@kenyaemr/esm-express-workflow-app 5.4.4-pre.299 → 5.4.4-pre.3

package/src/components/registration/start-visit-form/overflow-menu-extension/custom-end-active-visit.extension.tsx

@@ -0,0 +1,44 @@
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { showModal, useVisit } from '@openmrs/esm-framework';
+import { OverflowMenuItem } from '@carbon/react';
+import styles from './overflow-menu-item.scss';
+
+interface StopVisitOverflowMenuItemProps {
+  patientUuid: string;
+  closeMenu?: () => void;
+}
+
+let isEndVisitDialogOpen = false;
+
+const StopVisitOverflowMenuItem: React.FC<StopVisitOverflowMenuItemProps> = ({ patientUuid, closeMenu }) => {
+  const { t } = useTranslation();
+  const { activeVisit } = useVisit(patientUuid);
+
+  const handleLaunchModal = useCallback(() => {
+    if (isEndVisitDialogOpen) {
+      return;
+    }
+    isEndVisitDialogOpen = true;
+    const dispose = showModal('custom-end-visit-dialog', {
+      closeModal: () => {
+        isEndVisitDialogOpen = false;
+        dispose();
+      },
+      patientUuid,
+    });
+  }, [patientUuid]);
+
+  return (
+    activeVisit && (
+      <OverflowMenuItem
+        className={styles.menuitem}
+        itemText={`${t('endCustomActiveVisit', 'End Active Visit')}`}
+        onClick={handleLaunchModal}
+        closeMenu={closeMenu}
+      />
+    )
+  );
+};
+
+export default StopVisitOverflowMenuItem;

package/src/components/registration/start-visit-form/start-visit-workspace/exported-visit-form.workspace.tsx

