@openmrs/esm-patient-tests-app 11.3.1-pre.9388 → 11.3.1-pre.9398

package/src/test-orders/lab-order-basket-panel/lab-order-basket-panel.extension.tsx

@@ -11,6 +11,7 @@ import {
   useConfig,
   MaybeIcon,
   launchWorkspace,
+  useWorkspaces,
   type Visit,
 } from '@openmrs/esm-framework';
 import { type OrderBasketItem, useOrderBasket, useOrderType } from '@openmrs/esm-patient-common-lib';
@@ -53,6 +54,11 @@ const LabOrderBasketPanelExtension: React.FC<OrderBasketSlotProps> = ({ patient
   );
 };
 
+export const WORKSPACES = {
+  TEST_RESULTS_FORM: 'test-results-form-workspace',
+  ORDER_BASKET: 'order-basket',
+};
+
 type OrderTypeConfig = ConfigObject['additionalTestOrderTypes'][0];
 
 interface LabOrderBasketPanelProps extends OrderTypeConfig {
@@ -61,9 +67,14 @@ interface LabOrderBasketPanelProps extends OrderTypeConfig {
 
 function LabOrderBasketPanel({ orderTypeUuid, label, icon, patient }: LabOrderBasketPanelProps) {
   const { t } = useTranslation();
+  type WorkSpaceType = (typeof WORKSPACES)[keyof typeof WORKSPACES];
   const isTablet = useLayoutType() === 'tablet';
   const { orderType, isLoadingOrderType } = useOrderType(orderTypeUuid);
-
+  const { workspaces = [{ name: WORKSPACES.ORDER_BASKET, additionalProps: {} }] } = useWorkspaces();
+  const [prevWorkSpace, setPrevWorkSpace] = useState(workspaces[0]?.name);
+  const [prevOrder, setPrevOrder] = useState(
+    workspaces[0]?.name === WORKSPACES.TEST_RESULTS_FORM ? workspaces[0].additionalProps['order'] : null,
+  );
   const { orders, setOrders } = useOrderBasket<TestOrderBasketItem>(patient, orderTypeUuid, prepTestOrderPostData);
   const [isExpanded, setIsExpanded] = useState(orders.length > 0);
   const {
@@ -101,31 +112,40 @@ function LabOrderBasketPanel({ orderTypeUuid, label, icon, patient }: LabOrderBa
       discontinuedOrderBasketItems,
     };
   }, [orders]);
+  const isWorkSpaceType = useCallback((value: string): value is WorkSpaceType => {
+    return Object.values(WORKSPACES).includes(value as WorkSpaceType);
+  }, []);
 
   const openNewLabForm = useCallback(() => {
-    closeWorkspace('order-basket', {
+    closeWorkspace(isWorkSpaceType(prevWorkSpace) ? prevWorkSpace : WORKSPACES.ORDER_BASKET, {
       ignoreChanges: true,
       onWorkspaceClose: () =>
         launchWorkspace('add-lab-order', {
           orderTypeUuid: orderTypeUuid,
+          prevWorkSpace: prevWorkSpace,
+          isWorkSpaceType: isWorkSpaceType,
+          prevOrder: prevOrder,
         }),
       closeWorkspaceGroup: false,
     });
-  }, [orderTypeUuid]);
+  }, [orderTypeUuid, isWorkSpaceType, prevOrder, prevWorkSpace]);
 
   const openEditLabForm = useCallback(
     (order: OrderBasketItem) => {
-      closeWorkspace('order-basket', {
+      closeWorkspace(isWorkSpaceType(prevWorkSpace) ? prevWorkSpace : WORKSPACES.ORDER_BASKET, {
         ignoreChanges: true,
         onWorkspaceClose: () =>
           launchWorkspace('add-lab-order', {
             order,
             orderTypeUuid: orderTypeUuid,
+            prevWorkSpace: prevWorkSpace,
+            isWorkSpaceType: isWorkSpaceType,
+            prevOrder: prevOrder,
           }),
         closeWorkspaceGroup: false,
       });
     },
-    [orderTypeUuid],
+    [orderTypeUuid, isWorkSpaceType, prevOrder, prevWorkSpace],
   );
 
   const removeLabOrder = useCallback(
@@ -154,7 +174,13 @@ function LabOrderBasketPanel({ orderTypeUuid, label, icon, patient }: LabOrderBa
       <div className={styles.container}>
         <div className={styles.iconAndLabel}>
           <MaybeIcon icon={icon ? icon : 'omrs-icon-generic-order-type'} size={isTablet ? 40 : 24} />
-          <h4 className={styles.heading}>{`${label ? t(label) : orderType?.display} (${orders.length})`}</h4>
+          <h4 className={styles.heading}>{`${
+            isWorkSpaceType(prevWorkSpace) && prevWorkSpace === WORKSPACES.ORDER_BASKET
+              ? label
+                ? t(label)
+                : orderType?.display
+              : t('tests', 'Tests')
+          } (${orders.length})`}</h4>
         </div>
         <div className={styles.buttonContainer}>
           <Button

package/src/test-orders/lab-order-basket-panel/lab-order-basket-panel.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { screen, render } from '@testing-library/react';
 import { useOrderType } from '@openmrs/esm-patient-common-lib';
-import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import { getDefaultsFromConfigSchema, useConfig, useWorkspaces, type WorkspacesInfo } from '@openmrs/esm-framework';
 import { type ConfigObject, configSchema } from '../../config-schema';
 import type { TestOrderBasketItem } from '../../types';
 import LabOrderBasketPanel from './lab-order-basket-panel.extension';
@@ -11,6 +11,8 @@ import { mockPatient } from 'tools';
 const mockUseOrderBasket = jest.fn();
 const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
 const mockUseOrderType = jest.mocked(useOrderType);
+const mockUseWorkSpaces = jest.mocked(useWorkspaces);
+const mockWorkSpacesInfo = {} as WorkspacesInfo;
 
 jest.mock('@openmrs/esm-patient-common-lib', () => ({
   ...jest.requireActual('@openmrs/esm-patient-common-lib'),
@@ -45,6 +47,9 @@ const testProps = {
 };
 
 describe('LabOrderBasketPanel', () => {
+  beforeEach(() => {
+    mockUseWorkSpaces.mockReturnValue(mockWorkSpacesInfo);
+  });
   test('renders an empty state when no items are selected in the order basket', () => {
     mockUseOrderBasket.mockReturnValue({ orders: [] });
     render(<LabOrderBasketPanel {...testProps} />);

package/translations/en.json

@@ -6,6 +6,7 @@
   "age": "Age",
   "back": "Back",
   "backToOrderBasket": "Back to order basket",
+  "backToTestResults": "Back to test Results",
   "backToTimeline": "Back to timeline",
   "cancel": "Cancel",
   "checkFilters": "Check the filters above",
@@ -80,6 +81,7 @@
   "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "Return to timeline",
   "saveOrder": "Save order",
+  "saveTest": "Save test",
   "scheduledDate": "Scheduled date",
   "scheduledDateRequired": "Scheduled date is required",
   "search": "Search",