aidbox-react 1.6.0 → 1.7.1

package/dist/cjs/hooks/pager.d.ts

@@ -3,7 +3,11 @@ import { RemoteData } from '../libs/remoteData';
 import { SearchParams } from '../services/search';
 export interface PagerManager {
     loadNext: () => void;
+    loadPrevious: () => void;
+    loadPage: (page: number) => void;
     reload: () => void;
     hasNext: boolean;
+    hasPrevious: boolean;
+    currentPage: number;
 }
 export declare function usePager<T extends AidboxResource>(resourceType: T['resourceType'], resourcesOnPage?: number, searchParams?: SearchParams): [RemoteData<Bundle<T>>, PagerManager];

package/dist/cjs/index.js

@@ -3168,19 +3168,28 @@ function createSharedState(initial) {
 }
 
 function usePager(resourceType, resourcesOnPage = 15, searchParams = {}) {
-    const [pageToLoad, setPageToLoad] = react.exports.useState(1);
+    var _a;
+    const [pageToLoad, setPageToLoad] = react.exports.useState((_a = searchParams._page) !== null && _a !== void 0 ? _a : 1);
     const [reloadsCount, setReloadsCount] = react.exports.useState(0);
-    const [resources] = useService(() => getFHIRResources(resourceType, Object.assign(Object.assign({}, searchParams), { _count: resourcesOnPage, _page: pageToLoad })), [pageToLoad, reloadsCount]);
+    const [resources] = useService(() => getFHIRResources(resourceType, Object.assign(Object.assign({}, searchParams), { _count: resourcesOnPage, _page: pageToLoad })), [pageToLoad, reloadsCount, resourcesOnPage]);
+    const hasNext = react.exports.useMemo(() => { var _a; return (isSuccess(resources) ? Boolean((_a = resources.data.link) === null || _a === void 0 ? void 0 : _a.some((link) => link.relation === 'next')) : false); }, [resources]);
+    const hasPrevious = react.exports.useMemo(() => { var _a; return isSuccess(resources) ? Boolean((_a = resources.data.link) === null || _a === void 0 ? void 0 : _a.some((link) => link.relation === 'previous')) : false; }, [resources]);
+    const loadNext = react.exports.useCallback(() => setPageToLoad((currentPage) => currentPage + 1), []);
+    const loadPrevious = react.exports.useCallback(() => setPageToLoad((currentPage) => (hasPrevious ? currentPage - 1 : currentPage)), [hasPrevious]);
+    const reload = react.exports.useCallback(() => {
+        setPageToLoad(1);
+        setReloadsCount((c) => c + 1);
+    }, []);
     return [
         resources,
         {
-            loadNext: () => setPageToLoad((currentPage) => currentPage + 1),
-            hasNext: isSuccess(resources) &&
-                Boolean(resources.data.link && resources.data.link.some((link) => link.relation === 'next')),
-            reload: () => {
-                setPageToLoad(1);
-                setReloadsCount((c) => c + 1);
-            },
+            loadNext,
+            loadPrevious,
+            loadPage: setPageToLoad,
+            reload,
+            hasNext,
+            hasPrevious,
+            currentPage: pageToLoad,
         },
     ];
 }

package/dist/cjs/services/token.d.ts

@@ -1,4 +1,5 @@
 export interface Token {
     access_token: string;
     token_type: string;
+    refresh_token?: string;
 }

package/dist/esm/hooks/pager.d.ts

@@ -3,7 +3,11 @@ import { RemoteData } from '../libs/remoteData';
 import { SearchParams } from '../services/search';
 export interface PagerManager {
     loadNext: () => void;
+    loadPrevious: () => void;
+    loadPage: (page: number) => void;
     reload: () => void;
     hasNext: boolean;
+    hasPrevious: boolean;
+    currentPage: number;
 }
 export declare function usePager<T extends AidboxResource>(resourceType: T['resourceType'], resourcesOnPage?: number, searchParams?: SearchParams): [RemoteData<Bundle<T>>, PagerManager];

package/dist/esm/index.js

