@kenyaemr/esm-admin-app 5.4.2-pre.2277 → 5.4.2-pre.2279

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"}],"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.2277"}
+{"$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"}],"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.2279"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-admin-app",
-  "version": "5.4.2-pre.2277",
+  "version": "5.4.2-pre.2279",
   "description": "Facilitates the management of ETL tables",
   "browser": "dist/kenyaemr-esm-admin-app.js",
   "main": "src/index.ts",

package/src/components/locations/common/results-tile.component.tsx

@@ -20,15 +20,15 @@ const ResultsTile: React.FC<ResultsTileProps> = ({ location, onClose }) => {
         {onClose && <Close size={16} className={styles.closeIcon} onClick={onClose} />}
         <Hospital className={styles.illustrationPictogram} />
         <div className={styles.details}>
-          <div style={{ fontWeight: 'bold' }}>{location.display || location.name}</div>
-          {location.description && <div style={{ fontSize: '0.875rem', color: '#666' }}>{location.description}</div>}
+          <div className={styles.locationName}>{location.display || location.name}</div>
+          {location.description && <div className={styles.description}>{location.description}</div>}
           {(location.stateProvince || location.country) && (
-            <div style={{ fontSize: '0.75rem', color: '#888' }}>
+            <div className={styles.locationDetails}>
               {[location.stateProvince, location.country].filter(Boolean).join(', ')}
             </div>
           )}
           {location.tags && (
-            <div style={{ fontSize: '0.75rem', color: '#888' }}>
+            <div className={styles.tags}>
               {location.tags.map((tag, index) => (
                 <Tag key={index} className={styles.tag}>
                   {tag.display || tag.name}

package/src/components/locations/common/results-tile.scss

@@ -62,3 +62,25 @@
     color: colors.$gray-100;
   }
 }
+
+.description {
+  @include type.type-style('body-compact-01');
+  color: colors.$gray-70;
+  margin-bottom: layout.$spacing-03;
+  font-size: layout.$spacing-01;
+}
+.locationName {
+  @include type.type-style('body-compact-01');
+  color: colors.$gray-70;
+  font-weight: bold;
+}
+.locationDetails {
+  @include type.type-style('body-compact-01');
+  color: colors.$gray-70;
+  font-size: layout.$spacing-01;
+}
+.tags {
+  @include type.type-style('body-compact-01');
+  color: colors.$gray-70;
+  font-size: layout.$spacing-01;
+}

package/src/components/locations/forms/add-location/add-location.workspace.tsx

@@ -23,11 +23,11 @@ import classNames from 'classnames';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import styles from './add-location.workspace.scss';
-import { editLocation, saveLocation } from '../../hooks/useLocation';
-import { LocationResponse, type AdmissionLocationResponse } from '../../types';
+import { type LocationResponse } from '../../types';
 import { extractErrorMessagesFromResponse } from '../../helpers';
 import { useLocationTags } from '../../hooks/useLocationTags';
 import { mutate } from 'swr';
+import { saveOrUpdateLocation } from '../../hooks/useLocation';
 
 type AddLocationWorkspaceProps = DefaultWorkspaceProps & {
   location?: LocationResponse;
@@ -89,16 +89,14 @@ const AddLocationWorkspace: React.FC<AddLocationWorkspaceProps> = ({
     };
 
     try {
-      if (location?.uuid) {
-        await editLocation(location.uuid, locationPayload);
-      } else {
-        await saveLocation(locationPayload);
-      }
+      const locationUuid = location?.uuid && typeof location.uuid === 'string' ? location.uuid : undefined;
+
+      await saveOrUpdateLocation(locationPayload, locationUuid);
 
       showSnackbar({
         title: t('success', 'Success'),
         kind: 'success',
-        subtitle: location?.uuid
+        subtitle: locationUuid
           ? t('locationUpdated', 'Location {{locationName}} was updated successfully.', {
               locationName: data.name,
             })

package/src/components/locations/forms/search-location/search-location.workspace.tsx

@@ -16,7 +16,7 @@ import { z } from 'zod';
 import { LocationAutosuggest } from '../../auto-suggest/location-autosuggest.component';
 import ResultsTile from '../../common/results-tile.component';
 import { extractErrorMessagesFromResponse } from '../../helpers';
-import { editLocation } from '../../hooks/useLocation';
+import { saveOrUpdateLocation } from '../../hooks/useLocation';
 import { useLocationTags } from '../../hooks/useLocationTags';
 import { LocationResponse } from '../../types';
 import styles from './search-location.workspace.scss';
@@ -78,7 +78,7 @@ const SearchLocationWorkspace: React.FC<AddLocationWorkspaceProps> = ({
         tags: locationTagsUuid,
       };
 
-      await editLocation(locationUuid, locationPayload);
+      await saveOrUpdateLocation(locationUuid, locationPayload);
 
       showSnackbar({
         title: t('success', 'Success'),

package/src/components/locations/hooks/useLocation.ts

@@ -1,19 +1,13 @@
 import { restBaseUrl, openmrsFetch } from '@openmrs/esm-framework';
-import useSWR from 'swr';
 
-export const saveLocation = async (locationPayload) => {
-  const url = `${restBaseUrl}/location`;
-  return await openmrsFetch(url, {
-    method: 'POST',
-    body: locationPayload,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
-};
+export const saveOrUpdateLocation = async (locationPayload, locationUuid) => {
+  if (typeof locationPayload === 'string' && typeof locationUuid === 'object') {
+    const temp = locationPayload;
+    locationPayload = locationUuid;
+    locationUuid = temp;
+  }
 
-export const editLocation = async (locationUuid, locationPayload) => {
-  const url = `${restBaseUrl}/location/${locationUuid}`;
+  const url = locationUuid ? `${restBaseUrl}/location/${locationUuid}` : `${restBaseUrl}/location`;
   return await openmrsFetch(url, {
     method: 'POST',
     body: locationPayload,

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

@@ -1,4 +1,4 @@
-import { FetchResponse, fhirBaseUrl, openmrsFetch } from '@openmrs/esm-framework';
+import { FetchResponse, fhirBaseUrl, openmrsFetch, useFhirFetchAll } from '@openmrs/esm-framework';
 import { type FHIRBundle, FHIRLocation, LocationTagsResponse } from '../types';
 import useSWR from 'swr';
 
@@ -17,7 +17,7 @@ export async function getFacilitiesByLocationTags(
     .filter(Boolean)
     .join(',');
 
-  const url = `${fhirBaseUrl}/Location?_summary=data&_tag=${tagNames}`;
+  const url = `${useFhirFetchAll}/Location?_summary=data&_tag=${tagNames}`;
   const response = await openmrsFetch<FHIRBundle>(url);
 
   const locations = response.data?.entry?.map((entry) => entry.resource) ?? [];

package/translations/en.json

@@ -4,16 +4,19 @@
   "Active Licensed": "Active Licensed",
   "activeFrom": "Active From",
   "activeTo": "Active To",
+  "addLocation": "Add Location",
   "addUser": "Add User",
   "adminLeftPannel": "Admin left panel",
   "All users": "All users",
   "cancel": "Cancel",
+  "checkFilters": "Check the filters above",
   "chooseAStockRole": "Choose a stock role",
   "completionStatus": "Completion status",
   "confirmation": "Confirmation",
   "continue": "Continue to registration",
   "delete": "Delete",
   "deletingstockUserScope": "Delete Stock User Scope",
+  "description": "Description",
   "edit": "Edit",
   "editUser": "Edit User",
   "emailAddress": "Email address",
@@ -43,17 +46,22 @@
   "licenseExpiringSoon": "License is expiring soon",
   "licenseExpiryDate": "License Expiry Date",
   "licenseNumber": "License Number",
+  "loading": "",
   "location": "Location(s)",
+  "locationName": "Location Name",
+  "locations": "Locations",
   "manageUserRoleScope": "Manage user role scope",
   "names": "Names",
   "nationalId": "National ID",
   "nextPage": "Next page",
   "no": "No",
+  "noData": "No data to display",
   "noDescriptionAvailable": "No description available",
   "noHwrApi": "Health Care Worker Registry API credentials not configured,Kindly contact system admin. Do you want to continue to create an account",
   "noMatchingUsers": "No matching users found",
   "noRecordsFound": "No ETL Operation logs found",
   "noRespond": "No",
+  "noSearchResults": "",
   "noUserRoleScope": "No user role scope",
   "noUsersAvailable": "No users available",
   "operationError": "{{operationName}} failed",
@@ -79,7 +87,10 @@
   "remove": "Remove",
   "ResourceNotFound": "The Health Work Registry is not reachable, kindly confirm your internet connectivity and try again. Do you want to continue to create an account",
   "role": "Role",
+  "search": "Search location",
   "searchForUsers": "Search for user",
+  "searchNoResults": "Found no matching results",
+  "searchNoResultsHelper": "Try searching for a different term",
   "shaContracted": "SHA Contracted",
   "shaExpiry": "SHA Expiry Date",
   "shaInformation": "SHA Information",
@@ -97,6 +108,9 @@
   "syncingHieError": "Syncing with HIE Failed",
   "syncingHieSuccess": "Synchronization Complete",
   "systemId": "System ID",
+  "tagLocation": "Tag Location",
+  "tags": "Tags",
+  "tryDifferentSearch": "Try a different search term",
   "unknownError": "An error occured while searching Health Worker Registry, kindly contact system admin. Do you want to continue to create an account ",
   "unlicensed": "Unlicensed",
   "Unlicensed": "Unlicensed",

package/src/components/locations/hooks/index.json

@@ -1,35 +0,0 @@
-{
-    "results": [
-        {
-            "uuid": "45a10dd9-edaa-4e50-a2d7-343fef0415eb",
-            "display": "10 Engineer VCT",
-            "name": "10 Engineer VCT",
-            "description": "Dispensary",
-            "stateProvince": "Laikipia",
-            "country": "Kenya",
-            "countyDistrict": "Laikipia",
-            "address5": "Nanyuki",
-            "address6": "Laikipia East",
-            "tags": [],
-
-            "attributes": [
-                {
-                    "display": "Master Facility Code: 14180",
-                    "uuid": "21e6dc68-46e7-4f2e-916c-4281c62dad6b",
-                    "attributeType": {
-                        "uuid": "8a845a89-6aa5-4111-81d3-0af31c45c002",
-                        "display": "Master Facility Code",
-                        "links": [
-                            {
-                                "rel": "self",
-                                "uri": "https://qa.kenyahmis.org/openmrs/ws/rest/v1/locationattributetype/8a845a89-6aa5-4111-81d3-0af31c45c002",
-                                "resourceAlias": "locationattributetype"
-                            }
-                        ]
-                    },
-                    "value": "14180"
-                }
-            ]
-        }
-    ]
-}