@kenyaemr/esm-express-workflow-app 5.4.4-pre.340 → 5.4.4-pre.342

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.24.0"},"pages":[{"component":"root","route":"express-workflow"},{"component":"queuesAdminHome","route":"queues-admin"}],"extensions":[{"component":"appointmentsDashboardLink","name":"appointments-dashboard-link","slot":"appointments-left-panel-slot","meta":{"name":"appointments","slot":"appointments-dashboard-slot","title":"Appointments"}},{"name":"ewf-preauth-dashboard-link","component":"preauthDashboardLink","slot":"patient-chart-dashboard-slot","order":10,"meta":{"name":"ewf-preauth","title":"Preauthorization","path":"preauthorization","slot":"ewf-preauth-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-preauth-dashboard","component":"preauthDashboard","slot":"ewf-patient-chart-preauth-dashboard-slot","online":true,"offline":false},{"component":"admissionsLeftPanelLink","name":"admissions-dashboard-link","slot":"express-workflow-left-panel-slot","order":9,"meta":{"name":"admissions","slot":"admissions-dashboard-slot","title":"Admissions"}},{"component":"admissionsDashboard","name":"admissions-dashboard","slot":"admissions-dashboard-slot"},{"component":"consultationLeftPanelLink","name":"consultation-dashboard-link","slot":"homepage-dashboard-slot","order":3,"meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"}},{"component":"consultationDashboard","name":"consultation-dashboard","slot":"consultation-dashboard-slot"},{"component":"facilityLeftPanelLink","name":"facility-dashboard-link","slot":"homepage-dashboard-slot","order":0,"meta":{"name":"dashboard","slot":"facility-dashboard-slot","title":"Dashboard"}},{"component":"facilityDashboard","name":"facility-dashboard","slot":"facility-dashboard-slot"},{"component":"mchLeftPanelLink","name":"mch-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"mch","slot":"mch-dashboard-slot","title":"MCH"}},{"component":"mchDashboard","name":"mch-dashboard","slot":"mch-dashboard-slot"},{"component":"registrationLeftPanelLink","name":"registration-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"registration","slot":"registration-dashboard-slot","title":"Registration"}},{"component":"registrationDashboard","name":"registration-dashboard","slot":"registration-dashboard-slot"},{"component":"triageLeftPanelLink","name":"triage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"triage","slot":"triage-dashboard-slot","title":"Triage"}},{"component":"triageDashboard","name":"triage-dashboard","slot":"triage-dashboard-slot"},{"name":"custom-visit-form-queue-fields","component":"checkinFormExtraExtension","slot":"visit-form-bottom-slot","order":0},{"component":"reportsDashboardLink","name":"reports-homepage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"reports-homepage-dashboard-slot","title":"Reports"}},{"component":"reportsDashboard","name":"reports-dashboard","slot":"reports-homepage-dashboard-slot"},{"name":"pharmacy-homepage-dashboard-link","component":"pharmacyLink","slot":"homepage-dashboard-slot","meta":{"name":"pharmacy","title":"Pharmacy","path":"pharmacy","slot":"pharmacy-homepage-dashboard-slot"}},{"name":"pharmacy-homepage-dashboard","component":"pharmacy","slot":"pharmacy-homepage-dashboard-slot","online":true,"offline":false},{"name":"ewf-pharmacy-orders-dashboard","component":"pharmacyOrders","slot":"ewf-orders-slot","online":true,"offline":false},{"name":"patient-summary-dashboard","component":"patientSummaryDashboard","slot":"patient-chart-summary-dashboard-slot"},{"name":"ewf-clinical-encounter-link","component":"clinicalEncounterLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-clinical-encounter","title":"Clinical Encounter","slot":"ewf-patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-clinical-encounter-dashboard","component":"clinicalEncounter","slot":"ewf-patient-chart-clinical-encounter-slot","online":true,"offline":false},{"name":"ewf-laboratory-dashboard-link","component":"laboratoryLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-laboratory","title":"Lab Orders","path":"laboratory","slot":"ewf-patient-chart-laboratory-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-laboratory-dashboard","component":"laboratoryDashboard","slot":"ewf-patient-chart-laboratory-dashboard-slot","online":true,"offline":false},{"name":"ewf-radiology-and-imaging-dashboard-link","component":"radiologyAndImagingLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-radiology-and-imaging","title":"Radiology and Imaging","path":"radiology-and-imaging","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-radiology-and-imaging-dashboard","component":"radiologyAndImagingDashboard","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","online":true,"offline":false},{"name":"ewf-procedures-dashboard-link","component":"proceduresLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-procedures","title":"Procedures","path":"procedures","slot":"ewf-patient-chart-procedures-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-procedures-dashboard","component":"proceduresDashboard","slot":"ewf-patient-chart-procedures-dashboard-slot","online":true,"offline":false},{"name":"ewf-pharmacy-dashboard-link","component":"pharmacyPatientChartDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-pharmacy","title":"Prescription","path":"pharmacy","slot":"ewf-patient-chart-pharmacy-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-pharmacy-dashboard","component":"pharmacyTabs","slot":"ewf-patient-chart-pharmacy-dashboard-slot","online":true,"offline":false},{"name":"ewf-admissions-dashboard-link","component":"admissionsDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-admissions","title":"In-patient","path":"admissions","slot":"ewf-patient-chart-admissions-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-admissions-dashboard","component":"admissionsDashboard","slot":"ewf-patient-chart-admissions-dashboard-slot","online":true,"offline":false},{"name":"ewf-homepage-dashboard-link","component":"homepageDashboardLink","slot":"patient-chart-dashboard-slot","order":0},{"name":"ewf-encounter-details-dashboard","component":"encounterDetails","slot":"ewf-clinical-encounter-slot","online":true,"offline":false},{"name":"custom-start-visit-overflow-menu-item","slot":"patient-actions-slot","component":"customStartVisitOverflowMenuItem","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"},{"name":"procedure-form-extras","component":"procedureFormExtras","slot":"procedure-order-form-extras-slot","online":true,"offline":false,"featureFlag":"procedureQueues"}],"workspaces2":[{"name":"custom-start-visit-workspace-form","component":"visitFormWorkspace","window":"ewf-start-visit"},{"name":"anaesthetic-record-workspace-form","component":"anaestheticFormWorkspace","window":"ewf-anaesthetic-record"},{"name":"interoperative-drug-given-workspace-form","component":"interoperativeDrugGivenFormWorkspace","window":"ewf-anaesthetic-record"}],"workspaceWindows2":[{"name":"ewf-start-visit","group":"patient-chart","width":"wider"},{"name":"ewf-anaesthetic-record","group":"ewf-patient-chart","width":"wider"}],"workspaceGroups2":[{"name":"ewf-patient-chart","scopePattern":"/patient/([^/]+)/chart"}],"modals":[{"component":"otpVerificationModal","name":"otp-verification-modal"},{"component":"facilityDashboardAuthorizationModal","name":"facility-dashboard-authorization-form-modal"},{"name":"custom-end-visit-dialog","component":"customEndVisitModal"}],"version":"5.4.4-pre.340"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.24.0"},"pages":[{"component":"root","route":"express-workflow"},{"component":"queuesAdminHome","route":"queues-admin"}],"extensions":[{"component":"appointmentsDashboardLink","name":"appointments-dashboard-link","slot":"appointments-left-panel-slot","meta":{"name":"appointments","slot":"appointments-dashboard-slot","title":"Appointments"}},{"name":"ewf-preauth-dashboard-link","component":"preauthDashboardLink","slot":"patient-chart-dashboard-slot","order":10,"meta":{"name":"ewf-preauth","title":"Preauthorization","path":"preauthorization","slot":"ewf-preauth-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-preauth-dashboard","component":"preauthDashboard","slot":"ewf-patient-chart-preauth-dashboard-slot","online":true,"offline":false},{"component":"admissionsLeftPanelLink","name":"admissions-dashboard-link","slot":"express-workflow-left-panel-slot","order":9,"meta":{"name":"admissions","slot":"admissions-dashboard-slot","title":"Admissions"}},{"component":"admissionsDashboard","name":"admissions-dashboard","slot":"admissions-dashboard-slot"},{"component":"consultationLeftPanelLink","name":"consultation-dashboard-link","slot":"homepage-dashboard-slot","order":3,"meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"}},{"component":"consultationDashboard","name":"consultation-dashboard","slot":"consultation-dashboard-slot"},{"component":"facilityLeftPanelLink","name":"facility-dashboard-link","slot":"homepage-dashboard-slot","order":0,"meta":{"name":"dashboard","slot":"facility-dashboard-slot","title":"Dashboard"}},{"component":"facilityDashboard","name":"facility-dashboard","slot":"facility-dashboard-slot"},{"component":"mchLeftPanelLink","name":"mch-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"mch","slot":"mch-dashboard-slot","title":"MCH"}},{"component":"mchDashboard","name":"mch-dashboard","slot":"mch-dashboard-slot"},{"component":"registrationLeftPanelLink","name":"registration-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"registration","slot":"registration-dashboard-slot","title":"Registration"}},{"component":"registrationDashboard","name":"registration-dashboard","slot":"registration-dashboard-slot"},{"component":"triageLeftPanelLink","name":"triage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"triage","slot":"triage-dashboard-slot","title":"Triage"}},{"component":"triageDashboard","name":"triage-dashboard","slot":"triage-dashboard-slot"},{"name":"custom-visit-form-queue-fields","component":"checkinFormExtraExtension","slot":"visit-form-bottom-slot","order":0},{"component":"reportsDashboardLink","name":"reports-homepage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"reports-homepage-dashboard-slot","title":"Reports"}},{"component":"reportsDashboard","name":"reports-dashboard","slot":"reports-homepage-dashboard-slot"},{"name":"pharmacy-homepage-dashboard-link","component":"pharmacyLink","slot":"homepage-dashboard-slot","meta":{"name":"pharmacy","title":"Pharmacy","path":"pharmacy","slot":"pharmacy-homepage-dashboard-slot"}},{"name":"pharmacy-homepage-dashboard","component":"pharmacy","slot":"pharmacy-homepage-dashboard-slot","online":true,"offline":false},{"name":"ewf-pharmacy-orders-dashboard","component":"pharmacyOrders","slot":"ewf-orders-slot","online":true,"offline":false},{"name":"patient-summary-dashboard","component":"patientSummaryDashboard","slot":"patient-chart-summary-dashboard-slot"},{"name":"ewf-clinical-encounter-link","component":"clinicalEncounterLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-clinical-encounter","title":"Clinical Encounter","slot":"ewf-patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-clinical-encounter-dashboard","component":"clinicalEncounter","slot":"ewf-patient-chart-clinical-encounter-slot","online":true,"offline":false},{"name":"ewf-laboratory-dashboard-link","component":"laboratoryLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-laboratory","title":"Lab Orders","path":"laboratory","slot":"ewf-patient-chart-laboratory-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-laboratory-dashboard","component":"laboratoryDashboard","slot":"ewf-patient-chart-laboratory-dashboard-slot","online":true,"offline":false},{"name":"ewf-radiology-and-imaging-dashboard-link","component":"radiologyAndImagingLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-radiology-and-imaging","title":"Radiology and Imaging","path":"radiology-and-imaging","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-radiology-and-imaging-dashboard","component":"radiologyAndImagingDashboard","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","online":true,"offline":false},{"name":"ewf-procedures-dashboard-link","component":"proceduresLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-procedures","title":"Procedures","path":"procedures","slot":"ewf-patient-chart-procedures-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-procedures-dashboard","component":"proceduresDashboard","slot":"ewf-patient-chart-procedures-dashboard-slot","online":true,"offline":false},{"name":"ewf-pharmacy-dashboard-link","component":"pharmacyPatientChartDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-pharmacy","title":"Prescription","path":"pharmacy","slot":"ewf-patient-chart-pharmacy-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-pharmacy-dashboard","component":"pharmacyTabs","slot":"ewf-patient-chart-pharmacy-dashboard-slot","online":true,"offline":false},{"name":"ewf-admissions-dashboard-link","component":"admissionsDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-admissions","title":"In-patient","path":"admissions","slot":"ewf-patient-chart-admissions-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-admissions-dashboard","component":"admissionsDashboard","slot":"ewf-patient-chart-admissions-dashboard-slot","online":true,"offline":false},{"name":"ewf-homepage-dashboard-link","component":"homepageDashboardLink","slot":"patient-chart-dashboard-slot","order":0},{"name":"ewf-encounter-details-dashboard","component":"encounterDetails","slot":"ewf-clinical-encounter-slot","online":true,"offline":false},{"name":"custom-start-visit-overflow-menu-item","slot":"patient-actions-slot","component":"customStartVisitOverflowMenuItem","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"},{"name":"procedure-form-extras","component":"procedureFormExtras","slot":"procedure-order-form-extras-slot","online":true,"offline":false,"featureFlag":"procedureQueues"},{"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":"clinicalEncounter","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-procedures-and-orders-results-tab","component":"proceduresAndOrdersResults","meta":{"title":"resultsTab","slot":"ewf-procedures-and-orders-results-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"}}],"workspaces2":[{"name":"custom-start-visit-workspace-form","component":"visitFormWorkspace","window":"ewf-start-visit"},{"name":"anaesthetic-record-workspace-form","component":"anaestheticFormWorkspace","window":"ewf-anaesthetic-record"},{"name":"interoperative-drug-given-workspace-form","component":"interoperativeDrugGivenFormWorkspace","window":"ewf-anaesthetic-record"}],"workspaceWindows2":[{"name":"ewf-start-visit","group":"patient-chart","width":"wider"},{"name":"ewf-anaesthetic-record","group":"ewf-patient-chart","width":"wider"}],"workspaceGroups2":[{"name":"ewf-patient-chart","scopePattern":"/patient/([^/]+)/chart"}],"modals":[{"component":"otpVerificationModal","name":"otp-verification-modal"},{"component":"facilityDashboardAuthorizationModal","name":"facility-dashboard-authorization-form-modal"},{"name":"custom-end-visit-dialog","component":"customEndVisitModal"}],"version":"5.4.4-pre.342"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-express-workflow-app",
-  "version": "5.4.4-pre.340",
+  "version": "5.4.4-pre.342",
   "description": "Express workflow app for OpenMRS 3",
   "keywords": [
     "openmrs",

package/src/components/consultation/clinical-encounter/clinical-encounter.component.tsx

@@ -1,28 +1,12 @@
-import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Layer } from '@carbon/react';
-import { IbmWatsonDiscovery, Account, Stethoscope } from '@carbon/react/icons';
-import ExtensionTabs, { ExtensionTabItem } from '../../../shared/tabs/extension-tabs.component';
+import React from 'react';
+import ExtensionTabs from '../../../shared/tabs/extension-tabs.component';
 
 type ClinicalEncounterProps = {
   patientUuid: string;
-  patient: fhir.Patient;
 };
 