@@ -3166,19 +3166,28 @@ function createSharedState(initial) {
 }
 
 function usePager(resourceType, resourcesOnPage = 15, searchParams = {}) {
-    const [pageToLoad, setPageToLoad] = react.exports.useState(1);
+    var _a;
+    const [pageToLoad, setPageToLoad] = react.exports.useState((_a = searchParams._page) !== null && _a !== void 0 ? _a : 1);
     const [reloadsCount, setReloadsCount] = react.exports.useState(0);
-    const [resources] = useService(() => getFHIRResources(resourceType, Object.assign(Object.assign({}, searchParams), { _count: resourcesOnPage, _page: pageToLoad })), [pageToLoad, reloadsCount]);
+    const [resources] = useService(() => getFHIRResources(resourceType, Object.assign(Object.assign({}, searchParams), { _count: resourcesOnPage, _page: pageToLoad })), [pageToLoad, reloadsCount, resourcesOnPage]);
+    const hasNext = react.exports.useMemo(() => { var _a; return (isSuccess(resources) ? Boolean((_a = resources.data.link) === null || _a === void 0 ? void 0 : _a.some((link) => link.relation === 'next')) : false); }, [resources]);
+    const hasPrevious = react.exports.useMemo(() => { var _a; return isSuccess(resources) ? Boolean((_a = resources.data.link) === null || _a === void 0 ? void 0 : _a.some((link) => link.relation === 'previous')) : false; }, [resources]);
+    const loadNext = react.exports.useCallback(() => setPageToLoad((currentPage) => currentPage + 1), []);
+    const loadPrevious = react.exports.useCallback(() => setPageToLoad((currentPage) => (hasPrevious ? currentPage - 1 : currentPage)), [hasPrevious]);
+    const reload = react.exports.useCallback(() => {
+        setPageToLoad(1);
+        setReloadsCount((c) => c + 1);
+    }, []);
     return [
         resources,
         {
-            loadNext: () => setPageToLoad((currentPage) => currentPage + 1),
-            hasNext: isSuccess(resources) &&
-                Boolean(resources.data.link && resources.data.link.some((link) => link.relation === 'next')),
-            reload: () => {
-                setPageToLoad(1);
-                setReloadsCount((c) => c + 1);
-            },
+            loadNext,
+            loadPrevious,
+            loadPage: setPageToLoad,
+            reload,
+            hasNext,
+            hasPrevious,
+            currentPage: pageToLoad,
         },
     ];
 }

package/dist/esm/services/token.d.ts

@@ -1,4 +1,5 @@
 export interface Token {
     access_token: string;
     token_type: string;
+    refresh_token?: string;
 }

package/dist/index.d.ts

@@ -42,6 +42,7 @@ declare function isNotAskedAny(responses: Array<RemoteData>): responses is Array
 interface Token {
     access_token: string;
     token_type: string;
+    refresh_token?: string;
 }
 
 declare function buildQueryParams(params: Record<string, any>): string;
@@ -223,8 +224,12 @@ declare function createSharedState<S>(initial?: S): StateManager<S>;
 
 interface PagerManager {
     loadNext: () => void;
+    loadPrevious: () => void;
+    loadPage: (page: number) => void;
     reload: () => void;
     hasNext: boolean;
+    hasPrevious: boolean;
+    currentPage: number;
 }
 declare function usePager<T extends AidboxResource>(resourceType: T['resourceType'], resourcesOnPage?: number, searchParams?: SearchParams): [RemoteData<Bundle<T>>, PagerManager];
 

package/lib/hooks/pager.d.ts

@@ -3,7 +3,11 @@ import { RemoteData } from '../libs/remoteData';
 import { SearchParams } from '../services/search';
 export interface PagerManager {
     loadNext: () => void;
+    loadPrevious: () => void;
+    loadPage: (page: number) => void;
     reload: () => void;
     hasNext: boolean;
+    hasPrevious: boolean;
+    currentPage: number;
 }
 export declare function usePager<T extends AidboxResource>(resourceType: T['resourceType'], resourcesOnPage?: number, searchParams?: SearchParams): [RemoteData<Bundle<T>>, PagerManager];

