@k-int/stripes-kint-components 5.1.1 → 5.1.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 5.1.3 2023-10-18
+  * ERM-3055 For custom properties with a pick list, "Not set" should always appear first in the list
+
+## 5.1.2 2023-10-06
+  * CustomPropertyEdit
+    * Added sorting by label to refdata type custom property options
+
 ## 5.1.1 2023-10-03
   * comparators - added !~ (Does not contain) comparator to constants array
 

package/es/index.js

@@ -384,6 +384,6 @@ var _FormattedKintMessage = _interopRequireDefault(require("./lib/FormattedKintM
 var _ResponsiveButtonGroup = _interopRequireDefault(require("./lib/ResponsiveButtonGroup"));
 var _SettingsFormContainer = _interopRequireDefault(require("./lib/SettingsFormContainer"));
 var _ComboButton = _interopRequireDefault(require("./lib/ComboButton"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/es/lib/ActionList/ActionList.js

@@ -12,8 +12,8 @@ var _finalFormArrays = _interopRequireDefault(require("final-form-arrays"));
 var _ActionListFieldArray = _interopRequireDefault(require("./ActionListFieldArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const propTypes = {
   actionAssigner: _propTypes.default.func,
   columnMapping: _propTypes.default.object,

package/es/lib/ActionList/ActionListFieldArray.js

@@ -14,8 +14,8 @@ var _hooks = require("../hooks");
 var _ActionListFieldArray = _interopRequireDefault(require("../../../styles/ActionListFieldArray.css"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const EDITING_ACTIONS_WIDTH = 25;
 const NON_EDITING_ACTIONS_WIDTH = 20;
 const TOTAL_WIDTH = 100;
@@ -43,7 +43,6 @@ const propTypes = {
 
 // This needs to be outside of the main component for forwardRef to work properly it seems.
 const ActionTrigger = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
-  var _action$label;
   let {
     action,
     ...actionTriggerProps
@@ -59,7 +58,7 @@ const ActionTrigger = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     ref: ref,
     marginBottom0: true,
     ...actionTriggerProps,
-    children: (_action$label = action.label) !== null && _action$label !== void 0 ? _action$label : action.name
+    children: action.label ?? action.name
   });
 });
 ActionTrigger.propTypes = {
@@ -117,7 +116,6 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     }
   };
   const handleSave = index => {
-    var _actionAssigner;
     const {
       actionListActions: _a,
       fieldName: _fn,
@@ -126,7 +124,7 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     } = fields.value[index];
 
     // Find "edit" entry in actionAssigner
-    const editCallback = (_actionAssigner = actionAssigner(rowData)) === null || _actionAssigner === void 0 || (_actionAssigner = _actionAssigner.find(act => act.name === 'edit')) === null || _actionAssigner === void 0 ? void 0 : _actionAssigner.callback;
+    const editCallback = actionAssigner(rowData)?.find(act => act.name === 'edit')?.callback;
     if (editCallback) {
       editCallback(rowData);
     }
@@ -158,14 +156,14 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     const widthsObject = {};
     visibleFields.forEach(f => {
       if (f !== 'actionListActions') {
-        widthsObject[f] = "".concat(staticWidth, "%");
+        widthsObject[f] = `${staticWidth}%`;
       }
     });
-    widthsObject.actionListActions = editing ? "".concat(EDITING_ACTIONS_WIDTH, "%") : "".concat(NON_EDITING_ACTIONS_WIDTH, "%");
+    widthsObject.actionListActions = editing ? `${EDITING_ACTIONS_WIDTH}%` : `${NON_EDITING_ACTIONS_WIDTH}%`;
     return widthsObject;
   };
   const renderActionButtons = data => {
-    const fieldName = "contentData[".concat(data.rowIndex, "]");
+    const fieldName = `contentData[${data.rowIndex}]`;
     const {
       actionListActions: actions,
       ...rest
@@ -173,7 +171,7 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
     if (data.id === editing || !data.id && editing === 'NEW_ROW') {
       // Render the save/cancel buttons
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-        id: "action-button-parent-".concat(data.rowIndex + 1),
+        id: `action-button-parent-${data.rowIndex + 1}`,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
           buttonStyle: "primary",
           disabled: hasValidationErrors || submitting || pristine,
@@ -193,9 +191,9 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
           type: "submit",
           children: kintIntl.formatKintMessage({
             id: 'save',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.save
+            overrideValue: labelOverrides?.save
           })
-        }, "save[".concat(data.rowIndex, "]")), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+        }, `save[${data.rowIndex}]`), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
           "data-type-button": "cancel",
           marginBottom0: true,
           onClick: () => {
@@ -209,14 +207,14 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
           },
           children: kintIntl.formatKintMessage({
             id: 'cancel',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.cancel
+            overrideValue: labelOverrides?.cancel
           })
-        }, "cancel[".concat(data.rowIndex, "]"))]
+        }, `cancel[${data.rowIndex}]`)]
       });
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      id: "action-button-parent-".concat(data.rowIndex + 1),
-      children: actions === null || actions === void 0 ? void 0 : actions.map(action => {
+      id: `action-button-parent-${data.rowIndex + 1}`,
+      children: actions?.map(action => {
         let actionFunction;
         if (action.callback) {
           actionFunction = () => action.callback(rest);
@@ -226,25 +224,25 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
         if (action.name === 'edit') {
           actionFunction = () => toggleEditing(data.id);
         }
-        let ariaLabel = "action-".concat(action.name, "[").concat(data.rowIndex, "]");
-        if (action !== null && action !== void 0 && action.ariaLabel) {
+        let ariaLabel = `action-${action.name}[${data.rowIndex}]`;
+        if (action?.ariaLabel) {
           if (typeof action.ariaLabel === 'function') {
             ariaLabel = action.ariaLabel(data);
           } else if (typeof action.ariaLabel === 'string') {
             ariaLabel = action.ariaLabel;
           } else {
-            throw new Error("Provided ariaLabel for action \"".concat(action.name, "\" must be a function or a string."));
+            throw new Error(`Provided ariaLabel for action "${action.name}" must be a function or a string.`);
           }
         }
         let tooltip;
         let tooltipSub;
-        if (action !== null && action !== void 0 && action.tooltip) {
+        if (action?.tooltip) {
           if (typeof action.tooltip === 'function') {
             tooltip = action.tooltip(data);
           } else {
             tooltip = action.tooltip;
           }
-          if (action !== null && action !== void 0 && action.tooltipSub) {
+          if (action?.tooltipSub) {
             if (typeof action.tooltipSub === 'function') {
               tooltipSub = action.tooltipSub(data);
             } else {
@@ -256,7 +254,7 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
         // If a tooltip is declared, render that around the actionButton
         if (tooltip) {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Tooltip, {
-            id: "action-".concat(action.name, "[").concat(data.rowIndex, "]-tooltip"),
+            id: `action-${action.name}[${data.rowIndex}]-tooltip`,
             sub: tooltipSub,
             text: tooltip,
             children: _ref3 => {
@@ -278,7 +276,7 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
                   return null;
                 },
                 to: action.to
-              }, "action-".concat(action.name, "[").concat(data.rowIndex, "]"));
+              }, `action-${action.name}[${data.rowIndex}]`);
             }
           });
         }
@@ -296,7 +294,7 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
             return null;
           },
           to: action.to
-        }, "action-".concat(action.name, "[").concat(data.rowIndex, "]"));
+        }, `action-${action.name}[${data.rowIndex}]`);
       })
     });
   };
