@ovok/core 0.4.31 → 0.4.32

package/dist/hooks/signals-alert-hooks.d.ts

@@ -1,18 +1,18 @@
 import { SignalsAlert, SignalsAlertsQuery, SignalsRawAlert, SignalsRawAlertsQuery } from "../client/signals";
-import { OvokMutationState, OvokRequestState } from "./api-hooks";
+export { useAcknowledgeSignalsAlert, useSignalsAlert } from "./signals-alert-item-hooks";
+export type { SignalsAlertGrain } from "./signals-alert-item-hooks";
 type SignalsAlertsHookQuery = Omit<SignalsAlertsQuery, "cursor"> & {
     episodes?: true;
 };
 type SignalsRawAlertsHookQuery = Omit<SignalsRawAlertsQuery, "cursor"> & {
     episodes: false;
 };
-/** Which grain an alert hook reads: episodes unless `episodes` is `false`. */
-export type SignalsAlertGrain = {
-    episodes?: boolean;
-};
 export type SignalsAlertsHookState<TAlert = SignalsAlert> = {
     items: TAlert[];
+    dataUpdatedAt: number | undefined;
     loading: boolean;
+    isRefreshing: boolean;
+    isStale: boolean;
     error: Error | undefined;
     reload: () => void;
     hasMore: boolean;
@@ -20,18 +20,3 @@ export type SignalsAlertsHookState<TAlert = SignalsAlert> = {
 };
 export declare function useSignalsAlerts(query: SignalsRawAlertsHookQuery): SignalsAlertsHookState<SignalsRawAlert>;
 export declare function useSignalsAlerts(query?: SignalsAlertsHookQuery): SignalsAlertsHookState<SignalsAlert>;
-/** One episode by id, or one raw alert with `{ episodes: false }`. */
-export declare function useSignalsAlert(id: string | undefined, grain: {
-    episodes: false;
-}): OvokRequestState<SignalsRawAlert>;
-export declare function useSignalsAlert(id?: string, grain?: {
-    episodes?: true;
-}): OvokRequestState<SignalsAlert>;
-/** Acknowledges an episode, or a raw alert with `{ episodes: false }`. */
-export declare function useAcknowledgeSignalsAlert(grain: {
-    episodes: false;
-}): OvokMutationState<string, SignalsRawAlert>;
-export declare function useAcknowledgeSignalsAlert(grain?: {
-    episodes?: true;
-}): OvokMutationState<string, SignalsAlert>;
-export {};

package/dist/hooks/signals-alert-hooks.js

@@ -34,33 +34,37 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSignalsAlert = exports.useAcknowledgeSignalsAlert = void 0;
 exports.useSignalsAlerts = useSignalsAlerts;
-exports.useSignalsAlert = useSignalsAlert;
-exports.useAcknowledgeSignalsAlert = useAcknowledgeSignalsAlert;
 const React = __importStar(require("react"));
-const api_hooks_1 = require("./api-hooks");
 const notification_invalidation_1 = require("./notification-invalidation");
 const index_1 = require("./index");
+var signals_alert_item_hooks_1 = require("./signals-alert-item-hooks");
+Object.defineProperty(exports, "useAcknowledgeSignalsAlert", { enumerable: true, get: function () { return signals_alert_item_hooks_1.useAcknowledgeSignalsAlert; } });
+Object.defineProperty(exports, "useSignalsAlert", { enumerable: true, get: function () { return signals_alert_item_hooks_1.useSignalsAlert; } });
 function useSignalsAlerts(query = {}) {
     const client = (0, index_1.useClient)();
     const queryKey = JSON.stringify(query);
     const querySnapshot = React.useMemo(() => JSON.parse(queryKey), [queryKey]);
-    const listPage = React.useCallback((cursor) => {
+    const listPage = React.useCallback((cursor, signal) => {
         const at = cursor === undefined ? {} : { cursor };
         if (querySnapshot.episodes === false) {
             const { episodes: _grain, ...filters } = querySnapshot;
-            return client.listSignalsRawAlerts({ ...filters, ...at });
+            return client.listSignalsRawAlerts({ ...filters, ...at }, { signal });
         }
         const { episodes: _grain, ...filters } = querySnapshot;
-        return client.listSignalsAlerts({ ...filters, ...at });
+        return client.listSignalsAlerts({ ...filters, ...at }, { signal });
     }, [client, querySnapshot]);
     const [items, setItems] = React.useState([]);
     const [nextCursor, setNextCursor] = React.useState(null);
     const [loading, setLoading] = React.useState(true);
     const [error, setError] = React.useState();
+    const [dataUpdatedAt, setDataUpdatedAt] = React.useState();
     const [revision, setRevision] = React.useState(0);
     const generation = React.useRef(0);
+    const loadMoreController = React.useRef();
     const loadingRef = React.useRef(false);
+    const previousQueryKey = React.useRef(queryKey);
     React.useEffect(() => (0, notification_invalidation_1.subscribeToNotificationChanges)(client, (change) => {
         if (!change) {
             setRevision((value) => value + 1);
@@ -74,22 +78,29 @@ function useSignalsAlerts(query = {}) {
     }), [client, querySnapshot.episodes]);
     React.useEffect(() => {
         const requestGeneration = generation.current + 1;
+        const controller = new AbortController();
+        const queryChanged = previousQueryKey.current !== queryKey;
         generation.current = requestGeneration;
+        previousQueryKey.current = queryKey;
         loadingRef.current = true;
-        setItems([]);
-        setNextCursor(null);
+        if (queryChanged) {
+            setItems([]);
+            setNextCursor(null);
+            setDataUpdatedAt(undefined);
+        }
         setError(undefined);
         setLoading(true);
-        listPage()
+        listPage(undefined, controller.signal)
             .then((page) => {
             if (generation.current === requestGeneration) {
                 setItems(page.items);
                 setNextCursor(page.nextCursor);
+                setDataUpdatedAt(Date.now());
             }
         })
             .catch((reason) => {
             if (generation.current === requestGeneration) {
-                setError(toError(reason));
+                setError(reason instanceof Error ? reason : new Error(String(reason)));
             }
         })
             .finally(() => {
@@ -99,27 +110,35 @@ function useSignalsAlerts(query = {}) {
             }
         });
         return () => {
+            var _a;
+            controller.abort();
+            (_a = loadMoreController.current) === null || _a === void 0 ? void 0 : _a.abort();
             generation.current += 1;
         };
-    }, [listPage, revision]);
+    }, [listPage, queryKey, revision]);
     const loadMore = React.useCallback(async () => {
+        var _a;
         if (nextCursor === null || loadingRef.current) {
             return;
         }
         const requestGeneration = generation.current;
+        const controller = new AbortController();
+        (_a = loadMoreController.current) === null || _a === void 0 ? void 0 : _a.abort();
+        loadMoreController.current = controller;
         loadingRef.current = true;
         setLoading(true);
         setError(undefined);
         try {
-            const page = await listPage(nextCursor);
+            const page = await listPage(nextCursor, controller.signal);
             if (generation.current === requestGeneration) {
                 setItems((current) => [...current, ...page.items]);
                 setNextCursor(page.nextCursor);
+                setDataUpdatedAt(Date.now());
             }
         }
         catch (reason) {
             if (generation.current === requestGeneration) {
-                setError(toError(reason));
+                setError(reason instanceof Error ? reason : new Error(String(reason)));
             }
         }
         finally {
@@ -127,6 +146,9 @@ function useSignalsAlerts(query = {}) {
                 loadingRef.current = false;
                 setLoading(false);
             }
+            if (loadMoreController.current === controller) {
+                loadMoreController.current = undefined;
+            }
         }
     }, [listPage, nextCursor]);
     const reload = React.useCallback(() => {
@@ -134,31 +156,13 @@ function useSignalsAlerts(query = {}) {
     }, []);
     return {
         items,
+        dataUpdatedAt,
         loading,
+        isRefreshing: items.length > 0 && loading,
+        isStale: items.length > 0 && (loading || error !== undefined),
         error,
         reload,
         hasMore: nextCursor !== null,
         loadMore,
     };
 }
-function useSignalsAlert(id, grain = {}) {
-    const client = (0, index_1.useClient)();
-    const episodes = grain.episodes !== false;
-    const load = React.useCallback(() => episodes
-        ? client.getSignalsAlert(id)
-        : client.getSignalsRawAlert(id), [client, id, episodes]);
-    return (0, api_hooks_1.useOvokRequest)(load, id !== undefined);
-}
-function useAcknowledgeSignalsAlert(grain = {}) {
-    const episodes = grain.episodes !== false;
-    return (0, api_hooks_1.useOvokMutation)(async (client, id) => {
-        const result = episodes
-            ? await client.acknowledgeSignalsAlert(id)
-            : await client.acknowledgeSignalsRawAlert(id);
-        (0, notification_invalidation_1.notifyNotificationChanges)(client, episodes
-            ? { type: "signals-alert", alert: result }
-            : { type: "signals-raw-alert", alert: result });
-        return result;
-    });
-}
-const toError = (error) => error instanceof Error ? error : new Error(String(error));

package/dist/hooks/signals-alert-item-hooks.d.ts

@@ -0,0 +1,19 @@
+import { SignalsAlert, SignalsRawAlert } from "../client/signals";
+import { OvokMutationState, OvokRequestState } from "./api-hooks";
+export type SignalsAlertGrain = {
+    episodes?: boolean;
+};
+/** One episode by id, or one raw alert with `{ episodes: false }`. */
+export declare function useSignalsAlert(id: string | undefined, grain: {
+    episodes: false;
+}): OvokRequestState<SignalsRawAlert>;
+export declare function useSignalsAlert(id?: string, grain?: {
+    episodes?: true;
+}): OvokRequestState<SignalsAlert>;
+/** Acknowledges an episode, or a raw alert with `{ episodes: false }`. */
+export declare function useAcknowledgeSignalsAlert(grain: {
+    episodes: false;
+}): OvokMutationState<string, SignalsRawAlert>;
+export declare function useAcknowledgeSignalsAlert(grain?: {
+    episodes?: true;
+}): OvokMutationState<string, SignalsAlert>;

package/dist/hooks/signals-alert-item-hooks.js

@@ -0,0 +1,62 @@
+"use strict";
+"use client";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSignalsAlert = useSignalsAlert;
+exports.useAcknowledgeSignalsAlert = useAcknowledgeSignalsAlert;
+const React = __importStar(require("react"));
+const api_hooks_1 = require("./api-hooks");
+const notification_invalidation_1 = require("./notification-invalidation");
+const index_1 = require("./index");
+function useSignalsAlert(id, grain = {}) {
+    const client = (0, index_1.useClient)();
+    const episodes = grain.episodes !== false;
+    const load = React.useCallback((signal) => episodes
+        ? client.getSignalsAlert(id, { signal })
+        : client.getSignalsRawAlert(id, { signal }), [client, id, episodes]);
+    return (0, api_hooks_1.useOvokRequest)(load, id !== undefined);
+}
+function useAcknowledgeSignalsAlert(grain = {}) {
+    const episodes = grain.episodes !== false;
+    return (0, api_hooks_1.useOvokMutation)(async (client, id) => {
+        const result = episodes
+            ? await client.acknowledgeSignalsAlert(id)
+            : await client.acknowledgeSignalsRawAlert(id);
+        (0, notification_invalidation_1.notifyNotificationChanges)(client, episodes
+            ? { type: "signals-alert", alert: result }
+            : { type: "signals-raw-alert", alert: result });
+        return result;
+    });
+}

package/dist/hooks/signals-hooks.js

@@ -46,7 +46,7 @@ const useEnableSignalsForPatient = () => (0, api_hooks_1.useOvokMutation)((clien
 exports.useEnableSignalsForPatient = useEnableSignalsForPatient;
 const useSignalsThresholds = (patientId) => {
     const client = (0, index_1.useClient)();
-    const load = React.useCallback(() => client.getSignalsThresholds(patientId), [client, patientId]);
+    const load = React.useCallback((signal) => client.getSignalsThresholds(patientId, { signal }), [client, patientId]);
     return (0, api_hooks_1.useOvokRequest)(load, patientId !== undefined);
 };
 exports.useSignalsThresholds = useSignalsThresholds;
@@ -56,7 +56,7 @@ const useRemoveSignalsThreshold = () => (0, api_hooks_1.useOvokMutation)((client
 exports.useRemoveSignalsThreshold = useRemoveSignalsThreshold;
 const useSignalsSettings = () => {
     const client = (0, index_1.useClient)();
-    const load = React.useCallback(() => client.getSignalsSettings(), [client]);
+    const load = React.useCallback((signal) => client.getSignalsSettings({ signal }), [client]);
     return (0, api_hooks_1.useOvokRequest)(load);
 };
 exports.useSignalsSettings = useSignalsSettings;

package/dist/index.d.ts

@@ -931,6 +931,8 @@ export * from "./client/auth/errors";
 export type { RegisterBody } from "./client/auth/types/RegisterBody";
 export type { RegisterPractitionerBody } from "./client/auth/types/RegisterPractitionerBody";
 export type { OvokSavedAccount } from "./client/auth/types/Account";
+export { LoginError } from "./client/auth/types/LoginError";
+export type { LoginProfile, TenantLoginStart } from "./client/auth/types/LoginError";
 export { MAX_CONDITIONAL_OBSERVATION_ENTRIES, MAX_OBSERVATION_BUNDLE_BYTES, } from "./client/ovok-client";
 export type { SaveObservationsResult } from "./client/ovok-client";
 export * from "./client/offline";
@@ -950,6 +952,7 @@ export * from "./client/cms";
 export * from "./client/invites";
 export * from "./client/notifications";
 export * from "./client/slim/types";
+export * from "./client/slim/paging";
 export * from "./client/experience/types";
 export * from "./client/patient/types";
 export * from "./client/patient-sharing";

package/dist/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapSignalsError = exports.isSignalsError = exports.SignalsError = exports.saveMeasurement = exports.MAX_OBSERVATION_BUNDLE_BYTES = exports.MAX_CONDITIONAL_OBSERVATION_ENTRIES = exports.OvokClient = exports.Medplum = void 0;
+exports.mapSignalsError = exports.isSignalsError = exports.SignalsError = exports.saveMeasurement = exports.MAX_OBSERVATION_BUNDLE_BYTES = exports.MAX_CONDITIONAL_OBSERVATION_ENTRIES = exports.LoginError = exports.OvokClient = exports.Medplum = void 0;
 const MedplumCore = __importStar(require("@medplum/core"));
 __exportStar(require("./types"), exports);
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -48,6 +48,8 @@ __exportStar(require("./client/errors/rate-limit-error"), exports);
 __exportStar(require("./client/errors/sign-in-required-error"), exports);
 __exportStar(require("./client/errors/ovok-error"), exports);
 __exportStar(require("./client/auth/errors"), exports);
+var LoginError_1 = require("./client/auth/types/LoginError");
+Object.defineProperty(exports, "LoginError", { enumerable: true, get: function () { return LoginError_1.LoginError; } });
 var ovok_client_2 = require("./client/ovok-client");
 Object.defineProperty(exports, "MAX_CONDITIONAL_OBSERVATION_ENTRIES", { enumerable: true, get: function () { return ovok_client_2.MAX_CONDITIONAL_OBSERVATION_ENTRIES; } });
 Object.defineProperty(exports, "MAX_OBSERVATION_BUNDLE_BYTES", { enumerable: true, get: function () { return ovok_client_2.MAX_OBSERVATION_BUNDLE_BYTES; } });
@@ -69,6 +71,7 @@ __exportStar(require("./client/cms"), exports);
 __exportStar(require("./client/invites"), exports);
 __exportStar(require("./client/notifications"), exports);
 __exportStar(require("./client/slim/types"), exports);
+__exportStar(require("./client/slim/paging"), exports);
 __exportStar(require("./client/experience/types"), exports);
 __exportStar(require("./client/patient/types"), exports);
 __exportStar(require("./client/patient-sharing"), exports);

package/dist/utils/auth/exchange-code.d.ts

@@ -1,9 +1,11 @@
+import type { MedplumRequestOptions } from "@medplum/core";
 import { OvokClient } from "../../client/ovok-client";
 import { AuthResponse } from "../../types";
 type ExchangeCodeProps = {
     client: OvokClient;
     sessionCode: string;
     codeVerifier: string;
+    requestOptions?: MedplumRequestOptions;
 } & ({
     type: "Patient";
 } | {

package/dist/utils/auth/exchange-code.js

@@ -7,11 +7,11 @@ const exchangeCode = async ({ ...props }) => {
             sessionCode: props.sessionCode,
             codeVerifier: props.codeVerifier,
             tenantCode: props.tenantCode,
-        });
+        }, undefined, props.requestOptions);
     }
     return props.client.post("auth/tenant/Patient/login/token", {
         sessionCode: props.sessionCode,
         codeVerifier: props.codeVerifier,
-    });
+    }, undefined, props.requestOptions);
 };
 exports.exchangeCode = exchangeCode;

package/dist/utils/auth/handle-tenant-code.d.ts

@@ -3,4 +3,4 @@ export declare const handleTenantCode: ({ profiles, tenantCode, type, }: {
     profiles: StartLoginResponse["profiles"];
     tenantCode?: string;
     type: "Practitioner" | "Patient";
-}) => string | undefined;
+}) => string;

package/dist/utils/auth/handle-tenant-code.js

@@ -1,20 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleTenantCode = void 0;
+const LoginError_1 = require("../../client/auth/types/LoginError");
 const handleTenantCode = ({ profiles, tenantCode, type, }) => {
-    var _a;
     if (type !== "Practitioner") {
+        if (!tenantCode) {
+            throw new LoginError_1.LoginError("tenant_code_required", "A tenant code is required for patient login.");
+        }
         return tenantCode;
     }
     if (!profiles || !(profiles === null || profiles === void 0 ? void 0 : profiles.length)) {
-        throw new Error("No profiles found");
+        if (tenantCode) {
+            return tenantCode;
+        }
+        throw new LoginError_1.LoginError("profile_not_found", "No practitioner profiles were returned.");
     }
     if (!tenantCode) {
-        return (_a = profiles === null || profiles === void 0 ? void 0 : profiles[0]) === null || _a === void 0 ? void 0 : _a.tenantCode;
+        if (profiles.length === 1) {
+            return profiles[0].tenantCode;
+        }
+        throw new LoginError_1.LoginError("tenant_code_required", "Choose a project before completing sign-in.", profiles);
     }
     const matchingProfile = profiles.find((profile) => profile.tenantCode === tenantCode);
     if (!matchingProfile) {
-        throw new Error("No matching profile found");
+        throw new LoginError_1.LoginError("tenant_code_not_found", "No practitioner profile matches that project.", profiles);
     }
     return matchingProfile.tenantCode;
 };

package/dist/utils/auth/start-login.d.ts

@@ -1,3 +1,4 @@
+import type { MedplumRequestOptions } from "@medplum/core";
 import { StartLoginResponse } from "../../client/auth/types/StartLoginResponse";
 import { OvokClient } from "../../client/ovok-client";
 import { LoginBody } from "../../types";
@@ -5,6 +6,7 @@ type StartLoginProps = {
     client: OvokClient;
     body: LoginBody;
     codeChallenge: string;
+    requestOptions?: MedplumRequestOptions;
 };
-export declare const startLogin: ({ client, body, codeChallenge, }: StartLoginProps) => Promise<StartLoginResponse>;
+export declare const startLogin: ({ client, body, codeChallenge, requestOptions, }: StartLoginProps) => Promise<StartLoginResponse>;
 export {};

package/dist/utils/auth/start-login.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startLogin = void 0;
-const startLogin = async ({ client, body, codeChallenge, }) => {
+const startLogin = async ({ client, body, codeChallenge, requestOptions, }) => {
     if (body.type === "Patient") {
         return client.post("auth/tenant/Patient/login/start", {
             email: body.email,
             password: body.password,
             codeChallenge,
             tenantCode: body.tenantCode,
-        }, "application/json");
+        }, "application/json", requestOptions);
     }
     return client.post("auth/tenant/Practitioner/login/start", {
         email: body.email,
         password: body.password,
         codeChallenge,
-    }, "application/json");
+    }, "application/json", requestOptions);
 };
 exports.startLogin = startLogin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ovok/core",
-  "version": "0.4.31",
+  "version": "0.4.32",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",