@openmrs/esm-react-utils 10.0.1-pre.5542 → 10.0.1-pre.5561

package/.turbo/turbo-build.log

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

package/dist/UserHasAccess.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserHasAccess.d.ts","sourceRoot":"","sources":["../src/UserHasAccess.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAetD,CAAC"}
+{"version":3,"file":"UserHasAccess.d.ts","sourceRoot":"","sources":["../src/UserHasAccess.tsx"],"names":[],"mappings":"AAGA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAoBtD,CAAC"}

package/dist/UserHasAccess.js

@@ -1,4 +1,4 @@
-/** @module @category API */ import { getCurrentUser, userHasAccess } from "@openmrs/esm-api";
+/** @module @category API */ import { getSessionStore, userHasAccess } from "@openmrs/esm-api";
 import React, { useEffect, useState } from "react";
 /**
  * A React component that renders its children only if the current user exists and has the privilege(s)
@@ -30,10 +30,15 @@ import React, { useEffect, useState } from "react";
  */ export const UserHasAccess = ({ privilege, fallback, children })=>{
     const [user, setUser] = useState(null);
     useEffect(()=>{
-        const subscription = getCurrentUser({
-            includeAuthStatus: false
-        }).subscribe(setUser);
-        return ()=>subscription.unsubscribe();
+        const store = getSessionStore();
+        const unsubscribe = store.subscribe(({ loaded, session })=>{
+            setUser(loaded ? session?.user ?? null : null);
+        });
+        const { loaded, session } = store.getState();
+        if (loaded) {
+            setUser(session?.user ?? null);
+        }
+        return unsubscribe;
     }, []);
     if (user && userHasAccess(privilege, user)) {
         return /*#__PURE__*/ React.createElement(React.Fragment, null, children);

package/dist/index.d.ts

@@ -16,7 +16,6 @@ export * from './useAttachments';
 export * from './useBodyScrollLock';
 export * from './useConfig';
 export * from './useConnectedExtensions';
-export * from './useConnectivity';
 export * from './useDebounce';
 export * from './useDefineAppContext';
 export * from './useEmrConfiguration';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,KAAK,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC/F,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,KAAK,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC/F,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}

package/dist/index.js

@@ -16,7 +16,6 @@ export * from "./useAttachments.js";
 export * from "./useBodyScrollLock.js";
 export * from "./useConfig.js";
 export * from "./useConnectedExtensions.js";
-export * from "./useConnectivity.js";
 export * from "./useDebounce.js";
 export * from "./useDefineAppContext.js";
 export * from "./useEmrConfiguration.js";

package/dist/public.d.ts

@@ -12,7 +12,6 @@ export * from './useAttachments';
 export * from './useBodyScrollLock';
 export * from './useConfig';
 export * from './useConnectedExtensions';
-export * from './useConnectivity';
 export * from './useDebounce';
 export * from './useDefineAppContext';
 export * from './useEmrConfiguration';

package/dist/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../src/public.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,KAAK,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC/F,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../src/public.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,KAAK,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,KAAK,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC/F,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC"}

package/dist/public.js

@@ -12,7 +12,6 @@ export * from "./useAttachments.js";
 export * from "./useBodyScrollLock.js";
 export * from "./useConfig.js";
 export * from "./useConnectedExtensions.js";
-export * from "./useConnectivity.js";
 export * from "./useDebounce.js";
 export * from "./useDefineAppContext.js";
 export * from "./useEmrConfiguration.js";

package/dist/useLocations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLocations.d.ts","sourceRoot":"","sources":["../src/useLocations.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,YAAY,CAAC,aAAa,GAAE,MAAM,GAAG,IAAW,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAgB9G"}
+{"version":3,"file":"useLocations.d.ts","sourceRoot":"","sources":["../src/useLocations.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKrD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,YAAY,CAAC,aAAa,GAAE,MAAM,GAAG,IAAW,EAAE,KAAK,GAAE,MAAM,GAAG,IAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,CAc9G"}

package/dist/useLocations.js

@@ -1,5 +1,6 @@
-/** @module @category API */ import { useState, useEffect } from "react";
-import { getLocations } from "@openmrs/esm-emr-api";
+/** @module @category API */ import { restBaseUrl } from "@openmrs/esm-api";
+import { useOpenmrsFetchAll } from "./useOpenmrsFetchAll.js";
+const noLocations = [];
 /**
  * A React hook that fetches and returns locations from the OpenMRS server.
  * Locations can be filtered by a tag UUID/name and/or a search query string.
@@ -24,17 +25,17 @@ import { getLocations } from "@openmrs/esm-emr-api";
  * }
  * ```
  */ export function useLocations(tagUuidOrName = null, query = null) {
-    const [locations, setLocations] = useState([]);
-    useEffect(()=>{
-        const locationSub = getLocations(tagUuidOrName, query).subscribe((locations)=>{
-            setLocations(locations);
-        }, (error)=>{
-            console.error(error);
-        });
-        return ()=>locationSub.unsubscribe();
-    }, [
-        tagUuidOrName,
-        query
-    ]);
-    return locations;
+    const params = new URLSearchParams();
+    if (tagUuidOrName) {
+        params.set('tag', tagUuidOrName);
+    }
+    if (query) {
+        params.set('q', query);
+    }
+    const queryString = params.toString();
+    const url = `${restBaseUrl}/location${queryString ? '?' + queryString : ''}`;
+    const { data } = useOpenmrsFetchAll(url, {
+        immutable: true
+    });
+    return data ?? noLocations;
 }

package/dist/useVisitTypes.d.ts

@@ -1,4 +1,3 @@
-/** @module @category API */
 import { type VisitType } from '@openmrs/esm-emr-api';
 /**
  * A React hook that fetches and returns all available visit types from the

package/dist/useVisitTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useVisitTypes.d.ts","sourceRoot":"","sources":["../src/useVisitTypes.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGrE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,aAAa,gBAe5B"}
+{"version":3,"file":"useVisitTypes.d.ts","sourceRoot":"","sources":["../src/useVisitTypes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAIpF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,aAAa,gBAG5B"}

package/dist/useVisitTypes.js

@@ -1,5 +1,6 @@
-/** @module @category API */ import { getVisitTypes } from "@openmrs/esm-emr-api";
-import { useEffect, useState } from "react";
+/** @module @category API */ import useSWRImmutable from "swr/immutable";
+import { getVisitTypes, visitTypesUrl } from "@openmrs/esm-emr-api";
+const noVisitTypes = [];
 /**
  * A React hook that fetches and returns all available visit types from the
  * OpenMRS server. The data is fetched once when the component mounts.
@@ -22,12 +23,6 @@ import { useEffect, useState } from "react";
  * }
  * ```
  */ export function useVisitTypes() {
-    const [visitTypes, setVisitTypes] = useState([]);
-    useEffect(()=>{
-        const visitTypesSub = getVisitTypes().subscribe((visitTypes)=>{
-            setVisitTypes(visitTypes);
-        }, (error)=>console.error(error));
-        return ()=>visitTypesSub.unsubscribe();
-    }, []);
-    return visitTypes;
+    const { data } = useSWRImmutable(visitTypesUrl, getVisitTypes);
+    return data ?? noVisitTypes;
 }

package/mock-jest.tsx

@@ -142,8 +142,6 @@ export const useAppContext = jest.fn();
 
 export const useAssignedExtensionIds = jest.fn();
 
-export const useConnectivity = jest.fn();
-
 export const useDefineAppContext = jest.fn();
 
 export const useExtensionSlot = jest.fn();

package/mock.tsx

@@ -147,8 +147,6 @@ export const useAppContext = vi.fn();
 
 export const useAssignedExtensionIds = vi.fn();
 
-export const useConnectivity = vi.fn();
-
 export const useDefineAppContext = vi.fn();
 
 export const useExtensionSlot = vi.fn();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-react-utils",
-  "version": "10.0.1-pre.5542",
+  "version": "10.0.1-pre.5561",
   "license": "MPL-2.0",
   "description": "React utilities for OpenMRS.",
   "type": "module",
@@ -60,37 +60,36 @@
     "single-spa-react": "^6.0.2"
   },
   "peerDependencies": {
-    "@openmrs/esm-api": "^10.0.1-pre.5542",
-    "@openmrs/esm-config": "^10.0.1-pre.5542",
-    "@openmrs/esm-context": "^10.0.1-pre.5542",
-    "@openmrs/esm-emr-api": "^10.0.1-pre.5542",
-    "@openmrs/esm-error-handling": "^10.0.1-pre.5542",
-    "@openmrs/esm-extensions": "^10.0.1-pre.5542",
-    "@openmrs/esm-feature-flags": "^10.0.1-pre.5542",
-    "@openmrs/esm-globals": "^10.0.1-pre.5542",
-    "@openmrs/esm-navigation": "^10.0.1-pre.5542",
-    "@openmrs/esm-state": "^10.0.1-pre.5542",
-    "@openmrs/esm-utils": "^10.0.1-pre.5542",
+    "@openmrs/esm-api": "^10.0.1-pre.5561",
+    "@openmrs/esm-config": "^10.0.1-pre.5561",
+    "@openmrs/esm-context": "^10.0.1-pre.5561",
+    "@openmrs/esm-emr-api": "^10.0.1-pre.5561",
+    "@openmrs/esm-error-handling": "^10.0.1-pre.5561",
+    "@openmrs/esm-extensions": "^10.0.1-pre.5561",
+    "@openmrs/esm-feature-flags": "^10.0.1-pre.5561",
+    "@openmrs/esm-globals": "^10.0.1-pre.5561",
+    "@openmrs/esm-navigation": "^10.0.1-pre.5561",
+    "@openmrs/esm-state": "^10.0.1-pre.5561",
+    "@openmrs/esm-utils": "^10.0.1-pre.5561",
     "dayjs": "1.x",
     "i18next": "25.x",
     "react": "18.x",
     "react-dom": "18.x",
     "react-i18next": "16.x",
-    "rxjs": "6.x",
     "swr": "2.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "10.0.1-pre.5542",
-    "@openmrs/esm-config": "10.0.1-pre.5542",
-    "@openmrs/esm-context": "10.0.1-pre.5542",
-    "@openmrs/esm-emr-api": "10.0.1-pre.5542",
-    "@openmrs/esm-error-handling": "10.0.1-pre.5542",
-    "@openmrs/esm-extensions": "10.0.1-pre.5542",
-    "@openmrs/esm-feature-flags": "10.0.1-pre.5542",
-    "@openmrs/esm-globals": "10.0.1-pre.5542",
-    "@openmrs/esm-navigation": "10.0.1-pre.5542",
-    "@openmrs/esm-state": "10.0.1-pre.5542",
-    "@openmrs/esm-utils": "10.0.1-pre.5542",
+    "@openmrs/esm-api": "10.0.1-pre.5561",
+    "@openmrs/esm-config": "10.0.1-pre.5561",
+    "@openmrs/esm-context": "10.0.1-pre.5561",
+    "@openmrs/esm-emr-api": "10.0.1-pre.5561",
+    "@openmrs/esm-error-handling": "10.0.1-pre.5561",
+    "@openmrs/esm-extensions": "10.0.1-pre.5561",
+    "@openmrs/esm-feature-flags": "10.0.1-pre.5561",
+    "@openmrs/esm-globals": "10.0.1-pre.5561",
+    "@openmrs/esm-navigation": "10.0.1-pre.5561",
+    "@openmrs/esm-state": "10.0.1-pre.5561",
+    "@openmrs/esm-utils": "10.0.1-pre.5561",
     "@swc/cli": "0.8.1",
     "@swc/core": "1.15.21",
     "@vitest/coverage-v8": "^4.1.2",
@@ -103,7 +102,6 @@
     "react-dom": "^18.3.1",
     "react-i18next": "^16.0.0",
     "rimraf": "^6.1.3",
-    "rxjs": "^6.5.3",
     "swr": "2.5.1",
     "vitest": "^4.1.2"
   },

package/src/UserHasAccess.test.tsx

@@ -1,16 +1,17 @@
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
 import React from 'react';
-import { Observable, type Subscriber } from 'rxjs';
-import type { LoggedInUser, Privilege, Role, getCurrentUser, userHasAccess } from '@openmrs/esm-api';
+import type { LoggedInUser, Privilege, Role } from '@openmrs/esm-api';
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+import { getSessionStore, userHasAccess } from '@openmrs/esm-api';
 import { UserHasAccess } from './UserHasAccess';
 
-// Mock getCurrentUser and userHasAccess
-const mockGetCurrentUser = vi.fn();
+// Mock getSessionStore and userHasAccess
+const mockGetSessionStore = vi.fn();
 const mockUserHasAccess = vi.fn();
 
 vi.mock('@openmrs/esm-api', () => ({
-  getCurrentUser: (...args: Parameters<typeof getCurrentUser>) => mockGetCurrentUser(...args),
+  getSessionStore: (...args: Parameters<typeof getSessionStore>) => mockGetSessionStore(...args),
   userHasAccess: (...args: Parameters<typeof userHasAccess>) => mockUserHasAccess(...args),
 }));
 
@@ -40,6 +41,37 @@ function createMockUser(privileges: string[] = [], roles: string[] = []): Logged
   };
 }
 
