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

package/es/lib/Settings/EditableSettingsList/SettingField/RenderSettingValue/RenderSettingValue.js

@@ -20,23 +20,21 @@ const RenderSettingValue = props => {
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   const NoCurrentValue = kintIntl.formatKintMessage({
     id: 'settings.noCurrentValue',
-    overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.noCurrentValue
+    overrideValue: labelOverrides?.noCurrentValue
   });
-  const defaultText = "[".concat(kintIntl.formatKintMessage({
+  const defaultText = `[${kintIntl.formatKintMessage({
     id: 'settings.default',
-    overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.default
-  }), "]");
+    overrideValue: labelOverrides?.default
+  })}]`;
   switch (setting.settingType) {
     case 'Refdata':
       {
         if (setting.value) {
-          var _refdata$filter$0$lab, _refdata$filter$;
-          return (_refdata$filter$0$lab = refdata === null || refdata === void 0 || (_refdata$filter$ = refdata.filter(obj => obj.value === setting.value)[0]) === null || _refdata$filter$ === void 0 ? void 0 : _refdata$filter$.label) !== null && _refdata$filter$0$lab !== void 0 ? _refdata$filter$0$lab : null;
+          return refdata?.filter(obj => obj.value === setting.value)[0]?.label ?? null;
         }
         if (setting.defValue) {
-          var _refdata$filter$2;
-          const defValue = refdata === null || refdata === void 0 || (_refdata$filter$2 = refdata.filter(obj => obj.value === setting.defValue)[0]) === null || _refdata$filter$2 === void 0 ? void 0 : _refdata$filter$2.label;
-          return "".concat(defaultText, " ").concat(defValue);
+          const defValue = refdata?.filter(obj => obj.value === setting.defValue)[0]?.label;
+          return `${defaultText} ${defValue}`;
         }
         return NoCurrentValue;
       }
@@ -46,7 +44,7 @@ const RenderSettingValue = props => {
           return '********';
         }
         if (setting.defValue) {
-          return "".concat(defaultText, " ********");
+          return `${defaultText} ********`;
         }
         return NoCurrentValue;
       }
@@ -56,7 +54,7 @@ const RenderSettingValue = props => {
           const settingId = setting.value || setting.defValue;
           return obj.id === settingId;
         })[0];
-        return (templateValue === null || templateValue === void 0 ? void 0 : templateValue.name) || NoCurrentValue;
+        return templateValue?.name || NoCurrentValue;
       }
     default:
       {
@@ -64,7 +62,7 @@ const RenderSettingValue = props => {
           return setting.value;
         }
         if (setting.defValue) {
-          return "".concat(defaultText, " ").concat(setting.defValue);
+          return `${defaultText} ${setting.defValue}`;
         }
         return NoCurrentValue;
       }

package/es/lib/Settings/EditableSettingsList/SettingField/SettingField.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _reactFinalForm = require("react-final-form");
 var _components = require("@folio/stripes/components");
 var _EditSettingValue = _interopRequireDefault(require("./EditSettingValue"));
 var _RenderSettingValue = _interopRequireDefault(require("./RenderSettingValue"));
@@ -15,11 +16,6 @@ var _utils = require("../../../utils");
 var _renderHelpText = _interopRequireDefault(require("../../../../../styles/renderHelpText.css"));
 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); }
 const SettingField = settingFieldProps => {
   const {
     allowEdit = true,
@@ -27,17 +23,25 @@ const SettingField = settingFieldProps => {
     intlKey: passedIntlKey,
     intlNS: passedIntlNS,
     labelOverrides = {},
+    name,
     onSave,
     setEditing,
     settingData: {
       currentSetting
-    } = {}
+    } = {},
+    setSettingSubmitting,
+    settingSubmitting
   } = settingFieldProps;
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   const {
     refdataEndpoint,
     templateEndpoint
   } = (0, _react.useContext)(_contexts.SettingsContext);
+  const {
+    submitting,
+    invalid,
+    values
+  } = (0, _reactFinalForm.useFormState)();
   const {
     0: {
       values: refdata = []
@@ -46,7 +50,7 @@ const SettingField = settingFieldProps => {
     endpoint: refdataEndpoint,
     desc: currentSetting.vocab,
     queryParams: {
-      enabled: !!(currentSetting !== null && currentSetting !== void 0 && currentSetting.vocab) && currentSetting.settingType === 'Refdata',
+      enabled: !!currentSetting?.vocab && currentSetting.settingType === 'Refdata',
       staleTime: 1000 * 60 * 2 // 2 minutes staletime for refdata in settings?
     }
   });
@@ -54,10 +58,10 @@ const SettingField = settingFieldProps => {
     context: currentSetting.vocab,
     endpoint: templateEndpoint,
     queryParams: {
-      enabled: !!(currentSetting !== null && currentSetting !== void 0 && currentSetting.vocab) && currentSetting.settingType === 'Template'
+      enabled: !!currentSetting?.vocab && currentSetting.settingType === 'Template'
     }
   });
-  const renderHelpText = helpTextId => {
+  const renderHelpText = (0, _react.useCallback)(helpTextId => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: _renderHelpText.default.help,
       children: kintIntl.formatKintMessage({
@@ -95,35 +99,50 @@ const SettingField = settingFieldProps => {
         })
       })
     });
