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

package/es/lib/ButtonTypedown/ButtonTypedown.js

@@ -10,36 +10,27 @@ var _components = require("@folio/stripes/components");
 var _SearchField = _interopRequireDefault(require("../SearchField"));
 var _Typedown = _interopRequireDefault(require("../Typedown"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["getTooltipText"],
-  _excluded2 = ["id", "renderButtonItem", "renderListItem", "tooltipProps"],
-  _excluded3 = ["buttonRef"];
 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 ButtonTypedown = _ref => {
   let {
-      id,
-      renderButtonItem,
-      renderListItem,
-      tooltipProps: {
-        getTooltipText // A special prop that selectedValue can be passed into
-      } = {}
-    } = _ref,
-    tooltipProps = _objectWithoutProperties(_ref.tooltipProps, _excluded),
-    typedownProps = _objectWithoutProperties(_ref, _excluded2);
+    id,
+    renderButtonItem,
+    renderListItem,
+    tooltipProps: {
+      getTooltipText,
+      // A special prop that selectedValue can be passed into
+      ...tooltipProps
+    } = {},
+    ...typedownProps
+  } = _ref;
   const renderButtonFunc = (0, _react.useCallback)(selectedValue => {
     if (renderButtonItem) {
       return renderButtonItem(selectedValue);
     }
     return renderListItem(selectedValue);
   }, [renderButtonItem, renderListItem]);
-  const usesTypedown = getTooltipText && typeof getTooltipText === 'function' || (tooltipProps === null || tooltipProps === void 0 ? void 0 : tooltipProps.text) && tooltipProps.text !== '';
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typedown.default, _objectSpread({
+  const usesTypedown = getTooltipText && typeof getTooltipText === 'function' || tooltipProps?.text && tooltipProps.text !== '';
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typedown.default, {
     getDisplayValue: () => false,
     renderHeader: _ref2 => {
       let {
@@ -47,7 +38,7 @@ const ButtonTypedown = _ref => {
         currentlyTyped
       } = _ref2;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchField.default, {
-        id: "button-typedown-searchfield-".concat(id),
+        id: `button-typedown-searchfield-${id}`,
         marginBottom0: true,
         onChange: handleType,
         value: currentlyTyped
@@ -63,27 +54,27 @@ const ButtonTypedown = _ref => {
       } = _ref3;
       const renderButton = _ref4 => {
         let {
-            buttonRef
-          } = _ref4,
-          buttonProps = _objectWithoutProperties(_ref4, _excluded3);
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.DropdownButton, _objectSpread(_objectSpread({
+          buttonRef,
+          ...buttonProps
+        } = _ref4;
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.DropdownButton, {
           ref: buttonRef,
           buttonStyle: "dropdownItem",
           id: triggerId,
           marginBottom0: true,
-          onKeyDown: typedownTriggerKeyDownHandler
-        }, buttonProps), {}, {
+          onKeyDown: typedownTriggerKeyDownHandler,
+          ...buttonProps,
           children: renderButtonFunc(selectedValue)
-        }));
+        });
       };
       if (!usesTypedown) {
         return renderButton({
           buttonRef: triggerComponentRef
         });
       }
-      const typedownText = getTooltipText && typeof getTooltipText === 'function' ? getTooltipText(selectedValue) : (tooltipProps === null || tooltipProps === void 0 ? void 0 : tooltipProps.text) || '';
+      const typedownText = getTooltipText && typeof getTooltipText === 'function' ? getTooltipText(selectedValue) : tooltipProps?.text || '';
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Tooltip, {
-        id: "button-typedown-trigger-".concat(id),
+        id: `button-typedown-trigger-${id}`,
         placement: "bottom",
         text: typedownText,
         children: _ref5 => {
@@ -103,8 +94,9 @@ const ButtonTypedown = _ref => {
           });
         }
       });
-    }
-  }, typedownProps));
+    },
+    ...typedownProps
+  });
 };
 var _default = exports.default = ButtonTypedown;
 ButtonTypedown.propTypes = {

package/es/lib/ComboButton/ComboButton.js

@@ -10,38 +10,31 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _components = require("@folio/stripes/components");
 var _ResponsiveButtonGroup = _interopRequireDefault(require("../../../styles/ResponsiveButtonGroup.css"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["children", "dropdownButtons", "dropdownProps", "dropdownRender", "marginBottom0", "popoverProps", "triggerProps"]; // FIXME we should probably store the shared styles in a more aptly named file
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// FIXME we should probably store the shared styles in a more aptly named file
+
 /*
  * ComboButton component, can either act as Primary/Bonus buttons in a dropdown
  * OR it can act as a popover rendered besides a button.
  * If neither are provided it will act as an ordinary button
- */
-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 ComboButton = _ref => {
+ */const ComboButton = _ref => {
   let {
-      children,
-      dropdownButtons = [],
-      // These MUST be buttons
-      dropdownProps = {},
-      dropdownRender,
-      marginBottom0,
-      // Will ONLY control the margin of the dropdown/main button
-      popoverProps = {},
-      triggerProps
-    } = _ref,
-    buttonProps = _objectWithoutProperties(_ref, _excluded);
+    children,
+    dropdownButtons = [],
+    // These MUST be buttons
+    dropdownProps = {},
+    dropdownRender,
+    marginBottom0,
+    // Will ONLY control the margin of the dropdown/main button
+    popoverProps = {},
+    triggerProps,
+    ...buttonProps
+  } = _ref;
   const [open, setOpen] = (0, _react.useState)(false);
   const onToggle = (0, _react.useCallback)(() => setOpen(!open), [open, setOpen]);
 
   // FIXME a lot of this is shared with ResponsiveButtonGroup
-  const styledDropdownButtons = (0, _react.useMemo)(() => dropdownButtons === null || dropdownButtons === void 0 ? void 0 : dropdownButtons.map(button => {
+  const styledDropdownButtons = (0, _react.useMemo)(() => dropdownButtons?.map(button => {
     return /*#__PURE__*/(0, _react.cloneElement)(button, {
       buttonStyle: 'dropdownItem'
     });
@@ -52,7 +45,6 @@ const ComboButton = _ref => {
     children: [...styledDropdownButtons]
   }), [styledDropdownButtons]);
   const renderTrigger = (0, _react.useCallback)(_ref2 => {
-    var _buttonProps$buttonSt;
     let {
       onToggle: toggleFunc,
       triggerRef,
@@ -61,36 +53,39 @@ const ComboButton = _ref => {
       ariaProps,
       getTriggerProps
     } = _ref2;
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
       ref: triggerRef,
       "aria-label": "menu",
       buttonClass: (0, _classnames.default)(_ResponsiveButtonGroup.default.width100, _ResponsiveButtonGroup.default.dropdownButtonClass, {
-        ["".concat(_ResponsiveButtonGroup.default.marginBottom)]: !marginBottom0
+        [`${_ResponsiveButtonGroup.default.marginBottom}`]: !marginBottom0
       }, {
-        ["".concat(_ResponsiveButtonGroup.default.marginBottom0)]: marginBottom0
+        [`${_ResponsiveButtonGroup.default.marginBottom0}`]: marginBottom0
       }),
-      buttonStyle: (_buttonProps$buttonSt = buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.buttonStyle) !== null && _buttonProps$buttonSt !== void 0 ? _buttonProps$buttonSt : 'default',
+      buttonStyle: buttonProps?.buttonStyle ?? 'default',
       onClick: toggleFunc,
       onKeyDown: keyHandler,
-      type: "button"
-    }, getTriggerProps()), ariaProps), triggerProps), {}, {
+      type: "button",
+      ...getTriggerProps(),
+      ...ariaProps,
+      ...triggerProps,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Icon, {
         icon: openState ? 'triangle-up' : 'triangle-down',
         iconPosition: "end"
       })
-    }));
-  }, [buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.buttonStyle, triggerProps, marginBottom0]);
+    });
+  }, [buttonProps?.buttonStyle, triggerProps, marginBottom0]);
   let comboTrigger;
   if (dropdownButtons.length > 0) {
-    comboTrigger = /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Dropdown, _objectSpread({
+    comboTrigger = /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Dropdown, {
       className: _ResponsiveButtonGroup.default.dropdownClass,
       onToggle: onToggle,
       open: open,
       renderMenu: renderActionMenuContent,
-      renderTrigger: renderTriggerProps => renderTrigger(renderTriggerProps)
-    }, dropdownProps), "combobutton-dropdown-toggle");
+      renderTrigger: renderTriggerProps => renderTrigger(renderTriggerProps),
+      ...dropdownProps
+    }, "combobutton-dropdown-toggle");
   } else if (dropdownRender) {
-    comboTrigger = /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Popover, _objectSpread(_objectSpread({
+    comboTrigger = /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Popover, {
       onToggle: onToggle,
       open: open,
       renderTrigger: _ref3 => {
@@ -105,28 +100,28 @@ const ComboButton = _ref => {
           open: openState,
           triggerRef: ref
         });
-      }
-    }, popoverProps), {}, {
+      },
+      ...popoverProps,
       children: dropdownRender
-    }));
+    });
   }
   if (comboTrigger) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: (0, _classnames.default)(_ResponsiveButtonGroup.default.buttonGroup),
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, _objectSpread(_objectSpread({
-        marginBottom0: marginBottom0
-      }, buttonProps), {}, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+        marginBottom0: marginBottom0,
+        ...buttonProps,
         children: children
-      })), comboTrigger]
+      }), comboTrigger]
     });
   }
 
   // Fallback, acts as a normal button
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, _objectSpread(_objectSpread({
-    marginBottom0: marginBottom0
-  }, buttonProps), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+    marginBottom0: marginBottom0,
+    ...buttonProps,
     children: children
-  }));
+  });
 };
 ComboButton.propTypes = {
   children: _propTypes.default.node,

package/es/lib/CustomProperties/Config/CustomPropertiesLookup.js

@@ -13,11 +13,6 @@ var _hooks = require("../../hooks");
 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 CustomPropertiesLookup = _ref => {
   let {
     contextFilterOptions,
@@ -52,9 +47,10 @@ const CustomPropertiesLookup = _ref => {
     }
   });
   const handleSearch = query => {
-    setNsValues(_objectSpread(_objectSpread({}, nsValues), {}, {
+    setNsValues({
+      ...nsValues,
       query
-    }));
+    });
   };
   const [searchTerm, setSearchTerm] = (0, _react.useState)('');
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
@@ -107,7 +103,7 @@ const CustomPropertiesLookup = _ref => {
           value: selectedContext
         })
       })
