@kenyaemr/esm-admin-app 5.4.4-pre.26 → 5.4.4-pre.265

package/src/components/users/userManagementFormSchema.tsx

@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { optional, z } from 'zod';
+import { z } from 'zod';
 
 const UserManagementFormSchema = (existingUsernames: Array<string>, isEdit?: boolean) => {
   const { t } = useTranslation();
@@ -13,9 +13,10 @@ const UserManagementFormSchema = (existingUsernames: Array<string>, isEdit?: boo
         message: t('genderRequired', 'Gender is required'),
       }),
     }),
+
     phoneNumber: z.string().optional(),
     email: z.string().optional(),
-    providerIdentifiers: z.boolean().optional(),
+
     username: z
       .string()
       .nonempty(t('usernameRequired', 'Username is required'))
@@ -25,25 +26,33 @@ const UserManagementFormSchema = (existingUsernames: Array<string>, isEdit?: boo
     password: z.string().optional(),
     confirmPassword: z.string().optional(),
     forcePasswordChange: z.boolean().optional(),
+
     roles: z
       .array(
         z.object({
-          uuid: z.string().min(1, 'UUI is required'),
+          uuid: z.string().min(1, 'UUID is required'),
           display: z.string().min(1, 'Role name is required'),
           description: z.string().nullable().optional(),
         }),
       )
       .optional(),
     primaryRole: z.string().optional(),
+
+    providerIdentifiers: z.boolean().optional(),
+    isEditProvider: z.boolean().optional(),
     systemId: z.string().optional(),
-    providerLicense: z.string().optional(),
-    licenseExpiryDate: z.date().optional(),
-    registrationNumber: z.string().optional(),
-    qualification: z.string().optional(),
+
     nationalId: z.string().optional(),
     passportNumber: z.string().optional(),
-    isEditProvider: z.boolean().optional(),
+
     providerUniqueIdentifier: z.string().optional(),
+    providerLicense: z.string().optional(),
+    licenseExpiryDate: z.date().optional(),
+    licenseBody: z.string().optional(),
+    qualification: z.string().optional(),
+    specialty: z.string().optional(),
+    providerCadre: z.string().optional(),
+    practiceType: z.string().optional(),
   });
 
   return { userManagementFormSchema };

package/src/config-schema.ts

