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

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

@@ -1,25 +0,0 @@
-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/order-basket/exported-order-basket.workspace.tsx

@@ -1,54 +0,0 @@
-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/add-general-order/add-general-order.workspace.tsx

@@ -1,35 +0,0 @@
-import React from 'react';
-import {
-  type OrderBasketItem,
-  type OrderBasketWindowProps,
-  type PatientWorkspace2DefinitionProps,
-} from '@openmrs/esm-patient-common-lib';
-import AddGeneralOrder from './add-general-order.component';
-
-interface OrderableConceptSearchWorkspaceProps {
-  order: OrderBasketItem;
-  orderTypeUuid: string;
-}
-
-/**
- * This workspace displays the drug order form for adding or editing a general order.
- */
-const AddGeneralOrderWorkspace: React.FC<
-  PatientWorkspace2DefinitionProps<OrderableConceptSearchWorkspaceProps, OrderBasketWindowProps>
-> = ({
-  workspaceProps: { order: initialOrder, orderTypeUuid },
-  groupProps: { patient, visitContext, mutateVisitContext },
-  closeWorkspace,
-}) => {
-  return (
-    <AddGeneralOrder
-      initialOrder={initialOrder}
-      orderTypeUuid={orderTypeUuid}
-      patient={patient}
-      visitContext={visitContext}
-      closeWorkspace={closeWorkspace}
-    />
-  );
-};
-
-export default AddGeneralOrderWorkspace;

package/src/order-basket/general-order-type/add-general-order/exported-add-general-order.workspace.tsx

@@ -1,32 +0,0 @@
-import React from 'react';
-import { type Workspace2DefinitionProps } from '@openmrs/esm-framework';
-import { type ExportedOrderBasketWindowProps, type OrderBasketItem } from '@openmrs/esm-patient-common-lib';
-import AddGeneralOrder from './add-general-order.component';
-
-interface OrderableConceptSearchWorkspaceProps {
-  order: OrderBasketItem;
-  orderTypeUuid: string;
-}
-
-/**
- * This workspace displays the drug order form for adding or editing a general order.
- */
-const ExportedAddGeneralOrderWorkspace: React.FC<
-  Workspace2DefinitionProps<OrderableConceptSearchWorkspaceProps, ExportedOrderBasketWindowProps, {}>
-> = ({
-  workspaceProps: { order: initialOrder, orderTypeUuid },
-  windowProps: { patient, visitContext },
-  closeWorkspace,
-}) => {
-  return (
-    <AddGeneralOrder
-      initialOrder={initialOrder}
-      orderTypeUuid={orderTypeUuid}
-      patient={patient}
-      visitContext={visitContext}
-      closeWorkspace={closeWorkspace}
-    />
-  );
-};
-
-export default ExportedAddGeneralOrderWorkspace;

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