-    }), isLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, _objectSpread({
+    }), isLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, {
       columnMapping: {
         'label': kintIntl.formatKintMessage({
           id: 'customProperties.label',
@@ -137,7 +133,7 @@ const CustomPropertiesLookup = _ref => {
       contentData: custprops,
       formatter: {
         primary: data => {
-          if (data !== null && data !== void 0 && data.primary) {
+          if (data?.primary) {
             return kintIntl.formatKintMessage({
               id: 'yes',
               overrideValue: labelOverrides.yes
@@ -150,17 +146,15 @@ const CustomPropertiesLookup = _ref => {
           }
         },
         type: data => kintIntl.formatKintMessage({
-          id: "customProperties.type.".concat(data === null || data === void 0 ? void 0 : data.type),
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[data === null || data === void 0 ? void 0 : data.type]
+          id: `customProperties.type.${data?.type}`,
+          overrideValue: labelOverrides?.[data?.type]
         }),
-        category: data => {
-          var _data$category;
-          return data === null || data === void 0 || (_data$category = data.category) === null || _data$category === void 0 ? void 0 : _data$category.desc;
-        }
+        category: data => data?.category?.desc
       },
       onRowClick: onSelectCustomProperty,
-      visibleColumns: ['label', 'primary', 'ctx', 'weight', 'type', 'category']
-    }, mclProps))]
+      visibleColumns: ['label', 'primary', 'ctx', 'weight', 'type', 'category'],
+      ...mclProps
+    })]
   });
 };
 CustomPropertiesLookup.propTypes = {

package/es/lib/CustomProperties/Config/CustomPropertiesSettings.js

@@ -18,18 +18,12 @@ var _hooks = require("../../hooks");
 var _utils = require("../../utils");
 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 EDITING = 'edit';
 const CREATING = 'create';
 const VIEWING = 'view';
 
 // A default option for setting up panes manually
 const CustomPropertiesSettings = _ref => {
-  var _customProperty$label, _customProperty$label2, _customProperty$categ, _customProperty$label3, _customProperty$label4;
   let {
     afterQueryCalls,
     catchQueryCalls,
@@ -74,7 +68,7 @@ const CustomPropertiesSettings = _ref => {
       // empty string is all custoprop contexts
       label: kintIntl.formatKintMessage({
         id: 'customProperties.config.all',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.all
+        overrideValue: labelOverrides?.all
       })
     }];
   }
@@ -91,7 +85,7 @@ const CustomPropertiesSettings = _ref => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
         setCustomProperty(res);
-        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.put) {
+        if (afterQueryCalls?.put) {
           afterQueryCalls.put(res);
         }
       },
