AB#1064 fixes and test coverage

NCI-Agency · Nov 11, 2024 · edaf108 · edaf108
1 parent c5a3a92
commit edaf108
Show file tree

Hide file tree

Showing 40 changed files with 1,190 additions and 108 deletions.
diff --git a/client/src/components/EventCollection.js b/client/src/components/EventCollection.js
@@ -31,7 +31,8 @@ const EventCollection = ({
   mapId,
   width,
   height,
-  marginBottom
+  marginBottom,
+  showEventSeries
 }) => {
   const [viewFormat, setViewFormat] = useState(viewFormats[0])
   const showHeader = viewFormats.length > 1
@@ -87,6 +88,7 @@ const EventCollection = ({
               setPagination={setPagination}
               queryParams={queryParams}
               setTotalCount={setTotalCount}
+              showEventSeries={showEventSeries}
             />
           )}
           {viewFormat === FORMAT_SUMMARY && (
@@ -97,6 +99,7 @@ const EventCollection = ({
               setPagination={setPagination}
               queryParams={queryParams}
               setTotalCount={setTotalCount}
+              showEventSeries={showEventSeries}
             />
           )}
           {viewFormat === FORMAT_CALENDAR && (
@@ -144,7 +147,8 @@ EventCollection.propTypes = {
   mapId: PropTypes.string,
   width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   height: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  marginBottom: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+  marginBottom: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  showEventSeries: PropTypes.bool
 }
 
 EventCollection.defaultProps = {

diff --git a/client/src/components/EventSummary.js b/client/src/components/EventSummary.js
@@ -24,7 +24,8 @@ const EventSummary = ({
   setTotalCount,
   paginationKey,
   pagination,
-  setPagination
+  setPagination,
+  showEventSeries
 }) => {
   // (Re)set pageNum to 0 if the queryParams change, and make sure we retrieve page 0 in that case
   const latestQueryParams = useRef(queryParams)
@@ -80,7 +81,11 @@ const EventSummary = ({
         goToPage={setPage}
       >
         {events.map(event => (
-          <EventSummaryRow event={event} key={event.uuid} />
+          <EventSummaryRow
+            event={event}
+            key={event.uuid}
+            showEventSeries={showEventSeries}
+          />
         ))}
       </UltimatePaginationTopDown>
     </div>
@@ -98,14 +103,15 @@ EventSummary.propTypes = {
   setTotalCount: PropTypes.func,
   paginationKey: PropTypes.string.isRequired,
   setPagination: PropTypes.func.isRequired,
-  pagination: PropTypes.object.isRequired
+  pagination: PropTypes.object.isRequired,
+  showEventSeries: PropTypes.bool
 }
 
-const EventSummaryRow = ({ event }) => {
+const EventSummaryRow = ({ event, showEventSeries }) => {
   event = new Event(event)
 
   return (
-    <Container fluid className="report-summary">
+    <Container fluid className="event-summary">
       <Row>
         <Col md={12}>
           <span>
@@ -158,7 +164,7 @@ const EventSummaryRow = ({ event }) => {
           </Col>
         </Row>
       )}
-      {!_isEmpty(event.eventSeries) && (
+      {showEventSeries && !_isEmpty(event.eventSeries) && (
         <Row>
           <Col md={12}>
             <span>
@@ -259,7 +265,8 @@ const EventSummaryRow = ({ event }) => {
 }
 
 EventSummaryRow.propTypes = {
-  event: PropTypes.object.isRequired
+  event: PropTypes.object.isRequired,
+  showEventSeries: PropTypes.bool
 }
 
 export default EventSummary
diff --git a/client/src/components/EventTable.js b/client/src/components/EventTable.js
@@ -72,7 +72,8 @@ const BaseEventTable = ({
   pageSize,
   pageNum,
   totalCount,
-  goToPage
+  goToPage,
+  showEventSeries
 }) => {
   if (_get(events, "length", 0) === 0) {
     return <em>{noEventsMessage}</em>
@@ -92,7 +93,7 @@ const BaseEventTable = ({
           <thead>
             <tr>
               <th>Name</th>
-              <th>Series</th>
+              {showEventSeries && <th>Series</th>}
               <th>Host Organization</th>
               <th>Location</th>
               <th>Start Date</th>
@@ -105,9 +106,11 @@ const BaseEventTable = ({
                 <td>
                   <LinkTo modelType="Event" model={event} />
                 </td>
-                <td>
-                  <LinkTo modelType="EventSeries" model={event.eventSeries} />
-                </td>
+                {showEventSeries && (
+                  <td>
+                    <LinkTo modelType="EventSeries" model={event.eventSeries} />
+                  </td>
+                )}
                 <td>
                   <LinkTo modelType="Organization" model={event.hostOrg} />
                 </td>
@@ -138,7 +141,8 @@ BaseEventTable.propTypes = {
   totalCount: PropTypes.number,
   pageNum: PropTypes.number,
   pageSize: PropTypes.number,
-  goToPage: PropTypes.func
+  goToPage: PropTypes.func,
+  showEventSeries: PropTypes.bool
 }
 
 BaseEventTable.defaultProps = {

diff --git a/client/src/components/NoPaginationOrganizationTable.js b/client/src/components/NoPaginationOrganizationTable.js
@@ -22,7 +22,6 @@ const NoPaginationOrganizationTable = ({
           <thead>
             <tr>
               <th>Name</th>
-              <th>Description</th>
               <th>Location</th>
               {showDelete && <th />}
             </tr>
@@ -34,7 +33,6 @@ const NoPaginationOrganizationTable = ({
                   <td>
                     <LinkTo modelType="Organization" model={organization} />
                   </td>
-                  <td>{organization.description}</td>
                   <td>
                     <LinkTo
                       modelType="Location"

diff --git a/client/src/index.css b/client/src/index.css
@@ -1278,4 +1278,17 @@ table.event-matrix-cell {
   .form-horizontal .form-label {
     text-align: left;
   }
+  .event-collection header {
+    margin-bottom: 18px;
+  }
+
+  .event-collection footer {
+    margin-top: 18px;
+  }
+
+  .event-summary {
+    margin-top: 25px;
+    padding-top: 15px;
+    box-shadow: 0 1px 3px hsla(0, 0%, 0%, 0.15);
+  }
 }
diff --git a/client/src/models/Event.js b/client/src/models/Event.js
@@ -31,7 +31,7 @@ export default class Event extends Model {
       .default(() => Model.STATUS.ACTIVE),
     type: yup.string().required().default(""),
     name: yup.string().required().default(""),
-    description: yup.string().required().default(""),
+    description: yup.string().default(""),
     startDate: yupDate.required().default(null),
     endDate: yupDate.required().default(null),
     outcomes: yup.string().default(""),

diff --git a/client/src/models/EventSeries.js b/client/src/models/EventSeries.js
@@ -22,7 +22,7 @@ export default class EventSeries extends Model {
       .required()
       .default(() => Model.STATUS.ACTIVE),
     name: yup.string().required().default(""),
-    description: yup.string().required().default(""),
+    description: yup.string().default(""),
     hostOrg: yup
       .object()
       .test("hostOrg", "host org error", (hostOrg, testContext) =>

diff --git a/client/src/pages/eventSeries/Form.js b/client/src/pages/eventSeries/Form.js
@@ -69,7 +69,7 @@ const EventSeriesForm = ({ edit, title, initialValues, notesComponent }) => {
         const organizationFilters = {
           allOrganizations: {
             label: "All organizations",
-            queryVars: {}
+            queryVars: { status: Model.STATUS.ACTIVE }
           }
         }
 

diff --git a/client/src/pages/eventSeries/Show.js b/client/src/pages/eventSeries/Show.js
@@ -135,7 +135,7 @@ const EventSeriesShow = ({ pageDispatchers }) => {
               </Fieldset>
               <Fieldset
                 title={Settings.fields.eventSeries.description?.label}
-                id="report-text"
+                id="description"
               >
                 <RichTextEditor readOnly value={eventSeries.description} />
               </Fieldset>

diff --git a/client/src/pages/events/Form.js b/client/src/pages/events/Form.js
@@ -111,10 +111,6 @@ const EventForm = ({ edit, title, initialValues, notesComponent }) => {
             ...orgsAdministratedUuids
           ]
         }
-
-        const currentOrg =
-          currentUser.position && currentUser.position.organization
-
         const locationFilters = Location.getReportLocationFilters()
 
         const action = (
@@ -128,7 +124,7 @@ const EventForm = ({ edit, title, initialValues, notesComponent }) => {
         const organizationFilters = {
           allOrganizations: {
             label: "All organizations",
-            queryVars: {}
+            queryVars: { status: Model.STATUS.ACTIVE }
           }
         }
 
@@ -152,20 +148,31 @@ const EventForm = ({ edit, title, initialValues, notesComponent }) => {
 
         const tasksFilters = {}
 
-        if (currentOrg) {
-          tasksFilters.assignedToMyOrg = {
-            label: `Assigned to ${currentOrg.shortName}`,
+        tasksFilters.allTasks = {
+          label: `All ${tasksLabel}`,
+          queryVars: { selectable: true }
+        }
+
+        if (values.hostOrg) {
+          tasksFilters.assignedToHostOrg = {
+            label: `Assigned to ${values.hostOrg.shortName}`,
             queryVars: {
-              taskedOrgUuid: currentOrg.uuid,
+              taskedOrgUuid: values.hostOrg.uuid,
               orgRecurseStrategy: RECURSE_STRATEGY.PARENTS,
               selectable: true
             }
           }
         }
 
-        tasksFilters.allUnassignedTasks = {
-          label: `All unassigned ${tasksLabel}`,
-          queryVars: { selectable: true, isAssigned: false }
+        if (values.adminOrg && values.adminOrg.uuid !== values.hostOrg?.uuid) {
+          tasksFilters.assignedToAdminOrg = {
+            label: `Assigned to ${values.adminOrg.shortName}`,
+            queryVars: {
+              taskedOrgUuid: values.adminOrg.uuid,
+              orgRecurseStrategy: RECURSE_STRATEGY.PARENTS,
+              selectable: true
+            }
+          }
         }
 
         return (

diff --git a/client/src/pages/events/MyEvents.js b/client/src/pages/events/MyEvents.js
@@ -64,7 +64,7 @@ const MyEvents = ({ pageDispatchers, searchQuery }) => {
 
   function renderEventSeriesSection() {
     return (
-      <Fieldset title="Event Series" id="event-series">
+      <Fieldset title="Event Series" id="my-event-series">
         <EventSeriesCollection
           paginationKey={`e_eventSeries_${currentUser.uuid}`}
           queryParams={eventSearchQueryParams}
@@ -76,11 +76,12 @@ const MyEvents = ({ pageDispatchers, searchQuery }) => {
 
   function renderEventsSection() {
     return (
-      <Fieldset title="Events" id="events">
+      <Fieldset title="Events" id="my-events">
         <EventCollection
           paginationKey={`e_event_${currentUser.uuid}`}
           queryParams={eventSearchQueryParams}
           mapId="event"
+          showEventSeries
         />
       </Fieldset>
     )

diff --git a/client/src/pages/events/Show.js b/client/src/pages/events/Show.js
@@ -27,6 +27,7 @@ import React, { useContext, useState } from "react"
 import { connect } from "react-redux"
 import { useLocation, useParams } from "react-router-dom"
 import Settings from "settings"
+import { FORMAT_TABLE } from "../../components/ReportCollection"
 
 const EventShow = ({ pageDispatchers }) => {
   const { currentUser } = useContext(AppContext)
@@ -200,7 +201,7 @@ const EventShow = ({ pageDispatchers }) => {
               </Fieldset>
               <Fieldset
                 title={Settings.fields.event.description?.label}
-                id="report-text"
+                id="description"
               >
                 <RichTextEditor readOnly value={event.description} />
               </Fieldset>
@@ -226,11 +227,13 @@ const EventShow = ({ pageDispatchers }) => {
                 </Fieldset>
               )}
               {event.tasks.length > 0 && (
-                <Fieldset title={Settings.fields.task.longLabel}>
+                <Fieldset
+                  id="eventTasks"
+                  title={Settings.fields.task.longLabel}
+                >
                   <NoPaginationTaskTable
                     id="events-tasks"
                     tasks={values.tasks}
-                    showOrganization
                     showDescription
                     noTasksMessage={`No ${tasksLabel} selected; click in the ${tasksLabel} box to view your organization's ${tasksLabel}`}
                   />
@@ -239,13 +242,13 @@ const EventShow = ({ pageDispatchers }) => {
               {event.outcomes && (
                 <Fieldset
                   title={Settings.fields.event.outcomes?.label}
-                  id="report-text"
+                  id="outcomes"
                 >
                   <RichTextEditor readOnly value={event.outcomes} />
                 </Fieldset>
               )}
               <Fieldset
-                id="reports"
+                id="eventReports"
                 title={`Reports for ${event.name}`}
                 action={
                   <LinkTo
@@ -263,6 +266,7 @@ const EventShow = ({ pageDispatchers }) => {
                   paginationKey={`r_${uuid}`}
                   queryParams={reportQueryParams}
                   mapId="reports"
+                  viewFormats={[FORMAT_TABLE]}
                 />
               </Fieldset>
             </Form>

diff --git a/client/src/pages/locations/Show.js b/client/src/pages/locations/Show.js
@@ -314,6 +314,7 @@ const LocationShow = ({ pageDispatchers }) => {
                 paginationKey={`e_${uuid}`}
                 queryParams={{ locationUuid: uuid }}
                 mapId="events"
+                showEventSeries
               />
             </Fieldset>
           </div>

diff --git a/client/src/pages/organizations/Show.js b/client/src/pages/organizations/Show.js
@@ -716,6 +716,7 @@ const OrganizationShow = ({ pageDispatchers }) => {
                   paginationKey={`e_${uuid}`}
                   queryParams={eventQueryParams}
                   mapId="events"
+                  showEventSeries
                 />
               </Fieldset>
               <Fieldset

diff --git a/client/src/pages/searches/Search.js b/client/src/pages/searches/Search.js
@@ -1075,6 +1075,7 @@ const Events = ({
       pageNum={curPage}
       totalCount={totalCount}
       goToPage={setPage}
+      showEventSeries
       id="events-search-results"
     />
   )