@k-int/stripes-kint-components 2.8.6 → 2.8.7

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

@@ -11,20 +11,19 @@ var _CustomPropertiesListField = _interopRequireDefault(require("./CustomPropert
 var _hooks = require("../../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var CustomPropertiesEditCtx = function CustomPropertiesEditCtx(_ref) {
-  var ctx = _ref.ctx,
-    customPropertiesEndpoint = _ref.customPropertiesEndpoint,
-    id = _ref.id,
-    _ref$labelOverrides = _ref.labelOverrides,
-    labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides,
-    nameOverride = _ref.nameOverride;
+const CustomPropertiesEditCtx = _ref => {
+  let {
+    ctx,
+    customPropertiesEndpoint,
+    id,
+    labelOverrides = {},
+    nameOverride
+  } = _ref;
   // Deal with all the possible label override options
-  var getAccordionLabel = function getAccordionLabel() {
-    var _labelOverrides$defau;
+  const getAccordionLabel = () => {
     // Special case for null context
     if (ctx === 'isNull') {
-      var _labelOverrides$noCon;
-      return (_labelOverrides$noCon = labelOverrides.noContext) !== null && _labelOverrides$noCon !== void 0 ? _labelOverrides$noCon : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+      return labelOverrides.noContext ?? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
         id: "stripes-kint-components.customProperties"
       });
     }
@@ -40,38 +39,39 @@ var CustomPropertiesEditCtx = function CustomPropertiesEditCtx(_ref) {
     }
 
     // Label override for default title or finally built in default
-    return (_labelOverrides$defau = labelOverrides.defaultTitle) !== null && _labelOverrides$defau !== void 0 ? _labelOverrides$defau : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+    return labelOverrides.defaultTitle ?? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
       id: "stripes-kint-components.customProperties.ctx.title",
       values: {
-        ctx: ctx
+        ctx
       }
     });
   };
-  var _useCustomProperties = (0, _hooks.useCustomProperties)({
-      ctx: ctx,
-      endpoint: customPropertiesEndpoint,
-      returnQueryObject: true,
-      options: {
-        filters: [{
-          path: 'retired',
-          comparator: '!=',
-          value: 'true'
-        }]
-      }
-    }),
-    custprops = _useCustomProperties.data,
-    isLoading = _useCustomProperties.isLoading;
+  const {
+    data: custprops,
+    isLoading
+  } = (0, _hooks.useCustomProperties)({
+    ctx,
+    endpoint: customPropertiesEndpoint,
+    returnQueryObject: true,
+    options: {
+      filters: [{
+        path: 'retired',
+        comparator: '!=',
+        value: 'true'
+      }]
+    }
+  });
   if (isLoading) {
     return null;
   }
   return custprops.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Accordion, {
-    id: "".concat(id, "-accordion-").concat(ctx),
+    id: `${id}-accordion-${ctx}`,
     label: getAccordionLabel(),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesListField.default, {
       ctx: ctx,
       customProperties: custprops,
       labelOverrides: labelOverrides,
-      name: nameOverride !== null && nameOverride !== void 0 ? nameOverride : 'customProperties'
+      name: nameOverride ?? 'customProperties'
     })
   });
 };
@@ -82,5 +82,4 @@ CustomPropertiesEditCtx.propTypes = {
   labelOverrides: _propTypes.default.object,
   nameOverride: _propTypes.default.string
 };
-var _default = CustomPropertiesEditCtx;
-exports.default = _default;
+var _default = exports.default = CustomPropertiesEditCtx;

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

@@ -9,31 +9,22 @@ var _testResources = require("./testResources");
 var _CustomPropertiesEditCtx = _interopRequireDefault(require("./CustomPropertiesEditCtx"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-jest.mock('./CustomPropertiesListField', function () {
-  return function () {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      children: "CustomPropertiesListField"
-    });
-  };
-});
-describe('CustomPropertiesEditCtx', function () {
-  var renderComponent;
-  beforeEach(function () {
+jest.mock('./CustomPropertiesListField', () => () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  children: "CustomPropertiesListField"
+}));
+describe('CustomPropertiesEditCtx', () => {
+  let renderComponent;
+  beforeEach(() => {
     renderComponent = (0, _helpers.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesEditCtx.default, _objectSpread({}, _testResources.custPropEditCtx))
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesEditCtx.default, {
+        ..._testResources.custPropEditCtx
+      })
     }));
   });