@@ -28,6 +28,7 @@ import {
   useConfig,
   useConnectivity,
   useEmrConfiguration,
+  useFeatureFlag,
   useLayoutType,
   useVisit,
   Workspace2,
@@ -121,6 +122,7 @@ const ExportedVisitForm: React.FC<Workspace2DefinitionProps<ExportedVisitFormPro
   const allVisitTypes = useConditionalVisitTypes();
   const { earliestAllowedStartDate, isLoading: isLoadingBirthdateCheck } =
     useEarliestAllowedVisitStartDate(patientUuid);
+  const hieFeatureFlags = useFeatureFlag('healthInformationExchange');
 
   const [errorFetchingResources, setErrorFetchingResources] = useState<{
     blockSavingForm: boolean;
@@ -314,18 +316,20 @@ const ExportedVisitForm: React.FC<Workspace2DefinitionProps<ExportedVisitFormPro
       const abortController = new AbortController();
 
       if (isOnline) {
-        setIsAwaitingOtp(true);
-        try {
-          for (const [, callbacks] of visitFormCallbacks) {
-            if (typeof callbacks.onBeforeVisitSave === 'function') {
-              const canProceed = await callbacks.onBeforeVisitSave();
-              if (!canProceed) {
-                return;
+        if (hieFeatureFlags) {
+          setIsAwaitingOtp(true);
+          try {
+            for (const [, callbacks] of visitFormCallbacks) {
+              if (typeof callbacks.onBeforeVisitSave === 'function') {
+                const canProceed = await callbacks.onBeforeVisitSave();
+                if (!canProceed) {
+                  return;
+                }
               }
             }
+          } finally {
+            setIsAwaitingOtp(false);
           }
-        } finally {
-          setIsAwaitingOtp(false);
         }
 
         const visitRequest = visitToEdit?.uuid
@@ -450,6 +454,7 @@ const ExportedVisitForm: React.FC<Workspace2DefinitionProps<ExportedVisitFormPro
       getErrorDescription,
       globalMutate,
       handleVisitAttributes,
+      hieFeatureFlags,
       isOnline,
       onVisitStarted,
       patientUuid,
@@ -686,7 +691,7 @@ const ExportedVisitForm: React.FC<Workspace2DefinitionProps<ExportedVisitFormPro
                   description={
                     visitToEdit
                       ? t('updatingVisit', 'Updating visit') + '...'
-                      : isAwaitingOtp
+                      : hieFeatureFlags && isAwaitingOtp
                       ? t('sendingOtp', 'Sending OTP') + '...'
                       : t('startingVisit', 'Starting visit') + '...'
                   }
@@ -697,7 +702,7 @@ const ExportedVisitForm: React.FC<Workspace2DefinitionProps<ExportedVisitFormPro
                     ? t('updateVisit', 'Update visit')
                     : isElectiveNotApproved
                     ? t('awaitingApproval', 'Awaiting approval')
-                    : isSHAVisit
+                    : hieFeatureFlags && isSHAVisit
                     ? t('verifyAndStartVisit', 'Verify & Start Visit')
                     : t('startVisit', 'Start visit')}
                 </span>

package/src/components/registration/type/index.ts

@@ -362,3 +362,104 @@ export interface QueueRoom {
 export interface OTPSource {
   otpSource?: string;
 }
+
+export const DISCHARGE_REASONS = [
+  { id: 'RECOVERED', label: 'Recovered' },
+  { id: 'REFERRED', label: 'Referred' },
+  { id: 'ABSCONDED', label: 'Absconded' },
+  { id: 'OTHER', label: 'Other' },
+];
+
+export type AuthorizingDeviceOS = 'windows' | 'android';
+
+export type OTPResponse = {
+  success: boolean;
+  otp?: string;
+  otp_found?: boolean;
+  raw_response?: { message: string };
+  error?: string;
+};
+
+export type BiometricAuthorizeRequest = {
+  agent_id: string;
+  patient_id: string;
+  interventions: string[];
+  service_type: string;
+  workstation_id: string;
+  authorizing_device_os: string;
+  is_emergency?: boolean;
+  payment_mechanism?: string;
+  patient_uuid?: string;
+  is_biometrics_discharge_authorization?: boolean;
+};
+
+export type BiometricAuthorizeResponse = {
+  success: boolean;
+  embed_url?: string;
+  authorization_code?: string;
+  consent_token?: string;
+  token?: string;
+  guid?: string;
+  error?: string;
+  upstream_error?: { error?: string; message?: string };
+};
+
+export type BiometricAuthorizationStatus = {
+  success: boolean;
+  token: string;
+  status: 'PENDING' | 'APPROVED' | 'REJECTED';
+  is_complete: boolean;
+  is_approved: boolean;
+  authorization_code: string | null;
+  guid: string | null;
+};
+
+export type BiometricConfigResponse = {
+  agent_url: string;
+  agent_timeout_ms: number;
+  default_factors: string[];
+};
+
+export type ProviderAttributesResponse = {
+  attributes: Array<{
+    attributeType: { display: string; uuid: string };
+    value: string;
+  }>;
+};
+
+export type WhitelistReason = {
+  code: string;
+  label: string;
+  description: string;
+  review_type: 'AUTOMATIC' | 'MANUAL';
+  requires_attachments: boolean;
+};
+
+export type WhitelistSubmitResponse = {
+  success: boolean;
+  review_type?: 'AUTOMATIC' | 'MANUAL';
+  error?: string;
+};
+
+export type WhitelistStatusPoll = {
+  beneficiary_cr_id: string;
+  is_whitelisted: boolean;
+  has_pending: boolean;
+  is_rejected: boolean;
+  can_submit_new: boolean;
+  latest_status: string | null;
+  total: number;
+  requests: Array<{
+    request_id: string | null;
+    status: string | null;
+    reason_type: string | null;
+    reason: string | null;
+    biometric_attempts: string | null;
+    beneficiary_name: string | null;
+    facility_name: string | null;
+    reviewed_by: string | null;
+    reviewer_note: string | null;
+    created_on: string | null;
+    reviewed_on: string | null;
+  }>;
+};

package/src/config-schema.ts

@@ -154,8 +154,11 @@ export const configSchema = {
       'Configurable list of maintenance-of-anaesthesia agents shown in the interoperative drug form (e.g. Halothane, Isoflurane). Override per deployment.',
     _default: [
       { value: '77343AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', label: 'Halothane' },
-      { value: '83872AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', label: 'Evoflurane' },
+      { value: '83872AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', label: 'Sevoflurane' },
       { value: '78258AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', label: 'Isoflurane' },
+      { value: '82726AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', label: 'Propofol' },
+      { value: '78467AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', label: 'Ketamine' },
+      { value: '74640AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA', label: 'Dexmedetomidine' },
     ],
   },
   proceduresOrderTypeUuid: {
@@ -274,6 +277,22 @@ export const configSchema = {
     _description: 'Whether the workflow is DHA Workflow',
     _default: true,
   },
+  crIdentificationNumberUUID: {
+    _type: Type.String,
+    _description:
+      'The patient identifier type UUID for the SHA Client Registry (CR) number, used for virtual claims and OTP/biometric authentication.',
+    _default: '24aedd37-b5be-4e08-8311-3721b8d5100d',
+  },
+  providerNationalIdUuid: {
+    _type: Type.String,
+    _description: 'The provider attribute type UUID for the national ID, used in SHA biometric authorization requests.',
+    _default: '3d152c97-2293-4a2b-802e-e0f1009b7b15',
+  },
+  nationalIdUUID: {
+    _type: Type.String,
+    _description: 'The patient identifier type UUID for the national ID, used for SHA eligibility checks.',
+    _default: '49af6cdc-7968-4abb-bf46-de10d7f4859f',
+  },
 
   anaesthetic: {
     _type: Type.Object,
@@ -478,6 +497,7 @@ export type ExpressWorkflowConfig = {
   inPatientVisitTypeUuid: string;
   defaultFacilityUrl: string; //done
   offlineVisitTypeUuid: string;
+  nationalIdUUID: string;
   showRecommendedVisitTypeTab: boolean;
   visitTypeResourceUrl: string;
   disableChangingVisitLocation: boolean;
@@ -491,6 +511,8 @@ export type ExpressWorkflowConfig = {
   showUpcomingAppointments: boolean; //done
   excludedVisitTypeUuids: Array<string>;
   isDHAWorkflow: boolean;
+  crIdentificationNumberUUID: string;
+  providerNationalIdUuid: string;
 };
 export interface ConfigObject {
   requireMaritalStatusOnAgeGreaterThanOrEqualTo: number;

package/src/index.ts

@@ -1,7 +1,20 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
+import { defineConfigSchema, getAsyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
+export * from './components/accounting';
+export * from './components/admissions';
+export * from './components/appointments';
+export * from './components/consultation';
+export * from './components/facility-dashboard';
+export * from './components/laboratory';
+export * from './components/mch';
+export * from './components/pharmacy';
+export * from './components/preauth';
+export * from './components/procedures';
 export * from './components/procedures/procedure-queues';
-
+export * from './components/radiology-and-imaging';
+export * from './components/registration';
+export * from './components/reports';
+export * from './components/triage';
 const moduleName = '@kenyaemr/esm-express-workflow-app';
 
 const options = {
@@ -19,20 +32,6 @@ export function startupApp() {
     'Enable/Disable procedure queue in procedure pannel and procedure form',
   );
 }
-export * from './components/facility-dashboard';
-export * from './components/registration';
-export * from './components/triage';
-export * from './components/accounting';
-export * from './components/consultation';
-export * from './components/mch';
-export * from './components/reports';
-export * from './components/pharmacy';
-export * from './components/laboratory';
-export * from './components/radiology-and-imaging';
-export * from './components/procedures';
-export * from './components/admissions';
-export * from './components/preauth';
-export * from './components/appointments';
 
 export const root = getAsyncLifecycle(() => import('./root.component'), options);
 export const otpVerificationModal = getAsyncLifecycle(
@@ -51,7 +50,14 @@ export const patientSummaryDashboard = getAsyncLifecycle(
 export const customStartVisitOverflowMenuItem = getAsyncLifecycle(
   () => import('./components/registration/start-visit-form/overflow-menu-extension/overflow-menu-item.extension'),
   {
-    featureName: 'patient-actions-slot-deceased-button',
+    featureName: 'patient-actions-slot-start-visit-button',
+    moduleName,
+  },
+);
+export const customStopVisitOverflowMenuItem = getAsyncLifecycle(
+  () => import('./components/registration/start-visit-form/overflow-menu-extension/custom-end-active-visit.extension'),
+  {
+    featureName: 'patient-actions-slot-stop-visit-button',
     moduleName,
   },
 );
@@ -61,6 +67,14 @@ export const visitFormWorkspace = getAsyncLifecycle(
   options,
 );
 
+export const customEndVisitModal = getAsyncLifecycle(
+  () => import('./components/registration/end-visit-modal/end-visit-dialog.modal'),
+  {
+    featureName: 'custom-patient-actions-end-visit-modal',
+    moduleName,
+  },
+);
+
 export const anaestheticFormWorkspace = getAsyncLifecycle(
   () => import('./components/anaesthetic/forms/anaesthetic-form.component'),
   options,
@@ -86,3 +100,8 @@ export const homepageDashboardLink = getAsyncLifecycle(
     ),
   options,
 );
+
+export const procedureAndOrdersTab = getAsyncLifecycle(
+  () => import('./shared/tabs/create-tab-extension').then((mod) => ({ default: mod.createTabExtension() })),
+  options,
+);

package/src/routes.json

@@ -24,7 +24,7 @@
         "slot": "appointments-dashboard-slot",
         "title": "Appointments"
       }
-        },
+    },
     {
       "name": "ewf-preauth-dashboard-link",
       "component": "preauthDashboardLink",
@@ -38,10 +38,8 @@
         "layoutMode": "anchored",
         "hideDashboardTitle": true
       }
-
     },
     {
-
       "name": "ewf-preauth-dashboard",
       "component": "preauthDashboard",
       "slot": "ewf-patient-chart-preauth-dashboard-slot",
@@ -332,13 +330,19 @@
       "online": true,
       "offline": true
     },
+    {
+      "name": "custom-stop-visit-overflow-menu-item",
+      "component": "customStopVisitOverflowMenuItem",
+      "online": true,
+      "offline": true
+    },
     {
       "name": "procedure-queues",
       "component": "procedureQueues",
       "online": true,
       "offline": false,
       "featureFlag": "procedureQueues",
-      "slot":"procedure-orders-dashboard-slot"
+      "slot": "procedure-orders-dashboard-slot"
     },
     {
       "name": "procedure-form-extras",
@@ -349,13 +353,198 @@
       "featureFlag": "procedureQueues"
     },
     {
-      "name": "admission-medication-summary",
-      "component": "admissionsMedicationSummary",
-      "slot": "inpatient-dashboard-tabs-slot",
-      "online": true,
-      "offline": false,
-      "meta":{
-        "title": "medicationSummary"
+      "name": "ewf-patient-summary-tab",
+      "component": "patientSummary",
+      "slot": "ewf-patient-chart-patient-summary-tabs-extension-slot",
+      "meta": {
+        "title": "patientSummaryTab",
+        "slot": "ewf-patient-summary-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-vitals-tab",
+      "component": "patientVitals",
+      "slot": "ewf-patient-chart-patient-summary-tabs-extension-slot",
+      "meta": {
+        "title": "vitalsAndAnthropometric",
+        "slot": "ewf-vitals-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-care-panel-tab",
+      "component": "carePanel",
+      "slot": "ewf-patient-chart-patient-summary-tabs-extension-slot",
+      "meta": {
+        "title": "carePanel",
+        "slot": "ewf-care-panel-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-immunization-tab",
+      "component": "immunization",
+      "slot": "ewf-patient-chart-patient-summary-tabs-extension-slot",
+      "meta": {
+        "title": "immunizations",
+        "slot": "ewf-immunizations-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-relationships-tab",
+      "component": "relationships",
+      "slot": "ewf-patient-chart-patient-summary-tabs-extension-slot",
+      "meta": {
+        "title": "relationships",
+        "slot": "ewf-relationships-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-appointments-tab",
+      "component": "appointments",
+      "slot": "ewf-patient-chart-patient-summary-tabs-extension-slot",
+      "meta": {
+        "title": "appointments",
+        "slot": "ewf-appointments-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-attachments-tab",
+      "component": "attachments",
+      "slot": "ewf-patient-chart-patient-summary-tabs-extension-slot",
+      "meta": {
+        "title": "attachments",
+        "slot": "ewf-attachments-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-clinical-encounter-tab",
+      "component": "patientClinicalEncounter",
+      "slot": "clinical-encounter-tabs-slot",
+      "meta": {
+        "title": "clinicalEncounterTab",
+        "slot": "ewf-clinical-encounter-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-visits-tab",
+      "component": "patientVisits",
+      "slot": "clinical-encounter-tabs-slot",
+      "meta": {
+        "title": "visits",
+        "slot": "ewf-visits-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-special-clinics-tab",
+      "component": "specialClinics",
+      "slot": "clinical-encounter-tabs-slot",
+      "meta": {
+        "title": "specialClinics",
+        "slot": "ewf-special-clinics-slot"
+      }
+    },
+    {
+      "name": "ewf-clinical-notes-tab",
+      "component": "clinicalNotes",
+      "meta": {
+        "title": "clinicalNotes",
+        "slot": "ewf-clinical-notes-slot"
+      }
+    },
+    {
+      "name": "ewf-procedures-and-orders-tab",
+      "component": "proceduresAndOrders",
+      "meta": {
+        "title": "proceduresAndOrders",
+        "slot": "ewf-procedures-and-orders-slot"
+      }
+    },
+    {
+      "name": "ewf-pharmacy-orders-tab",
+      "component": "pharmacyOrdersTab",
+      "slot": "pharmacy-tabs-slot",
+      "meta": {
+        "title": "orders",
+        "slot": "ewf-orders-slot"
+      }
+    },
+    {
+      "name": "ewf-pharmacy-active-medication-tab",
+      "component": "pharmacyActiveMedicationsTab",
+      "slot": "pharmacy-tabs-slot",
+      "meta": {
+        "title": "activeMedications",
+        "slot": "ewf-active-medications-slot"
+      }
+    },
+    {
+      "name": "ewf-pharmacy-past-medication-tab",
+      "component": "pharmacyPastMedicationsTab",
+      "slot": "pharmacy-tabs-slot",
+      "meta": {
+        "title": "pastMedications",
+        "slot": "ewf-past-medications-slot"
+      }
+    },
+    {
+      "name": "ewf-patient-lab-orders-tab",
+      "component": "patientLaboratoryOrdersTab",
+      "slot": "patient-laboratory-tabs-slot",
+      "meta": {
+        "title": "orders"
+      }
+    },
+    {
+      "name": "ewf-patient-lab-order-results-tab",
+      "component": "patientLaboratoryOrdersResults",
+      "slot": "patient-laboratory-tabs-slot",
+      "meta": {
+        "title": "results",
+        "slot": "ewf-laboratory-results-slot",
+        "basePath": "laboratory"
+      }
+    },
+    {
+      "name": "ewf-patient-procedure-orders-tab",
+      "component": "patientProcedureOrdersTab",
+      "slot": "patient-procedure-tabs-slot",
+      "meta": {
+        "title": "orders"
+      }
+    },
+    {
+      "name": "ewf-patient-procedure-order-results-tab",
+      "component": "patientProcedureOrdersResults",
+      "slot": "patient-procedure-tabs-slot",
+      "meta": {
+        "title": "results",
+        "slot": "ewf-procedures-results-slot",
+        "basePath": "procedures"
+      }
+    },
+    {
+      "name": "ewf-patient-procedure-anaesthetic-tab",
+      "component": "patientProcedureAnaestheticTab",
+      "slot": "patient-procedure-tabs-slot",
+      "meta": {
+        "title": "anaesthetic"
+      }
+    },
+    {
+      "name": "ewf-patient-imaging-orders-tab",
+      "component": "patientImagingOrdersTab",
+      "slot": "patient-imaging-tabs-slot",
+      "meta": {
+        "title": "orders"
+      }
+    },
+    {
+      "name": "ewf-patient-imaging-order-results-tab",
+      "component": "patientImagingOrdersResults",
+      "slot": "patient-imaging-tabs-slot",
+      "meta": {
+        "title": "results",
+        "slot": "ewf-radiology-and-imaging-results-slot",
+        "basePath": "radiology-and-imaging"
       }
     }
   ],
@@ -379,7 +568,7 @@
   "workspaceWindows2": [
     {
       "name": "ewf-start-visit",
-      "group": "ewf-patient-chart",
+      "group": "patient-chart",
       "width": "wider"
     },
     {
@@ -402,6 +591,10 @@
     {
       "component": "facilityDashboardAuthorizationModal",
       "name": "facility-dashboard-authorization-form-modal"
+    },
+    {
+      "name": "custom-end-visit-dialog",
+      "component": "customEndVisitModal"
     }
   ]
 }

package/src/shared/otp-verification/index.ts

@@ -134,6 +134,9 @@ export type OTPVerificationModalOptions = {
 
   /** Expected origin of eKYC postMessage events. Defaults to https://test.ekyc.pesaflow.com. */
   ekycOrigin?: string;
+
+  /** Whether this modal is being used to start or end a visit. Defaults to 'start'. Affects progress message text. */
+  visitAction?: 'start' | 'end';
 };
 
 /**