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

openmrs · Dec 17, 2024 · c7e7b75 · c7e7b75
1 parent ee59431
commit c7e7b75
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
@@ -35,6 +35,11 @@
         "fullWidth": false
       }
     },
+    {
+      "name": "order-basket-ward-action-menu",
+      "component": "orderBasketActionMenu",
+      "slot": "action-menu-ward-patient-items-slot"
+    },
     {
       "name": "patient-orders-summary-dashboard",
       "component": "ordersDashboardLink",
@@ -61,7 +66,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/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"]
     }
   ]
 }
diff --git a/packages/esm-patient-tests-app/src/test-orders/add-test-order/add-test-order.workspace.tsx b/packages/esm-patient-tests-app/src/test-orders/add-test-order/add-test-order.workspace.tsx
@@ -65,6 +65,7 @@ export default function AddLabOrderWorkspace({
     closeWorkspace({
       ignoreChanges: true,
       onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+      closeWorkspaceGroup: false,
     });
   }, [closeWorkspace]);
 

diff --git a/...ent-tests-app/src/test-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx b/...ent-tests-app/src/test-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx
@@ -102,6 +102,7 @@ function LabOrderBasketPanel({ orderTypeUuid, label, icon }: LabOrderBasketPanel
         launchPatientWorkspace('add-lab-order', {
           orderTypeUuid: orderTypeUuid,
         }),
+      closeWorkspaceGroup: false,
     });
   }, [orderTypeUuid]);
 
@@ -114,6 +115,7 @@ function LabOrderBasketPanel({ orderTypeUuid, label, icon }: LabOrderBasketPanel
             order,
             orderTypeUuid: orderTypeUuid,
           }),
+        closeWorkspaceGroup: false,
       });
     },
     [orderTypeUuid],