@react-pakistan/util-functions 1.25.17 → 1.25.19

package/general/generic-cache.js

@@ -162,7 +162,7 @@ exports.getCachedDataSync = getCachedDataSync;
  * const active = await getCachedData<UserBE>({ config, filters: { enabled: true }, pageLimit: 200 });
  */
 var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, function () {
-    var config, params, cacheKey, apiUrl, responseKey, expirationMs, fallBackPageLimit, fallBackCurrentPage, filters, searchQuery, queryObj_1, searchParams_1, response_1, items_1, raw, currentTime, cachedTime, ageInMs, cachedTime, ageInMs, itemsArray, queryObj, searchParams, response, itemsRaw, items, count, itemsMap, updatedCache, error_1;
+    var config, params, cacheKey, apiUrl, responseKey, expirationMs, fallBackPageLimit, fallBackCurrentPage, filters, searchQuery, paramsWithoutFilters_1, otherParams_1, queryObj_1, searchParams_1, response_1, items_1, raw, currentTime, cachedTime, ageInMs, cachedTime, ageInMs, itemsArray, paramsWithoutFilters_2, otherParams, queryObj, searchParams, response, itemsRaw, items, count, itemsMap, updatedCache, error_1;
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __generator(this, function (_m) {
         switch (_m.label) {
@@ -179,12 +179,20 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                 _m.trys.push([1, 5, , 6]);
                 if (!((searchQuery && searchQuery.trim()) ||
                     (filters && Object.keys(filters).length > 0))) return [3 /*break*/, 3];
+                paramsWithoutFilters_1 = __assign({}, (params || {}));
+                if (paramsWithoutFilters_1.filters !== undefined) {
+                    delete paramsWithoutFilters_1.filters;
+                }
+                otherParams_1 = Object.keys(paramsWithoutFilters_1).reduce(function (acc, key) {
+                    acc[key] = String(paramsWithoutFilters_1[key]);
+                    return acc;
+                }, {});
                 queryObj_1 = __assign(__assign(__assign({ pageLimit: fallBackPageLimit, currentPage: fallBackCurrentPage }, (searchQuery && { searchQuery: searchQuery })), (filters
                     ? Object.keys(filters).reduce(function (acc, key) {
                         acc[key] = String(filters[key]);
                         return acc;
                     }, {})
-                    : {})), (params || {}));
+                    : {})), otherParams_1);
                 searchParams_1 = new URLSearchParams(queryObj_1);
                 return [4 /*yield*/, (0, fetch_data_1.fetchData)({
                         url: "".concat(apiUrl, "?").concat(searchParams_1.toString()),
@@ -217,7 +225,15 @@ var getCachedData = function (opts) { return __awaiter(void 0, void 0, void 0, f
                         return [2 /*return*/, { count: itemsArray.length, items: itemsArray }];
                     }
                 }
-                queryObj = __assign({ pageLimit: fallBackPageLimit, currentPage: fallBackCurrentPage }, (params || {}));
+                paramsWithoutFilters_2 = __assign({}, (params || {}));
+                if (paramsWithoutFilters_2.filters !== undefined) {
+                    delete paramsWithoutFilters_2.filters;
+                }
+                otherParams = Object.keys(paramsWithoutFilters_2).reduce(function (acc, key) {
+                    acc[key] = String(paramsWithoutFilters_2[key]);
+                    return acc;
+                }, {});
+                queryObj = __assign({ pageLimit: fallBackPageLimit, currentPage: fallBackCurrentPage }, otherParams);
                 searchParams = new URLSearchParams(queryObj);
                 return [4 /*yield*/, (0, fetch_data_1.fetchData)({
                         url: "".concat(apiUrl, "?").concat(searchParams.toString()),

package/hooks/use-module-entity-v2.d.ts

@@ -75,6 +75,8 @@ interface Params {
     listDeps?: Array<any> | Array<string>;
     listParams: object;
     listUrl: string;
+    /** Optional headers to include on every fetch made by this hook */
+    headers?: Record<string, string>;
     searchQuery: string;
     unitByIdUrl: string;
     unitUrl: string;
@@ -96,5 +98,5 @@ interface Return {
     updateFetchNow: (url?: string, config?: FetchConfig) => void;
     updateLoading: boolean;
 }
-export declare const useModuleEntityV2: ({ byIdCallback, byIdDeps, byIdParams, deleteCallback, deleteDeps, deleteParams, listCallback, listDeps, listParams, listUrl, searchQuery, unitByIdUrl, unitUrl, updateCallback, updateDeps, updateParams, }: Params) => Return;
+export declare const useModuleEntityV2: ({ byIdCallback, byIdDeps, byIdParams, deleteCallback, deleteDeps, deleteParams, listCallback, listDeps, listParams, listUrl, headers, searchQuery, unitByIdUrl, unitUrl, updateCallback, updateDeps, updateParams, }: Params) => Return;
 export {};

package/hooks/use-module-entity-v2.js

@@ -74,7 +74,7 @@ var constants_1 = require("../constants");
 var use_fetch_1 = require("./use-fetch");
 var use_debounce_1 = require("./use-debounce");
 var useModuleEntityV2 = function (_a) {
-    var byIdCallback = _a.byIdCallback, _b = _a.byIdDeps, byIdDeps = _b === void 0 ? [] : _b, byIdParams = _a.byIdParams, deleteCallback = _a.deleteCallback, _c = _a.deleteDeps, deleteDeps = _c === void 0 ? [] : _c, deleteParams = _a.deleteParams, listCallback = _a.listCallback, _d = _a.listDeps, listDeps = _d === void 0 ? [] : _d, listParams = _a.listParams, listUrl = _a.listUrl, searchQuery = _a.searchQuery, unitByIdUrl = _a.unitByIdUrl, unitUrl = _a.unitUrl, updateCallback = _a.updateCallback, _e = _a.updateDeps, updateDeps = _e === void 0 ? [] : _e, updateParams = _a.updateParams;
+    var byIdCallback = _a.byIdCallback, _b = _a.byIdDeps, byIdDeps = _b === void 0 ? [] : _b, byIdParams = _a.byIdParams, deleteCallback = _a.deleteCallback, _c = _a.deleteDeps, deleteDeps = _c === void 0 ? [] : _c, deleteParams = _a.deleteParams, listCallback = _a.listCallback, _d = _a.listDeps, listDeps = _d === void 0 ? [] : _d, listParams = _a.listParams, listUrl = _a.listUrl, headers = _a.headers, searchQuery = _a.searchQuery, unitByIdUrl = _a.unitByIdUrl, unitUrl = _a.unitUrl, updateCallback = _a.updateCallback, _e = _a.updateDeps, updateDeps = _e === void 0 ? [] : _e, updateParams = _a.updateParams;
     var debouncedQuery = (0, use_debounce_1.useDebounce)(searchQuery, 800);
     // debounced list refresh to batch multiple updates/deletes
     var refreshTimerRef = (0, react_1.useRef)(null);
@@ -88,6 +88,7 @@ var useModuleEntityV2 = function (_a) {
     var _f = (0, use_fetch_1.useFetch)(listUrl, {
         method: constants_1.API_METHODS.GET,
         params: listParams,
+        headers: headers,
         callback: listCallback,
         credentials: true,
     }, __spreadArray([debouncedQuery, listParams], listDeps, true)), listError = _f.error, listFetchNow = _f.fetchNow, listLoading = _f.loading;
@@ -102,6 +103,7 @@ var useModuleEntityV2 = function (_a) {
                 listFetchNow(undefined, {
                     method: constants_1.API_METHODS.GET,
                     params: listParams,
+                    headers: headers,
                 });
             }
             catch (_a) {
@@ -114,6 +116,7 @@ var useModuleEntityV2 = function (_a) {
     var _g = (0, use_fetch_1.useFetch)(unitUrl, {
         method: constants_1.API_METHODS.PUT,
         body: JSON.stringify(updateParams),
+        headers: headers,
         callback: function (d) {
             if (updateCallback) {
                 try {
@@ -139,12 +142,14 @@ var useModuleEntityV2 = function (_a) {
     var _h = (0, use_fetch_1.useFetch)(unitByIdUrl, {
         method: constants_1.API_METHODS.GET,
         params: byIdParams,
+        headers: headers,
         callback: byIdCallback,
     }, __spreadArray([], byIdDeps, true)), byIdError = _h.error, byIdLoading = _h.loading, byIdFetchNow = _h.fetchNow;
     // delete
     var _j = (0, use_fetch_1.useFetch)(unitUrl, {
         method: constants_1.API_METHODS.DELETE,
         body: JSON.stringify(deleteParams),
+        headers: headers,
         callback: function (d) {
             if (deleteCallback) {
                 try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-pakistan/util-functions",
-  "version": "1.25.17",
+  "version": "1.25.19",
   "description": "A library of all util functions",
   "main": "index.js",
   "scripts": {