package/lib/hooks/pager.js

@@ -7,23 +7,32 @@ var remoteData_1 = require("../libs/remoteData");
 var fhir_1 = require("../services/fhir");
 var service_1 = require("./service");
 function usePager(resourceType, resourcesOnPage, searchParams) {
+    var _a;
     if (resourcesOnPage === void 0) { resourcesOnPage = 15; }
     if (searchParams === void 0) { searchParams = {}; }
-    var _a = (0, react_1.useState)(1), pageToLoad = _a[0], setPageToLoad = _a[1];
-    var _b = (0, react_1.useState)(0), reloadsCount = _b[0], setReloadsCount = _b[1];
+    var _b = (0, react_1.useState)((_a = searchParams._page) !== null && _a !== void 0 ? _a : 1), pageToLoad = _b[0], setPageToLoad = _b[1];
+    var _c = (0, react_1.useState)(0), reloadsCount = _c[0], setReloadsCount = _c[1];
     var resources = (0, service_1.useService)(function () {
         return (0, fhir_1.getFHIRResources)(resourceType, tslib_1.__assign(tslib_1.__assign({}, searchParams), { _count: resourcesOnPage, _page: pageToLoad }));
-    }, [pageToLoad, reloadsCount])[0];
+    }, [pageToLoad, reloadsCount, resourcesOnPage])[0];
+    var hasNext = (0, react_1.useMemo)(function () { var _a; return ((0, remoteData_1.isSuccess)(resources) ? Boolean((_a = resources.data.link) === null || _a === void 0 ? void 0 : _a.some(function (link) { return link.relation === 'next'; })) : false); }, [resources]);
+    var hasPrevious = (0, react_1.useMemo)(function () { var _a; return (0, remoteData_1.isSuccess)(resources) ? Boolean((_a = resources.data.link) === null || _a === void 0 ? void 0 : _a.some(function (link) { return link.relation === 'previous'; })) : false; }, [resources]);
+    var loadNext = (0, react_1.useCallback)(function () { return setPageToLoad(function (currentPage) { return currentPage + 1; }); }, []);
+    var loadPrevious = (0, react_1.useCallback)(function () { return setPageToLoad(function (currentPage) { return (hasPrevious ? currentPage - 1 : currentPage); }); }, [hasPrevious]);
+    var reload = (0, react_1.useCallback)(function () {
+        setPageToLoad(1);
+        setReloadsCount(function (c) { return c + 1; });
+    }, []);
     return [
         resources,
         {
-            loadNext: function () { return setPageToLoad(function (currentPage) { return currentPage + 1; }); },
-            hasNext: (0, remoteData_1.isSuccess)(resources) &&
-                Boolean(resources.data.link && resources.data.link.some(function (link) { return link.relation === 'next'; })),
-            reload: function () {
-                setPageToLoad(1);
-                setReloadsCount(function (c) { return c + 1; });
-            },
+            loadNext: loadNext,
+            loadPrevious: loadPrevious,
+            loadPage: setPageToLoad,
+            reload: reload,
+            hasNext: hasNext,
+            hasPrevious: hasPrevious,
+            currentPage: pageToLoad,
         },
     ];
 }

package/lib/hooks/pager.js.map