@@ -328,17 +326,16 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
         const editingRow = cd.id === editing || !cd.id;
 
         // Default to the passed formatter values
-        let returnValue = formatter !== null && formatter !== void 0 && formatter[key] ? formatter[key](cd) : cd[key];
+        let returnValue = formatter?.[key] ? formatter[key](cd) : cd[key];
 
         // If editing, replace values with fields
         if (editingRow) {
-          var _editableFields$key, _creatableFields$key;
           /*
             Check if the property is a visible field.
             If it is not then we don't allow editing in this component.
           */
-          const editFunction = (_editableFields$key = editableFields[key]) !== null && _editableFields$key !== void 0 ? _editableFields$key : () => true;
-          const createFunction = (_creatableFields$key = creatableFields[key]) !== null && _creatableFields$key !== void 0 ? _creatableFields$key : () => true;
+          const editFunction = editableFields[key] ?? (() => true);
+          const createFunction = creatableFields[key] ?? (() => true);
           /*
             Next check if this is a new row, if so we should run the createableField function with the data.
             If it is not a new row, then we run the editableField function with the data,
@@ -349,19 +346,19 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
           if (!cd.id && createFunction(cd) || !!cd.id && editFunction(cd)) {
             const passedObject = {
               allValues: values,
-              index: cd === null || cd === void 0 ? void 0 : cd.fieldIndex,
+              index: cd?.fieldIndex,
               key,
-              name: "".concat(cd.fieldName, ".").concat(key),
+              name: `${cd.fieldName}.${key}`,
               rowFieldName: cd.fieldName
             };
-            const validateFunction = validateFields !== null && validateFields !== void 0 && validateFields[key] ? validateFields === null || validateFields === void 0 ? void 0 : validateFields[key](passedObject) : null;
+            const validateFunction = validateFields?.[key] ? validateFields?.[key](passedObject) : null;
             returnValue = fieldComponents[key] ? fieldComponents[key](passedObject) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
               ariaLabel: key // TODO at the moment the only way to override this is passing in an entire fieldComponent.
               ,
               autoFocus: autoFocus,
               component: _components.TextField,
               marginBottom0: true,
-              name: "".concat(cd.fieldName, ".").concat(key),
+              name: `${cd.fieldName}.${key}`,
               parse: v => v,
               validate: validateFunction
             });
@@ -386,7 +383,7 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
         onClick: handleClickCreate,
         children: kintIntl.formatKintMessage({
           id: 'new',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.new
+          overrideValue: labelOverrides?.new
         })
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, {
@@ -394,7 +391,7 @@ const ActionListFieldArray = /*#__PURE__*/(0, _react.forwardRef)((_ref2, ref) =>
         ...columnMapping,
         actionListActions: kintIntl.formatKintMessage({
           id: 'actions',
-          overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.actions
+          overrideValue: labelOverrides?.actions
         })
       },
       columnWidths: getColumnWidths(),

package/es/lib/ComboButton/ComboButton.js

@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
   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'
     });
