@openmrs/esm-patient-medications-app 11.3.1-pre.9447 → 11.3.1-pre.9455

package/src/add-drug-order/add-drug-order.test.tsx

@@ -10,19 +10,18 @@ import {
   mockSessionDataResponse,
 } from '__mocks__';
 import { getTemplateOrderBasketItem, useDrugSearch, useDrugTemplate } from './drug-search/drug-search.resource';
-import { closeWorkspace, launchWorkspace, useSession } from '@openmrs/esm-framework';
+import { launchWorkspace2, useSession } from '@openmrs/esm-framework';
 import { type PostDataPrepFunction, useOrderBasket } from '@openmrs/esm-patient-common-lib';
 import { _resetOrderBasketStore } from '@openmrs/esm-patient-common-lib/src/orders/store';
 import AddDrugOrderWorkspace from './add-drug-order.workspace';
 
-const mockCloseWorkspace = closeWorkspace as jest.Mock;
-const mockLaunchWorkspace = jest.mocked(launchWorkspace);
+const mockCloseWorkspace = jest.fn();
+const mockLaunchWorkspace = jest.mocked(launchWorkspace2);
 const mockUseSession = jest.mocked(useSession);
 const mockUseDrugSearch = jest.mocked(useDrugSearch);
 const mockUseDrugTemplate = jest.mocked(useDrugTemplate);
 const usePatientOrdersMock = jest.fn();
 
-mockCloseWorkspace.mockImplementation((name, { onWorkspaceClose }) => onWorkspaceClose());
 mockUseSession.mockReturnValue(mockSessionDataResponse.data);
 
 /** This is needed to render the order form */
