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

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

@@ -12,15 +12,7 @@ var _components = require("@folio/stripes/components");
 var _hooks = require("../../hooks");
 var _CustomPropertyFormCard = _interopRequireDefault(require("./CustomPropertyFormCard"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["ctx", "customProperties", "intlKey", "intlNS", "labelOverrides"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-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; }
-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 CustomPropertiesList = _ref => {
   let {
     availableCustomProperties = [],
@@ -55,17 +47,18 @@ 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);
     setDirtying(true);
-    onChange(_objectSpread(_objectSpread({}, value), {}, {
-      [customProperty.value]: [_objectSpread(_objectSpread({}, currentValue), {}, {
+    onChange({
+      ...value,
+      [customProperty.value]: [{
+        ...currentValue,
         _delete: true
-      })]
-    }));
+      }]
+    });
   };
   const renderCustomProperties = customPropertyType => {
     // This is necessary to track individually since "index" will span primary/optional for a given set
@@ -89,7 +82,7 @@ const CustomPropertiesList = _ref => {
         onChange,
         setCustomProperties,
         value
-      }, "customPropertyField-".concat(customProperty.value));
+      }, `customPropertyField-${customProperty.value}`);
     }).filter(cp => cp !== undefined);
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -139,20 +132,19 @@ const CustomPropertiesList = _ref => {
 };
 const CustomPropertiesListField = _ref2 => {
   let {
-      ctx,
-      customProperties,
-      intlKey: passedIntlKey,
-      intlNS: passedIntlNS,
-      labelOverrides = {}
-    } = _ref2,
-    fieldProps = _objectWithoutProperties(_ref2, _excluded);
+    ctx,
+    customProperties,
+    intlKey: passedIntlKey,
+    intlNS: passedIntlNS,
+    labelOverrides = {},
+    ...fieldProps
+  } = _ref2;
   const fieldRef = (0, _react.useRef)();
   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');
@@ -191,29 +183,31 @@ 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;
     }
 
     // Ensure that if we already had these values in initialvalues they're not overwritten
-    return _objectSpread(_objectSpread({}, cps), initialValues.customProperties);
+    return {
+      ...cps,
+      ...initialValues.customProperties
+    };
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, _objectSpread(_objectSpread({}, fieldProps), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
+    ...fieldProps,
     initialValue: getInitialValue(),
     render: p => {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomPropertiesList, _objectSpread({
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomPropertiesList, {
         ref: fieldRef,
         availableCustomProperties: availableCustomProperties,
         ctx: ctx,
         intlKey: passedIntlKey,
         intlNS: passedIntlNS,
-        labelOverrides: labelOverrides
-      }, p));
+        labelOverrides: labelOverrides,
+        ...p
+      });
     }
