@digigov/ui 2.0.0-7d9a8d86 → 2.0.0-85c27c19

package/api/APIErrors/index.js

@@ -2,7 +2,7 @@ import React from "react";
 class APIErrors extends React.Component {
   constructor() {
     super(...arguments);
-    this.state = {hasError: false, error: null};
+    this.state = { hasError: false, error: null };
   }
   static getDerivedStateFromError(error) {
     return {
@@ -13,9 +13,7 @@ class APIErrors extends React.Component {
   render() {
     if (this.state.hasError) {
       const Comp = this.props.fallback;
-      return /* @__PURE__ */ React.createElement(Comp, {
-        error: this.state.error
-      });
+      return /* @__PURE__ */ React.createElement(Comp, { error: this.state.error });
     }
     return this.props.children;
   }

package/api/APIErrors.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 export declare class APIErrors extends React.Component<{
     fallback: any;
+    children?: React.ReactNode;
 }> {
     state: {
         hasError: boolean;

package/api/APIErrors.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/APIErrors.tsx"],
-  "sourcesContent": ["import React from 'react';\nexport class APIErrors extends React.Component<{\n  fallback: any;\n}> {\n  state = { hasError: false, error: null };\n  static getDerivedStateFromError(error: Error): Record<string, any> {\n    return {\n      hasError: true,\n      error,\n    };\n  }\n\n  render(): any {\n    if (this.state.hasError) {\n      const Comp = this.props.fallback;\n      return <Comp error={this.state.error} />;\n    }\n    return this.props.children;\n  }\n}\n\nexport default APIErrors;\n\n/*\n  The type of `error` variable of the `useRequest` hook result.\n\n  We expect a request to fail for at least one reason (`error` property). In\n  case of multiple errors, developers may use `errors` property to construct\n  a more verbose error report.\n*/\nexport class APIError extends Error {\n  error: null | { data: { invalid_fields: Record<string, any>[] } } = null;\n  errors = null;\n  status = 200;\n\n  constructor(errors, status, ...args) {\n    super(...args);\n    this.name = 'APIError';\n    Error.captureStackTrace(this, APIError);\n    this.error = (errors && errors.length && errors[0]) || errors;\n    this.errors = errors;\n    this.status = status;\n  }\n}\n"],
-  "mappings": "AAAA;AACO,wBAAwB,MAAM,UAElC;AAAA,EAFI,cADP;AACO;AAGL,iBAAQ,CAAE,UAAU,OAAO,OAAO;AAAA;AAAA,SAC3B,yBAAyB,OAAmC;AACjE,WAAO;AAAA,MACL,UAAU;AAAA,MACV;AAAA;AAAA;AAAA,EAIJ,SAAc;AACZ,QAAI,KAAK,MAAM,UAAU;AACvB,YAAM,OAAO,KAAK,MAAM;AACxB,aAAO,oCAAC,MAAD;AAAA,QAAM,OAAO,KAAK,MAAM;AAAA;AAAA;AAEjC,WAAO,KAAK,MAAM;AAAA;AAAA;AAItB,IAAO,oBAAQ;AASR,uBAAuB,MAAM;AAAA,EAKlC,YAAY,QAAQ,WAAW,MAAM;AACnC,UAAM,GAAG;AALX,iBAAoE;AACpE,kBAAS;AACT,kBAAS;AAIP,SAAK,OAAO;AACZ,UAAM,kBAAkB,MAAM;AAC9B,SAAK,QAAS,UAAU,OAAO,UAAU,OAAO,MAAO;AACvD,SAAK,SAAS;AACd,SAAK,SAAS;AAAA;AAAA;",
+  "sourcesContent": ["import React from 'react';\n\nexport class APIErrors extends React.Component<{\n  fallback: any;\n  children?: React.ReactNode;\n}> {\n  state = { hasError: false, error: null };\n  static getDerivedStateFromError(error: Error): Record<string, any> {\n    return {\n      hasError: true,\n      error,\n    };\n  }\n\n  render(): any {\n    if (this.state.hasError) {\n      const Comp = this.props.fallback;\n      return <Comp error={this.state.error} />;\n    }\n    return this.props.children;\n  }\n}\n\nexport default APIErrors;\n\n/*\n  The type of `error` variable of the `useRequest` hook result.\n\n  We expect a request to fail for at least one reason (`error` property). In\n  case of multiple errors, developers may use `errors` property to construct\n  a more verbose error report.\n*/\nexport class APIError extends Error {\n  error: null | { data: { invalid_fields: Record<string, any>[] } } = null;\n  errors = null;\n  status = 200;\n\n  constructor(errors, status, ...args) {\n    super(...args);\n    this.name = 'APIError';\n    Error.captureStackTrace(this, APIError);\n    this.error = (errors && errors.length && errors[0]) || errors;\n    this.errors = errors;\n    this.status = status;\n  }\n}\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAEX,MAAM,kBAAkB,MAAM,UAGlC;AAAA,EAHI;AAAA;AAIL,iBAAQ,EAAE,UAAU,OAAO,OAAO,KAAK;AAAA;AAAA,EACvC,OAAO,yBAAyB,OAAmC;AACjE,WAAO;AAAA,MACL,UAAU;AAAA,MACV;AAAA,IACF;AAAA,EACF;AAAA,EAEA,SAAc;AACZ,QAAI,KAAK,MAAM,UAAU;AACvB,YAAM,OAAO,KAAK,MAAM;AACxB,aAAO,oCAAC,QAAK,OAAO,KAAK,MAAM,OAAO;AAAA,IACxC;AACA,WAAO,KAAK,MAAM;AAAA,EACpB;AACF;AAEA,IAAO,oBAAQ;AASR,MAAM,iBAAiB,MAAM;AAAA,EAKlC,YAAY,QAAQ,WAAW,MAAM;AACnC,UAAM,GAAG,IAAI;AALf,iBAAoE;AACpE,kBAAS;AACT,kBAAS;AAIP,SAAK,OAAO;AACZ,UAAM,kBAAkB,MAAM,QAAQ;AACtC,SAAK,QAAS,UAAU,OAAO,UAAU,OAAO,CAAC,KAAM;AACvD,SAAK,SAAS;AACd,SAAK,SAAS;AAAA,EAChB;AACF;",
   "names": []
 }

package/api/APIProvider/index.js

@@ -1,4 +1,4 @@
-import React, {createContext, useMemo} from "react";
+import React, { createContext, useContext, useMemo } from "react";
 const APIContext = createContext({
   config: {
     baseURL: ""
@@ -7,16 +7,18 @@ const APIContext = createContext({
 });
 const APIProvider = ({
   token = null,
-  config = {baseURL: ""},
+  config = { baseURL: "" },
   children
 }) => {
-  const data = useMemo(() => ({token, config}), [token, config]);
-  return /* @__PURE__ */ React.createElement(APIContext.Provider, {
-    value: data
-  }, children);
+  const data = useMemo(() => ({ token, config }), [token, config]);
+  return /* @__PURE__ */ React.createElement(APIContext.Provider, { value: data }, children);
+};
+const useAPI = () => {
+  return useContext(APIContext);
 };
 export {
   APIContext,
-  APIProvider
+  APIProvider,
+  useAPI
 };
 //# sourceMappingURL=APIProvider.js.map

package/api/APIProvider.d.ts

@@ -13,3 +13,4 @@ export interface APIProviderProps {
 }
 export declare const APIContext: React.Context<APIContextData>;
 export declare const APIProvider: React.FC<APIProviderProps>;
+export declare const useAPI: () => APIContextData;

package/api/APIProvider.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/APIProvider.tsx"],
-  "sourcesContent": ["import React, { createContext, useMemo } from 'react';\nexport interface APIConfig {\n  baseURL: string;\n}\nexport interface APIContextData {\n  config: APIConfig;\n  token: string | null | undefined;\n}\nexport interface APIProviderProps {\n  token: string | null | undefined;\n  children: React.ReactNode;\n  config: APIConfig;\n}\nexport const APIContext = createContext<APIContextData>({\n  config: {\n    baseURL: '',\n  },\n  token: null,\n});\nexport const APIProvider: React.FC<APIProviderProps> = ({\n  token = null,\n  config = { baseURL: '' },\n  children,\n}) => {\n  const data = useMemo(() => ({ token, config }), [token, config]);\n  return <APIContext.Provider value={data}>{children}</APIContext.Provider>;\n};\n"],
-  "mappings": "AAAA;AAaO,MAAM,aAAa,cAA8B;AAAA,EACtD,QAAQ;AAAA,IACN,SAAS;AAAA;AAAA,EAEX,OAAO;AAAA;AAEF,MAAM,cAA0C,CAAC;AAAA,EACtD,QAAQ;AAAA,EACR,SAAS,CAAE,SAAS;AAAA,EACpB;AAAA,MACI;AACJ,QAAM,OAAO,QAAQ,MAAO,EAAE,OAAO,UAAW,CAAC,OAAO;AACxD,SAAO,oCAAC,WAAW,UAAZ;AAAA,IAAqB,OAAO;AAAA,KAAO;AAAA;",
+  "sourcesContent": ["import React, { createContext, useContext, useMemo } from 'react';\nexport interface APIConfig {\n  baseURL: string;\n}\nexport interface APIContextData {\n  config: APIConfig;\n  token: string | null | undefined;\n}\nexport interface APIProviderProps {\n  token: string | null | undefined;\n  children: React.ReactNode;\n  config: APIConfig;\n}\nexport const APIContext = createContext<APIContextData>({\n  config: {\n    baseURL: '',\n  },\n  token: null,\n});\nexport const APIProvider: React.FC<APIProviderProps> = ({\n  token = null,\n  config = { baseURL: '' },\n  children,\n}) => {\n  const data = useMemo(() => ({ token, config }), [token, config]);\n  return <APIContext.Provider value={data}>{children}</APIContext.Provider>;\n};\n\nexport const useAPI = (): APIContextData => {\n  return useContext(APIContext);\n};\n"],
+  "mappings": "AAAA,OAAO,SAAS,eAAe,YAAY,eAAe;AAanD,MAAM,aAAa,cAA8B;AAAA,EACtD,QAAQ;AAAA,IACN,SAAS;AAAA,EACX;AAAA,EACA,OAAO;AACT,CAAC;AACM,MAAM,cAA0C,CAAC;AAAA,EACtD,QAAQ;AAAA,EACR,SAAS,EAAE,SAAS,GAAG;AAAA,EACvB;AACF,MAAM;AACJ,QAAM,OAAO,QAAQ,OAAO,EAAE,OAAO,OAAO,IAAI,CAAC,OAAO,MAAM,CAAC;AAC/D,SAAO,oCAAC,WAAW,UAAX,EAAoB,OAAO,QAAO,QAAS;AACrD;AAEO,MAAM,SAAS,MAAsB;AAC1C,SAAO,WAAW,UAAU;AAC9B;",
   "names": []
 }

package/api/fetchAPI/index.js

@@ -1,13 +1,25 @@
-import {getArgs, processResponse} from "@digigov/ui/api/utils";
-async function fetchAPI(resource, {query = {}, path = "", method = "GET", body = null}, apiConfig) {
+import {
+  getArgs,
+  processResponse
+} from "@digigov/ui/api/utils";
+async function fetchAPI(resource, { query = {}, path = "", method = "GET", body = null }, apiConfig) {
   const {
-    config: {baseURL},
+    config: { baseURL },
     token
   } = apiConfig;
-  const [url, options] = getArgs(resource, path, query, body, null, method, baseURL, token);
+  const [url, options] = getArgs(
+    resource,
+    path,
+    query,
+    body,
+    null,
+    method,
+    baseURL,
+    token
+  );
   const response = await window.fetch(url, options);
-  const {data, error, status} = await processResponse(response);
-  return {data, error, status};
+  const { data, error, status } = await processResponse(response);
+  return { data, error, status };
 }
 var fetchAPI_default = fetchAPI;
 export {

package/api/fetchAPI.d.ts

@@ -1,9 +1,5 @@
 import { APIContextData } from '@digigov/ui/api/APIProvider';
-export interface ProcessedResponse {
-    data?: any;
-    status: number;
-    error?: any;
-}
+import { ProcessedResponse } from '@digigov/ui/api/utils';
 export interface FetchAPIProps {
     resource: string;
     options?: {

package/api/fetchAPI.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/fetchAPI.ts"],
-  "sourcesContent": ["import { APIContextData } from '@digigov/ui/api/APIProvider';\nimport { getArgs, processResponse } from '@digigov/ui/api/utils';\n\nexport interface ProcessedResponse {\n  data?: any;\n  status: number;\n  error?: any;\n}\n\nexport interface FetchAPIProps {\n  resource: string;\n  options?: {\n    query?: Record<string, any>;\n    path?: string;\n    method?: string;\n    body?: any;\n  };\n  getAPI?: (...args) => APIContextData;\n}\n\nexport async function fetchAPI(\n  resource: string,\n  { query = {}, path = '', method = 'GET', body = null }: any,\n  apiConfig: any\n): Promise<ProcessedResponse> {\n  const {\n    config: { baseURL },\n    token,\n  } = apiConfig;\n  const [url, options] = getArgs(\n    resource,\n    path,\n    query,\n    body,\n    null,\n    method,\n    baseURL,\n    token\n  );\n  const response = await window.fetch(url, options);\n  const { data, error, status } = await processResponse(response);\n  return { data, error, status };\n}\n\nexport default fetchAPI;\n"],
-  "mappings": "AACA;AAmBA,wBACE,UACA,CAAE,QAAQ,IAAI,OAAO,IAAI,SAAS,OAAO,OAAO,OAChD,WAC4B;AAC5B,QAAM;AAAA,IACJ,QAAQ,CAAE;AAAA,IACV;AAAA,MACE;AACJ,QAAM,CAAC,KAAK,WAAW,QACrB,UACA,MACA,OACA,MACA,MACA,QACA,SACA;AAEF,QAAM,WAAW,MAAM,OAAO,MAAM,KAAK;AACzC,QAAM,CAAE,MAAM,OAAO,UAAW,MAAM,gBAAgB;AACtD,SAAO,CAAE,MAAM,OAAO;AAAA;AAGxB,IAAO,mBAAQ;",
+  "sourcesContent": ["import { APIContextData } from '@digigov/ui/api/APIProvider';\nimport {\n  ProcessedResponse,\n  getArgs,\n  processResponse,\n} from '@digigov/ui/api/utils';\n\nexport interface FetchAPIProps {\n  resource: string;\n  options?: {\n    query?: Record<string, any>;\n    path?: string;\n    method?: string;\n    body?: any;\n  };\n  getAPI?: (...args) => APIContextData;\n}\n\nexport async function fetchAPI(\n  resource: string,\n  { query = {}, path = '', method = 'GET', body = null }: any,\n  apiConfig: any\n): Promise<ProcessedResponse> {\n  const {\n    config: { baseURL },\n    token,\n  } = apiConfig;\n  const [url, options] = getArgs(\n    resource,\n    path,\n    query,\n    body,\n    null,\n    method,\n    baseURL,\n    token\n  );\n  const response = await window.fetch(url, options);\n  const { data, error, status } = await processResponse(response);\n  return { data, error, status };\n}\n\nexport default fetchAPI;\n"],
+  "mappings": "AACA;AAAA,EAEE;AAAA,EACA;AAAA,OACK;AAaP,eAAsB,SACpB,UACA,EAAE,QAAQ,CAAC,GAAG,OAAO,IAAI,SAAS,OAAO,OAAO,KAAK,GACrD,WAC4B;AAC5B,QAAM;AAAA,IACJ,QAAQ,EAAE,QAAQ;AAAA,IAClB;AAAA,EACF,IAAI;AACJ,QAAM,CAAC,KAAK,OAAO,IAAI;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,QAAM,WAAW,MAAM,OAAO,MAAM,KAAK,OAAO;AAChD,QAAM,EAAE,MAAM,OAAO,OAAO,IAAI,MAAM,gBAAgB,QAAQ;AAC9D,SAAO,EAAE,MAAM,OAAO,OAAO;AAC/B;AAEA,IAAO,mBAAQ;",
   "names": []
 }

package/api/index.d.ts

@@ -1,9 +1,8 @@
-import { APIContextData } from '@digigov/ui/api/APIProvider';
 export * from '@digigov/ui/api/APIErrors';
 export * from '@digigov/ui/api/APIProvider';
 export * from '@digigov/ui/api/useResource';
 export * from '@digigov/ui/api/useResourceAction';
 export * from '@digigov/ui/api/useResourceQuery';
 export * from '@digigov/ui/api/fetchAPI';
-export declare const useAPI: () => APIContextData;
+import { useAPI } from '@digigov/ui/api/APIProvider';
 export default useAPI;

package/api/index.js

@@ -1,17 +1,12 @@
-import {useContext} from "react";
-import {APIContext} from "@digigov/ui/api/APIProvider";
 export * from "@digigov/ui/api/APIErrors";
 export * from "@digigov/ui/api/APIProvider";
 export * from "@digigov/ui/api/useResource";
 export * from "@digigov/ui/api/useResourceAction";
 export * from "@digigov/ui/api/useResourceQuery";
 export * from "@digigov/ui/api/fetchAPI";
-const useAPI = () => {
-  return useContext(APIContext);
-};
+import { useAPI } from "@digigov/ui/api/APIProvider";
 var api_default = useAPI;
 export {
-  api_default as default,
-  useAPI
+  api_default as default
 };
 //# sourceMappingURL=index.js.map

package/api/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/index.tsx"],
-  "sourcesContent": ["/* eslint-disable @typescript-eslint/no-unused-vars */\nimport { useContext } from 'react';\nimport { APIContextData, APIContext } from '@digigov/ui/api/APIProvider';\n\nexport * from '@digigov/ui/api/APIErrors';\nexport * from '@digigov/ui/api/APIProvider';\nexport * from '@digigov/ui/api/useResource';\nexport * from '@digigov/ui/api/useResourceAction';\nexport * from '@digigov/ui/api/useResourceQuery';\nexport * from '@digigov/ui/api/fetchAPI';\n\nexport const useAPI = (): APIContextData => {\n  return useContext(APIContext);\n};\n\nexport default useAPI;\n"],
-  "mappings": "AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AAEO,MAAM,SAAS,MAAsB;AAC1C,SAAO,WAAW;AAAA;AAGpB,IAAO,cAAQ;",
+  "sourcesContent": ["export * from '@digigov/ui/api/APIErrors';\nexport * from '@digigov/ui/api/APIProvider';\nexport * from '@digigov/ui/api/useResource';\nexport * from '@digigov/ui/api/useResourceAction';\nexport * from '@digigov/ui/api/useResourceQuery';\nexport * from '@digigov/ui/api/fetchAPI';\n\nimport { useAPI } from '@digigov/ui/api/APIProvider';\nexport default useAPI;\n"],
+  "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AAEd,SAAS,cAAc;AACvB,IAAO,cAAQ;",
   "names": []
 }

package/api/useResource/index.js

@@ -1,21 +1,21 @@
-import {useState} from "react";
-import {useQuery, queryCache} from "react-query";
-import {useAPI} from "@digigov/ui/api";
-import {getQueryKey, processResponse} from "@digigov/ui/api/utils";
+import { useState } from "react";
+import { useQuery, queryCache } from "react-query";
+import { useAPI } from "@digigov/ui/api/APIProvider";
+import { getQueryKey, processResponse } from "@digigov/ui/api/utils";
 function useResource(resource, id, query, options, suspense) {
   const {
-    config: {baseURL},
+    config: { baseURL },
     token
   } = useAPI();
-  const [{url, dataSet}, setFetchOpts] = useState({
+  const [{ url, dataSet }, setFetchOpts] = useState({
     url: "",
     dataSet: false
   });
   async function customFetcher(fetchUrl, options2) {
-    setFetchOpts({url: fetchUrl, dataSet: false});
+    setFetchOpts({ url: fetchUrl, dataSet: false });
     const response = await fetch(fetchUrl, options2);
     try {
-      const {data: data2, error: error2} = await processResponse(response);
+      const { data: data2, error: error2 } = await processResponse(response);
       if (error2) {
         return Promise.reject(error2);
       }
@@ -26,7 +26,16 @@ function useResource(resource, id, query, options, suspense) {
       return Promise.reject(error2.error);
     }
   }
-  const queryKey = getQueryKey(resource, id, query, null, options, "GET", baseURL, token);
+  const queryKey = getQueryKey(
+    resource,
+    id,
+    query,
+    null,
+    options,
+    "GET",
+    baseURL,
+    token
+  );
   let enabled = true;
   let resolvedQueryKey;
   if (typeof queryKey === "function") {
@@ -36,16 +45,21 @@ function useResource(resource, id, query, options, suspense) {
       enabled = false;
     }
   }
-  const {status, data, error, isFetching, refetch} = useQuery(resolvedQueryKey || queryKey, customFetcher, {
-    enabled,
-    refetchOnWindowFocus: false,
-    refetchOnMount: false,
-    suspense: suspense || false,
-    cacheTime: 3e5,
-    staleTime: 2e4,
-    retry: false,
-    useErrorBoundary: false
-  });
+  const { status, data, error, isFetching, refetch } = useQuery(
+    resolvedQueryKey || queryKey,
+    customFetcher,
+    {
+      enabled,
+      refetchOnWindowFocus: false,
+      refetchOnMount: false,
+      suspense: suspense || false,
+      cacheTime: 3e5,
+      staleTime: 2e4,
+      retry: false,
+      useErrorBoundary: false
+      // falls back to suspense
+    }
+  );
   return {
     data,
     loading: isFetching,

package/api/useResource.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/useResource.tsx"],
-  "sourcesContent": ["import { useState } from 'react';\nimport { useQuery, queryCache } from 'react-query';\nimport { useAPI } from '@digigov/ui/api';\nimport { getQueryKey, processResponse } from '@digigov/ui/api/utils';\n\nexport type RequestResponse = {\n  data?: Record<string, any>;\n  loading?: boolean;\n  loaded?: boolean;\n  error?: Error | string | null | unknown;\n  invalidate: () => void;\n  fetch: () => void;\n  dataSet?: boolean | null;\n  url: string;\n};\n\nexport function useResource(\n  resource: string,\n  id?: string | number | ((...args) => void),\n  query?: Record<string, any> | null | ((...args) => void),\n  options?: RequestInit | null,\n  suspense?: boolean\n): RequestResponse {\n  const {\n    config: { baseURL },\n    token,\n  } = useAPI();\n  const [{ url, dataSet }, setFetchOpts] = useState({\n    url: '',\n    dataSet: false,\n  });\n\n  async function customFetcher(fetchUrl, options) {\n    setFetchOpts({ url: fetchUrl, dataSet: false });\n    const response = await fetch(fetchUrl, options);\n    try {\n      const { data, error } = await processResponse(response);\n      if (error) {\n        return Promise.reject(error);\n      }\n      if (data) {\n        return Promise.resolve(data);\n      }\n    } catch (error) {\n      return Promise.reject(error.error);\n    }\n  }\n\n  const queryKey = getQueryKey(\n    resource,\n    id,\n    query,\n    null,\n    options,\n    'GET',\n    baseURL,\n    token\n  );\n  let enabled = true;\n  let resolvedQueryKey;\n  if (typeof queryKey === 'function') {\n    try {\n      resolvedQueryKey = queryKey();\n    } catch (err) {\n      enabled = false;\n    }\n  }\n\n  const { status, data, error, isFetching, refetch } = useQuery(\n    resolvedQueryKey || queryKey,\n    customFetcher,\n    {\n      enabled,\n      refetchOnWindowFocus: false,\n      refetchOnMount: false,\n      suspense: suspense || false,\n      cacheTime: 300000,\n      staleTime: 20000,\n      retry: false,\n      useErrorBoundary: false, // falls back to suspense\n    }\n  );\n\n  return {\n    data,\n    loading: isFetching,\n    loaded: ['error', 'success'].includes(status),\n    error,\n    invalidate: (): void => {\n      queryCache.invalidateQueries(resolvedQueryKey || queryKey);\n    },\n    fetch: refetch,\n    dataSet,\n    url,\n  };\n}\n"],
-  "mappings": "AAAA;AACA;AACA;AACA;AAaO,qBACL,UACA,IACA,OACA,SACA,UACiB;AACjB,QAAM;AAAA,IACJ,QAAQ,CAAE;AAAA,IACV;AAAA,MACE;AACJ,QAAM,CAAC,CAAE,KAAK,UAAW,gBAAgB,SAAS;AAAA,IAChD,KAAK;AAAA,IACL,SAAS;AAAA;AAGX,+BAA6B,UAAU,UAAS;AAC9C,iBAAa,CAAE,KAAK,UAAU,SAAS;AACvC,UAAM,WAAW,MAAM,MAAM,UAAU;AACvC,QAAI;AACF,YAAM,CAAE,aAAM,iBAAU,MAAM,gBAAgB;AAC9C,UAAI,QAAO;AACT,eAAO,QAAQ,OAAO;AAAA;AAExB,UAAI,OAAM;AACR,eAAO,QAAQ,QAAQ;AAAA;AAAA,aAElB,QAAP;AACA,aAAO,QAAQ,OAAO,OAAM;AAAA;AAAA;AAIhC,QAAM,WAAW,YACf,UACA,IACA,OACA,MACA,SACA,OACA,SACA;AAEF,MAAI,UAAU;AACd,MAAI;AACJ,MAAI,OAAO,aAAa,YAAY;AAClC,QAAI;AACF,yBAAmB;AAAA,aACZ,KAAP;AACA,gBAAU;AAAA;AAAA;AAId,QAAM,CAAE,QAAQ,MAAM,OAAO,YAAY,WAAY,SACnD,oBAAoB,UACpB,eACA;AAAA,IACE;AAAA,IACA,sBAAsB;AAAA,IACtB,gBAAgB;AAAA,IAChB,UAAU,YAAY;AAAA,IACtB,WAAW;AAAA,IACX,WAAW;AAAA,IACX,OAAO;AAAA,IACP,kBAAkB;AAAA;AAItB,SAAO;AAAA,IACL;AAAA,IACA,SAAS;AAAA,IACT,QAAQ,CAAC,SAAS,WAAW,SAAS;AAAA,IACtC;AAAA,IACA,YAAY,MAAY;AACtB,iBAAW,kBAAkB,oBAAoB;AAAA;AAAA,IAEnD,OAAO;AAAA,IACP;AAAA,IACA;AAAA;AAAA;",
-  "names": []
+  "sourcesContent": ["import { useState } from 'react';\nimport { useQuery, queryCache } from 'react-query';\nimport { useAPI } from '@digigov/ui/api/APIProvider';\nimport { getQueryKey, processResponse } from '@digigov/ui/api/utils';\n\nexport type RequestResponse = {\n  data?: Record<string, any>;\n  loading?: boolean;\n  loaded?: boolean;\n  error?: Error | string | null | unknown;\n  invalidate: () => void;\n  fetch: () => void;\n  dataSet?: boolean | null;\n  url: string;\n};\n\nexport function useResource(\n  resource: string,\n  id?: string | number | ((...args) => void),\n  query?: Record<string, any> | null | ((...args) => void),\n  options?: RequestInit | null,\n  suspense?: boolean\n): RequestResponse {\n  const {\n    config: { baseURL },\n    token,\n  } = useAPI();\n  const [{ url, dataSet }, setFetchOpts] = useState({\n    url: '',\n    dataSet: false,\n  });\n\n  async function customFetcher(fetchUrl, options) {\n    setFetchOpts({ url: fetchUrl, dataSet: false });\n    const response = await fetch(fetchUrl, options);\n    try {\n      const { data, error } = await processResponse(response);\n      if (error) {\n        return Promise.reject(error);\n      }\n      if (data) {\n        return Promise.resolve(data);\n      }\n    } catch (error) {\n      return Promise.reject(error.error);\n    }\n  }\n\n  const queryKey = getQueryKey(\n    resource,\n    id,\n    query,\n    null,\n    options,\n    'GET',\n    baseURL,\n    token\n  );\n  let enabled = true;\n  let resolvedQueryKey;\n  if (typeof queryKey === 'function') {\n    try {\n      resolvedQueryKey = queryKey();\n    } catch (err) {\n      enabled = false;\n    }\n  }\n\n  const { status, data, error, isFetching, refetch } = useQuery(\n    resolvedQueryKey || queryKey,\n    customFetcher,\n    {\n      enabled,\n      refetchOnWindowFocus: false,\n      refetchOnMount: false,\n      suspense: suspense || false,\n      cacheTime: 300000,\n      staleTime: 20000,\n      retry: false,\n      useErrorBoundary: false, // falls back to suspense\n    }\n  );\n\n  return {\n    data,\n    loading: isFetching,\n    loaded: ['error', 'success'].includes(status),\n    error,\n    invalidate: (): void => {\n      queryCache.invalidateQueries(resolvedQueryKey || queryKey);\n    },\n    fetch: refetch,\n    dataSet,\n    url,\n  };\n}\n"],
+  "mappings": "AAAA,SAAS,gBAAgB;AACzB,SAAS,UAAU,kBAAkB;AACrC,SAAS,cAAc;AACvB,SAAS,aAAa,uBAAuB;AAatC,SAAS,YACd,UACA,IACA,OACA,SACA,UACiB;AACjB,QAAM;AAAA,IACJ,QAAQ,EAAE,QAAQ;AAAA,IAClB;AAAA,EACF,IAAI,OAAO;AACX,QAAM,CAAC,EAAE,KAAK,QAAQ,GAAG,YAAY,IAAI,SAAS;AAAA,IAChD,KAAK;AAAA,IACL,SAAS;AAAA,EACX,CAAC;AAED,iBAAe,cAAc,UAAUA,UAAS;AAC9C,iBAAa,EAAE,KAAK,UAAU,SAAS,MAAM,CAAC;AAC9C,UAAM,WAAW,MAAM,MAAM,UAAUA,QAAO;AAC9C,QAAI;AACF,YAAM,EAAE,MAAAC,OAAM,OAAAC,OAAM,IAAI,MAAM,gBAAgB,QAAQ;AACtD,UAAIA,QAAO;AACT,eAAO,QAAQ,OAAOA,MAAK;AAAA,MAC7B;AACA,UAAID,OAAM;AACR,eAAO,QAAQ,QAAQA,KAAI;AAAA,MAC7B;AAAA,IACF,SAASC,QAAO;AACd,aAAO,QAAQ,OAAOA,OAAM,KAAK;AAAA,IACnC;AAAA,EACF;AAEA,QAAM,WAAW;AAAA,IACf;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACA,MAAI,UAAU;AACd,MAAI;AACJ,MAAI,OAAO,aAAa,YAAY;AAClC,QAAI;AACF,yBAAmB,SAAS;AAAA,IAC9B,SAAS,KAAK;AACZ,gBAAU;AAAA,IACZ;AAAA,EACF;AAEA,QAAM,EAAE,QAAQ,MAAM,OAAO,YAAY,QAAQ,IAAI;AAAA,IACnD,oBAAoB;AAAA,IACpB;AAAA,IACA;AAAA,MACE;AAAA,MACA,sBAAsB;AAAA,MACtB,gBAAgB;AAAA,MAChB,UAAU,YAAY;AAAA,MACtB,WAAW;AAAA,MACX,WAAW;AAAA,MACX,OAAO;AAAA,MACP,kBAAkB;AAAA;AAAA,IACpB;AAAA,EACF;AAEA,SAAO;AAAA,IACL;AAAA,IACA,SAAS;AAAA,IACT,QAAQ,CAAC,SAAS,SAAS,EAAE,SAAS,MAAM;AAAA,IAC5C;AAAA,IACA,YAAY,MAAY;AACtB,iBAAW,kBAAkB,oBAAoB,QAAQ;AAAA,IAC3D;AAAA,IACA,OAAO;AAAA,IACP;AAAA,IACA;AAAA,EACF;AACF;",
+  "names": ["options", "data", "error"]
 }

package/api/useResourceAction/index.js

@@ -1,13 +1,13 @@
-import {useState, useEffect} from "react";
-import {useMutation} from "react-query";
-import {useAPI} from "@digigov/ui/api";
-import {getQueryKey, processResponse} from "@digigov/ui/api/utils";
+import { useState, useEffect } from "react";
+import { useMutation } from "react-query";
+import { useAPI } from "@digigov/ui/api/APIProvider";
+import { getQueryKey, processResponse } from "@digigov/ui/api/utils";
 function useResourceAction(resource, id, method = "POST", data, query, options) {
   const {
-    config: {baseURL},
+    config: { baseURL },
     token
   } = useAPI();
-  const [{url, dataSet}, setFetchOpts] = useState({
+  const [{ url, dataSet }, setFetchOpts] = useState({
     url: "",
     dataSet: false
   });
@@ -15,13 +15,13 @@ function useResourceAction(resource, id, method = "POST", data, query, options)
   async function customFetcher(...args) {
     const [fetchUrl, options2] = args[0];
     if (options2.body) {
-      setFetchOpts({url: fetchUrl, dataSet: true});
+      setFetchOpts({ url: fetchUrl, dataSet: true });
     } else {
-      setFetchOpts({url: fetchUrl, dataSet: false});
+      setFetchOpts({ url: fetchUrl, dataSet: false });
     }
     const response = await fetch(fetchUrl, options2);
     try {
-      const {data: data2} = await processResponse(response, true);
+      const { data: data2 } = await processResponse(response, true);
       if (data2) {
         return Promise.resolve(data2);
       }
@@ -29,10 +29,22 @@ function useResourceAction(resource, id, method = "POST", data, query, options)
       return Promise.reject(error2.error);
     }
   }
-  const [mutate, {status, data: _data, error, reset}] = useMutation(customFetcher, {});
+  const [mutate, { status, data: _data, error, reset }] = useMutation(
+    customFetcher,
+    {}
+  );
   useEffect(() => {
     if (consume) {
-      const queryKey = getQueryKey(resource, id, query, data, options, method, baseURL, token);
+      const queryKey = getQueryKey(
+        resource,
+        id,
+        query,
+        data,
+        options,
+        method,
+        baseURL,
+        token
+      );
       if (typeof queryKey === "function") {
         mutate(queryKey());
       } else {

package/api/useResourceAction.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/useResourceAction.tsx"],
-  "sourcesContent": ["import { useState, useEffect } from 'react';\nimport { useMutation } from 'react-query';\nimport { useAPI } from '@digigov/ui/api';\nimport { RequestResponse } from '@digigov/ui/api/useResource';\nimport { getQueryKey, processResponse } from '@digigov/ui/api/utils';\n\nexport function useResourceAction(\n  resource: string,\n  id?: (string | null | undefined) | number | ((...args: any) => void),\n  method = 'POST',\n  data?: Record<string, any> | null | ((...args: any) => void),\n  query?: Record<string, any> | null | ((...args: any) => void),\n  options?: RequestInit | null\n): RequestResponse {\n  const {\n    config: { baseURL },\n    token,\n  } = useAPI();\n  const [{ url, dataSet }, setFetchOpts] = useState({\n    url: '',\n    dataSet: false,\n  });\n  const [consume, setConsume] = useState(false);\n  async function customFetcher(...args) {\n    const [fetchUrl, options] = args[0];\n    if (options.body) {\n      setFetchOpts({ url: fetchUrl, dataSet: true });\n    } else {\n      setFetchOpts({ url: fetchUrl, dataSet: false });\n    }\n    const response = await fetch(fetchUrl, options);\n    try {\n      const { data } = await processResponse(response, true);\n      if (data) {\n        return Promise.resolve(data);\n      }\n    } catch (error) {\n      return Promise.reject(error.error);\n    }\n  }\n\n  const [mutate, { status, data: _data, error, reset }] = useMutation(\n    customFetcher,\n    {}\n  );\n  useEffect(() => {\n    if (consume) {\n      const queryKey = getQueryKey(\n        resource,\n        id,\n        query,\n        data,\n        options,\n        method,\n        baseURL,\n        token\n      );\n      if (typeof queryKey === 'function') {\n        mutate(queryKey());\n      } else {\n        mutate(queryKey);\n      }\n      setConsume(false);\n    }\n  }, [consume]);\n  return {\n    data: _data,\n    loading: status === 'loading',\n    loaded: ['success', 'error'].includes(status),\n    error,\n    invalidate: (): void => {\n      reset();\n    },\n    fetch() {\n      setConsume(true);\n    },\n    dataSet,\n    url,\n  };\n}\n"],
-  "mappings": "AAAA;AACA;AACA;AAEA;AAEO,2BACL,UACA,IACA,SAAS,QACT,MACA,OACA,SACiB;AACjB,QAAM;AAAA,IACJ,QAAQ,CAAE;AAAA,IACV;AAAA,MACE;AACJ,QAAM,CAAC,CAAE,KAAK,UAAW,gBAAgB,SAAS;AAAA,IAChD,KAAK;AAAA,IACL,SAAS;AAAA;AAEX,QAAM,CAAC,SAAS,cAAc,SAAS;AACvC,kCAAgC,MAAM;AACpC,UAAM,CAAC,UAAU,YAAW,KAAK;AACjC,QAAI,SAAQ,MAAM;AAChB,mBAAa,CAAE,KAAK,UAAU,SAAS;AAAA,WAClC;AACL,mBAAa,CAAE,KAAK,UAAU,SAAS;AAAA;AAEzC,UAAM,WAAW,MAAM,MAAM,UAAU;AACvC,QAAI;AACF,YAAM,CAAE,eAAS,MAAM,gBAAgB,UAAU;AACjD,UAAI,OAAM;AACR,eAAO,QAAQ,QAAQ;AAAA;AAAA,aAElB,QAAP;AACA,aAAO,QAAQ,OAAO,OAAM;AAAA;AAAA;AAIhC,QAAM,CAAC,QAAQ,CAAE,QAAQ,MAAM,OAAO,OAAO,UAAW,YACtD,eACA;AAEF,YAAU,MAAM;AACd,QAAI,SAAS;AACX,YAAM,WAAW,YACf,UACA,IACA,OACA,MACA,SACA,QACA,SACA;AAEF,UAAI,OAAO,aAAa,YAAY;AAClC,eAAO;AAAA,aACF;AACL,eAAO;AAAA;AAET,iBAAW;AAAA;AAAA,KAEZ,CAAC;AACJ,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS,WAAW;AAAA,IACpB,QAAQ,CAAC,WAAW,SAAS,SAAS;AAAA,IACtC;AAAA,IACA,YAAY,MAAY;AACtB;AAAA;AAAA,IAEF,QAAQ;AACN,iBAAW;AAAA;AAAA,IAEb;AAAA,IACA;AAAA;AAAA;",
-  "names": []
+  "sourcesContent": ["import { useState, useEffect } from 'react';\nimport { useMutation } from 'react-query';\nimport { useAPI } from '@digigov/ui/api/APIProvider';\nimport { RequestResponse } from '@digigov/ui/api/useResource';\nimport { getQueryKey, processResponse } from '@digigov/ui/api/utils';\n\nexport function useResourceAction(\n  resource: string,\n  id?: (string | null | undefined) | number | ((...args: any) => void),\n  method = 'POST',\n  data?: Record<string, any> | null | ((...args: any) => void),\n  query?: Record<string, any> | null | ((...args: any) => void),\n  options?: RequestInit | null\n): RequestResponse {\n  const {\n    config: { baseURL },\n    token,\n  } = useAPI();\n  const [{ url, dataSet }, setFetchOpts] = useState({\n    url: '',\n    dataSet: false,\n  });\n  const [consume, setConsume] = useState(false);\n  async function customFetcher(...args) {\n    const [fetchUrl, options] = args[0];\n    if (options.body) {\n      setFetchOpts({ url: fetchUrl, dataSet: true });\n    } else {\n      setFetchOpts({ url: fetchUrl, dataSet: false });\n    }\n    const response = await fetch(fetchUrl, options);\n    try {\n      const { data } = await processResponse(response, true);\n      if (data) {\n        return Promise.resolve(data);\n      }\n    } catch (error) {\n      return Promise.reject(error.error);\n    }\n  }\n\n  const [mutate, { status, data: _data, error, reset }] = useMutation(\n    customFetcher,\n    {}\n  );\n  useEffect(() => {\n    if (consume) {\n      const queryKey = getQueryKey(\n        resource,\n        id,\n        query,\n        data,\n        options,\n        method,\n        baseURL,\n        token\n      );\n      if (typeof queryKey === 'function') {\n        mutate(queryKey());\n      } else {\n        mutate(queryKey);\n      }\n      setConsume(false);\n    }\n  }, [consume]);\n  return {\n    data: _data,\n    loading: status === 'loading',\n    loaded: ['success', 'error'].includes(status),\n    error,\n    invalidate: (): void => {\n      reset();\n    },\n    fetch() {\n      setConsume(true);\n    },\n    dataSet,\n    url,\n  };\n}\n"],
+  "mappings": "AAAA,SAAS,UAAU,iBAAiB;AACpC,SAAS,mBAAmB;AAC5B,SAAS,cAAc;AAEvB,SAAS,aAAa,uBAAuB;AAEtC,SAAS,kBACd,UACA,IACA,SAAS,QACT,MACA,OACA,SACiB;AACjB,QAAM;AAAA,IACJ,QAAQ,EAAE,QAAQ;AAAA,IAClB;AAAA,EACF,IAAI,OAAO;AACX,QAAM,CAAC,EAAE,KAAK,QAAQ,GAAG,YAAY,IAAI,SAAS;AAAA,IAChD,KAAK;AAAA,IACL,SAAS;AAAA,EACX,CAAC;AACD,QAAM,CAAC,SAAS,UAAU,IAAI,SAAS,KAAK;AAC5C,iBAAe,iBAAiB,MAAM;AACpC,UAAM,CAAC,UAAUA,QAAO,IAAI,KAAK,CAAC;AAClC,QAAIA,SAAQ,MAAM;AAChB,mBAAa,EAAE,KAAK,UAAU,SAAS,KAAK,CAAC;AAAA,IAC/C,OAAO;AACL,mBAAa,EAAE,KAAK,UAAU,SAAS,MAAM,CAAC;AAAA,IAChD;AACA,UAAM,WAAW,MAAM,MAAM,UAAUA,QAAO;AAC9C,QAAI;AACF,YAAM,EAAE,MAAAC,MAAK,IAAI,MAAM,gBAAgB,UAAU,IAAI;AACrD,UAAIA,OAAM;AACR,eAAO,QAAQ,QAAQA,KAAI;AAAA,MAC7B;AAAA,IACF,SAASC,QAAO;AACd,aAAO,QAAQ,OAAOA,OAAM,KAAK;AAAA,IACnC;AAAA,EACF;AAEA,QAAM,CAAC,QAAQ,EAAE,QAAQ,MAAM,OAAO,OAAO,MAAM,CAAC,IAAI;AAAA,IACtD;AAAA,IACA,CAAC;AAAA,EACH;AACA,YAAU,MAAM;AACd,QAAI,SAAS;AACX,YAAM,WAAW;AAAA,QACf;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AACA,UAAI,OAAO,aAAa,YAAY;AAClC,eAAO,SAAS,CAAC;AAAA,MACnB,OAAO;AACL,eAAO,QAAQ;AAAA,MACjB;AACA,iBAAW,KAAK;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,OAAO,CAAC;AACZ,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS,WAAW;AAAA,IACpB,QAAQ,CAAC,WAAW,OAAO,EAAE,SAAS,MAAM;AAAA,IAC5C;AAAA,IACA,YAAY,MAAY;AACtB,YAAM;AAAA,IACR;AAAA,IACA,QAAQ;AACN,iBAAW,IAAI;AAAA,IACjB;AAAA,IACA;AAAA,IACA;AAAA,EACF;AACF;",
+  "names": ["options", "data", "error"]
 }

package/api/useResourceQuery/index.js

@@ -1,31 +1,43 @@
-import {useEffect, useMemo, useState, useCallback} from "react";
-import {usePaginatedQuery, queryCache} from "react-query";
-import {useAPI} from "@digigov/ui/api";
-import {getQueryKey, processResponse} from "@digigov/ui/api/utils";
+import { useEffect, useMemo, useState, useCallback } from "react";
+import { usePaginatedQuery, queryCache } from "react-query";
+import { useAPI } from "@digigov/ui/api/APIProvider";
+import { getQueryKey, processResponse } from "@digigov/ui/api/utils";
 const DEFAULT_PAGINATION_LIMIT = 30;
 const DEFAULT_LIMIT_OPTIONS = [10, 30, 60, 100];
 function useResourceManyBase(resource, query, options) {
   const {
-    config: {baseURL},
+    config: { baseURL },
     token
   } = useAPI();
-  const [{url, dataSet}, setFetchOpts] = useState({
+  const [{ url, dataSet }, setFetchOpts] = useState({
     url: "",
     dataSet: false
   });
-  const customFetcher = useCallback(async (fetchUrl, options2) => {
-    setFetchOpts({url: fetchUrl, dataSet: false});
-    const response = await fetch(fetchUrl, options2);
-    try {
-      const {data: data2} = await processResponse(response, true);
-      if (data2) {
-        return Promise.resolve(data2);
+  const customFetcher = useCallback(
+    async (fetchUrl, options2) => {
+      setFetchOpts({ url: fetchUrl, dataSet: false });
+      const response = await fetch(fetchUrl, options2);
+      try {
+        const { data: data2 } = await processResponse(response, true);
+        if (data2) {
+          return Promise.resolve(data2);
+        }
+      } catch (error2) {
+        return Promise.reject(error2.error);
       }
-    } catch (error2) {
-      return Promise.reject(error2.error);
-    }
-  }, []);
-  const queryKey = getQueryKey(resource, null, query, null, options, "GET", baseURL, token);
+    },
+    []
+  );
+  const queryKey = getQueryKey(
+    resource,
+    null,
+    query,
+    null,
+    options,
+    "GET",
+    baseURL,
+    token
+  );
   let enabled = true;
   let resolvedQueryKey;
   if (typeof queryKey === "function") {
@@ -65,45 +77,54 @@ function useResourceManyBase(resource, query, options) {
   };
 }
 function useResourceMany(resource, query, options) {
-  const [limit, setLimit] = useState(query && query.limit || DEFAULT_PAGINATION_LIMIT);
+  const [limit, setLimit] = useState(
+    query && query.limit || DEFAULT_PAGINATION_LIMIT
+  );
   const [pageParams, setPageParams] = useState({
     offset: query && query.offset || 0,
     limit
   });
   useEffect(() => {
     if (pageParams.limit !== limit) {
-      setPageParams({...pageParams, limit});
+      setPageParams({ ...pageParams, limit });
     }
   }, [limit]);
   const queryKey = JSON.stringify(query);
   const pageParamsKey = JSON.stringify(pageParams);
   const q = useMemo(() => {
-    return {...pageParams, ...query};
+    return { ...pageParams, ...query };
   }, [queryKey, pageParamsKey]);
-  const {data, ...rest} = useResourceManyBase(resource, q, options);
+  const { data, ...rest } = useResourceManyBase(resource, q, options);
   const resp = data ? data.data : data;
   const meta = data ? data.meta : data;
-  const totalPages = useMemo(() => data && data.meta && data.meta.total || 1, [data]);
-  const total = useMemo(() => data && data.meta && data.meta.count || 0, [
-    data
-  ]);
+  const totalPages = useMemo(
+    () => data && data.meta && data.meta.total || 1,
+    [data]
+  );
+  const total = useMemo(
+    () => data && data.meta && data.meta.count || 0,
+    [data]
+  );
   const limitOptions = useMemo(() => DEFAULT_LIMIT_OPTIONS, []);
   const page = useMemo(() => {
     const offset = parseInt(pageParams.offset) || 0;
     const _limit = parseInt(`${pageParams.limit}`) || parseInt(`${limit}`);
     return offset / _limit;
   }, [pageParams]);
-  const setPage = useCallback((page2) => {
-    if (page2 > totalPages) {
-      page2 = totalPages;
-    }
-    if (page2 <= 0) {
-      page2 = 0;
-    }
-    const _limit = limit || DEFAULT_PAGINATION_LIMIT;
-    const offset = _limit * page2;
-    setPageParams({offset, limit});
-  }, [setPageParams]);
+  const setPage = useCallback(
+    (page2) => {
+      if (page2 > totalPages) {
+        page2 = totalPages;
+      }
+      if (page2 <= 0) {
+        page2 = 0;
+      }
+      const _limit = limit || DEFAULT_PAGINATION_LIMIT;
+      const offset = _limit * page2;
+      setPageParams({ offset, limit });
+    },
+    [setPageParams]
+  );
   const hasNext = page < totalPages - 1;
   const hasPrevious = page > 0;
   return {

package/api/useResourceQuery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/api/useResourceQuery.tsx"],
-  "sourcesContent": ["import { useEffect, useMemo, useState, useCallback } from 'react';\nimport { usePaginatedQuery, QueryFunction, queryCache } from 'react-query';\nimport { useAPI } from '@digigov/ui/api';\nimport { getQueryKey, processResponse } from '@digigov/ui/api/utils';\n\nconst DEFAULT_PAGINATION_LIMIT = 30;\nconst DEFAULT_LIMIT_OPTIONS = [10, 30, 60, 100];\n\nexport function useResourceManyBase(\n  resource: string,\n  query?: Record<string, any> | null | ((...args: any) => any),\n  options?: RequestInit | null\n): any {\n  const {\n    config: { baseURL },\n    token,\n  } = useAPI();\n  const [{ url, dataSet }, setFetchOpts] = useState({\n    url: '',\n    dataSet: false,\n  });\n  const customFetcher: QueryFunction<any> = useCallback(\n    async (fetchUrl, options) => {\n      setFetchOpts({ url: fetchUrl, dataSet: false });\n      const response = await fetch(fetchUrl, options);\n      try {\n        const { data } = await processResponse(response, true);\n        if (data) {\n          return Promise.resolve(data);\n        }\n      } catch (error) {\n        return Promise.reject(error.error);\n      }\n    },\n    []\n  );\n  const queryKey = getQueryKey(\n    resource,\n    null,\n    query,\n    null,\n    options,\n    'GET',\n    baseURL,\n    token\n  );\n  let enabled = true;\n  let resolvedQueryKey;\n  if (typeof queryKey === 'function') {\n    try {\n      resolvedQueryKey = queryKey();\n    } catch (err) {\n      enabled = false;\n    }\n  }\n\n  const {\n    resolvedData,\n    latestData: data,\n    error,\n    isFetching,\n    refetch,\n  } = usePaginatedQuery({\n    queryKey: resolvedQueryKey || queryKey,\n    queryFn: customFetcher,\n    config: {\n      enabled,\n      suspense: true,\n      cacheTime: 30000,\n      refetchOnMount: false,\n    },\n  });\n\n  return {\n    data: data || resolvedData,\n    loading: isFetching,\n    loaded: !!data || !!error,\n    error,\n    invalidate: (): void => {\n      queryCache.invalidateQueries(resolvedQueryKey || queryKey);\n    },\n    fetch: refetch,\n    dataSet,\n    url,\n  };\n}\n\nexport type UseResourceManyResponse = {\n  data?: any;\n  meta?: {\n    total?: number;\n    count?: number;\n  };\n  page: number;\n  limit: number;\n  totalPages: number;\n  total: number;\n  limitOptions: number[];\n  setPage: (page: number) => void;\n  setLimit: (limit: number) => void;\n  hasNext: boolean;\n  hasPrevious: boolean;\n};\nexport function useResourceMany(\n  resource: string,\n  query?: Record<string, any> | null,\n  options?: RequestInit | null\n): UseResourceManyResponse {\n  // allow developer to set a custom limit, fallback to a common value\n  const [limit, setLimit] = useState(\n    (query && query.limit) || DEFAULT_PAGINATION_LIMIT\n  );\n  const [pageParams, setPageParams] = useState({\n    offset: (query && query.offset) || 0,\n    limit,\n  });\n  // update options when limit is changed\n  useEffect(() => {\n    if (pageParams.limit !== limit) {\n      setPageParams({ ...pageParams, limit: limit });\n    }\n  }, [limit]);\n  // update user provided query with pagination params\n  const queryKey = JSON.stringify(query);\n  const pageParamsKey = JSON.stringify(pageParams);\n  const q = useMemo(() => {\n    return { ...pageParams, ...query };\n  }, [queryKey, pageParamsKey]);\n  const { data, ...rest } = useResourceManyBase(resource, q, options);\n  // extract data/metadata from response\n  const resp = data ? data.data : data;\n  const meta = data ? data.meta : data;\n  const totalPages = useMemo(\n    () => (data && data.meta && data.meta.total) || 1,\n    [data]\n  );\n  const total = useMemo(() => (data && data.meta && data.meta.count) || 0, [\n    data,\n  ]);\n  const limitOptions = useMemo(() => DEFAULT_LIMIT_OPTIONS, []);\n  const page = useMemo(() => {\n    const offset = parseInt(pageParams.offset) || 0;\n    const _limit = parseInt(`${pageParams.limit}`) || parseInt(`${limit}`);\n    return offset / _limit;\n  }, [pageParams]);\n  // set params to specific page\n  const setPage = useCallback(\n    (page) => {\n      if (page > totalPages) {\n        page = totalPages;\n      }\n      if (page <= 0) {\n        page = 0;\n      }\n      const _limit = limit || DEFAULT_PAGINATION_LIMIT;\n      const offset = _limit * page;\n      setPageParams({ offset, limit });\n    },\n    [setPageParams]\n  );\n  const hasNext = page < totalPages - 1;\n  const hasPrevious = page > 0;\n  return {\n    data: resp,\n    meta,\n    page,\n    limit,\n    totalPages,\n    total,\n    limitOptions,\n    setPage,\n    setLimit,\n    hasNext,\n    hasPrevious,\n    ...rest,\n  };\n}\n"],
-  "mappings": "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",
-  "names": []
+  "sourcesContent": ["import { useEffect, useMemo, useState, useCallback } from 'react';\nimport { usePaginatedQuery, QueryFunction, queryCache } from 'react-query';\nimport { useAPI } from '@digigov/ui/api/APIProvider';\nimport { getQueryKey, processResponse } from '@digigov/ui/api/utils';\n\nconst DEFAULT_PAGINATION_LIMIT = 30;\nconst DEFAULT_LIMIT_OPTIONS = [10, 30, 60, 100];\n\nexport function useResourceManyBase(\n  resource: string,\n  query?: Record<string, any> | null | ((...args: any) => any),\n  options?: RequestInit | null\n): any {\n  const {\n    config: { baseURL },\n    token,\n  } = useAPI();\n  const [{ url, dataSet }, setFetchOpts] = useState({\n    url: '',\n    dataSet: false,\n  });\n  const customFetcher: QueryFunction<any> = useCallback(\n    async (fetchUrl, options) => {\n      setFetchOpts({ url: fetchUrl, dataSet: false });\n      const response = await fetch(fetchUrl, options);\n      try {\n        const { data } = await processResponse(response, true);\n        if (data) {\n          return Promise.resolve(data);\n        }\n      } catch (error) {\n        return Promise.reject(error.error);\n      }\n    },\n    []\n  );\n  const queryKey = getQueryKey(\n    resource,\n    null,\n    query,\n    null,\n    options,\n    'GET',\n    baseURL,\n    token\n  );\n  let enabled = true;\n  let resolvedQueryKey;\n  if (typeof queryKey === 'function') {\n    try {\n      resolvedQueryKey = queryKey();\n    } catch (err) {\n      enabled = false;\n    }\n  }\n\n  const {\n    resolvedData,\n    latestData: data,\n    error,\n    isFetching,\n    refetch,\n  } = usePaginatedQuery({\n    queryKey: resolvedQueryKey || queryKey,\n    queryFn: customFetcher,\n    config: {\n      enabled,\n      suspense: true,\n      cacheTime: 30000,\n      refetchOnMount: false,\n    },\n  });\n\n  return {\n    data: data || resolvedData,\n    loading: isFetching,\n    loaded: !!data || !!error,\n    error,\n    invalidate: (): void => {\n      queryCache.invalidateQueries(resolvedQueryKey || queryKey);\n    },\n    fetch: refetch,\n    dataSet,\n    url,\n  };\n}\n\nexport type UseResourceManyResponse = {\n  data?: any;\n  meta?: {\n    total?: number;\n    count?: number;\n  };\n  page: number;\n  limit: number;\n  totalPages: number;\n  total: number;\n  limitOptions: number[];\n  setPage: (page: number) => void;\n  setLimit: (limit: number) => void;\n  hasNext: boolean;\n  hasPrevious: boolean;\n};\nexport function useResourceMany(\n  resource: string,\n  query?: Record<string, any> | null,\n  options?: RequestInit | null\n): UseResourceManyResponse {\n  // allow developer to set a custom limit, fallback to a common value\n  const [limit, setLimit] = useState(\n    (query && query.limit) || DEFAULT_PAGINATION_LIMIT\n  );\n  const [pageParams, setPageParams] = useState({\n    offset: (query && query.offset) || 0,\n    limit,\n  });\n  // update options when limit is changed\n  useEffect(() => {\n    if (pageParams.limit !== limit) {\n      setPageParams({ ...pageParams, limit: limit });\n    }\n  }, [limit]);\n  // update user provided query with pagination params\n  const queryKey = JSON.stringify(query);\n  const pageParamsKey = JSON.stringify(pageParams);\n  const q = useMemo(() => {\n    return { ...pageParams, ...query };\n  }, [queryKey, pageParamsKey]);\n  const { data, ...rest } = useResourceManyBase(resource, q, options);\n  // extract data/metadata from response\n  const resp = data ? data.data : data;\n  const meta = data ? data.meta : data;\n  const totalPages = useMemo(\n    () => (data && data.meta && data.meta.total) || 1,\n    [data]\n  );\n  const total = useMemo(\n    () => (data && data.meta && data.meta.count) || 0,\n    [data]\n  );\n  const limitOptions = useMemo(() => DEFAULT_LIMIT_OPTIONS, []);\n  const page = useMemo(() => {\n    const offset = parseInt(pageParams.offset) || 0;\n    const _limit = parseInt(`${pageParams.limit}`) || parseInt(`${limit}`);\n    return offset / _limit;\n  }, [pageParams]);\n  // set params to specific page\n  const setPage = useCallback(\n    (page) => {\n      if (page > totalPages) {\n        page = totalPages;\n      }\n      if (page <= 0) {\n        page = 0;\n      }\n      const _limit = limit || DEFAULT_PAGINATION_LIMIT;\n      const offset = _limit * page;\n      setPageParams({ offset, limit });\n    },\n    [setPageParams]\n  );\n  const hasNext = page < totalPages - 1;\n  const hasPrevious = page > 0;\n  return {\n    data: resp,\n    meta,\n    page,\n    limit,\n    totalPages,\n    total,\n    limitOptions,\n    setPage,\n    setLimit,\n    hasNext,\n    hasPrevious,\n    ...rest,\n  };\n}\n"],
+  "mappings": "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",
+  "names": ["options", "data", "error", "page"]
 }

package/api/utils/index.js

@@ -1,4 +1,4 @@
-import {APIError} from "@digigov/ui/api/APIErrors";
+import { APIError } from "@digigov/ui/api/APIErrors";
 async function parseErrors(response) {
   const errors = [];
   const error = {
@@ -97,10 +97,28 @@ function getQueryKey(resource, id, query, data, options, method, baseURL, token)
   let queryKey;
   if ([id, query, data].some((param) => typeof param === "function")) {
     queryKey = () => {
-      return getArgs(resource, id, query, data, options, method, baseURL, token);
+      return getArgs(
+        resource,
+        id,
+        query,
+        data,
+        options,
+        method,
+        baseURL,
+        token
+      );
     };
   } else {
-    queryKey = getArgs(resource, id, query, data, options, method, baseURL, token);
+    queryKey = getArgs(
+      resource,
+      id,
+      query,
+      data,
+      options,
+      method,
+      baseURL,
+      token
+    );
   }
   return queryKey;
 }