@@ -124,12 +123,12 @@ describe('AddDrugOrderWorkspace drug search', () => {
 
     expect(hookResult.current.orders).toEqual([
       expect.objectContaining({
-        ...getTemplateOrderBasketItem(mockDrugSearchResultApiData[2]),
+        ...getTemplateOrderBasketItem(mockDrugSearchResultApiData[2], null),
         isOrderIncomplete: true,
         startDate: expect.any(Date),
       }),
     ]);
-    expect(mockLaunchWorkspace).toHaveBeenCalledWith('order-basket');
+    expect(mockCloseWorkspace).toHaveBeenCalled();
   });
 
   test('can open the drug form ', async () => {
@@ -172,6 +171,7 @@ describe('AddDrugOrderWorkspace drug search', () => {
         expect.objectContaining({
           ...getTemplateOrderBasketItem(
             mockDrugSearchResultApiData[0],
+            null,
             undefined,
             mockDrugOrderTemplateApiData[mockDrugSearchResultApiData[0].uuid][0],
           ),
@@ -188,15 +188,23 @@ describe('AddDrugOrderWorkspace drug search', () => {
 function renderAddDrugOrderWorkspace() {
   render(
     <AddDrugOrderWorkspace
-      order={undefined as any}
-      closeWorkspace={({ onWorkspaceClose }) => onWorkspaceClose()}
-      closeWorkspaceWithSavedChanges={({ onWorkspaceClose }) => onWorkspaceClose()}
-      promptBeforeClosing={() => false}
-      patientUuid={mockPatient.id}
-      patient={mockPatient}
-      setTitle={jest.fn()}
-      visitContext={null}
-      mutateVisitContext={null}
+      workspaceProps={{
+        order: undefined as any,
+      }}
+      groupProps={{
+        patientUuid: mockPatient.id,
+        patient: mockPatient,
+        visitContext: null,
+        mutateVisitContext: null,
+      }}
+      workspaceName={''}
+      launchChildWorkspace={jest.fn()}
+      closeWorkspace={mockCloseWorkspace}
+      windowProps={{
+        encounterUuid: '',
+      }}
+      windowName={''}
+      isRootWorkspace={false}
     />,
   );
 }

package/src/add-drug-order/add-drug-order.workspace.tsx

@@ -1,129 +1,36 @@
-import React, { type ComponentProps, useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Button } from '@carbon/react';
-import { ArrowLeftIcon, launchWorkspace, useLayoutType } from '@openmrs/esm-framework';
-import { type DefaultPatientWorkspaceProps, useOrderBasket } from '@openmrs/esm-patient-common-lib';
-import { prepMedicationOrderPostData } from '../api/api';
-import { ordersEqual } from './drug-search/helpers';
-import type { DrugOrderBasketItem } from '../types';
-import { DrugOrderForm } from './drug-order-form.component';
-import DrugSearch from './drug-search/drug-search.component';
-import styles from './add-drug-order.scss';
+import React from 'react';
+import {
+  type DrugOrderBasketItem,
+  type OrderBasketWindowProps,
+  type PatientWorkspace2DefinitionProps,
+} from '@openmrs/esm-patient-common-lib';
+import AddDrugOrder from './add-drug-order.component';
 
-export interface AddDrugOrderWorkspaceAdditionalProps {
+export interface AddDrugOrderWorkspaceProps {
   order: DrugOrderBasketItem;
 }
 
-export interface AddDrugOrderWorkspace extends DefaultPatientWorkspaceProps, AddDrugOrderWorkspaceAdditionalProps {}
-
 /**
- * This workspace displays the drug order form. On form submission, it saves the drug order
- * to the (frontend) order basket. For a form that submits the drug order directly on submit,
+ * This workspace displays the drug order form for adding or editing a drug order.
+ * On form submission, it saves the drug order to the (frontend) order basket.
+ * For a form that submits the drug order directly on submit,
  * see fill-prescription-form.workspace.tsx
+ *
+ * This workspace must only be used within the patient chart.
+ * @see exported-add-drug-order.workspace.tsx
  */
 export default function AddDrugOrderWorkspace({
-  order: initialOrder,
+  workspaceProps: { order: initialOrder },
+  groupProps: { patient, patientUuid, visitContext },
   closeWorkspace,
-  closeWorkspaceWithSavedChanges,
-  promptBeforeClosing,
-  patient,
-}: AddDrugOrderWorkspace) {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-  const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>(
-    patient,
-    'medications',
-    prepMedicationOrderPostData,
-  );
-  const [currentOrder, setCurrentOrder] = useState(initialOrder);
-
-  const cancelDrugOrder = useCallback(() => {
-    closeWorkspace({
-      onWorkspaceClose: () => launchWorkspace('order-basket'),
-      closeWorkspaceGroup: false,
-    });
-  }, [closeWorkspace]);
-
-  const openOrderForm = useCallback(
-    (searchResult: DrugOrderBasketItem) => {
-      const existingOrder = orders.find((order) => ordersEqual(order, searchResult));
-      if (existingOrder) {
-        setCurrentOrder(existingOrder);
-      } else {
-        setCurrentOrder(searchResult);
-      }
-    },
-    [orders],
+}: PatientWorkspace2DefinitionProps<AddDrugOrderWorkspaceProps, OrderBasketWindowProps>) {
+  return (
+    <AddDrugOrder
+      initialOrder={initialOrder}
+      patient={patient}
+      patientUuid={patientUuid}
+      visitContext={visitContext}
+      closeWorkspace={closeWorkspace}
+    />
   );
-
-  const saveDrugOrder = useCallback(
-    async (finalizedOrder: DrugOrderBasketItem) => {
-      const newOrders = [...orders];
-      const existingOrder = orders.find((order) => ordersEqual(order, finalizedOrder));
-      if (existingOrder) {
-        newOrders[orders.indexOf(existingOrder)] = {
-          ...finalizedOrder,
-          // Incomplete orders should be marked completed on saving the form
-          isOrderIncomplete: false,
-        };
-      } else {
-        newOrders.push(finalizedOrder);
-      }
-      setOrders(newOrders);
-      closeWorkspaceWithSavedChanges({
-        onWorkspaceClose: () => launchWorkspace('order-basket'),
-      });
-    },
-    [orders, setOrders, closeWorkspaceWithSavedChanges],
-  );
-
-  if (!currentOrder) {
-    return (
-      <>
-        {!isTablet && (
-          <div className={styles.backButton}>
-            <Button
-              iconDescription="Return to order basket"
-              kind="ghost"
-              onClick={cancelDrugOrder}
-              renderIcon={(props: ComponentProps<typeof ArrowLeftIcon>) => <ArrowLeftIcon size={24} {...props} />}
-              size="sm"
-            >
-              <span>{t('backToOrderBasket', 'Back to order basket')}</span>
-            </Button>
-          </div>
-        )}
-        <DrugSearch patient={patient} openOrderForm={openOrderForm} />
-      </>
-    );
-  } else {
-    return (
-      <div className={styles.container}>
-        {!isTablet && (
-          <div className={styles.backButton}>
-            <Button
-              iconDescription="Return to order basket"
-              kind="ghost"
-              onClick={cancelDrugOrder}
-              renderIcon={(props: ComponentProps<typeof ArrowLeftIcon>) => <ArrowLeftIcon size={24} {...props} />}
-              size="sm"
-            >
-              <span>{t('backToOrderBasket', 'Back to order basket')}</span>
-            </Button>
-          </div>
-        )}
-        <DrugOrderForm
-          patientUuid={patient.id}
-          initialOrderBasketItem={currentOrder}
-          patient={patient}
-          onSave={saveDrugOrder}
-          saveButtonText={t('saveOrder', 'Save order')}
-          onCancel={cancelDrugOrder}
-          promptBeforeClosing={promptBeforeClosing}
-          allowSelectingPrescribingClinician={false}
-          allowSelectingDrug={false} // In this workspace, the drug is selected in <DrugSearch>, not in <DrugOrderForm>
-        />
-      </div>
-    );
-  }
 }