-  }));
+  });
 };
 CustomPropertiesListField.propTypes = {
   ctx: _propTypes.default.string,

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

@@ -14,11 +14,6 @@ var _NumberField = _interopRequireDefault(require("../../NumberField"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 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 CustomPropertyField = _ref => {
   let {
     availableCustomProperties,
@@ -37,12 +32,11 @@ const CustomPropertyField = _ref => {
   const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   // 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({
@@ -85,9 +79,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];
@@ -96,16 +88,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
@@ -123,33 +115,35 @@ const CustomPropertyField = _ref => {
         // We do this by 1) marking the current customProperty for deletion and 2) initing
         // the new customProperty to an empty object.
         const currentValue = value[customProperty.value] ? value[customProperty.value][0] : {};
-        onChange(_objectSpread(_objectSpread({}, value), {}, {
+        onChange({
+          ...value,
           [customProperty.value]: [{
             id: currentValue.id,
             _delete: true
           }],
           [newValue]: [{}]
-        }));
+        });
       },
       required: true,
       value: customProperty.value
     });
   };
   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;
 
     // Default change handler
     let handleChange = e => {
-      onChange(_objectSpread(_objectSpread({}, value), {}, {
-        [customProperty.value]: [_objectSpread(_objectSpread({}, currentValue), {}, {
+      onChange({
+        ...value,
+        [customProperty.value]: [{
+          ...currentValue,
           _delete: e.target.value === '',
           // Delete customProperty if removing the value.
           value: e.target.value // send down the number for integers and decimal types
-        })]
-      }));
+        }]
+      });
     };
     // Figure out which component we're rendering and specify its unique props.
     let fieldProps;
@@ -159,25 +153,27 @@ const CustomPropertyField = _ref => {
           component: _components.Select,
           // don't order dataOptions here, notSet should always be first in list
           dataOptions: customProperty.options,
-          format: v => v === null || v === void 0 ? void 0 : v.value
+          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: (0, _orderBy.default)((_customProperty$optio = customProperty.options) === null || _customProperty$optio === void 0 ? void 0 : _customProperty$optio.filter(opt => !!(opt !== null && opt !== void 0 && opt.value)), 'label'),
+          dataOptions: (0, _orderBy.default)(customProperty.options?.filter(opt => !!opt?.value), 'label'),
           renderToOverlay: true // FIXME Switch to usePortal for stripes v10
         };
         // MultiSelection passes the changed array as a value not an event
         handleChange = refdataArray => {
-          onChange(_objectSpread(_objectSpread({}, value), {}, {
-            [customProperty.value]: [_objectSpread(_objectSpread({}, currentValue), {}, {
-              _delete: (refdataArray === null || refdataArray === void 0 ? void 0 : refdataArray.length) === 0 ? true : undefined,
+          onChange({
+            ...value,
+            [customProperty.value]: [{
+              ...currentValue,
+              _delete: refdataArray?.length === 0 ? true : undefined,
               // Delete customProperty if removing all values.
               value: refdataArray
-            })]
-          }));
+            }]
+          });
         };
         break;
       case CUSTOM_PROPERTY_TYPES.INTEGER_CLASS_NAME:
@@ -189,13 +185,15 @@ const CustomPropertyField = _ref => {
           step: 'any'
         };
         handleChange = e => {
-          onChange(_objectSpread(_objectSpread({}, value), {}, {
-            [customProperty.value]: [_objectSpread(_objectSpread({}, currentValue), {}, {
+          onChange({
+            ...value,
+            [customProperty.value]: [{
+              ...currentValue,
               _delete: e.target.value === '' ? true : undefined,
               // Delete customProperty if removing the value.
               value: e.target.value
-            })]
-          }));
+            }]
+          });
         };
         break;
       case CUSTOM_PROPERTY_TYPES.TEXT_CLASS_NAME:
@@ -218,28 +216,30 @@ const CustomPropertyField = _ref => {
         };
         break;
     }
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, _objectSpread({
+    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)
-    }, fieldProps));
+      validate: (fieldValue, allValues) => customPropertyValidator(fieldValue, allValues),
+      ...fieldProps
+    });
   };
   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(_objectSpread(_objectSpread({}, value), {}, {
-        [customProperty.value]: [_objectSpread(_objectSpread({}, customPropertyObject), {}, {
+      onChange({
+        ...value,
+        [customProperty.value]: [{
+          ...customPropertyObject,
           internal: e.target.value
-        })]
-      }));
+        }]
+      });
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Select, {
       "data-test-customproperty-visibility": true,
@@ -256,55 +256,57 @@ 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(_objectSpread(_objectSpread({}, value), {}, {
-        [customProperty.value]: [_objectSpread(_objectSpread({}, customPropertyObject), {}, {
+      onChange({
+        ...value,
+        [customProperty.value]: [{
+          ...customPropertyObject,
           note: e.target.value
-        })]
-      }));
+        }]
+      });
     };
     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(_objectSpread(_objectSpread({}, value), {}, {
-        [customProperty.value]: [_objectSpread(_objectSpread({}, customPropertyObject), {}, {
+      onChange({
+        ...value,
+        [customProperty.value]: [{
+          ...customPropertyObject,
           publicNote: e.target.value
-        })]
-      }));
+        }]
+      });
     };
     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

@@ -7,20 +7,15 @@ var _jest = require("../../../../test/jest");
 var _testResources = require("./testResources");
 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 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,
@@ -38,10 +33,11 @@ describe('CustomPropertyField', () => {
       renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_stripesErmTesting.TestForm, {
         initialValues: _testResources.initialValues,
         onSubmit: onSubmit,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, _objectSpread(_objectSpread({}, defaultProps), {}, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, {
+          ...defaultProps,
           customProperty: authIdentCustom,
           index: 0
-        }))
+        })
       }));
       const {
         getByTestId
@@ -89,10 +85,11 @@ describe('CustomPropertyField', () => {
       renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_stripesErmTesting.TestForm, {
         initialValues: _testResources.initialValues,
         onSubmit: onSubmit,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, _objectSpread(_objectSpread({}, defaultProps), {}, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, {
+          ...defaultProps,
           customProperty: decimalCustProp,
           index: 2
-        }))
+        })
       }));
     });
     test('Displays expected Decimal field', async () => {
@@ -106,10 +103,11 @@ describe('CustomPropertyField', () => {
       renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_stripesErmTesting.TestForm, {
         initialValues: _testResources.initialValues,
         onSubmit: onSubmit,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, _objectSpread(_objectSpread({}, defaultProps), {}, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, {
+          ...defaultProps,
           customProperty: integerCustProp,
           index: 3
-        }))
+        })
       }));
     });
     test('Displays expected integer Field', async () => {
@@ -125,10 +123,11 @@ describe('CustomPropertyField', () => {
       renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_stripesErmTesting.TestForm, {
         initialValues: _testResources.initialValues,
         onSubmit: onSubmit,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, _objectSpread(_objectSpread({}, defaultProps), {}, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, {
+          ...defaultProps,
           customProperty: multiRefdataCustProp,
           index: 4
-        }))
+        })
       }));
     });
     test('Displays expected multi-select Refdata Field', async () => {
@@ -151,10 +150,11 @@ describe('CustomPropertyField', () => {
       renderComponent = (0, _jest.renderWithKintHarness)(/*#__PURE__*/(0, _jsxRuntime.jsx)(_stripesErmTesting.TestForm, {
         initialValues: _testResources.initialValues,
         onSubmit: onSubmit,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, _objectSpread(_objectSpread({}, defaultProps), {}, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyField.default, {
+          ...defaultProps,
           customProperty: dateCustProp,
           index: 5
-        }))
+        })
       }));
     });
     test('renders values DatePicker', async () => {

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

@@ -11,7 +11,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 = {