@@ -99,7 +93,7 @@ const CustomPropertiesSettings = _ref => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
         setCustomProperty(res);
-        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.post) {
+        if (afterQueryCalls?.post) {
           afterQueryCalls.post(res);
         }
       },
@@ -107,12 +101,12 @@ const CustomPropertiesSettings = _ref => {
         setMode(VIEWING);
         queryClient.invalidateQueries(['stripes-kint-components', 'useCustomProperties', 'custprops']);
         setCustomProperty();
-        if (afterQueryCalls !== null && afterQueryCalls !== void 0 && afterQueryCalls.delete) {
+        if (afterQueryCalls?.delete) {
           afterQueryCalls.delete(res);
         }
       }
     },
-    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 customProperty in question
       delete: async err => {
@@ -120,34 +114,35 @@ const CustomPropertiesSettings = _ref => {
         callout.sendCallout({
           message: kintIntl.formatKintMessage({
             id: 'customProperties.config.delete.errorMessage',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.deleteError
+            overrideValue: labelOverrides?.deleteError
           }, {
-            error: errorResp === null || errorResp === void 0 ? void 0 : errorResp.message,
-            label: customProperty === null || customProperty === void 0 ? void 0 : customProperty.label
+            error: errorResp?.message,
+            label: customProperty?.label
           }),
           type: 'error'
         });
-      }
-    }, catchQueryCalls),
+      },
+      ...catchQueryCalls // Override defaults here
+    },
     endpoint: customPropertiesEndpoint,