@@ -1 +1 @@
-{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../src/hooks/pager.ts"],"names":[],"mappings":";;;;AAAA,+BAAiC;AAGjC,iDAA2D;AAC3D,yCAAoD;AAEpD,qCAAuC;AAQvC,SAAgB,QAAQ,CACpB,YAA+B,EAC/B,eAA4B,EAC5B,YAA+B;IAD/B,gCAAA,EAAA,oBAA4B;IAC5B,6BAAA,EAAA,iBAA+B;IAEzB,IAAA,KAA8B,IAAA,gBAAQ,EAAC,CAAC,CAAC,EAAxC,UAAU,QAAA,EAAE,aAAa,QAAe,CAAC;IAC1C,IAAA,KAAkC,IAAA,gBAAQ,EAAC,CAAC,CAAC,EAA5C,YAAY,QAAA,EAAE,eAAe,QAAe,CAAC;IAE7C,IAAA,SAAS,GAAI,IAAA,oBAAU,EAC1B;QACI,OAAA,IAAA,uBAAgB,EAAC,YAAY,wCACtB,YAAY,KACf,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,UAAU,IACnB;IAJF,CAIE,EACN,CAAC,UAAU,EAAE,YAAY,CAAC,CAC7B,GARe,CAQd;IAEF,OAAO;QACH,SAAS;QACT;YACI,QAAQ,EAAE,cAAM,OAAA,aAAa,CAAC,UAAC,WAAW,IAAK,OAAA,WAAW,GAAG,CAAC,EAAf,CAAe,CAAC,EAA/C,CAA+C;YAC/D,OAAO,EACH,IAAA,sBAAS,EAAC,SAAS,CAAC;gBACpB,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAxB,CAAwB,CAAC,CAAC;YAChG,MAAM,EAAE;gBACJ,aAAa,CAAC,CAAC,CAAC,CAAC;gBACjB,eAAe,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,GAAG,CAAC,EAAL,CAAK,CAAC,CAAC;YAClC,CAAC;SACJ;KACJ,CAAC;AACN,CAAC;AA/BD,4BA+BC"}
+{"version":3,"file":"pager.js","sourceRoot":"","sources":["../../src/hooks/pager.ts"],"names":[],"mappings":";;;;AAAA,+BAAuD;AAGvD,iDAA2D;AAC3D,yCAAoD;AAEpD,qCAAuC;AAYvC,SAAgB,QAAQ,CACpB,YAA+B,EAC/B,eAA4B,EAC5B,YAA+B;;IAD/B,gCAAA,EAAA,oBAA4B;IAC5B,6BAAA,EAAA,iBAA+B;IAEzB,IAAA,KAA8B,IAAA,gBAAQ,EAAC,MAAC,YAAY,CAAC,KAAgB,mCAAI,CAAC,CAAC,EAA1E,UAAU,QAAA,EAAE,aAAa,QAAiD,CAAC;IAC5E,IAAA,KAAkC,IAAA,gBAAQ,EAAC,CAAC,CAAC,EAA5C,YAAY,QAAA,EAAE,eAAe,QAAe,CAAC;IAC7C,IAAA,SAAS,GAAI,IAAA,oBAAU,EAC1B;QACI,OAAA,IAAA,uBAAgB,EAAC,YAAY,wCACtB,YAAY,KACf,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,UAAU,IACnB;IAJF,CAIE,EACN,CAAC,UAAU,EAAE,YAAY,EAAE,eAAe,CAAC,CAC9C,GARe,CAQd;IAEF,IAAM,OAAO,GAAG,IAAA,eAAO,EACnB,sBAAM,OAAA,CAAC,IAAA,sBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAA,SAAS,CAAC,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAxB,CAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA,EAAA,EAC7G,CAAC,SAAS,CAAC,CACd,CAAC;IAEF,IAAM,WAAW,GAAG,IAAA,eAAO,EACvB,sBACI,OAAA,IAAA,sBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAA,SAAS,CAAC,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,QAAQ,KAAK,UAAU,EAA5B,CAA4B,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA,EAAA,EAC7G,CAAC,SAAS,CAAC,CACd,CAAC;IAEF,IAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,cAAM,OAAA,aAAa,CAAC,UAAC,WAAW,IAAK,OAAA,WAAW,GAAG,CAAC,EAAf,CAAe,CAAC,EAA/C,CAA+C,EAAE,EAAE,CAAC,CAAC;IAExF,IAAM,YAAY,GAAG,IAAA,mBAAW,EAC5B,cAAM,OAAA,aAAa,CAAC,UAAC,WAAW,IAAK,OAAA,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,EAA7C,CAA6C,CAAC,EAA7E,CAA6E,EACnF,CAAC,WAAW,CAAC,CAChB,CAAC;IAEF,IAAM,MAAM,GAAG,IAAA,mBAAW,EAAC;QACvB,aAAa,CAAC,CAAC,CAAC,CAAC;QACjB,eAAe,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,GAAG,CAAC,EAAL,CAAK,CAAC,CAAC;IAClC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACH,SAAS;QACT;YACI,QAAQ,UAAA;YACR,YAAY,cAAA;YACZ,QAAQ,EAAE,aAAa;YACvB,MAAM,QAAA;YACN,OAAO,SAAA;YACP,WAAW,aAAA;YACX,WAAW,EAAE,UAAU;SAC1B;KACJ,CAAC;AACN,CAAC;AApDD,4BAoDC"}

package/lib/services/token.d.ts

@@ -1,4 +1,5 @@
 export interface Token {
     access_token: string;
     token_type: string;
+    refresh_token?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "aidbox-react",
-    "version": "1.6.0",
+    "version": "1.7.1",
     "scripts": {
         "build": "tsc & rollup -c",
         "prebuild": "rimraf lib/* & rimraf dist/*",

package/src/hooks/pager.ts

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import { AidboxResource, Bundle } from 'shared/src/contrib/aidbox';
 
 import { isSuccess, RemoteData } from '../libs/remoteData';
@@ -8,8 +8,12 @@ import { useService } from './service';
 
 export interface PagerManager {
     loadNext: () => void;
+    loadPrevious: () => void;
+    loadPage: (page: number) => void;
     reload: () => void;
     hasNext: boolean;
+    hasPrevious: boolean;
+    currentPage: number;
 }
 
 export function usePager<T extends AidboxResource>(
@@ -17,9 +21,8 @@ export function usePager<T extends AidboxResource>(
     resourcesOnPage: number = 15,
     searchParams: SearchParams = {}
 ): [RemoteData<Bundle<T>>, PagerManager] {
-    const [pageToLoad, setPageToLoad] = useState(1);
+    const [pageToLoad, setPageToLoad] = useState((searchParams._page as number) ?? 1);
     const [reloadsCount, setReloadsCount] = useState(0);
-
     const [resources] = useService(
         () =>
             getFHIRResources(resourceType, {
@@ -27,20 +30,42 @@ export function usePager<T extends AidboxResource>(
                 _count: resourcesOnPage,
                 _page: pageToLoad,
             }),
-        [pageToLoad, reloadsCount]
+        [pageToLoad, reloadsCount, resourcesOnPage]
+    );
+
+    const hasNext = useMemo(
+        () => (isSuccess(resources) ? Boolean(resources.data.link?.some((link) => link.relation === 'next')) : false),
+        [resources]
+    );
+
+    const hasPrevious = useMemo(
+        () =>
+            isSuccess(resources) ? Boolean(resources.data.link?.some((link) => link.relation === 'previous')) : false,
+        [resources]
     );
 
+    const loadNext = useCallback(() => setPageToLoad((currentPage) => currentPage + 1), []);
+
+    const loadPrevious = useCallback(
+        () => setPageToLoad((currentPage) => (hasPrevious ? currentPage - 1 : currentPage)),
+        [hasPrevious]
+    );
+
+    const reload = useCallback(() => {
+        setPageToLoad(1);
+        setReloadsCount((c) => c + 1);
+    }, []);
+
     return [
         resources,
         {
-            loadNext: () => setPageToLoad((currentPage) => currentPage + 1),
-            hasNext:
-                isSuccess(resources) &&
-                Boolean(resources.data.link && resources.data.link.some((link) => link.relation === 'next')),
-            reload: () => {
-                setPageToLoad(1);
-                setReloadsCount((c) => c + 1);
-            },
+            loadNext,
+            loadPrevious,
+            loadPage: setPageToLoad,
+            reload,
+            hasNext,
+            hasPrevious,
+            currentPage: pageToLoad,
         },
     ];
 }

package/src/services/token.ts

@@ -1,4 +1,5 @@
 export interface Token {
     access_token: string;
     token_type: string;
+    refresh_token?: string;
 }