-  };
-  const renderEditButton = () => {
+  }, [kintIntl]);
+  const renderEditButton = (0, _react.useCallback)(() => {
     const EditText = editing ? kintIntl.formatKintMessage({
       id: 'save'
     }) : kintIntl.formatKintMessage({
       id: 'edit'
     });
     if (allowEdit) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+      // This is unbelievably gross... this stems from this all being in a single FieldArray.
+      // We should aim to set this up in an ActionList as soon as possible
+      const settingToSave = values.settings?.find(s => s.id === currentSetting.id);
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Button, {
+        disabled: editing && (submitting || invalid),
         marginBottom0: true,
         onClick: e => {
           e.preventDefault();
-          return editing ? onSave().then(() => setEditing(false)) : setEditing(true);
+          if (editing) {
+            setSettingSubmitting(true);
+            // We want to track that JUST this setting is being edited,
+            // since "Submitting" is relevant for any and all submits
+            // I hate this
+            return onSave(settingToSave).then(() => {
+              setEditing(false);
+              setSettingSubmitting(false);
+            });
+          }
+          return setEditing(true);
         },
-        children: EditText
+        children: [submitting && settingSubmitting ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {}) : null, EditText]
       });
     }
     return null;
-  };
-  let RenderFunction;
-  if (editing === false) {
-    RenderFunction = _RenderSettingValue.default;
-  } else {
-    RenderFunction = _EditSettingValue.default;
-  }
-  const id = "settings.".concat((0, _utils.toCamelCase)(currentSetting.section), ".").concat((0, _utils.toCamelCase)(currentSetting.key), ".help");
-  const renderHeaderStart = () => {
+  }, [allowEdit, currentSetting.id, editing, invalid, kintIntl, onSave, setEditing, setSettingSubmitting, settingSubmitting, submitting, values.settings]);
+  const RenderFunction = (0, _react.useMemo)(() => {
+    if (editing === false) {
+      return _RenderSettingValue.default;
+    } else {
+      return _EditSettingValue.default;
+    }
+  }, [editing]);
+  const id = (0, _react.useMemo)(() => `settings.${(0, _utils.toCamelCase)(currentSetting.section)}.${(0, _utils.toCamelCase)(currentSetting.key)}.help`, [currentSetting.key, currentSetting.section]);
+  const renderHeaderStart = (0, _react.useCallback)(() => {
     const settingName = Object.keys(currentSetting).length > 0 ? kintIntl.formatKintMessage({
-      id: "settings.".concat((0, _utils.toCamelCase)(currentSetting.section), ".").concat((0, _utils.toCamelCase)(currentSetting.key))
+      id: `settings.${(0, _utils.toCamelCase)(currentSetting.section)}.${(0, _utils.toCamelCase)(currentSetting.key)}`
     }) : kintIntl.formatKintMessage({
       id: 'loading'
     });
@@ -132,20 +151,22 @@ const SettingField = settingFieldProps => {
         content: renderHelpText(id)
       }), settingName]
     });
