@openmrs/esm-emr-api 10.0.1-pre.5542 → 10.0.1-pre.5561

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 21 files with swc (174.88ms)
+[0] Successfully compiled: 21 files with swc (147.24ms)
 [0] swc --strip-leading-paths src -d dist exited with code 0
 [1] tsc --project tsconfig.build.json exited with code 0

package/dist/current-patient.d.ts

@@ -12,18 +12,13 @@ export interface OnlyThePatient extends CurrentPatientOptions {
 }
 export type PatientUuid = string | null;
 /**
- * Fetches a patient by their UUID from the FHIR API. This function first attempts
- * to fetch the patient from the server. If the server request fails and offline
- * patients are included, it will check for a matching patient in the offline
- * patient registration sync queue.
+ * Fetches a patient by their UUID from the FHIR API.
  *
  * @param patientUuid The UUID of the patient to fetch, or `null`.
  * @param fetchInit Optional fetch configuration options to pass to the request.
- * @param includeOfflinePatients Whether to include patients from the offline
- *   registration queue if the server request fails. Defaults to `true`.
  * @returns A Promise that resolves with the FHIR Patient object, or `null` if
- *   the patient UUID is null or the patient is not found.
- * @throws Rethrows any error from the server request if no offline patient is found.
+ *   the patient UUID is null.
+ * @throws Rethrows any error from the server request.
  *
  * @example
  * ```ts
@@ -34,5 +29,5 @@ export type PatientUuid = string | null;
  * }
  * ```
  */
-export declare function fetchCurrentPatient(patientUuid: PatientUuid, fetchInit?: FetchConfig, includeOfflinePatients?: boolean): Promise<fhir.Patient | null>;
+export declare function fetchCurrentPatient(patientUuid: PatientUuid, fetchInit?: FetchConfig): Promise<fhir.Patient | null>;
 //# sourceMappingURL=current-patient.d.ts.map

