@k-int/stripes-kint-components 5.1.0 → 5.1.2

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactFinalForm = require("react-final-form");
+var _orderBy = _interopRequireDefault(require("lodash/orderBy"));
 var _components = require("@folio/stripes/components");
 var CUSTOM_PROPERTY_TYPES = _interopRequireWildcard(require("../../constants/customProperties"));
 var _hooks = require("../../hooks");
@@ -32,12 +33,11 @@ const CustomPropertyField = _ref => {
 
   // Set up the validator for the customProperty
   const customPropertyValidator = (fieldValue, allValues) => {
-    var _allValues$customProp, _allValues$customProp2;
     const {
       note,
       publicNote,
       value: currentValue
-    } = (_allValues$customProp = allValues === null || allValues === void 0 || (_allValues$customProp2 = allValues.customProperties) === null || _allValues$customProp2 === void 0 || (_allValues$customProp2 = _allValues$customProp2[customProperty === null || customProperty === void 0 ? void 0 : customProperty.value]) === null || _allValues$customProp2 === void 0 ? void 0 : _allValues$customProp2[0]) !== null && _allValues$customProp !== void 0 ? _allValues$customProp : {};
+    } = allValues?.customProperties?.[customProperty?.value]?.[0] ?? {};
     if (note && !currentValue || publicNote && !currentValue) {
       if (customProperty.type === CUSTOM_PROPERTY_TYPES.DECIMAL_CLASS_NAME || customProperty.type === CUSTOM_PROPERTY_TYPES.INTEGER_CLASS_NAME) {
         return kintIntl.formatKintMessage({
@@ -80,9 +80,7 @@ const CustomPropertyField = _ref => {
     return availableCustomProperties.find(cp => cp.value === customPropertyValue);
   };
   const renderCustomPropertyName = () => {
-    var _customPropertyValue$;
     const unsetCustomProperties = availableCustomProperties.filter(t => {
-      var _custPropValue$;
       // Only optional properties can be set
       if (t.primary) return false;
       const custPropValue = value[t.value];
@@ -91,16 +89,16 @@ const CustomPropertyField = _ref => {
       if (custPropValue === undefined) return true;
 
       // The customProperty is set but is marked for deletion. Allow reuse.
-      if ((_custPropValue$ = custPropValue[0]) !== null && _custPropValue$ !== void 0 && _custPropValue$._delete) return true;
+      if (custPropValue[0]?._delete) return true;
       return false;
     });
     const customPropertyValue = value[customProperty.value];
-    const id = customPropertyValue === null || customPropertyValue === void 0 || (_customPropertyValue$ = customPropertyValue[0]) === null || _customPropertyValue$ === void 0 ? void 0 : _customPropertyValue$.id;
+    const id = customPropertyValue?.[0]?.id;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select, {
       autoFocus: !id,
       dataOptions: [customProperty, ...unsetCustomProperties] // The selected customProperty, and the available unset customProperties
       ,
-      id: "edit-customproperty-".concat(index, "-name"),
+      id: `edit-customproperty-${index}-name`,
       label: kintIntl.formatKintMessage({
         id: 'customProperties.name',
         overrideValue: labelOverrides.name
@@ -132,7 +130,6 @@ const CustomPropertyField = _ref => {
     });
   };
   const renderCustomPropertyValue = () => {
-    var _customProperty$optio;
     const currentValue = value[customProperty.value] ? value[customProperty.value][0] : {};
     const min = Number.MIN_SAFE_INTEGER;
     const max = Number.MAX_SAFE_INTEGER;
@@ -155,15 +152,15 @@ const CustomPropertyField = _ref => {
       case CUSTOM_PROPERTY_TYPES.REFDATA_CLASS_NAME:
         fieldProps = {
           component: _components.Select,
-          dataOptions: customProperty.options,
-          format: v => v === null || v === void 0 ? void 0 : v.value
+          dataOptions: (0, _orderBy.default)(customProperty.options, 'label'),
+          format: v => v?.value
         };
         break;
       case CUSTOM_PROPERTY_TYPES.MULTI_REFDATA_CLASS_NAME:
         fieldProps = {
           component: _components.MultiSelection,
           // The "not set" value is not relevant for a multi select
-          dataOptions: (_customProperty$optio = customProperty.options) === null || _customProperty$optio === void 0 ? void 0 : _customProperty$optio.filter(opt => !!(opt !== null && opt !== void 0 && opt.value)),
+          dataOptions: (0, _orderBy.default)(customProperty.options?.filter(opt => !!opt?.value), 'label'),
           renderToOverlay: true
         };
         // MultiSelection passes the changed array as a value not an event
@@ -172,7 +169,7 @@ const CustomPropertyField = _ref => {
             ...value,
             [customProperty.value]: [{
               ...currentValue,
-              _delete: (refdataArray === null || refdataArray === void 0 ? void 0 : refdataArray.length) === 0 ? true : undefined,
+              _delete: refdataArray?.length === 0 ? true : undefined,
               // Delete customProperty if removing all values.
               value: refdataArray
             }]
@@ -223,12 +220,12 @@ const CustomPropertyField = _ref => {
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
       "data-test-customproperty-value": true,
-      id: "edit-customproperty-".concat(index, "-value"),
+      id: `edit-customproperty-${index}-value`,
       label: kintIntl.formatKintMessage({
         id: 'customProperties.value',
         overrideValue: labelOverrides.value
       }),
-      name: "".concat(name, ".").concat(customProperty.value, "[0].value"),
+      name: `${name}.${customProperty.value}[0].value`,
       onChange: handleChange,
       required: !customProperty.primary,
       validate: (fieldValue, allValues) => customPropertyValidator(fieldValue, allValues),
@@ -236,8 +233,7 @@ const CustomPropertyField = _ref => {
     });
   };
   const renderCustomPropertyVisibility = () => {
-    var _value$customProperty, _value$customProperty2, _customPropertyObject;
-    const customPropertyObject = (_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 customPropertyObject = value[customProperty.value]?.[0] ?? {};
     const handleChange = e => {
       onChange({
         ...value,
@@ -262,18 +258,17 @@ const CustomPropertyField = _ref => {
           overrideValue: labelOverrides.internalFalse
         })
       }],
-      id: "edit-customproperty-".concat(index, "-visibility"),
+      id: `edit-customproperty-${index}-visibility`,
       label: kintIntl.formatKintMessage({
         id: 'customProperties.visibility',
         overrideValue: labelOverrides.visibility
       }),
       onChange: handleChange,
-      value: (_customPropertyObject = customPropertyObject === null || customPropertyObject === void 0 ? void 0 : customPropertyObject.internal) !== null && _customPropertyObject !== void 0 ? _customPropertyObject : customProperty.defaultInternal
+      value: customPropertyObject?.internal ?? customProperty.defaultInternal
     });
   };
   const renderCustomPropertyNoteInternal = () => {
-    var _value$customProperty3, _value$customProperty4;
-    const customPropertyObject = (_value$customProperty3 = (_value$customProperty4 = value[customProperty.value]) === null || _value$customProperty4 === void 0 ? void 0 : _value$customProperty4[0]) !== null && _value$customProperty3 !== void 0 ? _value$customProperty3 : {};
+    const customPropertyObject = value[customProperty.value]?.[0] ?? {};
     const handleChange = e => {
       onChange({
         ...value,
@@ -285,18 +280,17 @@ const CustomPropertyField = _ref => {
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextArea, {
       "data-test-customproperty-note": true,
-      id: "edit-customproperty-".concat(index, "-internal-note"),
+      id: `edit-customproperty-${index}-internal-note`,
       label: kintIntl.formatKintMessage({
         id: 'customProperties.internalNote',
         overrideValue: labelOverrides.internalNote
       }),
       onChange: handleChange,
-      value: customPropertyObject === null || customPropertyObject === void 0 ? void 0 : customPropertyObject.note
+      value: customPropertyObject?.note
     });
   };
   const renderCustomPropertyNotePublic = () => {
-    var _value$customProperty5, _value$customProperty6;
-    const customPropertyObject = (_value$customProperty5 = (_value$customProperty6 = value[customProperty.value]) === null || _value$customProperty6 === void 0 ? void 0 : _value$customProperty6[0]) !== null && _value$customProperty5 !== void 0 ? _value$customProperty5 : {};
+    const customPropertyObject = value[customProperty.value]?.[0] ?? {};
     const handleChange = e => {
       onChange({
         ...value,
@@ -308,13 +302,13 @@ const CustomPropertyField = _ref => {
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.TextArea, {
       "data-test-customproperty-public-note": true,
-      id: "edit-customproperty-".concat(index, "-public-note"),
+      id: `edit-customproperty-${index}-public-note`,
       label: kintIntl.formatKintMessage({
         id: 'customProperties.publicNote',
         overrideValue: labelOverrides.publicNote
       }),
       onChange: handleChange,
-      value: customPropertyObject === null || customPropertyObject === void 0 ? void 0 : customPropertyObject.publicNote
+      value: customPropertyObject?.publicNote
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/es/lib/CustomProperties/Edit/CustomPropertyField.test.js

@@ -11,11 +11,11 @@ const onSubmit = jest.fn();
 jest.mock('../../hooks');
 const onChange = () => {};
 const setCustomProperties = () => {};
-const authIdentCustom = _jest.availableCustomProperties === null || _jest.availableCustomProperties === void 0 ? void 0 : _jest.availableCustomProperties.find(cp => cp.value === 'AuthorIdentification');
-const decimalCustProp = _jest.availableCustomProperties === null || _jest.availableCustomProperties === void 0 ? void 0 : _jest.availableCustomProperties.find(cp => cp.value === 'decimal');
-const integerCustProp = _jest.availableCustomProperties === null || _jest.availableCustomProperties === void 0 ? void 0 : _jest.availableCustomProperties.find(cp => cp.value === 'integer');
-const dateCustProp = _jest.availableCustomProperties === null || _jest.availableCustomProperties === void 0 ? void 0 : _jest.availableCustomProperties.find(cp => cp.value === 'date');
-const multiRefdataCustProp = _jest.availableCustomProperties === null || _jest.availableCustomProperties === void 0 ? void 0 : _jest.availableCustomProperties.find(cp => cp.value === 'MultiRefdata');
+const authIdentCustom = _jest.availableCustomProperties?.find(cp => cp.value === 'AuthorIdentification');
+const decimalCustProp = _jest.availableCustomProperties?.find(cp => cp.value === 'decimal');
+const integerCustProp = _jest.availableCustomProperties?.find(cp => cp.value === 'integer');
+const dateCustProp = _jest.availableCustomProperties?.find(cp => cp.value === 'date');
+const multiRefdataCustProp = _jest.availableCustomProperties?.find(cp => cp.value === 'MultiRefdata');
 const defaultProps = {
   availableCustomProperties: _jest.availableCustomProperties,
   customProperties: _jest.customProperties,

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

@@ -57,7 +57,7 @@ const CustomPropertyFormCard = _ref => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Card, {
     "data-testid": "custom-property-form-card",
     headerEnd: customPropertyType === 'optional' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Tooltip, {
-      id: "customProperty-".concat(customProperty.value, "-").concat(index),
+      id: `customProperty-${customProperty.value}-${index}`,
       text: getTooltipText(),
       children: _ref2 => {
         let {
@@ -68,7 +68,7 @@ const CustomPropertyFormCard = _ref => {
           ref: ref,
           "aria-labelledby": ariaIds.text,
           icon: "trash",
-          id: "edit-customproperty-".concat(index, "-delete"),
+          id: `edit-customproperty-${index}-delete`,
           onClick: () => handleDeleteCustomProperty(customProperty, index)
         });
       }

package/es/lib/CustomProperties/Edit/CustomPropertyFormCard.test.js

@@ -12,7 +12,7 @@ jest.mock('../../hooks');
 jest.mock('./CustomPropertyField', () => () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
   children: "CustomPropertyField"
 }));
-const customProperty = _customProperties.availableCustomProperties === null || _customProperties.availableCustomProperties === void 0 ? void 0 : _customProperties.availableCustomProperties.find(cp => cp.value === 'AuthorIdentification');
+const customProperty = _customProperties.availableCustomProperties?.find(cp => cp.value === 'AuthorIdentification');
 const onChange = jest.fn();
 const setCustomProperties = jest.fn();
 describe('CustomPropertyFormCard', () => {

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

@@ -5,23 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.value = exports.initialValues = void 0;
 var _jest = require("../../../../test/jest");
-var _agreementStatusRefda, _agreementStatusRefda2, _licenseAmendmentStat;
-const agreementStatusRefdata = _jest.refdata === null || _jest.refdata === void 0 ? void 0 : _jest.refdata.find(rdc => rdc.desc === 'SubscriptionAgreement.AgreementStatus');
-const licenseAmendmentStatusRefdata = _jest.refdata === null || _jest.refdata === void 0 ? void 0 : _jest.refdata.find(rdc => rdc.desc === 'LicenseAmendmentStatus.Status');
+const agreementStatusRefdata = _jest.refdata?.find(rdc => rdc.desc === 'SubscriptionAgreement.AgreementStatus');
+const licenseAmendmentStatusRefdata = _jest.refdata?.find(rdc => rdc.desc === 'LicenseAmendmentStatus.Status');
 const value = exports.value = {
   AuthorIdentification: [{
     id: 2,
     internal: true,
     publicNote: 'this is a public note',
     note: 'this is an internal note',
-    value: agreementStatusRefdata === null || agreementStatusRefdata === void 0 || (_agreementStatusRefda = agreementStatusRefdata.values) === null || _agreementStatusRefda === void 0 ? void 0 : _agreementStatusRefda.find(rdv => rdv.value === 'active'),
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(cp => cp.name === 'AuthorIdentification')
+    value: agreementStatusRefdata?.values?.find(rdv => rdv.value === 'active'),
+    type: _jest.customProperties?.find(cp => cp.name === 'AuthorIdentification')
   }],
   Test: [{
     id: 4,
     internal: true,
-    value: agreementStatusRefdata === null || agreementStatusRefdata === void 0 || (_agreementStatusRefda2 = agreementStatusRefdata.values) === null || _agreementStatusRefda2 === void 0 ? void 0 : _agreementStatusRefda2.find(rdv => rdv.value === 'active'),
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(cp => cp.name === 'Test')
+    value: agreementStatusRefdata?.values?.find(rdv => rdv.value === 'active'),
+    type: _jest.customProperties?.find(cp => cp.name === 'Test')
   }],
   decimal: [{
     id: 8,
@@ -29,7 +28,7 @@ const value = exports.value = {
     note: 'decimal',
     internal: true,
     value: 1,
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(cp => cp.name === 'decimal')
+    type: _jest.customProperties?.find(cp => cp.name === 'decimal')
   }],
   integer: [{
     id: 6,
@@ -37,7 +36,7 @@ const value = exports.value = {
     note: 'Integer',
     internal: true,
     value: 1,
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(cp => cp.name === 'integer')
+    type: _jest.customProperties?.find(cp => cp.name === 'integer')
   }],
   text: [{
     id: 7,
@@ -45,15 +44,15 @@ const value = exports.value = {
     note: 'text',
     internal: true,
     value: 'text',
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(cp => cp.name === 'text')
+    type: _jest.customProperties?.find(cp => cp.name === 'text')
   }],
   Refdata: [{
     id: 5,
     publicNote: 'refdata',
     note: 'refdata',
     internal: true,
-    value: licenseAmendmentStatusRefdata === null || licenseAmendmentStatusRefdata === void 0 || (_licenseAmendmentStat = licenseAmendmentStatusRefdata.values) === null || _licenseAmendmentStat === void 0 ? void 0 : _licenseAmendmentStat.find(rdv => rdv.value === 'current'),
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(cp => cp.name === 'Refdata')
+    value: licenseAmendmentStatusRefdata?.values?.find(rdv => rdv.value === 'current'),
+    type: _jest.customProperties?.find(cp => cp.name === 'Refdata')
   }]
 };
 const initialValues = exports.initialValues = {

package/es/lib/CustomProperties/Filter/CustomPropertiesFilter.js

@@ -14,7 +14,6 @@ var _customProperties = require("../../constants/customProperties");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const CustomPropertiesFilter = _ref => {
-  var _parsedFilterData$num, _parsedFilterData$num2;
   let {
     activeFilters: {
       customProperties: custPropFilters,
@@ -75,13 +74,9 @@ const CustomPropertiesFilter = _ref => {
       filters = []
     } = values;
     const filterStrings = filters.filter(filter => filter.rules).map(filter => {
-      var _custprops$filter$, _custprops$filter;
-      const relevantCustomProperty = (_custprops$filter$ = custprops === null || custprops === void 0 || (_custprops$filter = custprops.filter(cp => cp.name === filter.customProperty)) === null || _custprops$filter === void 0 ? void 0 : _custprops$filter[0]) !== null && _custprops$filter$ !== void 0 ? _custprops$filter$ : {};
-      const filterByValueId = (relevantCustomProperty === null || relevantCustomProperty === void 0 ? void 0 : relevantCustomProperty.type) === _customProperties.MULTI_REFDATA_CLASS_NAME || (relevantCustomProperty === null || relevantCustomProperty === void 0 ? void 0 : relevantCustomProperty.type) === _customProperties.REFDATA_CLASS_NAME;
-      return filter.rules.map(rule => {
-        var _rule$value;
-        return "customProperties.".concat(filter.customProperty, ".value").concat(filterByValueId ? '.id' : '').concat(rule.operator).concat((_rule$value = rule.value) !== null && _rule$value !== void 0 ? _rule$value : '');
-      }).join('||');
+      const relevantCustomProperty = custprops?.filter(cp => cp.name === filter.customProperty)?.[0] ?? {};
+      const filterByValueId = relevantCustomProperty?.type === _customProperties.MULTI_REFDATA_CLASS_NAME || relevantCustomProperty?.type === _customProperties.REFDATA_CLASS_NAME;
+      return filter.rules.map(rule => `customProperties.${filter.customProperty}.value${filterByValueId ? '.id' : ''}${rule.operator}${rule.value ?? ''}`).join('||');
     });
     filterHandlers.state({
       ...restOfFilters,
@@ -92,7 +87,7 @@ const CustomPropertiesFilter = _ref => {
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Accordion, {
     closedByDefault: true,
-    displayClearButton: ((_parsedFilterData$num = parsedFilterData === null || parsedFilterData === void 0 ? void 0 : parsedFilterData.numberOfFilters) !== null && _parsedFilterData$num !== void 0 ? _parsedFilterData$num : 0) > 0,
+    displayClearButton: (parsedFilterData?.numberOfFilters ?? 0) > 0,
     header: _components.FilterAccordionHeader,
     id: "clickable-custprop-filter",
     label: kintIntl.formatKintMessage({
@@ -110,12 +105,12 @@ const CustomPropertiesFilter = _ref => {
         id: 'customProperty.filtersApplied',
         overrideValue: labelOverrides.filtersApplied
       }, {
-        count: (_parsedFilterData$num2 = parsedFilterData === null || parsedFilterData === void 0 ? void 0 : parsedFilterData.numberOfFilters) !== null && _parsedFilterData$num2 !== void 0 ? _parsedFilterData$num2 : 0
+        count: parsedFilterData?.numberOfFilters ?? 0
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesFilterForm.default, {
       customProperties: custprops,
       editingFilters: editingFilters,
-      filters: parsedFilterData === null || parsedFilterData === void 0 ? void 0 : parsedFilterData.filters,
+      filters: parsedFilterData?.filters,
       handlers: {
         closeEditModal,
         openEditModal

package/es/lib/CustomProperties/Filter/CustomPropertiesFilterField.js

@@ -15,7 +15,6 @@ var _hooks = require("../../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const CustomPropertiesFilterField = _ref => {
-  var _customProperties$fin, _customProperties$fin2, _fields$value$index2;
   let {
     customProperties = [],
     fields,
@@ -38,16 +37,15 @@ const CustomPropertiesFilterField = _ref => {
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
-      id: "input-custprop-".concat(index),
+      id: `input-custprop-${index}`,
       label: kintIntl.formatKintMessage({
         id: 'customProperty',
         overrideValue: labelOverrides.customProperty
       }),
-      name: "".concat(name, ".customProperty"),
+      name: `${name}.customProperty`,
       placeholder: " ",
       render: fieldProps => {
-        var _Object$entries;
-        const sortedGroupedCustProps = (_Object$entries = Object.entries(groupedCustomProperties)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.sort((a, b) => {
+        const sortedGroupedCustProps = Object.entries(groupedCustomProperties)?.sort((a, b) => {
           if (a[0] === 'isNull') return -1; // Make sure noContext is at top
 
           if (a[0].toLowerCase() < b[0].toLowerCase()) return -1;
@@ -76,22 +74,19 @@ const CustomPropertiesFilterField = _ref => {
                   }) : v.label
                 }, v.id);
               })
-            }, "custom-property-optgroup-".concat(key));
+            }, `custom-property-optgroup-${key}`);
           })]
         });
       },
       required: true,
       validate: _validators.required
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      "data-testid": "selected-custprop-name-".concat(index),
-      id: "selected-custprop-name-".concat(index),
+      "data-testid": `selected-custprop-name-${index}`,
+      id: `selected-custprop-name-${index}`,
       style: {
         display: 'none'
       },
-      children: (_customProperties$fin = (_customProperties$fin2 = customProperties.find(t => {
-        var _fields$value$index;
-        return t.name === ((_fields$value$index = fields.value[index]) === null || _fields$value$index === void 0 ? void 0 : _fields$value$index.customProperty);
-      })) === null || _customProperties$fin2 === void 0 ? void 0 : _customProperties$fin2.label) !== null && _customProperties$fin !== void 0 ? _customProperties$fin : ''
+      children: customProperties.find(t => t.name === fields.value[index]?.customProperty)?.label ?? ''
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 2
@@ -119,29 +114,26 @@ const CustomPropertiesFilterField = _ref => {
         xs: 2
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalFormArrays.FieldArray, {
-      name: "".concat(name, ".rules"),
+      name: `${name}.rules`,
       children: _ref3 => {
         let {
           fields: ruleFields
         } = _ref3;
-        return ruleFields.map((ruleFieldName, ruleFieldIndex) => {
-          var _values$filters$index;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesRule.default, {
-            ariaLabelledby: "selected-custprop-name-".concat(index),
-            clearRuleValue: () => change("filters[".concat(index, "].rules[").concat(ruleFieldIndex, "].value"), ''),
-            custPropDefinition: customProperties.find(t => t.name === fields.value[index].customProperty),
-            index: ruleFieldIndex,
-            labelOverrides: labelOverrides,
-            name: ruleFieldName,
-            onDelete: () => ruleFields.remove(ruleFieldIndex),
-            value: (_values$filters$index = values.filters[index]) === null || _values$filters$index === void 0 ? void 0 : _values$filters$index.rules[ruleFieldIndex]
-          }, ruleFieldName);
-        });
+        return ruleFields.map((ruleFieldName, ruleFieldIndex) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesRule.default, {
+          ariaLabelledby: `selected-custprop-name-${index}`,
+          clearRuleValue: () => change(`filters[${index}].rules[${ruleFieldIndex}].value`, ''),
+          custPropDefinition: customProperties.find(t => t.name === fields.value[index].customProperty),
+          index: ruleFieldIndex,
+          labelOverrides: labelOverrides,
+          name: ruleFieldName,
+          onDelete: () => ruleFields.remove(ruleFieldIndex),
+          value: values.filters[index]?.rules[ruleFieldIndex]
+        }, ruleFieldName));
       }
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
       "data-test-add-rule-btn": true,
-      disabled: !((_fields$value$index2 = fields.value[index]) !== null && _fields$value$index2 !== void 0 && _fields$value$index2.customProperty),
-      onClick: () => push("".concat(name, ".rules")),
+      disabled: !fields.value[index]?.customProperty,
+      onClick: () => push(`${name}.rules`),
       children: kintIntl.formatKintMessage({
         id: 'addRule',
         overrideValue: labelOverrides.addRule

package/es/lib/CustomProperties/Filter/CustomPropertiesFilterField.test.js

@@ -31,7 +31,7 @@ describe('CustomPropertiesFilterField', () => {
             fields: fields,
             index: index,
             name: name
-          }, "custom-property-filter-field-".concat(name, "[").concat(index, "]")));
+          }, `custom-property-filter-field-${name}[${index}]`));
         }
       })
     })

package/es/lib/CustomProperties/Filter/CustomPropertiesFilterFieldArray.js

@@ -36,7 +36,7 @@ const CustomPropertiesFilterFieldArray = _ref => {
           return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Card, {
               headerEnd: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Tooltip, {
-                id: "custom-property-filter-card-delete-[".concat(index, "]-tooltip"),
+                id: `custom-property-filter-card-delete-[${index}]-tooltip`,
                 text: kintIntl.formatKintMessage({
                   id: 'customProperty.removeFilter',
                   overrideValue: labelOverrides.removeFilter
@@ -52,7 +52,7 @@ const CustomPropertiesFilterFieldArray = _ref => {
                     ref: ref,
                     "aria-labelledby": ariaIds.text,
                     icon: "trash",
-                    id: "custom-property-filter-card-delete-[".concat(index, "]"),
+                    id: `custom-property-filter-card-delete-[${index}]`,
                     onClick: () => fields.remove(index)
                   });
                 }
@@ -72,15 +72,15 @@ const CustomPropertiesFilterFieldArray = _ref => {
                 index: index,
                 labelOverrides: labelOverrides,
                 name: name
-              }, "custom-property-filter-field-".concat(name, "[").concat(index, "]"))
-            }, "custom-property-filter-card[".concat(index, "]")), index < fields.value.length - 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Layout, {
+              }, `custom-property-filter-field-${name}[${index}]`)
+            }, `custom-property-filter-card[${index}]`), index < fields.value.length - 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Layout, {
               className: "textCentered",
               children: kintIntl.formatKintMessage({
                 id: 'AND',
                 overrideValue: labelOverrides.AND
               })
-            }, "custom-property-filter[".concat(index, "]-AND"))]
-          }, "custom-property-filter-card[".concat(index, "]-container"));
+            }, `custom-property-filter[${index}]-AND`)]
+          }, `custom-property-filter-card[${index}]-container`);
         });
       }
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {

package/es/lib/CustomProperties/Filter/CustomPropertiesRule.js

@@ -51,7 +51,7 @@ const CustomPropertiesRule = _ref => {
   const operators = (0, _useOperators.default)(custPropDefinition.type, passedIntlKey, passedIntlNS, labelOverrides);
   const valueProps = (0, _useValueProps.default)(custPropDefinition, passedIntlKey, passedIntlNS, labelOverrides);
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
-  const selectedOperator = operators.find(o => o.value === (value === null || value === void 0 ? void 0 : value.operator));
+  const selectedOperator = operators.find(o => o.value === value?.operator);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
       xs: 2,
@@ -65,7 +65,7 @@ const CustomPropertiesRule = _ref => {
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
       xs: 4,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
-        name: "".concat(name, ".operator"),
+        name: `${name}.operator`,
         validate: _validators.required,
         children: _ref2 => {
           let {
@@ -74,13 +74,13 @@ const CustomPropertiesRule = _ref => {
           } = _ref2;
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select, {
             ...input,
-            "aria-labelledby": "".concat(ariaLabelledby, "-rule-column-header-comparator"),
+            "aria-labelledby": `${ariaLabelledby}-rule-column-header-comparator`,
             dataOptions: operators,
-            error: (meta === null || meta === void 0 ? void 0 : meta.touched) && (meta === null || meta === void 0 ? void 0 : meta.error),
+            error: meta?.touched && meta?.error,
             onChange: e => {
               input.onChange(e);
               const newlySelectedOperator = operators.find(o => o.value === e.target.value);
-              if (newlySelectedOperator !== null && newlySelectedOperator !== void 0 && newlySelectedOperator.noValueAllowed) {
+              if (newlySelectedOperator?.noValueAllowed) {
                 clearRuleValue();
               }
             },
@@ -91,9 +91,9 @@ const CustomPropertiesRule = _ref => {
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
       xs: 4,
-      children: selectedOperator !== null && selectedOperator !== void 0 && selectedOperator.noValueAllowed ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
-        "aria-labelledby": "".concat(ariaLabelledby, "-rule-column-header-value"),
-        name: "".concat(name, ".value"),
+      children: selectedOperator?.noValueAllowed ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
+        "aria-labelledby": `${ariaLabelledby}-rule-column-header-value`,
+        name: `${name}.value`,
         required: true,
         validate: _validators.required,
         ...valueProps

package/es/lib/CustomProperties/Filter/testResources.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.filterHandlers = exports.data = exports.activeFilters = void 0;
 var _jest = require("../../../../test/jest");
-var _refdata$find;
 const activeFilters = exports.activeFilters = {
-  'customProperties': ["customProperties.AuthorIdentification.value==".concat(_jest.refdata === null || _jest.refdata === void 0 || (_refdata$find = _jest.refdata.find(rdc => rdc.desc === 'AuthIdent')) === null || _refdata$find === void 0 || (_refdata$find = _refdata$find.values) === null || _refdata$find === void 0 || (_refdata$find = _refdata$find.find(rdv => rdv.value === 'email_domain')) === null || _refdata$find === void 0 ? void 0 : _refdata$find.id)]
+  'customProperties': [`customProperties.AuthorIdentification.value==${_jest.refdata?.find(rdc => rdc.desc === 'AuthIdent')?.values?.find(rdv => rdv.value === 'email_domain')?.id}`]
 };
 const filterHandlers = exports.filterHandlers = {
   'state': () => ({}),

package/es/lib/CustomProperties/Filter/useParseActiveFilterStrings.js

@@ -13,14 +13,13 @@ const useParseActiveFilterStrings = function (filterStrings, passedIntlKey, pass
   const filters = filterStrings.map(filter => {
     let customProperty;
     const rules = filter.split('||').map(ruleString => {
-      var _operators$find;
       // ruleString is constructed in this.handleSubmit passed to CustomPropertyFiltersForm
       // and has shape "customProperties.foo.value!=42"
       // OR customProperties.foo.value.id==1234, so make sure to disregard the .id
       const [customPropertyPath, rule] = ruleString.split('.value');
       const idSafeRule = rule.replace('.id', '');
       customProperty = customPropertyPath.replace('customProperties.', '');
-      const operator = (_operators$find = operators.find(o => idSafeRule.startsWith(o))) !== null && _operators$find !== void 0 ? _operators$find : '';
+      const operator = operators.find(o => idSafeRule.startsWith(o)) ?? '';
       const value = idSafeRule.substring(operator.length);
       numberOfFilters += 1;
       return {

package/es/lib/CustomProperties/View/CustomPropertiesView.js

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