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

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

@@ -29,9 +29,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,
@@ -55,7 +55,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
       });
@@ -65,7 +65,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;
@@ -81,48 +81,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",
@@ -131,19 +131,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",
@@ -160,9 +160,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",
@@ -177,9 +177,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",
@@ -188,7 +188,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);
@@ -204,9 +204,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",
@@ -226,20 +226,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);
             }
@@ -255,9 +255,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

@@ -9,7 +9,7 @@ var _jest = require("../../../../test/jest");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const initialValues = {
-  ...(_customProperties.default === null || _customProperties.default === void 0 ? void 0 : _customProperties.default.find(cp => cp.name === 'test')),
+  ..._customProperties.default?.find(cp => cp.name === 'test'),
   // Just massage the type/ctx value to be of the shape the form expects
   type: 'Decimal',
   ctx: [{
@@ -140,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;

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

@@ -12,7 +12,6 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // A default option for CustProp view pane, with the ability to override labels for fields
 const CustomPropertyView = _ref => {
-  var _customProperty$ctx, _customProperty$categ, _customProperty$categ2;
   let {
     customProperty,
     helpPopovers,
@@ -29,12 +28,12 @@ const CustomPropertyView = _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]
           }),
-          value: customProperty === null || customProperty === void 0 ? void 0 : customProperty.label
+          value: customProperty?.label
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
@@ -42,12 +41,12 @@ const CustomPropertyView = _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]
           }),
-          value: customProperty === null || customProperty === void 0 ? void 0 : customProperty.name
+          value: customProperty?.name
         })
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Row, {
@@ -56,9 +55,9 @@ const CustomPropertyView = _ref => {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
             id: 'customProperties.description',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.description
+            overrideValue: labelOverrides?.description
           }),
-          value: customProperty === null || customProperty === void 0 ? void 0 : customProperty.description
+          value: customProperty?.description
         })
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
@@ -67,11 +66,11 @@ const CustomPropertyView = _ref => {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
             id: 'customProperties.primary',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.primary
+            overrideValue: labelOverrides?.primary
           }),
           value: kintIntl.formatKintMessage({
-            id: customProperty !== null && customProperty !== void 0 && customProperty.primary ? 'yes' : 'no',
-            overrideValue: customProperty !== null && customProperty !== void 0 && customProperty.primary ? labelOverrides.yes : labelOverrides.no
+            id: customProperty?.primary ? 'yes' : 'no',
+            overrideValue: customProperty?.primary ? labelOverrides.yes : labelOverrides.no
           })
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
@@ -79,11 +78,11 @@ const CustomPropertyView = _ref => {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
             id: 'customProperties.retired',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.retired
+            overrideValue: labelOverrides?.retired
           }),
           value: kintIntl.formatKintMessage({
-            id: customProperty !== null && customProperty !== void 0 && customProperty.retired ? 'yes' : 'no',
-            overrideValue: customProperty !== null && customProperty !== void 0 && customProperty.retired ? labelOverrides.yes : labelOverrides.no
+            id: customProperty?.retired ? 'yes' : 'no',
+            overrideValue: customProperty?.retired ? labelOverrides.yes : labelOverrides.no
           })
         })
       })]
@@ -93,20 +92,20 @@ const CustomPropertyView = _ref => {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
             id: 'customProperties.weight',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.weight
+            overrideValue: labelOverrides?.weight
           }),
-          value: customProperty === null || customProperty === void 0 ? void 0 : customProperty.weight
+          value: customProperty?.weight
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
             id: 'customProperties.defaultVisibility',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.defaultVisibility
+            overrideValue: labelOverrides?.defaultVisibility
           }),
           value: kintIntl.formatKintMessage({
-            id: customProperty !== null && customProperty !== void 0 && customProperty.defaultInternal ? 'customProperties.internalTrue' : 'customProperties.internalFalse',
-            overrideValue: customProperty !== null && customProperty !== void 0 && customProperty.defaultInternal ? labelOverrides.internalTrue : labelOverrides.internalFalse
+            id: customProperty?.defaultInternal ? 'customProperties.internalTrue' : 'customProperties.internalFalse',
+            overrideValue: customProperty?.defaultInternal ? labelOverrides.internalTrue : labelOverrides.internalFalse
           })
         })
       })]
@@ -117,35 +116,35 @@ const CustomPropertyView = _ref => {
           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]
           }),
-          value: (_customProperty$ctx = customProperty === null || customProperty === void 0 ? void 0 : customProperty.ctx) !== null && _customProperty$ctx !== void 0 ? _customProperty$ctx : /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.NoValue, {})
+          value: customProperty?.ctx ?? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.NoValue, {})
         })
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
-        children: (customProperty === null || customProperty === void 0 ? void 0 : customProperty.type) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
+        children: customProperty?.type && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
             id: 'customProperties.type',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.type
+            overrideValue: labelOverrides?.type
           }),
           value: kintIntl.formatKintMessage({
-            id: "customProperties.type.".concat(customProperty === null || customProperty === void 0 ? void 0 : customProperty.type),
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides[customProperty === null || customProperty === void 0 ? void 0 : customProperty.type]
+            id: `customProperties.type.${customProperty?.type}`,
+            overrideValue: labelOverrides?.[customProperty?.type]
           })
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
-        children: ((customProperty === null || customProperty === void 0 ? void 0 : customProperty.type) === _customProperties.REFDATA_CLASS_NAME || (customProperty === null || customProperty === void 0 ? void 0 : customProperty.type) === _customProperties.MULTI_REFDATA_CLASS_NAME) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
+        children: (customProperty?.type === _customProperties.REFDATA_CLASS_NAME || customProperty?.type === _customProperties.MULTI_REFDATA_CLASS_NAME) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
             id: 'customProperties.category',
