Merge branch 'dev' into Jmpi-bug-notification-screen-pointing-to-deleted-GR-2

Author: MatthewErispe

JeMPI_Apps/JeMPI_UI/src/components/notificationWorklist/NotificationWorklist.tsx

@@ -27,7 +27,7 @@ import { useConfig } from 'hooks/useConfig'
 import CustomPagination from 'components/shared/CustomDataGridPagination'
 import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker'
 import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'
-import MultiSelect from 'components/shared/MultiSelect'
+import SelectDropdown from 'components/shared/SelectDropdown'
 
 const NotificationWorklist = () => {
   const navigate = useNavigate()
@@ -117,11 +117,12 @@ const NotificationWorklist = () => {
                 }
               }}
             />
-            <MultiSelect
-              listValues={[NotificationState.OPEN, NotificationState.CLOSED]}
+            <SelectDropdown
+              listValues={[NotificationState.ALL, NotificationState.OPEN, NotificationState.CLOSED]}
               label="States"
               setSelectedValues={setSelectedStates}
               defaultSelectedValues={[NotificationState.OPEN]}
+              multiple={false}
             />
             <Button variant="contained" onClick={() => refetch()} size="large">
               Filter

JeMPI_Apps/JeMPI_UI/src/components/shared/MultiSelect.tsx renamed to JeMPI_Apps/JeMPI_UI/src/components/shared/SelectDropdown.tsx

@@ -30,18 +30,20 @@ function getStyles(value: string, personName: readonly string[], theme: Theme) {
   }
 }
 
-type MultiSelectProps<T extends string> = {
+type SelectDropdownProps<T extends string> = {
   listValues: T[]
   label: string
   defaultSelectedValues: T[]
   setSelectedValues: Dispatch<SetStateAction<T[]>>
+  multiple: boolean
 }
-const MultiSelect = <T extends string>({
+const SelectDropdown = <T extends string>({
   listValues,
   label,
   defaultSelectedValues,
-  setSelectedValues
-}: MultiSelectProps<T>) => {
+  setSelectedValues,
+  multiple
+}: SelectDropdownProps<T>) => {
   const theme = useTheme()
   const [selectedValuesList, setSelectedValuesList] = useState(
     defaultSelectedValues
@@ -59,22 +61,21 @@ const MultiSelect = <T extends string>({
   }, [selectedValuesList])
   return (
     <FormControl>
-      <InputLabel id="multiple-status-label">{label}</InputLabel>
+      <InputLabel id="single-status-label">{label}</InputLabel>
       <Select
         sx={{ minWidth: 300, maxHeight: 55 }}
-        labelId="multiple-status-label"
-        id="multiple-chip"
-        multiple
+        labelId="single-status-label"
+        id="single-chip"
+        multiple={multiple}
         value={selectedValuesList}
         onChange={handleChange}
         input={<OutlinedInput label={label} />}
         renderValue={selected => (
           <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
-            {selected.map(value => (
-              <Chip key={value} label={value} />
-            ))}
+              <Chip  key={selected.toString()} label={selected} />
           </Box>
-        )}
+          )
+        }
         MenuProps={MenuProps}
       >
         {listValues.map(value => (
@@ -91,4 +92,4 @@ const MultiSelect = <T extends string>({
   )
 }
 
-export default MultiSelect
+export default SelectDropdown

JeMPI_Apps/JeMPI_UI/src/services/ApiClient.ts

@@ -27,7 +27,7 @@ import {
   DemographicData,
   PatientRecord
 } from 'types/PatientRecord'
-import { Notifications } from 'types/Notification'
+import { Notifications, NotificationState} from 'types/Notification'
 import { Config } from 'config'
 import axios from 'axios'
 import { getCookie } from '../utils/misc'
@@ -95,7 +95,8 @@ export class ApiClient {
     endDay: string,
     states: string[]
   ): Promise<Notifications> {
-    const url = `${ROUTES.GET_NOTIFICATIONS}?limit=${limit}&startDate=${startDay}&endDate=${endDay}&offset=${offset}&states=${states}`
+    const notificationState = states.includes(NotificationState.ALL.toString()) ? [NotificationState.CLOSED, NotificationState.OPEN] : states;
+    const url = `${ROUTES.GET_NOTIFICATIONS}?limit=${limit}&startDate=${startDay}&endDate=${endDay}&offset=${offset}&states=${notificationState}`
     const { data } = await this.client.get<NotificationResponse>(url)
     const { records, skippedRecords, count } = data
 

JeMPI_Apps/JeMPI_UI/src/types/Notification.ts

@@ -20,7 +20,8 @@ export interface GoldenRecordCandidate {
 
 export enum NotificationState {
   OPEN = 'OPEN',
-  CLOSED = 'CLOSED'
+  CLOSED = 'CLOSED',
+  ALL = 'ALL'
 }
 
 export type NotificationType = 'THRESHOLD' | 'MARGIN' | 'UPDATE'