@k-int/stripes-kint-components 5.32.0 → 5.33.1

package/es/lib/SearchField/SearchField.js

@@ -9,15 +9,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _components = require("@folio/stripes/components");
 var _SearchField = _interopRequireDefault(require("../../../styles/SearchField.css"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["ariaLabel"]; // Accepts the same props as TextField
 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; }
+// Accepts the same props as TextField
 const propTypes = {
   ariaLabel: _propTypes.default.string,
   clearSearchId: _propTypes.default.string,
@@ -26,22 +19,23 @@ const propTypes = {
 };
 const SearchField = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
   const {
-      ariaLabel
-    } = props,
-    rest = _objectWithoutProperties(props, _excluded);
+    ariaLabel,
+    ...rest
+  } = props;
   const searchIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Icon, {
     icon: "search",
     iconClassName: _SearchField.default.searchIcon,
     size: "small"
   });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, _objectSpread(_objectSpread({}, rest), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextField, {
+    ...rest,
     "aria-label": rest['aria-label'] || ariaLabel,
     focussedclass: _SearchField.default.isFocused,
     hasClearIcon: true,
     inputRef: ref,
     startControl: searchIcon,
     type: "search"
-  }));
+  });
 });
 SearchField.propTypes = propTypes;
 var _default = exports.default = SearchField;

package/es/lib/SearchKeyControl/SearchKeyControl.js

@@ -21,19 +21,15 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   } = _ref;
   // This component expects a qIndex comprising of a comma separated list
   const [qIndex, setQIndex] = (0, _hooks.useQIndex)();
-  const qIndexArray = (0, _react.useMemo)(() => {
-    var _qIndex$split$map, _qIndex$split;
-    return (_qIndex$split$map = qIndex === null || qIndex === void 0 || (_qIndex$split = qIndex.split(',')) === null || _qIndex$split === void 0 ? void 0 : _qIndex$split.map(index => index.trim())) !== null && _qIndex$split$map !== void 0 ? _qIndex$split$map : [];
-  }, [qIndex]);
+  const qIndexArray = (0, _react.useMemo)(() => qIndex?.split(',')?.map(index => index.trim()) ?? [], [qIndex]);
 
   // Memoise this process so keyState changes if and only if options/qIndex change
   const createKeyState = (0, _react.useCallback)(() => options.reduce((acc, curr) => {
-    var _curr$indexes$length, _curr$indexes, _curr$label;
     // Is in use if URL contains ALL of the indexes
-    const subindexes = ((_curr$indexes$length = curr === null || curr === void 0 || (_curr$indexes = curr.indexes) === null || _curr$indexes === void 0 ? void 0 : _curr$indexes.length) !== null && _curr$indexes$length !== void 0 ? _curr$indexes$length : 0) > 0 ? curr.indexes : [curr.key];
+    const subindexes = (curr?.indexes?.length ?? 0) > 0 ? curr.indexes : [curr.key];
     acc[curr.key] = {
       inUse: subindexes.every(si => qIndexArray.includes(si)),
-      label: (_curr$label = curr.label) !== null && _curr$label !== void 0 ? _curr$label : curr.key,
+      label: curr.label ?? curr.key,
       subIndexes: curr.indexes
     };
     return acc;
@@ -56,7 +52,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
     defaultToPageOne: false
   });
   const handleSearchKeyChange = (0, _react.useCallback)(_ref2 => {
-    var _value$subIndexes$len, _value$subIndexes;
     let {
       e: {
         target: {
@@ -67,7 +62,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
       value
     } = _ref2;
     // Set up which indexes need to change
-    const indicesToChange = ((_value$subIndexes$len = value === null || value === void 0 || (_value$subIndexes = value.subIndexes) === null || _value$subIndexes === void 0 ? void 0 : _value$subIndexes.length) !== null && _value$subIndexes$len !== void 0 ? _value$subIndexes$len : 0) > 0 ? value.subIndexes : [key];
+    const indicesToChange = (value?.subIndexes?.length ?? 0) > 0 ? value.subIndexes : [key];
 
     // If false, we must remove from the qIndex
     if (!targetIsChecked) {
@@ -84,7 +79,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
         qIndexArray.push(ind);
       });
     }
-    setQIndex(qIndexArray === null || qIndexArray === void 0 ? void 0 : qIndexArray.join(','));
+    setQIndex(qIndexArray?.join(','));
     if (currentPage) {
       resetPage();
     }
@@ -102,15 +97,15 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
           }
         */
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Checkbox, {
-          checked: value === null || value === void 0 ? void 0 : value.inUse,
+          checked: value?.inUse,
           className: _SearchKeyControl.default.searchKeyControlElement,
-          label: value === null || value === void 0 ? void 0 : value.label,
+          label: value?.label,
           onChange: e => handleSearchKeyChange({
             e,
             key,
             value
           })
-        }, "search-key-control-".concat(key));
+        }, `search-key-control-${key}`);
       })
     })
   });

