@openmrs/esm-patient-orders-app 11.3.1-pre.9294 → 11.3.1-pre.9304

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"optionalBackendDependencies":{"fhirproxy":"^1.0.0-SNAPSHOT","stockmanagement":"^1.4.0 || ^2.0.0 || >=3.0.0-0","billing":"^1.2.0-SNAPSHOT"},"extensions":[{"name":"order-price-details","component":"orderPriceDetailsExtension","slot":"order-item-additional-info-slot","order":0},{"name":"order-stock-details","component":"orderStockDetailsExtension","slot":"order-item-additional-info-slot","order":1},{"name":"order-basket-action-menu","component":"orderBasketActionMenu","slots":["action-menu-patient-chart-items-slot","action-menu-ward-patient-items-slot"]},{"name":"lab-result","component":"labResult","slot":"completed-lab-order-results-slot","meta":{"fullWidth":false}},{"name":"print-lab-results-action-button","component":"printLabResultsButton","slot":"print-lab-results-action-button-slot","meta":{"fullWidth":false}},{"name":"patient-orders-summary-dashboard","component":"ordersDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"slot":"patient-chart-orders-dashboard-slot","path":"Orders","hideDashboardTitle":true},"order":4},{"name":"patient-orders-dashboard","component":"ordersDashboard","slot":"patient-chart-orders-dashboard-slot","meta":{"fullWidth":false}}],"workspaces":[{"name":"order-basket","title":"orderBasketWorkspaceTitle","component":"orderBasketWorkspace","type":"order","canHide":true},{"name":"patient-orders-form-workspace","title":"orderCancellation","component":"patientOrdersFormWorkspace","type":"order","canHide":false},{"name":"test-results-form-workspace","title":"enterTestResults","component":"testResultsFormWorkspace","type":"lab-results","canHide":false},{"name":"orderable-concept-workspace","title":"searchOrderables","component":"orderableConceptSearch","type":"order"}],"modals":[{"component":"printLabResultModal","name":"print-lab-results-modal"}],"version":"11.3.1-pre.9294"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":">=2.2.0"},"optionalBackendDependencies":{"fhirproxy":"^1.0.0-SNAPSHOT","stockmanagement":"^1.4.0 || ^2.0.0 || >=3.0.0-0","billing":"^1.2.0-SNAPSHOT"},"extensions":[{"name":"order-price-details","component":"orderPriceDetailsExtension","slot":"order-item-additional-info-slot","order":0},{"name":"order-stock-details","component":"orderStockDetailsExtension","slot":"order-item-additional-info-slot","order":1},{"name":"order-basket-action-menu","component":"orderBasketActionMenu","slots":["action-menu-patient-chart-items-slot","action-menu-ward-patient-items-slot"]},{"name":"lab-result","component":"labResult","slot":"completed-lab-order-results-slot","meta":{"fullWidth":false}},{"name":"print-lab-results-action-button","component":"printLabResultsButton","slot":"print-lab-results-action-button-slot","meta":{"fullWidth":false}},{"name":"patient-orders-summary-dashboard","component":"ordersDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"slot":"patient-chart-orders-dashboard-slot","path":"Orders","hideDashboardTitle":true},"order":4},{"name":"patient-orders-dashboard","component":"ordersDashboard","slot":"patient-chart-orders-dashboard-slot","meta":{"fullWidth":false}}],"workspaces":[{"name":"order-basket","title":"orderBasketWorkspaceTitle","component":"orderBasketWorkspace","type":"order","canHide":true},{"name":"patient-orders-form-workspace","title":"orderCancellation","component":"patientOrdersFormWorkspace","type":"order","canHide":false},{"name":"test-results-form-workspace","title":"enterTestResults","component":"testResultsFormWorkspace","type":"lab-results","canHide":false},{"name":"orderable-concept-workspace","title":"searchOrderables","component":"orderableConceptSearch","type":"order"}],"modals":[{"component":"printLabResultModal","name":"print-lab-results-modal"}],"version":"11.3.1-pre.9304"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-orders-app",
-  "version": "11.3.1-pre.9294",
+  "version": "11.3.1-pre.9304",
   "license": "MPL-2.0",
   "description": "Microfrontend for the OpenMRS SPA providing the order basket for the patient chart",
   "browser": "dist/openmrs-esm-patient-orders-app.js",
@@ -52,7 +52,7 @@
     "swr": "2.x"
   },
   "devDependencies": {
-    "@openmrs/esm-patient-common-lib": "11.3.1-pre.9294",
+    "@openmrs/esm-patient-common-lib": "11.3.1-pre.9304",
     "webpack": "^5.99.9"
   },
   "stableVersion": "11.3.0"

package/src/api/api.ts

@@ -1,7 +1,13 @@
 import { useCallback, useMemo } from 'react';
 import useSWR, { useSWRConfig } from 'swr';
-import { type FetchResponse, openmrsFetch, type OpenmrsResource, restBaseUrl } from '@openmrs/esm-framework';
-import { useSystemVisitSetting, useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
+import {
+  type FetchResponse,
+  openmrsFetch,
+  type OpenmrsResource,
+  restBaseUrl,
+  type Visit,
+} from '@openmrs/esm-framework';
+import { useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
 
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
 
@@ -43,6 +49,8 @@ export function getMedicationByUuid(abortController: AbortController, orderUuid:
 
 export function useOrderEncounter(
   patientUuid: string,
+  visit: Visit,
+  mutateVisit: () => void,
   encounterTypeUuid: string,
 ): {
   visitRequired: boolean;
@@ -61,7 +69,6 @@ export function useOrderEncounter(
       : null,
     openmrsFetch,
   );
-  const visit = useVisitOrOfflineVisit(patientUuid);
 
   const results = useMemo(() => {
     if (isLoadingSystemVisitSetting || errorFetchingSystemVisitSetting) {
@@ -76,12 +83,11 @@ export function useOrderEncounter(
     return systemVisitEnabled
       ? {
           visitRequired: true,
-          isLoading: visit?.isLoading,
-          encounterUuid: visit?.currentVisit?.encounters?.find(
-            (encounter) => encounter.encounterType?.uuid === encounterTypeUuid,
-          )?.uuid,
-          error: visit?.error,
-          mutate: visit?.mutate,
+          isLoading: false,
+          encounterUuid: visit?.encounters?.find((encounter) => encounter.encounterType?.uuid === encounterTypeUuid)
+            ?.uuid,
+          error: null,
+          mutate: mutateVisit,
         }
       : {
           visitRequired: false,
@@ -94,6 +100,7 @@ export function useOrderEncounter(
     isLoadingSystemVisitSetting,
     errorFetchingSystemVisitSetting,
     visit,
+    mutateVisit,
     todayEncounter,
     systemVisitEnabled,
     encounterTypeUuid,

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

@@ -78,6 +78,8 @@ interface OrderBasketItemActionsProps {
   openOrderBasket: () => void;
   launchOrderForm: (additionalProps?: { order: MutableOrderBasketItem }) => void;
   orderItem: Order;
+  responsiveSize: 'lg' | 'md' | 'sm';
+  patient: fhir.Patient;
 }
 
 interface OrderHeaderProps {
@@ -101,10 +103,10 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({
   const headerTitle = t('orders', 'Orders');
   const isTablet = useLayoutType() === 'tablet';
   const responsiveSize = isTablet ? 'lg' : 'md';
-  const launchOrderBasket = useLaunchWorkspaceRequiringVisit('order-basket');
-  const launchAddDrugOrder = useLaunchWorkspaceRequiringVisit('add-drug-order');
-  const launchModifyLabOrder = useLaunchWorkspaceRequiringVisit('add-lab-order');
-  const launchModifyGeneralOrder = useLaunchWorkspaceRequiringVisit('orderable-concept-workspace');
+  const launchOrderBasket = useLaunchWorkspaceRequiringVisit(patientUuid, 'order-basket');
+  const launchAddDrugOrder = useLaunchWorkspaceRequiringVisit(patientUuid, 'add-drug-order');
+  const launchModifyLabOrder = useLaunchWorkspaceRequiringVisit(patientUuid, 'add-lab-order');
+  const launchModifyGeneralOrder = useLaunchWorkspaceRequiringVisit(patientUuid, 'orderable-concept-workspace');
   const contentToPrintRef = useRef<HTMLDivElement | null>(null);
   const { excludePatientIdentifierCodeTypes } = useConfig();
   const [isPrinting, setIsPrinting] = useState(false);
@@ -523,6 +525,8 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({
                                             launchOrderForm={() => launchOrderForm(matchingOrder)}
                                             openOrderBasket={launchOrderBasket}
                                             orderItem={matchingOrder}
+                                            responsiveSize={responsiveSize}
+                                            patient={patient}
                                           />
                                         ) : (
                                           <ExtensionSlot
@@ -605,7 +609,13 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({
   );
 };
 
-function OrderBasketItemActions({ orderItem, openOrderBasket, launchOrderForm }: OrderBasketItemActionsProps) {
+function OrderBasketItemActions({
+  orderItem,
+  openOrderBasket,
+  launchOrderForm,
+  responsiveSize,
+  patient,
+}: OrderBasketItemActionsProps) {
   const { t } = useTranslation();
 
   // Use the appropriate grouping key and postDataPrepFunction based on order type
@@ -629,7 +639,7 @@ function OrderBasketItemActions({ orderItem, openOrderBasket, launchOrderForm }:
   }, [orderItem.type, orderItem.orderType.uuid]);
 
   const { grouping, postDataPrepFn } = getOrderBasketConfig();
-  const { orders, setOrders } = useOrderBasket<MutableOrderBasketItem>(grouping, postDataPrepFn);
+  const { orders, setOrders } = useOrderBasket<MutableOrderBasketItem>(patient, grouping, postDataPrepFn);
   const alreadyInBasket = orders.some((x) => x.uuid === orderItem.uuid);
 
   const handleAddOrEditTestResults = useCallback(() => {

package/src/lab-results/lab-results-form.test.tsx

@@ -47,6 +47,8 @@ const testProps = {
   setTitle: jest.fn(),
   patientUuid: mockPatient.id,
   patient: mockPatient,
+  visitContext: null,
+  mutateVisitContext: null,
 };
 
 describe('LabResultsForm', () => {

package/src/order-basket/general-order-type/general-order-form/general-order-form.component.tsx

@@ -51,13 +51,14 @@ export function OrderForm({
   closeWorkspace,
   closeWorkspaceWithSavedChanges,
   promptBeforeClosing,
+  patient,
   orderTypeUuid,
 }: OrderFormProps) {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const session = useSession();
   const isEditing = useMemo(() => initialOrder && initialOrder.action === 'REVISE', [initialOrder]);
-  const { orders, setOrders } = useOrderBasket<OrderBasketItem>(orderTypeUuid, prepOrderPostData);
+  const { orders, setOrders } = useOrderBasket<OrderBasketItem>(patient, orderTypeUuid, prepOrderPostData);
   const [showErrorNotification, setShowErrorNotification] = useState(false);
   const { orderType } = useOrderType(orderTypeUuid);
   const config = useConfig<ConfigObject>();

package/src/order-basket/general-order-type/general-order-type.component.tsx

@@ -19,14 +19,15 @@ import styles from './general-order-panel.scss';
 
 interface GeneralOrderTypeProps extends OrderTypeDefinition {
   closeWorkspace: DefaultWorkspaceProps['closeWorkspace'];
+  patient: fhir.Patient;
 }
 
-const GeneralOrderType: React.FC<GeneralOrderTypeProps> = ({ orderTypeUuid, closeWorkspace, label, icon }) => {
+const GeneralOrderType: React.FC<GeneralOrderTypeProps> = ({ patient, orderTypeUuid, closeWorkspace, label, icon }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const { orderType, isLoadingOrderType } = useOrderType(orderTypeUuid);
 
-  const { orders, setOrders } = useOrderBasket<OrderBasketItem>(orderTypeUuid, prepOrderPostData);
+  const { orders, setOrders } = useOrderBasket<OrderBasketItem>(patient, orderTypeUuid, prepOrderPostData);
   const [isExpanded, setIsExpanded] = useState(orders.length > 0);
   const {
     incompleteOrderBasketItems,

package/src/order-basket/general-order-type/orderable-concept-search/orderable-concept-search.workspace.tsx

@@ -11,10 +11,10 @@ import {
   type DefaultWorkspaceProps,
 } from '@openmrs/esm-framework';
 import {
+  type DefaultPatientWorkspaceProps,
   type OrderBasketItem,
   useOrderBasket,
   useOrderType,
-  usePatientChartStore,
 } from '@openmrs/esm-patient-common-lib';
 import { OrderForm } from '../general-order-form/general-order-form.component';
 import { prepOrderPostData } from '../resources';
@@ -22,7 +22,7 @@ import { type ConfigObject } from '../../../config-schema';
 import OrderableConceptSearchResults from './search-results.component';
 import styles from './orderable-concept-search.scss';
 
-interface OrderableConceptSearchWorkspaceProps extends DefaultWorkspaceProps {
+interface OrderableConceptSearchWorkspaceProps extends DefaultPatientWorkspaceProps {
   order: OrderBasketItem;
   orderTypeUuid: string;
   orderableConceptClasses: Array<string>;
@@ -44,11 +44,14 @@ const OrderableConceptSearchWorkspace: React.FC<OrderableConceptSearchWorkspaceP
   closeWorkspaceWithSavedChanges,
   promptBeforeClosing,
   setTitle,
+  patientUuid,
+  patient,
+  visitContext,
+  mutateVisitContext,
 }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
-  const { orders } = useOrderBasket<OrderBasketItem>(orderTypeUuid, prepOrderPostData);
-  const { patientUuid, patient } = usePatientChartStore();
+  const { orders } = useOrderBasket<OrderBasketItem>(patient, orderTypeUuid, prepOrderPostData);
   const { orderTypes } = useConfig<ConfigObject>();
   const [currentOrder, setCurrentOrder] = useState(initialOrder);
   const { orderType } = useOrderType(orderTypeUuid);
@@ -112,6 +115,8 @@ const OrderableConceptSearchWorkspace: React.FC<OrderableConceptSearchWorkspaceP
           orderableConceptSets={orderableConceptSets}
           patientUuid={patientUuid}
           patient={patient}
+          visitContext={visitContext}
+          mutateVisitContext={mutateVisitContext}
           setTitle={() => {}}
         />
       ) : (
@@ -120,6 +125,7 @@ const OrderableConceptSearchWorkspace: React.FC<OrderableConceptSearchWorkspaceP
           closeWorkspace={closeWorkspace}
           orderableConceptSets={orderableConceptSets}
           orderTypeUuid={orderTypeUuid}
+          patient={patient}
         />
       )}
     </div>
@@ -131,9 +137,16 @@ interface ConceptSearchProps {
   openOrderForm: (search: OrderBasketItem) => void;
   orderTypeUuid: string;
   orderableConceptSets: Array<string>;
+  patient: fhir.Patient;
 }
 
-function ConceptSearch({ closeWorkspace, orderTypeUuid, openOrderForm, orderableConceptSets }: ConceptSearchProps) {
+function ConceptSearch({
+  closeWorkspace,
+  orderTypeUuid,
+  openOrderForm,
+  orderableConceptSets,
+  patient,
+}: ConceptSearchProps) {
   const { t } = useTranslation();
   const { orderType } = useOrderType(orderTypeUuid);
   const isTablet = useLayoutType() === 'tablet';
@@ -182,6 +195,7 @@ function ConceptSearch({ closeWorkspace, orderTypeUuid, openOrderForm, orderable
         orderTypeUuid={orderTypeUuid}
         cancelOrder={() => {}}
         orderableConceptSets={orderableConceptSets}
+        patient={patient}
       />
       {isTablet && (
         <div className={styles.separatorContainer}>

package/src/order-basket/general-order-type/orderable-concept-search/search-results.component.tsx

@@ -28,6 +28,7 @@ interface OrderableConceptSearchResultsProps {
   orderableConceptSets: Array<string>;
   orderTypeUuid: string;
   closeWorkspace: DefaultWorkspaceProps['closeWorkspace'];
+  patient: fhir.Patient;
 }
 
 const OrderableConceptSearchResults: React.FC<OrderableConceptSearchResultsProps> = ({
@@ -38,6 +39,7 @@ const OrderableConceptSearchResults: React.FC<OrderableConceptSearchResultsProps
   orderableConceptSets,
   orderTypeUuid,
   closeWorkspace,
+  patient,
 }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
@@ -89,6 +91,7 @@ const OrderableConceptSearchResults: React.FC<OrderableConceptSearchResultsProps
                 concept={concept}
                 orderTypeUuid={orderTypeUuid}
                 closeWorkspace={closeWorkspace}
+                patient={patient}
               />
             ))}
           </div>
@@ -154,6 +157,7 @@ interface TestTypeSearchResultItemProps {
   openOrderForm: (searchResult: OrderBasketItem) => void;
   orderTypeUuid: string;
   closeWorkspace: DefaultWorkspaceProps['closeWorkspace'];
+  patient: fhir.Patient;
 }
 
 const TestTypeSearchResultItem: React.FC<TestTypeSearchResultItemProps> = ({
@@ -161,11 +165,12 @@ const TestTypeSearchResultItem: React.FC<TestTypeSearchResultItemProps> = ({
   openOrderForm,
   orderTypeUuid,
   closeWorkspace,
+  patient,
 }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const session = useSession();
-  const { orders, setOrders } = useOrderBasket<OrderBasketItem>(orderTypeUuid, prepOrderPostData);
+  const { orders, setOrders } = useOrderBasket<OrderBasketItem>(patient, orderTypeUuid, prepOrderPostData);
 
   const orderAlreadyInBasket = useMemo(
     () => orders?.some((order) => order.concept.uuid === concept.uuid),

package/src/order-basket/order-basket.workspace.tsx

@@ -10,7 +10,7 @@ import {
   useConfig,
   useLayoutType,
   useSession,
-  useVisit,
+  type Visit,
 } from '@openmrs/esm-framework';
 import {
   type DefaultPatientWorkspaceProps,
@@ -19,7 +19,6 @@ import {
   postOrders,
   postOrdersOnNewEncounter,
   useOrderBasket,
-  useVisitOrOfflineVisit,
 } from '@openmrs/esm-patient-common-lib';
 import { useSWRConfig } from 'swr';
 import { type ConfigObject } from '../config-schema';
@@ -27,18 +26,27 @@ import { useMutatePatientOrders, useOrderEncounter } from '../api/api';
 import GeneralOrderType from './general-order-type/general-order-type.component';
 import styles from './order-basket.scss';
 
+interface OrderBasketSlotProps {
+  patientUuid: string;
+  patient: fhir.Patient;
+  visitContext: Visit;
+  mutateVisitContext: () => void;
+}
+
 const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
   patientUuid,
+  patient,
   closeWorkspace,
   closeWorkspaceWithSavedChanges,
   promptBeforeClosing,
+  visitContext,
+  mutateVisitContext,
 }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
   const config = useConfig<ConfigObject>();
   const session = useSession();
-  const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
-  const { orders, clearOrders } = useOrderBasket();
+  const { orders, clearOrders } = useOrderBasket(patient);
   const [ordersWithErrors, setOrdersWithErrors] = useState<OrderBasketItem[]>([]);
   const {
     visitRequired,
@@ -46,11 +54,10 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
     encounterUuid,
     error: errorFetchingEncounterUuid,
     mutate: mutateEncounterUuid,
-  } = useOrderEncounter(patientUuid, config.orderEncounterType);
+  } = useOrderEncounter(patientUuid, visitContext, mutateVisitContext, config.orderEncounterType);
   const [isSavingOrders, setIsSavingOrders] = useState(false);
   const [creatingEncounterError, setCreatingEncounterError] = useState('');
   const { mutate: mutateOrders } = useMutatePatientOrders(patientUuid);
-  const { mutate: mutateCurrentVisit } = useVisit(patientUuid);
   const { mutate } = useSWRConfig();
 
   useEffect(() => {
@@ -75,14 +82,13 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
         await postOrdersOnNewEncounter(
           patientUuid,
           config?.orderEncounterType,
-          visitRequired ? currentVisit : null,
+          visitRequired ? visitContext : null,
           session?.sessionLocation?.uuid,
           abortController,
         );
         mutateEncounterUuid();
         // Only revalidate current visit since orders create new encounters
-        mutateCurrentVisit();
-        invalidateVisitAndEncounterData(mutate, patientUuid);
+        mutateVisitContext?.();
         clearOrders();
         await mutateOrders();
 
@@ -99,7 +105,7 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
       const erroredItems = await postOrders(patientUuid, orderEncounterUuid, abortController);
       clearOrders({ exceptThoseMatching: (item) => erroredItems.map((e) => e.display).includes(item.display) });
       // Only revalidate current visit since orders create new encounters
-      mutateCurrentVisit();
+      mutateVisitContext?.();
       await mutateOrders();
       invalidateVisitAndEncounterData(mutate, patientUuid);
 
@@ -113,7 +119,7 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
     setIsSavingOrders(false);
     return () => abortController.abort();
   }, [
-    currentVisit,
+    visitContext,
     visitRequired,
     clearOrders,
     closeWorkspaceWithSavedChanges,
@@ -121,7 +127,7 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
     encounterUuid,
     mutateEncounterUuid,
     mutateOrders,
-    mutateCurrentVisit,
+    mutateVisitContext,
     orders,
     patientUuid,
     session,
@@ -133,21 +139,36 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
     closeWorkspace({ onWorkspaceClose: clearOrders });
   }, [clearOrders, closeWorkspace]);
 
+  const extensionProps = {
+    patientUuid,
+    patient,
+    visitContext,
+    mutateVisitContext,
+  } satisfies OrderBasketSlotProps;
+
   return (
     <>
       <div className={styles.container}>
-        <ExtensionSlot name="visit-context-header-slot" state={{ patientUuid }} />
+        <ExtensionSlot name="visit-context-header-slot" state={extensionProps} />
         <div className={styles.orderBasketContainer}>
           <ExtensionSlot
             className={classNames(styles.orderBasketSlot, {
               [styles.orderBasketSlotTablet]: isTablet,
             })}
             name="order-basket-slot"
+            state={extensionProps}
           />
           {config?.orderTypes?.length > 0 &&
             config.orderTypes.map((orderType) => (
               <div className={styles.orderPanel} key={orderType.orderTypeUuid}>
-                <GeneralOrderType key={orderType.orderTypeUuid} {...orderType} closeWorkspace={closeWorkspace} />
+                <GeneralOrderType
+                  key={orderType.orderTypeUuid}
+                  orderTypeUuid={orderType.orderTypeUuid}
+                  label={orderType.label}
+                  orderableConceptSets={orderType.orderableConceptSets}
+                  closeWorkspace={closeWorkspace}
+                  patient={patient}
+                />
               </div>
             ))}
         </div>
@@ -183,7 +204,7 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
                 isSavingOrders ||
                 !orders?.length ||
                 isLoadingEncounterUuid ||
-                (visitRequired && !currentVisit) ||
+                (visitRequired && !visitContext) ||
                 orders?.some(({ isOrderIncomplete }) => isOrderIncomplete)
               }
             >
@@ -196,7 +217,7 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
           </ButtonSet>
         </div>
       </div>
-      {visitRequired && !currentVisit && (
+      {visitRequired && !visitContext && (
         <ActionableNotification
           kind="error"
           actionButtonLabel={t('startVisit', 'Start visit')}

package/src/order-basket-action-button/order-basket-action-button.extension.tsx

@@ -3,10 +3,18 @@ import { useTranslation } from 'react-i18next';
 import { ActionMenuButton, ShoppingCartIcon } from '@openmrs/esm-framework';
 import { useLaunchWorkspaceRequiringVisit, useOrderBasket } from '@openmrs/esm-patient-common-lib';
 
-const OrderBasketActionButton: React.FC = () => {
+interface OrderBasketActionButtonProps {
+  patientUuid: string;
+  patient: fhir.Patient;
+}
+
+/**
+ * This extension uses the patient chart store and MUST only be mounted within the patient chart
+ */
+const OrderBasketActionButton: React.FC<OrderBasketActionButtonProps> = ({ patientUuid, patient }) => {
   const { t } = useTranslation();
-  const { orders } = useOrderBasket();
-  const launchOrderBasket = useLaunchWorkspaceRequiringVisit('order-basket');
+  const { orders } = useOrderBasket(patient);
+  const launchOrderBasket = useLaunchWorkspaceRequiringVisit(patientUuid, 'order-basket');
 
   return (
     <ActionMenuButton

package/src/order-basket-action-button/order-basket-action-button.test.tsx

@@ -36,15 +36,6 @@ mockUseWorkspaces.mockReturnValue({
 // I think it is related to this: https://github.com/swc-project/jest/issues/14#issuecomment-1238621942
 
 const mockLaunchStartVisitPrompt = jest.fn();
-const mockUseVisitOrOfflineVisit = jest.fn(() => ({
-  activeVisit: {
-    uuid: '8ef90c91-14be-42dd-a1c0-e67fbf904470',
-  },
-  currentVisit: {
-    uuid: '8ef90c91-14be-42dd-a1c0-e67fbf904470',
-  },
-}));
-const mockGetPatientUuidFromUrl = jest.fn(() => mockPatient.id);
 const mockUseSystemVisitSetting = jest.fn();
 
 jest.mock('@openmrs/esm-patient-common-lib/src/useSystemVisitSetting', () => {
@@ -57,17 +48,6 @@ jest.mock('@openmrs/esm-patient-common-lib/src/launchStartVisitPrompt', () => {
   return { launchStartVisitPrompt: () => mockLaunchStartVisitPrompt() };
 });
 
-jest.mock('@openmrs/esm-patient-common-lib/src/store/patient-chart-store', () => {
-  return {
-    getPatientUuidFromStore: () => mockGetPatientUuidFromUrl(),
-    usePatientChartStore: () => ({ patientUuid: mockPatient.id }),
-  };
-});
-
-jest.mock('@openmrs/esm-patient-common-lib/src/offline/visit', () => {
-  return { useVisitOrOfflineVisit: () => mockUseVisitOrOfflineVisit() };
-});
-
 mockUseSystemVisitSetting.mockReturnValue({ systemVisitEnabled: false });
 
 const mockedUseFeatureFlag = jest.mocked(useFeatureFlag);
@@ -86,7 +66,7 @@ describe('<OrderBasketActionButton/>', () => {
   it('should display tablet view action button', async () => {
     const user = userEvent.setup();
     mockUseLayoutType.mockReturnValue('tablet');
-    render(<OrderBasketActionButton />);
+    render(<OrderBasketActionButton patient={mockPatient} patientUuid={mockPatient.id} />);
 
     const orderBasketButton = screen.getByRole('button', { name: /Order Basket/i });
     expect(orderBasketButton).toBeInTheDocument();
@@ -97,7 +77,7 @@ describe('<OrderBasketActionButton/>', () => {
   it('should display desktop view action button', async () => {
     const user = userEvent.setup();
     mockUseLayoutType.mockReturnValue('small-desktop');
-    render(<OrderBasketActionButton />);
+    render(<OrderBasketActionButton patient={mockPatient} patientUuid={mockPatient.id} />);
 
     const orderBasketButton = screen.getByRole('button', { name: /order basket/i });
     expect(orderBasketButton).toBeInTheDocument();
@@ -110,12 +90,8 @@ describe('<OrderBasketActionButton/>', () => {
     const user = userEvent.setup();
     mockUseLayoutType.mockReturnValue('small-desktop');
     mockUseSystemVisitSetting.mockReturnValue({ systemVisitEnabled: true });
-    mockUseVisitOrOfflineVisit.mockImplementation(() => ({
-      activeVisit: null,
-      currentVisit: null,
-    }));
 
-    render(<OrderBasketActionButton />);
+    render(<OrderBasketActionButton patient={mockPatient} patientUuid={mockPatient.id} />);
 
     const orderBasketButton = screen.getByRole('button', { name: /order basket/i });
     expect(orderBasketButton).toBeInTheDocument();
@@ -126,9 +102,9 @@ describe('<OrderBasketActionButton/>', () => {
 
   it('should display a count tag when orders are present on the desktop view', () => {
     mockUseLayoutType.mockReturnValue('small-desktop');
-    const { result } = renderHook(useOrderBasket);
+    const { result } = renderHook(() => useOrderBasket(mockPatient));
     expect(result.current.orders).toHaveLength(1); // sanity check
-    render(<OrderBasketActionButton />);
+    render(<OrderBasketActionButton patient={mockPatient} patientUuid={mockPatient.id} />);
 
     expect(screen.getByText(/order basket/i)).toBeInTheDocument();
     expect(screen.getByText(/1/i)).toBeInTheDocument();
@@ -136,7 +112,7 @@ describe('<OrderBasketActionButton/>', () => {
 
   it('should display the count tag when orders are present on the tablet view', () => {
     mockUseLayoutType.mockReturnValue('tablet');
-    render(<OrderBasketActionButton />);
+    render(<OrderBasketActionButton patient={mockPatient} patientUuid={mockPatient.id} />);
 
     expect(screen.getByRole('button', { name: /1 order basket/i })).toBeInTheDocument();
   });

package/translations/am.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "Order basket",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
   "ordered": "Placed order for",
   "orderedBy": "Ordered by",

package/translations/ar.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "سلة الطلب",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
   "ordered": "Placed order for",
   "orderedBy": "Ordered by",

package/translations/ar_SY.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "Order basket",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
   "ordered": "Placed order for",
   "orderedBy": "Ordered by",

package/translations/bn.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "Order basket",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
   "ordered": "Placed order for",
   "orderedBy": "Ordered by",

package/translations/de.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "Order basket",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
   "ordered": "Placed order for",
   "orderedBy": "Ordered by",

package/translations/en.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "Order basket",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
   "ordered": "Placed order for",
   "orderedBy": "Ordered by",

package/translations/en_US.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "Order basket",
   "orderCancellation": "Order cancellation",
   "orderCancelled": "Order cancelled",
-  "orderCompleted": "Placed orders",
   "orderDetails": "Order details",
   "ordered": "Placed order for",
   "orderedBy": "Ordered by",

package/translations/es.json

@@ -65,7 +65,6 @@
   "orderBasketWorkspaceTitle": "Canasta de órdenes",
   "orderCancellation": "Cancelación de orden",
   "orderCancelled": "Orden cancelada",
-  "orderCompleted": "Órdenes realizadas",
   "orderDetails": "Detalles de la orden",
   "ordered": "Orden realizada para",
   "orderedBy": "Ordenado por",