@@ -4,7 +4,7 @@ import dayjs from 'dayjs';
 export const configSchema = {
   providerNationalIdUuid: {
     _type: Type.String,
-    _description: 'UUID for provider national id',
+    _description: 'UUID for provider national ID',
     _default: '3d152c97-2293-4a2b-802e-e0f1009b7b15',
   },
   passportNumberUuid: {
@@ -12,21 +12,17 @@ export const configSchema = {
     _description: 'UUID for passport number identification for provider',
     _default: '5b4b88e8-9db3-41e6-a175-5e39f2c8a9a5',
   },
-  providerHieFhirReference: {
-    _type: Type.String,
-    _description: 'UUID for provider hie fhir reference',
-    _default: '67b94e8e-4d61-4810-b0f1-d86497f6e553',
-  },
-  qualificationUuid: {
+  providerUniqueIdentifierAttributeTypeUuid: {
     _type: Type.String,
-    _description: 'UUID for provider hie qualification',
-    _default: '43f99413-6e7f-4812-bc60-066bb1d43f94',
+    _description: 'UUID for cross-regulator provider unique identifier (PUID)',
+    _default: 'dace9d99-9f29-4653-9eae-c05929f34a32',
   },
-  licenseBodyUuid: {
+  externalProviderIdentifierUuid: {
     _type: Type.String,
-    _description: 'UUID for license body',
-    _default: 'ba18bb97-d17c-4640-80d2-58e7df90ca4c',
+    _description: 'UUID for external provider identifier (regulator-public reference)',
+    _default: 'bbdf67e8-c020-40ff-8ad6-74ba34893882',
   },
+
   licenseNumberUuid: {
     _type: Type.String,
     _description: 'UUID for license number',
@@ -37,6 +33,31 @@ export const configSchema = {
     _description: 'UUID for license expiry date',
     _default: '00539959-a1c7-4848-a5ed-8941e9d5e835',
   },
+  licenseBodyUuid: {
+    _type: Type.String,
+    _description: 'UUID for licensing body (e.g. KMPDC, NCK, PPB, COC)',
+    _default: 'ba18bb97-d17c-4640-80d2-58e7df90ca4c',
+  },
+  qualificationUuid: {
+    _type: Type.String,
+    _description: 'UUID for provider educational qualification',
+    _default: '43f99413-6e7f-4812-bc60-066bb1d43f94',
+  },
+  specialtyUuid: {
+    _type: Type.String,
+    _description: 'UUID for provider clinical specialty',
+    _default: '7f5d8e2c-3a1b-4d6e-9c0f-2b4a1d5e8c91',
+  },
+  providerCadreUuid: {
+    _type: Type.String,
+    _description: 'UUID for provider professional cadre',
+    _default: '8a6e9f3d-4b2c-5e7f-ad10-3c5b2e6f9da2',
+  },
+  practiceTypeUuid: {
+    _type: Type.String,
+    _description: 'UUID for provider practice type (clinical, non-clinical, etc.)',
+    _default: '9b7faa4e-5c3d-6f80-be21-4d6c3f70aeb3',
+  },
   phoneNumberUuid: {
     _type: Type.String,
     _description: 'UUID for provider phone number',
@@ -44,9 +65,14 @@ export const configSchema = {
   },
   providerAddressUuid: {
     _type: Type.String,
-    _description: 'UUID for provider address',
+    _description: 'UUID for provider postal address',
     _default: '033ff604-ecf7-464f-b623-5b77c733667f',
   },
+  providerHieFhirReference: {
+    _type: Type.String,
+    _description: 'UUID for provider HIE FHIR reference',
+    _default: '67b94e8e-4d61-4810-b0f1-d86497f6e553',
+  },
   personEmailAttributeUuid: {
     _type: Type.String,
     _description: 'UUID for person email attribute',
@@ -57,48 +83,6 @@ export const configSchema = {
     _description: 'UUID for person phone number attribute',
     _default: 'b2c38640-2603-4629-aebd-3b54f33f1e3a',
   },
-  providerUniqueIdentifierAttributeTypeUuid: {
-    _type: Type.String,
-    _description: 'UUID for provider unique identifier attribute type',
-    _default: 'dace9d99-9f29-4653-9eae-c05929f34a32',
-  },
-  identifierTypes: {
-    _type: Type.Array,
-    _elements: {
-      _type: Type.Object,
-      properties: {
-        key: { _type: Type.String },
-        name: { _type: Type.String },
-      },
-    },
-    _default: [
-      { key: 'National ID', name: 'National ID' },
-      { key: 'registration_number', name: 'Registration Number' },
-      { key: 'Passport', name: 'Passport Number' },
-    ],
-    _description: 'List of identifier types with unique keys for each.',
-  },
-  regulatorOptions: {
-    _type: Type.Array,
-    _elements: {
-      _type: Type.Object,
-      properties: {
-        key: { _type: Type.String },
-        name: { _type: Type.String },
-      },
-    },
-    _default: [
-      { key: 'Clinical Officers Council', name: 'Clinical Officers Council' },
-      { key: 'Pharmacy and Poisons Board', name: 'Pharmacy and Poisons Board' },
-      { key: 'Nursing Council', name: 'Nursing Council' },
-      { key: 'KMPDC', name: 'Kenya Medical Practitioners and Dentists Council (KMPDC)' },
-      {
-        key: 'Kenya Medical Laboratory Technicians & Technologists Board',
-        name: 'Kenya Medical Laboratory Technicians & Technologists Board',
-      },
-    ],
-    _description: 'List of regulator options with unique keys for each.',
-  },
 };
 
 export interface UserProperties {
@@ -109,22 +93,18 @@ export interface UserProperties {
 export interface ConfigObject {
   providerNationalIdUuid: string;
   passportNumberUuid: string;
-  providerHieFhirReference: string;
   providerUniqueIdentifierAttributeTypeUuid: string;
+  externalProviderIdentifierUuid: string;
+  licenseNumberUuid: string;
+  licenseExpiryDateUuid: string;
+  licenseBodyUuid: string;
+  qualificationUuid: string;
+  specialtyUuid: string;
+  providerCadreUuid: string;
+  practiceTypeUuid: string;
   phoneNumberUuid: string;
   providerAddressUuid: string;
-  qualificationUuid: string;
-  licenseBodyUuid: string;
-  licenseNumberUuid: string;
+  providerHieFhirReference: string;
   personEmailAttributeUuid: string;
   personPhonenumberAttributeUuid: string;
-  licenseExpiryDateUuid: string;
-  identifierTypes: Array<{
-    key: string;
-    name: string;
-  }>;
-  regulatorOptions: Array<{
-    key: string;
-    name: string;
-  }>;
 }

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;