package/es/lib/SearchKeyControl/SearchKeyControl.test.js

@@ -7,13 +7,9 @@ var _SearchKeyControl = _interopRequireDefault(require("./SearchKeyControl"));
 var _jest = require("../../../test/jest");
 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 mockUseQIndex = jest.fn();
-jest.mock('../hooks', () => _objectSpread(_objectSpread({}, jest.requireActual('../hooks')), {}, {
+jest.mock('../hooks', () => ({
+  ...jest.requireActual('../hooks'),
   useQIndex: () => mockUseQIndex()
 }));
 describe('SearchKeyControl', () => {

package/es/lib/Settings/EditableRefdataCategoryList/EditableRefdataCategoryList.js

@@ -16,11 +16,6 @@ var _utils = require("../../utils");
 var _CustomProperties = _interopRequireDefault(require("../../../../styles/CustomProperties.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 propTypes = {
   afterQueryCalls: _propTypes.default.object,
   catchQueryCalls: _propTypes.default.object,
@@ -40,7 +35,6 @@ const propTypes = {
   refdataEndpoint: _propTypes.default.string
 };
 const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
-  var _deleteModal$refdata2;
   let {
     afterQueryCalls,
     catchQueryCalls,
@@ -94,12 +88,10 @@ const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, r
   (0, _react.useEffect)(() => {
     if (!isRefdataLoading) {
       if (searchTerm) {
-        var _filteredRefdata$sort;
-        const filteredRefdata = refdata === null || refdata === void 0 ? void 0 : refdata.filter(rd => rd.desc.toLowerCase().includes(searchTerm.toLowerCase()));
-        setContentData((_filteredRefdata$sort = filteredRefdata === null || filteredRefdata === void 0 ? void 0 : filteredRefdata.sort(sortByDesc)) !== null && _filteredRefdata$sort !== void 0 ? _filteredRefdata$sort : []);
+        const filteredRefdata = refdata?.filter(rd => rd.desc.toLowerCase().includes(searchTerm.toLowerCase()));
+        setContentData(filteredRefdata?.sort(sortByDesc) ?? []);
       } else {
-        var _refdata$sort;
-        setContentData((_refdata$sort = refdata === null || refdata === void 0 ? void 0 : refdata.sort(sortByDesc)) !== null && _refdata$sort !== void 0 ? _refdata$sort : []);
+        setContentData(refdata?.sort(sortByDesc) ?? []);
       }
     }
   }, [isRefdataLoading, refdata, searchTerm]);
@@ -111,36 +103,36 @@ const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, r
   } = (0, _hooks.useMutateRefdataCategory)({
     afterQueryCalls: {
       delete: json => {
-        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.delete) {
+        if (afterQueryCalls?.delete) {
           afterQueryCalls.delete(json);
         }
       },
       post: json => {
-        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.post) {
+        if (afterQueryCalls?.post) {
           afterQueryCalls.post(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);
         callout.sendCallout({
           message: kintIntl.formatKintMessage({
             id: 'refdataCategory.deleteRefdataCategory.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
@@ -156,14 +148,13 @@ const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, r
 
   // This is the function which will take a row in the table and assign the relevant actions to it
   const actionAssigner = rowData => {
-    var _rowData$values;
     const actionArray = [];
-    if (!(rowData !== null && rowData !== void 0 && (_rowData$values = rowData.values) !== null && _rowData$values !== void 0 && _rowData$values.length) && deleteCondition) {
+    if (!rowData?.values?.length && 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({
@@ -172,9 +163,9 @@ const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, r
         }),
         ariaLabel: data => kintIntl.formatKintMessage({
           id: 'refdataCategory.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
         })
       });
     }
@@ -200,11 +191,11 @@ const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, r
       columnMapping: {
         desc: kintIntl.formatKintMessage({
           id: 'refdataCategory.refdataCategory',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.refdataCategory
+          overrideValue: labelOverrides?.refdataCategory
         }),
         values: kintIntl.formatKintMessage({
           id: 'refdataCategory.noOfValues',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.noOfValues
+          overrideValue: labelOverrides?.noOfValues
         })
       },
       contentData: contentData,
@@ -218,21 +209,15 @@ const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, r
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
               buttonStyle: "link",
               onClick: () => handleRefdataCategoryClick(rowData),
-              children: rowData === null || rowData === void 0 ? void 0 : rowData.desc
+              children: rowData?.desc
             });
           }
-          return rowData === null || rowData === void 0 ? void 0 : rowData.desc;
+          return rowData?.desc;
         },
-        values: rowData => {
-          var _rowData$values2;
-          return rowData === null || rowData === void 0 || (_rowData$values2 = rowData.values) === null || _rowData$values2 === void 0 ? void 0 : _rowData$values2.length;
-        }
+        values: rowData => rowData?.values?.length
       }
       /* Hide actions column when no permissions, or no deletable refdata categories */,
-      hideActionsColumn: !createCondition && !deleteCondition || !(contentData !== null && contentData !== void 0 && contentData.find(cd => {
-        var _cd$values;
-        return (cd === null || cd === void 0 || (_cd$values = cd.values) === null || _cd$values === void 0 ? void 0 : _cd$values.length) === 0;
-      })),
+      hideActionsColumn: !createCondition && !deleteCondition || !contentData?.find(cd => cd?.values?.length === 0),
       hideCreateButton: hideCreateButton,
       label: label,
       validateFields: {
@@ -242,32 +227,31 @@ const EditableRefdataCategoryList = /*#__PURE__*/(0, _react.forwardRef)((_ref, r
     }), /*#__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: 'refdataCategory.deleteRefdataCategory',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteRefdataCategory
+        overrideValue: labelOverrides?.deleteRefdataCategory
       }),
       message: kintIntl.formatKintMessage({
         id: 'refdataCategory.deleteRefdataCategory.confirmMessage',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteRefdataCategoryMessage
+        overrideValue: labelOverrides?.deleteRefdataCategoryMessage
       }, {
-        name: deleteModal === null || deleteModal === void 0 || (_deleteModal$refdata2 = deleteModal.refdata) === null || _deleteModal$refdata2 === void 0 ? void 0 : _deleteModal$refdata2.desc
+        name: deleteModal?.refdata?.desc
       }),
       onCancel: () => setDeleteModal({
         visible: false,
         refdata: null
       }),
       onConfirm: () => {
-        var _deleteModal$refdata3, _deleteModal$refdata4;
-        deleteRefdataCategory(deleteModal === null || deleteModal === void 0 || (_deleteModal$refdata3 = deleteModal.refdata) === null || _deleteModal$refdata3 === void 0 ? void 0 : _deleteModal$refdata3.id);
-        onConfirmDelete(deleteModal === null || deleteModal === void 0 || (_deleteModal$refdata4 = deleteModal.refdata) === null || _deleteModal$refdata4 === void 0 ? void 0 : _deleteModal$refdata4.id);
+        deleteRefdataCategory(deleteModal?.refdata?.id);
+        onConfirmDelete(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/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({