@k-int/stripes-kint-components 5.25.2 → 5.25.3

package/es/lib/hooks/useMutateRefdataCategory/useMutateRefdataCategory.js

@@ -7,19 +7,27 @@ exports.default = void 0;
 var _noop = _interopRequireDefault(require("lodash/noop"));
 var _useInvalidateRefdata = _interopRequireDefault(require("../useInvalidateRefdata"));
 var _useMutateGeneric = _interopRequireDefault(require("../useMutateGeneric"));
+const _excluded = ["afterQueryCalls", "endpoint"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const useMutateRefdataCategory = _ref => {
   let {
-    afterQueryCalls: {
-      delete: afterQueryDelete = _noop.default,
-      post: afterQueryPost = _noop.default,
-      put: afterQueryPut = _noop.default
-    } = {},
-    endpoint,
-    ...mutateGenericProps
-  } = _ref;
+      afterQueryCalls: {
+        delete: afterQueryDelete = _noop.default,
+        post: afterQueryPost = _noop.default,
+        put: afterQueryPut = _noop.default
+      } = {},
+      endpoint
+    } = _ref,
+    mutateGenericProps = _objectWithoutProperties(_ref, _excluded);
   const invalidateRefdata = (0, _useInvalidateRefdata.default)();
-  return (0, _useMutateGeneric.default)({
+  return (0, _useMutateGeneric.default)(_objectSpread({
     afterQueryCalls: {
       delete: res => {
         invalidateRefdata().then(() => {
@@ -40,14 +48,12 @@ const useMutateRefdataCategory = _ref => {
     endpoint,
     payloadMutators: {
       post: data => ({
-        json: {
-          ...data,
+        json: _objectSpread(_objectSpread({}, data), {}, {
           values: []
-        }
+        })
       })
     },
-    queryKey: ['stripes-kint-components', 'useMutateRefdataCategory'],
-    ...mutateGenericProps
-  });
+    queryKey: ['stripes-kint-components', 'useMutateRefdataCategory']
+  }, mutateGenericProps));
 };
 var _default = exports.default = useMutateRefdataCategory;

package/es/lib/hooks/useMutateRefdataValue/useMutateRefdataValue.js

@@ -7,20 +7,28 @@ exports.default = void 0;
 var _noop = _interopRequireDefault(require("lodash/noop"));
 var _useInvalidateRefdata = _interopRequireDefault(require("../useInvalidateRefdata"));
 var _useMutateGeneric = _interopRequireDefault(require("../useMutateGeneric"));
+const _excluded = ["afterQueryCalls", "endpoint", "id"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const useMutateRefdataValue = _ref => {
   let {
-    afterQueryCalls: {
-      delete: afterQueryDelete = _noop.default,
-      post: afterQueryPost = _noop.default,
-      put: afterQueryPut = _noop.default
-    } = {},
-    endpoint,
-    id,
-    ...mutateGenericProps
-  } = _ref;
+      afterQueryCalls: {
+        delete: afterQueryDelete = _noop.default,
+        post: afterQueryPost = _noop.default,
+        put: afterQueryPut = _noop.default
+      } = {},
+      endpoint,
+      id
+    } = _ref,
+    mutateGenericProps = _objectWithoutProperties(_ref, _excluded);
   const invalidateRefdata = (0, _useInvalidateRefdata.default)();
-  return (0, _useMutateGeneric.default)({
+  return (0, _useMutateGeneric.default)(_objectSpread({
     afterQueryCalls: {
       delete: res => {
         invalidateRefdata().then(() => {
@@ -41,7 +49,7 @@ const useMutateRefdataValue = _ref => {
     endpoint,
     id,
     promiseReturns: {
-      delete: (delId, ky) => ky.put(`${endpoint}/${id}`, {
+      delete: (delId, ky) => ky.put("".concat(endpoint, "/").concat(id), {
         json: {
           id,
           values: [{
@@ -50,21 +58,20 @@ const useMutateRefdataValue = _ref => {
           }]
         }
       }).json(),
-      post: (data, ky) => ky.put(`${endpoint}/${id}`, {
+      post: (data, ky) => ky.put("".concat(endpoint, "/").concat(id), {
         json: {
           id,
           values: [data]
         }
       }).json(),
-      put: (data, ky) => ky.put(`${endpoint}/${id}`, {
+      put: (data, ky) => ky.put("".concat(endpoint, "/").concat(id), {
         json: {
           id,
           values: [data]
         }
       }).json()
     },
-    queryKey: ['stripes-kint-components', 'useMutateRefdataValue', id],
-    ...mutateGenericProps
-  });
+    queryKey: ['stripes-kint-components', 'useMutateRefdataValue', id]
+  }, mutateGenericProps));
 };
 var _default = exports.default = useMutateRefdataValue;

package/es/lib/hooks/usePrevNextPagination.js

@@ -10,6 +10,11 @@ var _queryString = _interopRequireDefault(require("query-string"));
 var _pagination = require("../constants/pagination");
 var _useLocalPageStore = _interopRequireDefault(require("./useLocalPageStore"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // Currently there are several places in which this hook is used twice within the same component
 // Once in order to get the current page, and again in order to handle changes to paginations
 // This hook should be refactored in order to resolve these issue - @EthanFreestone
@@ -69,14 +74,13 @@ const usePrevNextPagination = function () {
       // change the store and the currentPage will update below
       setPage(id, newPage);
       setCurrentPage(newPage);
-    } else if (newPage !== urlQuery?.page) {
-      const newQuery = {
-        ...urlQuery,
+    } else if (newPage !== (urlQuery === null || urlQuery === void 0 ? void 0 : urlQuery.page)) {
+      const newQuery = _objectSpread(_objectSpread({}, urlQuery), {}, {
         page: newPage
-      };
+      });
       history.push({
         pathname: location.pathname,
-        search: `?${_queryString.default.stringify(newQuery)}`
+        search: "?".concat(_queryString.default.stringify(newQuery))
       });
     }
   }, [currentPage, history, id, location.pathname, location.search, setPage, syncToLocation]);
@@ -92,30 +96,28 @@ const usePrevNextPagination = function () {
   (0, _react.useEffect)(() => {
     if (syncToLocation) {
       const urlQuery = _queryString.default.parse(location.search);
-      if (urlQuery?.page && currentPage !== urlQuery?.page) {
-        setCurrentPage(Number(urlQuery?.page));
-      } else if (!urlQuery?.page && defaultToPageOne) {
+      if (urlQuery !== null && urlQuery !== void 0 && urlQuery.page && currentPage !== (urlQuery === null || urlQuery === void 0 ? void 0 : urlQuery.page)) {
+        setCurrentPage(Number(urlQuery === null || urlQuery === void 0 ? void 0 : urlQuery.page));
+      } else if (!(urlQuery !== null && urlQuery !== void 0 && urlQuery.page) && defaultToPageOne) {
         // If url query "page" is not yet set, set it to 1
         setCurrentPage(1);
-        const newQuery = {
-          ...urlQuery,
+        const newQuery = _objectSpread(_objectSpread({}, urlQuery), {}, {
           page: 1
-        };
+        });
 
         // We use replace instead of push for the defaulting so we don't add unnecessary history entries
         history.replace({
           pathname: location.pathname,
-          search: `?${_queryString.default.stringify(newQuery)}`
+          search: "?".concat(_queryString.default.stringify(newQuery))
         });
       }
       if (resetPageState) {
-        const newQuery = {
-          ...urlQuery,
+        const newQuery = _objectSpread(_objectSpread({}, urlQuery), {}, {
           page: 1
-        };
+        });
         history.push({
           pathname: location.pathname,
-          search: `?${_queryString.default.stringify(newQuery)}`
+          search: "?".concat(_queryString.default.stringify(newQuery))
         });
         setResetPageState(false);
       }
@@ -127,7 +129,7 @@ const usePrevNextPagination = function () {
   }, [currentPage, defaultToPageOne, history, id, location, pageStore, resetPageState, syncToLocation]);
 
   // Set up MCL specific props based on page
-  const pagingCanGoNext = hasNextPage ?? (currentPage && currentPage < Number(count) / pageSize);
+  const pagingCanGoNext = hasNextPage !== null && hasNextPage !== void 0 ? hasNextPage : currentPage && currentPage < Number(count) / pageSize;
   const pagingCanGoPrevious = currentPage && Number(currentPage) > 1;
   const pagingOffset = currentPage ? (currentPage - 1) * pageSize : 0;
   const onNeedMoreData = function () {

package/es/lib/hooks/useQIndex.js

@@ -9,35 +9,38 @@ var _reactRouterDom = require("react-router-dom");
 var _queryString = _interopRequireDefault(require("query-string"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const useQIndex = () => {
   const history = (0, _reactRouterDom.useHistory)();
   const location = (0, _reactRouterDom.useLocation)();
   const query = _queryString.default.parse(location.search);
-  const [currentQindex, setCurrentQindex] = (0, _react.useState)(query?.qindex);
+  const [currentQindex, setCurrentQindex] = (0, _react.useState)(query === null || query === void 0 ? void 0 : query.qindex);
   const handleQindexChange = newQindex => {
     setCurrentQindex(newQindex);
-    if (newQindex !== query?.qindex) {
+    if (newQindex !== (query === null || query === void 0 ? void 0 : query.qindex)) {
       let newQuery;
       if (newQindex !== '') {
-        newQuery = {
-          ...query,
+        newQuery = _objectSpread(_objectSpread({}, query), {}, {
           qindex: newQindex
-        };
+        });
       } else {
-        newQuery = {
-          ...query,
+        newQuery = _objectSpread(_objectSpread({}, query), {}, {
           qindex: undefined
-        };
+        });
       }
       history.push({
         pathname: location.pathname,
-        search: `?${_queryString.default.stringify(newQuery)}`
+        search: "?".concat(_queryString.default.stringify(newQuery))
       });
     }
   };
   (0, _react.useEffect)(() => {
-    if (currentQindex !== query?.qindex) {
-      setCurrentQindex(query?.qindex);
+    if (currentQindex !== (query === null || query === void 0 ? void 0 : query.qindex)) {
+      setCurrentQindex(query === null || query === void 0 ? void 0 : query.qindex);
     }
   }, [currentQindex, history, location, query]);
   return [currentQindex, handleQindexChange];

package/es/lib/hooks/useRefdata.js

@@ -28,13 +28,13 @@ const useRefdata = _ref => {
 
   if (Array.isArray(desc)) {
     // If we have an array, append a desc filter for each desc given
-    nsValues.filters = desc.map(d => `DescKey.${d}`).join(',');
+    nsValues.filters = desc.map(d => "DescKey.".concat(d)).join(',');
   } else if (desc) {
     // If we just have a string, append a single desc filter
-    nsValues.filters = `DescKey.${desc}`;
+    nsValues.filters = "DescKey.".concat(desc);
   }
   const query = (0, _utils.generateKiwtQuery)(options, nsValues);
-  const path = `${endpoint}${query}`;
+  const path = "".concat(endpoint).concat(query);
   const queryObject = (0, _reactQuery.useQuery)((0, _utils.refdataQueryKey)(desc), () => ky(path).json(), queryParams);
   if (returnQueryObject) {
     return queryObject || {};

package/es/lib/hooks/useTemplates.js

@@ -18,16 +18,16 @@ const useTemplates = _ref => {
   const ky = (0, _core.useOkapiKy)();
   const extraPathItems = [];
   if (context) {
-    extraPathItems.push(`filters=context=${context}`);
+    extraPathItems.push("filters=context=".concat(context));
   }
   if (sort) {
-    extraPathItems.push(`sort=${sort}`);
+    extraPathItems.push("sort=".concat(sort));
   }
   extraPathItems.push('max=500');
-  const path = `${endpoint}?${extraPathItems.join('&')}`;
+  const path = "".concat(endpoint, "?").concat(extraPathItems.join('&'));
   const {
     data: templates
-  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useTemplates', 'templates', context ?? ''], () => ky(path).json(), queryParams);
+  } = (0, _reactQuery.useQuery)(['stripes-kint-components', 'useTemplates', 'templates', context !== null && context !== void 0 ? context : ''], () => ky(path).json(), queryParams);
   return templates || [];
 };
 var _default = exports.default = useTemplates;

package/es/lib/settingsHooks/useAppSettings/useAppSettings.js

@@ -8,6 +8,7 @@ var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
 var _utils = require("../../utils");
 const useAppSettings = _ref => {
+  var _ref2, _ref3, _queryObject$data2;
   let {
     endpoint,
     keyName,
@@ -23,29 +24,32 @@ const useAppSettings = _ref => {
   };
   const namespaceArray = [endpoint];
   if (sectionName) {
-    defaultQueryParamObject.filters = [...(defaultQueryParamObject.filters ?? []), {
+    var _defaultQueryParamObj;
+    defaultQueryParamObject.filters = [...((_defaultQueryParamObj = defaultQueryParamObject.filters) !== null && _defaultQueryParamObj !== void 0 ? _defaultQueryParamObj : []), {
       path: 'section',
       value: sectionName
     }];
     namespaceArray.push(sectionName);
   }
   if (keyName) {
-    defaultQueryParamObject.filters = [...(defaultQueryParamObject.filters ?? []), {
+    var _defaultQueryParamObj2;
+    defaultQueryParamObject.filters = [...((_defaultQueryParamObj2 = defaultQueryParamObject.filters) !== null && _defaultQueryParamObj2 !== void 0 ? _defaultQueryParamObj2 : []), {
       path: 'key',
       value: keyName
     }];
     defaultQueryParamObject.perPage = 1;
     namespaceArray.push(keyName);
   }
-  const queryParamArray = (0, _utils.generateKiwtQueryParams)(options ?? defaultQueryParamObject, {});
+  const queryParamArray = (0, _utils.generateKiwtQueryParams)(options !== null && options !== void 0 ? options : defaultQueryParamObject, {});
   namespaceArray.push(queryParamArray);
-  const queryObject = (0, _reactQuery.useQuery)(namespaceArray, () => ky(`${endpoint}?${queryParamArray?.join('&')}`).json(), queryParams);
+  const queryObject = (0, _reactQuery.useQuery)(namespaceArray, () => ky("".concat(endpoint, "?").concat(queryParamArray === null || queryParamArray === void 0 ? void 0 : queryParamArray.join('&'))).json(), queryParams);
   if (returnQueryObject) {
     return queryObject;
   }
-  if ((queryParams ?? defaultQueryParamObject)?.perPage && (queryParams ?? defaultQueryParamObject)?.perPage === 1) {
-    return queryObject?.data?.[0] ?? {};
+  if ((_ref2 = queryParams !== null && queryParams !== void 0 ? queryParams : defaultQueryParamObject) !== null && _ref2 !== void 0 && _ref2.perPage && ((_ref3 = queryParams !== null && queryParams !== void 0 ? queryParams : defaultQueryParamObject) === null || _ref3 === void 0 ? void 0 : _ref3.perPage) === 1) {
+    var _queryObject$data$, _queryObject$data;
+    return (_queryObject$data$ = queryObject === null || queryObject === void 0 || (_queryObject$data = queryObject.data) === null || _queryObject$data === void 0 ? void 0 : _queryObject$data[0]) !== null && _queryObject$data$ !== void 0 ? _queryObject$data$ : {};
   }
-  return queryObject?.data ?? [];
+  return (_queryObject$data2 = queryObject === null || queryObject === void 0 ? void 0 : queryObject.data) !== null && _queryObject$data2 !== void 0 ? _queryObject$data2 : [];
 };
 var _default = exports.default = useAppSettings;

package/es/lib/settingsHooks/useSettingSection/useSettingSection.js

@@ -7,6 +7,10 @@ exports.default = void 0;
 var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
 var _utils = require("../../utils");
+const _excluded = ["data"],
+  _excluded2 = ["mutateAsync"];
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const useSettingSection = _ref => {
   let {
     sectionName,
@@ -31,18 +35,20 @@ const useSettingSection = _ref => {
     perPage: 100,
     stats: false
   }, {});
-  const {
-    data: settings = [],
-    ...settingsQuery
-  } = (0, _reactQuery.useQuery)(getQueryNamespaceGenerator({
-    queryParams
-  }), () => ky(`${settingEndpoint}?${queryParams?.join('&')}`).json());
-  const {
-    mutateAsync: putSetting,
-    ...settingsMutate
-  } = (0, _reactQuery.useMutation)(getMutateNamespaceGenerator(), data => ky.put(`${settingEndpoint}${data.id ? '/' + data.id : ''}`, {
-    json: data
-  }));
+  const _useQuery = (0, _reactQuery.useQuery)(getQueryNamespaceGenerator({
+      queryParams
+    }), () => ky("".concat(settingEndpoint, "?").concat(queryParams === null || queryParams === void 0 ? void 0 : queryParams.join('&'))).json()),
+    {
+      data: settings = []
+    } = _useQuery,
+    settingsQuery = _objectWithoutProperties(_useQuery, _excluded);
+  const _useMutation = (0, _reactQuery.useMutation)(getMutateNamespaceGenerator(), data => ky.put("".concat(settingEndpoint).concat(data.id ? '/' + data.id : ''), {
+      json: data
+    })),
+    {
+      mutateAsync: putSetting
+    } = _useMutation,
+    settingsMutate = _objectWithoutProperties(_useMutation, _excluded2);
   return {
     handleSubmit: putSetting,
     settings,

package/es/lib/settingsHooks/useSettings/useSettings.js

@@ -15,7 +15,11 @@ var _utils = require("../../utils");
 var _hooks = require("../../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// TODO work underway to make the settings hook more useful when trying to render multiple sections at a time
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // TODO work underway to make the settings hook more useful when trying to render multiple sections at a time
 const useSettings = function () {
   let settingsProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
@@ -48,11 +52,13 @@ const useSettings = function () {
   // Set up array of queryParams, pageLists etc etc ready for us to do all the work in a single place
 
   const sectionMetaArray = (0, _react.useMemo)(() => {
+    var _sections$length;
     const array = [];
     const getSectionQueryProps = sectionProps => {
-      const dqp = sectionProps.dynamicPageExclusions ?? dynamicPageExclusions;
+      var _sectionProps$dynamic, _sectionProps$setting;
+      const dqp = (_sectionProps$dynamic = sectionProps.dynamicPageExclusions) !== null && _sectionProps$dynamic !== void 0 ? _sectionProps$dynamic : dynamicPageExclusions;
       const queryParams = (0, _utils.generateKiwtQueryParams)({
-        filters: dqp?.map(dpe => ({
+        filters: dqp === null || dqp === void 0 ? void 0 : dqp.map(dpe => ({
           path: 'section',
           comparator: '!=',
           value: dpe
@@ -60,72 +66,68 @@ const useSettings = function () {
         perPage: 100,
         stats: false
       }, {});
-      const finalSettingEndpoint = sectionProps.settingEndpoint ?? settingEndpoint;
+      const finalSettingEndpoint = (_sectionProps$setting = sectionProps.settingEndpoint) !== null && _sectionProps$setting !== void 0 ? _sectionProps$setting : settingEndpoint;
       const queryKey = ['stripes-kint-components', 'useSettings', 'appSettings', finalSettingEndpoint, queryParams];
-      const queryFn = () => ky(`${finalSettingEndpoint}?${queryParams?.join('&')}`).json();
+      const queryFn = () => ky("".concat(finalSettingEndpoint, "?").concat(queryParams === null || queryParams === void 0 ? void 0 : queryParams.join('&'))).json();
       return {
         queryParams,
         queryKey,
         queryFn
       };
     };
-    if ((sections?.length ?? 0) > 0) {
+    if (((_sections$length = sections === null || sections === void 0 ? void 0 : sections.length) !== null && _sections$length !== void 0 ? _sections$length : 0) > 0) {
       array.push(...sections.map(section => {
         const querySectionProps = getSectionQueryProps(section);
-        return {
-          ...settingsProps,
-          // ensure these fall through to section based props
-          ...querySectionProps,
-          ...section // return original section object
-        };
+        return _objectSpread(_objectSpread(_objectSpread({}, settingsProps), querySectionProps), section);
       }));
     } else {
       const querySectionProps = getSectionQueryProps(settingsProps);
-      array.push({
-        ...settingsProps,
-        ...querySectionProps
-      });
+      array.push(_objectSpread(_objectSpread({}, settingsProps), querySectionProps));
     }
     return array;
   }, [dynamicPageExclusions, ky, sections, settingEndpoint, settingsProps]);
-  const queries = (0, _react.useMemo)(() => sectionMetaArray.map(sma => {
-    let enabled = true;
-    if (sma.pages || sma.preventQueries || pages || preventQueries) {
-      enabled = false;
-    }
-    return {
-      queryKey: sma.queryKey,
-      queryFn: sma.queryFn,
-      enabled
-    };
-  }) ?? [], [pages, preventQueries, sectionMetaArray]);
+  const queries = (0, _react.useMemo)(() => {
+    var _sectionMetaArray$map;
+    return (_sectionMetaArray$map = sectionMetaArray.map(sma => {
+      let enabled = true;
+      if (sma.pages || sma.preventQueries || pages || preventQueries) {
+        enabled = false;
+      }
+      return {
+        queryKey: sma.queryKey,
+        queryFn: sma.queryFn,
+        enabled
+      };
+    })) !== null && _sectionMetaArray$map !== void 0 ? _sectionMetaArray$map : [];
+  }, [pages, preventQueries, sectionMetaArray]);
   const queryReturnArray = (0, _reactQuery.useQueries)(queries);
   const [isLoading, setIsLoading] = (0, _react.useState)(true);
   const getDynamicPages = (0, _react.useCallback)((qra, sma) => {
-    const pagesFromQueryReturn = [...new Set(qra.data?.map(s => s.section))];
+    var _qra$data;
+    const pagesFromQueryReturn = [...new Set((_qra$data = qra.data) === null || _qra$data === void 0 ? void 0 : _qra$data.map(s => s.section))];
     const dynamic = pagesFromQueryReturn.map(page => {
-      const finalRender = sma.render ?? render;
-      const finalSectionRoute = sma.sectionRoute ?? sectionRoute;
-      const pageRoute = (finalSectionRoute ? `${finalSectionRoute}/` : '') + page;
+      var _sma$render, _sma$sectionRoute;
+      const finalRender = (_sma$render = sma.render) !== null && _sma$render !== void 0 ? _sma$render : render;
+      const finalSectionRoute = (_sma$sectionRoute = sma.sectionRoute) !== null && _sma$sectionRoute !== void 0 ? _sma$sectionRoute : sectionRoute;
+      const pageRoute = (finalSectionRoute ? "".concat(finalSectionRoute, "/") : '') + page;
       return {
         route: pageRoute,
         label: kintIntl.formatKintMessage({
-          id: `settings.settingsSection.${(0, _utils.toCamelCase)(page)}`,
+          id: "settings.settingsSection.".concat((0, _utils.toCamelCase)(page)),
           fallbackMessage: page
         }),
         component: props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPagePane, {
           intlKey: passedIntlKey,
           intlNS: passedIntlNS,
           sectionName: page,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPage, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPage, _objectSpread({
             allowEdit: allowGlobalEdit,
             intlKey: passedIntlKey,
             intlNS: passedIntlNS,
             labelOverrides: labelOverrides,
             render: finalRender,
-            sectionName: page,
-            ...props
-          })
+            sectionName: page
+          }, props))
         })
       };
     });
@@ -142,18 +144,20 @@ const useSettings = function () {
   }, [isLoading, queryReturnArray]);
   const finalSections = (0, _react.useMemo)(() => {
     return sectionMetaArray.map((sma, idx) => {
+      var _sma$sectionPermissio;
       const SettingsContextProvider = _ref => {
+        var _sma$intlKey, _sma$refdataEndpoint, _sma$settingEndpoint, _sma$templateEndpoint;
         let {
           children
         } = _ref;
         const intlKey = (0, _hooks.useIntlKey)(passedIntlKey, passedIntlNS);
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_contexts.SettingsContext.Provider, {
           value: {
-            intlKey: sma.intlKey ?? intlKey,
+            intlKey: (_sma$intlKey = sma.intlKey) !== null && _sma$intlKey !== void 0 ? _sma$intlKey : intlKey,
             // This is only here for backwards compatibility... is now grabbed from useIntlKey instead of what's passed in directly
-            refdataEndpoint: sma.refdataEndpoint ?? refdataEndpoint,
-            settingEndpoint: sma.settingEndpoint ?? settingEndpoint,
-            templateEndpoint: sma.templateEndpoint ?? templateEndpoint
+            refdataEndpoint: (_sma$refdataEndpoint = sma.refdataEndpoint) !== null && _sma$refdataEndpoint !== void 0 ? _sma$refdataEndpoint : refdataEndpoint,
+            settingEndpoint: (_sma$settingEndpoint = sma.settingEndpoint) !== null && _sma$settingEndpoint !== void 0 ? _sma$settingEndpoint : settingEndpoint,
+            templateEndpoint: (_sma$templateEndpoint = sma.templateEndpoint) !== null && _sma$templateEndpoint !== void 0 ? _sma$templateEndpoint : templateEndpoint
           },
           children: children
         });
@@ -161,27 +165,24 @@ const useSettings = function () {
       SettingsContextProvider.propTypes = {
         children: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node])
       };
-      const finalPermission = sma.sectionPermission ?? sectionPermission;
+      const finalPermission = (_sma$sectionPermissio = sma.sectionPermission) !== null && _sma$sectionPermissio !== void 0 ? _sma$sectionPermissio : sectionPermission;
       if (!finalPermission || stripes.hasPerm(finalPermission)) {
+        var _ref2, _sma$pages, _sma$persistentPages;
         const dynamicPagesFromQueryReturn = getDynamicPages(queryReturnArray[idx], sma);
-        const finalPages = sma.pages ?? pages ?? (sma.persistentPages ?? persistentPages).concat(dynamicPagesFromQueryReturn.dynamic).sort(_utils.sortByLabel).map(p => {
-          return {
-            ...p,
+        const finalPages = (_ref2 = (_sma$pages = sma.pages) !== null && _sma$pages !== void 0 ? _sma$pages : pages) !== null && _ref2 !== void 0 ? _ref2 : ((_sma$persistentPages = sma.persistentPages) !== null && _sma$persistentPages !== void 0 ? _sma$persistentPages : persistentPages).concat(dynamicPagesFromQueryReturn.dynamic).sort(_utils.sortByLabel).map(p => {
+          return _objectSpread(_objectSpread({}, p), {}, {
             component: pCProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(SettingsContextProvider, {
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(p.component, {
-                ...pCProps
-              })
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(p.component, _objectSpread({}, pCProps))
             })
-          };
+          });
         });
-        return {
-          ...sma,
-          SettingsContextProvider,
-          ...dynamicPagesFromQueryReturn,
+        return _objectSpread(_objectSpread(_objectSpread({}, sma), {}, {
+          SettingsContextProvider
+        }, dynamicPagesFromQueryReturn), {}, {
           pageList: finalPages,
           // DEPRECATED Here for backwards compatibility
           pages: finalPages // ASSUMPTION MADE THAT INDICES REMAIN THE SAME
-        };
+        });
       }
       return null;
     }).filter(Boolean);
@@ -189,7 +190,7 @@ const useSettings = function () {
   const pageList = (0, _react.useMemo)(() => {
     let finalPages = null;
     if (finalSections && finalSections.length === 1 && !renderSingleSection) {
-      finalPages = pages ?? finalSections[0].pages;
+      finalPages = pages !== null && pages !== void 0 ? pages : finalSections[0].pages;
     }
     return finalPages;
   }, [finalSections, pages, renderSingleSection]);
@@ -200,14 +201,13 @@ const useSettings = function () {
     return null;
   }, [finalSections, renderSingleSection]);
   const SettingsComponent = props => {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.Settings, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.Settings, _objectSpread({
       pages: pageList,
       paneTitle: kintIntl.formatKintMessage({
         id: 'meta.title'
       }),
-      sections: passedSections,
-      ...props
-    });
+      sections: passedSections
+    }, props));
   };
   return {
     isLoading,
@@ -215,10 +215,10 @@ const useSettings = function () {
     sections: finalSections,
     SettingsComponent,
     // This doesn't make much sense if there is more than one section, here to avoid breaking changes
-    SettingsContextProvider: finalSections && finalSections.length === 1 ? finalSections[0].SettingsContextProvider : _ref2 => {
+    SettingsContextProvider: finalSections && finalSections.length === 1 ? finalSections[0].SettingsContextProvider : _ref3 => {
       let {
         children
-      } = _ref2;
+      } = _ref3;
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [" ", children, " "]
       });