(fix) Remove workaround for filtering patient lists (#866)

openmrs · Oct 30, 2023 · 3ed2084 · 3ed2084
1 parent b0604ed
commit 3ed2084
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/packages/esm-patient-list-app/src/api/hooks.ts b/packages/esm-patient-list-app/src/api/hooks.ts
@@ -139,14 +139,8 @@ export function usePatientListMembers(
     openmrsFetch,
   );
 
-  // FIXME: This is a workaround for removing a patient from a list
-  const filterList = (listMembers: Array<OpenmrsCohortMember>) =>
-    listMembers.filter((member) => !member.endDate && !member.voided);
-
-  const filteredListMembers = filterList(data?.data?.results ?? []);
-
   return {
-    listMembers: filteredListMembers,
+    listMembers: data?.data?.results ?? [],
     isLoadingListMembers: isLoading,
     error: error,
     mutateListMembers: mutate,

diff --git a/packages/esm-patient-list-app/src/patient-table/patient-table.component.tsx b/packages/esm-patient-list-app/src/patient-table/patient-table.component.tsx
@@ -297,7 +297,7 @@ const PatientTable: React.FC<PatientTableProps> = ({
                   </TableHead>
                   <TableBody>
                     {rows.map((row) => {
-                      const name = patients.find((patient) => patient.identifier === row.id)?.name;
+                      const currentPatient = patients.find((patient) => patient.identifier === row.id);
 
                       return (
                         <TableRow
@@ -317,8 +317,8 @@ const PatientTable: React.FC<PatientTableProps> = ({
                               size={isDesktop(layout) ? 'sm' : 'lg'}
                               tooltipPosition="left"
                               onClick={() => {
-                                setMembershipUuid(row.id);
-                                setPatientName(name);
+                                setMembershipUuid(currentPatient.membershipUuid);
+                                setPatientName(currentPatient.name);
                                 setShowConfirmationModal(true);
                               }}
                             />