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

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);
       },

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

@@ -30,9 +30,9 @@ const CustomPropertyForm = _ref => {
     change
   } = (0, _reactFinalForm.useForm)();
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
-  const booleanToString = booleanValue => booleanValue === null || booleanValue === void 0 ? void 0 : booleanValue.toString();
+  const booleanToString = booleanValue => booleanValue?.toString();
   const stringToBoolean = stringValue => stringValue === 'true';
-  const [contextOptions, setContextOptions] = (0, _react.useState)(contextFilterOptions === null || contextFilterOptions === void 0 ? void 0 : contextFilterOptions.filter(ctx => ctx.value !== '' && (ctx === null || ctx === void 0 ? void 0 : ctx.value) !== 'isNull'));
+  const [contextOptions, setContextOptions] = (0, _react.useState)(contextFilterOptions?.filter(ctx => ctx.value !== '' && ctx?.value !== 'isNull'));
   const addCtx = _ref2 => {
     let {
       _r,
@@ -56,7 +56,7 @@ const CustomPropertyForm = _ref => {
     } else {
       return kintIntl.formatKintMessage({
         id: 'customProperties.ctx.addContext',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.addCtx
+        overrideValue: labelOverrides?.addCtx
       }, {
         value: filterValue
       });
@@ -66,7 +66,7 @@ const CustomPropertyForm = _ref => {
     if (allValues.primary && allValues.retired) {
       return kintIntl.formatKintMessage({
         id: 'customProperties.errors.primaryRetired',
-        overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.primaryRetired
+        overrideValue: labelOverrides?.primaryRetired
       });
     }
     return null;
@@ -82,48 +82,48 @@ const CustomPropertyForm = _ref => {
             value: ''
           }, {
             label: kintIntl.formatKintMessage({
-              id: "customProperties.type.".concat(_customProperties.DECIMAL_CLASS_NAME),
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[_customProperties.DECIMAL_CLASS_NAME]
+              id: `customProperties.type.${_customProperties.DECIMAL_CLASS_NAME}`,
+              overrideValue: labelOverrides?.[_customProperties.DECIMAL_CLASS_NAME]
             }),
             value: _customProperties.DECIMAL_CLASS_NAME
           }, {
             label: kintIntl.formatKintMessage({
-              id: "customProperties.type.".concat(_customProperties.INTEGER_CLASS_NAME),
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[_customProperties.INTEGER_CLASS_NAME]
+              id: `customProperties.type.${_customProperties.INTEGER_CLASS_NAME}`,
+              overrideValue: labelOverrides?.[_customProperties.INTEGER_CLASS_NAME]
             }),
             value: _customProperties.INTEGER_CLASS_NAME
           }, {
             label: kintIntl.formatKintMessage({
-              id: "customProperties.type.".concat(_customProperties.TEXT_CLASS_NAME),
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[_customProperties.TEXT_CLASS_NAME]
+              id: `customProperties.type.${_customProperties.TEXT_CLASS_NAME}`,
+              overrideValue: labelOverrides?.[_customProperties.TEXT_CLASS_NAME]
             }),
             value: _customProperties.TEXT_CLASS_NAME
           }, {
             label: kintIntl.formatKintMessage({
-              id: "customProperties.type.".concat(_customProperties.REFDATA_CLASS_NAME),
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[_customProperties.REFDATA_CLASS_NAME]
+              id: `customProperties.type.${_customProperties.REFDATA_CLASS_NAME}`,
+              overrideValue: labelOverrides?.[_customProperties.REFDATA_CLASS_NAME]
             }),
             value: _customProperties.REFDATA_CLASS_NAME
           }, {
             label: kintIntl.formatKintMessage({
-              id: "customProperties.type.".concat(_customProperties.MULTI_REFDATA_CLASS_NAME),
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[_customProperties.MULTI_REFDATA_CLASS_NAME]
+              id: `customProperties.type.${_customProperties.MULTI_REFDATA_CLASS_NAME}`,
+              overrideValue: labelOverrides?.[_customProperties.MULTI_REFDATA_CLASS_NAME]
             }),
             value: _customProperties.MULTI_REFDATA_CLASS_NAME
           }, {
             label: kintIntl.formatKintMessage({
-              id: "customProperties.type.".concat(_customProperties.DATE_CLASS_NAME),
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[_customProperties.DATE_CLASS_NAME]
+              id: `customProperties.type.${_customProperties.DATE_CLASS_NAME}`,
+              overrideValue: labelOverrides?.[_customProperties.DATE_CLASS_NAME]
             }),
             value: _customProperties.DATE_CLASS_NAME
           }],
-          disabled: !!(values !== null && values !== void 0 && values.id),
+          disabled: !!values?.id,
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.type',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.type
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.type ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.type
+              overrideValue: labelOverrides?.type
+            }), helpPopovers?.type ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.type
             }) : null]
           }),
           name: "type",
