Add 'ward-patient' workspace to the order basket related workspaces

openmrs · Dec 4, 2024 · b019a98 · b019a98
1 parent 9a9fcf0
commit b019a98
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/packages/esm-patient-medications-app/src/routes.json b/packages/esm-patient-medications-app/src/routes.json
@@ -43,7 +43,8 @@
       "name": "add-drug-order",
       "title": "addDrugOrderWorkspaceTitle",
       "component": "addDrugOrderWorkspace",
-      "type": "order"
+      "type": "order",
+      "groups": ["ward-patient"]
     }
   ]
 }
diff --git a/packages/esm-patient-orders-app/src/routes.json b/packages/esm-patient-orders-app/src/routes.json
@@ -33,6 +33,11 @@
       "slot": "action-menu-patient-chart-items-slot",
       "order": 0
     },
+    {
+      "name": "order-basket-ward-action-menu",
+      "component": "orderBasketActionMenu",
+      "slot": "action-menu-ward-patient-items-slot"
+    },
     {
       "name": "patient-orders-summary-dashboard",
       "component": "ordersDashboardLink",
@@ -59,7 +64,8 @@
       "title": "orderBasketWorkspaceTitle",
       "component": "orderBasketWorkspace",
       "type": "order",
-      "canHide": true
+      "canHide": true,
+      "groups": ["ward-patient"]
     },
     {
       "name": "patient-orders-form-workspace",

diff --git a/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx b/packages/esm-patient-tests-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
@@ -48,6 +48,7 @@ export default function AddLabOrderWorkspace({
     closeWorkspace({
       ignoreChanges: true,
       onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+      closeWorkspaceGroup: false,
     });
   }, [closeWorkspace]);
 

diff --git a/...ient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx b/...ient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx
@@ -62,13 +62,15 @@ export default function LabOrderBasketPanelExtension() {
     closeWorkspace('order-basket', {
       ignoreChanges: true,
       onWorkspaceClose: () => launchPatientWorkspace('add-lab-order'),
+      closeWorkspaceGroup: false,
     });
   }, []);
 
   const openEditLabForm = useCallback((order: OrderBasketItem) => {
     closeWorkspace('order-basket', {
       ignoreChanges: true,
       onWorkspaceClose: () => launchPatientWorkspace('add-lab-order', { order }),
+      closeWorkspaceGroup: false,
     });
   }, []);
 

diff --git a/packages/esm-patient-tests-app/src/routes.json b/packages/esm-patient-tests-app/src/routes.json
@@ -51,7 +51,8 @@
       "name": "add-lab-order",
       "type": "order",
       "component": "addLabOrderWorkspace",
-      "title": "addLabOrderWorkspaceTitle"
+      "title": "addLabOrderWorkspaceTitle",
+      "groups": ["ward-patient"]
     }
   ]
 }