@openmrs/esm-patient-common-lib 11.3.1-pre.9641 → 11.3.1-pre.9645

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-common-lib",
-  "version": "11.3.1-pre.9641",
+  "version": "11.3.1-pre.9645",
   "license": "MPL-2.0",
   "description": "Library for common patient chart components",
   "browser": "dist/openmrs-esm-patient-common-lib.js",

package/src/orders/postOrders.ts

@@ -1,5 +1,6 @@
 import {
   type Concept,
+  type Encounter,
   openmrsFetch,
   type OpenmrsResource,
   parseDate,
@@ -7,20 +8,28 @@ import {
   type Visit,
 } from '@openmrs/esm-framework';
 import { type OrderBasketStore, orderBasketStore } from './store';
-import type {
-  DrugOrderPost,
-  TestOrderPost,
-  ExtractedOrderErrorObject,
-  OrderBasketItem,
-  OrderErrorObject,
-  OrderPost,
-} from './types';
+import type { ExtractedOrderErrorObject, Order, OrderBasketItem, OrderErrorObject, OrderPost } from './types';
+
+function getOrdersPayloadFromOrderBasket(patientUuid: string, ordererUuid: string) {
+  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, ordererUuid));
+    });
+  });
+
+  return orders;
+}
 
 export async function postOrdersOnNewEncounter(
   patientUuid: string,
   orderEncounterType: string,
   currentVisit: Visit | null,
-  sessionLocationUuid: string,
+  orderLocationUuid: string,
+  ordererUuid: string,
   abortController?: AbortController,
 
   /**
@@ -29,34 +38,19 @@ export async function postOrdersOnNewEncounter(
    */
   encounterDate?: Date,
 ) {
-  const now = new Date();
-  const visitStartDate = parseDate(currentVisit?.startDatetime);
-  const visitEndDate = parseDate(currentVisit?.stopDatetime);
   if (!encounterDate) {
-    if (!currentVisit || (visitStartDate < now && (!visitEndDate || visitEndDate > now))) {
-      encounterDate = now;
+    if (currentVisit?.stopDatetime) {
+      encounterDate = parseDate(currentVisit.startDatetime);
     } 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;
+      encounterDate = new Date();
     }
   }
 
-  const { items, postDataPrepFunctions }: OrderBasketStore = orderBasketStore.getState();
-  const patientItems = items[patientUuid];
-
-  const orders: Array<DrugOrderPost | TestOrderPost> = [];
-
-  Object.entries(patientItems).forEach(([grouping, groupOrders]) => {
-    groupOrders.forEach((order) => {
-      orders.push(postDataPrepFunctions[grouping](order, patientUuid, null));
-    });
-  });
+  const orders = getOrdersPayloadFromOrderBasket(patientUuid, ordererUuid);
 
   const encounterPostData: EncounterPost = {
     patient: patientUuid,
-    location: sessionLocationUuid,
+    location: orderLocationUuid,
     encounterType: orderEncounterType,
     encounterDatetime: encounterDate,
     visit: currentVisit?.uuid,
@@ -82,21 +76,27 @@ export interface EncounterPost {
 }
 
 export async function postEncounter(encounterPostData: EncounterPost, abortController?: AbortController) {
-  return openmrsFetch<OpenmrsResource>(`${restBaseUrl}/encounter`, {
+  return openmrsFetch<Encounter>(`${restBaseUrl}/encounter`, {
     headers: {
       'Content-Type': 'application/json',
     },
     method: 'POST',
     body: encounterPostData,
     signal: abortController?.signal,
-  }).then((res) => res?.data?.uuid);
+  }).then((res) => res?.data);
 }
 
-export async function postOrders(patientUuid: string, encounterUuid: string, abortController: AbortController) {
+export async function postOrders(
+  patientUuid: string,
+  encounterUuid: string,
+  abortController: AbortController,
+  ordererUuid: string,
+) {
   const { items, postDataPrepFunctions }: OrderBasketStore = orderBasketStore.getState();
   const patientItems = items[patientUuid];
 
   const erroredItems: Array<OrderBasketItem> = [];
+  const postedOrders: Array<Order> = [];
   for (let grouping in patientItems) {
     const orders = patientItems[grouping];
     for (let i = 0; i < orders.length; i++) {
@@ -108,20 +108,24 @@ export async function postOrders(patientUuid: string, encounterUuid: string, abo
         continue;
       }
 
-      await postOrder(dataPrepFn(order, patientUuid, encounterUuid), abortController).catch((error) => {
-        erroredItems.push({
-          ...order,
-          orderError: error,
-          extractedOrderError: extractErrorDetails(error),
+      await postOrder(dataPrepFn(order, patientUuid, encounterUuid, ordererUuid), abortController)
+        .then((response) => {
+          postedOrders.push(response.data);
+        })
+        .catch((error) => {
+          erroredItems.push({
+            ...order,
+            orderError: error,
+            extractedOrderError: extractErrorDetails(error),
+          });
         });
-      });
     }
   }
-  return erroredItems;
+  return { postedOrders, erroredItems };
 }
 
 export function postOrder(body: OrderPost, abortController?: AbortController) {
-  return openmrsFetch(`${restBaseUrl}/order`, {
+  return openmrsFetch<Order>(`${restBaseUrl}/order`, {
     method: 'POST',
     signal: abortController?.signal,
     headers: { 'Content-Type': 'application/json' },

package/src/orders/types/order.ts

@@ -47,8 +47,6 @@ export interface OrderBasketItem {
   action: OrderAction;
   display: string;
   uuid?: string;
-  orderer?: string;
-  careSetting?: string;
   orderError?: Error & {
     responseBody?: {
       error?: {
@@ -211,10 +209,15 @@ export interface OrderType {
 
 export type FulfillerStatus = 'RECEIVED' | 'IN_PROGRESS' | 'EXCEPTION' | 'ON_HOLD' | 'DECLINED' | 'COMPLETED';
 
+/**
+ * A function type that converts a OrderBasketItem into
+ * a POST order payload
+ */
 export type PostDataPrepFunction = (
   order: OrderBasketItem,
   patientUuid: string,
   encounterUuid: string | null,
+  orderingProviderUuid: string,
 ) => OrderPost;
 
 export interface OrderBasketExtensionProps {
@@ -308,6 +311,7 @@ export interface TestOrderBasketItem extends OrderBasketItem {
 
 export interface OrderBasketWindowProps {
   encounterUuid: string;
+  onOrderBasketSubmitted?: (encounterUuid: string, postedOrders: Array<Order>) => void;
 }
 
 export interface ExportedOrderBasketWindowProps {
@@ -319,4 +323,5 @@ export interface ExportedOrderBasketWindowProps {
   patientUuid: string;
   visitContext: Visit;
   mutateVisitContext: () => void;
+  onOrderBasketSubmitted?: (encounterUuid: string, postedOrders: Array<Order>) => void;
 }

package/src/orders/useOrders.ts

@@ -15,6 +15,9 @@ export const drugCustomRepresentation =
   'frequency:ref,asNeeded,asNeededCondition,quantity,quantityUnits:ref,numRefills,dosingInstructions,' +
   'duration,durationUnits:ref,route:ref,brandName,dispenseAsWritten)';
 
+export const orderCustomRepresentation =
+  'custom:(uuid,display,orderNumber,accessionNumber,patient,concept,action,careSetting,previousOrder,dateActivated,scheduledDate,dateStopped,autoExpireDate,encounter:(uuid,display,visit),orderer:ref,orderReason,orderReasonNonCoded,orderType,urgency,instructions,commentToFulfiller)';
+
 export function usePatientOrders(
   patientUuid: string,
   status?: Status,
@@ -25,8 +28,8 @@ export function usePatientOrders(
   const { mutate } = useSWRConfig();
   const baseOrdersUrl =
     startDate && endDate
-      ? `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&v=default&activatedOnOrAfterDate=${startDate}&activatedOnOrBeforeDate=${endDate}&excludeDiscontinueOrders=true`
-      : `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&v=default&status=${status}&excludeDiscontinueOrders=true`;
+      ? `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&v=${orderCustomRepresentation}&activatedOnOrAfterDate=${startDate}&activatedOnOrBeforeDate=${endDate}&excludeDiscontinueOrders=true`
+      : `${restBaseUrl}/order?patient=${patientUuid}&careSetting=${careSettingUuid}&v=${orderCustomRepresentation}&status=${status}&excludeDiscontinueOrders=true`;
   const ordersUrl = orderType ? `${baseOrdersUrl}&orderTypes=${orderType}` : baseOrdersUrl;
 
   const { data, error, isLoading, isValidating } = useSWR<FetchResponse<PatientOrderFetchResponse>, Error>(

package/src/workspaces.ts

@@ -47,7 +47,7 @@ export function useLaunchWorkspaceRequiringVisit<T extends object>(patientUuid:
     (workspaceProps?: T, windowProps?: any, groupProps?: any) => {
       startVisitIfNeeded().then((didStartVisit) => {
         if (didStartVisit) {
-          launchWorkspace2(workspaceName, workspaceProps, windowProps);
+          launchWorkspace2(workspaceName, workspaceProps, windowProps, groupProps);
         }
       });
     },