@@ -132,19 +132,19 @@ const CustomPropertyForm = _ref => {
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
-        children: ((values === null || values === void 0 ? void 0 : values.type) === _customProperties.REFDATA_CLASS_NAME || (values === null || values === void 0 ? void 0 : values.type) === _customProperties.MULTI_REFDATA_CLASS_NAME) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
+        children: (values?.type === _customProperties.REFDATA_CLASS_NAME || values?.type === _customProperties.MULTI_REFDATA_CLASS_NAME) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
           component: _components.Select,
           dataOptions: [{
             label: '',
             value: ''
           }, ...refdata],
-          disabled: !!(values !== null && values !== void 0 && values.id),
+          disabled: !!values?.id,
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.category',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.category
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.category ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.category
+              overrideValue: labelOverrides?.category
+            }), helpPopovers?.category ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.category
             }) : null]
           }),
           name: "category",
@@ -161,9 +161,9 @@ const CustomPropertyForm = _ref => {
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.label',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.label
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.label ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.label
+              overrideValue: labelOverrides?.label
+            }), helpPopovers?.label ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.label
             }) : null]
           }),
           name: "label",
@@ -178,9 +178,9 @@ const CustomPropertyForm = _ref => {
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.name',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.name
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.name ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.name
+              overrideValue: labelOverrides?.name
+            }), helpPopovers?.name ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.name
             }) : null]
           }),
           name: "name",
@@ -189,7 +189,7 @@ const CustomPropertyForm = _ref => {
             if (v && v.length) {
               return /^[a-z][a-z0-9]*$/i.test(v) ? undefined : kintIntl.formatKintMessage({
                 id: 'errors.hasNonAlphaName',
-                overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.hasNonAlphaName
+                overrideValue: labelOverrides?.hasNonAlphaName
               });
             }
             return (0, _validators.required)(v);
@@ -205,9 +205,9 @@ const CustomPropertyForm = _ref => {
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.description',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.description
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.description ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.description
+              overrideValue: labelOverrides?.description
+            }), helpPopovers?.description ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.description
             }) : null]
           }),
           name: "description",
@@ -227,20 +227,20 @@ const CustomPropertyForm = _ref => {
           dataOptions: contextOptions,
           emptyMessage: kintIntl.formatKintMessage({
             id: 'customProperties.noCtxFound',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.noCtxFound
+            overrideValue: labelOverrides?.noCtxFound
           }),
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.ctx',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.ctx
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.ctx ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.ctx
+              overrideValue: labelOverrides?.ctx
+            }), helpPopovers?.ctx ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.ctx
             }) : null]
           }),
           name: "ctx",
           onChange: selectedItems => {
             if (selectedItems.length) {
-              change('ctx', [selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems[(selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.length) - 1]]);
+              change('ctx', [selectedItems?.[selectedItems?.length - 1]]);
             } else {
               change('ctx', undefined);
             }
@@ -256,9 +256,9 @@ const CustomPropertyForm = _ref => {
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.weight',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.weight
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.weight ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.weight
+              overrideValue: labelOverrides?.weight
+            }), helpPopovers?.weight ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.weight
             }) : null]
           }),
           name: "weight",
