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

package/src/add-drug-order/drug-order-form.resource.ts

@@ -4,10 +4,9 @@ import { useTranslation } from 'react-i18next';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { parseDate, useConfig } from '@openmrs/esm-framework';
+import { type Drug, type DrugOrderBasketItem } from '@openmrs/esm-patient-common-lib';
 import { careSettingUuid, useRequireOutpatientQuantity } from '../api';
 import { type ConfigObject } from '../config-schema';
-import { type DrugOrderBasketItem } from '../types';
-import { type Drug } from '@openmrs/esm-patient-common-lib';
 
 export function useDrugOrderForm(initialOrderBasketItem: DrugOrderBasketItem, defaultPrescribingProviderUuid: string) {
   const medicationOrderFormSchema = useCreateMedicationOrderFormSchema();

package/src/add-drug-order/drug-search/drug-search-combobox.component.tsx

@@ -1,13 +1,14 @@
 import { ComboBox } from '@carbon/react';
-import { useConfig, useDebounce } from '@openmrs/esm-framework';
+import { useConfig, useDebounce, type Visit } from '@openmrs/esm-framework';
+import { type DrugOrderBasketItem } from '@openmrs/esm-patient-common-lib';
 import React, { useMemo, useState } from 'react';
 import { getTemplateOrderBasketItem, useDrugSearch, useDrugTemplates } from './drug-search.resource';
-import { type DrugOrderBasketItem } from '../../types';
 import { type ConfigObject } from '../../config-schema';
 import { useTranslation } from 'react-i18next';
 
 interface DrugSearchComboBoxProps {
   setSelectedDrugItem(drug: DrugOrderBasketItem);
+  visit: Visit;
 }
 
 /**
@@ -16,7 +17,7 @@ interface DrugSearchComboBoxProps {
  * This extension is currently not used anywhere in the patient-medications-app, but
  * is used by other apps (ex: dispensing) for selecting drugs.
  */
-const DrugSearchComboBox: React.FC<DrugSearchComboBoxProps> = ({ setSelectedDrugItem }) => {
+const DrugSearchComboBox: React.FC<DrugSearchComboBoxProps> = ({ setSelectedDrugItem, visit }) => {
   const { daysDurationUnit } = useConfig<ConfigObject>();
   const { t } = useTranslation();
   const [drugSearchTerm, setDrugSearchTerm] = useState('');
@@ -27,12 +28,12 @@ const DrugSearchComboBox: React.FC<DrugSearchComboBoxProps> = ({ setSelectedDrug
     return drugs?.flatMap((drug) => {
       const templates = templateByDrugUuid.get(drug.uuid);
       if (templates?.length > 0) {
-        return templates.map((template) => getTemplateOrderBasketItem(drug, daysDurationUnit, template));
+        return templates.map((template) => getTemplateOrderBasketItem(drug, visit, daysDurationUnit, template));
       } else {
-        return [getTemplateOrderBasketItem(drug, daysDurationUnit)];
+        return [getTemplateOrderBasketItem(drug, visit, daysDurationUnit)];
       }
     });
-  }, [drugs, templateByDrugUuid, daysDurationUnit]);
+  }, [drugs, templateByDrugUuid, daysDurationUnit, visit]);
 
   return (
     <ComboBox

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

@@ -52,5 +52,5 @@ describe('DrugSearchComboBox', () => {
 });
 
 function renderDrugSearchComboBox() {
-  render(<DrugSearchComboBox setSelectedDrugItem={mockSetSelectedDrugItem} />);
+  render(<DrugSearchComboBox setSelectedDrugItem={mockSetSelectedDrugItem} visit={null} />);
 }

package/src/add-drug-order/drug-search/drug-search.component.tsx

@@ -5,21 +5,23 @@ import {
   useConfig,
   useDebounce,
   ResponsiveWrapper,
-  closeWorkspace,
   useLayoutType,
-  launchWorkspace,
+  type Workspace2DefinitionProps,
+  type Visit,
 } from '@openmrs/esm-framework';
+import { type DrugOrderBasketItem } from '@openmrs/esm-patient-common-lib';
 import { type ConfigObject } from '../../config-schema';
-import { type DrugOrderBasketItem } from '../../types';
 import OrderBasketSearchResults from './order-basket-search-results.component';
 import styles from './order-basket-search.scss';
 
 export interface DrugSearchProps {
   openOrderForm: (searchResult: DrugOrderBasketItem) => void;
+  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
   patient: fhir.Patient;
+  visit: Visit;
 }
 
-export default function DrugSearch({ openOrderForm, patient }: DrugSearchProps) {
+export default function DrugSearch({ closeWorkspace, openOrderForm, patient, visit }: DrugSearchProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const [searchTerm, setSearchTerm] = useState('');
@@ -27,12 +29,6 @@ export default function DrugSearch({ openOrderForm, patient }: DrugSearchProps)
   const debouncedSearchTerm = useDebounce(searchTerm, debounceDelayInMs ?? 300);
   const searchInputRef = useRef(null);
 
-  const cancelDrugOrder = useCallback(() => {
-    closeWorkspace('add-drug-order', {
-      onWorkspaceClose: () => launchWorkspace('order-basket'),
-    });
-  }, []);
-
   const handleSearchTermChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       setSearchTerm(event.target.value ?? '');
@@ -59,14 +55,16 @@ export default function DrugSearch({ openOrderForm, patient }: DrugSearchProps)
       </ResponsiveWrapper>
       <OrderBasketSearchResults
         searchTerm={debouncedSearchTerm}
+        closeWorkspace={closeWorkspace}
         openOrderForm={openOrderForm}
         focusAndClearSearchInput={focusAndClearSearchInput}
         patient={patient}
+        visit={visit}
       />
       {isTablet && (
         <div className={styles.separatorContainer}>
           <p className={styles.separator}>{t('or', 'or')}</p>
-          <Button iconDescription="Return to order basket" kind="ghost" onClick={cancelDrugOrder}>
+          <Button iconDescription="Return to order basket" kind="ghost" onClick={() => closeWorkspace()}>
             {t('returnToOrderBasket', 'Return to order basket')}
           </Button>
         </div>

package/src/add-drug-order/drug-search/drug-search.resource.tsx

@@ -1,8 +1,12 @@
 import { useMemo } from 'react';
 import useSWRImmutable from 'swr/immutable';
-import { type FetchResponse, openmrsFetch, restBaseUrl, useFeatureFlag } from '@openmrs/esm-framework';
-import type { Drug } from '@openmrs/esm-patient-common-lib';
-import { type DrugOrderBasketItem, type DrugOrderTemplate, type OrderTemplate } from '../../types';
+import { type FetchResponse, openmrsFetch, restBaseUrl, useFeatureFlag, type Visit } from '@openmrs/esm-framework';
+import {
+  type Drug,
+  type DrugOrderBasketItem,
+  type DrugOrderTemplate,
+  type OrderTemplate,
+} from '@openmrs/esm-patient-common-lib';
 
 export interface DrugSearchResult {
   uuid: string;
@@ -136,6 +140,7 @@ export function getDefault(template: OrderTemplate, prop: string) {
 
 export function getTemplateOrderBasketItem(
   drug: DrugSearchResult,
+  visit: Visit,
   configDefaultDurationConcept?: {
     uuid: string;
     display: string;
@@ -184,6 +189,7 @@ export function getTemplateOrderBasketItem(
                 valueCoded: drug?.dosageForm?.uuid,
               }
             : null,
+        visit,
       }
     : {
         action: 'NEW',
@@ -223,5 +229,6 @@ export function getTemplateOrderBasketItem(
               valueCoded: drug?.dosageForm?.uuid,
             }
           : null,
+        visit,
       };
 }

package/src/add-drug-order/drug-search/helpers.ts

@@ -1,4 +1,4 @@
-import { type DrugOrderBasketItem } from '../../types';
+import { type DrugOrderBasketItem } from '@openmrs/esm-patient-common-lib';
 
 type DrugsOrOrders = Pick<DrugOrderBasketItem, 'action' | 'commonMedicationName'>;
 

package/src/add-drug-order/drug-search/order-basket-search-results.component.tsx

@@ -3,15 +3,15 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { Button, ButtonSkeleton, SkeletonText, Tile } from '@carbon/react';
 import { ShoppingCartArrowUp } from '@carbon/react/icons';
-import { useOrderBasket } from '@openmrs/esm-patient-common-lib';
+import { type DrugOrderBasketItem, useOrderBasket } from '@openmrs/esm-patient-common-lib';
 import {
   ArrowRightIcon,
-  closeWorkspace,
   ShoppingCartArrowDownIcon,
   useConfig,
   useLayoutType,
   UserHasAccess,
-  launchWorkspace,
+  type Visit,
+  type Workspace2DefinitionProps,
 } from '@openmrs/esm-framework';
 import { type ConfigObject } from '../../config-schema';
 import { prepMedicationOrderPostData, useActivePatientOrders } from '../../api/api';
@@ -22,20 +22,23 @@ import {
   useDrugSearch,
   useDrugTemplate,
 } from './drug-search.resource';
-import type { DrugOrderBasketItem } from '../../types';
 import styles from './order-basket-search-results.scss';
 
 export interface OrderBasketSearchResultsProps {
   patient: fhir.Patient;
   searchTerm: string;
+  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
   openOrderForm: (searchResult: DrugOrderBasketItem) => void;
   focusAndClearSearchInput: () => void;
+  visit: Visit;
 }
 
 interface DrugSearchResultItemProps {
   patient: fhir.Patient;
   drug: DrugSearchResult;
   openOrderForm: (searchResult: DrugOrderBasketItem) => void;
+  visit: Visit;
+  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
 }
 
 export default function OrderBasketSearchResults({
@@ -43,6 +46,8 @@ export default function OrderBasketSearchResults({
   openOrderForm,
   focusAndClearSearchInput,
   patient,
+  visit,
+  closeWorkspace,
 }: OrderBasketSearchResultsProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
@@ -109,14 +114,27 @@ export default function OrderBasketSearchResults({
       </div>
       <div className={styles.resultsContainer}>
         {drugs?.map((drug) => (
-          <DrugSearchResultItem patient={patient} key={drug.uuid} drug={drug} openOrderForm={openOrderForm} />
+          <DrugSearchResultItem
+            key={drug.uuid}
+            patient={patient}
+            drug={drug}
+            openOrderForm={openOrderForm}
+            visit={visit}
+            closeWorkspace={closeWorkspace}
+          />
         ))}
       </div>
     </div>
   );
 }
 
-const DrugSearchResultItem: React.FC<DrugSearchResultItemProps> = ({ patient, drug, openOrderForm }) => {
+const DrugSearchResultItem: React.FC<DrugSearchResultItemProps> = ({
+  patient,
+  drug,
+  openOrderForm,
+  visit,
+  closeWorkspace,
+}) => {
   const isTablet = useLayoutType() === 'tablet';
   const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>(
     patient,
@@ -126,14 +144,14 @@ const DrugSearchResultItem: React.FC<DrugSearchResultItemProps> = ({ patient, dr
   const patientUuid = patient.id;
   const { data: activeOrders, isLoading: isLoadingActiveOrders } = useActivePatientOrders(patientUuid);
   const drugAlreadyInBasket = useMemo(
-    () => orders?.some((order) => ordersEqual(order, getTemplateOrderBasketItem(drug))),
-    [orders, drug],
+    () => orders?.some((order) => ordersEqual(order, getTemplateOrderBasketItem(drug, visit))),
+    [orders, drug, visit],
   );
   // TODO: use the backend instead of this to determine whether the drug formulation can be ordered
   // See: https://openmrs.atlassian.net/browse/RESTWS-1003
   const drugAlreadyPrescribed = useMemo(
     () => activeOrders?.some((order) => order?.drug?.uuid === drug?.uuid),
-    [activeOrders, drug],
+    [activeOrders, drug?.uuid],
   );
 
   const { templates, error: fetchingDrugOrderTemplatesError } = useDrugTemplate(drug?.uuid);
@@ -142,9 +160,9 @@ const DrugSearchResultItem: React.FC<DrugSearchResultItemProps> = ({ patient, dr
   const drugItemTemplateOptions: Array<DrugOrderBasketItem> = useMemo(
     () =>
       templates?.length
-        ? templates.map((template) => getTemplateOrderBasketItem(drug, config?.daysDurationUnit, template))
-        : [getTemplateOrderBasketItem(drug, config?.daysDurationUnit)],
-    [templates, drug, config?.daysDurationUnit],
+        ? templates.map((template) => getTemplateOrderBasketItem(drug, visit, config?.daysDurationUnit, template))
+        : [getTemplateOrderBasketItem(drug, visit, config?.daysDurationUnit)],
+    [templates, drug, config?.daysDurationUnit, visit],
   );
 
   const addToBasket = useCallback(
@@ -152,12 +170,9 @@ const DrugSearchResultItem: React.FC<DrugSearchResultItemProps> = ({ patient, dr
       // Directly adding the order to basket should be marked as incomplete
       searchResult.isOrderIncomplete = true;
       setOrders([...orders, searchResult]);
-      closeWorkspace('add-drug-order', {
-        ignoreChanges: true,
-        onWorkspaceClose: () => launchWorkspace('order-basket'),
-      });
+      closeWorkspace();
     },
-    [orders, setOrders],
+    [orders, setOrders, closeWorkspace],
   );
 
   const removeFromBasket = useCallback(

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

@@ -0,0 +1,28 @@
+import React from 'react';
+import { type Workspace2DefinitionProps } from '@openmrs/esm-framework';
+import { type ExportedOrderBasketWindowProps, type DrugOrderBasketItem } from '@openmrs/esm-patient-common-lib';
+import AddDrugOrder from './add-drug-order.component';
+
+export interface AddDrugOrderWorkspaceAdditionalProps {
+  order: DrugOrderBasketItem;
+}
+
+/**
+ * This workspace is meant for use outside the patient chart
+ * @see add-drug-order.workspace.tsx
+ */
+export default function ExportedAddDrugOrderWorkspace({
+  workspaceProps: { order: initialOrder },
+  windowProps: { patient, patientUuid, visitContext },
+  closeWorkspace,
+}: Workspace2DefinitionProps<AddDrugOrderWorkspaceAdditionalProps, ExportedOrderBasketWindowProps, {}>) {
+  return (
+    <AddDrugOrder
+      initialOrder={initialOrder}
+      patient={patient}
+      patientUuid={patientUuid}
+      visitContext={visitContext}
+      closeWorkspace={closeWorkspace}
+    />
+  );
+}

package/src/add-drug-order/fill-prescription-form.workspace.tsx

@@ -1,5 +1,4 @@
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 import {
   type ConfigObject,
   type DefaultWorkspaceProps,
@@ -8,10 +7,10 @@ import {
   useSession,
   useVisit,
 } from '@openmrs/esm-framework';
-import { type EncounterPost, postEncounter } from '@openmrs/esm-patient-common-lib';
-import { type DrugOrderBasketItem } from '../types';
+import { type DrugOrderBasketItem, type EncounterPost, postEncounter } from '@openmrs/esm-patient-common-lib';
 import { prepMedicationOrderPostData } from '../api';
 import DrugOrderForm from './drug-order-form.component';
+import { useTranslation } from 'react-i18next';
 
 export interface FillPrescriptionFormProps extends DefaultWorkspaceProps {
   patient: fhir.Patient;
@@ -95,15 +94,15 @@ const FillPrescriptionForm: React.FC<FillPrescriptionFormProps> = ({
   }
   return (
     <DrugOrderForm
-      patientUuid={patientUuid}
       initialOrderBasketItem={{ action: 'NEW' } as DrugOrderBasketItem}
       patient={patient}
       onSave={submitDrugOrder}
       saveButtonText={t('fillPrescription', 'Fill prescription')}
       onCancel={closeWorkspace}
-      promptBeforeClosing={promptBeforeClosing}
       allowSelectingPrescribingClinician={true}
+      visitContext={activeVisit}
       allowSelectingDrug={true}
+      workspaceTitle={t('fillPrescription', 'Fill prescription')}
     />
   );
 };

package/src/api/api.ts

@@ -2,16 +2,20 @@ import { useCallback, useMemo } from 'react';
 import useSWR, { useSWRConfig } from 'swr';
 import useSWRImmutable from 'swr/immutable';
 import { openmrsFetch, restBaseUrl, useConfig, useOpenmrsFetchAll, type FetchResponse } from '@openmrs/esm-framework';
-import type { DrugOrderPost, PatientOrderFetchResponse, Order } from '@openmrs/esm-patient-common-lib';
+import type {
+  DrugOrderBasketItem,
+  DrugOrderPost,
+  PatientOrderFetchResponse,
+  Order,
+} from '@openmrs/esm-patient-common-lib';
 import { type ConfigObject } from '../config-schema';
-import { type DrugOrderBasketItem } from '../types';
 
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
 
 const customRepresentation =
   'custom:(uuid,dosingType,orderNumber,accessionNumber,' +
   'patient:ref,action,careSetting:ref,previousOrder:ref,dateActivated,scheduledDate,dateStopped,autoExpireDate,' +
-  'orderType:ref,encounter:ref,orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,orderType,urgency,instructions,' +
+  'orderType:ref,encounter:(uuid,display,visit),orderer:(uuid,display,person:(display)),orderReason,orderReasonNonCoded,orderType,urgency,instructions,' +
   'commentToFulfiller,fulfillerStatus,drug:(uuid,display,strength,dosageForm:(display,uuid),concept),dose,doseUnits:ref,' +
   'frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,' +
   'duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)';

package/src/api/order-config.ts

@@ -1,13 +1,13 @@
 import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
-import { useMemo } from 'react';
-import useSWRImmutable from 'swr/immutable';
 import {
   type DosingUnit,
   type DurationUnit,
   type MedicationFrequency,
   type MedicationRoute,
   type QuantityUnit,
-} from '../types';
+} from '@openmrs/esm-patient-common-lib';
+import { useMemo } from 'react';
+import useSWRImmutable from 'swr/immutable';
 
 export interface ConceptName {
   uuid: string;

package/src/components/medications-details-table.component.tsx

@@ -21,10 +21,15 @@ import {
 import {
   CardHeader,
   compare,
+  type DrugOrderBasketItem,
   PatientChartPagination,
   type Order,
   useLaunchWorkspaceRequiringVisit,
   useOrderBasket,
+  type PatientWorkspaceGroupProps,
+  invalidateVisitByUuid,
+  invalidateVisitAndEncounterData,
+  type OrderBasketWindowProps,
 } from '@openmrs/esm-patient-common-lib';
 import {
   AddIcon,
@@ -36,14 +41,16 @@ import {
   useLayoutType,
   usePagination,
   UserIcon,
+  launchWorkspace2,
+  type Encounter,
 } from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import { useReactToPrint } from 'react-to-print';
-import { type AddDrugOrderWorkspaceAdditionalProps } from '../add-drug-order/add-drug-order.workspace';
-import { type DrugOrderBasketItem } from '../types';
 import { type ConfigObject } from '../config-schema';
 import PrintComponent from '../print/print.component';
 import styles from './medications-details-table.scss';
+import { useSWRConfig } from 'swr';
+import { type AddDrugOrderWorkspaceProps } from '../add-drug-order/add-drug-order.workspace';
 
 export interface MedicationsDetailsTableProps {
   isValidating?: boolean;
@@ -69,7 +76,6 @@ const MedicationsDetailsTable: React.FC<MedicationsDetailsTableProps> = ({
   const pageSize = 5;
   const { t } = useTranslation();
   const launchOrderBasket = useLaunchWorkspaceRequiringVisit(patient.id, 'order-basket');
-  const launchAddDrugOrder = useLaunchWorkspaceRequiringVisit(patient.id, 'add-drug-order');
   const config = useConfig<ConfigObject>();
   const showPrintButton = config.showPrintButton;
   const contentToPrintRef = useRef(null);
@@ -251,7 +257,7 @@ const MedicationsDetailsTable: React.FC<MedicationsDetailsTableProps> = ({
               kind="ghost"
               renderIcon={(props: ComponentProps<typeof AddIcon>) => <AddIcon size={16} {...props} />}
               iconDescription="Launch order basket"
-              onClick={launchAddDrugOrder}
+              onClick={() => launchOrderBasket({}, { encounterUuid: '' })}
             >
               {t('add', 'Add')}
             </Button>
@@ -298,14 +304,13 @@ const MedicationsDetailsTable: React.FC<MedicationsDetailsTableProps> = ({
                       {!isPrinting && (
                         <TableCell className="cds--table-column-menu">
                           <OrderBasketItemActions
+                            patient={patient}
                             showDiscontinueButton={showDiscontinueButton}
                             showModifyButton={showModifyButton}
                             showReorderButton={showReorderButton}
                             medication={medications[rowIndex]}
                             items={orders}
                             setItems={setOrders}
-                            openOrderBasket={launchOrderBasket}
-                            openDrugOrderForm={launchAddDrugOrder}
                           />
                         </TableCell>
                       )}
@@ -337,27 +342,39 @@ function InfoTooltip({ orderer }: { orderer: string }) {
 }
 
 function OrderBasketItemActions({
+  patient,
   showDiscontinueButton,
   showModifyButton,
   showReorderButton,
   medication,
   items,
   setItems,
-  openOrderBasket,
-  openDrugOrderForm,
 }: {
+  patient: fhir.Patient;
   showDiscontinueButton: boolean;
   showModifyButton: boolean;
   showReorderButton: boolean;
   medication: Order;
   items: Array<DrugOrderBasketItem>;
   setItems: (items: Array<DrugOrderBasketItem>) => void;
-  openOrderBasket: () => void;
-  openDrugOrderForm: (additionalProps?: AddDrugOrderWorkspaceAdditionalProps) => void;
 }) {
+  const { mutate: globalMutate } = useSWRConfig();
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const alreadyInBasket = items.some((x) => x.uuid === medication.uuid);
+
+  const workspaceGroupProps: PatientWorkspaceGroupProps = useMemo(
+    () => ({
+      patient,
+      patientUuid: patient.id,
+      visitContext: medication.encounter.visit,
+      mutateVisitContext: () => {
+        invalidateVisitByUuid(globalMutate, medication.encounter.visit?.uuid);
+        invalidateVisitAndEncounterData(globalMutate, patient.id);
+      },
+    }),
+    [patient, medication, globalMutate],
+  );
   const handleDiscontinueClick = useCallback(() => {
     setItems([
       ...items,
@@ -403,10 +420,17 @@ function OrderBasketItemActions({
           value: medication.quantityUnits?.display,
           valueCoded: medication.quantityUnits?.uuid,
         },
+        encounterUuid: medication.encounter?.uuid,
+        visit: medication.encounter?.visit,
       },
     ]);
-    openOrderBasket();
-  }, [items, setItems, medication, openOrderBasket]);
+    launchWorkspace2<{}, OrderBasketWindowProps, PatientWorkspaceGroupProps>(
+      'order-basket',
+      {},
+      { encounterUuid: medication.encounter.uuid },
+      workspaceGroupProps,
+    );
+  }, [items, setItems, medication, workspaceGroupProps]);
 
   const handleModifyClick = useCallback(() => {
     const newItem: DrugOrderBasketItem = {
@@ -451,10 +475,18 @@ function OrderBasketItemActions({
         value: medication.quantityUnits?.display,
         valueCoded: medication.quantityUnits?.uuid,
       },
+      encounterUuid: medication.encounter?.uuid,
+      visit: medication.encounter?.visit,
     };
     setItems([...items, newItem]);
-    openDrugOrderForm({ order: newItem });
-  }, [items, setItems, medication, openDrugOrderForm]);
+
+    launchWorkspace2<AddDrugOrderWorkspaceProps, OrderBasketWindowProps, PatientWorkspaceGroupProps>(
+      'add-drug-order',
+      { order: newItem },
+      { encounterUuid: medication.encounter.uuid },
+      workspaceGroupProps,
+    );
+  }, [items, setItems, medication, workspaceGroupProps]);
 
   const handleReorderClick = useCallback(() => {
     setItems([
@@ -501,10 +533,17 @@ function OrderBasketItemActions({
           value: medication.quantityUnits?.display,
           valueCoded: medication.quantityUnits?.uuid,
         },
+        encounterUuid: medication.encounter?.uuid,
+        visit: medication.encounter?.visit,
       },
     ]);
-    openOrderBasket();
-  }, [items, setItems, medication, openOrderBasket]);
+    launchWorkspace2<{}, OrderBasketWindowProps, PatientWorkspaceGroupProps>(
+      'order-basket',
+      {},
+      { encounterUuid: medication.encounter.uuid },
+      workspaceGroupProps,
+    );
+  }, [items, setItems, medication, workspaceGroupProps]);
 
   return (
     <OverflowMenu aria-label="Actions menu" selectorPrimaryFocus={'#modify'} flipped size={isTablet ? 'lg' : 'md'}>