(fix) Resolve issue preventing addition of patients to existing groups (

#81) * Fixed error when adding a patient to an existing group * Fixed patient list sorting when loading an existing group
openmrs · Apr 3, 2024 · ad854e4 · ad854e4
1 parent 0493326
commit ad854e4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/add-group-modal/AddGroupModal.tsx b/src/add-group-modal/AddGroupModal.tsx
@@ -144,14 +144,14 @@ const NewGroupForm = (props) => {
 };
 
 const AddGroupModal = ({
-                         patients = undefined,
-                         isCreate = undefined,
-                         groupName = "",
-                         cohortUuid = undefined,
-                         isOpen,
-                         onPostCancel,
-                         onPostSubmit,
-                       }) => {
+  patients = undefined,
+  isCreate = undefined,
+  groupName = "",
+  cohortUuid = undefined,
+  isOpen,
+  onPostCancel,
+  onPostSubmit,
+}) => {
   const { setGroup } = useContext(GroupFormWorkflowContext);
   const { t } = useTranslation();
   const [errors, setErrors] = useState({});
@@ -197,17 +197,19 @@ const AddGroupModal = ({
 
   const updatePatientList = useCallback(
     (patientUuid) => {
+      function getPatientName(patient) {
+        return [patient?.name?.[0]?.given, patient?.name?.[0]?.family].join(
+          " "
+        );
+      }
       if (!patientList.find((p) => p.uuid === patientUuid)) {
         fetchCurrentPatient(patientUuid).then((result) => {
-          const newPatient = {
-            uuid: patientUuid,
-            name: [result?.name?.[0]?.given, result?.name?.[0]?.family].join(
-              " "
-            ),
-          };
+          const newPatient = { uuid: patientUuid, ...result };
           setPatientList(
             [...patientList, newPatient].sort((a, b) =>
-              a.name?.localeCompare(b?.name, { sensitivity: "base" })
+              getPatientName(a).localeCompare(getPatientName(b), undefined, {
+                sensitivity: "base",
+              })
             )
           );
         });

diff --git a/src/group-form-entry-workflow/group-search-header/GroupSearchHeader.tsx b/src/group-form-entry-workflow/group-search-header/GroupSearchHeader.tsx
@@ -14,8 +14,11 @@ const GroupSearchHeader = () => {
   );
   const [isOpen, setOpen] = useState(false);
   const handleSelectGroup = (group) => {
-    group.cohortMembers.sort((a, b) =>
-      a.display?.localeCompare(b?.display, { sensitivity: "base" })
+    group.cohortMembers.sort((a, b) => {
+        let aName = a?.patient?.person?.names?.[0]?.display;
+        let bName = b?.patient?.person?.names?.[0]?.display;
+        return aName.localeCompare(bName, undefined, {sensitivity: "base"});
+      }
     );
     setGroup(group);
   };