@k-int/stripes-kint-components 5.31.4 → 5.33.0

package/es/lib/Settings/StaticSettingsField/StaticSettingsFieldComponent/StaticSettingsFieldComponent.js

@@ -8,17 +8,26 @@ var _react = require("react");
 var _components = require("@folio/stripes/components");
 var _RefdataButtons = _interopRequireDefault(require("../../../RefdataButtons"));
 var _jsxRuntime = require("react/jsx-runtime");
+const _excluded = ["refdata", "setting", "templates"];
 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 StaticSettingsFieldComponent = _ref => {
   let {
-    refdata,
-    setting = {},
-    templates,
-    ...fieldProps // Anything else will be passed directly onto the <Field> component
-  } = _ref;
+      refdata,
+      setting = {},
+      templates
+      // Anything else will be passed directly onto the <Field> component
+    } = _ref,
+    fieldProps = _objectWithoutProperties(_ref, _excluded);
   // Adding default sort to refdata object in ascending order by label
   const sortByLabel = (0, _react.useCallback)((a, b) => a.label.localeCompare(b.label), []);
-  const sortedRefdata = (0, _react.useMemo)(() => refdata?.sort(sortByLabel), [refdata, sortByLabel]);
+  const sortedRefdata = (0, _react.useMemo)(() => refdata === null || refdata === void 0 ? void 0 : refdata.sort(sortByLabel), [refdata, sortByLabel]);
   switch (setting.settingType) {
     case 'Refdata':
       // Grab refdata values corresponding to setting
@@ -27,15 +36,13 @@ const StaticSettingsFieldComponent = _ref => {
       if (refdata.length > 0 && refdata.length <= 4) {
         RefdataComponent = _RefdataButtons.default;
       }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(RefdataComponent, {
-        ...fieldProps,
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(RefdataComponent, _objectSpread(_objectSpread({}, fieldProps), {}, {
         dataOptions: sortedRefdata
-      });
+      }));
     case 'Password':
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, {
-        ...fieldProps,
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, _objectSpread(_objectSpread({}, fieldProps), {}, {
         type: "password"
-      });
+      }));
     case 'Template':
       // Grab template values corresponding to setting
       // eslint-disable-next-line no-case-declarations
@@ -46,15 +53,12 @@ const StaticSettingsFieldComponent = _ref => {
         value: t.id,
         label: t.name
       }))];
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select, {
-        ...fieldProps,
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select, _objectSpread(_objectSpread({}, fieldProps), {}, {
         dataOptions: selectTemplateValues
-      });
+      }));
     default:
       // If in doubt, go with String
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, {
-        ...fieldProps
-      });
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, _objectSpread({}, fieldProps));
   }
 };
 var _default = exports.default = StaticSettingsFieldComponent;

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

@@ -35,13 +35,13 @@ const useSettingCallout = function () {
           // 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

@@ -17,7 +17,7 @@ const useSettingsSectionInitalValues = _ref => {
         value,
         settingType
       } = setting;
-      const valueToParse = value ?? defValue;
+      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,6 +9,11 @@ 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
@@ -54,10 +59,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,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/Settings/hooks/useSettingSection/useSettingSection.js

@@ -8,6 +8,10 @@ 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,
@@ -33,23 +37,25 @@ 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()),
+    {
+      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
+    }).then(async res => {
+      await queryClient.invalidateQueries(getQueryNamespaceGenerator({
+        queryParams
+      }));
+      return res;
+    })),
+    {
+      mutateAsync: putSetting
+    } = _useMutation,
+    settingsMutate = _objectWithoutProperties(_useMutation, _excluded2);
   return {
     handleSubmit: putSetting,
     settings,

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

@@ -8,18 +8,47 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactQuery = require("react-query");
 var _core = require("@folio/stripes/core");
-var _smartComponents = require("@folio/stripes/smart-components");
+var _Settings = _interopRequireDefault(require("../../Settings"));
 var _SettingPage = require("../../SettingPage");
 var _contexts = require("../../contexts");
 var _utils = require("../../../utils");
 var _hooks = require("../../../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 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); } // 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;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_contexts.SettingsContext.Provider, {
+    value: contextValue,
+    children: children
+  });
+};
+InternalSettingsContextProvider.propTypes = {
+  children: _propTypes.default.oneOfType([_propTypes.default.node, _propTypes.default.func]),
+  contextValue: _propTypes.default.object
+};
+
 // 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,
