(feat) O3-2117: Save orders on a new encounter if there is no encounter

packages/esm-patient-common-lib/src/orders/postOrders.ts

@@ -1,8 +1,58 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
+import { openmrsFetch, type OpenmrsResource, parseDate, restBaseUrl, type Visit } from '@openmrs/esm-framework';
 import { getPatientUuidFromUrl } from '../get-patient-uuid-from-url';
 import { type OrderBasketStore, orderBasketStore } from './store';
-import { type ExtractedOrderErrorObject, type OrderBasketItem, type OrderPost } from './types';
-import { type OrderErrorObject } from './types';
+import { type ExtractedOrderErrorObject, type OrderBasketItem, type OrderErrorObject, type OrderPost } from './types';
+
+export async function postOrdersOnNewEncounter(
+  patientUuid: string,
+  orderEncounterType: string,
+  activeVisit: Visit | null,
+  sessionLocationUuid: string,
+  abortController?: AbortController,
+) {
+  const now = new Date();
+  const visitStartDate = parseDate(activeVisit?.startDatetime);
+  const visitEndDate = parseDate(activeVisit?.stopDatetime);
+  let encounterDate: Date;
+  if (!activeVisit || (visitStartDate < now && (!visitEndDate || visitEndDate > now))) {
+    encounterDate = now;
+  } else {
+    console.warn(
+      'postOrdersOnNewEncounter received an active visit that is not currently active. This is a programming error. Attempting to place the order using the visit start date.',
+    );
+    encounterDate = visitStartDate;
+  }
+
+  const { items, postDataPrepFunctions }: OrderBasketStore = orderBasketStore.getState();
+  const patientItems = items[patientUuid];
+
+  const orders: Array<OrderPost> = [];
+
+  Object.entries(patientItems).forEach(([grouping, groupOrders]) => {
+    groupOrders.forEach((order) => {
+      orders.push(postDataPrepFunctions[grouping](order, patientUuid, null));
+    });
+  });
+
+  const encounterPostData = {
+    patient: patientUuid,
+    location: sessionLocationUuid,
+    encounterType: orderEncounterType,
+    encounterDatetime: encounterDate,
+    visit: activeVisit?.uuid,
+    obs: [],
+    orders,
+  };
+
+  return openmrsFetch<OpenmrsResource>(`${restBaseUrl}/encounter`, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    method: 'POST',
+    body: encounterPostData,
+    signal: abortController?.signal,
+  }).then((res) => res?.data?.uuid);
+}
 
 export async function postOrders(encounterUuid: string, abortController: AbortController) {
   const patientUuid = getPatientUuidFromUrl();

packages/esm-patient-common-lib/src/orders/types.ts

@@ -169,7 +169,11 @@ export interface Drug {
   display: string;
 }
 
-export type PostDataPrepFunction = (order: OrderBasketItem, patientUuid: string, encounterUuid: string) => OrderPost;
+export type PostDataPrepFunction = (
+  order: OrderBasketItem,
+  patientUuid: string,
+  encounterUuid: string | null,
+) => OrderPost;
 
 // Adopted from @openmrs/esm-patient-medications-app package. We should consider maintaining a single shared types file
 export interface DrugOrderBasketItem extends OrderBasketItem {

packages/esm-patient-labs-app/src/lab-orders/api.ts

@@ -2,11 +2,12 @@ import useSWR, { mutate } from 'swr';
 import { useCallback, useMemo } from 'react';
 import useSWRImmutable from 'swr/immutable';
 import { chunk } from 'lodash-es';
-import { type FetchResponse, openmrsFetch, useConfig, restBaseUrl, showSnackbar } from '@openmrs/esm-framework';
-import type { OrderPost, PatientOrderFetchResponse, LabOrderBasketItem } from '@openmrs/esm-patient-common-lib';
+import { type FetchResponse, openmrsFetch, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework';
+import type { LabOrderBasketItem, OrderPost, PatientOrderFetchResponse } from '@openmrs/esm-patient-common-lib';
 import { type ConfigObject } from '../config-schema';
 
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
+
 /**
  * SWR-based data fetcher for patient orders.
  *
@@ -75,7 +76,11 @@ function getConceptReferenceUrls(conceptUuids: Array<string>) {
   );
 }
 
-export function prepLabOrderPostData(order: LabOrderBasketItem, patientUuid: string, encounterUuid: string): OrderPost {
+export function prepLabOrderPostData(
+  order: LabOrderBasketItem,
+  patientUuid: string,
+  encounterUuid: string | null,
+): OrderPost {
   if (order.action === 'NEW' || order.action === 'RENEW') {
     return {
       action: 'NEW',

packages/esm-patient-medications-app/src/api/api.ts

@@ -1,5 +1,5 @@
 import useSWR, { mutate } from 'swr';
-import { type FetchResponse, openmrsFetch, useConfig, restBaseUrl } from '@openmrs/esm-framework';
+import { type FetchResponse, openmrsFetch, restBaseUrl, useConfig } from '@openmrs/esm-framework';
 import { type ConfigObject } from '../config-schema';
 import { useCallback, useMemo } from 'react';
 import { type OrderPost, type PatientOrderFetchResponse } from '@openmrs/esm-patient-common-lib';
@@ -56,7 +56,7 @@ export function usePatientOrders(patientUuid: string, status: 'ACTIVE' | 'any')
 export function prepMedicationOrderPostData(
   order: DrugOrderBasketItem,
   patientUuid: string,
-  encounterUuid: string,
+  encounterUuid: string | null,
 ): OrderPost {
   if (order.action === 'NEW' || order.action === 'RENEW') {
     return {

packages/esm-patient-orders-app/src/api/api.ts

@@ -1,14 +1,7 @@
 import { useCallback, useMemo } from 'react';
 import useSWR, { useSWRConfig } from 'swr';
-import {
-  type FetchResponse,
-  openmrsFetch,
-  type OpenmrsResource,
-  parseDate,
-  type Visit,
-  restBaseUrl,
-} from '@openmrs/esm-framework';
-import { type OrderPost, useVisitOrOfflineVisit, useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
+import { type FetchResponse, openmrsFetch, type OpenmrsResource, restBaseUrl } from '@openmrs/esm-framework';
+import { useSystemVisitSetting, useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
 
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
 
@@ -48,53 +41,6 @@ export function getMedicationByUuid(abortController: AbortController, orderUuid:
   );
 }
 
-export function createEmptyEncounter(
-  patientUuid: string,
-  orderEncounterType: string,
-  activeVisit: Visit | null,
-  sessionLocationUuid: string,
-  abortController?: AbortController,
-) {
-  const now = new Date();
-  const visitStartDate = parseDate(activeVisit?.startDatetime);
-  const visitEndDate = parseDate(activeVisit?.stopDatetime);
-  let encounterDate: Date;
-  if (!activeVisit || (visitStartDate < now && (!visitEndDate || visitEndDate > now))) {
-    now;
-  } else {
-    console.warn(
-      'createEmptyEncounter received an active visit that is not currently active. This is a programming error. Attempting to place the order using the visit start date.',
-    );
-    visitStartDate;
-  }
-  const emptyEncounter = {
-    patient: patientUuid,
-    location: sessionLocationUuid,
-    encounterType: orderEncounterType,
-    encounterDatetime: encounterDate,
-    visit: activeVisit?.uuid,
-    obs: [],
-  };
-
-  return openmrsFetch<OpenmrsResource>(`${restBaseUrl}/encounter`, {
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    method: 'POST',
-    body: emptyEncounter,
-    signal: abortController?.signal,
-  }).then((res) => res?.data?.uuid);
-}
-
-export function postOrder(body: OrderPost, abortController?: AbortController) {
-  return openmrsFetch(`${restBaseUrl}/order`, {
-    method: 'POST',
-    signal: abortController?.signal,
-    headers: { 'Content-Type': 'application/json' },
-    body,
-  });
-}
-
 export function useOrderEncounter(patientUuid: string): {
   activeVisitRequired: boolean;
   isLoading: boolean;

packages/esm-patient-orders-app/src/order-basket/order-basket.workspace.tsx

@@ -5,13 +5,14 @@ import { ActionableNotification, Button, ButtonSet, InlineNotification } from '@
 import { ExtensionSlot, showModal, showSnackbar, useConfig, useLayoutType, useSession } from '@openmrs/esm-framework';
 import {
   type DefaultPatientWorkspaceProps,
+  type OrderBasketItem,
   postOrders,
+  postOrdersOnNewEncounter,
   useOrderBasket,
   useVisitOrOfflineVisit,
-  type OrderBasketItem,
 } from '@openmrs/esm-patient-common-lib';
 import { type ConfigObject } from '../config-schema';
-import { createEmptyEncounter, useOrderEncounter, useMutatePatientOrders } from '../api/api';
+import { useMutatePatientOrders, useOrderEncounter } from '../api/api';
 import styles from './order-basket.scss';
 
 const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
@@ -34,6 +35,7 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
     error: errorFetchingEncounterUuid,
     mutate: mutateEncounterUuid,
   } = useOrderEncounter(patientUuid);
+  const [isSavingOrders, setIsSavingOrders] = useState(false);
   const [creatingEncounterError, setCreatingEncounterError] = useState('');
   const { mutate: mutateOrders } = useMutatePatientOrders(patientUuid);
 
@@ -52,34 +54,41 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
     const abortController = new AbortController();
     setCreatingEncounterError('');
     let orderEncounterUuid = encounterUuid;
-    // If there's no encounter present, create an encounter for the order.
+    setIsSavingOrders(true);
+    // If there's no encounter present, create an encounter along with the orders.
     if (!orderEncounterUuid) {
       try {
-        orderEncounterUuid = await createEmptyEncounter(
+        await postOrdersOnNewEncounter(
           patientUuid,
           config?.orderEncounterType,
           activeVisitRequired ? activeVisit : null,
           session?.sessionLocation?.uuid,
           abortController,
         );
         mutateEncounterUuid();
+        clearOrders();
+        await mutateOrders();
+        closeWorkspaceWithSavedChanges();
+        showOrderSuccessToast(t, orders);
       } catch (e) {
-        setCreatingEncounterError(e);
         console.error(e);
-        return; // don't try to create the orders if we couldn't create the encounter
+        setCreatingEncounterError(
+          e.responseBody.error.message ||
+            t('tryReopeningTheWorkspaceAgain', 'Please try launching the workspace again'),
+        );
       }
-    }
-
-    const erroredItems = await postOrders(orderEncounterUuid, abortController);
-    clearOrders({ exceptThoseMatching: (item) => erroredItems.map((e) => e.display).includes(item.display) });
-    mutateOrders();
-    if (erroredItems.length == 0) {
-      closeWorkspaceWithSavedChanges();
-      showOrderSuccessToast(t, orders);
     } else {
-      setOrdersWithErrors(erroredItems);
+      const erroredItems = await postOrders(orderEncounterUuid, abortController);
+      clearOrders({ exceptThoseMatching: (item) => erroredItems.map((e) => e.display).includes(item.display) });
+      await mutateOrders();
+      if (erroredItems.length == 0) {
+        closeWorkspaceWithSavedChanges();
+        showOrderSuccessToast(t, orders);
+      } else {
+        setOrdersWithErrors(erroredItems);
+      }
     }
-
+    setIsSavingOrders(false);
     return () => abortController.abort();
   }, [
     activeVisit,
@@ -116,8 +125,8 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
           {(creatingEncounterError || errorFetchingEncounterUuid) && (
             <InlineNotification
               kind="error"
-              title={t('errorCreatingAnEncounter', 'Error when creating an encounter')}
-              subtitle={t('tryReopeningTheWorkspaceAgain', 'Please try launching the workspace again')}
+              title={t('tryReopeningTheWorkspaceAgain', 'Please try launching the workspace again')}
+              subtitle={creatingEncounterError}
               lowContrast={true}
               className={styles.inlineNotification}
             />
@@ -132,14 +141,15 @@ const OrderBasket: React.FC<DefaultPatientWorkspaceProps> = ({
             />
           ))}
           <ButtonSet className={styles.buttonSet}>
-            <Button className={styles.bottomButton} kind="secondary" onClick={handleCancel}>
+            <Button className={styles.bottomButton} disabled={isSavingOrders} kind="secondary" onClick={handleCancel}>
               {t('cancel', 'Cancel')}
             </Button>
             <Button
               className={styles.bottomButton}
               kind="primary"
               onClick={handleSave}
               disabled={
+                isSavingOrders ||
                 !orders?.length ||
                 isLoadingEncounterUuid ||
                 (activeVisitRequired && !activeVisit) ||

packages/esm-patient-orders-app/translations/en.json

@@ -17,7 +17,6 @@
   "enterTestResults": "Enter test results",
   "error": "Error",
   "errorCancellingOrder": "Error cancelling order",
-  "errorCreatingAnEncounter": "Error when creating an encounter",
   "errorSavingLabResults": "Error saving lab results",
   "female": "Female",
   "indication": "Indication",