Closing and opening new workspace should not close workspaceGroup

mekomsolutions · Jan 16, 2025 · 36c35b5 · 36c35b5
1 parent bf872b6
commit 36c35b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/medical-orders/medical-supply-order-form/medical-supply-order-form.component.tsx b/src/medical-orders/medical-supply-order-form/medical-supply-order-form.component.tsx
@@ -140,6 +140,7 @@ export function OrderForm({
 
       closeWorkspaceWithSavedChanges({
         onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+        closeWorkspaceGroup: false,
       });
     },
     [orders, setOrders, session?.currentProvider?.uuid, closeWorkspaceWithSavedChanges, initialOrder],
@@ -149,6 +150,7 @@ export function OrderForm({
     setOrders(orders.filter((order) => order.concept.uuid !== defaultValues.concept.conceptUuid));
     closeWorkspace({
       onWorkspaceClose: () => launchPatientWorkspace('order-basket'),
+      closeWorkspaceGroup: false,
     });
   }, [closeWorkspace, orders, setOrders, defaultValues]);
 

diff --git a/translations/en.json b/translations/en.json
@@ -29,6 +29,8 @@
   "removeFromBasket": "Remove from basket",
   "returnToOrderBasket": "Return to order basket",
   "saveOrder": "Save order",
+  "scheduledDate": "Scheduled date",
+  "scheduledDateRequired": "Scheduled date is required",
   "searchAgain": "search again",
   "searchMedicalSupplyOrderables": "Search medical supply orderables",
   "searchResultsMatchesForTerm_one": "{{count}} results for \"{{searchTerm}}\"",

diff --git a/translations/fr.json b/translations/fr.json
@@ -29,6 +29,8 @@
   "removeFromBasket": "Retirer du panier",
   "returnToOrderBasket": "Retourner au panier de commande",
   "saveOrder": "Enregistrer la commande",
+  "scheduledDate": "Scheduled date",
+  "scheduledDateRequired": "Scheduled date is required",
   "searchAgain": "Rechercher à nouveau",
   "searchMedicalSupplyOrderables": "Search medical supply orderables",
   "searchResultsMatchesForTerm_one": "{{count}} résultats pour \"{{searchTerm}}\"",