@k-int/stripes-kint-components 5.36.1 → 5.37.0

package/es/lib/Settings/hooks/staticSettingsPages/useSettingCallout/useSettingCallout.js

@@ -11,37 +11,33 @@ var _utils = require("../../../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 // A hook which can take an array of settings objects and return a
 const useSettingCallout = function () {
-  let {
-    labelOverrides = [],
-    intlKey: passedIntlKey,
-    intlNS: passedIntlNS
-  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  let _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref$labelOverrides = _ref.labelOverrides,
+    labelOverrides = _ref$labelOverrides === void 0 ? [] : _ref$labelOverrides,
+    passedIntlKey = _ref.intlKey,
+    passedIntlNS = _ref.intlNS;
   const callout = (0, _core.useCallout)();
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
-  return (0, _react.useCallback)(_ref => {
-    let {
-      settings,
-      type
-    } = _ref;
+  return (0, _react.useCallback)(_ref2 => {
+    let settings = _ref2.settings,
+      type = _ref2.type;
     callout.sendCallout({
       type,
       timeout: 10000,
       message: /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
-        children: settings.map(_ref2 => {
-          let {
-            setting,
-            error: _error
-          } = _ref2;
+        children: settings.map(_ref3 => {
+          let setting = _ref3.setting,
+            _error = _ref3.error;
           // error will obviously be null for successful updates.
           // We can choose to surface the errors to the user should we wish
           const settingLabel = kintIntl.formatKintMessage({
-            id: `settings.${setting.section}.${(0, _utils.toCamelCase)(setting.key)}`,
+            id: "settings.".concat(setting.section, ".").concat((0, _utils.toCamelCase)(setting.key)),
             // Camelcasing to keep in line with how we translate the dynamic settings
             overrideValue: labelOverrides[setting.key],
             fallbackMessage: setting.key
           });
           const message = kintIntl.formatKintMessage({
-            id: `settings.update.${type}`,
+            id: "settings.update.".concat(type),
             overrideValue: labelOverrides[type],
             fallbackMessage: setting.key
           }, {

package/es/lib/Settings/hooks/staticSettingsPages/useSettingsSectionInitalValues/useSettingsSectionInitalValues.js

@@ -6,18 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 const useSettingsSectionInitalValues = _ref => {
-  let {
-    settings: rawSettings // A settingsSection return of EXACTLY the shape defined in useSettingsSection
-  } = _ref;
+  let rawSettings = _ref.settings;
   const initialValues = (0, _react.useMemo)(() => {
     const settingsKeyValue = rawSettings.map(setting => {
-      const {
-        defValue,
-        key,
-        value,
-        settingType
-      } = setting;
-      const valueToParse = value ?? defValue;
+      const defValue = setting.defValue,
+        key = setting.key,
+        value = setting.value,
+        settingType = setting.settingType;
+      const valueToParse = value !== null && value !== void 0 ? value : defValue;
       let parsedValue;
       if (settingType === 'Boolean') {
         parsedValue = valueToParse === 'true';

package/es/lib/Settings/hooks/staticSettingsPages/useStaticSettingsSection.js

@@ -9,34 +9,35 @@ var _useSettingSection = _interopRequireDefault(require("../useSettingSection"))
 var _useSettingsSectionInitalValues = _interopRequireDefault(require("./useSettingsSectionInitalValues"));
 var _useSettingCallout = _interopRequireDefault(require("./useSettingCallout"));
 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); }
 /**
  * A helper hook which collates several hooks useful in the setup and operation of static setting pages, in which
  * an entire section of AppSetting objects needs to be submitted at once
  */
 const useStaticSettingsSection = _ref => {
-  let {
-    intlKey: passedIntlKey,
-    intlNS: passedIntlNS,
-    onSubmitComplete = () => null,
-    // Callback which runs after all promises have completed
-    onSettingsSuccess = () => null,
-    // Specifically logic to handle a list of successful settings calls
-    onSettingsFailure = () => null,
-    // Specifically logic to handle a list of failed settings calls
-    sectionName,
-    settingEndpoint,
-    getQueryNamespaceGenerator
-  } = _ref;
+  let passedIntlKey = _ref.intlKey,
+    passedIntlNS = _ref.intlNS,
+    _ref$onSubmitComplete = _ref.onSubmitComplete,
+    onSubmitComplete = _ref$onSubmitComplete === void 0 ? () => null : _ref$onSubmitComplete,
+    _ref$onSettingsSucces = _ref.onSettingsSuccess,
+    onSettingsSuccess = _ref$onSettingsSucces === void 0 ? () => null : _ref$onSettingsSucces,
+    _ref$onSettingsFailur = _ref.onSettingsFailure,
+    onSettingsFailure = _ref$onSettingsFailur === void 0 ? () => null : _ref$onSettingsFailur,
+    sectionName = _ref.sectionName,
+    settingEndpoint = _ref.settingEndpoint,
+    getQueryNamespaceGenerator = _ref.getQueryNamespaceGenerator;
   // Following example in agreements for useAgreementsDisplaySettings
   const settingsSection = (0, _useSettingSection.default)({
     sectionName,
     settingEndpoint,
     getQueryNamespaceGenerator
   });
-  const {
-    handleSubmit,
-    settings: rawSettings
-  } = settingsSection;
+  const handleSubmit = settingsSection.handleSubmit,
+    rawSettings = settingsSection.settings;
 
   // We should ONLY change initial values when autoResponderValues updates
   // initialValues should take a KIWT AppSetting object and turn it into key/value for the Form
@@ -54,10 +55,9 @@ const useStaticSettingsSection = _ref => {
       const originalValue = initialValues[setting.key];
       const formValue = values[setting.key];
       if (formValue !== originalValue) {
-        updates.push({
-          ...setting,
+        updates.push(_objectSpread(_objectSpread({}, setting), {}, {
           value: formValue.toString()
-        });
+        }));
       }
     });
     if (updates.length > 0) {

package/es/lib/Settings/hooks/useAppSettings/useAppSettings.js

@@ -8,14 +8,14 @@ var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
 var _utils = require("../../../utils");
 const useAppSettings = _ref => {
-  let {
-    endpoint,
-    keyName,
-    options,
-    returnQueryObject = false,
-    sectionName,
-    queryParams
-  } = _ref;
+  var _ref2, _ref3, _queryObject$data2;
+  let endpoint = _ref.endpoint,
+    keyName = _ref.keyName,
+    options = _ref.options,
+    _ref$returnQueryObjec = _ref.returnQueryObject,
+    returnQueryObject = _ref$returnQueryObjec === void 0 ? false : _ref$returnQueryObjec,
+    sectionName = _ref.sectionName,
+    queryParams = _ref.queryParams;
   const ky = (0, _core.useOkapiKy)();
   const defaultQueryParamObject = {
     perPage: 100,
@@ -23,29 +23,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/Settings/hooks/useSettingSection/useSettingSection.js

@@ -8,18 +8,20 @@ var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
 var _utils = require("../../../utils");
 var _constants = require("../../constants");
+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,
-    settingEndpoint,
-    getQueryNamespaceGenerator = _ref2 => {
-      let {
-        queryParams
-      } = _ref2;
+  let sectionName = _ref.sectionName,
+    settingEndpoint = _ref.settingEndpoint,
+    _ref$getQueryNamespac = _ref.getQueryNamespaceGenerator,
+    getQueryNamespaceGenerator = _ref$getQueryNamespac === void 0 ? _ref2 => {
+      let queryParams = _ref2.queryParams;
       return (0, _constants.GET_SETTING_SECTION_QUERY_KEY)(queryParams, sectionName);
-    },
-    getMutateNamespaceGenerator = () => (0, _constants.GET_SETTING_SECTION_MUTATE_KEY)(sectionName)
-  } = _ref;
+    } : _ref$getQueryNamespac,
+    _ref$getMutateNamespa = _ref.getMutateNamespaceGenerator,
+    getMutateNamespaceGenerator = _ref$getMutateNamespa === void 0 ? () => (0, _constants.GET_SETTING_SECTION_MUTATE_KEY)(sectionName) : _ref$getMutateNamespa;
   const ky = (0, _core.useOkapiKy)();
   const queryClient = (0, _reactQuery.useQueryClient)();
   const queryParams = (0, _utils.generateKiwtQueryParams)({
@@ -33,23 +35,22 @@ 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
-  }).then(async res => {
-    await queryClient.invalidateQueries(getQueryNamespaceGenerator({
+  const _useQuery = (0, _reactQuery.useQuery)(getQueryNamespaceGenerator({
       queryParams
-    }));
-    return res;
-  }));
+    }), () => ky("".concat(settingEndpoint, "?").concat(queryParams === null || queryParams === void 0 ? void 0 : queryParams.join('&'))).json()),
+    _useQuery$data = _useQuery.data,
+    settings = _useQuery$data === void 0 ? [] : _useQuery$data,
+    settingsQuery = _objectWithoutProperties(_useQuery, _excluded);
+  const _useMutation = (0, _reactQuery.useMutation)(getMutateNamespaceGenerator(), data => ky.put("".concat(settingEndpoint).concat(data.id ? '/' + data.id : ''), {
+      json: data
+    }).then(async res => {
+      await queryClient.invalidateQueries(getQueryNamespaceGenerator({
+        queryParams
+      }));
+      return res;
+    })),
+    putSetting = _useMutation.mutateAsync,
+    settingsMutate = _objectWithoutProperties(_useMutation, _excluded2);
   return {
     handleSubmit: putSetting,
     settings,

package/es/lib/Settings/hooks/useSettings/useSettings.js

@@ -15,15 +15,22 @@ var _utils = require("../../../utils");
 var _hooks = require("../../../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// We have swapped from the stripes-smart components settings page to our own internal one.
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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); } // We have swapped from the stripes-smart components settings page to our own internal one.
 // I'd honestly prefer to redo it all but at least this way we're in control
 // import { Settings } from '@folio/stripes/smart-components';
-
 const InternalSettingsContextProvider = _ref => {
-  let {
-    children,
-    contextValue
-  } = _ref;
+  let children = _ref.children,
+    contextValue = _ref.contextValue;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_contexts.SettingsContext.Provider, {
     value: contextValue,
     children: children
@@ -37,36 +44,29 @@ InternalSettingsContextProvider.propTypes = {
 // 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 {
-    allowGlobalEdit = true,
-    // DEPRECATED This prop will eventually be set to FALSE in a breaking change.
-    // This is a LEGACY prop, which ensured each page had context pre-wrapped.
-    // This is NOT required while using Settings component within kint-components
-    // to render dynamic pages, but the dynamic pages break if context is missing with
-    // the stripes smart components model
-    // Turn this OFF if having difficulties with settings page redraws (When using SASQ in particular)
-    contextPerPage = true,
-    dynamicPageExclusions,
-    intlKey: passedIntlKey,
-    intlNS: passedIntlNS,
-    labelOverrides = {},
-    pages,
-    // If this is present, act completely as a passthrough either in sections OR standalone
-    persistentPages = [],
-    preventQueries = false,
-    refdataEndpoint,
-    renderSingleSection = false,
-    // IF SECTIONS == NULL, this prop allows the implementor to render the pageList as a section with label etc
-    sectionPermission,
-    // If we're rendering sections, this prevents the rendering of said section (works as fallback or prevention for single section)
-    sectionRoute,
-    sections,
-    // if present, should be an array of objects with the SAME shape as the overall props here.
-    // If a prop isn't present it can fall back to the "global" prop.
-    settingEndpoint,
-    templateEndpoint,
-    render // Allow setting-by-setting rendering of fields, to allow for special treatment for a given setting key etc
-  } = settingsProps;
+  const _settingsProps$allowG = settingsProps.allowGlobalEdit,
+    allowGlobalEdit = _settingsProps$allowG === void 0 ? true : _settingsProps$allowG,
+    _settingsProps$contex = settingsProps.contextPerPage,
+    contextPerPage = _settingsProps$contex === void 0 ? true : _settingsProps$contex,
+    dynamicPageExclusions = settingsProps.dynamicPageExclusions,
+    passedIntlKey = settingsProps.intlKey,
+    passedIntlNS = settingsProps.intlNS,
+    _settingsProps$labelO = settingsProps.labelOverrides,
+    labelOverrides = _settingsProps$labelO === void 0 ? {} : _settingsProps$labelO,
+    pages = settingsProps.pages,
+    _settingsProps$persis = settingsProps.persistentPages,
+    persistentPages = _settingsProps$persis === void 0 ? [] : _settingsProps$persis,
+    _settingsProps$preven = settingsProps.preventQueries,
+    preventQueries = _settingsProps$preven === void 0 ? false : _settingsProps$preven,
+    refdataEndpoint = settingsProps.refdataEndpoint,
+    _settingsProps$render = settingsProps.renderSingleSection,
+    renderSingleSection = _settingsProps$render === void 0 ? false : _settingsProps$render,
+    sectionPermission = settingsProps.sectionPermission,
+    sectionRoute = settingsProps.sectionRoute,
+    sections = settingsProps.sections,
+    settingEndpoint = settingsProps.settingEndpoint,
+    templateEndpoint = settingsProps.templateEndpoint,
+    render = settingsProps.render;
   const ky = (0, _core.useOkapiKy)();
   const stripes = (0, _core.useStripes)();
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
@@ -75,11 +75,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
@@ -87,72 +89,71 @@ 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 _useState = (0, _react.useState)(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    isLoading = _useState2[0],
+    setIsLoading = _useState2[1];
   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))
         })
       };
     });
@@ -169,49 +170,47 @@ const useSettings = function () {
   }, [isLoading, queryReturnArray]);
   const finalSections = (0, _react.useMemo)(() => {
     return sectionMetaArray.map((sma, idx) => {
+      var _sma$intlKey, _sma$refdataEndpoint, _sma$settingEndpoint, _sma$templateEndpoint, _sma$sectionPermissio;
       const contextValue = {
-        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
       };
-      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 => {
+        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 => {
           let component = p.component;
           if (contextPerPage) {
             component = cprops => /*#__PURE__*/(0, _jsxRuntime.jsx)(InternalSettingsContextProvider, {
               contextValue: contextValue,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(p.component, {
-                ...cprops
-              })
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(p.component, _objectSpread({}, cprops))
             });
           }
-          return {
-            ...p,
+          return _objectSpread(_objectSpread({}, p), {}, {
             component,
             Provider: InternalSettingsContextProvider,
             contextValue
-          };
+          });
         });
-        return {
-          ...sma,
-          SettingsContextProvider: InternalSettingsContextProvider,
-          ...dynamicPagesFromQueryReturn,
+        return _objectSpread(_objectSpread(_objectSpread({}, sma), {}, {
+          SettingsContextProvider: InternalSettingsContextProvider
+        }, dynamicPagesFromQueryReturn), {}, {
           pageList: finalPages,
           // DEPRECATED Here for backwards compatibility
           pages: finalPages // ASSUMPTION MADE THAT INDICES REMAIN THE SAME
-        };
+        });
       }
       return null;
     }).filter(Boolean);
   }, [contextPerPage, getDynamicPages, intlKey, pages, persistentPages, queryReturnArray, refdataEndpoint, sectionMetaArray, sectionPermission, settingEndpoint, stripes, templateEndpoint]);
   const outputPages = (0, _react.useMemo)(() => {
     let finalPages = null;
-    if (finalSections?.length === 1 && !renderSingleSection) {
-      finalPages = pages ?? finalSections[0].pages;
+    if ((finalSections === null || finalSections === void 0 ? void 0 : finalSections.length) === 1 && !renderSingleSection) {
+      finalPages = pages !== null && pages !== void 0 ? pages : finalSections[0].pages;
     }
     return finalPages;
   }, [finalSections, pages, renderSingleSection]);
@@ -222,14 +221,13 @@ const useSettings = function () {
     return null;
   }, [finalSections, renderSingleSection]);
   const SettingsComponent = (0, _react.useCallback)(props => {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Settings.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Settings.default, _objectSpread({
       pages: outputPages,
       paneTitle: kintIntl.formatKintMessage({
         id: 'meta.title'
       }),
-      sections: outputSections,
-      ...props
-    });
+      sections: outputSections
+    }, props));
   }, [kintIntl, outputPages, outputSections]);
   return {
     isLoading,
@@ -237,10 +235,8 @@ const useSettings = function () {
     sections: outputSections,
     SettingsComponent,
     // This doesn't make much sense if there is more than one section, here to avoid breaking changes
-    SettingsContextProvider: finalSections?.length === 1 ? finalSections[0].SettingsContextProvider : _ref2 => {
-      let {
-        children
-      } = _ref2;
+    SettingsContextProvider: (finalSections === null || finalSections === void 0 ? void 0 : finalSections.length) === 1 ? finalSections[0].SettingsContextProvider : _ref3 => {
+      let children = _ref3.children;
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [" ", children, " "]
       });