(fix) O3-4180: Fix reset attribute search fields on advanced search p…

…age (#1410) * fix attribute filters reset and setting * fix tests
openmrs · Dec 16, 2024 · 6c607b6 · 6c607b6
1 parent f16bd73
commit 6c607b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/...ages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.component.tsx b/...ages/esm-patient-search-app/src/patient-search-page/advanced-patient-search.component.tsx
@@ -27,7 +27,9 @@ const AdvancedPatientSearchComponent: React.FC<AdvancedPatientSearchProps> = ({
       }
     });
 
-    count += Object.keys(filters.attributes).length ?? 0;
+    const attributesWithValues = Object.entries(filters.attributes || {}).filter(([key, value]) => value !== '');
+
+    count += attributesWithValues.length;
     return count;
   }, [filters]);
 
@@ -101,6 +103,8 @@ const AdvancedPatientSearchComponent: React.FC<AdvancedPatientSearchProps> = ({
         // Person attributes filter
         if (Object.keys(filters.attributes).length) {
           for (const [attributeUuid, value] of Object.entries(filters.attributes)) {
+            if (value === '') continue;
+
             const matchingAttribute = patient.attributes.find((attr) => attr.attributeType.uuid === attributeUuid);
 
             if (!matchingAttribute) return false;

diff --git a/.../esm-patient-search-app/src/patient-search-page/refine-search/refine-search.component.tsx b/.../esm-patient-search-app/src/patient-search-page/refine-search/refine-search.component.tsx
@@ -50,22 +50,7 @@ const RefineSearch: React.FC<RefineSearchProps> = ({ setFilters, inTabletOrOverl
 
   const onSubmit = useCallback(
     (data: AdvancedPatientSearchState) => {
-      const cleanedAttributes = Object.entries(data.attributes || {}).reduce(
-        (acc, [key, value]) => {
-          if (value) {
-            acc[key] = value;
-          }
-          return acc;
-        },
-        {} as Record<string, string>,
-      );
-
-      const cleanedData = {
-        ...data,
-        attributes: cleanedAttributes,
-      };
-
-      setFilters(cleanedData);
+      setFilters(data);
       setShowRefineSearchDialog(false);
     },
     [setFilters],

diff --git a/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.test.tsx b/packages/esm-patient-search-app/src/patient-search-page/refine-search/refine-search.test.tsx
@@ -109,7 +109,9 @@ describe('RefineSearch', () => {
         monthOfBirth: 0,
         yearOfBirth: 0,
         postcode: '',
-        attributes: {},
+        attributes: {
+          '14d4f066-15f5-102d-96e4-000c29c2a5d7': '',
+        },
         age: 30,
       }),
     );