-const ClinicalEncounter: React.FC<ClinicalEncounterProps> = ({ patientUuid, patient }) => {
-  const { t } = useTranslation();
-  const state = useMemo(() => ({ patientUuid, patient }), [patientUuid, patient]);
-  const items: Array<ExtensionTabItem> = [
-    { label: t('clinicalEncounter', 'Clinical Encounter'), icon: Stethoscope, slotName: 'ewf-clinical-encounter-slot' },
-    { label: t('visits', 'Visits'), icon: Account, slotName: 'ewf-visits-slot' },
-    { label: t('specialClinics', 'Special Clinics'), icon: IbmWatsonDiscovery, slotName: 'ewf-special-clinics-slot' },
-  ];
-
-  return (
-    <Layer>
-      <ExtensionTabs items={items} state={state} />
-    </Layer>
-  );
+const ClinicalEncounter: React.FC<ClinicalEncounterProps> = ({ patientUuid }) => {
+  return <ExtensionTabs extensionSlotName="clinical-encounter-tabs-slot" patientUuid={patientUuid} />;
 };
 
 export default ClinicalEncounter;

package/src/components/consultation/index.ts

@@ -1,5 +1,5 @@
 import { getAsyncLifecycle } from '@openmrs/esm-framework';
-
+export * from './tabs';
 import { moduleName } from '../../constants';
 
 const options = {

package/src/components/consultation/tabs/index.ts

@@ -0,0 +1,34 @@
+import { getSyncLifecycle } from '@openmrs/esm-framework';
+import { createTabExtension } from '../../../shared/tabs/create-tab-extension';
+
+const options = {
+  featureName: 'express-workflow',
+  moduleName: '@kenyaemr/esm-express-workflow-app',
+};
+
+// t('patientSummaryTab', 'Patient Summary')
+export const patientSummary = getSyncLifecycle(createTabExtension(), options);
+// t('vitalsAndAnthropometric', 'Vitals & Anthropometric')
+export const patientVitals = getSyncLifecycle(createTabExtension(), options);
+// t('carePanel', 'Care Panel')
+export const carePanel = getSyncLifecycle(createTabExtension(), options);
+// t('immunizations', 'Immunizations')
+export const immunization = getSyncLifecycle(createTabExtension(), options);
+// t('relationships', 'Relationships')
+export const relationships = getSyncLifecycle(createTabExtension(), options);
+// t('appointments', 'Appointments')
+export const appointments = getSyncLifecycle(createTabExtension(), options);
+// t("attachments", "Attachments")
+export const attachments = getSyncLifecycle(createTabExtension(), options);
+// t('clinicalEncounterTab', 'Clinical Encounter')
+export const patientClinicalEncounter = getSyncLifecycle(createTabExtension(), options);
+// t('visits', 'Visits')
+export const patientVisits = getSyncLifecycle(createTabExtension(), options);
+// t('specialClinics', 'Special Clinics')
+export const specialClinics = getSyncLifecycle(createTabExtension(), options);
+// t('clinicalNotes', 'Clinical Notes')
+export const clinicalNotes = getSyncLifecycle(createTabExtension(), options);
+// t('proceduresAndOrders', 'Procedures & Orders')
+export const proceduresAndOrders = getSyncLifecycle(createTabExtension(), options);
+// t('resultsTab', 'Results')
+export const proceduresAndOrdersResults = getSyncLifecycle(createTabExtension(), options);

package/src/components/laboratory/index.ts

@@ -1,6 +1,7 @@
-import { getAsyncLifecycle } from '@openmrs/esm-framework';
+import { getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
 
 import { moduleName } from '../../constants';
+import { createTabExtension } from '../../shared/tabs/create-tab-extension';
 
 const options = {
   featureName: 'express-workflow',
@@ -20,3 +21,11 @@ export const laboratoryLeftPanelLink = getAsyncLifecycle(
     })),
   options,
 );
+
+// t("results", "Results")
+export const patientLaboratoryOrdersResults = getSyncLifecycle(createTabExtension(), options);
+// t("order", "Orders")
+export const patientLaboratoryOrdersTab = getAsyncLifecycle(
+  () => import('../../components/laboratory/lab-table.component'),
+  options,
+);

package/src/components/laboratory/lab-table.component.tsx

@@ -1,35 +1,48 @@
 import React, { useMemo } from 'react';
-import { Order } from '../../types/order/order';
-import { Layer } from '@carbon/react';
+import { DataTableSkeleton, Layer } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { useConfig } from '@openmrs/esm-framework';
+import { ErrorState, useConfig } from '@openmrs/esm-framework';
 import styles from './laboratory-tabs.scss';
 import { EmptyState, useLaunchWorkspaceRequiringVisit, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import { ExpressWorkflowConfig } from '../../config-schema';
 import OrderTable from '../../shared/orders/OrderTable';
+import { usePatientOrders } from '../../hooks/useOrders';
 
 type LabTableProps = {
-  orders: Array<Order>;
   patientUuid: string;
-  mutateOrders: () => void;
 };
 
-const LabTable: React.FC<LabTableProps> = ({ orders, patientUuid, mutateOrders }) => {
+const LabTable: React.FC<LabTableProps> = ({ patientUuid }) => {
+  const { labOrderTypeUuid, orderableConceptSets } = useConfig<ExpressWorkflowConfig>();
+  const {
+    data: orders,
+    isLoading,
+    error,
+    mutate: mutateOrders,
+  } = usePatientOrders(patientUuid, 'any', labOrderTypeUuid, undefined, undefined);
+
   const { t } = useTranslation();
   const { patient } = usePatientChartStore(patientUuid);
-  const windowProps = useMemo(() => ({ encounterUuid: orders[0]?.encounter?.uuid }), [orders[0]?.encounter?.uuid]);
+  const windowProps = useMemo(() => ({ encounterUuid: orders?.[0]?.encounter?.uuid }), [orders]);
   const groupProps = useMemo(
     () => ({
       patient,
       patientUuid: patient?.id,
-      visitContext: orders[0]?.encounter?.visit,
+      visitContext: orders?.[0]?.encounter?.visit,
       mutateVisitContext: mutateOrders,
     }),
-    [patient, orders[0]?.encounter?.visit, mutateOrders],
+    [patient, orders, mutateOrders],
   );
-  const { labOrderTypeUuid, orderableConceptSets } = useConfig<ExpressWorkflowConfig>();
   const launchAddLabOrder = useLaunchWorkspaceRequiringVisit(patientUuid, 'order-basket');
 
+  if (isLoading) {
+    return <DataTableSkeleton />;
+  }
+
+  if (error) {
+    return <ErrorState headerTitle={t('laboratoryOrders', 'Laboratory Orders')} error={error} />;
+  }
+
   if (orders?.length === 0) {
     return (
       <Layer>
@@ -47,8 +60,8 @@ const LabTable: React.FC<LabTableProps> = ({ orders, patientUuid, mutateOrders }
   return (
     <OrderTable
       title={t('laboratoryOrders', 'Laboratory Orders')}
-      orders={orders}
-      onAdd={() => launchAddLabOrder(null, { encounterUuid: '' }, groupProps)}
+      orders={orders ?? []}
+      onAdd={() => launchAddLabOrder(undefined, { encounterUuid: '' }, groupProps)}
       containerClassName={styles.labTableContainer}
       tableCellClassName={styles.tableCell}
       priorityPillClassName={styles.priorityPill}

package/src/components/laboratory/laboratory-tabs.component.tsx

@@ -1,29 +1,15 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import OrdersTabs from '../../shared/orders/OrdersTabs';
-import LabTable from './lab-table.component';
+import ExtensionTabs from '../../shared/tabs/extension-tabs.component';
 
 type LaboratoryTabsProps = {
   patientUuid: string;
-  patient: fhir.Patient;
 };
 
-const LaboratoryTabs: React.FC<LaboratoryTabsProps> = ({ patientUuid, patient }) => {
+const LaboratoryTabs: React.FC<LaboratoryTabsProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
-  const testOrderTypeUuid = '52a447d3-a64a-11e3-9aeb-50e549534c5e';
 
-  return (
-    <OrdersTabs
-      patientUuid={patientUuid}
-      patient={patient}
-      basePath="laboratory"
-      resultsSlotName="ewf-laboratory-results-slot"
-      orderTypeUuid={testOrderTypeUuid}
-      Table={({ orders, mutateOrders }) => {
-        return <LabTable orders={orders} patientUuid={patientUuid} mutateOrders={mutateOrders} />;
-      }}
-    />
-  );
+  return <ExtensionTabs extensionSlotName="patient-laboratory-tabs-slot" patientUuid={patientUuid} />;
 };
 
 export default LaboratoryTabs;

package/src/components/pharmacy/index.ts

@@ -1,7 +1,7 @@
 import { getAsyncLifecycle } from '@openmrs/esm-framework';
 
 import { moduleName } from '../../constants';
-
+export * from './tabs';
 const options = {
   featureName: 'express-workflow',
   moduleName,

package/src/components/pharmacy/pharmacy-tabs.component.tsx

@@ -1,29 +1,13 @@
-import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Layer } from '@carbon/react';
-import { Activity, RequestQuote, CalendarTools } from '@carbon/react/icons';
+import React from 'react';
 
-import ExtensionTabs, { ExtensionTabItem } from '../../shared/tabs/extension-tabs.component';
+import ExtensionTabs from '../../shared/tabs/extension-tabs.component';
 
 type PharmacyTabsProps = {
   patientUuid: string;
-  patient: fhir.Patient;
 };
 
-const PharmacyTabs: React.FC<PharmacyTabsProps> = ({ patientUuid, patient }) => {
-  const { t } = useTranslation();
-  const state = useMemo(() => ({ patientUuid, patient }), [patientUuid, patient]);
-  const items: Array<ExtensionTabItem> = [
-    { label: t('orders', 'Orders'), icon: RequestQuote, slotName: 'ewf-orders-slot' },
-    { label: t('activeMedications', 'Active Medications'), icon: Activity, slotName: 'ewf-active-medications-slot' },
-    { label: t('pastMedications', 'Past Medications'), icon: CalendarTools, slotName: 'ewf-past-medications-slot' },
-  ];
-
-  return (
-    <Layer>
-      <ExtensionTabs items={items} state={state} />
-    </Layer>
-  );
+const PharmacyTabs: React.FC<PharmacyTabsProps> = ({ patientUuid }) => {
+  return <ExtensionTabs extensionSlotName={'pharmacy-tabs-slot'} patientUuid={patientUuid} />;
 };
 
 export default PharmacyTabs;

package/src/components/pharmacy/tabs/index.ts

@@ -0,0 +1,13 @@
+import { getSyncLifecycle } from '@openmrs/esm-framework';
+import { createTabExtension } from '../../../shared/tabs/create-tab-extension';
+
+const options = {
+  featureName: 'express-workflow',
+  moduleName: '@kenyaemr/esm-express-workflow-app',
+};
+// t('orders', 'Orders')
+export const pharmacyOrdersTab = getSyncLifecycle(createTabExtension(), options);
+// t('activeMedications', 'Active Medications')
+export const pharmacyActiveMedicationsTab = getSyncLifecycle(createTabExtension(), options);
+// t('pastMedications', 'Past Medications')
+export const pharmacyPastMedicationsTab = getSyncLifecycle(createTabExtension(), options);

package/src/components/procedures/index.ts

@@ -1,6 +1,7 @@
-import { getAsyncLifecycle } from '@openmrs/esm-framework';
+import { getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
 
 import { moduleName } from '../../constants';
+import { createTabExtension } from '../../shared/tabs/create-tab-extension';
 
 const options = {
   featureName: 'express-workflow',
@@ -20,3 +21,16 @@ export const proceduresLeftPanelLink = getAsyncLifecycle(
     })),
   options,
 );
+
+// t("results", "Results")
+export const patientProcedureOrdersResults = getSyncLifecycle(createTabExtension(), options);
+// t("order", "Orders")
+export const patientProcedureOrdersTab = getAsyncLifecycle(
+  () => import('../../components/procedures/procedures-table.component'),
+  options,
+);
+// t('anaesthetic', 'Anaesthetic')
+export const patientProcedureAnaestheticTab = getAsyncLifecycle(
+  () => import('../../components/anaesthetic/anaesthetic.component'),
+  options,
+);

package/src/components/procedures/procedures-table.component.tsx

@@ -1,5 +1,5 @@
-import React, { useMemo } from 'react';
-import { useConfig } from '@openmrs/esm-framework';
+import { DataTableSkeleton, Layer } from '@carbon/react';
+import { ErrorState, FHIRResource, useConfig } from '@openmrs/esm-framework';
 import {
   EmptyState,
   invalidateVisitAndEncounterData,
@@ -7,41 +7,54 @@ import {
   useLaunchWorkspaceRequiringVisit,
   usePatientChartStore,
 } from '@openmrs/esm-patient-common-lib';
-import { Layer } from '@carbon/react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import OrderTable from '../../shared/orders/OrderTable';
 
-import { type Order } from '../../types/order/order';
+import { useSWRConfig } from 'swr';
 import { type ExpressWorkflowConfig } from '../../config-schema';
+import { usePatientOrders } from '../../hooks/useOrders';
 import styles from './procedures.scss';
-import { useSWRConfig } from 'swr';
 
 type ProceduresTableProps = {
-  orders: Order[];
   patientUuid: string;
-  patient: fhir.Patient;
+  patient?: FHIRResource;
 };
-const ProceduresTable: React.FC<ProceduresTableProps> = ({ orders, patientUuid, patient }) => {
+const ProceduresTable: React.FC<ProceduresTableProps> = ({ patientUuid, patient }) => {
   const { t } = useTranslation();
   const { imagingOrderTypeUuid, imagingOrderableConceptSets } = useConfig<ExpressWorkflowConfig>();
+  const {
+    data: orders,
+    isLoading,
+    error,
+    mutate: mutateOrders,
+  } = usePatientOrders(patientUuid, 'any', imagingOrderTypeUuid, undefined, undefined);
+
   const { visitContext } = usePatientChartStore(patientUuid);
   const { mutate: globalMutate } = useSWRConfig();
-  const windowProps = useMemo(() => ({ encounterUuid: orders[0]?.encounter?.uuid }), [orders[0]?.encounter?.uuid]);
+  const windowProps = useMemo(() => ({ encounterUuid: orders?.[0]?.encounter?.uuid }), [orders]);
   const groupProps = useMemo(
     () => ({
       patient,
-      patientUuid: patient?.id,
+      patientUuid,
       visitContext: visitContext,
       mutateVisitContext: () => {
+        mutateOrders();
         invalidateVisitByUuid(globalMutate, visitContext.uuid);
-        invalidateVisitAndEncounterData(globalMutate, patient.id);
+        invalidateVisitAndEncounterData(globalMutate, patientUuid);
       },
     }),
-    [globalMutate, visitContext, patient.id],
+    [patient, patientUuid, visitContext, mutateOrders, globalMutate],
   );
   const launchOrderBasket = useLaunchWorkspaceRequiringVisit(patientUuid ?? '', 'order-basket');
 
+  if (isLoading) {
+    return <DataTableSkeleton />;
+  }
+  if (error) {
+    return <ErrorState headerTitle={t('proceduresOrders', 'Procedures Orders')} error={error} />;
+  }
   if (orders?.length === 0) {
     return (
       <Layer>
@@ -66,7 +79,7 @@ const ProceduresTable: React.FC<ProceduresTableProps> = ({ orders, patientUuid,
   return (
     <OrderTable
       title={t('proceduresOrders', 'Procedures Orders')}
-      orders={orders}
+      orders={orders ?? []}
       onAdd={() =>
         launchOrderBasket(
           {

package/src/components/procedures/procedures-tabs.component.tsx

@@ -1,32 +1,13 @@
 import React from 'react';
-import { useConfig } from '@openmrs/esm-framework';
-import { useTranslation } from 'react-i18next';
 
-import OrdersTabs from '../../shared/orders/OrdersTabs';
-import ProceduresTable from './procedures-table.component';
-import { ExpressWorkflowConfig } from '../../config-schema';
-import Anaesthetic from '../anaesthetic/anaesthetic.component';
+import ExtensionTabs from '../../shared/tabs/extension-tabs.component';
 
 type ProceduresTabsProps = {
   patientUuid: string;
-  patient: fhir.Patient;
 };
 
-const ProceduresTabs: React.FC<ProceduresTabsProps> = ({ patientUuid, patient }) => {
-  const { t } = useTranslation();
-  const { proceduresConceptClassUuid, imagingOrderTypeUuid } = useConfig<ExpressWorkflowConfig>();
-  return (
-    <OrdersTabs
-      patientUuid={patientUuid}
-      patient={patient}
-      basePath="procedures"
-      resultsSlotName="ewf-procedures-results-slot"
-      orderTypeUuid={imagingOrderTypeUuid}
-      filter={(order) => order.concept?.conceptClass?.uuid === proceduresConceptClassUuid}
-      Table={({ orders }) => <ProceduresTable orders={orders} patientUuid={patientUuid} patient={patient} />}
-      additionalTabs={[{ label: t('anaesthetic', 'Anaesthetic'), content: <Anaesthetic patientUuid={patientUuid} /> }]}
-    />
-  );
+const ProceduresTabs: React.FC<ProceduresTabsProps> = ({ patientUuid }) => {
+  return <ExtensionTabs extensionSlotName="patient-procedure-tabs-slot" patientUuid={patientUuid} />;
 };
 
 export default ProceduresTabs;

package/src/components/radiology-and-imaging/index.ts

@@ -1,6 +1,7 @@
-import { getAsyncLifecycle } from '@openmrs/esm-framework';
+import { getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
 
 import { moduleName } from '../../constants';
+import { createTabExtension } from '../../shared/tabs/create-tab-extension';
 
 const options = {
   featureName: 'express-workflow',
@@ -23,3 +24,11 @@ export const radiologyAndImagingLeftPanelLink = getAsyncLifecycle(
     })),
   options,
 );
+
+// t("results", "Results")
+export const patientImagingOrdersResults = getSyncLifecycle(createTabExtension(), options);
+// t("order", "Orders")
+export const patientImagingOrdersTab = getAsyncLifecycle(
+  () => import('../../components/radiology-and-imaging/radiology-and-imaging-table.component'),
+  options,
+);

package/src/components/radiology-and-imaging/radiology-and-imaging-table.component.tsx

@@ -1,37 +1,58 @@
-import React, { useMemo } from 'react';
-import { useConfig } from '@openmrs/esm-framework';
+import { DataTableSkeleton, Layer } from '@carbon/react';
+import { ErrorState, FHIRResource, useConfig } from '@openmrs/esm-framework';
 import { EmptyState, useLaunchWorkspaceRequiringVisit, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
-import { Layer } from '@carbon/react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import OrderTable from '../../shared/orders/OrderTable';
 
-import { type Order } from '../../types/order/order';
 import { type ExpressWorkflowConfig } from '../../config-schema';
+import { usePatientOrders } from '../../hooks/useOrders';
 import styles from './radiology-and-imaging.scss';
 
 type RadiologyAndImagingTableProps = {
-  orders: Array<Order>;
   patientUuid: string;
-  patient: fhir.Patient;
+  patient: FHIRResource;
 };
-const RadiologyAndImagingTable: React.FC<RadiologyAndImagingTableProps> = ({ orders, patientUuid, patient }) => {
+const RadiologyAndImagingTable: React.FC<RadiologyAndImagingTableProps> = ({ patientUuid, patient }) => {
   const { t } = useTranslation();
-  const { imagingOrderTypeUuid, imagingOrderableConceptSets } = useConfig<ExpressWorkflowConfig>();
+  const { imagingOrderTypeUuid, imagingOrderableConceptSets, imagingConceptClassUuid } =
+    useConfig<ExpressWorkflowConfig>();
+  const {
+    data: orders,
+    isLoading,
+    error,
+    mutate: mutateOrders,
+  } = usePatientOrders(patientUuid, 'any', imagingOrderTypeUuid, undefined, undefined);
+  const filteredOrders = useMemo(
+    () => orders?.filter((order) => order.concept?.conceptClass?.uuid === imagingConceptClassUuid),
+    [imagingConceptClassUuid, orders],
+  );
   const { mutateVisitContext, visitContext } = usePatientChartStore(patientUuid);
 
-  const windowProps = useMemo(() => ({ encounterUuid: orders[0]?.encounter?.uuid }), [orders[0]?.encounter?.uuid]);
+  const windowProps = useMemo(() => ({ encounterUuid: filteredOrders?.[0]?.encounter?.uuid }), [filteredOrders]);
   const groupProps = useMemo(
     () => ({
       patient,
-      patientUuid: patient?.id,
+      patientUuid,
       visitContext: visitContext,
-      mutateVisitContext: mutateVisitContext,
+      mutateVisitContext: () => {
+        mutateOrders();
+        mutateVisitContext();
+      },
     }),
-    [patient, visitContext, mutateVisitContext],
+    [patient, patientUuid, visitContext, mutateOrders, mutateVisitContext],
   );
   const launchAddLabOrder = useLaunchWorkspaceRequiringVisit(patientUuid, 'order-basket');
 
-  if (orders?.length === 0) {
+  if (isLoading) {
+    return <DataTableSkeleton />;
+  }
+
+  if (error) {
+    return <ErrorState headerTitle={t('radiologyAndImagingOrders', 'Radiology & Imaging Orders')} error={error} />;
+  }
+
+  if (filteredOrders?.length === 0) {
     return (
       <Layer>
         <EmptyState
@@ -55,7 +76,7 @@ const RadiologyAndImagingTable: React.FC<RadiologyAndImagingTableProps> = ({ ord
   return (
     <OrderTable
       title={t('radiologyAndImagingOrders', 'Radiology & Imaging Orders')}
-      orders={orders}
+      orders={filteredOrders ?? []}
       onAdd={() =>
         launchAddLabOrder(
           {

package/src/components/radiology-and-imaging/radiology-and-imaging.component.tsx

@@ -1,28 +1,12 @@
 import React from 'react';
-import { useConfig } from '@openmrs/esm-framework';
-import OrdersTabs from '../../shared/orders/OrdersTabs';
-import RadiologyAndImagingTable from './radiology-and-imaging-table.component';
-import { ExpressWorkflowConfig } from '../../config-schema';
+import ExtensionTabs from '../../shared/tabs/extension-tabs.component';
 
 type RadiologyAndImagingTabsProps = {
   patientUuid: string;
-  patient: fhir.Patient;
 };
-const imagingRadiologyConceptClassUuid = '8caa332c-efe4-4025-8b18-3398328e1323';
 
-const RadiologyAndImagingTabs: React.FC<RadiologyAndImagingTabsProps> = ({ patientUuid, patient }) => {
-  const { imagingOrderTypeUuid } = useConfig<ExpressWorkflowConfig>();
-  return (
-    <OrdersTabs
-      patientUuid={patientUuid}
-      patient={patient}
-      basePath="radiology-and-imaging"
-      resultsSlotName="ewf-radiology-and-imaging-results-slot"
-      orderTypeUuid={imagingOrderTypeUuid}
-      filter={(order) => order.concept?.conceptClass?.uuid === imagingRadiologyConceptClassUuid}
-      Table={({ orders }) => <RadiologyAndImagingTable orders={orders} patientUuid={patientUuid} patient={patient} />}
-    />
-  );
+const RadiologyAndImagingTabs: React.FC<RadiologyAndImagingTabsProps> = ({ patientUuid }) => {
+  return <ExtensionTabs extensionSlotName="patient-imaging-tabs-slot" patientUuid={patientUuid} />;
 };
 
 export default RadiologyAndImagingTabs;

package/src/index.ts

@@ -1,7 +1,6 @@
 import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, registerFeatureFlag } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
 export * from './components/procedures/procedure-queues';
-
 const moduleName = '@kenyaemr/esm-express-workflow-app';
 
 const options = {