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

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,7 +330,7 @@
       "online": true,
       "offline": true
     },
-     {
+    {
       "name": "custom-stop-visit-overflow-menu-item",
       "component": "customStopVisitOverflowMenuItem",
       "online": true,
@@ -344,7 +342,7 @@
       "online": true,
       "offline": false,
       "featureFlag": "procedureQueues",
-      "slot":"procedure-orders-dashboard-slot"
+      "slot": "procedure-orders-dashboard-slot"
     },
     {
       "name": "procedure-form-extras",
@@ -353,6 +351,209 @@
       "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": [

package/src/shared/patient-chart/patient-summary-dashboard/patient-summary-dashboard.component.tsx

@@ -1,80 +1,12 @@
-import { Column, Grid, Layer } from '@carbon/react';
-import {
-  Activity,
-  Attachment,
-  Calendar,
-  CloudMonitoring,
-  Dashboard,
-  IbmWatsonDiscovery,
-  Settings,
-} from '@carbon/react/icons';
-import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import ExtensionTabs, { ExtensionTabItem } from '../../tabs/extension-tabs.component';
-import styles from './patient-summary-dashboard.scss';
+import React from 'react';
+import ExtensionTabs from '../../tabs/extension-tabs.component';
 
 type PatientSummaryDashboardProps = {
   patientUuid: string;
-  patient: fhir.Patient;
 };
-
-const PatientSummaryDashboard: React.FC<PatientSummaryDashboardProps> = ({ patientUuid, patient }) => {
-  const { t } = useTranslation();
-  const state = useMemo(() => ({ patientUuid, patient }), [patientUuid, patient]);
-  const items: Array<ExtensionTabItem> = [
-    {
-      label: t('patientSummary', 'Patient Summary'),
-      icon: Dashboard,
-      slotName: 'ewf-patient-summary-slot',
-      slotClassName: styles.ewfExtensionSlot,
-    },
-    {
-      label: t('vitalsAndAnthropometric', 'Vitals & Anthropometric'),
-      icon: Activity,
-      slotName: 'ewf-vitals-slot',
-      slotClassName: styles.ewfExtensionSlot,
-    },
-    {
-      label: t('carePanel', 'Care Panel'),
-      icon: CloudMonitoring,
-      slotName: 'ewf-care-panel-slot',
-      slotClassName: styles.ewfExtensionSlot,
-    },
-    {
-      label: t('immunizations', 'Immunizations'),
-      icon: IbmWatsonDiscovery,
-      slotName: 'ewf-immunizations-slot',
-      slotClassName: styles.ewfExtensionSlot,
-    },
-    {
-      label: t('relationships', 'Relationships'),
-      icon: Settings,
-      slotName: 'ewf-relationships-slot',
-      slotClassName: styles.ewfExtensionSlot,
-    },
-    {
-      label: t('appointments', 'Appointments'),
-      icon: Calendar,
-      slotName: 'ewf-appointments-slot',
-      slotClassName: styles.ewfExtensionSlot,
-    },
-    {
-      label: t('attachments', 'Attachments'),
-      icon: Attachment,
-      slotName: 'ewf-attachments-slot',
-      slotClassName: styles.ewfExtensionSlot,
-    },
-  ];
-
-  return (
-    <Layer>
-      <Grid condensed>
-        <Column lg={16} md={8} sm={4}>
-          <ExtensionTabs items={items} state={state} />
-        </Column>
-      </Grid>
-    </Layer>
-  );
+const PATIENT_CHART_PATIENT_SUMMARY_EXTENSION_SLOT = 'ewf-patient-chart-patient-summary-tabs-extension-slot';
+const PatientSummaryDashboard: React.FC<PatientSummaryDashboardProps> = ({ patientUuid }) => {
+  return <ExtensionTabs extensionSlotName={PATIENT_CHART_PATIENT_SUMMARY_EXTENSION_SLOT} patientUuid={patientUuid} />;
 };
 
 export default PatientSummaryDashboard;

package/src/shared/tabs/create-tab-extension.tsx

@@ -0,0 +1,33 @@
+import { ExtensionSlot, FHIRResource } from '@openmrs/esm-framework';
+import React from 'react';
+import styles from './patient-summary-dashboard.scss';
+export const createTabExtension = (extensionSlotName?: string) => {
+  return function TabExtension(props: any) {
+    return <TabWithExtensionSlot extensionSlotName={extensionSlotName} {...props} />;
+  };
+};
+
+const TabWithExtensionSlot: React.FC<{
+  extensionSlotName?: string;
+  patientUuid: string;
+  patient: FHIRResource;
+  _meta?: {
+    slot?: string;
+    [key: string]: any;
+  };
+}> = ({ extensionSlotName, patientUuid, patient, _meta }) => {
+  if (!_meta?.slot && !extensionSlotName) {
+    console.warn(
+      'No slot provided for TabExtension. Please provide a slot in the route meta or as an argument to createTabExtension.',
+    );
+    return null;
+  }
+  const { slot, ...others } = _meta || {};
+  return (
+    <ExtensionSlot
+      name={_meta?.slot ?? (extensionSlotName as string)}
+      state={{ patientUuid, patient, ...others }}
+      className={styles.ewfExtensionSlot}
+    />
+  );
+};

package/src/shared/tabs/extension-tabs.component.tsx

@@ -1,41 +1,59 @@
-import React, { useState } from 'react';
-import { Tabs, TabList, Tab, TabPanels, TabPanel } from '@carbon/react';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-
-export type ExtensionTabItem = {
-  label: React.ReactNode;
-  icon?: React.ComponentType<unknown>;
-  slotName: string;
-  slotClassName?: string;
-};
+import { Layer, Tab, TabList, TabPanel, TabPanels, Tabs, TabsSkeleton } from '@carbon/react';
+import { ErrorState, Extension, translateFrom, usePatient } from '@openmrs/esm-framework';
+import { ComponentContext, useExtensionSlot } from '@openmrs/esm-framework/src/internal';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 type ExtensionTabsProps = {
-  items: Array<ExtensionTabItem>;
-  state?: Record<string, unknown>;
-  contained?: boolean;
+  extensionSlotName: string;
+  patientUuid: string;
 };
 
-const ExtensionTabs: React.FC<ExtensionTabsProps> = ({ items, state, contained = true }) => {
-  const [activeTab, setActiveTab] = useState<number>(0);
+const ExtensionTabs: React.FC<ExtensionTabsProps> = ({ extensionSlotName, patientUuid }) => {
+  const { t } = useTranslation();
+  const { patient, isLoading, error } = usePatient(patientUuid);
+  const state = useMemo(() => ({ patientUuid, patient }), [patientUuid, patient]);
+
+  const { extensions, extensionSlotModuleName } = useExtensionSlot(extensionSlotName, state);
+  if (isLoading) {
+    return <TabsSkeleton />;
+  }
+
+  if (error) {
+    return <ErrorState headerTitle={t('consultation', 'Consultation')} error={error} />;
+  }
+
   return (
-    <Tabs selectedIndex={activeTab} onChange={({ selectedIndex }) => setActiveTab(selectedIndex)}>
-      <TabList contained={contained}>
-        {items.map((item) => (
-          <Tab key={item.slotName} renderIcon={item.icon}>
-            {item.label}
-          </Tab>
-        ))}
-      </TabList>
-      <TabPanels>
-        {items.map((item, index) => (
-          <TabPanel key={item.slotName}>
-            {index === activeTab ? (
-              <ExtensionSlot className={item.slotClassName} name={item.slotName} state={state} />
-            ) : null}
-          </TabPanel>
-        ))}
-      </TabPanels>
-    </Tabs>
+    <Layer>
+      <Tabs>
+        <TabList contained>
+          {extensions.map((ext) => (
+            <Tab key={ext.name}>{translateFrom(extensionSlotModuleName, ext.meta.title, ext.meta.title)}</Tab>
+          ))}
+        </TabList>
+        <TabPanels
+          data-extension-slot-name={extensionSlotName}
+          data-extension-slot-module-name={extensionSlotModuleName}>
+          {extensions.map((ext) => (
+            <TabPanel key={ext.name}>
+              <ComponentContext.Provider
+                key={ext.id}
+                value={{
+                  featureName: ext.meta.featureName,
+                  moduleName: ext.moduleName,
+                  extension: {
+                    extensionId: ext.id,
+                    extensionSlotName: extensionSlotName,
+                    extensionSlotModuleName: ext.moduleName,
+                  },
+                }}>
+                <Extension state={state} />
+              </ComponentContext.Provider>
+            </TabPanel>
+          ))}
+        </TabPanels>
+      </Tabs>
+    </Layer>
   );
 };
 

package/translations/am.json

@@ -76,6 +76,8 @@
   "clientsPatientsAttendedTo": "Clients/Patients attended to",
   "clientsPatientsWaiting": "Clients/Patients waiting",
   "clinicalEncounter": "Clinical Encounter",
+  "clinicalEncounterTab": "የክሊኒካል ግኝት",
+  "clinicalNotes": "የክሊኒካል ማስታወሻዎች",
   "comingFrom": "Coming from",
   "completedProcedures": "Completed Procedures",
   "concentrationRate": "Concentration rate",
@@ -271,7 +273,7 @@
   "patientManagement": "የሕመምተኛ አስተዳደር",
   "patientMissingUuid": "Patient is missing a UUID",
   "patientsAwaiting": "የሚጠብቅ ሕመምተኛ",
-  "patientSummary": "Patient Summary",
+  "patientSummaryTab": "የታካሚ ማጠቃለያ",
   "pendingMedicationOrders": "Pending Medication Orders",
   "pharmacy": "Pharmacy",
   "pharmacyOrdersDescription": "Active medication prescriptions awaiting pharmacist review and dispensing",
@@ -289,6 +291,7 @@
   "priority": "Priority",
   "priorityComment": "Priority Comment",
   "procedures": "Procedures",
+  "proceduresAndOrders": "ሂደቶች እና ትዕዛዞች",
   "proceduresAwaiting": "Procedures Awaiting",
   "proceduresCompleted": "Procedures Completed",
   "proceduresOrders": "Procedures Orders",
@@ -326,6 +329,7 @@
   "results": "Results",
   "resultsOfOperation": "Results of Operation",
   "resultsOfOperationRequired": "Results of operation are required",
+  "resultsTab": "ውጤቶች",
   "revisitPatientResults_one": "Revisit patient(s) ({{count}})",
   "revisitPatientResults_other": "Revisit patient(s) ({{count}})",
   "save": "Save",

package/translations/en.json

@@ -76,6 +76,8 @@
   "clientsPatientsAttendedTo": "Clients/Patients attended to",
   "clientsPatientsWaiting": "Clients/Patients waiting",
   "clinicalEncounter": "Clinical Encounter",
+  "clinicalEncounterTab": "Clinical Encounter",
+  "clinicalNotes": "Clinical Notes",
   "comingFrom": "Coming from",
   "completedProcedures": "Completed Procedures",
   "concentrationRate": "Concentration rate",
@@ -271,7 +273,7 @@
   "patientManagement": "Patient Management",
   "patientMissingUuid": "Patient is missing a UUID",
   "patientsAwaiting": "Patient awaiting",
-  "patientSummary": "Patient Summary",
+  "patientSummaryTab": "Patient Summary",
   "pendingMedicationOrders": "Pending Medication Orders",
   "pharmacy": "Pharmacy",
   "pharmacyOrdersDescription": "Active medication prescriptions awaiting pharmacist review and dispensing",
@@ -289,6 +291,7 @@
   "priority": "Priority",
   "priorityComment": "Priority Comment",
   "procedures": "Procedures",
+  "proceduresAndOrders": "Procedures & Orders",
   "proceduresAwaiting": "Procedures Awaiting",
   "proceduresCompleted": "Procedures Completed",
   "proceduresOrders": "Procedures Orders",
@@ -326,6 +329,7 @@
   "results": "Results",
   "resultsOfOperation": "Results of Operation",
   "resultsOfOperationRequired": "Results of operation are required",
+  "resultsTab": "Results",
   "revisitPatientResults_one": "Revisit patient(s) ({{count}})",
   "revisitPatientResults_other": "Revisit patient(s) ({{count}})",
   "save": "Save",

package/translations/fr.json

@@ -76,6 +76,8 @@
   "clientsPatientsAttendedTo": "Clients/Patients pris en charge",
   "clientsPatientsWaiting": "Clients/Patients en attente",
   "clinicalEncounter": "Consultation clinique",
+  "clinicalEncounterTab": "Consultation clinique",
+  "clinicalNotes": "Notes cliniques",
   "comingFrom": "Provenant de",
   "completedProcedures": "Procédures terminées",
   "concentrationRate": "Taux de concentration",
@@ -272,7 +274,7 @@
   "patientManagement": "Prise en charge du patient",
   "patientMissingUuid": "Le patient n’a pas d’UUID",
   "patientsAwaiting": "Patients en attente",
-  "patientSummary": "Résumé du patient",
+  "patientSummaryTab": "Résumé du patient",
   "pendingMedicationOrders": "Prescriptions en attente",
   "pharmacy": "Pharmacie",
   "pharmacyOrdersDescription": "Prescriptions actives en attente de validation et de délivrance par la pharmacie",
@@ -290,6 +292,7 @@
   "priority": "Priorité",
   "priorityComment": "Commentaire de priorité",
   "procedures": "Procédures",
+  "proceduresAndOrders": "Procédures et ordonnances",
   "proceduresAwaiting": "Procédures en attente",
   "proceduresCompleted": "Procédures terminées",
   "proceduresOrders": "Ordres de procédures",
@@ -327,6 +330,7 @@
   "results": "Résultats",
   "resultsOfOperation": "Résultats de l’opération",
   "resultsOfOperationRequired": "Les résultats de l’opération sont requis",
+  "resultsTab": "Résultats",
   "revisitPatientResults_one": "Patient(s) en revisite ({{count}})",
   "revisitPatientResults_many": "Patients en revisite ({{count}})",
   "revisitPatientResults_other": "Patient(s) en revisite ({{count}})",

package/translations/sw.json

@@ -76,6 +76,8 @@
   "clientsPatientsAttendedTo": "Clients/Patients attended to",
   "clientsPatientsWaiting": "Clients/Patients waiting",
   "clinicalEncounter": "Clinical Encounter",
+  "clinicalEncounterTab": "Mkutano wa Kliniki",
+  "clinicalNotes": "Maelezo ya Kliniki",
   "comingFrom": "Coming from",
   "completedProcedures": "Completed Procedures",
   "concentrationRate": "Concentration rate",
@@ -271,7 +273,7 @@
   "patientManagement": "Patient Management",
   "patientMissingUuid": "Patient is missing a UUID",
   "patientsAwaiting": "Patient awaiting",
-  "patientSummary": "Patient Summary",
+  "patientSummaryTab": "Muhtasari wa Mgonjwa",
   "pendingMedicationOrders": "Pending Medication Orders",
   "pharmacy": "Pharmacy",
   "pharmacyOrdersDescription": "Active medication prescriptions awaiting pharmacist review and dispensing",
@@ -289,6 +291,7 @@
   "priority": "Priority",
   "priorityComment": "Priority Comment",
   "procedures": "Procedures",
+  "proceduresAndOrders": "Taratibu na Maagizo",
   "proceduresAwaiting": "Procedures Awaiting",
   "proceduresCompleted": "Procedures Completed",
   "proceduresOrders": "Procedures Orders",
@@ -326,6 +329,7 @@
   "results": "Results",
   "resultsOfOperation": "Results of Operation",
   "resultsOfOperationRequired": "Results of operation are required",
+  "resultsTab": "Matokeo",
   "revisitPatientResults_one": "Revisit patient(s) ({{count}})",
   "revisitPatientResults_other": "Revisit patient(s) ({{count}})",
   "save": "Save",