@kenyaemr/esm-admin-app 5.4.2-pre.2375 → 5.4.2-pre.2378

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.2375"}
+{"$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.2378"}

package/package.json

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

package/src/components/hook/searchHealthCareWork.ts

@@ -3,8 +3,8 @@ import { HWR_API_NO_CREDENTIALS, PROVIDER_NOT_FOUND, RESOURCE_NOT_FOUND, UNKNOWN
 import useSWR from 'swr';
 import { useState } from 'react';
 
-export const searchHealthCareWork = async (identifierType: string, identifierNumber: string) => {
-  const url = `${restBaseUrl}/kenyaemr/practitionersearch?identifierType=${identifierType}&identifierNumber=${identifierNumber}`;
+export const searchHealthCareWork = async (identifierType: string, identifierNumber: string, regulator: string) => {
+  const url = `${restBaseUrl}/kenyaemr/practitionersearch?identifierType=${identifierType}&identifierNumber=${identifierNumber}&regulator=${regulator}`;
   const response = await fetch(makeUrl(url));
   if (response.ok) {
     const responseData = await response.json();

package/src/components/modal/hwr-sync.modal.tsx

@@ -31,6 +31,7 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
     providerAddressUuid,
     providerHieFhirReference,
     providerUniqueIdentifierAttributeTypeUuid,
+    regulatorOptions,
   } = config;
 
   const attributeMapping = {
@@ -45,6 +46,7 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
   const [searchHWR, setSearchHWR] = useState({
     identifierType: identifierTypes[0]?.key,
     identifier: attributeMapping[identifierTypes[0]?.key],
+    regulator: regulatorOptions[0]?.key,
   });
 
   const handleIdentifierTypeChange = (selectedItem: { key: string; name: string } | null) => {
@@ -56,16 +58,25 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
     }));
   };
 
+  const handleRegulatorChange = (selectedItem: { key: string; name: string } | null) => {
+    const selectedKey = selectedItem?.key ?? '';
+    setSearchHWR((prev) => ({
+      ...prev,
+      regulator: selectedKey,
+    }));
+  };
+
   const isSearchDisabled = () => !searchHWR.identifier;
 
   const handleSync = async () => {
     try {
       setSyncLoading(true);
-
       const healthWorker: PractitionerResponse = await searchHealthCareWork(
         searchHWR.identifierType,
         searchHWR.identifier,
+        searchHWR.regulator,
       );
+
       const resource = healthWorker.entry[0]?.resource;
 
       const extractedAttributes = {
@@ -99,7 +110,17 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
         { attributeType: licenseExpiryDateUuid, value: parseDate(extractedAttributes.licenseDate) },
         { attributeType: phoneNumberUuid, value: extractedAttributes.phoneNumber },
         { attributeType: qualificationUuid, value: extractedAttributes.qualification },
-        { attributeType: providerHieFhirReference, value: JSON.stringify(healthWorker) },
+        {
+          attributeType: providerHieFhirReference,
+          // Include regulator info in the health worker reference
+          value: JSON.stringify({
+            ...healthWorker,
+            searchParameters: {
+              regulator: searchHWR.regulator,
+              identifierType: searchHWR.identifierType,
+            },
+          }),
+        },
         { attributeType: providerAddressUuid, value: extractedAttributes.email },
         { attributeType: providerNationalIdUuid, value: extractedAttributes.nationalId },
         {
@@ -165,6 +186,18 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
               className={styles.ComboBox}
             />
           </Column>
+          <Column className={styles.identifierTypeColumn}>
+            <ComboBox
+              onChange={({ selectedItem }) => handleRegulatorChange(selectedItem)}
+              id="regulatorOptions"
+              titleText={t('regulator', 'Regulator')}
+              placeholder={t('chooseRegulator', 'Choose regulator')}
+              initialSelectedItem={regulatorOptions.find((item) => item.key === searchHWR.regulator)}
+              items={regulatorOptions}
+              itemToString={(item) => (item ? item.name : '')}
+              className={styles.ComboBox}
+            />
+          </Column>
           <Column className={styles.identifierTypeColumn}>
             <span className={styles.identifierTypeHeader}>{t('identifierNumber', 'Identifier number*')}</span>
             <Search

package/src/components/users/manage-users/user-management.workspace.tsx

@@ -85,6 +85,7 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
   const { rolesConfig, error } = useSystemUserRoleConfigSetting();
   const {
     identifierTypes,
+    regulatorOptions,
     licenseBodyUuid,
     passportNumberUuid,
     personEmailAttributeUuid,
@@ -100,10 +101,12 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
   } = useConfig<ConfigObject>();
   const [searchHWR, setSearchHWR] = useState({
     identifierType: identifierTypes[0]?.key ?? '',
+    regulator: regulatorOptions[0]?.key ?? '',
     identifier: '',
     isHWRLoading: false,
   });
   const defaultIdentifierType = identifierTypes.find((item) => item.key === searchHWR.identifierType);
+  const defaultRegulator = regulatorOptions.find((item) => item.key === searchHWR.regulator);
 
   const attributeTypeMapping = useMemo(() => {
     return {
@@ -259,6 +262,7 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
       const fetchedHealthWorker: PractitionerResponse = await searchHealthCareWork(
         searchHWR.identifierType,
         searchHWR.identifier,
+        searchHWR.regulator,
       );
       if (!fetchedHealthWorker?.entry || fetchedHealthWorker.entry.length === 0) {
         showModal('hwr-empty-modal', { errorCode: t('noResults', 'No results found') });
@@ -616,6 +620,19 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
                                   itemToString={(item) => (item ? item.name : '')}
                                 />
                               </Column>
+                              <Column>
+                                <ComboBox
+                                  onChange={({ selectedItem }) => {
+                                    setSearchHWR({ ...searchHWR, regulator: selectedItem?.key ?? '' });
+                                  }}
+                                  id="formRegulatorOptions"
+                                  titleText={t('regulator', 'Regulator')}
+                                  placeholder={t('chooseRegulatorType', 'Choose regulator option')}
+                                  initialSelectedItem={defaultRegulator}
+                                  items={regulatorOptions}
+                                  itemToString={(item) => (item ? item.name : '')}
+                                />
+                              </Column>
                               <Column>
                                 <span className={styles.formIdentifierType}>
                                   {t('identifierNumber', 'Identifier number*')}
@@ -635,6 +652,13 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
                                     kind="secondary"
                                     size="md"
                                     renderIcon={Query}
+                                    disabled={
+                                      !searchHWR.identifier ||
+                                      searchHWR.isHWRLoading ||
+                                      !searchHWR.identifierType ||
+                                      !searchHWR.regulator
+                                    }
+                                    iconDescription={t('search', 'Search')}
                                     hasIconOnly
                                     className={styles.formSearchButton}
                                     onClick={handleSearch}

package/src/config-schema.ts

@@ -78,6 +78,27 @@ export const configSchema = {
     ],
     _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 {
@@ -102,4 +123,8 @@ export interface ConfigObject {
     key: string;
     name: string;
   }>;
+  regulatorOptions: Array<{
+    key: string;
+    name: string;
+  }>;
 }