@kenyaemr/esm-admin-app 5.4.2-pre.2767 → 5.4.2-pre.2774

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemrCharts":"^1.6.7"},"extensions":[{"component":"adminLeftPanelLink","name":"admin-left-panel-link","slot":"admin-left-panel-slot"},{"component":"userManagementLeftPannelLink","name":"user-management-left-panel-link","slot":"admin-left-panel-slot"},{"component":"etlAdministrationLeftPannelLink","name":"etl-administration-left-panel-link","slot":"admin-left-panel-slot"},{"component":"locationsLeftPanelLink","name":"locations-left-panel-link","slot":"admin-left-panel-slot"},{"component":"facilitySetupLeftPanelLink","name":"facility-setup-left-panel-link","slot":"admin-left-panel-slot"},{"component":"providerBanner","name":"provider-banner","slot":"provider-banner-info-slot","order":1}],"workspaces":[{"name":"manage-user-workspace","component":"manageUserWorkspace","title":"Manage User Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"user-role-scope-workspace","component":"userRoleScopeWorkspace","title":"User Rple Scope Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"add-location-workspace","title":"Add Location","component":"addLocation","type":"workspace"},{"name":"search-location-workspace","title":"Search Location","component":"searchLocationWorkspace","type":"workspace"},{"name":"hwr-sync-workspace","title":"HWR Sync Workspace","component":"hwrSyncWorkspace","type":"other-form"},{"name":"hwr-sync-modal","title":"HWR Sync Modal","component":"hwrSyncModal","type":"modal"}],"modals":[{"component":"operationConfirmationModal","name":"operation-confirmation-modal"},{"component":"hwrConfirmationModal","name":"hwr-confirmation-modal"},{"component":"hwrEmptyModal","name":"hwr-empty-modal"},{"component":"hwrSyncModal","name":"hwr-syncing-modal"}],"pages":[{"component":"root","route":"admin"}],"version":"5.4.2-pre.2767"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemrCharts":"^1.6.7"},"extensions":[{"component":"adminLeftPanelLink","name":"admin-left-panel-link","slot":"admin-left-panel-slot"},{"component":"userManagementLeftPannelLink","name":"user-management-left-panel-link","slot":"admin-left-panel-slot"},{"component":"etlAdministrationLeftPannelLink","name":"etl-administration-left-panel-link","slot":"admin-left-panel-slot"},{"component":"locationsLeftPanelLink","name":"locations-left-panel-link","slot":"admin-left-panel-slot"},{"component":"facilitySetupLeftPanelLink","name":"facility-setup-left-panel-link","slot":"admin-left-panel-slot"},{"component":"providerBanner","name":"provider-banner","slot":"provider-banner-info-slot","order":1}],"workspaces":[{"name":"manage-user-workspace","component":"manageUserWorkspace","title":"Manage User Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"user-role-scope-workspace","component":"userRoleScopeWorkspace","title":"User Rple Scope Workspace","type":"other-form","canMaximize":true,"width":"extra-wide"},{"name":"add-location-workspace","title":"Add Location","component":"addLocation","type":"workspace"},{"name":"search-location-workspace","title":"Search Location","component":"searchLocationWorkspace","type":"workspace"},{"name":"hwr-sync-workspace","title":"HWR Sync Workspace","component":"hwrSyncWorkspace","type":"other-form"},{"name":"hwr-sync-modal","title":"HWR Sync Modal","component":"hwrSyncModal","type":"modal"}],"modals":[{"component":"operationConfirmationModal","name":"operation-confirmation-modal"},{"component":"hwrConfirmationModal","name":"hwr-confirmation-modal"},{"component":"hwrEmptyModal","name":"hwr-empty-modal"},{"component":"hwrSyncModal","name":"hwr-syncing-modal"}],"pages":[{"component":"root","route":"admin"}],"version":"5.4.2-pre.2774"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-admin-app",
-  "version": "5.4.2-pre.2767",
+  "version": "5.4.2-pre.2774",
   "description": "Facilitates the management of ETL tables",
   "keywords": [
     "openmrs"

package/src/components/locations/tables/locations-table.resource.ts

@@ -1,41 +1,26 @@
-import { FetchResponse, fhirBaseUrl, openmrsFetch, useFhirFetchAll } from '@openmrs/esm-framework';
-import { type FHIRBundle, FHIRLocation, LocationTagsResponse } from '../types';
-import useSWR from 'swr';
+import { useFhirFetchAll } from '@openmrs/esm-framework';
+import { type FHIRLocation, type LocationTagsResponse } from '../types';
 
 /**
- * Fetches facilities that are tagged with any of the specified location tags.
+ * Custom hook that fetches all facilities with specified location tags.
+ * Uses the framework's useFhirFetchAll hook which handles pagination automatically.
  *
- * @param locationTags The location tags to filter facilities by
- * @returns A promise that resolves to the data object containing the matching FHIR locations
- * @throws {Error} If the API request fails
+ * @param locationTags The location tags response containing tags to filter by
+ * @returns Object containing loading state, error, and the list of facilities
  */
-export async function getFacilitiesByLocationTags(
-  locationTags: LocationTagsResponse,
-): Promise<{ results: Array<FHIRLocation> }> {
-  const tagNames = locationTags.results
-    .map((tag) => encodeURIComponent(tag.name || tag.display))
+export const useFacilitiesTagged = (locationTags: LocationTagsResponse) => {
+  const tagNames = locationTags?.results
+    ?.map((tag) => encodeURIComponent(tag.name || tag.display))
     .filter(Boolean)
     .join(',');
 
-  const url = `${useFhirFetchAll}/Location?_summary=data&_tag=${tagNames}`;
-  const response = await openmrsFetch<FHIRBundle>(url);
-
-  const locations = response.data?.entry?.map((entry) => entry.resource) ?? [];
-
-  return { results: locations };
-}
+  const url = tagNames ? `ws/fhir2/R4/Location?_summary=data&_tag=${tagNames}` : null;
 
-export const useFacilitiesTagged = (locationTags: LocationTagsResponse) => {
-  const tagNames = locationTags.results
-    .map((tag) => encodeURIComponent(tag.name || tag.display))
-    .filter(Boolean)
-    .join(',');
-  const url = `${fhirBaseUrl}/Location?_summary=data&_tag=${tagNames}`;
-  const { isLoading, error, data } = useSWR<FetchResponse<FHIRBundle>>(url, openmrsFetch);
+  const { data, isLoading, error } = useFhirFetchAll<FHIRLocation>(url);
 
   return {
     isLoading,
     error,
-    facilityList: data?.data?.entry || [],
+    facilityList: data?.map((resource) => ({ resource })) || [],
   };
 };