-            overrideValue: labelOverrides === null || labelOverrides === void 0 ? void 0 : labelOverrides.category
+            overrideValue: labelOverrides?.category
           }),
-          value: (_customProperty$categ = customProperty === null || customProperty === void 0 || (_customProperty$categ2 = customProperty.category) === null || _customProperty$categ2 === void 0 ? void 0 : _customProperty$categ2.desc) !== null && _customProperty$categ !== void 0 ? _customProperty$categ : /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.NoValue, {})
+          value: customProperty?.category?.desc ?? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.NoValue, {})
         })
       })]
     })]

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

@@ -13,7 +13,7 @@ describe('CustomPropertyView', () => {
   beforeEach(() => {
     (0, _jest.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyView.default, {
-        customProperty: _customProperties.default === null || _customProperties.default === void 0 ? void 0 : _customProperties.default.find(cp => cp.name === 'Eligible authors')
+        customProperty: _customProperties.default?.find(cp => cp.name === 'Eligible authors')
       })
     }));
   });

package/es/lib/CustomProperties/Edit/CustomPropertiesEdit.js

@@ -26,7 +26,7 @@ const CustomPropertiesEdit = _ref => {
     intlNS: passedIntlNS,
     labelOverrides,
     nameOverride
-  }, "customPropertiesEdit-".concat(ctx)));
+  }, `customPropertiesEdit-${ctx}`));
 };
 CustomPropertiesEdit.propTypes = {
   contexts: _propTypes.default.arrayOf(_propTypes.default.string),

package/es/lib/CustomProperties/Edit/CustomPropertiesEditCtx.js

@@ -35,7 +35,7 @@ const CustomPropertiesEditCtx = _ref => {
     // Chain formatKintMessages together using provided fallbackMessage to
     // allow for "If override or translation exists, use it, else use default"
     return kintIntl.formatKintMessage({
-      id: "customProperties.ctx.".concat(ctx),
+      id: `customProperties.ctx.${ctx}`,
       overrideValue: labelOverrides[ctx],
       fallbackMessage: kintIntl.formatKintMessage({
         id: 'customProperties.defaultTitle',
@@ -66,7 +66,7 @@ const CustomPropertiesEditCtx = _ref => {
     return null;
   }
   return custprops.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Accordion, {
-    id: "".concat(id, "-accordion-").concat(ctx),
+    id: `${id}-accordion-${ctx}`,
     label: getAccordionLabel(),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesListField.default, {
       ctx: ctx,
@@ -74,7 +74,7 @@ const CustomPropertiesEditCtx = _ref => {
       intlKey: passedIntlKey,
       intlNS: passedIntlNS,
       labelOverrides: labelOverrides,
-      name: nameOverride !== null && nameOverride !== void 0 ? nameOverride : 'customProperties'
+      name: nameOverride ?? 'customProperties'
     })
   });
 };

package/es/lib/CustomProperties/Edit/CustomPropertiesListField.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _orderBy = _interopRequireDefault(require("lodash/orderBy"));
 var _reactFinalForm = require("react-final-form");
 var _components = require("@folio/stripes/components");
 var _hooks = require("../../hooks");
@@ -46,8 +47,7 @@ const CustomPropertiesList = _ref => {
     }
   }, [availableCustomProperties, dirtying, pristine, value]);
   const handleDeleteCustomProperty = (customProperty, i) => {
-    var _value$customProperty, _value$customProperty2;
-    const currentValue = (_value$customProperty = (_value$customProperty2 = value[customProperty.value]) === null || _value$customProperty2 === void 0 ? void 0 : _value$customProperty2[0]) !== null && _value$customProperty !== void 0 ? _value$customProperty : {};
+    const currentValue = value[customProperty.value]?.[0] ?? {};
     const newCustomProperties = [...customProperties];
     newCustomProperties.splice(i, 1);
     setCustomProperties(newCustomProperties);
@@ -82,7 +82,7 @@ const CustomPropertiesList = _ref => {
         onChange,
         setCustomProperties,
         value
-      }, "customPropertyField-".concat(customProperty.value, "-").concat(index));
+      }, `customPropertyField-${customProperty.value}-${index}`);
     }).filter(cp => cp !== undefined);
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -143,10 +143,11 @@ const CustomPropertiesListField = _ref2 => {
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
 
   // Map customProperties to bring together the options and the definition values
-  const availableCustomProperties = customProperties === null || customProperties === void 0 ? void 0 : customProperties.map(customProperty => {
-    var _customProperty$categ;
-    let options = customProperty === null || customProperty === void 0 || (_customProperty$categ = customProperty.category) === null || _customProperty$categ === void 0 ? void 0 : _customProperty$categ.values;
+  const availableCustomProperties = customProperties?.map(customProperty => {
+    let options = customProperty?.category?.values;
     if (options) {
+      // order by label, add notSet option afterwards
+      options = (0, _orderBy.default)(options, 'label');
       options = [{
         label: kintIntl.formatKintMessage({
           id: 'notSet',
@@ -182,10 +183,7 @@ const CustomPropertiesListField = _ref2 => {
     // IMPORTANT -- All customproperty ctx sections are adding to the same "initialValue" field
     // Ensure that we don't already have initialValues for this particular set before setting them,
     // to ensure no looping behaviour
-    if (Object.keys(cps).every(key => {
-      var _initialValues$custom;
-      return ((_initialValues$custom = initialValues.customProperties) === null || _initialValues$custom === void 0 ? void 0 : _initialValues$custom[key]) !== undefined;
-    })) {
+    if (Object.keys(cps).every(key => initialValues.customProperties?.[key] !== undefined)) {
       return initialValues.customProperties;
     }