+type SessionState = { loaded: boolean; session: { authenticated: boolean; sessionId: string; user?: LoggedInUser } };
+
+/**
+ * Builds a minimal stand-in for the session store {@link UserHasAccess} consumes:
+ * `getState()` returns the current state synchronously and `subscribe()` registers
+ * a listener and returns an unsubscribe function. `emit()` lets tests push updates.
+ */
+function createFakeStore(user: LoggedInUser | null, unsubscribe: () => void = vi.fn()) {
+  const listeners = new Set<(state: SessionState) => void>();
+  let state: SessionState = {
+    loaded: true,
+    session: user ? { authenticated: true, sessionId: 'test-session', user } : { authenticated: false, sessionId: '' },
+  };
+  return {
+    getState: () => state,
+    subscribe: vi.fn((listener: (state: SessionState) => void) => {
+      listeners.add(listener);
+      return unsubscribe;
+    }),
+    emit(nextUser: LoggedInUser | null) {
+      state = {
+        loaded: true,
+        session: nextUser
+          ? { authenticated: true, sessionId: 'test-session', user: nextUser }
+          : { authenticated: false, sessionId: '' },
+      };
+      listeners.forEach((listener) => listener(state));
+    },
+  };
+}
+
 describe('UserHasAccess', () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -53,7 +85,7 @@ describe('UserHasAccess', () => {
     it('should render children for single privilege', () => {
       const user = createMockUser(['Edit Patients']);
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(true);
 
       render(
@@ -69,7 +101,7 @@ describe('UserHasAccess', () => {
     it('should render children for multiple privileges', () => {
       const user = createMockUser(['Edit Patients', 'Delete Patients']);
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(true);
 
       render(
@@ -85,7 +117,7 @@ describe('UserHasAccess', () => {
     it('should render multiple children', () => {
       const user = createMockUser(['Edit Patients']);
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(true);
 
       render(
@@ -104,7 +136,7 @@ describe('UserHasAccess', () => {
     it('should render nothing when no fallback provided', () => {
       const user = createMockUser(['View Patients']);
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(false);
 
       const { container } = render(
@@ -121,7 +153,7 @@ describe('UserHasAccess', () => {
     it('should render fallback when provided', () => {
       const user = createMockUser(['View Patients']);
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(false);
 
       render(
@@ -137,7 +169,7 @@ describe('UserHasAccess', () => {
     it('should render fallback for missing privilege in array', () => {
       const user = createMockUser(['Edit Patients']); // Has one but not both
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(false);
 
       render(
@@ -153,7 +185,7 @@ describe('UserHasAccess', () => {
 
   describe('when user is not logged in', () => {
     it('should render nothing when no fallback provided', () => {
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(null)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(null));
       mockUserHasAccess.mockReturnValue(false);
 
       const { container } = render(
@@ -168,7 +200,7 @@ describe('UserHasAccess', () => {
     });
 
     it('should render fallback when provided', () => {
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(null)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(null));
       mockUserHasAccess.mockReturnValue(false);
 
       render(
@@ -182,18 +214,12 @@ describe('UserHasAccess', () => {
     });
   });
 
-  describe('observable subscription management', () => {
-    it('should subscribe to getCurrentUser on mount', () => {
+  describe('session subscription management', () => {
+    it('should subscribe to the session store on mount', () => {
       const user = createMockUser(['Edit Patients']);
-      const subscribeMock = vi.fn();
-
-      mockGetCurrentUser.mockReturnValue(
-        new Observable((subscriber) => {
-          subscribeMock();
-          subscriber.next(user);
-          return () => {};
-        }),
-      );
+      const store = createFakeStore(user);
+
+      mockGetSessionStore.mockReturnValue(store);
       mockUserHasAccess.mockReturnValue(true);
 
       render(
@@ -202,20 +228,16 @@ describe('UserHasAccess', () => {
         </UserHasAccess>,
       );
 
-      expect(mockGetCurrentUser).toHaveBeenCalledWith({ includeAuthStatus: false });
-      expect(subscribeMock).toHaveBeenCalled();
+      expect(mockGetSessionStore).toHaveBeenCalled();
+      expect(store.subscribe).toHaveBeenCalled();
     });
 
-    it('should unsubscribe from getCurrentUser on unmount', () => {
+    it('should unsubscribe from the session store on unmount', () => {
       const user = createMockUser(['Edit Patients']);
       const unsubscribeMock = vi.fn();
+      const store = createFakeStore(user, unsubscribeMock);
 
-      mockGetCurrentUser.mockReturnValue(
-        new Observable((subscriber) => {
-          subscriber.next(user);
-          return unsubscribeMock;
-        }),
-      );
+      mockGetSessionStore.mockReturnValue(store);
       mockUserHasAccess.mockReturnValue(true);
 
       const { unmount } = render(
@@ -231,23 +253,17 @@ describe('UserHasAccess', () => {
   });
 
   describe('user updates', () => {
-    it('should update when user changes', async () => {
+    it('should update when the session changes', async () => {
       const user1 = createMockUser(['View Patients']);
       const user2 = createMockUser(['Edit Patients']);
+      const store = createFakeStore(user1);
 
-      let subscriber: Subscriber<unknown> | undefined = undefined;
-      mockGetCurrentUser.mockReturnValue(
-        new Observable((sub) => {
-          subscriber = sub;
-          sub.next(user1);
-          return () => {};
-        }),
-      );
+      mockGetSessionStore.mockReturnValue(store);
 
       // Initially user doesn't have access
       mockUserHasAccess.mockReturnValue(false);
 
-      const { rerender } = render(
+      render(
         <UserHasAccess privilege="Edit Patients" fallback={<div>No Access</div>}>
           <div>Protected Content</div>
         </UserHasAccess>,
@@ -258,7 +274,7 @@ describe('UserHasAccess', () => {
 
       // User gains access
       mockUserHasAccess.mockReturnValue(true);
-      (subscriber as unknown as Subscriber<unknown>)?.next(user2);
+      store.emit(user2);
 
       await waitFor(() => {
         expect(screen.queryByText('No Access')).not.toBeInTheDocument();
@@ -271,7 +287,7 @@ describe('UserHasAccess', () => {
     it('should handle empty children gracefully', () => {
       const user = createMockUser(['Edit Patients']);
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(true);
 
       const { container } = render(<UserHasAccess privilege="Edit Patients" />);
@@ -284,7 +300,7 @@ describe('UserHasAccess', () => {
     it('should handle complex fallback component', () => {
       const user = createMockUser(['View Patients']);
 
-      mockGetCurrentUser.mockReturnValue(new Observable((subscriber) => subscriber.next(user)));
+      mockGetSessionStore.mockReturnValue(createFakeStore(user));
       mockUserHasAccess.mockReturnValue(false);
 
       render(

package/src/UserHasAccess.tsx

@@ -1,6 +1,6 @@
 /** @module @category API */
 import type { LoggedInUser } from '@openmrs/esm-api';
-import { getCurrentUser, userHasAccess } from '@openmrs/esm-api';
+import { getSessionStore, userHasAccess } from '@openmrs/esm-api';
 import React, { useEffect, useState } from 'react';
 
 export interface UserHasAccessProps {
@@ -41,10 +41,15 @@ export const UserHasAccess: React.FC<UserHasAccessProps> = ({ privilege, fallbac
   const [user, setUser] = useState<LoggedInUser | null>(null);
 
   useEffect(() => {
-    const subscription = getCurrentUser({
-      includeAuthStatus: false,
-    }).subscribe(setUser);
-    return () => subscription.unsubscribe();
+    const store = getSessionStore();
+    const unsubscribe = store.subscribe(({ loaded, session }) => {
+      setUser(loaded ? session?.user ?? null : null);
+    });
+    const { loaded, session } = store.getState();
+    if (loaded) {
+      setUser(session?.user ?? null);
+    }
+    return unsubscribe;
   }, []);
 
   if (user && userHasAccess(privilege, user)) {

package/src/index.ts

@@ -16,7 +16,6 @@ export * from './useAttachments';
 export * from './useBodyScrollLock';
 export * from './useConfig';
 export * from './useConnectedExtensions';
-export * from './useConnectivity';
 export * from './useDebounce';
 export * from './useDefineAppContext';
 export * from './useEmrConfiguration';

package/src/public.ts

@@ -12,7 +12,6 @@ export * from './useAttachments';
 export * from './useBodyScrollLock';
 export * from './useConfig';
 export * from './useConnectedExtensions';
-export * from './useConnectivity';
 export * from './useDebounce';
 export * from './useDefineAppContext';
 export * from './useEmrConfiguration';

package/src/useLocations.tsx

@@ -1,6 +1,9 @@
 /** @module @category API */
-import { useState, useEffect } from 'react';
-import { getLocations, type Location } from '@openmrs/esm-emr-api';
+import { restBaseUrl } from '@openmrs/esm-api';
+import { type Location } from '@openmrs/esm-emr-api';
+import { useOpenmrsFetchAll } from './useOpenmrsFetchAll';
+
+const noLocations: Array<Location> = [];
 
 /**
  * A React hook that fetches and returns locations from the OpenMRS server.
@@ -27,19 +30,17 @@ import { getLocations, type Location } from '@openmrs/esm-emr-api';
  * ```
  */
 export function useLocations(tagUuidOrName: string | null = null, query: string | null = null): Array<Location> {
-  const [locations, setLocations] = useState<Array<Location>>([]);
+  const params = new URLSearchParams();
+  if (tagUuidOrName) {
+    params.set('tag', tagUuidOrName);
+  }
+  if (query) {
+    params.set('q', query);
+  }
+  const queryString = params.toString();
 
-  useEffect(() => {
-    const locationSub = getLocations(tagUuidOrName, query).subscribe(
-      (locations) => {
-        setLocations(locations);
-      },
-      (error) => {
-        console.error(error);
-      },
-    );
-    return () => locationSub.unsubscribe();
-  }, [tagUuidOrName, query]);
+  const url = `${restBaseUrl}/location${queryString ? '?' + queryString : ''}`;
 
-  return locations;
+  const { data } = useOpenmrsFetchAll<Location>(url, { immutable: true });
+  return data ?? noLocations;
 }

package/src/useVisitTypes.ts

@@ -1,6 +1,8 @@
 /** @module @category API */
-import { getVisitTypes, type VisitType } from '@openmrs/esm-emr-api';
-import { useEffect, useState } from 'react';
+import useSWRImmutable from 'swr/immutable';
+import { getVisitTypes, visitTypesUrl, type VisitType } from '@openmrs/esm-emr-api';
+
+const noVisitTypes: Array<VisitType> = [];
 
 /**
  * A React hook that fetches and returns all available visit types from the
@@ -25,18 +27,6 @@ import { useEffect, useState } from 'react';
  * ```
  */
 export function useVisitTypes() {
-  const [visitTypes, setVisitTypes] = useState<Array<VisitType>>([]);
-
-  useEffect(() => {
-    const visitTypesSub = getVisitTypes().subscribe(
-      (visitTypes) => {
-        setVisitTypes(visitTypes);
-      },
-      (error) => console.error(error),
-    );
-
-    return () => visitTypesSub.unsubscribe();
-  }, []);
-
-  return visitTypes;
+  const { data } = useSWRImmutable(visitTypesUrl, getVisitTypes);
+  return data ?? noVisitTypes;
 }

package/dist/useConnectivity.d.ts

@@ -1,18 +0,0 @@
-/**
- * A React hook that returns the current online/offline status and automatically
- * updates when connectivity changes. Useful for showing offline indicators or
- * conditionally rendering UI based on network availability.
- *
- * @returns `true` if the browser is online, `false` if offline.
- *
- * @example
- * ```tsx
- * import { useConnectivity } from '@openmrs/esm-framework';
- * function NetworkStatus() {
- *   const isOnline = useConnectivity();
- *   return <span>{isOnline ? 'Online' : 'Offline'}</span>;
- * }
- * ```
- */
-export declare function useConnectivity(): boolean;
-//# sourceMappingURL=useConnectivity.d.ts.map

package/dist/useConnectivity.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useConnectivity.d.ts","sourceRoot":"","sources":["../src/useConnectivity.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,YAM9B"}

package/dist/useConnectivity.js

@@ -1,23 +0,0 @@
-/** @module @category Offline */ import { subscribeConnectivityChanged } from "@openmrs/esm-globals";
-import { isOnline as isOnlineFn } from "@openmrs/esm-utils";
-import { useEffect, useState } from "react";
-/**
- * A React hook that returns the current online/offline status and automatically
- * updates when connectivity changes. Useful for showing offline indicators or
- * conditionally rendering UI based on network availability.
- *
- * @returns `true` if the browser is online, `false` if offline.
- *
- * @example
- * ```tsx
- * import { useConnectivity } from '@openmrs/esm-framework';
- * function NetworkStatus() {
- *   const isOnline = useConnectivity();
- *   return <span>{isOnline ? 'Online' : 'Offline'}</span>;
- * }
- * ```
- */ export function useConnectivity() {
-    let [isOnline, setIsOnline] = useState(isOnlineFn());
-    useEffect(()=>subscribeConnectivityChanged(({ online })=>setIsOnline(online)), []);
-    return isOnline;
-}

package/src/useConnectivity.ts

@@ -1,28 +0,0 @@
-/** @module @category Offline */
-import { subscribeConnectivityChanged } from '@openmrs/esm-globals';
-import { isOnline as isOnlineFn } from '@openmrs/esm-utils';
-import { useEffect, useState } from 'react';
-
-/**
- * A React hook that returns the current online/offline status and automatically
- * updates when connectivity changes. Useful for showing offline indicators or
- * conditionally rendering UI based on network availability.
- *
- * @returns `true` if the browser is online, `false` if offline.
- *
- * @example
- * ```tsx
- * import { useConnectivity } from '@openmrs/esm-framework';
- * function NetworkStatus() {
- *   const isOnline = useConnectivity();
- *   return <span>{isOnline ? 'Online' : 'Offline'}</span>;
- * }
- * ```
- */
-export function useConnectivity() {
-  let [isOnline, setIsOnline] = useState(isOnlineFn());
-
-  useEffect(() => subscribeConnectivityChanged(({ online }) => setIsOnline(online)), []);
-
-  return isOnline;
-}