package/dist/current-patient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"current-patient.d.ts","sourceRoot":"","sources":["../src/current-patient.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,EAA6B,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGnG,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAExE,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,uBAAwB,SAAQ,qBAAqB;IACpE,aAAa,EAAE,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,qBAAqB;IAC3D,aAAa,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC;AAExC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,WAAW,EACvB,sBAAsB,GAAE,OAAc,GACrC,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAwB9B"}
+{"version":3,"file":"current-patient.d.ts","sourceRoot":"","sources":["../src/current-patient.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,EAA6B,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEnG,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAExE,MAAM,WAAW,qBAAqB;IACpC,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,uBAAwB,SAAQ,qBAAqB;IACpE,aAAa,EAAE,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,qBAAqB;IAC3D,aAAa,EAAE,KAAK,CAAC;CACtB;AAED,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,IAAI,CAAC;AAExC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,WAAW,GACtB,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,CAO9B"}

package/dist/current-patient.js

@@ -1,18 +1,12 @@
 /** @module @category API */ import { fhirBaseUrl, openmrsFetch } from "@openmrs/esm-api";
-import { getSynchronizationItems } from "@openmrs/esm-offline";
 /**
- * Fetches a patient by their UUID from the FHIR API. This function first attempts
- * to fetch the patient from the server. If the server request fails and offline
- * patients are included, it will check for a matching patient in the offline
- * patient registration sync queue.
+ * Fetches a patient by their UUID from the FHIR API.
  *
  * @param patientUuid The UUID of the patient to fetch, or `null`.
  * @param fetchInit Optional fetch configuration options to pass to the request.
- * @param includeOfflinePatients Whether to include patients from the offline
- *   registration queue if the server request fails. Defaults to `true`.
  * @returns A Promise that resolves with the FHIR Patient object, or `null` if
- *   the patient UUID is null or the patient is not found.
- * @throws Rethrows any error from the server request if no offline patient is found.
+ *   the patient UUID is null.
+ * @throws Rethrows any error from the server request.
  *
  * @example
  * ```ts
@@ -22,27 +16,10 @@ import { getSynchronizationItems } from "@openmrs/esm-offline";
  *   console.log('Patient name:', patient.name?.[0]?.text);
  * }
  * ```
- */ export async function fetchCurrentPatient(patientUuid, fetchInit, includeOfflinePatients = true) {
+ */ export async function fetchCurrentPatient(patientUuid, fetchInit) {
     if (patientUuid) {
-        let err = null;
-        const [onlinePatient, offlinePatient] = await Promise.all([
-            openmrsFetch(`${fhirBaseUrl}/Patient/${patientUuid}`, fetchInit).catch((e)=>err = e),
-            includeOfflinePatients ? getOfflineRegisteredPatientAsFhirPatient(patientUuid) : Promise.resolve(null)
-        ]);
-        if (onlinePatient.ok) {
-            return onlinePatient.data;
-        }
-        if (offlinePatient) {
-            return offlinePatient;
-        }
-        if (err) {
-            throw err;
-        }
+        const response = await openmrsFetch(`${fhirBaseUrl}/Patient/${patientUuid}`, fetchInit);
+        return response.data;
     }
     return null;
 }
-async function getOfflineRegisteredPatientAsFhirPatient(patientUuid) {
-    const patientRegistrationSyncItems = await getSynchronizationItems('patient-registration');
-    const patientSyncItem = patientRegistrationSyncItems.find((item)=>item.fhirPatient.id === patientUuid);
-    return patientSyncItem?.fhirPatient ?? null;
-}

package/dist/location.d.ts

@@ -1,5 +1,4 @@
-import type { Observable } from 'rxjs';
 import type { Location } from './types';
 export declare function toLocationObject(openmrsRestForm: any): Location;
-export declare function getLocations(tagUuidOrName?: string | null, query?: string | null): Observable<Array<Location>>;
+export declare function getLocations(tagUuidOrName?: string | null, query?: string | null): Promise<Array<Location>>;
 //# sourceMappingURL=location.d.ts.map

package/dist/location.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../src/location.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAEvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,GAAG,GAAG,QAAQ,CAK/D;AAED,wBAAgB,YAAY,CAC1B,aAAa,GAAE,MAAM,GAAG,IAAW,EACnC,KAAK,GAAE,MAAM,GAAG,IAAW,GAC1B,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAmB7B"}
+{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../src/location.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,GAAG,GAAG,QAAQ,CAK/D;AAED,wBAAgB,YAAY,CAC1B,aAAa,GAAE,MAAM,GAAG,IAAW,EACnC,KAAK,GAAE,MAAM,GAAG,IAAW,GAC1B,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAc1B"}

package/dist/location.js

@@ -1,5 +1,4 @@
-/** @module @category API */ import { openmrsObservableFetch, restBaseUrl } from "@openmrs/esm-api";
-import { map, take } from "rxjs/operators/index.js";
+/** @module @category API */ import { openmrsFetch, restBaseUrl } from "@openmrs/esm-api";
 export function toLocationObject(openmrsRestForm) {
     return {
         uuid: openmrsRestForm.uuid,
@@ -16,8 +15,5 @@ export function getLocations(tagUuidOrName = null, query = null) {
     }
     const queryString = params.toString();
     const url = `${restBaseUrl}/location${queryString ? '?' + queryString : ''}`;
-    return openmrsObservableFetch(url).pipe(map((results)=>{
-        const locations = results.data.results.map(toLocationObject);
-        return locations;
-    })).pipe(take(1));
+    return openmrsFetch(url).then((response)=>response.data.results.map(toLocationObject));
 }

package/dist/visit-type.d.ts

@@ -1,19 +1,20 @@
-import type { Observable } from 'rxjs';
 import { type VisitType } from './types';
 export declare function toVisitTypeObject(openmrsRestForm: any): VisitType;
+/** The endpoint {@link getVisitTypes} reads from. Use it as the SWR key when caching visit types. */
+export declare const visitTypesUrl = "/ws/rest/v1/visittype";
 /**
  * Fetches all available visit types from the OpenMRS REST API.
  *
- * @returns An Observable that emits an array of VisitType objects and then completes.
- *   The Observable will emit exactly one value containing all visit types.
+ * @param url The endpoint to read from, defaulting to {@link visitTypesUrl}. This exists so that the
+ *   function can be passed straight to SWR as a fetcher, which calls it with the cache key.
+ * @returns A Promise that resolves with an array of VisitType objects.
  *
  * @example
  * ```ts
  * import { getVisitTypes } from '@openmrs/esm-framework';
- * getVisitTypes().subscribe((visitTypes) => {
- *   console.log('Available visit types:', visitTypes);
- * });
+ * const visitTypes = await getVisitTypes();
+ * console.log('Available visit types:', visitTypes);
  * ```
  */
-export declare function getVisitTypes(): Observable<Array<VisitType>>;
+export declare function getVisitTypes(url?: string): Promise<Array<VisitType>>;
 //# sourceMappingURL=visit-type.d.ts.map

package/dist/visit-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visit-type.d.ts","sourceRoot":"","sources":["../src/visit-type.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAEvC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,GAAG,GAAG,SAAS,CAMjE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAS5D"}
+{"version":3,"file":"visit-type.d.ts","sourceRoot":"","sources":["../src/visit-type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAEzC,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,GAAG,GAAG,SAAS,CAMjE;AAED,qGAAqG;AACrG,eAAO,MAAM,aAAa,0BAA6B,CAAC;AAExD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CAAC,GAAG,GAAE,MAAsB,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAEpF"}

package/dist/visit-type.js

@@ -1,5 +1,4 @@
-/** @module @category API */ import { openmrsObservableFetch, restBaseUrl } from "@openmrs/esm-api";
-import { map, take } from "rxjs/operators/index.js";
+/** @module @category API */ import { openmrsFetch, restBaseUrl } from "@openmrs/esm-api";
 export function toVisitTypeObject(openmrsRestForm) {
     return {
         uuid: openmrsRestForm.uuid,
@@ -7,22 +6,20 @@ export function toVisitTypeObject(openmrsRestForm) {
         name: openmrsRestForm.name
     };
 }
+/** The endpoint {@link getVisitTypes} reads from. Use it as the SWR key when caching visit types. */ export const visitTypesUrl = `${restBaseUrl}/visittype`;
 /**
  * Fetches all available visit types from the OpenMRS REST API.
  *
- * @returns An Observable that emits an array of VisitType objects and then completes.
- *   The Observable will emit exactly one value containing all visit types.
+ * @param url The endpoint to read from, defaulting to {@link visitTypesUrl}. This exists so that the
+ *   function can be passed straight to SWR as a fetcher, which calls it with the cache key.
+ * @returns A Promise that resolves with an array of VisitType objects.
  *
  * @example
  * ```ts
  * import { getVisitTypes } from '@openmrs/esm-framework';
- * getVisitTypes().subscribe((visitTypes) => {
- *   console.log('Available visit types:', visitTypes);
- * });
+ * const visitTypes = await getVisitTypes();
+ * console.log('Available visit types:', visitTypes);
  * ```
- */ export function getVisitTypes() {
-    return openmrsObservableFetch(`${restBaseUrl}/visittype`).pipe(map((results)=>{
-        const visitTypes = results.data.results.map(toVisitTypeObject);
-        return visitTypes;
-    })).pipe(take(1));
+ */ export function getVisitTypes(url = visitTypesUrl) {
+    return openmrsFetch(url).then((response)=>response.data.results.map(toVisitTypeObject));
 }

package/dist/visit-utils.d.ts

@@ -1,6 +1,5 @@
 /** @module @category API */
 import { type FetchResponse } from '@openmrs/esm-api';
-import { BehaviorSubject } from 'rxjs';
 import { type NewVisitPayload, type UpdateVisitPayload, type Visit } from './types';
 export interface VisitItem {
     mode: VisitMode;
@@ -105,6 +104,4 @@ export declare function updateVisit(uuid: string, payload: UpdateVisitPayload, a
 export declare function getVisitsForPatient(patientUuid: string, abortController: AbortController, v?: string): Promise<FetchResponse<{
     results: Array<Visit>;
 }>>;
-/** @deprecated */
-export declare const getStartedVisit: BehaviorSubject<VisitItem | null>;
 //# sourceMappingURL=visit-utils.d.ts.map

package/dist/visit-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visit-utils.d.ts","sourceRoot":"","sources":["../src/visit-utils.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjF,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACvC,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,kBAAkB,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAEpF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,oBAAY,SAAS;IACnB,QAAQ,eAAe;IACvB,SAAS,cAAc;IACvB,OAAO,iBAAiB;CACzB;AAED,oBAAY,WAAW;IACrB,UAAU,eAAe;IACzB,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,QAUZ,CAAC;AAOlC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,gDAE5B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAErE;AAkBD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CASnH;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,EAC3B,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAS/B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,CAAC,CAAC,EAAE,MAAM,GACT,OAAO,CAAC,aAAa,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;CAAE,CAAC,CAAC,CAUnD;AAED,kBAAkB;AAClB,eAAO,MAAM,eAAe,mCAA8C,CAAC"}
+{"version":3,"file":"visit-utils.d.ts","sourceRoot":"","sources":["../src/visit-utils.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjF,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,kBAAkB,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAEpF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,oBAAY,SAAS;IACnB,QAAQ,eAAe;IACvB,SAAS,cAAc;IACvB,OAAO,iBAAiB;CACzB;AAED,oBAAY,WAAW;IACrB,UAAU,eAAe;IACzB,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,QAUZ,CAAC;AAOlC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,gDAE5B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAErE;AAkBD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CASnH;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,EAC3B,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAS/B;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,eAAe,EAChC,CAAC,CAAC,EAAE,MAAM,GACT,OAAO,CAAC,aAAa,CAAC;IAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;CAAE,CAAC,CAAC,CAUnD"}

package/dist/visit-utils.js

@@ -1,6 +1,5 @@
 /** @module @category API */ import { openmrsFetch, restBaseUrl } from "@openmrs/esm-api";
 import { getGlobalStore } from "@openmrs/esm-state";
-import { BehaviorSubject } from "rxjs";
 export var VisitMode = /*#__PURE__*/ function(VisitMode) {
     VisitMode["NEWVISIT"] = "startVisit";
     VisitMode["EDITVISIT"] = "editVisit";
@@ -139,4 +138,3 @@ function getVisitSessionStorage() {
         }
     });
 }
-/** @deprecated */ export const getStartedVisit = new BehaviorSubject(null);

package/mock-jest.ts

@@ -13,4 +13,3 @@ export const deleteAttachmentPermanently = jest.fn();
 export const updateVisit = jest.fn();
 export const saveVisit = jest.fn();
 export const getVisitsForPatient = jest.fn();
-export const getStartedVisit = jest.fn();

package/mock.ts

@@ -14,4 +14,3 @@ export const deleteAttachmentPermanently = vi.fn();
 export const updateVisit = vi.fn();
 export const saveVisit = vi.fn();
 export const getVisitsForPatient = vi.fn();
-export const getStartedVisit = vi.fn();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-emr-api",
-  "version": "10.0.1-pre.5542",
+  "version": "10.0.1-pre.5561",
   "license": "MPL-2.0",
   "description": "The javascript module for interacting with the OpenMRS API",
   "type": "module",
@@ -58,14 +58,12 @@
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
-    "@openmrs/esm-api": "^10.0.1-pre.5542",
-    "@openmrs/esm-offline": "^10.0.1-pre.5542",
-    "@openmrs/esm-state": "^10.0.1-pre.5542"
+    "@openmrs/esm-api": "^10.0.1-pre.5561",
+    "@openmrs/esm-state": "^10.0.1-pre.5561"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "10.0.1-pre.5542",
-    "@openmrs/esm-offline": "10.0.1-pre.5542",
-    "@openmrs/esm-state": "10.0.1-pre.5542",
+    "@openmrs/esm-api": "10.0.1-pre.5561",
+    "@openmrs/esm-state": "10.0.1-pre.5561",
     "@swc/cli": "0.8.1",
     "@swc/core": "1.15.21",
     "@vitest/coverage-v8": "^4.1.2",
@@ -73,7 +71,6 @@
     "cross-env": "^10.1.0",
     "happy-dom": "^20.6.0",
     "rimraf": "^6.1.3",
-    "rxjs": "^6.5.3",
     "vitest": "^4.1.2"
   },
   "stableVersion": "10.0.0"

package/src/current-patient.test.ts

@@ -1,25 +1,19 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { openmrsFetch, type FetchResponse } from '@openmrs/esm-api';
-import { getSynchronizationItems } from '@openmrs/esm-offline';
 import { fetchCurrentPatient } from './current-patient';
 
 vi.mock('@openmrs/esm-api');
 
 const mockOpenmrsFetch = vi.mocked(openmrsFetch);
-const mockGetSynchronizationItems = vi.mocked(getSynchronizationItems);
 
 vi.mock('../openmrs-fetch', () => ({
   openmrsFetch: vi.fn(),
   fhirBaseUrl: '/ws/fhir2/R4',
 }));
 
-vi.mock('@openmrs/esm-offline', () => ({
-  getSynchronizationItems: vi.fn(),
-}));
-
-describe('fetchPatientData', () => {
+describe('fetchCurrentPatient', () => {
   beforeEach(() => {
-    mockGetSynchronizationItems.mockResolvedValue([]);
+    mockOpenmrsFetch.mockReset();
   });
 
   it('should return null when patientUuid is falsy', async () => {
@@ -27,7 +21,7 @@ describe('fetchPatientData', () => {
     expect(result).toBeNull();
   });
 
-  it('should return online patient data when available', async () => {
+  it('should return patient data when available', async () => {
     const mockPatient = { id: '123', name: [{ given: ['John'], family: 'Doe' }] };
     mockOpenmrsFetch.mockResolvedValue({ data: mockPatient, ok: true } as Partial<FetchResponse> as FetchResponse);
 
@@ -35,18 +29,8 @@ describe('fetchPatientData', () => {
     expect(result).toEqual(mockPatient);
   });
 
-  it('should return offline patient data when online fetch fails', async () => {
-    const mockOfflinePatient = { id: '123', name: [{ given: ['Jane'], family: 'Doe' }] };
-    mockOpenmrsFetch.mockRejectedValue(new Error('Network error'));
-    mockGetSynchronizationItems.mockResolvedValue([{ fhirPatient: mockOfflinePatient }]);
-
-    const result = await fetchCurrentPatient('123');
-    expect(result).toEqual(mockOfflinePatient);
-  });
-
-  it('should throw an error when both online and offline fetches fail', async () => {
+  it('should throw an error when the fetch fails', async () => {
     mockOpenmrsFetch.mockRejectedValue(new Error('Network error'));
-    mockGetSynchronizationItems.mockResolvedValue([]);
 
     await expect(fetchCurrentPatient('123')).rejects.toThrow('Network error');
   });

package/src/current-patient.ts

@@ -1,6 +1,5 @@
 /** @module @category API */
 import { fhirBaseUrl, openmrsFetch, type FetchConfig, type FetchResponse } from '@openmrs/esm-api';
-import { getSynchronizationItems } from '@openmrs/esm-offline';
 
 export type CurrentPatient = fhir.Patient | FetchResponse<fhir.Patient>;
 
@@ -19,18 +18,13 @@ export interface OnlyThePatient extends CurrentPatientOptions {
 export type PatientUuid = string | null;
 
 /**
- * Fetches a patient by their UUID from the FHIR API. This function first attempts
- * to fetch the patient from the server. If the server request fails and offline
- * patients are included, it will check for a matching patient in the offline
- * patient registration sync queue.
+ * Fetches a patient by their UUID from the FHIR API.
  *
  * @param patientUuid The UUID of the patient to fetch, or `null`.
  * @param fetchInit Optional fetch configuration options to pass to the request.
- * @param includeOfflinePatients Whether to include patients from the offline
- *   registration queue if the server request fails. Defaults to `true`.
  * @returns A Promise that resolves with the FHIR Patient object, or `null` if
- *   the patient UUID is null or the patient is not found.
- * @throws Rethrows any error from the server request if no offline patient is found.
+ *   the patient UUID is null.
+ * @throws Rethrows any error from the server request.
  *
  * @example
  * ```ts
@@ -44,38 +38,11 @@ export type PatientUuid = string | null;
 export async function fetchCurrentPatient(
   patientUuid: PatientUuid,
   fetchInit?: FetchConfig,
-  includeOfflinePatients: boolean = true,
 ): Promise<fhir.Patient | null> {
   if (patientUuid) {
-    let err: Error | null = null;
-    const [onlinePatient, offlinePatient] = await Promise.all([
-      openmrsFetch<fhir.Patient>(`${fhirBaseUrl}/Patient/${patientUuid}`, fetchInit).catch<FetchResponse<fhir.Patient>>(
-        (e) => (err = e),
-      ),
-      includeOfflinePatients ? getOfflineRegisteredPatientAsFhirPatient(patientUuid) : Promise.resolve(null),
-    ]);
-
-    if (onlinePatient.ok) {
-      return onlinePatient.data;
-    }
-
-    if (offlinePatient) {
-      return offlinePatient;
-    }
-
-    if (err) {
-      throw err;
-    }
+    const response = await openmrsFetch<fhir.Patient>(`${fhirBaseUrl}/Patient/${patientUuid}`, fetchInit);
+    return response.data;
   }
 
   return null;
 }
-
-async function getOfflineRegisteredPatientAsFhirPatient(patientUuid: string): Promise<fhir.Patient | null> {
-  const patientRegistrationSyncItems = await getSynchronizationItems<{
-    fhirPatient: fhir.Patient;
-  }>('patient-registration');
-  const patientSyncItem = patientRegistrationSyncItems.find((item) => item.fhirPatient.id === patientUuid);
-
-  return patientSyncItem?.fhirPatient ?? null;
-}

package/src/location.ts

@@ -1,7 +1,5 @@
 /** @module @category API */
-import { openmrsObservableFetch, restBaseUrl } from '@openmrs/esm-api';
-import type { Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators/index.js';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-api';
 import type { Location } from './types';
 
 export function toLocationObject(openmrsRestForm: any): Location {
@@ -14,7 +12,7 @@ export function toLocationObject(openmrsRestForm: any): Location {
 export function getLocations(
   tagUuidOrName: string | null = null,
   query: string | null = null,
-): Observable<Array<Location>> {
+): Promise<Array<Location>> {
   const params = new URLSearchParams();
   if (tagUuidOrName) {
     params.set('tag', tagUuidOrName);
@@ -25,12 +23,7 @@ export function getLocations(
   const queryString = params.toString();
   const url = `${restBaseUrl}/location${queryString ? '?' + queryString : ''}`;
 
-  return openmrsObservableFetch<{ results: Array<Location> }>(url)
-    .pipe(
-      map((results) => {
-        const locations: Array<Location> = results.data.results.map(toLocationObject);
-        return locations;
-      }),
-    )
-    .pipe(take(1));
+  return openmrsFetch<{ results: Array<Location> }>(url).then((response) =>
+    response.data.results.map(toLocationObject),
+  );
 }

package/src/visit-type.ts

@@ -1,7 +1,5 @@
 /** @module @category API */
-import { openmrsObservableFetch, restBaseUrl } from '@openmrs/esm-api';
-import type { Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators/index.js';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-api';
 import { type VisitType } from './types';
 
 export function toVisitTypeObject(openmrsRestForm: any): VisitType {
@@ -12,27 +10,23 @@ export function toVisitTypeObject(openmrsRestForm: any): VisitType {
   };
 }
 
+/** The endpoint {@link getVisitTypes} reads from. Use it as the SWR key when caching visit types. */
+export const visitTypesUrl = `${restBaseUrl}/visittype`;
+
 /**
  * Fetches all available visit types from the OpenMRS REST API.
  *
- * @returns An Observable that emits an array of VisitType objects and then completes.
- *   The Observable will emit exactly one value containing all visit types.
+ * @param url The endpoint to read from, defaulting to {@link visitTypesUrl}. This exists so that the
+ *   function can be passed straight to SWR as a fetcher, which calls it with the cache key.
+ * @returns A Promise that resolves with an array of VisitType objects.
  *
  * @example
  * ```ts
  * import { getVisitTypes } from '@openmrs/esm-framework';
- * getVisitTypes().subscribe((visitTypes) => {
- *   console.log('Available visit types:', visitTypes);
- * });
+ * const visitTypes = await getVisitTypes();
+ * console.log('Available visit types:', visitTypes);
  * ```
  */
-export function getVisitTypes(): Observable<Array<VisitType>> {
-  return openmrsObservableFetch<any>(`${restBaseUrl}/visittype`)
-    .pipe(
-      map((results) => {
-        const visitTypes: Array<VisitType> = results.data.results.map(toVisitTypeObject);
-        return visitTypes;
-      }),
-    )
-    .pipe(take(1));
+export function getVisitTypes(url: string = visitTypesUrl): Promise<Array<VisitType>> {
+  return openmrsFetch<{ results: Array<any> }>(url).then((response) => response.data.results.map(toVisitTypeObject));
 }

package/src/visit-utils.ts

@@ -1,7 +1,6 @@
 /** @module @category API */
 import { openmrsFetch, restBaseUrl, type FetchResponse } from '@openmrs/esm-api';
 import { getGlobalStore } from '@openmrs/esm-state';
-import { BehaviorSubject } from 'rxjs';
 import { type NewVisitPayload, type UpdateVisitPayload, type Visit } from './types';
 
 export interface VisitItem {
@@ -185,6 +184,3 @@ export function getVisitsForPatient(
     },
   });
 }
-
-/** @deprecated */
-export const getStartedVisit = new BehaviorSubject<VisitItem | null>(null);