@@ -272,13 +272,13 @@ const CustomPropertyForm = _ref => {
           dataOptions: [{
             label: kintIntl.formatKintMessage({
               id: 'yes',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.yes
+              overrideValue: labelOverrides?.yes
             }),
             value: 'true'
           }, {
             label: kintIntl.formatKintMessage({
               id: 'no',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.no
+              overrideValue: labelOverrides?.no
             }),
             value: 'false'
           }],
@@ -286,9 +286,9 @@ const CustomPropertyForm = _ref => {
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.primary',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.primary
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.primary ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.primary
+              overrideValue: labelOverrides?.primary
+            }), helpPopovers?.primary ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.primary
             }) : null]
           }),
           name: "primary",
@@ -303,13 +303,13 @@ const CustomPropertyForm = _ref => {
           dataOptions: [{
             label: kintIntl.formatKintMessage({
               id: 'yes',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.yes
+              overrideValue: labelOverrides?.yes
             }),
             value: 'true'
           }, {
             label: kintIntl.formatKintMessage({
               id: 'no',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.no
+              overrideValue: labelOverrides?.no
             }),
             value: 'false'
           }],
@@ -317,9 +317,9 @@ const CustomPropertyForm = _ref => {
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.retired',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.retired
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.retired ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.retired
+              overrideValue: labelOverrides?.retired
+            }), helpPopovers?.retired ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.retired
             }) : null]
           }),
           name: "retired",
@@ -334,13 +334,13 @@ const CustomPropertyForm = _ref => {
           dataOptions: [{
             label: kintIntl.formatKintMessage({
               id: 'customProperties.internalTrue',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.internalTrue
+              overrideValue: labelOverrides?.internalTrue
             }),
             value: 'true'
           }, {
             label: kintIntl.formatKintMessage({
               id: 'customProperties.internalFalse',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.internalFalse
+              overrideValue: labelOverrides?.internalFalse
             }),
             value: 'false'
           }],
@@ -348,9 +348,9 @@ const CustomPropertyForm = _ref => {
           label: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [kintIntl.formatKintMessage({
               id: 'customProperties.defaultVisibility',
-              overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.defaultVisibility
-            }), helpPopovers !== null && helpPopovers !== void 0 && helpPopovers.defaultVisibility ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
-              content: helpPopovers === null || helpPopovers === void 0 ? void 0 : helpPopovers.defaultVisibility
+              overrideValue: labelOverrides?.defaultVisibility
+            }), helpPopovers?.defaultVisibility ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.InfoPopover, {
+              content: helpPopovers?.defaultVisibility
             }) : null]
           }),
           name: "defaultInternal",

package/es/lib/CustomProperties/Config/CustomPropertyForm.test.js

@@ -8,19 +8,15 @@ var _customProperties = _interopRequireDefault(require("../../../../test/jest/cu
 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 initialValues = _objectSpread(_objectSpread({}, _customProperties.default === null || _customProperties.default === void 0 ? void 0 : _customProperties.default.find(cp => cp.name === 'test')), {}, {
+const initialValues = {
+  ..._customProperties.default?.find(cp => cp.name === 'test'),
   // Just massage the type/ctx value to be of the shape the form expects
   type: 'Decimal',
   ctx: [{
     value: 'OpenAccess',
     label: 'OpenAccess'
   }]
-});
+};
 const onSubmit = jest.fn();
 jest.mock('../../hooks');
 describe('CustomPropertyForm', () => {
@@ -144,7 +140,7 @@ describe('CustomPropertyForm', () => {
       name: 'Primary'
     })).toHaveDisplayValue('Yes');
   });
-  ['Decimal', 'Refdata (multi-select)', 'Refdata', 'Text', 'Integer'].forEach(type => it("Displays expected ".concat(type, " option"), () => {
+  ['Decimal', 'Refdata (multi-select)', 'Refdata', 'Text', 'Integer'].forEach(type => it(`Displays expected ${type} option`, () => {
     const {
       getByText
     } = renderComponent;