Adjusted AttendanceTable rendering to prevent undefined patient issues

openmrs · Mar 27, 2024 · 2711866 · 2711866
1 parent b743382
commit 2711866
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/group-form-entry-workflow/attendance-table/AttendanceTable.tsx b/src/group-form-entry-workflow/attendance-table/AttendanceTable.tsx
@@ -131,15 +131,17 @@ const AttendanceTable = ({ patients }) => {
         </TableHead>
         <TableBody>
           {activeGroupMembers
-            .map((patientUuid, index) => {
-              return patients.find((patient) => patient.id === patientUuid);
-            })
-            .sort((a, b) => {
-              return getPatientName(a).localeCompare(getPatientName(b));
-            })
-            .map((patient, index) => {
-              return <PatientRow patient={patient} key={index} />;
-            })}
+            .map((patientUuid) =>
+              patients.find((patient) => patient.id === patientUuid)
+            )
+            .filter(Boolean)
+            .sort((a, b) =>
+              getPatientName(a).localeCompare(
+                getPatientName(b).map((patient, index) => (
+                  <PatientRow patient={patient} key={index} />
+                ))
+              )
+            )}
         </TableBody>
       </Table>
     </div>