-    id: customProperty === null || customProperty === void 0 ? void 0 : customProperty.id
+    id: customProperty?.id
   });
   const handeContextSubmit = submitData => {
-    var _submitData$ctx$0$val, _submitData$ctx;
-    return _objectSpread(_objectSpread({}, submitData), {}, {
-      ctx: (_submitData$ctx$0$val = submitData === null || submitData === void 0 || (_submitData$ctx = submitData.ctx) === null || _submitData$ctx === void 0 || (_submitData$ctx = _submitData$ctx[0]) === null || _submitData$ctx === void 0 ? void 0 : _submitData$ctx.value) !== null && _submitData$ctx$0$val !== void 0 ? _submitData$ctx$0$val : ''
-    });
+    return {
+      ...submitData,
+      ctx: submitData?.ctx?.[0]?.value ?? ''
+    };
   };
 
   // When POSTing a custom property, the backend expects a shorthand "Integer" or "LocalDate"
   // When PUTing a custom property, the backend needs the full class name
   const handleType = submitData => {
-    var _typeRegex$exec;
     const typeRegex = /(com\.k_int\.web\.toolkit\.custprops\.types\.CustomProperty)(.*)/g;
-    const typeMatch = (_typeRegex$exec = typeRegex.exec(submitData === null || submitData === void 0 ? void 0 : submitData.type)) !== null && _typeRegex$exec !== void 0 ? _typeRegex$exec : [];
-    return _objectSpread(_objectSpread({}, submitData), {}, {
+    const typeMatch = typeRegex.exec(submitData?.type) ?? [];
+    return {
+      ...submitData,
       type: typeMatch[2]
-    });
+    };
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Pane, {
@@ -160,7 +155,7 @@ const CustomPropertiesSettings = _ref => {
         ,
         children: kintIntl.formatKintMessage({
           id: 'new',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.new
+          overrideValue: labelOverrides?.new
         })
       }),
       paneTitle: kintIntl.formatKintMessage({
@@ -190,10 +185,10 @@ const CustomPropertiesSettings = _ref => {
               icon: "edit",
               children: kintIntl.formatKintMessage({
                 id: 'edit',
-                overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.edit
+                overrideValue: labelOverrides?.edit
               })
             })
-          }, "".concat(customProperty.name, "-action-edit")));
+          }, `${customProperty.name}-action-edit`));
         }
         if (deleteCondition) {
           actionsArray.push(/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
@@ -207,12 +202,12 @@ const CustomPropertiesSettings = _ref => {
               icon: "trash",
               children: kintIntl.formatKintMessage({
                 id: 'delete',
-                overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.delete
+                overrideValue: labelOverrides?.delete
               })
             })
-          }, "".concat(customProperty.name, "-action-delete")));
+          }, `${customProperty.name}-action-delete`));
         }
