@openmrs/esm-patient-orders-app 11.3.0 → 11.3.1-patch.9310

package/src/lab-results/{lab-results-form.component.tsx → exported-lab-results-form.workspace.tsx}

@@ -5,8 +5,15 @@ import { type Control, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { useSWRConfig } from 'swr';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { restBaseUrl, showSnackbar, useAbortController, useLayoutType } from '@openmrs/esm-framework';
-import { type DefaultPatientWorkspaceProps, type Order } from '@openmrs/esm-patient-common-lib';
+import {
+  restBaseUrl,
+  showSnackbar,
+  useAbortController,
+  useLayoutType,
+  Workspace2,
+  type Workspace2DefinitionProps,
+} from '@openmrs/esm-framework';
+import { type Order, type PatientWorkspace2DefinitionProps } from '@openmrs/esm-patient-common-lib';
 import { type ObservationValue } from '../types/encounter';
 import {
   createObservationPayload,
@@ -24,21 +31,17 @@ import { createLabResultsFormSchema } from './lab-results-schema.resource';
 import ResultFormField from './lab-results-form-field.component';
 import styles from './lab-results-form.scss';
 
-export interface LabResultsFormProps extends DefaultPatientWorkspaceProps {
+export interface LabResultsFormProps {
   order: Order;
+  /** Callback to refresh lab orders in the Laboratory app after results are saved.
+   * This ensures the orders list stays in sync across the different tabs in the Laboratory app.
+   * @see https://github.com/openmrs/openmrs-esm-laboratory-app/pull/117 */
   invalidateLabOrders?: () => void;
 }
 
-const LabResultsForm: React.FC<LabResultsFormProps> = ({
+const ExportedLabResultsForm: React.FC<Workspace2DefinitionProps<LabResultsFormProps, {}, {}>> = ({
+  workspaceProps: { order, invalidateLabOrders },
   closeWorkspace,
-  closeWorkspaceWithSavedChanges,
-  order,
-  promptBeforeClosing,
-  /* Callback to refresh lab orders in the Laboratory app after results are saved.
-   * This ensures the orders list stays in sync across the different tabs in the Laboratory app.
-   * @see https://github.com/openmrs/openmrs-esm-laboratory-app/pull/117
-   */
-  invalidateLabOrders,
 }) => {
   const { t } = useTranslation();
   const abortController = useAbortController();
@@ -93,10 +96,6 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     }
   }, [concept, completeLabResult, order, setValue]);
 
-  useEffect(() => {
-    promptBeforeClosing(() => isDirty);
-  }, [isDirty, promptBeforeClosing]);
-
   if (isLoadingConcepts) {
     return (
       <div className={styles.loaderContainer}>
@@ -147,7 +146,7 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
       if (failedObsconceptUuids.length) {
         showNotification('error', 'Could not save obs with concept uuids ' + failedObsconceptUuids.join(', '));
       } else {
-        closeWorkspaceWithSavedChanges();
+        closeWorkspace({ discardUnsavedChanges: true });
         showNotification(
           'success',
           t('successfullySavedLabResults', 'Lab results for {{orderNumber}} have been successfully updated', {
@@ -188,7 +187,7 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
         abortController,
       );
 
-      closeWorkspaceWithSavedChanges();
+      closeWorkspace({ discardUnsavedChanges: true });
       mutateOrderData();
       mutateResults();
       invalidateLabOrders?.();
@@ -207,57 +206,59 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
   };
 
   return (
-    <Form className={styles.form} onSubmit={handleSubmit(saveLabResults)}>
-      <Layer level={isTablet ? 1 : 0}>
-        <div className={styles.grid}>
-          {concept && (
-            <Stack gap={5}>
-              {!isLoading ? (
-                <ResultFormField
-                  defaultValue={completeLabResult}
-                  concept={concept}
-                  control={control as unknown as Control<Record<string, unknown>>}
-                />
-              ) : (
-                <InlineLoading description={t('loadingInitialValues', 'Loading initial values') + '...'} />
-              )}
-            </Stack>
-          )}
-          {showEmptyFormErrorNotification && (
-            <InlineNotification
-              className={styles.emptyFormError}
-              lowContrast
-              title={t('error', 'Error')}
-              subtitle={t('pleaseFillField', 'Please fill at least one field') + '.'}
-            />
-          )}
-        </div>
-      </Layer>
+    <Workspace2 title={t('enterTestResults', 'Enter test results')} hasUnsavedChanges={isDirty}>
+      <Form className={styles.form} onSubmit={handleSubmit(saveLabResults)}>
+        <Layer level={isTablet ? 1 : 0}>
+          <div className={styles.grid}>
+            {concept && (
+              <Stack gap={5}>
+                {!isLoading ? (
+                  <ResultFormField
+                    defaultValue={completeLabResult}
+                    concept={concept}
+                    control={control as unknown as Control<Record<string, unknown>>}
+                  />
+                ) : (
+                  <InlineLoading description={t('loadingInitialValues', 'Loading initial values') + '...'} />
+                )}
+              </Stack>
+            )}
+            {showEmptyFormErrorNotification && (
+              <InlineNotification
+                className={styles.emptyFormError}
+                lowContrast
+                title={t('error', 'Error')}
+                subtitle={t('pleaseFillField', 'Please fill at least one field') + '.'}
+              />
+            )}
+          </div>
+        </Layer>
 
-      <ButtonSet
-        className={classNames({
-          [styles.tablet]: isTablet,
-          [styles.desktop]: !isTablet,
-        })}
-      >
-        <Button className={styles.button} kind="secondary" disabled={isSubmitting} onClick={() => closeWorkspace()}>
-          {t('discard', 'Discard')}
-        </Button>
-        <Button
-          className={styles.button}
-          kind="primary"
-          disabled={isSubmitting || Object.keys(errors).length > 0}
-          type="submit"
+        <ButtonSet
+          className={classNames({
+            [styles.tablet]: isTablet,
+            [styles.desktop]: !isTablet,
+          })}
         >
-          {isSubmitting ? (
-            <InlineLoading description={t('saving', 'Saving') + '...'} />
-          ) : (
-            t('saveAndClose', 'Save and close')
-          )}
-        </Button>
-      </ButtonSet>
-    </Form>
+          <Button className={styles.button} kind="secondary" disabled={isSubmitting} onClick={() => closeWorkspace()}>
+            {t('discard', 'Discard')}
+          </Button>
+          <Button
+            className={styles.button}
+            kind="primary"
+            disabled={isSubmitting || Object.keys(errors).length > 0}
+            type="submit"
+          >
+            {isSubmitting ? (
+              <InlineLoading description={t('saving', 'Saving') + '...'} />
+            ) : (
+              t('saveAndClose', 'Save and close')
+            )}
+          </Button>
+        </ButtonSet>
+      </Form>
+    </Workspace2>
   );
 };
 
-export default LabResultsForm;
+export default ExportedLabResultsForm;

package/src/lab-results/lab-results-form-field.component.tsx

@@ -2,18 +2,18 @@ import React, { useCallback, useMemo } from 'react';
 import {
   Accordion,
   AccordionItem,
+  InlineNotification,
   NumberInput,
   Select,
   SelectItem,
   TextInput,
-  InlineNotification,
 } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { type Control, Controller } from 'react-hook-form';
+import { useLayoutType } from '@openmrs/esm-framework';
 import { isCoded, isNumeric, isPanel, isText, type LabOrderConcept } from './lab-results.resource';
 import { type Observation } from '../types/encounter';
 import styles from './lab-results-form.scss';
-import { useLayoutType } from '@openmrs/esm-framework';
 
 interface ResultFormFieldProps {
   concept: LabOrderConcept;
@@ -65,7 +65,10 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
     [defaultValue],
   );
 
-  const labelText = useMemo(() => `${concept.display} ${formatLabRange(concept)}`, [concept]);
+  const labelText = useMemo(() => {
+    const displayText = concept.display?.trim() || concept.name?.name?.trim() || concept.name?.display?.trim() || '--';
+    return `${displayText} ${formatLabRange(concept)}`.trim();
+  }, [concept]);
 
   const { isTextField, isNumericField, isCodedField, isPanelField } = useMemo(
     () => ({
@@ -136,7 +139,7 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
         />
         {isPanelField ? (
           <Accordion>
-            <AccordionItem title={concept.display} open>
+            <AccordionItem title={concept.display || concept.name?.name || concept.name?.display || '--'} open>
               {concept.setMembers.map((member) => (
                 <ResultFormField
                   key={member.uuid}
@@ -154,7 +157,7 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({ concept, control, def
 
   return (
     <div className={styles.formField}>
-      <label className={styles.label}>{labelText}</label>
+      <span className={styles.label}>{labelText}</span>
       <InlineNotification
         kind="error"
         hideCloseButton

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

@@ -10,8 +10,8 @@ import {
   type Datatype,
   useCompletedLabResults,
 } from './lab-results.resource';
-import LabResultsForm from './lab-results-form.component';
-import { type Order } from '@openmrs/esm-patient-common-lib';
+import LabResultsForm, { type LabResultsFormProps } from './lab-results-form.workspace';
+import { type PatientWorkspace2DefinitionProps, type Order } from '@openmrs/esm-patient-common-lib';
 import { type Encounter } from '../types/encounter';
 import { mockPatient } from 'tools';
 
@@ -39,14 +39,24 @@ const mockOrder = {
   orderer: { uuid: 'orderer-uuid' },
 };
 
-const testProps = {
-  closeWorkspace: jest.fn(),
-  closeWorkspaceWithSavedChanges: jest.fn(),
-  order: mockOrder as Order,
-  promptBeforeClosing: jest.fn(),
-  setTitle: jest.fn(),
-  patientUuid: mockPatient.id,
-  patient: mockPatient,
+const mockCloseWorkspace = jest.fn();
+
+const testProps: PatientWorkspace2DefinitionProps<LabResultsFormProps, {}> = {
+  closeWorkspace: mockCloseWorkspace,
+  workspaceProps: {
+    order: mockOrder as Order,
+  },
+  groupProps: {
+    patientUuid: mockPatient.id,
+    patient: mockPatient,
+    visitContext: null,
+    mutateVisitContext: null,
+  },
+  launchChildWorkspace: jest.fn(),
+  windowProps: {},
+  workspaceName: '',
+  windowName: '',
+  isRootWorkspace: false,
 };
 
 describe('LabResultsForm', () => {
@@ -263,16 +273,8 @@ describe('LabResultsForm', () => {
 
   test('submits form with valid data', async () => {
     const user = userEvent.setup();
-    const mockCloseWorkspace = jest.fn();
-    const mockCloseWorkspaceWithSavedChanges = jest.fn();
-
-    render(
-      <LabResultsForm
-        {...testProps}
-        closeWorkspace={mockCloseWorkspace}
-        closeWorkspaceWithSavedChanges={mockCloseWorkspaceWithSavedChanges}
-      />,
-    );
+
+    render(<LabResultsForm {...testProps} />);
 
     const input = await screen.findByLabelText(`Test Concept (0 - 100 mg/dL)`);
     await user.type(input, '50');
@@ -281,7 +283,7 @@ describe('LabResultsForm', () => {
     await user.click(saveButton);
 
     await waitFor(() => {
-      expect(mockCloseWorkspaceWithSavedChanges).toHaveBeenCalled();
+      expect(mockCloseWorkspace).toHaveBeenCalled();
     });
   });
 

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

@@ -0,0 +1,25 @@
+import React from 'react';
+import { type Order, type PatientWorkspace2DefinitionProps } from '@openmrs/esm-patient-common-lib';
+import ExportedLabResultsForm from './exported-lab-results-form.workspace';
+
+export interface LabResultsFormProps {
+  order: Order;
+  /** Callback to refresh lab orders in the Laboratory app after results are saved.
+   * This ensures the orders list stays in sync across the different tabs in the Laboratory app.
+   * @see https://github.com/openmrs/openmrs-esm-laboratory-app/pull/117 */
+  invalidateLabOrders?: () => void;
+}
+
+/**
+ * This workspace displays the form to input lab results for orders.
+ * This workspace should only be used within the patient chart. Use ExportedLabResultsForm
+ * for use cases outside the patient chart.
+ */
+const LabResultsForm: React.FC<PatientWorkspace2DefinitionProps<LabResultsFormProps, {}>> = ({
+  workspaceProps: { order, invalidateLabOrders },
+  ...rest
+}) => {
+  return <ExportedLabResultsForm workspaceProps={{ order, invalidateLabOrders }} {...rest} />;
+};
+
+export default LabResultsForm;

package/src/lab-results/print-results/print-modal/print-results-modal.tsx

@@ -65,7 +65,11 @@ const PrintResultsModal: React.FC<PrintResultsModalProps> = ({ orders, closeModa
               <Checkbox
                 key={order.uuid}
                 id={order.uuid}
-                labelText={<span className={styles.checkboxLabel}>{capitalize(order.concept.display)}</span>}
+                labelText={
+                  <span className={styles.checkboxLabel}>
+                    {capitalize(order.concept.display || order.concept.name?.display || '--')}
+                  </span>
+                }
                 checked={selectedOrders.has(order.uuid)}
                 onChange={(_, { checked }) => handleOrderSelection(order.uuid, checked)}
                 className={styles.checkboxItem}

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

@@ -0,0 +1,54 @@
+import React, { useMemo } from 'react';
+import { type Workspace2DefinitionProps } from '@openmrs/esm-framework';
+import {
+  type OrderBasketExtensionProps,
+  type OrderBasketItem,
+  type ExportedOrderBasketWindowProps,
+} from '@openmrs/esm-patient-common-lib';
+import OrderBasket from './order-basket.component';
+
+const ExportedOrderBasketWorkspace: React.FC<Workspace2DefinitionProps<{}, ExportedOrderBasketWindowProps, {}>> = ({
+  windowProps: {
+    patientUuid,
+    patient,
+    visitContext,
+    mutateVisitContext,
+    drugOrderWorkspaceName,
+    labOrderWorkspaceName,
+    generalOrderWorkspaceName,
+  },
+  closeWorkspace,
+  launchChildWorkspace,
+}) => {
+  const orderBasketExtensionProps = useMemo(() => {
+    const launchDrugOrderForm = (order: OrderBasketItem) => {
+      launchChildWorkspace(drugOrderWorkspaceName, { order });
+    };
+    const launchLabOrderForm = (orderTypeUuid: string, order: OrderBasketItem) => {
+      launchChildWorkspace(labOrderWorkspaceName, { orderTypeUuid, order });
+    };
+    const launchGeneralOrderForm = (orderTypeUuid: string, order: OrderBasketItem) => {
+      launchChildWorkspace(generalOrderWorkspaceName, { orderTypeUuid, order });
+    };
+
+    return {
+      patient,
+      launchDrugOrderForm,
+      launchLabOrderForm,
+      launchGeneralOrderForm,
+    } satisfies OrderBasketExtensionProps;
+  }, [launchChildWorkspace, drugOrderWorkspaceName, labOrderWorkspaceName, generalOrderWorkspaceName, patient]);
+
+  return (
+    <OrderBasket
+      patientUuid={patientUuid}
+      patient={patient}
+      visitContext={visitContext}
+      mutateVisitContext={mutateVisitContext}
+      closeWorkspace={closeWorkspace}
+      orderBasketExtensionProps={orderBasketExtensionProps}
+    />
+  );
+};
+
+export default ExportedOrderBasketWorkspace;

package/src/order-basket/general-order-type/{orderable-concept-search/orderable-concept-search.workspace.tsx → add-general-order/add-general-order.component.tsx}

@@ -1,67 +1,64 @@
-import React, { type ComponentProps, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { type ComponentProps, useCallback, useMemo, useRef, useState } from 'react';
 import { Button, Search } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import {
   ArrowLeftIcon,
-  launchWorkspace,
   ResponsiveWrapper,
   useConfig,
   useDebounce,
   useLayoutType,
-  type DefaultWorkspaceProps,
+  type Visit,
+  Workspace2,
+  type Workspace2DefinitionProps,
 } from '@openmrs/esm-framework';
-import {
-  type OrderBasketItem,
-  useOrderBasket,
-  useOrderType,
-  usePatientChartStore,
-} from '@openmrs/esm-patient-common-lib';
+import { type OrderBasketItem, useOrderBasket, useOrderType } from '@openmrs/esm-patient-common-lib';
 import { OrderForm } from '../general-order-form/general-order-form.component';
 import { prepOrderPostData } from '../resources';
 import { type ConfigObject } from '../../../config-schema';
 import OrderableConceptSearchResults from './search-results.component';
 import styles from './orderable-concept-search.scss';
 
-interface OrderableConceptSearchWorkspaceProps extends DefaultWorkspaceProps {
-  order: OrderBasketItem;
+interface AddGeneralOrderProps {
+  initialOrder: OrderBasketItem;
   orderTypeUuid: string;
-  orderableConceptClasses: Array<string>;
-  orderableConceptSets: Array<string>;
-}
-
-export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
-
-type DrugsOrOrders = Pick<OrderBasketItem, 'action'>;
-
-export function ordersEqual(order1: DrugsOrOrders, order2: DrugsOrOrders) {
-  return order1.action === order2.action;
+  patient: fhir.Patient;
+  visitContext: Visit;
+  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
 }
 
-const OrderableConceptSearchWorkspace: React.FC<OrderableConceptSearchWorkspaceProps> = ({
-  order: initialOrder,
+/**
+ * This workspace displays the drug order form for adding or editing a general order.
+ */
+const AddGeneralOrder: React.FC<AddGeneralOrderProps> = ({
+  initialOrder,
   orderTypeUuid,
+  patient,
+  visitContext,
   closeWorkspace,
-  closeWorkspaceWithSavedChanges,
-  promptBeforeClosing,
-  setTitle,
 }) => {
   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);
+  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
 
-  useEffect(() => {
+  const title = useMemo(() => {
     if (orderType) {
-      setTitle(
-        t(`addOrderableForOrderType`, 'Add {{orderTypeDisplay}}', {
+      if (initialOrder?.action == 'REVISE') {
+        return t(`editOrderableForOrderType`, 'Edit {{orderTypeDisplay}}', {
           orderTypeDisplay: orderType.display.toLocaleLowerCase(),
-        }),
-      );
+        });
+      } else {
+        return t(`addOrderableForOrderType`, 'Add {{orderTypeDisplay}}', {
+          orderTypeDisplay: orderType.display.toLocaleLowerCase(),
+        });
+      }
+    } else {
+      return '';
     }
-  }, [orderType, t, setTitle]);
+  }, [orderType, t, initialOrder?.action]);
 
   const orderableConceptSets = useMemo(
     () => orderTypes.find((orderType) => orderType.orderTypeUuid === orderTypeUuid).orderableConceptSets,
@@ -69,10 +66,7 @@ const OrderableConceptSearchWorkspace: React.FC<OrderableConceptSearchWorkspaceP
   );
 
   const cancelDrugOrder = useCallback(() => {
-    closeWorkspace({
-      onWorkspaceClose: () => launchWorkspace('order-basket'),
-      closeWorkspaceGroup: false,
-    });
+    closeWorkspace();
   }, [closeWorkspace]);
 
   const openOrderForm = useCallback(
@@ -88,52 +82,61 @@ const OrderableConceptSearchWorkspace: React.FC<OrderableConceptSearchWorkspaceP
   );
 
   return (
-    <div className={styles.workspaceWrapper}>
-      {!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>
-      )}
-      {currentOrder ? (
-        <OrderForm
-          initialOrder={currentOrder}
-          closeWorkspace={closeWorkspace}
-          closeWorkspaceWithSavedChanges={closeWorkspaceWithSavedChanges}
-          promptBeforeClosing={promptBeforeClosing}
-          orderTypeUuid={orderTypeUuid}
-          orderableConceptSets={orderableConceptSets}
-          patientUuid={patientUuid}
-          patient={patient}
-          setTitle={() => {}}
-        />
-      ) : (
-        <ConceptSearch
-          openOrderForm={openOrderForm}
-          closeWorkspace={closeWorkspace}
-          orderableConceptSets={orderableConceptSets}
-          orderTypeUuid={orderTypeUuid}
-        />
-      )}
-    </div>
+    <Workspace2 title={title} hasUnsavedChanges={hasUnsavedChanges}>
+      <div className={styles.workspaceWrapper}>
+        {!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>
+        )}
+        {currentOrder ? (
+          <OrderForm
+            initialOrder={currentOrder}
+            closeWorkspace={closeWorkspace}
+            setHasUnsavedChanges={setHasUnsavedChanges}
+            orderTypeUuid={orderTypeUuid}
+            patient={patient}
+          />
+        ) : (
+          <ConceptSearch
+            openOrderForm={openOrderForm}
+            closeWorkspace={closeWorkspace}
+            orderableConceptSets={orderableConceptSets}
+            orderTypeUuid={orderTypeUuid}
+            patient={patient}
+            visit={visitContext}
+          />
+        )}
+      </div>
+    </Workspace2>
   );
 };
 
 interface ConceptSearchProps {
-  closeWorkspace: DefaultWorkspaceProps['closeWorkspace'];
+  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
   openOrderForm: (search: OrderBasketItem) => void;
   orderTypeUuid: string;
   orderableConceptSets: Array<string>;
+  patient: fhir.Patient;
+  visit: Visit;
 }
 
-function ConceptSearch({ closeWorkspace, orderTypeUuid, openOrderForm, orderableConceptSets }: ConceptSearchProps) {
+function ConceptSearch({
+  closeWorkspace,
+  orderTypeUuid,
+  openOrderForm,
+  orderableConceptSets,
+  patient,
+  visit,
+}: ConceptSearchProps) {
   const { t } = useTranslation();
   const { orderType } = useOrderType(orderTypeUuid);
   const isTablet = useLayoutType() === 'tablet';
@@ -142,9 +145,7 @@ function ConceptSearch({ closeWorkspace, orderTypeUuid, openOrderForm, orderable
   const searchInputRef = useRef(null);
 
   const cancelDrugOrder = useCallback(() => {
-    closeWorkspace({
-      onWorkspaceClose: () => launchWorkspace('order-basket'),
-    });
+    closeWorkspace();
   }, [closeWorkspace]);
 
   const focusAndClearSearchInput = () => {
@@ -178,10 +179,12 @@ function ConceptSearch({ closeWorkspace, orderTypeUuid, openOrderForm, orderable
         searchTerm={debouncedSearchTerm}
         openOrderForm={openOrderForm}
         focusAndClearSearchInput={focusAndClearSearchInput}
-        closeWorkspace={closeWorkspace}
         orderTypeUuid={orderTypeUuid}
         cancelOrder={() => {}}
         orderableConceptSets={orderableConceptSets}
+        closeWorkspace={closeWorkspace}
+        patient={patient}
+        visit={visit}
       />
       {isTablet && (
         <div className={styles.separatorContainer}>
@@ -195,4 +198,10 @@ function ConceptSearch({ closeWorkspace, orderTypeUuid, openOrderForm, orderable
   );
 }
 
-export default OrderableConceptSearchWorkspace;
+type DrugsOrOrders = Pick<OrderBasketItem, 'action' | 'concept'>;
+
+function ordersEqual(order1: DrugsOrOrders, order2: DrugsOrOrders) {
+  return order1.action === order2.action && order1.concept.uuid === order2.concept.uuid;
+}
+
+export default AddGeneralOrder;