@@ -1,213 +0,0 @@
-import React, { useCallback, useMemo, useState } from 'react';
-import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import { Button, ButtonSet, InlineLoading, InlineNotification } from '@carbon/react';
-import {
-  ExtensionSlot,
-  useConfig,
-  useLayoutType,
-  useSession,
-  type Visit,
-  Workspace2,
-  type Workspace2DefinitionProps,
-} from '@openmrs/esm-framework';
-import {
-  invalidateVisitAndEncounterData,
-  type OrderBasketExtensionProps,
-  type OrderBasketItem,
-  postOrders,
-  postOrdersOnNewEncounter,
-  showOrderSuccessToast,
-  useMutatePatientOrders,
-  useOrderBasket,
-} from '@openmrs/esm-patient-common-lib';
-import { useSWRConfig } from 'swr';
-import { type ConfigObject } from '../config-schema';
-import { useOrderEncounter } from '../api/api';
-import GeneralOrderPanel from './general-order-type/general-order-panel.component';
-import styles from './order-basket.scss';
-
-interface OrderBasketProps {
-  patientUuid: string;
-  patient: fhir.Patient;
-  visitContext: Visit;
-  mutateVisitContext: () => void;
-  closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
-  orderBasketExtensionProps: OrderBasketExtensionProps;
-}
-
-const OrderBasket: React.FC<OrderBasketProps> = ({
-  patientUuid,
-  patient,
-  visitContext,
-  mutateVisitContext,
-  closeWorkspace,
-  orderBasketExtensionProps,
-}) => {
-  const { t } = useTranslation();
-  const isTablet = useLayoutType() === 'tablet';
-  const config = useConfig<ConfigObject>();
-  const session = useSession();
-  const { orders, clearOrders } = useOrderBasket(patient);
-  const [ordersWithErrors, setOrdersWithErrors] = useState<OrderBasketItem[]>([]);
-  const {
-    visitRequired,
-    isLoading: isLoadingEncounterUuid,
-    encounterUuid,
-    error: errorFetchingEncounterUuid,
-    mutate: mutateEncounterUuid,
-  } = useOrderEncounter(patientUuid, visitContext, mutateVisitContext, config.orderEncounterType);
-  const [isSavingOrders, setIsSavingOrders] = useState(false);
-  const [creatingEncounterError, setCreatingEncounterError] = useState('');
-  const { mutate: mutateOrders } = useMutatePatientOrders(patientUuid);
-  const { mutate } = useSWRConfig();
-
-  const handleSave = useCallback(async () => {
-    const abortController = new AbortController();
-    setCreatingEncounterError('');
-    let orderEncounterUuid = encounterUuid;
-    setIsSavingOrders(true);
-    // If there's no encounter present, create an encounter along with the orders.
-    if (!orderEncounterUuid) {
-      try {
-        await postOrdersOnNewEncounter(
-          patientUuid,
-          config?.orderEncounterType,
-          visitRequired ? visitContext : null,
-          session?.sessionLocation?.uuid,
-          abortController,
-        );
-        await closeWorkspace({ discardUnsavedChanges: true });
-        mutateEncounterUuid();
-        // Only revalidate current visit since orders create new encounters
-        mutateVisitContext?.();
-        invalidateVisitAndEncounterData(mutate, patientUuid);
-        clearOrders();
-        await mutateOrders();
-        showOrderSuccessToast(t, orders);
-      } catch (e) {
-        console.error(e);
-        setCreatingEncounterError(
-          e.responseBody?.error?.message ||
-            t('tryReopeningTheWorkspaceAgain', 'Please try launching the workspace again'),
-        );
-      }
-    } else {
-      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
-      mutateVisitContext?.();
-      await mutateOrders();
-      invalidateVisitAndEncounterData(mutate, patientUuid);
-
-      if (erroredItems.length == 0) {
-        await closeWorkspace({ discardUnsavedChanges: true });
-        showOrderSuccessToast(t, orders);
-      } else {
-        setOrdersWithErrors(erroredItems);
-      }
-      clearOrders({ exceptThoseMatching: (item) => erroredItems.map((e) => e.display).includes(item.display) });
-      // Only revalidate current visit since orders create new encounters
-      mutateVisitContext?.();
-      await mutateOrders();
-      invalidateVisitAndEncounterData(mutate, patientUuid);
-    }
-    setIsSavingOrders(false);
-    return () => abortController.abort();
-  }, [
-    visitContext,
-    visitRequired,
-    clearOrders,
-    closeWorkspace,
-    config,
-    encounterUuid,
-    mutateEncounterUuid,
-    mutateOrders,
-    mutateVisitContext,
-    orders,
-    patientUuid,
-    session,
-    t,
-    mutate,
-  ]);
-
-  const handleCancel = useCallback(() => {
-    closeWorkspace().then((didClose) => {
-      if (didClose) {
-        clearOrders();
-      }
-    });
-  }, [clearOrders, closeWorkspace]);
-
-  return (
-    <Workspace2 title={t('orderBasketWorkspaceTitle', 'Order Basket')} hasUnsavedChanges={!!orders.length}>
-      <div id="order-basket" className={styles.container}>
-        <ExtensionSlot name="visit-context-header-slot" state={{ patientUuid }} />
-        <div className={styles.orderBasketContainer}>
-          <ExtensionSlot
-            className={classNames(styles.orderBasketSlot, {
-              [styles.orderBasketSlotTablet]: isTablet,
-            })}
-            name="order-basket-slot"
-            state={orderBasketExtensionProps as any}
-          />
-          {config?.orderTypes?.length > 0 &&
-            config.orderTypes.map((orderType) => (
-              <div className={styles.orderPanel} key={orderType.orderTypeUuid}>
-                <GeneralOrderPanel
-                  {...orderType}
-                  launchGeneralOrderForm={orderBasketExtensionProps.launchGeneralOrderForm}
-                  patient={patient}
-                />
-              </div>
-            ))}
-        </div>
-        <div>
-          {(creatingEncounterError || errorFetchingEncounterUuid) && (
-            <InlineNotification
-              kind="error"
-              title={t('tryReopeningTheWorkspaceAgain', 'Please try launching the workspace again')}
-              subtitle={creatingEncounterError}
-              lowContrast={true}
-              className={styles.inlineNotification}
-            />
-          )}
-          {ordersWithErrors.map((order) => (
-            <InlineNotification
-              lowContrast
-              kind="error"
-              title={t('saveDrugOrderFailed', 'Error ordering {{orderName}}', { orderName: order.display })}
-              subtitle={order.extractedOrderError?.fieldErrors?.join(', ')}
-              className={styles.inlineNotification}
-            />
-          ))}
-          <ButtonSet className={styles.buttonSet}>
-            <Button className={styles.actionButton} kind="secondary" onClick={handleCancel}>
-              {t('cancel', 'Cancel')}
-            </Button>
-            <Button
-              className={styles.actionButton}
-              kind="primary"
-              onClick={handleSave}
-              disabled={
-                isSavingOrders ||
-                !orders?.length ||
-                isLoadingEncounterUuid ||
-                (visitRequired && !visitContext) ||
-                orders?.some(({ isOrderIncomplete }) => isOrderIncomplete)
-              }
-            >
-              {isSavingOrders ? (
-                <InlineLoading description={t('saving', 'Saving') + '...'} />
-              ) : (
-                <span>{t('signAndClose', 'Sign and close')}</span>
-              )}
-            </Button>
-          </ButtonSet>
-        </div>
-      </div>
-    </Workspace2>
-  );
-};
-
-export default OrderBasket;

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