-        return actionsArray !== null && actionsArray !== void 0 && actionsArray.length ? actionsArray : null;
+        return actionsArray?.length ? actionsArray : null;
       },
       defaultWidth: "fill",
       dismissible: true,
@@ -220,10 +215,10 @@ const CustomPropertiesSettings = _ref => {
       onClose: () => setCustomProperty(),
       paneTitle: kintIntl.formatKintMessage({
         id: 'customProperties.config.viewPaneTitle',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.viewPaneTitle,
-        fallbackMessage: (_customProperty$label = customProperty === null || customProperty === void 0 ? void 0 : customProperty.label) !== null && _customProperty$label !== void 0 ? _customProperty$label : customProperty === null || customProperty === void 0 ? void 0 : customProperty.name
+        overrideValue: labelOverrides?.viewPaneTitle,
+        fallbackMessage: customProperty?.label ?? customProperty?.name
       }, {
-        name: (_customProperty$label2 = customProperty === null || customProperty === void 0 ? void 0 : customProperty.label) !== null && _customProperty$label2 !== void 0 ? _customProperty$label2 : customProperty === null || customProperty === void 0 ? void 0 : customProperty.name
+        name: customProperty?.label ?? customProperty?.name
       }),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyView.default, {
         customProperty: customProperty,
@@ -238,23 +233,24 @@ const CustomPropertiesSettings = _ref => {
         primary: true,
         retired: false,
         defaultInternal: true
-      } : _objectSpread(_objectSpread({}, customProperty), {}, {
-        ctx: customProperty !== null && customProperty !== void 0 && customProperty.ctx ? [{
+      } : {
+        ...customProperty,
+        ctx: customProperty?.ctx ? [{
           value: customProperty.ctx,
           label: customProperty.ctx
         }] : null,
-        category: customProperty !== null && customProperty !== void 0 && customProperty.category ? customProperty === null || customProperty === void 0 || (_customProperty$categ = customProperty.category) === null || _customProperty$categ === void 0 ? void 0 : _customProperty$categ.id : null
-      }),
+        category: customProperty?.category ? customProperty?.category?.id : null
+      },
       modalProps: {
         dismissible: true,
         label: mode === CREATING ? kintIntl.formatKintMessage({
           id: 'customProperties.config.newModal',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.newModalTitle
+          overrideValue: labelOverrides?.newModalTitle
         }) : kintIntl.formatKintMessage({
           id: 'customProperties.config.editModal',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.editModalTitle
+          overrideValue: labelOverrides?.editModalTitle
         }, {
-          name: (_customProperty$label3 = customProperty === null || customProperty === void 0 ? void 0 : customProperty.label) !== null && _customProperty$label3 !== void 0 ? _customProperty$label3 : customProperty === null || customProperty === void 0 ? void 0 : customProperty.name
+          name: customProperty?.label ?? customProperty?.name
         }),
         onClose: () => setMode(VIEWING),
         open: mode === CREATING || mode === EDITING
@@ -275,22 +271,22 @@ const CustomPropertiesSettings = _ref => {
       buttonStyle: "danger",
       confirmLabel: kintIntl.formatKintMessage({
         id: 'delete',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.delete
+        overrideValue: labelOverrides?.delete
       }),
       heading: kintIntl.formatKintMessage({
         id: 'customProperties.config.delete.confirmHeading',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.confirmHeading
+        overrideValue: labelOverrides?.confirmHeading
       }),
       id: "delete-custprop-confirmation",
       message: kintIntl.formatKintMessage({
         id: 'customProperties.config.delete.confirmMessage',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.confirmMessage
+        overrideValue: labelOverrides?.confirmMessage
       }, {
-        name: (_customProperty$label4 = customProperty === null || customProperty === void 0 ? void 0 : customProperty.label) !== null && _customProperty$label4 !== void 0 ? _customProperty$label4 : customProperty === null || customProperty === void 0 ? void 0 : customProperty.name
+        name: customProperty?.label ?? customProperty?.name
       }),
       onCancel: () => setDeleteModal(false),
       onConfirm: () => {
-        deleteCustProp(customProperty === null || customProperty === void 0 ? void 0 : customProperty.id);
+        deleteCustProp(customProperty?.id);
         setCustomProperty();
         setDeleteModal(false);
       },