@kenyaemr/esm-admin-app 5.4.4-pre.20 → 5.4.4-pre.201

package/src/index.ts

@@ -1,17 +1,7 @@
-import { defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
+import { defineConfigSchema, getSyncLifecycle, getAsyncLifecycle } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
 import { moduleName } from './constants';
 import OperationConfirmation from './components/confirm-modal/confirmation-operation-modal.component';
-import Root from './root.component';
-import ManageUserWorkspace from './components/users/manage-users/user-management.workspace';
-import { createLeftPanelLink } from './left-pannel-link.component';
-import HWRConfirmModal from './components/modal/hwr-confirmation.modal';
-import HWREmptyModal from './components/modal/hwr-empty.modal.component';
-import UserRoleScopeWorkspace from './components/users/manage-users/manage-user-role-scope/user-role-scope-workspace/user-role-scope.workspace';
-import HWRSyncModal from './components/modal/hwr-sync.modal';
-import AddLocationWorkspace from './components/locations/forms/add-location/add-location.workspace';
-import SearchLocationWorkspace from './components/locations/forms/search-location/search-location.workspace';
-import ProviderBannerTag from './components/provider-banner/provider-banner.component';
 
 const options = {
   featureName: 'esm-admin-app',
@@ -20,40 +10,75 @@ const options = {
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
-export const root = getSyncLifecycle(Root, options);
+export const root = getAsyncLifecycle(() => import('./root.component'), options);
 
 export function startupApp() {
   defineConfigSchema(moduleName, configSchema);
 }
 
 export const operationConfirmationModal = getSyncLifecycle(OperationConfirmation, options);
-export const manageUserWorkspace = getSyncLifecycle(ManageUserWorkspace, options);
-export const userRoleScopeWorkspace = getSyncLifecycle(UserRoleScopeWorkspace, options);
-
-export const userManagementLeftPannelLink = getSyncLifecycle(
-  createLeftPanelLink({ title: 'Manage Users', name: 'user-management' }),
+export const manageUserWorkspace = getAsyncLifecycle(
+  () => import('./components/users/manage-users/user-management.workspace'),
   options,
 );
-
-export const etlAdministrationLeftPannelLink = getSyncLifecycle(
-  createLeftPanelLink({ title: 'ETL Administration', name: 'etl-administration' }),
+export const userRoleScopeWorkspace = getAsyncLifecycle(
+  () =>
+    import(
+      './components/users/manage-users/manage-user-role-scope/user-role-scope-workspace/user-role-scope.workspace'
+    ),
+  options,
+);
+// t("manageUsers", "Manage Users")
+export const userManagementLeftPannelLink = getAsyncLifecycle(
+  () =>
+    import('./left-pannel-link.component').then((m) => ({
+      default: m.createLeftPanelLink({ title: 'manageUsers', name: 'user-management' }),
+    })),
   options,
 );
-export const locationsLeftPanelLink = getSyncLifecycle(
-  createLeftPanelLink({ title: 'Locations', name: 'locations' }),
+// t("etlAdministration", "ETL Administration")
+export const etlAdministrationLeftPannelLink = getAsyncLifecycle(
+  () =>
+    import('./left-pannel-link.component').then((m) => ({
+      default: m.createLeftPanelLink({ title: 'etlAdministration', name: 'etl-administration' }),
+    })),
   options,
 );
-export const facilitySetupLeftPanelLink = getSyncLifecycle(
-  createLeftPanelLink({ title: 'Facility Details', name: 'facility-setup' }),
+// t("locations", "Locations")
+export const locationsLeftPanelLink = getAsyncLifecycle(
+  () =>
+    import('./left-pannel-link.component').then((m) => ({
+      default: m.createLeftPanelLink({ title: 'locations', name: 'locations' }),
+    })),
+  options,
+);
+// t("facilityDetails", "Facility Details")
+export const facilitySetupLeftPanelLink = getAsyncLifecycle(
+  () =>
+    import('./left-pannel-link.component').then((m) => ({
+      default: m.createLeftPanelLink({ title: 'facilityDetails', name: 'facility-setup' }),
+    })),
   options,
 );
 
-export const hwrConfirmationModal = getSyncLifecycle(HWRConfirmModal, options);
-export const hwrEmptyModal = getSyncLifecycle(HWREmptyModal, options);
-export const hwrSyncModal = getSyncLifecycle(HWRSyncModal, options);
+export const hwrConfirmationModal = getAsyncLifecycle(
+  () => import('./components/modal/hwr-confirmation.modal'),
+  options,
+);
+export const hwrEmptyModal = getAsyncLifecycle(() => import('./components/modal/hwr-empty.modal.component'), options);
+export const hwrSyncModal = getAsyncLifecycle(() => import('./components/modal/hwr-sync.modal'), options);
 
-export const addLocation = getSyncLifecycle(AddLocationWorkspace, options);
-export const searchLocationWorkspace = getSyncLifecycle(SearchLocationWorkspace, options);
+export const addLocation = getAsyncLifecycle(
+  () => import('./components/locations/forms/add-location/add-location.workspace'),
+  options,
+);
+export const searchLocationWorkspace = getAsyncLifecycle(
+  () => import('./components/locations/forms/search-location/search-location.workspace'),
+  options,
+);
 
 // t('providerBanner', 'Provider banner')
-export const providerBanner = getSyncLifecycle(ProviderBannerTag, options);
+export const providerBanner = getAsyncLifecycle(
+  () => import('./components/provider-banner/provider-banner.component'),
+  options,
+);

package/src/left-pannel-link.component.tsx

@@ -1,7 +1,8 @@
-import React, { useMemo } from 'react';
+import { ConfigurableLink } from '@openmrs/esm-framework';
 import last from 'lodash-es/last';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { BrowserRouter, useLocation } from 'react-router-dom';
-import { ConfigurableLink } from '@openmrs/esm-framework';
 
 export interface LinkConfig {
   name: string;
@@ -9,6 +10,7 @@ export interface LinkConfig {
 }
 
 function LinkExtension({ config }: { config: LinkConfig }) {
+  const { t } = useTranslation();
   const { name, title } = config;
   const location = useLocation();
 
@@ -27,7 +29,7 @@ function LinkExtension({ config }: { config: LinkConfig }) {
     <ConfigurableLink
       to={`${window.getOpenmrsSpaBase()}admin${name && name !== 'admin' ? `/${name}` : ''}`}
       className={`cds--side-nav__link ${name === urlSegment && 'active-left-nav-link'}`}>
-      {title}
+      {t(title)}
     </ConfigurableLink>
   );
 }

package/src/root.component.tsx

@@ -1,24 +1,22 @@
-import React, { useEffect } from 'react';
+import React from 'react';
+import { useLeftNav } from '@openmrs/esm-framework';
 import { BrowserRouter, Route, Routes } from 'react-router-dom';
-import { setLeftNav, unsetLeftNav, WorkspaceContainer } from '@openmrs/esm-framework';
-import styles from './root.scss';
+
 import LeftPanel from './components/side-menu/left-pannel.component';
 import UserManagentLandingPage from './components/users/manage-users/manage-user.component';
 import EtlAdminDashboard from './components/dashboard/etl-dashboard.component';
 import FacilitySetup from './components/facility-setup/facility-setup.component';
 import HomeComponent from './components/locations/home/home-locations.component';
 
-const Root: React.FC = () => {
-  const spaBasePath = window.spaBase;
-  const adminBasename = window.getOpenmrsSpaBase() + 'admin';
+import styles from './root.scss';
 
-  useEffect(() => {
-    setLeftNav({
-      name: 'admin-left-panel-slot',
-      basePath: spaBasePath,
-    });
-    return () => unsetLeftNav('admin-left-panel-slot');
-  }, [spaBasePath]);
+const Root: React.FC = () => {
+  const spaBasePath = globalThis.spaBase;
+  const adminBasename = globalThis.getOpenmrsSpaBase() + 'admin';
+  useLeftNav({
+    name: 'admin-left-panel-slot',
+    basePath: spaBasePath,
+  });
 
   return (
     <BrowserRouter basename={adminBasename}>

package/src/routes.json

@@ -13,7 +13,7 @@
       "component": "userManagementLeftPannelLink",
       "name": "user-management-left-panel-link",
       "slot": "admin-left-panel-slot"
-    }, 
+    },
     {
       "component": "etlAdministrationLeftPannelLink",
       "name": "etl-administration-left-panel-link",
@@ -33,67 +33,67 @@
       "component": "providerBanner",
       "name": "provider-banner",
       "slot": "provider-banner-info-slot",
-      "order":1
+      "order": 1
+    }
+  ],
+  "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"
     }
   ],
-  "workspaces": [
+  "workspaces2": [
     {
       "name": "manage-user-workspace",
       "component": "manageUserWorkspace",
-      "title": "Manage User Workspace",
-      "type": "other-form",
-      "canMaximize": true,
-      "width": "extra-wide"
+      "window": "esm-admin-extra-wide-workspace-window"
     },
     {
       "name": "user-role-scope-workspace",
       "component": "userRoleScopeWorkspace",
-      "title": "User Rple Scope Workspace",
-      "type": "other-form",
-       "canMaximize": true,
-      "width": "extra-wide"
+      "window": "esm-admin-workspace-window"
     },
     {
       "name": "add-location-workspace",
-      "title": "Add Location",
       "component": "addLocation",
-      "type": "workspace"
+      "window": "esm-admin-workspace-window"
     },
     {
       "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"
+      "window": "esm-admin-workspace-window"
     }
   ],
-  "modals": [
+  "workspaceWindows2": [
     {
-      "component": "operationConfirmationModal",
-      "name": "operation-confirmation-modal"
+      "name": "esm-admin-workspace-window",
+      "canMaximize": true,
+      "group": "esm-admin-workspace-group"
     },
     {
-      "component": "hwrConfirmationModal",
-      "name": "hwr-confirmation-modal"
-    },
+      "name": "esm-admin-extra-wide-workspace-window",
+      "canMaximize": true,
+      "group": "esm-admin-workspace-group",
+      "width": "extra-wide"
+    }
+  ],
+  "workspaceGroups2": [
     {
-      "component": "hwrEmptyModal",
-      "name": "hwr-empty-modal"
-    },
-     {
-      "component": "hwrSyncModal",
-      "name": "hwr-syncing-modal"
+      "name": "esm-admin-workspace-group",
+      "scopePattern": "/admin",
+      "closeable": true
     }
   ],
   "pages": [
@@ -102,4 +102,4 @@
       "route": "admin"
     }
   ]
-}
+}

package/src/types/index.ts

@@ -27,8 +27,36 @@ export interface SHAFacility {
   shaFacilityLicenseNumber: string;
   facilityRegistryCode: string;
   source: string;
+  officialName: string;
+  facilityType: string;
+  facilityOwnership: string;
+  fidCode: string;
+  isHub: string;
+  facilityLicenseStatus: string;
+  facilityLicenseStartDate: string;
+  regulatoryBody: string;
+  shaContractStatus: string;
+  shaContractStartDate: string;
+  shaContractEndDate: string;
+  facilityPhoneNumber: string;
+  facilityEmail: string;
+  facilityAdministratorName: string;
+  facilityAdministratorPhone: string;
+  facilityAdministratorEmail: string;
+  county: string;
+  subCounty: string;
+  town: string;
+  physicalLocation: string;
+  postalAddress: string;
+  latitude: string;
+  longitude: string;
+  totalBeds: string;
+  normalBeds: string;
+  icuBeds: string;
+  hduBeds: string;
+  dialysisBeds: string;
+  shaContractedServices: string;
 }
-
 export interface DefaultFacility {
   locationId: number;
   uuid: string;

package/translations/am.json

@@ -13,7 +13,9 @@
   "chooseAStockRole": "የክምችት ሚና ይምረጡ",
   "completionStatus": "የማጠናቀቂያ ሁኔታ",
   "confirmation": "ማረጋገጫ",
+  "contactAndAdministrator": "Contact & administrator",
   "continue": "ወደ ምዝገባ ይቀጥሉ",
+  "county": "County",
   "delete": "ሰርዝ",
   "deletingstockUserScope": "የክምችት ተጠቃሚ ስፋትን ሰርዝ",
   "description": "መግለጫ",
@@ -30,38 +32,49 @@
   "Expired Licensed": "ያለፈበት ፈቃድ ያለው",
   "expiresIn3Months": "በ3 ወራት ውስጥ ያልቃል",
   "expiresSoon": "በቅርቡ ያልቃል",
-  "facilityCode": "የተቋሙ KMHFR ኮድ",
   "facilityDetails": "የተቋሙ ዝርዝሮች",
+  "facilityEmail": "Email",
   "facilityInfo": "የተቋሙ መረጃ",
-  "facilityInformation": "የተቋሙ መረጃ",
   "facilityName": "የተቋሙ ስም",
+  "facilityOwnership": "Ownership",
+  "facilityPhone": "Phone",
   "facilityRegistryCode": "የተቋሙ መመዝገቢያ ኮድ",
+  "facilityType": "Facility type",
+  "fidCode": "FID code",
   "filter": "አጣራ",
   "filterBy": "በዚህ አጣራ:",
   "generalInformation": "አጠቃላይ መረጃ",
   "HealthworkerNotFound": "የጤና ሰራተኛ መዝገቦች በጤና ሰራተኛ መመዝገቢያ ውስጥ ሊገኙ አልቻሉም፣ አካውንት መፍጠር መቀጠል ይፈልጋሉ",
   "healthWorkerRegistryEmpty": "አካውንት ይፍጠሩ",
+  "hieSyncFailed": "HIE sync failed. Pulling local info.",
   "hieSynchronizationError": "ከHIE ጋር ሲመሳሰል ስህተት ተፈጥሯል",
   "home": "መነሻ",
+  "hubFacility": "Hub facility",
   "identifierProvider": "መለያ:",
   "kephLevel": "የ Keph ደረጃ",
+  "licenseAndShaStatus": "License & SHA status",
   "Licensed expiring soon": "በቅርቡ የሚያልፍ ፈቃድ ያለው",
   "licenseExpired": "ፈቃድ ጊዜው አልፏል",
   "licenseExpiringSoon": "ፈቃድ በቅርቡ ያልቃል",
+  "licenseExpiry": "License expiry",
   "licenseExpiryDate": "የፈቃድ ማብቂያ ቀን",
   "licenseNumber": "የፈቃድ ቁጥር",
   "licenseProvider": "ፈቃድ:",
+  "licenseStart": "License start",
+  "licenseStatus": "License status",
   "loading": "",
   "loadingState": "",
   "location": "ቦታ(ዎች)",
   "locationName": "የቦታ ስም",
   "locations": "ቦታዎች",
   "manageUserRoleScope": "የተጠቃሚ ሚና ስፋትን አስተዳድር",
+  "mflCode": "MFL code",
   "nameProvider": "ስም:",
   "names": "ስሞች",
   "nationalId": "ብሔራዊ መታወቂያ",
   "nextPage": "ቀጣይ ገጽ",
   "no": "አይ",
+  "noContractedServices": "No contracted services on record for this facility.",
   "noData": "የሚታይ መረጃ የለም",
   "noDescriptionAvailable": "ምንም መግለጫ አይገኝም",
   "noHwrApi": "የጤና እንክብካቤ ሰራተኛ መመዝገቢያ API መረጃዎች አልተዋቀሩም፣ እባክዎ የስርዓት አስተዳዳሪን ያግኙ። አካውንት መፍጠር መቀጠል ይፈልጋሉ",
@@ -71,6 +84,7 @@
   "noSearchResults": "",
   "noUserRoleScope": "ምንም የተጠቃሚ ሚና ስፋት የለም",
   "noUsersAvailable": "ምንም ተጠቃሚዎች አይገኙም",
+  "operationalStatus": "Operational status",
   "operationError": "{{operationName}} አልተሳካም",
   "operationErrorSubtitle": "በክንውኑ ጊዜ ስህተት ተፈጥሯል።",
   "operationsConfirmationMessages": "{{operationTypeOrName}} ይፈልጋሉ?",
@@ -79,6 +93,8 @@
   "passportNumber": "ፓስፖርት ቁጥር",
   "permanent": "ቋሚ?",
   "phoneNumber": "ስልክ ቁጥር",
+  "physicalLocation": "Physical location",
+  "postalAddress": "Postal address",
   "previousPage": "የቀድሞ ገጽ",
   "procedure": "ሥነ-ሥርዓት",
   "providerBanner": "የአቅራቢ ባነር",
@@ -92,6 +108,7 @@
   "refreshingUserScopes": "የተጠቃሚ ስፋቶችን በማደስ ላይ...",
   "refreshTables": "ሰንጠረዦችን አድስ",
   "registrationNumber": "የምዝገባ ቁጥር",
+  "regulatoryBody": "Regulatory body",
   "remove": "አስወግድ",
   "ResourceNotFound": "የጤና ሰራተኛ መመዝገቢያ ሊደረስበት አልቻለም፣ እባክዎ የበይነመረብ ግንኙነትዎን ያረጋግጡ እና እንደገና ይሞክሩ። አካውንት መፍጠር መቀጠል ይፈልጋሉ",
   "role": "ሚና",
@@ -99,24 +116,25 @@
   "searchForUsers": "ተጠቃሚ ፈልግ",
   "searchNoResults": "ምንም ተዛማጅ ውጤቶች አልተገኙም",
   "searchNoResultsHelper": "የተለየ ቃል ለመፈለግ ይሞክሩ",
-  "shaContracted": "SHA ተዋውሏል",
-  "shaContractExpiry": "የ SHA ውል ማብቂያ ቀን",
-  "shalicenceNumber": "የ SHA ፈቃድ ቁጥር",
-  "shaStatus": "የ SHA ሁኔታ",
+  "shaContractedServices": "SHA contracted services",
+  "shaContractStatus": "SHA contract",
   "startTime": "የመጀመሪያ ሰዓት",
   "stockLocation": "የክምችት ቦታ",
   "stockOperation": "የክምችት ክንውን",
   "stockRole": "የክምችት ሚና",
   "stockRoleAccess": "የክምችት ሚና መዳረሻ",
   "stockUserScopeDeletedSuccessfully": "የክምችት ተጠቃሚ ስፋት በተሳካ ሁኔታ ተሰርዟል",
+  "subCounty": "Sub-county",
   "sync": "አመሳክር",
-  "synchronizeWithHie": "ከ HIE ጋር አመሳክር",
-  "synchronizingFacilityData": "እባክዎ ይጠብቁ፣ መረጃ በመመሳሰል ላይ ነው።",
+  "synchronizing": "Synchronizing...",
   "syncingHieError": "ከHIE ጋር ማመሳሰል አልተሳካም",
   "syncingHieSuccess": "ማመሳሰል ተጠናቋል",
+  "syncWithHie": "Sync with HIE",
   "systemId": "የስርዓት መታወቂያ",
   "tagLocation": "ቦታን ምልክት አድርግ",
   "tags": "መለያዎች",
+  "totalBeds": "Total beds",
+  "town": "Town",
   "tryDifferentSearch": "የተለየ የፍለጋ ቃል ይሞክሩ",
   "unknownError": "የጤና ሰራተኛ መመዝገቢያን በሚፈልጉበት ጊዜ ያልታወቀ ስህተት ተከስቷል፣ እባክዎ የስርዓት አስተዳዳሪን ያግኙ። አካውንት መፍጠር መቀጠል ይፈልጋሉ",
   "unlicensed": "ፈቃድ የሌለው",