@k-int/stripes-kint-components 5.29.1 → 5.31.0

package/es/lib/Settings/EditableRefdataList/EditableRefdataList.js

@@ -15,11 +15,6 @@ var _utils = require("../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const propTypes = {
   afterQueryCalls: _propTypes.default.object,
   allowSpecial: _propTypes.default.bool,
@@ -37,7 +32,6 @@ const propTypes = {
   refdataEndpoint: _propTypes.default.string
 };
 const EditableRefdataList = _ref => {
-  var _deleteModal$refdata2;
   let {
     afterQueryCalls,
     allowSpecial = false,
@@ -92,8 +86,7 @@ const EditableRefdataList = _ref => {
   const sortByLabel = (a, b) => a.label.localeCompare(b.label);
   (0, _react.useEffect)(() => {
     if (!isRefdataLoading) {
-      var _refdata$values$sort, _refdata$values;
-      setContentData((_refdata$values$sort = refdata === null || refdata === void 0 || (_refdata$values = refdata.values) === null || _refdata$values === void 0 ? void 0 : _refdata$values.sort(sortByLabel)) !== null && _refdata$values$sort !== void 0 ? _refdata$values$sort : []);
+      setContentData(refdata?.values?.sort(sortByLabel) ?? []);
     }
   }, [isRefdataLoading, refdata]);
 
@@ -105,41 +98,39 @@ const EditableRefdataList = _ref => {
   } = (0, _hooks.useMutateRefdataValue)({
     afterQueryCalls: {
       delete: json => {
-        var _json$values$sort, _json$values;
-        setContentData((_json$values$sort = json === null || json === void 0 || (_json$values = json.values) === null || _json$values === void 0 ? void 0 : _json$values.sort(sortByLabel)) !== null && _json$values$sort !== void 0 ? _json$values$sort : []);
-        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.delete) {
+        setContentData(json?.values?.sort(sortByLabel) ?? []);
+        if (afterQueryCalls?.delete) {
           afterQueryCalls.delete(json);
         }
       },
       put: json => {
-        var _json$values$sort2, _json$values2;
-        setContentData((_json$values$sort2 = json === null || json === void 0 || (_json$values2 = json.values) === null || _json$values2 === void 0 ? void 0 : _json$values2.sort(sortByLabel)) !== null && _json$values$sort2 !== void 0 ? _json$values$sort2 : []);
-        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.put) {
+        setContentData(json?.values?.sort(sortByLabel) ?? []);
+        if (afterQueryCalls?.put) {
           afterQueryCalls.put(json);
         }
       }
     },
-    catchQueryCalls: _objectSpread({
+    catchQueryCalls: {
       // Default delete behaviour is to fire a callout, either with kint-components default message
       // or one provided in labelOverrides, which is passed the error message and refdata in question
       delete: async err => {
-        var _deleteModal$refdata;
         const errorResp = await (0, _utils.parseErrorResponse)(err.response);
         // console.log('ERRORRESP: %o', errorResp);
         callout.sendCallout({
           message: kintIntl.formatKintMessage({
             id: 'refdata.deleteRefdataValue.errorMessage',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteError
+            overrideValue: labelOverrides?.deleteError
           }, {
-            label: deleteModal === null || deleteModal === void 0 || (_deleteModal$refdata = deleteModal.refdata) === null || _deleteModal$refdata === void 0 ? void 0 : _deleteModal$refdata.label,
-            error: errorResp === null || errorResp === void 0 ? void 0 : errorResp.message
+            label: deleteModal?.refdata?.label,
+            error: errorResp?.message
           }),
           type: 'error'
         });
-      }
-    }, catchQueryCalls),
+      },
+      ...catchQueryCalls // override defaults here
+    },
     endpoint: refdataEndpoint,
-    id: refdata === null || refdata === void 0 ? void 0 : refdata.id,
+    id: refdata?.id,
     queryParams: {
       delete: {
         enabled: !!refdata
@@ -161,24 +152,24 @@ const EditableRefdataList = _ref => {
         name: 'edit',
         label: kintIntl.formatKintMessage({
           id: 'edit',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.edit
+          overrideValue: labelOverrides?.edit
         }),
         icon: 'edit',
         callback: data => editRefdataValue(data),
         ariaLabel: data => kintIntl.formatKintMessage({
           id: 'refdata.editAriaLabel',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.editAriaLabel
+          overrideValue: labelOverrides?.editAriaLabel
         }, {
-          label: data === null || data === void 0 ? void 0 : data.label
+          label: data?.label
         })
       });
     }
-    if (!(refdata !== null && refdata !== void 0 && refdata.internal) && deleteCondition) {
+    if (!refdata?.internal && deleteCondition) {
       actionArray.push({
         name: 'delete',
         label: kintIntl.formatKintMessage({
           id: 'delete',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.delete
+          overrideValue: labelOverrides?.delete
         }),
         icon: 'trash',
         callback: data => setDeleteModal({
@@ -187,9 +178,9 @@ const EditableRefdataList = _ref => {
         }),
         ariaLabel: data => kintIntl.formatKintMessage({
           id: 'refdata.deleteAriaLabel',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteAriaLabel
+          overrideValue: labelOverrides?.deleteAriaLabel
         }, {
-          label: data === null || data === void 0 ? void 0 : data.label
+          label: data?.label
         })
       });
     }
@@ -201,25 +192,25 @@ const EditableRefdataList = _ref => {
       columnMapping: {
         label: kintIntl.formatKintMessage({
           id: 'refdata.label',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.label
+          overrideValue: labelOverrides?.label
         }),
         value: kintIntl.formatKintMessage({
           id: 'refdata.value',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.value
+          overrideValue: labelOverrides?.value
         })
       },
       contentData: contentData,
       creatableFields: {
         value: () => false
       },
-      createCallback: !createCondition || refdata !== null && refdata !== void 0 && refdata.internal ? null : data => {
+      createCallback: !createCondition || refdata?.internal ? null : data => {
         if (allowSpecial) {
           editRefdataValue(data);
         } else {
-          var _selectorSafe;
-          editRefdataValue(_objectSpread(_objectSpread({}, data), {}, {
-            value: (_selectorSafe = (0, _utils.selectorSafe)(data === null || data === void 0 ? void 0 : data.label)) === null || _selectorSafe === void 0 ? void 0 : _selectorSafe.replaceAll('%20', ' ')
-          }));
+          editRefdataValue({
+            ...data,
+            value: (0, _utils.selectorSafe)(data?.label)?.replaceAll('%20', ' ')
+          });
         }
       },
       editableFields: {
@@ -235,31 +226,30 @@ const EditableRefdataList = _ref => {
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.ConfirmationModal, {
       confirmLabel: kintIntl.formatKintMessage({
         id: 'delete',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.delete
+        overrideValue: labelOverrides?.delete
       }),
       heading: kintIntl.formatKintMessage({
         id: 'refdata.deleteRefdataValue',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteRefdataValue
+        overrideValue: labelOverrides?.deleteRefdataValue
       }),
       message: kintIntl.formatKintMessage({
         id: 'refdata.deleteRefdataValue.confirmMessage',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteRefdataValueMessage
+        overrideValue: labelOverrides?.deleteRefdataValueMessage
       }, {
-        name: deleteModal === null || deleteModal === void 0 || (_deleteModal$refdata2 = deleteModal.refdata) === null || _deleteModal$refdata2 === void 0 ? void 0 : _deleteModal$refdata2.label
+        name: deleteModal?.refdata?.label
       }),
       onCancel: () => setDeleteModal({
         visible: false,
         refdata: null
       }),
       onConfirm: () => {
-        var _deleteModal$refdata3;
-        deleteRefdataValue(deleteModal === null || deleteModal === void 0 || (_deleteModal$refdata3 = deleteModal.refdata) === null || _deleteModal$refdata3 === void 0 ? void 0 : _deleteModal$refdata3.id);
+        deleteRefdataValue(deleteModal?.refdata?.id);
         setDeleteModal({
           visible: false,
           refdata: null
         });
       },
-      open: deleteModal === null || deleteModal === void 0 ? void 0 : deleteModal.visible
+      open: deleteModal?.visible
     })]
   });
 };

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

@@ -10,11 +10,6 @@ var _reactFinalForm = require("react-final-form");
 var _SettingField = require("../SettingField");
 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 EditableSettingsListField = _ref => {
   let {
     allowEdit,
@@ -34,19 +29,20 @@ const EditableSettingsListField = _ref => {
   // Set up whether this setting is submitting or not.
   // Submitting in the form level applies to ALL
   const [settingSubmitting, setSettingSubmitting] = (0, _react.useState)(false);
-  const settingData = (0, _react.useMemo)(() => _objectSpread({
-    currentSetting: passedSettingData.settings[index]
-  }, passedSettingData), [index, passedSettingData]);
+  const settingData = (0, _react.useMemo)(() => ({
+    currentSetting: passedSettingData.settings[index],
+    ...passedSettingData
+  }), [index, passedSettingData]);
   const DefaultField = (0, _react.useCallback)(() => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
       allowEdit: allowEdit,
       component: _SettingField.SettingField,
-      "data-testid": "editableSettingsListFieldArray[".concat(index, "]"),
+      "data-testid": `editableSettingsListFieldArray[${index}]`,
       editing: editing,
       intlKey: intlKey,
       intlNS: intlNS,
       labelOverrides: labelOverrides,
-      name: "".concat(setting, ".value"),
+      name: `${setting}.value`,
       onSave: handleSave,
       parse: v => v,
       setEditing: setEditing,
@@ -56,7 +52,7 @@ const EditableSettingsListField = _ref => {
     });
   }, [allowEdit, editing, handleSave, index, intlKey, intlNS, labelOverrides, setting, settingData, settingSubmitting]);
   if (!render || render instanceof Function) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(DefaultField, {}, "".concat(setting, "-default-field"));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(DefaultField, {}, `${setting}-default-field`);
   }
   return render({
     allowEdit,

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

@@ -9,37 +9,30 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _hooks = require("../../../../hooks");
 var _StaticSettingsField = require("../../../StaticSettingsField");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["currentSetting", "intlKey", "intlNS", "labelOverrides", "name"];
 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 EditSettingValue = _ref => {
   let {
-      currentSetting: setting,
-      intlKey: passedIntlKey,
-      intlNS: passedIntlNS,
-      labelOverrides = {},
-      name
-    } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded);
+    currentSetting: setting,
+    intlKey: passedIntlKey,
+    intlNS: passedIntlNS,
+    labelOverrides = {},
+    name,
+    ...props
+  } = _ref;
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   const fieldLabel = (0, _react.useMemo)(() => kintIntl.formatKintMessage({
     id: 'settings.valueFor',
-    overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.valueFor
+    overrideValue: labelOverrides?.valueFor
   }, {
     name: setting.key
-  }), [kintIntl, labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.valueFor, setting.key]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_StaticSettingsField.StaticSettingsFieldComponent, _objectSpread({
+  }), [kintIntl, labelOverrides?.valueFor, setting.key]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_StaticSettingsField.StaticSettingsFieldComponent, {
     "aria-label": fieldLabel,
     autofocus: true,
     name: name,
-    setting: setting
-  }, props), "static-render-function-".concat(name));
+    setting: setting,
+    ...props
+  }, `static-render-function-${name}`);
 };
 EditSettingValue.propTypes = {
   currentSetting: _propTypes.default.shape({

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

@@ -16,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,
@@ -55,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?
     }
   });
@@ -63,7 +58,7 @@ 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 = (0, _react.useCallback)(helpTextId => {
@@ -112,10 +107,9 @@ const SettingField = settingFieldProps => {
       id: 'edit'
     });
     if (allowEdit) {
-      var _values$settings;
       // 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 = values.settings) === null || _values$settings === void 0 ? void 0 : _values$settings.find(s => s.id === currentSetting.id);
+      const settingToSave = values.settings?.find(s => s.id === currentSetting.id);
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Button, {
         disabled: editing && (submitting || invalid),
         marginBottom0: true,
@@ -145,10 +139,10 @@ const SettingField = settingFieldProps => {
       return _EditSettingValue.default;
     }
   }, [editing]);
-  const id = (0, _react.useMemo)(() => "settings.".concat((0, _utils.toCamelCase)(currentSetting.section), ".").concat((0, _utils.toCamelCase)(currentSetting.key), ".help"), [currentSetting.key, currentSetting.section]);
+  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'
     });
@@ -162,16 +156,17 @@ const SettingField = settingFieldProps => {
     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), "setting-render-function-".concat(name))
-  }, "setting-edit-card-".concat(name));
+      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

@@ -64,16 +64,16 @@ describe('SettingField', () => {
         })
       }));
     });
-    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/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