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

package/src/routes.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
     "fhir2": ">=1.2",
-   "webservices.rest": ">=2.24.0"
+    "webservices.rest": ">=2.24.0"
   },
   "pages": [
     {
@@ -12,10 +12,6 @@
     {
       "component": "queuesAdminHome",
       "route": "queues-admin"
-    },
-    {
-      "component": "appointmentsDashboard",
-      "route": "appointments"
     }
   ],
   "extensions": [
@@ -29,6 +25,27 @@
         "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",
@@ -125,7 +142,7 @@
     {
       "name": "custom-visit-form-queue-fields",
       "component": "checkinFormExtraExtension",
-      "slot":"visit-form-bottom-slot",
+      "slot": "visit-form-bottom-slot",
       "order": 0
     },
     {
@@ -193,7 +210,7 @@
       "online": true,
       "offline": false
     },
-     {
+    {
       "name": "ewf-laboratory-dashboard-link",
       "component": "laboratoryLeftPanelLink",
       "slot": "patient-chart-dashboard-slot",
@@ -266,15 +283,15 @@
         "hideDashboardTitle": true
       }
     },
-
-        {
+    {
       "name": "ewf-pharmacy-dashboard",
       "component": "pharmacyTabs",
       "slot": "ewf-patient-chart-pharmacy-dashboard-slot",
       "online": true,
       "offline": false
     },
-    {"name": "ewf-admissions-dashboard-link",
+    {
+      "name": "ewf-admissions-dashboard-link",
       "component": "admissionsDashboardLink",
       "slot": "patient-chart-dashboard-slot",
       "meta": {
@@ -305,38 +322,287 @@
       "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": "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"
+      }
+    }
+  ],
+  "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"
     }
   ],
-
-  "workspaces": [
-    {
-      "name": "express-workflow-workspace",
-      "component": "expressWorkflowWorkspace",
-      "title": "Express Workflow Workspace",
-      "type": "workspace",
-      "canMaximize": true,
-      "canHide": true
+  "workspaceWindows2": [
+    {
+      "name": "ewf-start-visit",
+      "group": "ewf-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"
-    }
-  ],
-  "workspaceGroups": [
-    {
-      "name": "express-workflow",
-      "members": [
-        "add-drug-order",
-        "order-basket",
-        "add-lab-order",
-        "express-workflow-workspace",
-        "start-visit-workspace-form"
-      ]
+    },
+    {
+      "name": "print-order-preview-modal",
+      "component": "printOrderPreviewModal"
+    },
+    {
+      "name": "custom-end-visit-dialog",
+      "component": "customEndVisitModal"
+    },
+    {
+      "name": "print-prescription-modal",
+      "component": "printPrescriptionModal"
     }
   ]
 }

package/src/shared/dashboard-link/dashboard-link.component.tsx

@@ -11,23 +11,26 @@ export interface LinkConfig {
   name: string;
   title: string;
   icon?: string | CarbonIconType;
+  basePath?: string;
 }
 
-export function LinkExtension({ config }: { config: LinkConfig }) {
+export function LinkExtension({ config }: { readonly config: LinkConfig }) {
   const { t } = useTranslation();
-  const { name, title, icon } = config;
+  const { name, title, icon, basePath = 'home' } = config;
   const nameSegment = name.split('/').at(-1);
   const location = useLocation();
-  const spaBasePath = window.getOpenmrsSpaBase() + 'home';
+  const spaBasePath = window.getOpenmrsSpaBase() + basePath;
 
-  let urlSegment = useMemo(() => decodeURIComponent(last(location.pathname.split('/'))), [location.pathname]);
-  const IconComp = typeof icon !== 'string' ? (icon as CarbonIconType) : null;
+  let urlSegment = useMemo(() => decodeURIComponent(last(location.pathname.split('/')) || ''), [location.pathname]);
+  const IconComp = typeof icon === 'string' ? null : icon;
+
+  const url = spaBasePath + '/' + name;
+
+  const cleanUrl = url.replaceAll(/(?<!:)\/\//g, '/');
 
   const isActive = nameSegment === urlSegment;
   return (
-    <ConfigurableLink
-      to={spaBasePath + '/' + name}
-      className={`cds--side-nav__link ${isActive && 'active-left-nav-link'}`}>
+    <ConfigurableLink to={cleanUrl} className={`cds--side-nav__link ${isActive && 'active-left-nav-link'}`}>
       {typeof icon === 'string' ? (
         <MaybeIcon icon={icon} className={styles.icon} size={16} />
       ) : (

package/src/shared/orders/OrderTable.scss

@@ -0,0 +1,7 @@
+@use '@carbon/layout';
+
+.buttonGroup {
+  display: flex;
+  justify-content: flex-end;
+  gap: layout.$spacing-05;
+}

package/src/shared/orders/OrderTable.tsx

@@ -1,11 +1,14 @@
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { DataTable, Table, TableHead, TableRow, TableHeader, TableBody, TableCell, Layer, Button } from '@carbon/react';
-import { Add } from '@carbon/react/icons';
+import { Add, Printer } from '@carbon/react/icons';
 import { useTranslation } from 'react-i18next';
-import { parseDate, formatDatetime } from '@openmrs/esm-framework';
+import { parseDate, formatDatetime, translateFrom, showModal, useVisit, OpenmrsResource } from '@openmrs/esm-framework';
 import { PriorityPill, StatusPill } from './OrderPills';
 import { type Order } from '../../types/order/order';
 import { CardHeader } from '@openmrs/esm-patient-common-lib';
+import styles from './OrderTable.scss';
+
+export type OrderDocumentType = 'lab' | 'radiology' | 'procedure';
 
 type OrderTableProps = {
   title: string;
@@ -15,15 +18,22 @@ type OrderTableProps = {
   tableCellClassName: string;
   priorityPillClassName: string;
   statusPillClassName: string;
+  module: string;
+  orderType: OrderDocumentType;
+  patientName?: string;
+  patientId?: string;
+  patientAge?: string | number;
 };
 
 const defaultHeaders = (t: (k: string, d: string) => string) => [
   { header: t('orderNo', 'Order No'), key: 'orderNo' },
   { header: t('dateOrdered', 'Date Ordered'), key: 'dateOrdered' },
   { header: t('order', 'Order'), key: 'order' },
+  { header: t('orderReason', 'Order reason'), key: 'orderReason' },
   { header: t('priority', 'Priority'), key: 'priority' },
   { header: t('orderBy', 'Order By'), key: 'orderBy' },
   { header: t('status', 'Status'), key: 'status' },
+  { header: t('actions', 'Actions'), key: 'actions' },
 ];
 
 export const OrderTable: React.FC<OrderTableProps> = ({
@@ -34,17 +44,65 @@ export const OrderTable: React.FC<OrderTableProps> = ({
   tableCellClassName,
   priorityPillClassName,
   statusPillClassName,
+  module,
+  orderType,
+  patientName,
+  patientId,
+  patientAge,
 }) => {
   const { t } = useTranslation();
 
+  const ordersByUuid = useMemo(() => new Map(orders.map((o) => [o.uuid, o])), [orders]);
+
+  const handlePrintOrder = useCallback(
+    (uuid: string) => {
+      const order = ordersByUuid.get(uuid);
+      if (!order) {
+        return;
+      }
+      const dispose = showModal('print-order-preview-modal', {
+        onClose: () => dispose(),
+        orders: [order],
+        orderType,
+        patientName,
+        patientId,
+        patientAge,
+      });
+    },
+    [ordersByUuid, orderType, patientName, patientId, patientAge],
+  );
+
   const rows = orders.map((order) => ({
     id: order.uuid,
     orderNo: order.orderNumber,
     dateOrdered: formatDatetime(parseDate(order.dateActivated), { mode: 'standard' }),
     order: order.concept?.display?.replace('_', ' ') ?? '--',
-    priority: <PriorityPill value={order.urgency} className={priorityPillClassName} dataAttrName="priority" />,
+    priority: (
+      <PriorityPill
+        value={translateFrom(module, order.urgency, order.urgency)}
+        className={priorityPillClassName}
+        dataAttrName="priority"
+      />
+    ),
     orderBy: order.orderer?.display ?? '--',
-    status: <StatusPill value={order.fulfillerStatus} className={statusPillClassName} dataAttrName="status" />,
+    orderReason: (order.orderReason as unknown as OpenmrsResource)?.display,
+    status: (
+      <StatusPill
+        value={translateFrom(module, order.fulfillerStatus, order.fulfillerStatus)}
+        className={statusPillClassName}
+        dataAttrName="status"
+      />
+    ),
+    actions: (
+      <Button
+        kind="ghost"
+        size="sm"
+        hasIconOnly
+        iconDescription={t('printOrder', 'Print Order')}
+        renderIcon={Printer}
+        onClick={() => handlePrintOrder(order.uuid)}
+      />
+    ),
   }));
 
   if (orders?.length === 0) {
@@ -54,9 +112,11 @@ export const OrderTable: React.FC<OrderTableProps> = ({
   return (
     <div className={containerClassName}>
       <CardHeader title={title}>
-        <Button onClick={onAdd} kind="ghost" renderIcon={Add}>
-          {t('addOrder', 'Add Order')}
-        </Button>
+        <div className={styles.buttonGroup}>
+          <Button onClick={onAdd} kind="ghost" renderIcon={Add}>
+            {t('addOrder', 'Add Order')}
+          </Button>
+        </div>
       </CardHeader>
       <DataTable size="sm" useZebraStyles headers={defaultHeaders(t)} isSortable rows={rows}>
         {({ getHeaderProps, getRowProps, getTableProps, headers, rows }) => (