@@ -45,7 +45,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
     children: [...styledDropdownButtons]
   }), [styledDropdownButtons]);
   const renderTrigger = (0, _react.useCallback)(_ref2 => {
-    var _buttonProps$buttonSt;
     let {
       onToggle: toggleFunc,
       triggerRef,
@@ -58,11 +57,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
       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",
@@ -74,7 +73,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
         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, {

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

@@ -133,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
@@ -146,13 +146,10 @@ 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'],

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

@@ -24,7 +24,6 @@ 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,
@@ -69,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
       })
     }];
   }
@@ -83,7 +82,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);
         }
       },
@@ -91,7 +90,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);
         }
       },
@@ -99,7 +98,7 @@ 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);
         }
       }
@@ -112,10 +111,10 @@ 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'
         });
@@ -124,22 +123,20 @@ const CustomPropertiesSettings = _ref => {
     },
 
     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 {
       ...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 : ''
+      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 : [];
+    const typeMatch = typeRegex.exec(submitData?.type) ?? [];
     return {
       ...submitData,
       type: typeMatch[2]
@@ -156,7 +153,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({
@@ -186,10 +183,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, {
@@ -203,12 +200,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,
@@ -216,10 +213,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,
@@ -236,22 +233,22 @@ const CustomPropertiesSettings = _ref => {
         defaultInternal: true
       } : {
         ...customProperty,
-        ctx: customProperty !== null && customProperty !== void 0 && customProperty.ctx ? [{
+        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
@@ -272,22 +269,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);
       },