ag-common 0.0.227 → 0.0.228

package/dist/ui/helpers/callOpenApi/hook.d.ts

@@ -7,19 +7,21 @@ export declare type TUseCallOpenApi<T> = AxiosWrapper<T> & {
     loadcount: number;
     setData: (d: TUseCallOpenApiDispatch<T | undefined>) => void;
 };
-/**
- * hooks+cached call to callOpenApi
- * @param p
- * @returns
- */
-export declare const useCallOpenApi: <T, TDefaultApi>(p: ICallOpenApi<T, TDefaultApi> & {
+declare type TUseCallOpenApi1<T, TDefaultApi> = ICallOpenApi<T, TDefaultApi> & {
     cacheKey: string;
     /**
      * will shortcut and return the appropriate axioswrapper data if cachekey is found
      */
-    ssrCacheItems?: CacheItems | undefined;
+    ssrCacheItems?: CacheItems;
     /**
      * default ttl in seconds for cache - default 120s
      */
-    cacheTtl?: number | undefined;
-}) => TUseCallOpenApi<T>;
+    cacheTtl?: number;
+};
+/**
+ * hooks+cached call to callOpenApi
+ * @param p
+ * @returns
+ */
+export declare const useCallOpenApi: <T, TDefaultApi>(pIn: TUseCallOpenApi1<T, TDefaultApi>) => TUseCallOpenApi<T>;
+export {};

package/dist/ui/helpers/callOpenApi/hook.js

@@ -13,25 +13,25 @@ exports.useCallOpenApi = void 0;
 const cached_1 = require("./cached");
 const direct_1 = require("./direct");
 const react_1 = require("react");
+const defaultState = (p) => {
+    var _a;
+    const cachedData = (_a = (0, cached_1.callOpenApiCachedRaw)(Object.assign(Object.assign({}, p), { onlyCached: true }))) === null || _a === void 0 ? void 0 : _a.data;
+    return Object.assign(Object.assign({ data: undefined, url: '', datetime: 0, loadcount: 0, loading: false, reFetch: () => __awaiter(void 0, void 0, void 0, function* () { }), setData: () => { } }, (cachedData && { data: cachedData })), { loaded: !!cachedData });
+};
 /**
  * hooks+cached call to callOpenApi
  * @param p
  * @returns
  */
-const useCallOpenApi = (p) => {
-    var _a;
-    const defv = {
-        data: undefined,
-        url: '',
-        datetime: 0,
-        loadcount: 0,
-        loading: false,
-        loaded: false,
-        reFetch: () => __awaiter(void 0, void 0, void 0, function* () { }),
-        setData: () => { },
-    };
-    const cachedData = (_a = (0, cached_1.callOpenApiCachedRaw)(Object.assign(Object.assign({}, p), { onlyCached: true }))) === null || _a === void 0 ? void 0 : _a.data;
-    const [data, setData] = (0, react_1.useState)(Object.assign(Object.assign(Object.assign({}, defv), (cachedData && { data: cachedData })), { loaded: !!cachedData }));
+const useCallOpenApi = (pIn) => {
+    const [p, setP] = (0, react_1.useState)(pIn);
+    const [data, setData] = (0, react_1.useState)(defaultState(p));
+    (0, react_1.useEffect)(() => {
+        if (JSON.stringify(p) !== JSON.stringify(pIn)) {
+            setP(pIn);
+            setData(defaultState(pIn));
+        }
+    }, [p, pIn]);
     (0, react_1.useEffect)(() => {
         function run() {
             return __awaiter(this, void 0, void 0, function* () {
@@ -47,9 +47,7 @@ const useCallOpenApi = (p) => {
         setData((d) => (Object.assign(Object.assign({}, d), { loading: true })));
         void run();
     }, [data, p, setData]);
-    return Object.assign(Object.assign({}, data), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () {
-            setData(defv);
-        }), setData: (d) => {
+    return Object.assign(Object.assign({}, data), { reFetch: () => __awaiter(void 0, void 0, void 0, function* () { return setData(defaultState(p)); }), setData: (d) => {
             setData(Object.assign(Object.assign({}, data), { data: d(data.data), datetime: new Date().getTime() }));
         } });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-common",
-  "version": "0.0.227",
+  "version": "0.0.228",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "author": "Andrei Gec <@andreigec> (https://gec.dev/)",
@@ -40,12 +40,12 @@
     "@storybook/react": "6.4.22",
     "@storybook/theming": "6.4.22",
     "@types/jsonwebtoken": "8.5.8",
-    "@types/node": "17.0.24",
+    "@types/node": "17.0.25",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "@types/styled-components": "5.1.25",
-    "@typescript-eslint/eslint-plugin": "5.19.0",
-    "@typescript-eslint/parser": "5.19.0",
+    "@typescript-eslint/eslint-plugin": "5.20.0",
+    "@typescript-eslint/parser": "5.20.0",
     "cross-env": "7.0.3",
     "eslint": "8.13.0",
     "eslint-config-airbnb-typescript": "17.0.0",