@@ -44,15 +73,18 @@ const useSettings = function () {
   const ky = (0, _core.useOkapiKy)();
   const stripes = (0, _core.useStripes)();
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
+  const intlKey = (0, _hooks.useIntlKey)(passedIntlKey, passedIntlNS);
 
   // 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 +92,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,83 +170,75 @@ const useSettings = function () {
   }, [isLoading, queryReturnArray]);
   const finalSections = (0, _react.useMemo)(() => {
     return sectionMetaArray.map((sma, idx) => {
-      const SettingsContextProvider = _ref => {
-        let {
-          children
-        } = _ref;
-        const intlKey = (0, _hooks.useIntlKey)(passedIntlKey, passedIntlNS);
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_contexts.SettingsContext.Provider, {
-          value: {
-            intlKey: 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
-          },
-          children: children
-        });
-      };
-      SettingsContextProvider.propTypes = {
-        children: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node])
+      var _sma$intlKey, _sma$refdataEndpoint, _sma$settingEndpoint, _sma$templateEndpoint, _sma$sectionPermissio;
+      const contextValue = {
+        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 = 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 => {
-          return {
-            ...p,
-            component: pCProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(SettingsContextProvider, {
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(p.component, {
-                ...pCProps
-              })
-            })
-          };
+        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, _objectSpread({}, cprops))
+            });
+          }
+          return _objectSpread(_objectSpread({}, p), {}, {
+            component,
+            Provider: InternalSettingsContextProvider,
+            contextValue
+          });
         });
-        return {
-          ...sma,
-          SettingsContextProvider,
-          ...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);
-  }, [getDynamicPages, pages, passedIntlKey, passedIntlNS, persistentPages, queryReturnArray, refdataEndpoint, sectionMetaArray, sectionPermission, settingEndpoint, stripes, templateEndpoint]);
-  const pageList = (0, _react.useMemo)(() => {
+  }, [contextPerPage, getDynamicPages, intlKey, pages, persistentPages, queryReturnArray, refdataEndpoint, sectionMetaArray, sectionPermission, settingEndpoint, stripes, templateEndpoint]);
+  const outputPages = (0, _react.useMemo)(() => {
     let finalPages = null;
-    if (finalSections && 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]);
-  const passedSections = (0, _react.useMemo)(() => {
+  const outputSections = (0, _react.useMemo)(() => {
     if (finalSections.length > 1 || finalSections.length === 1 && renderSingleSection) {
       return finalSections;
     }
     return null;
   }, [finalSections, renderSingleSection]);
-  const SettingsComponent = props => {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.Settings, {
-      pages: pageList,
+  const SettingsComponent = (0, _react.useCallback)(props => {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Settings.default, _objectSpread({
+      pages: outputPages,
       paneTitle: kintIntl.formatKintMessage({
         id: 'meta.title'
       }),
-      sections: passedSections,
-      ...props
-    });
-  };
+      sections: outputSections
+    }, props));
+  }, [kintIntl, outputPages, outputSections]);
   return {
     isLoading,
-    pageList,
-    sections: finalSections,
+    pageList: outputPages,
+    sections: outputSections,
     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 === null || finalSections === void 0 ? void 0 : finalSections.length) === 1 ? finalSections[0].SettingsContextProvider : _ref3 => {
       let {
         children
-      } = _ref2;
+      } = _ref3;
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [" ", children, " "]
       });

package/es/lib/Settings/index.js

@@ -7,6 +7,7 @@ var _exportNames = {
   SettingsFormContainer: true,
   SettingPage: true,
   SettingPagePane: true,
+  Settings: true,
   RefdataCategoriesSettings: true,
   EditableRefdataList: true,
   EditableRefdataCategoryList: true,
@@ -44,6 +45,12 @@ Object.defineProperty(exports, "SettingPagePane", {
     return _SettingPage.SettingPagePane;
   }
 });
