@kenyaemr/esm-shr-app 5.4.4-pre.43 → 5.4.4-pre.430

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-shr-app",
-  "version": "5.4.4-pre.43",
+  "version": "5.4.4-pre.430",
   "description": "Patient care panels microfrontend for the OpenMRS SPA",
   "keywords": [
     "openmrs"
@@ -39,7 +39,7 @@
   },
   "peerDependencies": {
     "@carbon/react": "1.x",
-    "@openmrs/esm-framework": "8.x",
+    "@openmrs/esm-framework": "9.x",
     "react": "^18.1.0",
     "react-i18next": "11.x",
     "react-router-dom": "6.x"

package/src/config-schema.ts

@@ -6,6 +6,11 @@ export const configSchema = {
     _description: 'The national patient unique identifier',
     _default: 'f85081e2-b4be-4e48-b3a4-7994b69bb101',
   },
+  nationalIdIdentifierType: {
+    _type: Type.UUID,
+    _description: 'The national patient unique identifier',
+    _default: '49af6cdc-7968-4abb-bf46-de10d7f4859f',
+  },
   phoneNumberAttributeType: {
     _type: Type.UUID,
     _description: 'The patient phone number attribute type uuid',
@@ -16,16 +21,11 @@ export const configSchema = {
     _description: 'Social Health Authority Unique Identification Number',
     _default: '24aedd37-b5be-4e08-8311-3721b8d5100d',
   },
-  artDirectoryUrl: {
-    _type: Type.String,
-    _description: 'URL for the ART Directory',
-    _default: 'https://art.kenyahmis.org/api/patients',
-  },
 };
 
 export type ReferralConfigObject = {
   nationalPatientUniqueIdentifier: string;
+  nationalIdIdentifierType: string;
   phoneNumberAttributeType: string;
   socialHealthAuthorityIdentifierType: string;
-  artDirectoryUrl: string;
 };

package/src/hooks/usePatient.ts

@@ -1,6 +1,7 @@
 import { type FetchResponse, openmrsFetch, type Patient, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import useSWR from 'swr';
 import { ReferralConfigObject } from '../config-schema';
+import { useMemo } from 'react';
 
 function extractValue(display: string) {
   const pattern = /=\s*(.*)$/;
@@ -15,20 +16,33 @@ const usePatient = (uuid: string) => {
   const customPresentation =
     'custom:(uuid,display,identifiers,person:(uuid,display,attributes:(uuid,display,attributeType:(uuid,display))))';
   const url = `${restBaseUrl}/patient/${uuid}?v=${customPresentation}`;
-  const { phoneNumberAttributeType } = useConfig<ReferralConfigObject>();
+  const { phoneNumberAttributeType, nationalIdIdentifierType } = useConfig<ReferralConfigObject>();
   const { data, error, isLoading } = useSWR<FetchResponse<Patient>>(url, openmrsFetch);
+  const nationalId = useMemo(
+    () =>
+      data?.data?.identifiers
+        ?.find((id) => id.identifierType?.uuid === nationalIdIdentifierType)
+        ?.display?.split('=')?.[1]
+        ?.trim(),
+    [data, nationalIdIdentifierType],
+  );
+  const patientPhoneNumber = useMemo(() => {
+    const phone = data?.data?.person?.attributes?.find(
+      (attr) => attr.attributeType?.uuid === phoneNumberAttributeType,
+    )?.display;
+    if (phone) {
+      return extractValue(phone);
+    }
+    return undefined;
+  }, [data?.data?.person?.attributes, phoneNumberAttributeType]);
+
   return {
     isLoading,
     error,
     patient: data?.data,
-    patientName: data?.data?.person.display,
-    patientPhoneNumber: data?.data?.person?.attributes?.find(
-      (attr) => attr.attributeType.uuid === phoneNumberAttributeType,
-    )?.display
-      ? extractValue(
-          data?.data?.person?.attributes?.find((attr) => attr.attributeType.uuid === phoneNumberAttributeType)?.display,
-        )
-      : undefined,
+    patientName: data?.data?.person?.display,
+    patientPhoneNumber,
+    nationalId,
   };
 };
 

package/src/hooks/useSHRSummary.ts

@@ -1,11 +1,9 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
 import useSWR from 'swr';
 import { SHRSummary } from '../types/index';
-import { useState } from 'react';
-import { deepMerge } from '../utils/function';
 
 export const useSHRSummary = (patientUuid: string) => {
-  const shrSummaryUrl = `/ws/rest/v1/kenyaemril/shrPatientSummary?patientUuid=${patientUuid}`;
+  const shrSummaryUrl = `/ws/rest/v1/kenyaemril/hie-patient-history?patientUuid=${patientUuid}`;
   const { data, mutate, error, isLoading } = useSWR<{ data: SHRSummary }>(shrSummaryUrl, openmrsFetch);
 
   return {

package/src/index.ts

@@ -82,8 +82,5 @@ export const facilityRefferalForm = getAsyncLifecycle(
 
 // SHR Summary
 export const patientSHRSummary = getAsyncLifecycle(() => import('./shr-summary/shr-summary.component'), options);
-export const shrAuthorizationForm = getAsyncLifecycle(
-  () => import('./shr-summary/shr-authorization-form.workspace'),
-  options,
-);
+
 export const referralWrap = getAsyncLifecycle(() => import('./referrals-wrap'), options);

package/src/referrals/dependents/dependents.component.tsx

@@ -13,6 +13,8 @@ import {
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import capitalize from 'lodash/capitalize';
+import { FHIRResource } from '@openmrs/esm-framework';
+import { EmptyState } from '@openmrs/esm-patient-common-lib';
 
 type DependentProps = {
   patientUuid: string;
@@ -76,7 +78,12 @@ const DependentsComponent: React.FC<DependentProps> = ({ patient, patientUuid })
   }
 
   if (dependents.length === 0) {
-    return <div>{t('noDependentsFoundFromHIE', 'No dependents found from HIE')}</div>;
+    return (
+      <EmptyState
+        headerTitle={t('hieDependants', 'HIE Dependants')}
+        displayText={t('hieDependants', 'HIE Dependants')}
+      />
+    );
   }
 
   return (

package/src/referrals/referral-reasons/referral-reasons.component.tsx

@@ -21,10 +21,10 @@ const ReferralReasonsDialogPopup: React.FC<ReferralReasonsDialogPopupProps> = ({
 }) => {
   const { t } = useTranslation();
 
-  const handleServeClient = async () => {
+  const handleServeClient = () => {
     try {
-      await handleProcessReferral();
       closeModal();
+      handleProcessReferral();
     } catch (error) {
       showNotification({
         title: t('referralError', 'Error processing referral'),

package/src/referrals/referral-tabs/referrals-tabs.component.tsx

@@ -3,7 +3,14 @@ import { mutate } from 'swr';
 import useSWRMutation from 'swr/mutation';
 import { useTranslation } from 'react-i18next';
 import { Tab, TabList, Tabs, Button, TabPanel, TabPanels, InlineLoading } from '@carbon/react';
-import { isDesktop, launchWorkspace, useLayoutType, showSnackbar, restBaseUrl } from '@openmrs/esm-framework';
+import {
+  isDesktop,
+  launchWorkspace,
+  useLayoutType,
+  showSnackbar,
+  restBaseUrl,
+  launchWorkspace2,
+} from '@openmrs/esm-framework';
 import { AirlineManageGates, UpdateNow } from '@carbon/react/icons';
 
 import ReferralTable from '../referrals.component';
@@ -46,7 +53,7 @@ const ReferralTabs: React.FC = () => {
   );
 
   const handleReferral = () => {
-    launchWorkspace('facility-referral-form', {
+    launchWorkspace2('facility-referral-form', {
       workspaceTitle: t('referralForm', 'Referral Form'),
     });
   };

package/src/referrals/referrals-actions.component.tsx

@@ -1,18 +1,26 @@
-import React, { useCallback } from 'react';
-import { Button } from '@carbon/react';
+import React, { useCallback, useRef, useState } from 'react';
+import { Button, InlineLoading } from '@carbon/react';
 
 import { useTranslation } from 'react-i18next';
 import { navigate, showModal, showSnackbar } from '@openmrs/esm-framework';
 import { ReferralReasonsProps } from '../types';
 import { processCommunityReferral } from './refferals.resource';
+import usePatient from '../hooks/usePatient';
+import { sendSHAOtp, verifyOtp } from '../shr-summary/shr-summary.resource';
 
 interface ReferralReasonData {
   referralData: ReferralReasonsProps;
   status: string;
+  patientUuid: string;
 }
 
-const CommunityReferralActions: React.FC<ReferralReasonData> = ({ status, referralData }) => {
+const CommunityReferralActions: React.FC<ReferralReasonData> = ({ status, referralData, patientUuid }) => {
   const { t } = useTranslation();
+  const idRef = useRef<string>();
+  const [accessGranted, setAccessGranted] = useState(true);
+  const [isAuthorizing, setIsAuthorizing] = useState(false);
+
+  const { error, isLoading, patientPhoneNumber, patientName, nationalId } = usePatient(patientUuid);
 
   const handleProcessReferral = useCallback(() => {
     processCommunityReferral(referralData.messageId)
@@ -39,22 +47,73 @@ const CommunityReferralActions: React.FC<ReferralReasonData> = ({ status, referr
       });
   }, [referralData, t]);
 
+  const handleInitiateAuthorization = useCallback(() => {
+    const dispose = showModal('otp-verification-modal', {
+      onClose: () => {
+        if (!accessGranted) {
+          setIsAuthorizing(false);
+        }
+        dispose();
+      },
+      phoneNumber: patientPhoneNumber || '',
+      otpLength: 5,
+      expiryMinutes: 5,
+      centerBoxes: true,
+      onRequestOtp: async (_phone: string) => {
+        const { status, id } = await sendSHAOtp(_phone, nationalId as string);
+        idRef.current = id;
+        if (status !== 'success') {
+          throw new Error(t('otpFailed', 'Failed to send OTP'));
+        }
+      },
+
+      onVerify: async (enteredOtp: string) => {
+        const { status, data, error } = await verifyOtp(enteredOtp, idRef.current as string);
+        if (status !== 'success') {
+          throw new Error(t('authorizeFailed', 'Authorization failed'));
+        }
+      },
+
+      onVerificationSuccess: () => {
+        dispose();
+        setIsAuthorizing(false);
+        setAccessGranted(true);
+        handleProcessReferral();
+        showSnackbar({
+          title: t('success', 'Success'),
+          subtitle: t('otpVerificationSuccessMessage', 'OTP Vefification succesfull'),
+          kind: 'success',
+        });
+      },
+
+      onCleanup: () => {
+        if (!accessGranted) {
+          setIsAuthorizing(false);
+        }
+      },
+    });
+  }, [accessGranted, handleProcessReferral, nationalId, patientPhoneNumber, t]);
+
   const refearralReasonsHandleClick = useCallback(() => {
     const dispose = showModal('referral-reasons-dialog', {
       closeModal: () => dispose(),
       referralReasons: referralData,
       status: status,
-      handleProcessReferral,
+      handleProcessReferral: handleInitiateAuthorization,
     });
-  }, [referralData, handleProcessReferral, status]);
+  }, [referralData, handleInitiateAuthorization, status]);
+
+  if (isLoading || isAuthorizing) {
+    return <InlineLoading description={t('loading', 'Loading...')} />;
+  }
 
   return (
     <>
-      <Button kind="primary" size="md" onClick={() => refearralReasonsHandleClick()}>
+      <Button kind="primary" size="md" onClick={refearralReasonsHandleClick}>
         {t('viewReasons', 'View reasons')}
       </Button>
       {status === 'completed' ? null : (
-        <Button kind="primary" size="md" onClick={() => handleProcessReferral()}>
+        <Button kind="primary" size="md" onClick={handleInitiateAuthorization}>
           {t('serveClient', 'Serve client')}
         </Button>
       )}

package/src/referrals/referrals.component.tsx

@@ -23,7 +23,7 @@ import { useTranslation } from 'react-i18next';
 import { useCommunityReferrals } from './refferals.resource';
 import CommunityReferralActions from './referrals-actions.component';
 import { ReferralReasonsProps } from '../types';
-import { usePaginationInfo } from '@openmrs/esm-patient-common-lib/src';
+import { usePaginationInfo } from '@openmrs/esm-patient-common-lib';
 
 type ReferralProps = {
   status: string;
@@ -124,7 +124,7 @@ const ReferralTable: React.FC<ReferralProps> = ({ status }) => {
         dateReferred: record.dateReferred,
         referredFrom: record.referredFrom,
         referralService: record.referralReasons?.category,
-        actions: <CommunityReferralActions status={status} referralData={referralReasonsx} />,
+        actions: <CommunityReferralActions status={status} referralData={referralReasonsx} patientUuid={record.uuid} />,
       };
       rowData.push(s);
     });

package/src/routes.json

@@ -1,80 +1,94 @@
 {
-    "$schema": "https://json.openmrs.org/routes.schema.json",
-    "backendDependencies": {
-        "kenyaemr": "^19.0.0"
+  "$schema": "https://json.openmrs.org/routes.schema.json",
+  "backendDependencies": {
+    "kenyaemr": "^19.0.0"
+  },
+  "pages": [
+    {
+      "component": "shrHome",
+      "route": "referrals"
+    }
+  ],
+  "extensions": [
+    {
+      "name": "patient-chart-shr-summary-dashboard-link",
+      "component": "shrSummaryDashboardLink",
+      "meta": {
+        "columns": 1,
+        "columnSpan": 1,
+        "slot": "patient-chart-shr-summary-dashboard-slot",
+        "path": "SHR Portal"
+      },
+      "featureFlag": "healthInformationExchange"
     },
-    "pages": [
-        {
-            "component": "shrHome",
-            "route": "referrals"
-        }
-    ],
-    "extensions": [
-        {
-            "component": "shrAuthorizationForm",
-            "name": "shr-authorization-form"
-        },
-        {
-            "name": "patient-chart-shr-summary-dashboard-link",
-            "component": "shrSummaryDashboardLink",
-            "meta": {
-                "columns": 1,
-                "columnSpan": 1,
-                "slot": "patient-chart-shr-summary-dashboard-slot",
-                "path": "SHR Portal"
-            },
-            "featureFlag": "healthInformationExchange"
-        },
-        {
-            "name": "SHR Portal",
-            "slot": "patient-chart-shr-summary-dashboard-slot",
-            "component": "patientSHRSummary",
-            "meta": {
-                "columnSpan": 4
-            }
-        },
-        {
-            "name": "referrals",
-            "slot": "referrals-slot",
-            "component": "referralWrap"
-        },
-        {
-            "name": "referrals-link",
-            "slot": "homepage-dashboard-slot",
-            "component": "ReferralsDashboardLink",
-            "meta": {
-                "name": "referrals",
-                "title": "referrals",
-                "slot": "referrals-slot"
-            }
-        },
-        {
-            "name": "referral-reasons-dialog",
-            "component": "referralReasonsDialogPopup"
-        },
-        {
-            "name": "facility-referral-form",
-            "component": "facilityRefferalForm"
-        },
-        {
-            "name": "referral-view-link",
-            "component": "referralLink",
-            "order": 13,
-            "meta": {
-                "columns": 1,
-                "columnSpan": 1,
-                "slot": "patient-chart-referral-slot",
-                "path": "referral",
-                "layoutMode": "anchored"
-            }
-        },
-        {
-            "name": "referral-view",
-            "slot": "patient-chart-referral-slot",
-            "component": "referralWidget",
-            "order": 0,
-            "online": true,
-            "offline": false
-        }
-    ]
-}
+    {
+      "name": "SHR Portal",
+      "slot": "patient-chart-shr-summary-dashboard-slot",
+      "component": "patientSHRSummary",
+      "meta": {
+        "columnSpan": 4
+      }
+    },
+    {
+      "name": "referrals",
+      "slot": "referrals-slot",
+      "component": "referralWrap"
+    },
+    {
+      "name": "referrals-link",
+      "slot": "homepage-dashboard-slot",
+      "component": "ReferralsDashboardLink",
+      "meta": {
+        "name": "referrals",
+        "title": "referrals",
+        "slot": "referrals-slot"
+      }
+    },
+    {
+      "name": "referral-reasons-dialog",
+      "component": "referralReasonsDialogPopup"
+    },
+    {
+      "name": "referral-view-link",
+      "component": "referralLink",
+      "order": 13,
+      "meta": {
+        "columns": 1,
+        "columnSpan": 1,
+        "slot": "patient-chart-referral-slot",
+        "path": "referral",
+        "layoutMode": "anchored"
+      }
+    },
+    {
+      "name": "referral-view",
+      "slot": "patient-chart-referral-slot",
+      "component": "referralWidget",
+      "order": 0,
+      "online": true,
+      "offline": false
+    }
+  ],
+  "workspaces2": [
+    {
+      "name": "facility-referral-form",
+      "component": "facilityRefferalForm",
+      "window": "referral-workspace-window"
+    }
+  ],
+  "workspaceWindows2": [
+    {
+      "name": "referral-workspace-window",
+      "group": "referral-workspace-group",
+      "canMaximize": false,
+      "width": "wider"
+    }
+  ],
+  "workspaceGroups2": [
+    {
+      "name": "referral-workspace-group",
+      "persistence": "closeable",
+      "closeable": true
+    }
+  ]
+}

package/src/shr-summary/shr-summary.component.tsx

@@ -1,23 +1,19 @@
-import { DataTableSkeleton, Layer, Tile, Tabs, TabList, Tab, TabPanel, TabPanels } from '@carbon/react';
-import {
-  CardHeader,
-  EmptyDataIllustration,
-  ErrorState,
-  getPatientUuidFromStore,
-} from '@openmrs/esm-patient-common-lib';
-import React from 'react';
+import { DataTableSkeleton, Tab, TabList, TabPanel, TabPanels, Tabs } from '@carbon/react';
+import { ErrorState } from '@openmrs/esm-patient-common-lib';
+import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import usePatientIdentifiers from '../hooks/usePatientIdentifiers';
-import styles from './tables/shr-tables.scss';
-import { useConfig } from '@openmrs/esm-framework';
-import { ReferralConfigObject } from '../config-schema';
-import PatientSHRSummaryTable from './tables/shr-summary-table.component';
 import DependentsComponent from '../referrals/dependents/dependents.component';
+import PatientSHRSummaryTable from './tables/shr-summary-table.component';
 
-const SHRSummaryPanel = ({ patient, patientUuid }) => {
+type SHRSummaryPanelProps = {
+  patientUuid: string;
+  patient: fhir.Patient;
+};
+
+const SHRSummaryPanel: FC<SHRSummaryPanelProps> = ({ patient, patientUuid }) => {
   const { t } = useTranslation();
-  const { socialHealthAuthorityIdentifierType } = useConfig<ReferralConfigObject>();
-  const { error, isLoading, hasType } = usePatientIdentifiers(patientUuid);
+  const { error, isLoading } = usePatientIdentifiers(patientUuid);
 
   if (isLoading) {
     return <DataTableSkeleton />;
@@ -27,25 +23,6 @@ const SHRSummaryPanel = ({ patient, patientUuid }) => {
     return <ErrorState error={error} headerTitle={t('shrSummary', 'SHR Summary')} />;
   }
 
-  // if (!hasType(socialHealthAuthorityIdentifierType)) {
-  //   return (
-  //     <div>
-  //       <Layer>
-  //         <Tile className={styles.tile}>
-  //           <CardHeader title={t('shrRecords', 'SHR Records')}>{''}</CardHeader>
-  //           <EmptyDataIllustration />
-  //           <p className={styles.content}>
-  //             {t(
-  //               'shrError',
-  //               'Patient must have CR Number.Please register the patient with the client registry to retrieve their SHR Records',
-  //             )}
-  //           </p>
-  //         </Tile>
-  //       </Layer>
-  //     </div>
-  //   );
-  // }
-
   return (
     <div>
       <Tabs>
@@ -58,7 +35,7 @@ const SHRSummaryPanel = ({ patient, patientUuid }) => {
             <DependentsComponent patientUuid={patientUuid} patient={patient} />
           </TabPanel>
           <TabPanel>
-            <PatientSHRSummaryTable />
+            <PatientSHRSummaryTable patient={patient} patientUuid={patientUuid} />
           </TabPanel>
         </TabPanels>
       </Tabs>