@k-int/stripes-kint-components 3.2.3 → 3.2.4

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

@@ -5,35 +5,22 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.value = exports.initialValues = void 0;
 var _jest = require("../../../../test/jest");
-var _agreementStatusRefda, _agreementStatusRefda2, _licenseAmendmentStat;
-var agreementStatusRefdata = _jest.refdata === null || _jest.refdata === void 0 ? void 0 : _jest.refdata.find(function (rdc) {
-  return rdc.desc === 'SubscriptionAgreement.AgreementStatus';
-});
-var licenseAmendmentStatusRefdata = _jest.refdata === null || _jest.refdata === void 0 ? void 0 : _jest.refdata.find(function (rdc) {
-  return rdc.desc === 'LicenseAmendmentStatus.Status';
-});
-var value = {
+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 ? void 0 : (_agreementStatusRefda = agreementStatusRefdata.values) === null || _agreementStatusRefda === void 0 ? void 0 : _agreementStatusRefda.find(function (rdv) {
-      return rdv.value === 'active';
-    }),
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(function (cp) {
-      return 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 ? void 0 : (_agreementStatusRefda2 = agreementStatusRefdata.values) === null || _agreementStatusRefda2 === void 0 ? void 0 : _agreementStatusRefda2.find(function (rdv) {
-      return rdv.value === 'active';
-    }),
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(function (cp) {
-      return cp.name === 'Test';
-    })
+    value: agreementStatusRefdata?.values?.find(rdv => rdv.value === 'active'),
+    type: _jest.customProperties?.find(cp => cp.name === 'Test')
   }],
   decimal: [{
     id: 8,
@@ -41,9 +28,7 @@ var value = {
     note: 'decimal',
     internal: true,
     value: 1,
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(function (cp) {
-      return cp.name === 'decimal';
-    })
+    type: _jest.customProperties?.find(cp => cp.name === 'decimal')
   }],
   integer: [{
     id: 6,
@@ -51,9 +36,7 @@ var value = {
     note: 'Integer',
     internal: true,
     value: 1,
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(function (cp) {
-      return cp.name === 'integer';
-    })
+    type: _jest.customProperties?.find(cp => cp.name === 'integer')
   }],
   text: [{
     id: 7,
@@ -61,25 +44,17 @@ var value = {
     note: 'text',
     internal: true,
     value: 'text',
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(function (cp) {
-      return 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 ? void 0 : (_licenseAmendmentStat = licenseAmendmentStatusRefdata.values) === null || _licenseAmendmentStat === void 0 ? void 0 : _licenseAmendmentStat.find(function (rdv) {
-      return rdv.value === 'current';
-    }),
-    type: _jest.customProperties === null || _jest.customProperties === void 0 ? void 0 : _jest.customProperties.find(function (cp) {
-      return cp.name === 'Refdata';
-    })
+    value: licenseAmendmentStatusRefdata?.values?.find(rdv => rdv.value === 'current'),
+    type: _jest.customProperties?.find(cp => cp.name === 'Refdata')
   }]
 };
-exports.value = value;
-var initialValues = {
+const initialValues = exports.initialValues = {
   customProperties: value
-};
-exports.initialValues = initialValues;
+};

package/es/lib/CustomProperties/Filter/CustomPropertiesFilter.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,68 +12,50 @@ var _useParseActiveFilterStrings = _interopRequireDefault(require("./useParseAct
 var _CustomPropertiesFilterForm = _interopRequireDefault(require("./CustomPropertiesFilterForm"));
 var _customProperties = require("../../constants/customProperties");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["customProperties"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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); }
-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; }
-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; }
-var CustomPropertiesFilter = function CustomPropertiesFilter(_ref) {
-  var _parsedFilterData$num, _parsedFilterData$num2;
-  var _ref$activeFilters = _ref.activeFilters,
-    custPropFilters = _ref$activeFilters.customProperties,
-    restOfFilters = _objectWithoutProperties(_ref$activeFilters, _excluded),
-    customPropertiesEndpoint = _ref.customPropertiesEndpoint,
-    filterHandlers = _ref.filterHandlers,
-    passedIntlKey = _ref.intlKey,
-    passedIntlNS = _ref.intlNS,
-    _ref$labelOverrides = _ref.labelOverrides,
-    labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    editingFilters = _useState2[0],
-    setEditingFilters = _useState2[1];
-  var openEditModal = function openEditModal() {
-    return setEditingFilters(true);
-  };
-  var closeEditModal = function closeEditModal() {
-    return setEditingFilters(false);
-  };
-  var kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
-  var _useCustomProperties = (0, _hooks.useCustomProperties)({
-      endpoint: customPropertiesEndpoint,
-      returnQueryObject: true,
-      options: {
-        sort: [{
-          path: 'ctx'
-        },
-        // Group by ctx
-        {
-          path: 'retired'
-        },
-        // Place retired custprops at the end
-        {
-          path: 'weight'
-        },
-        // Within those groups, sort by weight first
-        {
-          path: 'label'
-        } // Within those groups, sort by label
-        ]
-      }
-    }),
-    custprops = _useCustomProperties.data,
-    isLoading = _useCustomProperties.isLoading;
-  var parsedFilterData = (0, _useParseActiveFilterStrings.default)(custPropFilters || [], passedIntlKey, passedIntlNS, labelOverrides);
+const CustomPropertiesFilter = _ref => {
+  let {
+    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);
+  const kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
+  const {
+    data: custprops,
+    isLoading
+  } = (0, _hooks.useCustomProperties)({
+    endpoint: customPropertiesEndpoint,
+    returnQueryObject: true,
+    options: {
+      sort: [{
+        path: 'ctx'
+      },
+      // Group by ctx
+      {
+        path: 'retired'
+      },
+      // Place retired custprops at the end
+      {
+        path: 'weight'
+      },
+      // Within those groups, sort by weight first
+      {
+        path: 'label'
+      } // Within those groups, sort by label
+      ]
+    }
+  });
+
+  const parsedFilterData = (0, _useParseActiveFilterStrings.default)(custPropFilters || [], passedIntlKey, passedIntlNS, labelOverrides);
   if (isLoading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Accordion, {
       closedByDefault: true,
@@ -88,42 +69,35 @@ var CustomPropertiesFilter = function CustomPropertiesFilter(_ref) {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Spinner, {})
     });
   }
-  var handleSubmit = function handleSubmit(values) {
-    var _values$filters = values.filters,
-      filters = _values$filters === void 0 ? [] : _values$filters;
-    var filterStrings = filters.filter(function (filter) {
-      return filter.rules;
-    }).map(function (filter) {
-      var _custprops$filter$, _custprops$filter;
-      var relevantCustomProperty = (_custprops$filter$ = custprops === null || custprops === void 0 ? void 0 : (_custprops$filter = custprops.filter(function (cp) {
-        return cp.name === filter.customProperty;
-      })) === null || _custprops$filter === void 0 ? void 0 : _custprops$filter[0]) !== null && _custprops$filter$ !== void 0 ? _custprops$filter$ : {};
-      var 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(function (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 handleSubmit = values => {
+    const {
+      filters = []
+    } = values;
+    const filterStrings = filters.filter(filter => filter.rules).map(filter => {
+      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: function onClearFilter() {
-      return filterHandlers.state(_objectSpread(_objectSpread({}, restOfFilters), {}, {
-        customProperties: []
-      }));
-    },
+    onClearFilter: () => filterHandlers.state({
+      ...restOfFilters,
+      customProperties: []
+    }),
     separator: false,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Layout, {
       className: "padding-bottom-gutter",
@@ -131,15 +105,15 @@ var CustomPropertiesFilter = function 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: closeEditModal,
-        openEditModal: openEditModal
+        closeEditModal,
+        openEditModal
       },
       labelOverrides: labelOverrides,
       onSubmit: handleSubmit
@@ -154,5 +128,4 @@ CustomPropertiesFilter.propTypes = {
   intlNS: _propTypes.default.string,
   labelOverrides: _propTypes.default.object
 };
-var _default = CustomPropertiesFilter;
-exports.default = _default;
+var _default = exports.default = CustomPropertiesFilter;

package/es/lib/CustomProperties/Filter/CustomPropertiesFilter.test.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); }
 var _react = _interopRequireDefault(require("react"));
 require("@folio/stripes-erm-components/test/jest/__mock__");
 var _reactRouterDom = require("react-router-dom");
@@ -11,20 +10,13 @@ var _helpers = _interopRequireDefault(require("../../../../test/helpers"));
 var _jest = require("../../../../test/jest");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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); }); }; }
 jest.mock('../../hooks');
-jest.mock('./CustomPropertiesFilterForm', function () {
-  return function () {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      children: "CustomPropertiesFilterForm"
-    });
-  };
-});
-describe('CustomPropertiesFilter', function () {
-  var renderComponent;
-  beforeEach(function () {
+jest.mock('./CustomPropertiesFilterForm', () => () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  children: "CustomPropertiesFilterForm"
+}));
+describe('CustomPropertiesFilter', () => {
+  let renderComponent;
+  beforeEach(() => {
     renderComponent = (0, _jest.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesFilter.default, {
         activeFilters: _testResources.activeFilters,
@@ -33,49 +25,23 @@ describe('CustomPropertiesFilter', function () {
       })
     }), {}, _helpers.default);
   });
-  test('renders the Custom properties Accordion by id', /*#__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.Accordion)({
-            id: 'clickable-custprop-filter'
-          }).exists();
-        case 2:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })));
-  test('renders the Custom properties Accordion', /*#__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.Accordion)('Custom properties').exists();
-        case 2:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  })));
-  test('renders the edit custom property filters 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)({
-            id: 'accordion-toggle-button-clickable-custprop-filter'
-          }).exists();
-        case 2:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  })));
-  it('renders CustomPropertiesFilterForm component ', function () {
-    var _renderComponent = renderComponent,
-      getByText = _renderComponent.getByText;
+  test('renders the Custom properties Accordion by id', async () => {
+    await (0, _stripesTesting.Accordion)({
+      id: 'clickable-custprop-filter'
+    }).exists();
+  });
+  test('renders the Custom properties Accordion', async () => {
+    await (0, _stripesTesting.Accordion)('Custom properties').exists();
+  });
+  test('renders the edit custom property filters button', async () => {
+    await (0, _stripesTesting.Button)({
+      id: 'accordion-toggle-button-clickable-custprop-filter'
+    }).exists();
+  });
+  it('renders CustomPropertiesFilterForm component ', () => {
+    const {
+      getByText
+    } = renderComponent;
     expect(getByText('CustomPropertiesFilterForm')).toBeInTheDocument();
   });
 });

package/es/lib/CustomProperties/Filter/CustomPropertiesFilterField.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
 });
@@ -15,66 +14,56 @@ var _CustomPropertiesRule = _interopRequireDefault(require("./CustomPropertiesRu
 var _hooks = require("../../hooks");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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); }
-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 CustomPropertiesFilterField = function CustomPropertiesFilterField(_ref) {
-  var _customProperties$fin, _customProperties$fin2, _fields$value$index2;
-  var _ref$customProperties = _ref.customProperties,
-    customProperties = _ref$customProperties === void 0 ? [] : _ref$customProperties,
-    fields = _ref.fields,
-    index = _ref.index,
-    passedIntlKey = _ref.intlKey,
-    passedIntlNS = _ref.intlNS,
-    _ref$labelOverrides = _ref.labelOverrides,
-    labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides,
-    name = _ref.name;
-  var groupedCustomProperties = (0, _utils.groupCustomPropertiesByCtx)(customProperties);
-  var _useForm = (0, _reactFinalForm.useForm)(),
-    change = _useForm.change,
-    push = _useForm.mutators.push;
-  var _useFormState = (0, _reactFinalForm.useFormState)(),
-    values = _useFormState.values;
-  var kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
+const CustomPropertiesFilterField = _ref => {
+  let {
+    customProperties = [],
+    fields,
+    index,
+    intlKey: passedIntlKey,
+    intlNS: passedIntlNS,
+    labelOverrides = {},
+    name
+  } = _ref;
+  const groupedCustomProperties = (0, _utils.groupCustomPropertiesByCtx)(customProperties);
+  const {
+    change,
+    mutators: {
+      push
+    }
+  } = (0, _reactFinalForm.useForm)();
+  const {
+    values
+  } = (0, _reactFinalForm.useFormState)();
+  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: function render(fieldProps) {
-        var _Object$entries;
-        var sortedGroupedCustProps = (_Object$entries = Object.entries(groupedCustomProperties)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.sort(function (a, b) {
+      render: fieldProps => {
+        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({}, fieldProps), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.Select, {
+          ...fieldProps,
           placeholder: null // placeholder default causes issues
           ,
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("option", {
             value: "",
             children: " "
-          }, "empty-option"), sortedGroupedCustProps.map(function (_ref2) {
-            var _ref3 = _slicedToArray(_ref2, 2),
-              key = _ref3[0],
-              value = _ref3[1];
+          }, "empty-option"), sortedGroupedCustProps.map(_ref2 => {
+            let [key, value] = _ref2;
             return /*#__PURE__*/(0, _jsxRuntime.jsx)("optgroup", {
               label: key === 'isNull' ? '-' : key,
-              children: value.map(function (v) {
+              children: value.map(v => {
                 return /*#__PURE__*/(0, _jsxRuntime.jsx)("option", {
                   value: v.name,
                   children: v.retired ? kintIntl.formatKintMessage({
@@ -85,22 +74,19 @@ var CustomPropertiesFilterField = function 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(function (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
@@ -128,35 +114,26 @@ var CustomPropertiesFilterField = function CustomPropertiesFilterField(_ref) {
         xs: 2
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalFormArrays.FieldArray, {
-      name: "".concat(name, ".rules"),
-      children: function children(_ref4) {
-        var ruleFields = _ref4.fields;
-        return ruleFields.map(function (ruleFieldName, ruleFieldIndex) {
-          var _values$filters$index;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesRule.default, {
-            ariaLabelledby: "selected-custprop-name-".concat(index),
-            clearRuleValue: function clearRuleValue() {
-              return change("filters[".concat(index, "].rules[").concat(ruleFieldIndex, "].value"), '');
-            },
-            custPropDefinition: customProperties.find(function (t) {
-              return t.name === fields.value[index].customProperty;
-            }),
-            index: ruleFieldIndex,
-            labelOverrides: labelOverrides,
-            name: ruleFieldName,
-            onDelete: function onDelete() {
-              return ruleFields.remove(ruleFieldIndex);
-            },
-            value: (_values$filters$index = values.filters[index]) === null || _values$filters$index === void 0 ? void 0 : _values$filters$index.rules[ruleFieldIndex]
-          }, ruleFieldName);
-        });
+      name: `${name}.rules`,
+      children: _ref3 => {
+        let {
+          fields: ruleFields
+        } = _ref3;
+        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: function onClick() {
-        return push("".concat(name, ".rules"));
-      },
+      disabled: !fields.value[index]?.customProperty,
+      onClick: () => push(`${name}.rules`),
       children: kintIntl.formatKintMessage({
         id: 'addRule',
         overrideValue: labelOverrides.addRule
@@ -173,5 +150,4 @@ CustomPropertiesFilterField.propTypes = {
   labelOverrides: _propTypes.default.object,
   name: _propTypes.default.string
 };
-var _default = CustomPropertiesFilterField;
-exports.default = _default;
+var _default = exports.default = CustomPropertiesFilterField;