(feat) O3-4143: useLocations should support searching by tag or query…

… string
openmrs · Oct 30, 2024 · e028053 · e028053
1 parent 3a2620e
commit e028053
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/packages/framework/esm-api/src/shared-api-objects/location.ts b/packages/framework/esm-api/src/shared-api-objects/location.ts
@@ -11,8 +11,16 @@ export function toLocationObject(openmrsRestForm: any): Location {
   };
 }
 
-export function getLocations(tagUuidOrName: string | null = null): Observable<Array<Location>> {
-  const url = `${restBaseUrl}/location` + (tagUuidOrName ? '?tag=' + tagUuidOrName : '');
+export function getLocations(
+  tagUuidOrName: string | null = null,
+  query: string | null = null,
+): Observable<Array<Location>> {
+  const url =
+    `${restBaseUrl}/location` +
+    (tagUuidOrName || query ? '?' : '') +
+    (tagUuidOrName ? 'tag=' + tagUuidOrName : '') +
+    (tagUuidOrName && query ? '&' : '') +
+    (query ? 'q=' + query : '');
   return openmrsObservableFetch<any>(url)
     .pipe(
       map((results) => {

diff --git a/packages/framework/esm-react-utils/src/useLocations.tsx b/packages/framework/esm-react-utils/src/useLocations.tsx
@@ -3,11 +3,11 @@ import type { Location } from '@openmrs/esm-api';
 import { getLocations } from '@openmrs/esm-api';
 import { useState, useEffect } from 'react';
 
-export function useLocations(tagUuidOrName: string | null = null) {
+export function useLocations(tagUuidOrName: string | null = null, query: string | null = null): Array<Location> {
   const [locations, setLocations] = useState<Array<Location>>([]);
 
   useEffect(() => {
-    const locationSub = getLocations(tagUuidOrName).subscribe(
+    const locationSub = getLocations(tagUuidOrName, query).subscribe(
       (locations) => {
         setLocations(locations);
       },
@@ -16,7 +16,7 @@ export function useLocations(tagUuidOrName: string | null = null) {
       },
     );
     return () => locationSub.unsubscribe();
-  }, []);
+  }, [query]);
 
   return locations;
 }