@k-int/stripes-kint-components 5.29.0 → 5.30.0

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

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _StaticSettingsFieldComponent.default;
+  }
+});
+var _StaticSettingsFieldComponent = _interopRequireDefault(require("./StaticSettingsFieldComponent"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

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

@@ -3,11 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "default", {
+Object.defineProperty(exports, "StaticSettingsField", {
   enumerable: true,
   get: function () {
     return _StaticSettingsField.default;
   }
 });
+Object.defineProperty(exports, "StaticSettingsFieldComponent", {
+  enumerable: true,
+  get: function () {
+    return _StaticSettingsFieldComponent.default;
+  }
+});
 var _StaticSettingsField = _interopRequireDefault(require("./StaticSettingsField"));
+var _StaticSettingsFieldComponent = _interopRequireDefault(require("./StaticSettingsFieldComponent"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/es/lib/Settings/constants/queryKeys.js

@@ -5,7 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GET_SETTING_SECTION_QUERY_KEY = exports.GET_SETTING_SECTION_MUTATE_KEY = exports.BASE_APP_SETTING_QUERY_KEY = exports.BASE_APP_SETTING_MUTATE_KEY = void 0;
 const BASE_APP_SETTING_QUERY_KEY = exports.BASE_APP_SETTING_QUERY_KEY = ['stripes-kint-components', 'useSetting', 'appSettings'];
-const GET_SETTING_SECTION_QUERY_KEY = (queryParams, sectionName) => [...BASE_APP_SETTING_QUERY_KEY, sectionName, queryParams];
+const GET_SETTING_SECTION_QUERY_KEY = (queryParams, sectionName) => {
+  const queryNamespace = [...BASE_APP_SETTING_QUERY_KEY];
+  if (sectionName) {
+    queryNamespace.push(sectionName);
+  }
+  if (queryParams) {
+    queryNamespace.push(queryParams);
+  }
+  return [...BASE_APP_SETTING_QUERY_KEY, sectionName, queryParams];
+};
 exports.GET_SETTING_SECTION_QUERY_KEY = GET_SETTING_SECTION_QUERY_KEY;
 const BASE_APP_SETTING_MUTATE_KEY = exports.BASE_APP_SETTING_MUTATE_KEY = ['stripes-kint-components', 'useSetting', 'putSetting'];
 const GET_SETTING_SECTION_MUTATE_KEY = sectionName => [...BASE_APP_SETTING_MUTATE_KEY, sectionName];

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.".concat(setting.section, ".").concat((0, _utils.toCamelCase)(setting.key)),
+            id: `settings.${setting.section}.${(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.".concat(type),
+            id: `settings.update.${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 !== null && value !== void 0 ? value : defValue;
+      const valueToParse = value ?? defValue;
       let parsedValue;
       if (settingType === 'Boolean') {
         parsedValue = valueToParse === 'true';

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

@@ -9,11 +9,6 @@ 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
@@ -59,9 +54,10 @@ const useStaticSettingsSection = _ref => {
       const originalValue = initialValues[setting.key];
       const formValue = values[setting.key];
       if (formValue !== originalValue) {
-        updates.push(_objectSpread(_objectSpread({}, setting), {}, {
+        updates.push({
+          ...setting,
           value: formValue.toString()
-        }));
+        });
       }
     });
     if (updates.length > 0) {

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

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

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

@@ -8,10 +8,6 @@ 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,
@@ -25,6 +21,7 @@ const useSettingSection = _ref => {
     getMutateNamespaceGenerator = () => (0, _constants.GET_SETTING_SECTION_MUTATE_KEY)(sectionName)
   } = _ref;
   const ky = (0, _core.useOkapiKy)();
+  const queryClient = (0, _reactQuery.useQueryClient)();
   const queryParams = (0, _utils.generateKiwtQueryParams)({
     filters: [{
       path: 'section',
@@ -36,20 +33,23 @@ const useSettingSection = _ref => {
     perPage: 100,
     stats: false
   }, {});
-  const _useQuery = (0, _reactQuery.useQuery)(getQueryNamespaceGenerator({
+  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({
       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 res;
+  }));
   return {
     handleSubmit: putSetting,
     settings,

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

@@ -15,11 +15,7 @@ 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); } // TODO work underway to make the settings hook more useful when trying to render multiple sections at a time
+// 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 {
@@ -52,13 +48,11 @@ 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 => {
-      var _sectionProps$dynamic, _sectionProps$setting;
-      const dqp = (_sectionProps$dynamic = sectionProps.dynamicPageExclusions) !== null && _sectionProps$dynamic !== void 0 ? _sectionProps$dynamic : dynamicPageExclusions;
+      const dqp = sectionProps.dynamicPageExclusions ?? dynamicPageExclusions;
       const queryParams = (0, _utils.generateKiwtQueryParams)({
-        filters: dqp === null || dqp === void 0 ? void 0 : dqp.map(dpe => ({
+        filters: dqp?.map(dpe => ({
           path: 'section',
           comparator: '!=',
           value: dpe
@@ -66,68 +60,72 @@ const useSettings = function () {
         perPage: 100,
         stats: false
       }, {});
-      const finalSettingEndpoint = (_sectionProps$setting = sectionProps.settingEndpoint) !== null && _sectionProps$setting !== void 0 ? _sectionProps$setting : settingEndpoint;
+      const finalSettingEndpoint = sectionProps.settingEndpoint ?? settingEndpoint;
       const queryKey = ['stripes-kint-components', 'useSettings', 'appSettings', finalSettingEndpoint, queryParams];
-      const queryFn = () => ky("".concat(finalSettingEndpoint, "?").concat(queryParams === null || queryParams === void 0 ? void 0 : queryParams.join('&'))).json();
+      const queryFn = () => ky(`${finalSettingEndpoint}?${queryParams?.join('&')}`).json();
       return {
         queryParams,
         queryKey,
         queryFn
       };
     };
-    if (((_sections$length = sections === null || sections === void 0 ? void 0 : sections.length) !== null && _sections$length !== void 0 ? _sections$length : 0) > 0) {
+    if ((sections?.length ?? 0) > 0) {
       array.push(...sections.map(section => {
         const querySectionProps = getSectionQueryProps(section);
-        return _objectSpread(_objectSpread(_objectSpread({}, settingsProps), querySectionProps), section);
+        return {
+          ...settingsProps,
+          // ensure these fall through to section based props
+          ...querySectionProps,
+          ...section // return original section object
+        };
       }));
     } else {
       const querySectionProps = getSectionQueryProps(settingsProps);
-      array.push(_objectSpread(_objectSpread({}, settingsProps), querySectionProps));
+      array.push({
+        ...settingsProps,
+        ...querySectionProps
+      });
     }
     return array;
   }, [dynamicPageExclusions, ky, sections, settingEndpoint, settingsProps]);
-  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 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 queryReturnArray = (0, _reactQuery.useQueries)(queries);
   const [isLoading, setIsLoading] = (0, _react.useState)(true);
   const getDynamicPages = (0, _react.useCallback)((qra, sma) => {
-    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 pagesFromQueryReturn = [...new Set(qra.data?.map(s => s.section))];
     const dynamic = pagesFromQueryReturn.map(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;
+      const finalRender = sma.render ?? render;
+      const finalSectionRoute = sma.sectionRoute ?? sectionRoute;
+      const pageRoute = (finalSectionRoute ? `${finalSectionRoute}/` : '') + page;
       return {
         route: pageRoute,
         label: kintIntl.formatKintMessage({
-          id: "settings.settingsSection.".concat((0, _utils.toCamelCase)(page)),
+          id: `settings.settingsSection.${(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, _objectSpread({
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SettingPage.SettingPage, {
             allowEdit: allowGlobalEdit,
             intlKey: passedIntlKey,
             intlNS: passedIntlNS,
             labelOverrides: labelOverrides,
             render: finalRender,
-            sectionName: page
-          }, props))
+            sectionName: page,
+            ...props
+          })
         })
       };
     });
@@ -144,20 +142,18 @@ 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 = sma.intlKey) !== null && _sma$intlKey !== void 0 ? _sma$intlKey : intlKey,
+            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 = 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
+            refdataEndpoint: sma.refdataEndpoint ?? refdataEndpoint,
+            settingEndpoint: sma.settingEndpoint ?? settingEndpoint,
+            templateEndpoint: sma.templateEndpoint ?? templateEndpoint
           },
           children: children
         });
@@ -165,24 +161,27 @@ const useSettings = function () {
       SettingsContextProvider.propTypes = {
         children: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node])
       };
-      const finalPermission = (_sma$sectionPermissio = sma.sectionPermission) !== null && _sma$sectionPermissio !== void 0 ? _sma$sectionPermissio : sectionPermission;
+      const finalPermission = sma.sectionPermission ?? sectionPermission;
       if (!finalPermission || stripes.hasPerm(finalPermission)) {
-        var _ref2, _sma$pages, _sma$persistentPages;
         const dynamicPagesFromQueryReturn = getDynamicPages(queryReturnArray[idx], sma);
-        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), {}, {
+        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, _objectSpread({}, pCProps))
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(p.component, {
+                ...pCProps
+              })
             })
-          });
+          };
         });
-        return _objectSpread(_objectSpread(_objectSpread({}, sma), {}, {
-          SettingsContextProvider
-        }, dynamicPagesFromQueryReturn), {}, {
+        return {
+          ...sma,
+          SettingsContextProvider,
+          ...dynamicPagesFromQueryReturn,
           pageList: finalPages,
           // DEPRECATED Here for backwards compatibility
           pages: finalPages // ASSUMPTION MADE THAT INDICES REMAIN THE SAME
-        });
+        };
       }
       return null;
     }).filter(Boolean);
@@ -190,7 +189,7 @@ const useSettings = function () {
   const pageList = (0, _react.useMemo)(() => {
     let finalPages = null;
     if (finalSections && finalSections.length === 1 && !renderSingleSection) {
-      finalPages = pages !== null && pages !== void 0 ? pages : finalSections[0].pages;
+      finalPages = pages ?? finalSections[0].pages;
     }
     return finalPages;
   }, [finalSections, pages, renderSingleSection]);
@@ -201,13 +200,14 @@ const useSettings = function () {
     return null;
   }, [finalSections, renderSingleSection]);
   const SettingsComponent = props => {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.Settings, _objectSpread({
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_smartComponents.Settings, {
       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 : _ref3 => {
+    SettingsContextProvider: finalSections && finalSections.length === 1 ? finalSections[0].SettingsContextProvider : _ref2 => {
       let {
         children
-      } = _ref3;
+      } = _ref2;
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [" ", children, " "]
       });

package/es/lib/Settings/index.js

@@ -11,6 +11,7 @@ var _exportNames = {
   EditableRefdataList: true,
   EditableRefdataCategoryList: true,
   StaticSettingsField: true,
+  StaticSettingsFieldComponent: true,
   SettingsContext: true
 };
 Object.defineProperty(exports, "EditableRefdataCategoryList", {
@@ -58,7 +59,13 @@ Object.defineProperty(exports, "SettingsFormContainer", {
 Object.defineProperty(exports, "StaticSettingsField", {
   enumerable: true,
   get: function () {
-    return _StaticSettingsField.default;
+    return _StaticSettingsField.StaticSettingsField;
+  }
+});
+Object.defineProperty(exports, "StaticSettingsFieldComponent", {
+  enumerable: true,
+  get: function () {
+    return _StaticSettingsField.StaticSettingsFieldComponent;
   }
 });
 var _SettingsFormContainer = _interopRequireDefault(require("./SettingsFormContainer"));
@@ -90,7 +97,7 @@ Object.keys(_EditableSettingsList).forEach(function (key) {
 var _RefdataCategoriesSettings = _interopRequireDefault(require("./RefdataCategoriesSettings"));
 var _EditableRefdataList = _interopRequireDefault(require("./EditableRefdataList"));
 var _EditableRefdataCategoryList = _interopRequireDefault(require("./EditableRefdataCategoryList"));
-var _StaticSettingsField = _interopRequireDefault(require("./StaticSettingsField"));
+var _StaticSettingsField = require("./StaticSettingsField");
 var _contexts = require("./contexts");
 var _constants = require("./constants");
 Object.keys(_constants).forEach(function (key) {

package/es/lib/Tags/Tags.js

@@ -17,7 +17,6 @@ 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
@@ -60,7 +59,7 @@ const Tags = _ref => {
     json: data
   }).then(() => {
     queryClient.invalidateQueries(link);
-    if (invalidateLinks !== null && invalidateLinks !== void 0 && invalidateLinks.length) {
+    if (invalidateLinks?.length) {
       invalidateLinks.forEach(il => queryClient.invalidateQueries(il));
     }
   }));
@@ -85,8 +84,7 @@ const Tags = _ref => {
   // add tag to the list of entity tags
   // istanbul ignore next
   const saveEntityTags = tagsToSave => {
-    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 => ({
+    const tagListMap = (entity?.tags ?? []).map(tag => ({
       'value': tag.value
     }));
     const tagsMap = tagsToSave.map(tag => ({
@@ -102,8 +100,7 @@ const Tags = _ref => {
     saveTags(addTags);
   };
   const onRemove = tag => {
-    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());
+    const tagToDelete = (entity?.tags ?? []).filter(t => t.value.toLowerCase() === tag.toLowerCase());
     putEntity({
       tags: [{
         id: tagToDelete[0].id,
@@ -111,7 +108,7 @@ const Tags = _ref => {
       }]
     });
   };
-  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());
+  const entityTags = (entity?.tags ?? []).map(tag => tag.value.toLowerCase());
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, {
     defaultWidth: "20%",
     dismissible: true,
@@ -121,7 +118,7 @@ const Tags = _ref => {
       id: 'numberOfTags',
       overrideValue: labelOverrides.numberOfTags
     }, {
-      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
+      count: 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 !== null && namespaceArray !== void 0 ? namespaceArray : _tagsConfig.tagNamespaceArray;
+  const nsArray = 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

@@ -3,14 +3,44 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tagsEnabledQueryKey = exports.default = void 0;
+exports.tagsEnabledQueryKey = exports.default = exports.TAGS_ENABLED_QUERY_KEY = exports.TAGS_ENABLED_CONFIG_QUERY_KEY = exports.TAGS_ENABLED_BASE_QUERY_KEY = void 0;
 var _core = require("@folio/stripes/core");
 var _reactQuery = require("react-query");
 var _endpoints = require("../../constants/endpoints");
-const tagsEnabledQueryKey = exports.tagsEnabledQueryKey = [_endpoints.MOD_SETTINGS_ENDPOINT, 'query=(module==TAGS and configName==tags_enabled)', 'stripes-kint-components', 'useTagsEnabled'];
-const useTagsEnabled = () => {
+const TAGS_ENABLED_BASE_QUERY_KEY = exports.TAGS_ENABLED_BASE_QUERY_KEY = ['stripes-kint-components', 'useTagsEnabled'];
+const TAGS_CONFIG_QUERY = 'query=(module==TAGS and configName==tags_enabled)';
+const TAGS_SETTINGS_QUERY = 'query=(scope==ui-tags.tags.manage and key==tags_enabled)';
+const TAGS_ENABLED_CONFIG_QUERY_KEY = exports.TAGS_ENABLED_CONFIG_QUERY_KEY = [...TAGS_ENABLED_BASE_QUERY_KEY, _endpoints.CONFIG_ENDPOINT, TAGS_CONFIG_QUERY];
+const TAGS_ENABLED_QUERY_KEY = exports.TAGS_ENABLED_QUERY_KEY = [...TAGS_ENABLED_BASE_QUERY_KEY, _endpoints.SETTINGS_ENDPOINT, TAGS_SETTINGS_QUERY];
+
+// DEPRECATED This remains for backwards compatibility but may not always be applicable, see useSettings configuration for details.
+const tagsEnabledQueryKey = exports.tagsEnabledQueryKey = TAGS_ENABLED_CONFIG_QUERY_KEY;
+
+/**
+ * useTagsEnabled
+ *
+ * By default uses mod-config, for backwards compatibility.
+ * Pass { useSettings: true } to use mod-settings instead.
+ *
+ * Returns:
+ *   true  if the setting is missing or true
+ *   false if the setting is explicitly false
+ */
+
+const useTagsEnabled = function () {
+  let {
+    useSettings = false
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const ky = (0, _core.useOkapiKy)();
-  const queryObject = (0, _reactQuery.useQuery)(tagsEnabledQueryKey, () => ky.get("".concat(_endpoints.MOD_SETTINGS_ENDPOINT, "?query=(module==TAGS and configName==tags_enabled)")).json());
+  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());
+  if (useSettings) {
+    // 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;
+    return value === undefined || value === null || value;
+  }
   const {
     data: {
       configs: {

package/es/lib/Tags/tagsConfig.js

@@ -7,4 +7,4 @@ exports.tagsPath = exports.tagNamespaceArray = exports.defaultTagsParams = expor
 const tagNamespaceArray = exports.tagNamespaceArray = ['tags', 'stripes-kint-components', 'Tags'];
 const tagsPath = exports.tagsPath = 'tags';
 const defaultTagsParams = exports.defaultTagsParams = ['limit=1000', 'query=cql.allRecords%3D1%20sortby%20label'];
-const defaultTagQuery = exports.defaultTagQuery = "".concat(tagsPath, "?").concat(defaultTagsParams === null || defaultTagsParams === void 0 ? void 0 : defaultTagsParams.join('&'));
+const defaultTagQuery = exports.defaultTagQuery = `${tagsPath}?${defaultTagsParams?.join('&')}`;