@openmrs/esm-patient-common-lib 11.2.2-pre.8773 → 11.3.1-patch.9064

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-common-lib",
-  "version": "11.2.2-pre.8773",
+  "version": "11.3.1-patch.9064",
   "license": "MPL-2.0",
   "description": "Library for common patient chart components",
   "browser": "dist/openmrs-esm-patient-common-lib.js",
@@ -38,5 +38,5 @@
     "react": "18.x",
     "single-spa": "6.x"
   },
-  "stableVersion": "11.2.1"
+  "stableVersion": "11.3.0"
 }

package/src/dashboards/createDashboardLink.tsx

@@ -3,12 +3,12 @@ import { BrowserRouter } from 'react-router-dom';
 import { DashboardExtension } from '@openmrs/esm-styleguide';
 import { type DashboardLinkConfig } from '../types';
 
-export const createDashboardLink = (db: DashboardLinkConfig) => {
-  return ({ basePath }: { basePath: string }) => {
+export function createDashboardLink(db: DashboardLinkConfig) {
+  return function ({ basePath }: { basePath: string }) {
     return (
       <BrowserRouter>
         <DashboardExtension basePath={basePath} title={db.title} path={db.path} icon={db.icon} />
       </BrowserRouter>
     );
   };
-};
+}

package/src/orders/postOrders.ts

@@ -1,4 +1,11 @@
-import { openmrsFetch, type OpenmrsResource, parseDate, restBaseUrl, type Visit } from '@openmrs/esm-framework';
+import {
+  type Concept,
+  openmrsFetch,
+  type OpenmrsResource,
+  parseDate,
+  restBaseUrl,
+  type Visit,
+} from '@openmrs/esm-framework';
 import { type OrderBasketStore, orderBasketStore } from './store';
 import type {
   DrugOrderPost,
@@ -15,18 +22,25 @@ export async function postOrdersOnNewEncounter(
   currentVisit: Visit | null,
   sessionLocationUuid: string,
   abortController?: AbortController,
+
+  /**
+   * If not specified, the encounterDate will either be set to
+   * `now` if currentVisit is active, or the start of the visit
+   */
+  encounterDate?: Date,
 ) {
   const now = new Date();
   const visitStartDate = parseDate(currentVisit?.startDatetime);
   const visitEndDate = parseDate(currentVisit?.stopDatetime);
-  let encounterDate: Date;
-  if (!currentVisit || (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;
+  if (!encounterDate) {
+    if (!currentVisit || (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();
@@ -40,7 +54,7 @@ export async function postOrdersOnNewEncounter(
     });
   });
 
-  const encounterPostData = {
+  const encounterPostData: EncounterPost = {
     patient: patientUuid,
     location: sessionLocationUuid,
     encounterType: orderEncounterType,
@@ -50,6 +64,24 @@ export async function postOrdersOnNewEncounter(
     orders,
   };
 
+  return postEncounter(encounterPostData, abortController);
+}
+interface ObsPayload {
+  concept: Concept | string;
+  value?: string | OpenmrsResource;
+  groupMembers?: Array<ObsPayload>;
+}
+export interface EncounterPost {
+  patient: string;
+  location: string;
+  encounterType: string;
+  encounterDatetime: Date;
+  visit?: string;
+  obs: ObsPayload[];
+  orders: OrderPost[];
+}
+
+export async function postEncounter(encounterPostData: EncounterPost, abortController?: AbortController) {
   return openmrsFetch<OpenmrsResource>(`${restBaseUrl}/encounter`, {
     headers: {
       'Content-Type': 'application/json',

package/src/orders/types/order.ts

@@ -186,7 +186,7 @@ export interface Order {
     changedBy: string;
     dateChanged: string;
   };
-  fulfillerStatus: 'RECEIVED' | 'IN_PROGRESS' | 'EXCEPTION' | 'ON_HOLD' | 'DECLINED' | 'COMPLETED' | 'DISCONINTUED';
+  fulfillerStatus: FulfillerStatus;
   fulfillerComment: string;
   specimenSource: string;
   laterality: string;
@@ -207,7 +207,13 @@ export interface OrderType {
   description: string;
 }
 
-export type FulfillerStatus = 'EXCEPTION' | 'RECEIVED' | 'COMPLETED' | 'IN_PROGRESS' | 'ON_HOLD' | 'DECLINED';
+export type FulfillerStatus =
+  | 'RECEIVED'
+  | 'IN_PROGRESS'
+  | 'EXCEPTION'
+  | 'ON_HOLD'
+  | 'DECLINED'
+  | 'COMPLETED';
 
 export type PostDataPrepFunction = (
   order: OrderBasketItem,

package/src/orders/useOrderBasket.ts

@@ -1,4 +1,4 @@
-import { useStoreWithActions } from '@openmrs/esm-framework';
+import { type Actions, useStoreWithActions } from '@openmrs/esm-framework';
 import type { OrderBasketItem, PostDataPrepFunction } from './types';
 import { getPatientUuidFromStore } from '../store/patient-chart-store';
 import { useEffect } from 'react';
@@ -32,7 +32,7 @@ const orderBasketStoreActions = {
       },
     };
   },
-};
+} satisfies Actions<OrderBasketStore>;
 
 function getOrderItems(items: OrderBasketStore['items'], grouping?: string | null): Array<OrderBasketItem> {
   const patientUuid = getPatientUuidFromStore();

package/src/types/index.ts

@@ -1,11 +1,11 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
+import { type IconId, type OpenmrsResource } from '@openmrs/esm-framework';
 
 export * from './test-results';
 
 export interface DashboardLinkConfig {
   path: string;
   title: string;
-  icon: string;
+  icon?: IconId;
   moduleName?: string;
 }