@kenyaemr/esm-admin-app 5.4.2-pre.2641 → 5.4.2-pre.2656

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.2641"}
+{"$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.2656"}

package/package.json

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

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

@@ -3,7 +3,7 @@ import { ExtensionSlot } from '@openmrs/esm-framework';
 import capitalize from 'lodash-es/capitalize';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { type PractitionerResponse } from '../../types';
+import { CustomHIEPractitionerResponse, type PractitionerResponse } from '../../types';
 import styles from './hwr-confirmation.modal.scss';
 import { formatDateTime } from '../../utils/utils';
 
@@ -24,26 +24,19 @@ const HealthWorkerInfo: React.FC<HealthWorkerInfoProps> = ({ label, value }) =>
 interface HWRConfirmModalProps {
   onConfirm: () => void;
   close: () => void;
-  healthWorker: PractitionerResponse;
+  healthWorker: CustomHIEPractitionerResponse;
 }
 
 const HWRConfirmModal: React.FC<HWRConfirmModalProps> = ({ close, onConfirm, healthWorker }) => {
   const { t } = useTranslation();
-  const passportNumber = healthWorker?.link
-    ?.find(
-      (link: { relation: string; url: string }) =>
-        link.relation === 'self' && link.url.includes('identifierType=Passport'),
-    )
-    ?.url.split('identifierNumber=')[1]
-    ?.split('&')[0];
 
-  const practitioner = healthWorker?.entry?.[0]?.resource;
+  const { membership, licenses, contacts, identifiers, professional_details } = healthWorker?.message || {};
 
-  const licenseRenewalDate = practitioner?.identifier?.find((id) =>
-    id.type?.coding?.some((code) => code.code === 'license-number'),
-  )?.period?.end;
+  const mostRecentLicense = licenses
+    ?.filter((l) => l.license_end)
+    .sort((a, b) => new Date(b.license_end).getTime() - new Date(a.license_end).getTime())[0];
 
-  const isLicenseValid = licenseRenewalDate ? new Date(licenseRenewalDate) > new Date() : false;
+  const isLicenseValid = mostRecentLicense?.license_end ? new Date(mostRecentLicense.license_end) > new Date() : false;
 
   return (
     <>
@@ -62,57 +55,83 @@ const HWRConfirmModal: React.FC<HWRConfirmModalProps> = ({ close, onConfirm, hea
             className={styles.healthWorkerPhoto}
             name="patient-photo-slot"
             state={{
-              patientName: practitioner?.name?.[0]?.text || '',
+              patientName: membership?.full_name || '',
             }}
           />
           <div style={{ width: '100%', marginLeft: '0.625rem' }}>
             <HealthWorkerInfo
               label={t('healthWorkerName', 'Health worker name')}
-              value={practitioner?.name?.[0]?.text}
+              value={membership?.full_name || '--'}
             />
+
             <HealthWorkerInfo
               label={t('providerUniqueIdentifier', 'Provider unique identifier')}
-              value={practitioner?.id}
+              value={membership?.id || '--'}
             />
-            {practitioner?.telecom?.map((telecom, index) => (
-              <HealthWorkerInfo key={index} label={capitalize(telecom?.system)} value={telecom?.value || '--'} />
-            ))}
-
-            {practitioner?.identifier?.map((identifier, index) => (
-              <HealthWorkerInfo
-                key={index}
-                label={identifier.type?.coding?.map((code) => code.display).join(' ') || '--'}
-                value={identifier.value || '--'}
-              />
-            ))}
-
-            {passportNumber && (
-              <HealthWorkerInfo label={t('passportNumber', 'Passport Number')} value={passportNumber} />
-            )}
 
             <HealthWorkerInfo
-              label={t('renewalDate', 'Renewal Date')}
-              value={formatDateTime(licenseRenewalDate) || '--'}
+              label={t('registrationId', 'Registration ID')}
+              value={membership?.registration_id || '--'}
             />
 
             <HealthWorkerInfo
-              label={t('licensingBody', 'Licensing Body')}
-              value={
-                practitioner?.qualification?.[0]?.extension?.find(
-                  (ext) => ext.url === 'https://hwr-kenyahie/StructureDefinition/licensing-body',
-                )?.valueCodeableConcept?.coding?.[0]?.display || '--'
-              }
+              label={t('externalReferenceId', 'External Reference ID')}
+              value={membership?.external_reference_id || '--'}
             />
+
+            <HealthWorkerInfo label={t('gender', 'Gender')} value={membership?.gender || '--'} />
+
+            <HealthWorkerInfo label={t('status', 'Status')} value={membership?.status || '--'} />
+
+            {contacts?.phone && <HealthWorkerInfo label={t('phone', 'Phone')} value={contacts.phone} />}
+
+            {contacts?.email && <HealthWorkerInfo label={t('email', 'Email')} value={contacts.email} />}
+
+            {identifiers?.identification_number && (
+              <HealthWorkerInfo
+                label={identifiers.identification_type || t('identificationNumber', 'Identification Number')}
+                value={identifiers.identification_number}
+              />
+            )}
+
+            <HealthWorkerInfo label={t('licensingBody', 'Licensing Body')} value={membership?.licensing_body || '--'} />
+
             <HealthWorkerInfo
-              label={t('qualification', 'Qualification')}
-              value={
-                practitioner?.qualification?.[0]?.code?.coding?.[0]?.display ||
-                practitioner?.extension?.find((ext) => ext.url === 'https://ts.kenya-hie.health/Codesystem/specialty')
-                  ?.valueCodeableConcept?.coding?.[0]?.display ||
-                '--'
-              }
+              label={t('specialty', 'Specialty')}
+              value={membership?.specialty || professional_details?.specialty || '--'}
             />
 
+            {professional_details?.professional_cadre && (
+              <HealthWorkerInfo
+                label={t('professionalCadre', 'Professional Cadre')}
+                value={professional_details.professional_cadre}
+              />
+            )}
+
+            {professional_details?.practice_type && (
+              <HealthWorkerInfo label={t('practiceType', 'Practice Type')} value={professional_details.practice_type} />
+            )}
+
+            {licenses && licenses.length > 0 && (
+              <>
+                <div style={{ marginTop: '1rem', marginBottom: '0.5rem' }}>
+                  <strong>{t('licenses', 'Licenses')}</strong>
+                </div>
+                {licenses.map((license, index) => (
+                  <div key={index} style={{ marginBottom: '0.5rem', paddingLeft: '1rem' }}>
+                    <HealthWorkerInfo
+                      label={`${license.license_type} ${t('license', 'License')}`}
+                      value={license.external_reference_id || '--'}
+                    />
+                    <HealthWorkerInfo
+                      label={t('validity', 'Validity')}
+                      value={`${formatDateTime(license.license_start)} - ${formatDateTime(license.license_end)}`}
+                    />
+                  </div>
+                ))}
+              </>
+            )}
+
             <HealthWorkerInfo
               label={t('licenseValid', 'License Validity')}
               value={

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

@@ -4,7 +4,7 @@ import { Button, Column, Search, ComboBox, InlineLoading } from '@carbon/react';
 import styles from './hwr-sync.modal.scss';
 import { useConfig, showSnackbar, formatDate, parseDate, showToast, restBaseUrl } from '@openmrs/esm-framework';
 import { mutate } from 'swr';
-import { type PractitionerResponse, type ProviderResponse } from '../../types';
+import { CustomHIEPractitionerResponse, type PractitionerResponse, type ProviderResponse } from '../../types';
 import { ConfigObject } from '../../config-schema';
 import { searchHealthCareWork } from '../hook/searchHealthCareWork';
 import { createProviderAttribute, updateProviderAttributes } from './hwr-sync.resource';
@@ -71,48 +71,44 @@ const HWRSyncModal: React.FC<HWRSyncModalProps> = ({ close, provider }) => {
   const handleSync = async () => {
     try {
       setSyncLoading(true);
-      const healthWorker: PractitionerResponse = await searchHealthCareWork(
+      const healthWorker: CustomHIEPractitionerResponse = await searchHealthCareWork(
         searchHWR.identifierType,
         searchHWR.identifier,
         searchHWR.regulator,
       );
 
-      const resource = healthWorker.entry[0]?.resource;
+      if (!healthWorker?.message) {
+        throw new Error(t('noResults', 'No results found'));
+      }
+
+      const { membership, licenses, contacts, identifiers } = healthWorker.message;
+
+      const mostRecentLicense = licenses
+        ?.filter((l) => l.license_end)
+        .sort((a, b) => new Date(b.license_end).getTime() - new Date(a.license_end).getTime())[0];
 
       const extractedAttributes = {
-        licenseNumber: resource?.identifier?.find((id) =>
-          id.type?.coding?.some((code) => code.code === 'license-number'),
-        )?.value,
-        regNumber: resource?.identifier?.find((id) =>
-          id.type?.coding?.some((code) => code.code === 'board-registration-number'),
-        )?.value,
-        licenseDate: formatDate(
-          new Date(
-            resource?.identifier?.find((id) =>
-              id.type?.coding?.some((code) => code.code === 'license-number'),
-            )?.period?.end,
-          ),
-        ),
-        phoneNumber: resource?.telecom?.find((contact) => contact.system === 'phone')?.value,
-        email: resource?.telecom?.find((contact) => contact.system === 'email')?.value,
-        qualification:
-          resource?.qualification?.[0]?.code?.coding?.[0]?.display ||
-          resource?.extension?.find((ext) => ext.url === 'https://ts.kenya-hie.health/Codesystem/specialty')
-            ?.valueCodeableConcept?.coding?.[0]?.display,
-        nationalId: resource?.identifier?.find((id) => id.type?.coding?.some((code) => code.code === 'national-id'))
-          ?.value,
-        providerUniqueIdentifier: resource?.id,
+        licenseNumber: membership.external_reference_id,
+        regNumber: membership.registration_id,
+        licenseDate: mostRecentLicense?.license_end ? formatDate(new Date(mostRecentLicense.license_end)) : null,
+        phoneNumber: contacts.phone,
+        email: contacts.email,
+        qualification: membership.specialty,
+        nationalId: identifiers.identification_number,
+        providerUniqueIdentifier: membership.id,
       };
 
       const updatableAttributes = [
         { attributeType: licenseNumberUuid, value: extractedAttributes.licenseNumber },
         { attributeType: licenseBodyUuid, value: extractedAttributes.regNumber },
-        { attributeType: licenseExpiryDateUuid, value: parseDate(extractedAttributes.licenseDate) },
+        {
+          attributeType: licenseExpiryDateUuid,
+          value: extractedAttributes.licenseDate ? parseDate(extractedAttributes.licenseDate) : null,
+        },
         { attributeType: phoneNumberUuid, value: extractedAttributes.phoneNumber },
         { attributeType: qualificationUuid, value: extractedAttributes.qualification },
         {
           attributeType: providerHieFhirReference,
-          // Include regulator info in the health worker reference
           value: JSON.stringify({
             ...healthWorker,
             searchParameters: {

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

@@ -46,7 +46,7 @@ import {
 import UserManagementFormSchema from '../userManagementFormSchema';
 import { ChevronLeft, Query, ChevronRight } from '@carbon/react/icons';
 import { useSystemUserRoleConfigSetting } from '../../hook/useSystemRoleSetting';
-import { type PractitionerResponse, Provider, User } from '../../../types';
+import { type CustomHIEPractitionerResponse, type PractitionerResponse, Provider, User } from '../../../types';
 import { searchHealthCareWork } from '../../hook/searchHealthCareWork';
 import { ROLE_CATEGORIES, SECTIONS, today } from '../../../constants';
 import { ConfigObject } from '../../../config-schema';
@@ -256,15 +256,45 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
     }
   }, [isDirty, promptBeforeClosing]);
 
+  const setPractitionerValues = (healthWorker: CustomHIEPractitionerResponse) => {
+    const { membership, licenses, contacts, identifiers } = healthWorker.message;
+
+    setValue('givenName', membership.first_name || '');
+    setValue('middleName', membership.middle_name || '');
+    setValue('familyName', membership.last_name || '');
+
+    setValue('nationalId', identifiers.identification_number || '');
+    setValue('providerLicense', membership.external_reference_id || '');
+    setValue('registrationNumber', membership.registration_id || '');
+    setValue('providerUniqueIdentifier', membership.id || '');
+
+    setValue('phoneNumber', contacts.phone || '');
+    setValue('email', contacts.email || '');
+
+    setValue('qualification', membership.specialty || '');
+
+    setValue('passportNumber', '');
+
+    const mostRecentLicense = licenses
+      .filter((l) => l.license_end)
+      .sort((a, b) => new Date(b.license_end).getTime() - new Date(a.license_end).getTime())[0];
+
+    setValue(
+      'licenseExpiryDate',
+      mostRecentLicense?.license_end ? parseDate(mostRecentLicense.license_end) : parseDate(t('unknown', 'Unknown')),
+    );
+  };
+
   const handleSearch = async () => {
     try {
       setSearchHWR({ ...searchHWR, isHWRLoading: true });
-      const fetchedHealthWorker: PractitionerResponse = await searchHealthCareWork(
+      const fetchedHealthWorker: CustomHIEPractitionerResponse = await searchHealthCareWork(
         searchHWR.identifierType,
         searchHWR.identifier,
         searchHWR.regulator,
       );
-      if (!fetchedHealthWorker?.entry || fetchedHealthWorker.entry.length === 0) {
+
+      if (!fetchedHealthWorker?.message) {
         showModal('hwr-empty-modal', { errorCode: t('noResults', 'No results found') });
         return;
       }
@@ -273,73 +303,7 @@ const ManageUserWorkspace: React.FC<ManageUserWorkspaceProps> = ({
         healthWorker: fetchedHealthWorker,
         onConfirm: () => {
           dispose();
-          const fullName = fetchedHealthWorker?.entry[0]?.resource?.name[0]?.text?.trim();
-
-          const nameParts = fullName.replace(/\s+/g, ' ').split(' ');
-
-          const hasTitle = nameParts[0].endsWith('.');
-          const nameWithoutTitle = hasTitle ? nameParts.slice(1) : nameParts;
-
-          const givenName = nameWithoutTitle[0] || '';
-          const familyName = nameWithoutTitle.length > 1 ? nameWithoutTitle[nameWithoutTitle.length - 1] : '';
-          const middleName = nameWithoutTitle.length > 2 ? nameWithoutTitle.slice(1, -1).join(' ') : '';
-          const healthWorkerPassPortNumber = fetchedHealthWorker?.link
-            ?.find(
-              (link: { relation: string; url: string }) =>
-                link.relation === 'self' && link.url.includes('identifierType=Passport'),
-            )
-            ?.url.split('identifierNumber=')[1]
-            ?.split('&')[0];
-
-          setValue('givenName', givenName);
-          setValue('middleName', middleName);
-          setValue('familyName', familyName);
-          setValue(
-            'nationalId',
-            fetchedHealthWorker?.entry[0]?.resource?.identifier?.find((id) =>
-              id.type?.coding?.some((code) => code.code === 'national-id'),
-            )?.value,
-          );
-          setValue(
-            'providerLicense',
-            fetchedHealthWorker?.entry[0]?.resource?.identifier?.find((id) =>
-              id.type?.coding?.some((code) => code.code === 'license-number'),
-            )?.value,
-          );
-          setValue(
-            'registrationNumber',
-            fetchedHealthWorker?.entry[0]?.resource?.identifier?.find((id) =>
-              id.type?.coding?.some((code) => code.code === 'board-registration-number'),
-            )?.value,
-          );
-          setValue(
-            'phoneNumber',
-            fetchedHealthWorker?.entry[0]?.resource?.telecom?.find((contact) => contact.system === 'phone')?.value ||
-              '',
-          );
-          setValue(
-            'qualification',
-            fetchedHealthWorker?.entry[0]?.resource?.qualification?.[0]?.code?.coding?.[0]?.display ||
-              fetchedHealthWorker?.entry[0]?.resource?.extension?.find(
-                (ext) => ext.url === 'https://ts.kenya-hie.health/Codesystem/specialty',
-              )?.valueCodeableConcept?.coding?.[0]?.display ||
-              '',
-          );
-          setValue(
-            'email',
-            fetchedHealthWorker?.entry[0]?.resource?.telecom?.find((contact) => contact.system === 'email')?.value ||
-              '',
-          );
-          setValue(
-            'licenseExpiryDate',
-            parseDate(
-              fetchedHealthWorker?.entry[0]?.resource?.identifier?.find((id) =>
-                id.type?.coding?.some((code) => code.code === 'license-number'),
-              )?.period?.end || t('unknown', 'Unknown'),
-            ),
-          );
-          setValue('passportNumber', healthWorkerPassPortNumber);
-          setValue('providerUniqueIdentifier', fetchedHealthWorker?.entry[0]?.resource?.id);
+          setPractitionerValues(fetchedHealthWorker);
           setHealthWorker(fetchedHealthWorker);
         },
       });

package/src/types/index.ts

@@ -333,3 +333,53 @@ export interface UserResponse {
     description: string;
   }>;
 }
+
+export interface CustomHIEPractitionerResponse {
+  message: {
+    membership: {
+      id: string;
+      status: string;
+      salutation: string;
+      full_name: string;
+      gender: string;
+      first_name: string;
+      middle_name: string;
+      last_name: string;
+      registration_id: string;
+      external_reference_id: string;
+      licensing_body: string;
+      specialty: string;
+      is_active: number;
+      is_withdrawn: number;
+      withdrawal_reason: string;
+      withdrawal_date: string;
+    };
+    licenses: Array<{
+      id: string;
+      external_reference_id: string;
+      license_type: string;
+      license_start: string;
+      license_end: string;
+    }>;
+    professional_details: {
+      professional_cadre: string;
+      practice_type: string;
+      specialty: string;
+      subspecialty: string;
+      discipline_name: string;
+      educational_qualifications: string;
+    };
+    contacts: {
+      phone: string;
+      email: string;
+      postal_address: string;
+    };
+    identifiers: {
+      identification_type: string;
+      identification_number: string;
+      client_registry_id: string;
+      student_id: string;
+    };
+  };
+  fhirFormat: boolean;
+}