-  it('renders CustomPropertiesListField component ', function () {
-    var _renderComponent = renderComponent,
-      getAllByText = _renderComponent.getAllByText;
-    (0, _react2.waitFor)(function () {
-      return expect(getAllByText('CustomPropertiesListField')).toBeInTheDocument();
-    });
+  it('renders CustomPropertiesListField component ', () => {
+    const {
+      getAllByText
+    } = renderComponent;
+    (0, _react2.waitFor)(() => expect(getAllByText('CustomPropertiesListField')).toBeInTheDocument());
   });
 });

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

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,45 +12,23 @@ var _reactIntl = require("react-intl");
 var _hooks = require("../../hooks");
 var _CustomPropertyFormCard = _interopRequireDefault(require("./CustomPropertyFormCard"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["ctx", "customProperties", "labelOverrides"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var CustomPropertiesList = function CustomPropertiesList(_ref) {
-  var _labelOverrides$prima, _labelOverrides$optio, _labelOverrides$addPr;
-  var _ref$availableCustomP = _ref.availableCustomProperties,
-    availableCustomProperties = _ref$availableCustomP === void 0 ? [] : _ref$availableCustomP,
-    _ref$input = _ref.input,
-    name = _ref$input.name,
-    onChange = _ref$input.onChange,
-    value = _ref$input.value,
-    _ref$labelOverrides = _ref.labelOverrides,
-    labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides,
-    pristine = _ref.meta.pristine;
-  var _useState = (0, _react.useState)([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    customProperties = _useState2[0],
-    setCustomProperties = _useState2[1]; // This is the list of customProperties we're currently displaying for edit.
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    dirtying = _useState4[0],
-    setDirtying = _useState4[1];
-  (0, _react.useEffect)(function () {
+const CustomPropertiesList = _ref => {
+  let {
+    availableCustomProperties = [],
+    input: {
+      name,
+      onChange,
+      value
+    },
+    labelOverrides = {},
+    meta: {
+      pristine
+    }
+  } = _ref;
+  const [customProperties, setCustomProperties] = (0, _react.useState)([]); // This is the list of customProperties we're currently displaying for edit.
+  const [dirtying, setDirtying] = (0, _react.useState)(false);
+  (0, _react.useEffect)(() => {
     // When the user loads this form, we want to init the list of customProperties
     // we're displaying (state.customProperties) with the list of customProperties that have been set
     // either via defaults or previously-saved data. Since that data may come in
@@ -63,96 +40,96 @@ var CustomPropertiesList = function CustomPropertiesList(_ref) {
     // so internally we use `state.dirtying` to show that we just initiated an action
     // that will result in a dirty component.
     if (pristine && !dirtying) {
-      setCustomProperties(availableCustomProperties.filter(function (customProperty) {
-        return value[customProperty.value] !== undefined;
-      }));
+      setCustomProperties(availableCustomProperties.filter(customProperty => value[customProperty.value] !== undefined));
     }
   }, [availableCustomProperties, dirtying, pristine, value]);
-  var handleDeleteCustomProperty = function handleDeleteCustomProperty(customProperty, i) {
-    var _value$customProperty, _value$customProperty2;
-    var 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 : {};
-    var newCustomProperties = _toConsumableArray(customProperties);
+  const handleDeleteCustomProperty = (customProperty, i) => {
+    const currentValue = value[customProperty.value]?.[0] ?? {};
+    const newCustomProperties = [...customProperties];
     newCustomProperties.splice(i, 1);
     setCustomProperties(newCustomProperties);
     setDirtying(true);
-    onChange(_objectSpread(_objectSpread({}, value), {}, _defineProperty({}, customProperty.value, [_objectSpread(_objectSpread({}, currentValue), {}, {
-      _delete: true
-    })])));
+    onChange({
+      ...value,
+      [customProperty.value]: [{
+        ...currentValue,
+        _delete: true
+      }]
+    });
   };
-  var renderCustomProperties = function renderCustomProperties(customPropertyType) {
+  const renderCustomProperties = customPropertyType => {
     // This is necessary to track individually since "index" will span primary/optional for a given set
-    var internalPropertyCounter = 0;
-    return customProperties.map(function (customProperty, index) {
+    let internalPropertyCounter = 0;
+    return customProperties.map((customProperty, index) => {
       if (customPropertyType === 'primary' && !customProperty.primary) return undefined;
       if (customPropertyType === 'optional' && customProperty.primary) return undefined;
       internalPropertyCounter += 1;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertyFormCard.default, {
-        availableCustomProperties: availableCustomProperties,
-        customProperty: customProperty,
-        customPropertyType: customPropertyType,
-        customProperties: customProperties,
-        handleDeleteCustomProperty: handleDeleteCustomProperty,
-        index: index,
-        internalPropertyCounter: internalPropertyCounter,
-        labelOverrides: labelOverrides,
-        name: name,
-        onChange: onChange,
-        setCustomProperties: setCustomProperties,
-        value: value
-      }, "customPropertyField-".concat(customProperty.value, "-").concat(index));
-    }).filter(function (cp) {
-      return cp !== undefined;
-    });
+        availableCustomProperties,
+        customProperty,
+        customPropertyType,
+        customProperties,
+        handleDeleteCustomProperty,
+        index,
+        internalPropertyCounter,
+        labelOverrides,
+        name,
+        onChange,
+        setCustomProperties,
+        value
+      }, `customPropertyField-${customProperty.value}-${index}`);
+    }).filter(cp => cp !== undefined);
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [availableCustomProperties.some(function () {
-      var customProperty = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      let customProperty = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return customProperty.primary;
     }) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
-      label: (_labelOverrides$prima = labelOverrides.primaryProperties) !== null && _labelOverrides$prima !== void 0 ? _labelOverrides$prima : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+      label: labelOverrides.primaryProperties ?? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
         id: "stripes-kint-components.customProperties.primaryProperties"
       }),
       value: renderCustomProperties('primary')
     }), availableCustomProperties.some(function () {
-      var customProperty = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      let customProperty = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return !customProperty.primary;
     }) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.KeyValue, {
-      label: (_labelOverrides$optio = labelOverrides.optionalProperties) !== null && _labelOverrides$optio !== void 0 ? _labelOverrides$optio : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+      label: labelOverrides.optionalProperties ?? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
         id: "stripes-kint-components.customProperties.optionalProperties"
       }),
       value: renderCustomProperties('optional')
     }), availableCustomProperties.some(function () {
-      var customProperty = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      let customProperty = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return !customProperty.primary;
     }) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
       id: "add-customproperty-btn",
-      onClick: function onClick() {
-        setCustomProperties([].concat(_toConsumableArray(customProperties), [{}]));
+      onClick: () => {
+        setCustomProperties([...customProperties, {}]);
         setDirtying(true);
       },
-      children: (_labelOverrides$addPr = labelOverrides.addProperty) !== null && _labelOverrides$addPr !== void 0 ? _labelOverrides$addPr : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
+      children: labelOverrides.addProperty ?? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
         id: "stripes-kint-components.customProperties.addProperty"
       })
     })]
   });
 };