-  };
+  }, [currentSetting, id, kintIntl, renderHelpText]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Card, {
     headerEnd: renderEditButton(),
     headerStart: renderHeaderStart(),
     roundedBorder: true,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(RenderFunction, _objectSpread({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(RenderFunction, {
       currentSetting: currentSetting,
+      disabled: submitting,
       intlKey: passedIntlKey,
       intlNS: passedIntlNS,
       labelOverrides: labelOverrides,
       refdata: refdata,
-      templates: templates
-    }, settingFieldProps))
-  });
+      templates: templates,
+      ...settingFieldProps
+    }, `setting-render-function-${name}`)
+  }, `setting-edit-card-${name}`);
 };
 SettingField.propTypes = {
   allowEdit: _propTypes.default.bool,

package/es/lib/Settings/EditableSettingsList/SettingField/SettingField.test.js

@@ -25,6 +25,7 @@ const setting = {
   value: 'diku-shared'
 };
 const setEditing = jest.fn();
+const setSettingSubmitting = jest.fn();
 let renderComponent;
 describe('SettingField', () => {
   describe.each([{
@@ -56,22 +57,23 @@ describe('SettingField', () => {
           name: "test",
           onSave: onSave,
           setEditing: setEditing,
+          setSettingSubmitting: setSettingSubmitting,
           settingData: {
             currentSetting: setting
           }
         })
       }));
     });
-    it("renders ".concat(expectedRender), () => {
+    it(`renders ${expectedRender}`, () => {
       const {
         getByText
       } = renderComponent;
       expect(getByText(expectedRender)).toBeInTheDocument();
     });
-    test("renders the ".concat(expectedButton, " button"), () => {
+    test(`renders the ${expectedButton} button`, () => {
       (0, _stripesErmTesting.Button)('Edit').exists();
     });
-    describe("clicking the ".concat(expectedButton, " button"), () => {
+    describe(`clicking the ${expectedButton} button`, () => {
       beforeEach(async () => {
         await (0, _react2.waitFor)(async () => {
           await (0, _stripesErmTesting.Button)(expectedButton).click();

package/es/lib/Settings/RefdataCategoriesSettings/RefdataCategoriesSettings.js

@@ -13,11 +13,6 @@ var _EditableRefdataList = _interopRequireDefault(require("../EditableRefdataLis
 var _FormattedKintMessage = _interopRequireDefault(require("../../FormattedKintMessage"));
 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); }
 const propTypes = {
   afterQueryCalls: _propTypes.default.object,
   catchQueryCalls: _propTypes.default.object,
@@ -34,7 +29,6 @@ const propTypes = {
   refdataEndpoint: _propTypes.default.string
 };
 const RefdataCategoriesSettings = _ref => {
-  var _refdataCategory$valu;
   let {
     /*
      * Set of extra booleans for controlling access to actions
@@ -64,29 +58,28 @@ const RefdataCategoriesSettings = _ref => {
   };
   const pickListValuesLabel = kintIntl.formatKintMessage({
     id: 'settings.pickListValues',
-    overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.pickListValues
+    overrideValue: labelOverrides?.pickListValues
   });
-  const renderViewPaneHeader = renderProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.PaneHeader, _objectSpread(_objectSpread({}, renderProps), {}, {
+  const renderViewPaneHeader = renderProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.PaneHeader, {
+    ...renderProps,
     dismissible: true,
     onClose: () => setRefdataCategory(),
     paneTitle: kintIntl.formatKintMessage({
       id: 'refdataCategories.config.viewPaneTitle',
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.viewPaneTitle,
-      fallbackMessage: refdataCategory === null || refdataCategory === void 0 ? void 0 : refdataCategory.desc
+      overrideValue: labelOverrides?.viewPaneTitle,
+      fallbackMessage: refdataCategory?.desc
     }, {
-      name: refdataCategory === null || refdataCategory === void 0 ? void 0 : refdataCategory.desc
+      name: refdataCategory?.desc
     })
-  }));
-  const renderLookupPaneHeader = renderProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.PaneHeader, _objectSpread(_objectSpread({}, renderProps), {}, {
+  });
+  const renderLookupPaneHeader = renderProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.PaneHeader, {
+    ...renderProps,
     dismissible: true,
     lastMenu: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.PaneMenu, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
-        disabled: !!(refState !== null && refState !== void 0 && refState.editing) || !displayConditions.create,
+        disabled: !!refState?.editing || !displayConditions.create,
         marginBottom0: true,
-        onClick: () => {
-          var _rdclRef$current;
-          return rdclRef === null || rdclRef === void 0 || (_rdclRef$current = rdclRef.current) === null || _rdclRef$current === void 0 ? void 0 : _rdclRef$current.create();
-        },
+        onClick: () => rdclRef?.current?.create(),
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormattedKintMessage.default, {
           id: "new"
         })
@@ -95,9 +88,9 @@ const RefdataCategoriesSettings = _ref => {
     onClose: onClose,
     paneTitle: kintIntl.formatKintMessage({
       id: 'settings.pickLists',
-      overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.pickLists
+      overrideValue: labelOverrides?.pickLists
     })
-  }));
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, {
       defaultWidth: "fill",
@@ -114,13 +107,13 @@ const RefdataCategoriesSettings = _ref => {
         handleRefdataCategoryClick: handleRefdataCategoryClick,
         hideCreateButton: true,
         onConfirmDelete: id => {
-          if ((refdataCategory === null || refdataCategory === void 0 ? void 0 : refdataCategory.id) === id) {
+          if (refdataCategory?.id === id) {
             setRefdataCategory();
           }
         },
         refdataEndpoint: refdataEndpoint
       })
-    }), (refdataCategory === null || refdataCategory === void 0 ? void 0 : refdataCategory.desc) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Pane, {
+    }), refdataCategory?.desc && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Pane, {
       defaultWidth: "fill",
       id: "settings-refdataCategories-viewPane",
       renderHeader: renderViewPaneHeader,
@@ -130,7 +123,7 @@ const RefdataCategoriesSettings = _ref => {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
             label: kintIntl.formatKintMessage({
               id: 'refdataCategory.refdataCategory',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.refdataCategory
+              overrideValue: labelOverrides?.refdataCategory
             }),
             value: refdataCategory.desc
           })
@@ -139,9 +132,9 @@ const RefdataCategoriesSettings = _ref => {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
             label: kintIntl.formatKintMessage({
               id: 'refdataCategory.noOfValues',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.noOfValues
+              overrideValue: labelOverrides?.noOfValues
             }),
-            value: refdataCategory === null || refdataCategory === void 0 || (_refdataCategory$valu = refdataCategory.values) === null || _refdataCategory$valu === void 0 ? void 0 : _refdataCategory$valu.length
+            value: refdataCategory?.values?.length
           })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_EditableRefdataList.default, {
@@ -149,7 +142,7 @@ const RefdataCategoriesSettings = _ref => {
           put: json => setRefdataCategory(json),
           delete: json => setRefdataCategory(json)
         },
-        desc: refdataCategory === null || refdataCategory === void 0 ? void 0 : refdataCategory.desc,
+        desc: refdataCategory?.desc,
         displayConditions: displayConditions,
         label: pickListValuesLabel,
         refdataEndpoint: refdataEndpoint

package/es/lib/Settings/SettingPage/SettingPage.js

@@ -44,6 +44,9 @@ const SettingPage = _ref => {
     onSave: handleSubmit,
     onSubmit: handleSubmit,
     render: render,
+    settingData: {
+      settings
+    },
     settingSection: sectionName
   });
 };

package/es/lib/Settings/SettingPage/SettingPagePane/SettingPagePane.js

@@ -20,9 +20,9 @@ const SettingPagePane = _ref => {
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, {
     defaultWidth: "fill",
-    id: "settings-".concat(sectionName),
+    id: `settings-${sectionName}`,
     paneTitle: kintIntl.formatKintMessage({
-      id: "settings.settingsSection.".concat((0, _utils.toCamelCase)(sectionName)),
+      id: `settings.settingsSection.${(0, _utils.toCamelCase)(sectionName)}`,
       fallbackMessage: sectionName
     }),
     children: children

package/es/lib/Settings/SettingsFormContainer/SettingsFormContainer.js

@@ -8,33 +8,25 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _core = require("@folio/stripes/core");
 var _hooks = require("../../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["ConfigFormComponent", "configName", "getInitialValues", "intlKey", "intlNS", "labelOverrides", "moduleName", "scope"];
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /*
  * API is similar to ConfigManager
  *
  * DEPRECATED -- As far as I can see this is now unused anyway
  * KInt modules are swapping to AppSettings instead of mod-settings, so no centralised components should be needed
- */
-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 SettingsFormContainer = _ref => {
+ */const SettingsFormContainer = _ref => {
   let {
-      ConfigFormComponent,
-      configName,
-      getInitialValues: passedGetInitialValues,
-      intlKey: passedIntlKey,
-      intlNS: passedIntlNS,
-      labelOverrides = {},
-      moduleName,
-      scope // We don't use this currently but it's here for future reference
-    } = _ref,
-    rest = _objectWithoutProperties(_ref, _excluded);
+    ConfigFormComponent,
+    configName,
+    getInitialValues: passedGetInitialValues,
+    intlKey: passedIntlKey,
+    intlNS: passedIntlNS,
+    labelOverrides = {},
+    moduleName,
+    scope,
+    // We don't use this currently but it's here for future reference
+    ...rest
+  } = _ref;
   // eslint-disable-next-line no-console
   console.warn('SettingsFormContainer is deprecated, as it utilises mod-config');
   const callout = (0, _core.useCallout)();
@@ -62,18 +54,20 @@ const SettingsFormContainer = _ref => {
   } = (0, _hooks.useMutateModConfigEntry)({
     configName,
     moduleName,
-    id: settings === null || settings === void 0 ? void 0 : settings.id
+    id: settings?.id
   });
   const onSubmit = values => {
-    const setting = _objectSpread(_objectSpread({}, settings), {}, {
-      value: JSON.stringify(values)
-    }, moduleName ? {
-      module: moduleName,
-      configName
-    } : {
-      scope,
-      key: configName
-    });
+    const setting = {
+      ...settings,
+      value: JSON.stringify(values),
+      ...(moduleName ? {
+        module: moduleName,
+        configName
+      } : {
+        scope,
+        key: configName
+      })
+    };
     editSettings(setting).then(() => {
       callout.sendCallout({
         message: kintIntl.formatKintMessage({
@@ -81,7 +75,7 @@ const SettingsFormContainer = _ref => {
           id: 'settingSaveSuccess',
           intlKey: passedIntlKey,
           intlNS: passedIntlNS,
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.settingSaveSuccess
+          overrideValue: labelOverrides?.settingSaveSuccess
         }),
         type: 'success'
       });
@@ -101,10 +95,11 @@ const SettingsFormContainer = _ref => {
     style: {
       width: '100%'
     },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ConfigFormComponent, _objectSpread({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ConfigFormComponent, {
       initialValues: getInitialValues(),
-      onSubmit: onSubmit
-    }, rest))
+      onSubmit: onSubmit,
+      ...rest
+    })
   });
 };
 SettingsFormContainer.propTypes = {

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

@@ -6,73 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactFinalForm = require("react-final-form");
-var _components = require("@folio/stripes/components");
-var _RefdataButtons = _interopRequireDefault(require("../../RefdataButtons"));
+var _StaticSettingsFieldComponent = _interopRequireDefault(require("./StaticSettingsFieldComponent"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["refdata", "setting", "templates"]; // This is pretty much EXACTLY equivalent to the EditSettingValue in EditableSettingsList,
-// but slightly tweaked to be more accommodating
 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 StaticSettingsField = _ref => {
-  let {
-      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 = (a, b) => a.label.localeCompare(b.label);
-  const sortedRefdata = refdata === null || refdata === void 0 ? void 0 : refdata.sort(sortByLabel);
-  switch (setting.settingType) {
-    case 'Refdata':
-      // Grab refdata values corresponding to setting
-      // eslint-disable-next-line no-case-declarations
-      let RefdataComponent = _components.Select;
-      if (refdata.length > 0 && refdata.length <= 4) {
-        RefdataComponent = _RefdataButtons.default;
-      }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, _objectSpread({
-        component: RefdataComponent,
-        dataOptions: sortedRefdata
-      }, fieldProps));
-    case 'Password':
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, _objectSpread({
-        component: _components.TextField,
-        parse: v => v // Lets us send an empty string instead of 'undefined'
-        ,
-        type: "password"
-      }, fieldProps));
-    case 'Template':
-      {
-        // Grab template values corresponding to setting
-        // eslint-disable-next-line no-case-declarations
-        const selectTemplateValues = [{
-          value: '',
-          label: ''
-        }, ...templates.map(t => ({
-          value: t.id,
-          label: t.name
-        }))];
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, _objectSpread({
-          component: _components.Select,
-          dataOptions: selectTemplateValues,
-          parse: v => v
-        }, fieldProps));
-      }
-    default:
-      // If in doubt, go with String
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, _objectSpread({
-        component: _components.TextField,
-        parse: v => v // Lets us send an empty string instead of 'undefined'
-      }, fieldProps));
-  }
+// This is pretty much EXACTLY equivalent to the EditSettingValue in EditableSettingsList,
+// but slightly tweaked to be more accommodating
+const StaticSettingsField = props => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
+    component: _StaticSettingsFieldComponent.default,
+    ...props
+  });
 };
 StaticSettingsField.propTypes = {
   setting: _propTypes.default.shape({

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

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = require("react");
+var _components = require("@folio/stripes/components");
+var _RefdataButtons = _interopRequireDefault(require("../../../RefdataButtons"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const StaticSettingsFieldComponent = _ref => {
+  let {
+    refdata,
+    setting = {},
+    templates,
+    ...fieldProps // Anything else will be passed directly onto the <Field> component
+  } = _ref;
+  // 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]);
+  switch (setting.settingType) {
+    case 'Refdata':
+      // Grab refdata values corresponding to setting
+      // eslint-disable-next-line no-case-declarations
+      let RefdataComponent = _components.Select;
+      if (refdata.length > 0 && refdata.length <= 4) {
+        RefdataComponent = _RefdataButtons.default;
+      }
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(RefdataComponent, {
+        ...fieldProps,
+        dataOptions: sortedRefdata
+      });
+    case 'Password':
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, {
+        ...fieldProps,
+        type: "password"
+      });
+    case 'Template':
+      // Grab template values corresponding to setting
+      // eslint-disable-next-line no-case-declarations
+      const selectTemplateValues = [{
+        value: '',
+        label: ''
+      }, ...templates.map(t => ({
+        value: t.id,
+        label: t.name
+      }))];
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select, {
+        ...fieldProps,
+        dataOptions: selectTemplateValues
+      });
+    default:
+      // If in doubt, go with String
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, {
+        ...fieldProps
+      });
+  }
+};
+var _default = exports.default = StaticSettingsFieldComponent;