+Object.defineProperty(exports, "Settings", {
+  enumerable: true,
+  get: function () {
+    return _Settings.default;
+  }
+});
 Object.defineProperty(exports, "SettingsContext", {
   enumerable: true,
   get: function () {
@@ -82,6 +89,7 @@ Object.keys(_hooks).forEach(function (key) {
   });
 });
 var _SettingPage = require("./SettingPage");
+var _Settings = _interopRequireDefault(require("./Settings"));
 var _EditableSettingsList = require("./EditableSettingsList");
 Object.keys(_EditableSettingsList).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/es/lib/Tags/Tags.js

@@ -17,6 +17,7 @@ var _hooks2 = require("../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const Tags = _ref => {
+  var _entity$tags3, _entity$tags$length, _entity$tags4;
   let {
     invalidateLinks = [],
     // If there are other queries that need invalidating, pass those here
@@ -59,7 +60,7 @@ const Tags = _ref => {
     json: data
   }).then(() => {
     queryClient.invalidateQueries(link);
-    if (invalidateLinks?.length) {
+    if (invalidateLinks !== null && invalidateLinks !== void 0 && invalidateLinks.length) {
       invalidateLinks.forEach(il => queryClient.invalidateQueries(il));
     }
   }));
@@ -84,7 +85,8 @@ const Tags = _ref => {
   // add tag to the list of entity tags
   // istanbul ignore next
   const saveEntityTags = tagsToSave => {
-    const tagListMap = (entity?.tags ?? []).map(tag => ({
+    var _entity$tags;
+    const tagListMap = ((_entity$tags = entity === null || entity === void 0 ? void 0 : entity.tags) !== null && _entity$tags !== void 0 ? _entity$tags : []).map(tag => ({
       'value': tag.value
     }));
     const tagsMap = tagsToSave.map(tag => ({
@@ -100,7 +102,8 @@ const Tags = _ref => {
     saveTags(addTags);
   };
   const onRemove = tag => {
-    const tagToDelete = (entity?.tags ?? []).filter(t => t.value.toLowerCase() === tag.toLowerCase());
+    var _entity$tags2;
+    const tagToDelete = ((_entity$tags2 = entity === null || entity === void 0 ? void 0 : entity.tags) !== null && _entity$tags2 !== void 0 ? _entity$tags2 : []).filter(t => t.value.toLowerCase() === tag.toLowerCase());
     putEntity({
       tags: [{
         id: tagToDelete[0].id,
@@ -108,7 +111,7 @@ const Tags = _ref => {
       }]
     });
   };
-  const entityTags = (entity?.tags ?? []).map(tag => tag.value.toLowerCase());
+  const entityTags = ((_entity$tags3 = entity === null || entity === void 0 ? void 0 : entity.tags) !== null && _entity$tags3 !== void 0 ? _entity$tags3 : []).map(tag => tag.value.toLowerCase());
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, {
     defaultWidth: "20%",
     dismissible: true,
@@ -118,7 +121,7 @@ const Tags = _ref => {
       id: 'numberOfTags',
       overrideValue: labelOverrides.numberOfTags
     }, {
-      count: entity?.tags?.length ?? 0
+      count: (_entity$tags$length = entity === null || entity === void 0 || (_entity$tags4 = entity.tags) === null || _entity$tags4 === void 0 ? void 0 : _entity$tags4.length) !== null && _entity$tags$length !== void 0 ? _entity$tags$length : 0
     }),
     paneTitle: kintIntl.formatKintMessage({
       id: 'tags',

package/es/lib/Tags/hooks/useTags.js

@@ -9,7 +9,7 @@ var _core = require("@folio/stripes/core");
 var _tagsConfig = require("../tagsConfig");
 const useTags = (namespaceArray, options) => {
   const ky = (0, _core.useOkapiKy)();
-  const nsArray = namespaceArray ?? _tagsConfig.tagNamespaceArray;
+  const nsArray = namespaceArray !== null && namespaceArray !== void 0 ? namespaceArray : _tagsConfig.tagNamespaceArray;
   return (0, _reactQuery.useQuery)(nsArray, () => ky.get(_tagsConfig.defaultTagQuery).json(), options);
 };
 var _default = exports.default = useTags;

package/es/lib/Tags/hooks/useTagsEnabled.js

@@ -35,10 +35,11 @@ const useTagsEnabled = function () {
   const endpoint = useSettings ? _endpoints.SETTINGS_ENDPOINT : _endpoints.CONFIG_ENDPOINT;
   const query = useSettings ? TAGS_SETTINGS_QUERY : TAGS_CONFIG_QUERY;
   const queryKey = useSettings ? TAGS_ENABLED_QUERY_KEY : TAGS_ENABLED_CONFIG_QUERY_KEY;
-  const queryObject = (0, _reactQuery.useQuery)(queryKey, () => ky.get(`${endpoint}?${query}`).json());
+  const queryObject = (0, _reactQuery.useQuery)(queryKey, () => ky.get("".concat(endpoint, "?").concat(query)).json());
   if (useSettings) {
+    var _queryObject$data;
     // mod-settings returns this value as a boolean instead of as a string, so the below approach !value is not applicable.
-    const value = queryObject?.data?.items?.[0]?.value;
+    const value = queryObject === null || queryObject === void 0 || (_queryObject$data = queryObject.data) === null || _queryObject$data === void 0 || (_queryObject$data = _queryObject$data.items) === null || _queryObject$data === void 0 || (_queryObject$data = _queryObject$data[0]) === null || _queryObject$data === void 0 ? void 0 : _queryObject$data.value;
     return value === undefined || value === null || value;
   }
   const {