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

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

@@ -12,28 +12,19 @@ var _useParseActiveFilterStrings = _interopRequireDefault(require("./useParseAct
 var _CustomPropertiesFilterForm = _interopRequireDefault(require("./CustomPropertiesFilterForm"));
 var _customProperties = require("../../constants/customProperties");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["customProperties"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const CustomPropertiesFilter = _ref => {
-  var _parsedFilterData$num, _parsedFilterData$num2;
   let {
-      activeFilters: {
-        customProperties: custPropFilters
-      },
-      customPropertiesEndpoint,
-      filterHandlers,
-      intlKey: passedIntlKey,
-      intlNS: passedIntlNS,
-      labelOverrides = {}
-    } = _ref,
-    restOfFilters = _objectWithoutProperties(_ref.activeFilters, _excluded);
+    activeFilters: {
+      customProperties: custPropFilters,
+      ...restOfFilters
+    },
+    customPropertiesEndpoint,
+    filterHandlers,
+    intlKey: passedIntlKey,
+    intlNS: passedIntlNS,
+    labelOverrides = {}
+  } = _ref;
   const [editingFilters, setEditingFilters] = (0, _react.useState)(false);
   const openEditModal = () => setEditingFilters(true);
   const closeEditModal = () => setEditingFilters(false);
@@ -82,32 +73,30 @@ 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(_objectSpread(_objectSpread({}, restOfFilters), {}, {
+    filterHandlers.state({
+      ...restOfFilters,
       customProperties: filterStrings
-    }));
+    });
     setEditingFilters(false);
     return Promise.resolve();
   };
   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({
       id: 'customProperties',
       overrideValue: labelOverrides.customProperties
     }),
-    onClearFilter: () => filterHandlers.state(_objectSpread(_objectSpread({}, restOfFilters), {}, {
+    onClearFilter: () => filterHandlers.state({
+      ...restOfFilters,
       customProperties: []
-    })),
+    }),
     separator: false,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Layout, {
       className: "padding-bottom-gutter",
@@ -115,12 +104,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

@@ -14,13 +14,7 @@ var _CustomPropertiesRule = _interopRequireDefault(require("./CustomPropertiesRu
 var _hooks = require("../../hooks");
 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 CustomPropertiesFilterField = _ref => {
-  var _customProperties$fin, _customProperties$fin2, _fields$value$index2;
   let {
     customProperties = [],
     fields,
@@ -43,25 +37,24 @@ 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;
           if (a[0].toLowerCase() > b[0].toLowerCase()) return 1;
           return 0;
         });
-        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Select, _objectSpread(_objectSpread({
-          autoFocus: true
-        }, fieldProps), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Select, {
+          autoFocus: true,
+          ...fieldProps,
           placeholder: null // placeholder default causes issues
           ,
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("option", {
@@ -82,22 +75,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
@@ -125,29 +115,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/CustomPropertiesFilterForm.js

@@ -12,11 +12,6 @@ var _CustomPropertiesFilterFieldArray = _interopRequireDefault(require("./Custom
 var _hooks = require("../../hooks");
 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 CustomPropertyFiltersForm = _ref => {
   let {
     customProperties,
@@ -62,7 +57,9 @@ const CustomPropertyFiltersForm = _ref => {
         open: editingFilters,
         size: 'medium'
       },
-      mutators: _objectSpread({}, _finalFormArrays.default),
+      mutators: {
+        ..._finalFormArrays.default
+      },
       onSubmit: onSubmit,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesFilterFieldArray.default, {
         customProperties: customProperties,

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

@@ -7,11 +7,6 @@ var _testResources = require("./testResources");
 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); }
 jest.mock('../../hooks');
 jest.mock('./CustomPropertiesFilterFieldArray', () => () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
   children: "CustomPropertiesFilterFieldArray"
@@ -20,9 +15,10 @@ const onSubmit = jest.fn();
 describe('CustomPropertyFiltersForm', () => {
   let renderComponent;
   beforeEach(() => {
-    renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesFilterForm.default, _objectSpread({
-      onSubmit: onSubmit
-    }, _testResources.data)));
+    renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesFilterForm.default, {
+      onSubmit: onSubmit,
+      ..._testResources.data
+    }));
   });
   it('renders CustomPropertiesFilterFieldArray component ', () => {
     const {

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

@@ -15,11 +15,6 @@ var _useOperators = _interopRequireDefault(require("./useOperators"));
 var _hooks = require("../../hooks");
 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 propTypes = {
   ariaLabelledby: _propTypes.default.string.isRequired,
   clearRuleValue: _propTypes.default.func.isRequired,
@@ -56,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,
@@ -70,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 {
@@ -78,32 +73,33 @@ const CustomPropertiesRule = _ref => {
             meta
           } = _ref2;
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select
-          /* We don't want to jump focus to it when we open a brand new filter, only on a brand new rule */, _objectSpread(_objectSpread({
-            autoFocus: index !== 0
-          }, input), {}, {
-            "aria-labelledby": "".concat(ariaLabelledby, "-rule-column-header-comparator"),
+          /* We don't want to jump focus to it when we open a brand new filter, only on a brand new rule */, {
+            autoFocus: index !== 0,
+            ...input,
+            "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();
               }
             },
             placeholder: " ",
             required: true
-          }));
+          });
         }
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
       xs: 4,
-      children: selectedOperator !== null && selectedOperator !== void 0 && selectedOperator.noValueAllowed ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, _objectSpread({
-        "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))
+        validate: _validators.required,
+        ...valueProps
+      })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
       xs: 2,
       children: index ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Tooltip, {

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

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

@@ -11,7 +11,6 @@ var _CustomPropertyCard = _interopRequireDefault(require("./CustomPropertyCard")
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const CustomPropertiesViewCtx = _ref => {
-  var _custprops$filter$len, _custprops$filter;
   let {
     ctx,
     customProperties = [],
@@ -36,7 +35,7 @@ const CustomPropertiesViewCtx = _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',
@@ -80,25 +79,21 @@ const CustomPropertiesViewCtx = _ref => {
       closedByDefault: true,
       displayWhenClosed: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {}),
       displayWhenOpen: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {}),
-      id: "".concat(id, "-accordion-").concat(ctx),
+      id: `${id}-accordion-${ctx}`,
       label: getAccordionLabel(),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {})
     });
   }
-  const countSetProperties = primary => {
-    var _Object$entries$filte, _Object$entries;
-    return (_Object$entries$filte = (_Object$entries = Object.entries(customProperties)) === null || _Object$entries === void 0 || (_Object$entries = _Object$entries.filter(_ref2 => {
-      var _cp$, _cp$2, _cp$3;
-      let [_key, cp] = _ref2;
-      return (((_cp$ = cp[0]) === null || _cp$ === void 0 || (_cp$ = _cp$.type) === null || _cp$ === void 0 ? void 0 : _cp$.ctx) === ctx || ctx === 'isNull' && !((_cp$2 = cp[0]) !== null && _cp$2 !== void 0 && (_cp$2 = _cp$2.type) !== null && _cp$2 !== void 0 && _cp$2.ctx)) &&
-      // Either the ctx string matches, or isNull matches blank
-      ((_cp$3 = cp[0]) === null || _cp$3 === void 0 || (_cp$3 = _cp$3.type) === null || _cp$3 === void 0 ? void 0 : _cp$3.primary) === primary // Only count non-primary set custprops
+  const countSetProperties = primary => Object.entries(customProperties)?.filter(_ref2 => {
+    let [_key, cp] = _ref2;
+    return (cp[0]?.type?.ctx === ctx || ctx === 'isNull' && !cp[0]?.type?.ctx) &&
+    // Either the ctx string matches, or isNull matches blank
+    cp[0]?.type?.primary === primary // Only count non-primary set custprops
 ;
-    })) === null || _Object$entries === void 0 ? void 0 : _Object$entries.length) !== null && _Object$entries$filte !== void 0 ? _Object$entries$filte : 0;
-  };
+  })?.length ?? 0;
 
   // We need to display any set properties, along with any non-set primary properties
-  const primaryCount = (_custprops$filter$len = custprops === null || custprops === void 0 || (_custprops$filter = custprops.filter(cp => cp.primary === true)) === null || _custprops$filter === void 0 ? void 0 : _custprops$filter.length) !== null && _custprops$filter$len !== void 0 ? _custprops$filter$len : 0;
+  const primaryCount = custprops?.filter(cp => cp.primary === true)?.length ?? 0;
   const optionalCount = countSetProperties(false);
   const setPrimaryCount = countSetProperties(true);
   return primaryCount + optionalCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Accordion, {
@@ -109,18 +104,15 @@ const CustomPropertiesViewCtx = _ref => {
     displayWhenOpen: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Badge, {
       children: setPrimaryCount + optionalCount
     }),
-    id: "".concat(id, "-accordion-").concat(ctx),
+    id: `${id}-accordion-${ctx}`,
     label: getAccordionLabel(),
-    children: custprops.map((cp, index) => {
-      var _customProperties$cp$;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyCard.default, {
-        ctx: ctx,
-        customProperty: customProperties === null || customProperties === void 0 || (_customProperties$cp$ = customProperties[cp.name]) === null || _customProperties$cp$ === void 0 ? void 0 : _customProperties$cp$[0],
-        customPropertyDefinition: cp,
-        index: index,
-        labelOverrides: labelOverrides
-      }, "custom-property-card-".concat(ctx, "[").concat(index, "]"));
-    })
+    children: custprops.map((cp, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyCard.default, {
+      ctx: ctx,
+      customProperty: customProperties?.[cp.name]?.[0],
+      customPropertyDefinition: cp,
+      index: index,
+      labelOverrides: labelOverrides
+    }, `custom-property-card-${ctx}[${index}]`))
   });
 };
 CustomPropertiesViewCtx.propTypes = {

package/es/lib/CustomProperties/View/CustomPropertiesViewCtx.test.js

@@ -8,11 +8,6 @@ var _CustomPropertiesViewCtx = _interopRequireDefault(require("./CustomPropertie
 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); }
 jest.mock('../../hooks');
 jest.mock('./CustomPropertyCard', () => () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
   children: "CustomPropertyCard"
@@ -21,7 +16,9 @@ describe('CustomPropertiesViewCtx', () => {
   let renderComponent;
   beforeEach(() => {
     renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesViewCtx.default, _objectSpread({}, _testResources.data))
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesViewCtx.default, {
+        ..._testResources.data
+      })
     }));
   });
   it('renders CustomPropertyCard component ', () => {

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

@@ -29,9 +29,8 @@ const CustomPropertyCard = _ref => {
   if (!toDisplay) {
     return null;
   }
-  const internalFalse = (customProperty === null || customProperty === void 0 ? void 0 : customProperty.internal) === false || (customProperty === null || customProperty === void 0 ? void 0 : customProperty.internal) === undefined && customPropertyDefinition.defaultInternal === false;
+  const internalFalse = customProperty?.internal === false || customProperty?.internal === undefined && customPropertyDefinition.defaultInternal === false;
   const renderValue = () => {
-    var _customProperty$value, _customProperty$value2, _customProperty$value3, _customProperty$value4;
     if (!customProperty) {
       return kintIntl.formatKintMessage({
         id: 'notSet',
@@ -41,14 +40,11 @@ const CustomPropertyCard = _ref => {
     switch (customPropertyDefinition.type) {
       case CUSTPROP_TYPES.MULTI_REFDATA_CLASS_NAME:
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.List, {
-          items: (_customProperty$value = customProperty.value) === null || _customProperty$value === void 0 ? void 0 : _customProperty$value.map(item => {
-            var _item$label;
-            return (_item$label = item === null || item === void 0 ? void 0 : item.label) !== null && _item$label !== void 0 ? _item$label : item === null || item === void 0 ? void 0 : item.value;
-          }),
+          items: customProperty.value?.map(item => item?.label ?? item?.value),
           listStyle: "bullets"
         });
       case CUSTPROP_TYPES.REFDATA_CLASS_NAME:
-        return (_customProperty$value2 = (_customProperty$value3 = customProperty.value) === null || _customProperty$value3 === void 0 ? void 0 : _customProperty$value3.label) !== null && _customProperty$value2 !== void 0 ? _customProperty$value2 : (_customProperty$value4 = customProperty.value) === null || _customProperty$value4 === void 0 ? void 0 : _customProperty$value4.value;
+        return customProperty.value?.label ?? customProperty.value?.value;
       case CUSTPROP_TYPES.DECIMAL_CLASS_NAME:
       case CUSTPROP_TYPES.INTEGER_CLASS_NAME:
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedNumber, {
@@ -76,7 +72,7 @@ const CustomPropertyCard = _ref => {
         content: customPropertyDefinition.description
       }) : null]
     }),
-    id: "customproperty-card-".concat(index),
+    id: `customproperty-card-${index}`,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Row, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
@@ -87,7 +83,7 @@ const CustomPropertyCard = _ref => {
           }),
           children: renderValue()
         })
-      }), customProperty !== null && customProperty !== void 0 && customProperty.note ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
+      }), customProperty?.note ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
         xs: 6,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
           label: kintIntl.formatKintMessage({
@@ -122,7 +118,7 @@ const CustomPropertyCard = _ref => {
             id: 'customProperties.publicNote',
             overrideValue: labelOverrides.publicNote
           }),
-          children: customProperty !== null && customProperty !== void 0 && customProperty.publicNote ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          children: customProperty?.publicNote ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
             style: {
               whiteSpace: 'pre-wrap'
             },
@@ -131,7 +127,7 @@ const CustomPropertyCard = _ref => {
         })
       })]
     })]
-  }, "customPropertyCard-".concat(ctx, "[").concat(index, "]"));
+  }, `customPropertyCard-${ctx}[${index}]`);
 };
 CustomPropertyCard.propTypes = {
   ctx: _propTypes.default.string,