@@ -1,35 +0,0 @@
-import React, { type ComponentProps } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ActionMenuButton2, ShoppingCartIcon } from '@openmrs/esm-framework';
-import {
-  useStartVisitIfNeeded,
-  useOrderBasket,
-  type PatientChartWorkspaceActionButtonProps,
-} from '@openmrs/esm-patient-common-lib';
-
-/**
- * This extension uses the patient chart store and MUST only be mounted within the patient chart
- */
-const OrderBasketActionButton: React.FC<PatientChartWorkspaceActionButtonProps> = (props) => {
-  const {
-    groupProps: { patientUuid, patient },
-  } = props;
-  const { t } = useTranslation();
-  const { orders } = useOrderBasket(patient);
-  const startVisitIfNeeded = useStartVisitIfNeeded(patientUuid);
-
-  return (
-    <ActionMenuButton2
-      icon={(props: ComponentProps<typeof ShoppingCartIcon>) => <ShoppingCartIcon {...props} />}
-      label={t('orderBasket', 'Order basket')}
-      tagContent={orders?.length > 0 ? orders?.length : null}
-      workspaceToLaunch={{
-        workspaceName: 'order-basket',
-        windowProps: { encounterUuid: '' },
-      }}
-      onBeforeWorkspaceLaunch={startVisitIfNeeded}
-    />
-  );
-};
-
-export default OrderBasketActionButton;