-var CustomPropertiesListField = function CustomPropertiesListField(_ref2) {
-  var ctx = _ref2.ctx,
-    customProperties = _ref2.customProperties,
-    labelOverrides = _ref2.labelOverrides,
-    fieldProps = _objectWithoutProperties(_ref2, _excluded);
-  var fieldRef = (0, _react.useRef)();
-  var availableCustomProperties = (0, _hooks.useAvailableCustomProperties)(customProperties);
-  var _useFormState = (0, _reactFinalForm.useFormState)(),
-    initialValues = _useFormState.initialValues;
-  var getInitialValue = function getInitialValue() {
-    var cps = {};
-    (customProperties || []).filter(function (cp) {
-      return cp.primary;
-    })
+const CustomPropertiesListField = _ref2 => {
+  let {
+    ctx,
+    customProperties,
+    labelOverrides,
+    ...fieldProps
+  } = _ref2;
+  const fieldRef = (0, _react.useRef)();
+  const availableCustomProperties = (0, _hooks.useAvailableCustomProperties)(customProperties);
+  const {
+    initialValues
+  } = (0, _reactFinalForm.useFormState)();
+  const getInitialValue = () => {
+    const cps = {};
+    (customProperties || []).filter(cp => cp.primary)
     // Change default to be an ignored customProperty.
     // This means any changes without setting the value will be ignored
-    .forEach(function (cp) {
+    .forEach(cp => {
       cps[cp.name] = [{
         _delete: true
       }];
@@ -161,27 +138,29 @@ var CustomPropertiesListField = function 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(function (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: function render(p) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomPropertiesList, _objectSpread({
+    render: p => {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(CustomPropertiesList, {
         ref: fieldRef,
         availableCustomProperties: availableCustomProperties,
         ctx: ctx,
-        labelOverrides: labelOverrides
-      }, p));
+        labelOverrides: labelOverrides,
+        ...p
+      });
     }
-  }));
+  });
 };
 CustomPropertiesListField.propTypes = {
   ctx: _propTypes.default.string,
@@ -199,5 +178,4 @@ CustomPropertiesList.propTypes = {
   labelOverrides: _propTypes.default.object,
   meta: _propTypes.default.object
 };
-var _default = CustomPropertiesListField;
-exports.default = _default;
+var _default = exports.default = CustomPropertiesListField;

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

@@ -10,86 +10,40 @@ var _CustomPropertiesListField = _interopRequireDefault(require("./CustomPropert
 var _helpers2 = require("../../../../test/jest/helpers");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var onSubmit = jest.fn();
-jest.mock('./CustomPropertyFormCard', function () {
-  return function () {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      children: "CustomPropertyFormCard"
-    });
-  };
-});
-describe('CustomPropertiesListField', function () {
-  var renderComponent;
-  beforeEach(function () {
+const onSubmit = jest.fn();
+jest.mock('./CustomPropertyFormCard', () => () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  children: "CustomPropertyFormCard"
+}));
+describe('CustomPropertiesListField', () => {
+  let renderComponent;
+  beforeEach(() => {
     renderComponent = (0, _helpers2.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_helpers.TestForm, {
       initialValues: _testResources.initialValues,
       onSubmit: onSubmit,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesListField.default, _objectSpread({}, _testResources.data))
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesListField.default, {
+        ..._testResources.data
+      })
     }));
   });
-  test('displays expected Primary terms key value', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return (0, _stripesTesting.KeyValue)('Primary terms').exists();
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  })));
-  test('displays expected Optional terms key value', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return (0, _stripesTesting.KeyValue)('Optional terms').exists();
-          case 2:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  })));
-  it('renders CustomPropertyFormCard component ', function () {
-    var _renderComponent = renderComponent,
-      getAllByText = _renderComponent.getAllByText;
-    (0, _react2.waitFor)(function () {
-      return expect(getAllByText('CustomPropertyFormCard')).toBeInTheDocument();
-    });
+  test('displays expected Primary terms key value', async () => {
+    await (0, _stripesTesting.KeyValue)('Primary terms').exists();
   });
-  it('renders CustomPropertiesList component ', function () {
-    var _renderComponent2 = renderComponent,
-      getAllByText = _renderComponent2.getAllByText;
-    (0, _react2.waitFor)(function () {
-      return expect(getAllByText('CustomPropertiesList')).toBeInTheDocument();
-    });
+  test('displays expected Optional terms key value', async () => {
+    await (0, _stripesTesting.KeyValue)('Optional terms').exists();
+  });
+  it('renders CustomPropertyFormCard component ', () => {
+    const {
+      getAllByText
+    } = renderComponent;
+    (0, _react2.waitFor)(() => expect(getAllByText('CustomPropertyFormCard')).toBeInTheDocument());
+  });
+  it('renders CustomPropertiesList component ', () => {
+    const {
+      getAllByText
+    } = renderComponent;
+    (0, _react2.waitFor)(() => expect(getAllByText('CustomPropertiesList')).toBeInTheDocument());
+  });
+  test('renders the Add property button', async () => {
+    await (0, _stripesTesting.Button)('Add property').exists();
   });
-  test('renders the Add property button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            _context3.next = 2;
-            return (0, _stripesTesting.Button)('Add property').exists();
-          case 2:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3);
-  })));
 });