@k-int/stripes-kint-components 2.8.2 → 3.0.0

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

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactIntl = require("react-intl");
-
 var _finalFormArrays = _interopRequireDefault(require("final-form-arrays"));
 
 var _components = require("@folio/stripes/components");
@@ -17,6 +15,8 @@ var _FormModal = _interopRequireDefault(require("../../FormModal"));
 
 var _CustomPropertiesFilterFieldArray = _interopRequireDefault(require("./CustomPropertiesFilterFieldArray"));
 
+var _hooks = require("../../hooks");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,22 +28,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var CustomPropertyFiltersForm = function CustomPropertyFiltersForm(_ref) {
-  var _labelOverrides$editC, _labelOverrides$filte;
-
   var customProperties = _ref.customProperties,
       editingFilters = _ref.editingFilters,
       filters = _ref.filters,
       _ref$handlers = _ref.handlers,
       closeEditModal = _ref$handlers.closeEditModal,
       openEditModal = _ref$handlers.openEditModal,
+      passedIntlKey = _ref.intlKey,
+      passedIntlNS = _ref.intlNS,
       _ref$labelOverrides = _ref.labelOverrides,
       labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides,
       onSubmit = _ref.onSubmit;
+  var kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
       onClick: openEditModal,
-      children: (_labelOverrides$editC = labelOverrides.editCustomPropertyFilters) !== null && _labelOverrides$editC !== void 0 ? _labelOverrides$editC : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-        id: "stripes-kint-components.customProperty.editCustomPropertyFilters"
+      children: kintIntl.formatKintMessage({
+        id: 'customProperty.editCustomPropertyFilters',
+        overrideValue: labelOverrides.editCustomPropertyFilters
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormModal.default, {
       initialValues: {
@@ -52,15 +54,17 @@ var CustomPropertyFiltersForm = function CustomPropertyFiltersForm(_ref) {
         }]
       },
       labelOverrides: {
-        save: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-          id: "stripes-kint-components.apply"
+        saveAndClose: kintIntl.formatKintMessage({
+          id: 'apply',
+          overrideValue: labelOverrides.apply
         })
       },
       modalProps: {
         dismissible: true,
         enforceFocus: false,
-        label: (_labelOverrides$filte = labelOverrides.filterBuilder) !== null && _labelOverrides$filte !== void 0 ? _labelOverrides$filte : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-          id: "stripes-kint-components.customProperty.filterbuilder"
+        label: kintIntl.formatKintMessage({
+          id: 'customProperty.filterBuilder',
+          overrideValue: labelOverrides.filterBuilder
         }),
         onClose: closeEditModal,
         open: editingFilters,
@@ -84,6 +88,8 @@ CustomPropertyFiltersForm.propTypes = {
     closeEditModal: _propTypes.default.func.isRequired,
     openEditModal: _propTypes.default.func.isRequired
   }),
+  intlKey: _propTypes.default.string,
+  intlNS: _propTypes.default.string,
   labelOverrides: _propTypes.default.object,
   onSubmit: _propTypes.default.func.isRequired
 };

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

@@ -8,14 +8,12 @@ require("@folio/stripes-erm-components/test/jest/__mock__");
 
 var _stripesTesting = require("@folio/stripes-testing");
 
-var _helpers = require("@folio/stripes-erm-components/test/jest/helpers");
-
 var _CustomPropertiesFilterForm = _interopRequireDefault(require("./CustomPropertiesFilterForm"));
 
-var _helpers2 = require("../../../../test/jest/helpers");
-
 var _testResources = require("./testResources");
 
+var _jest = require("../../../../test/jest");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -32,6 +30,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+jest.mock('../../hooks');
 jest.mock('./CustomPropertiesFilterFieldArray', function () {
   return function () {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -43,23 +42,24 @@ var onSubmit = jest.fn();
 describe('CustomPropertyFiltersForm', function () {
   var renderComponent;
   beforeEach(function () {
-    renderComponent = (0, _helpers2.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_helpers.TestForm, {
-      onSubmit: onSubmit,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesFilterForm.default, _objectSpread({}, _testResources.data))
-    }));
+    renderComponent = (0, _jest.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesFilterForm.default, _objectSpread({
+      onSubmit: onSubmit
+    }, _testResources.data)));
   });
   it('renders CustomPropertiesFilterFieldArray component ', function () {
     var _renderComponent = renderComponent,
         getByText = _renderComponent.getByText;
     expect(getByText('CustomPropertiesFilterFieldArray')).toBeInTheDocument();
   });
-  test('renders the submit button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  test('renders the apply button (disabled)', /*#__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.Button)('Submit').exists();
+            return (0, _stripesTesting.Button)('Apply').has({
+              disabled: true
+            });
 
           case 2:
           case "end":
@@ -68,13 +68,13 @@ describe('CustomPropertyFiltersForm', function () {
       }
     }, _callee);
   })));
-  test('renders the Edit supplementary property filters button', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  test('renders the Edit custom property filters button', /*#__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.Button)('Edit supplementary property filters').exists();
+            return (0, _stripesTesting.Button)('Edit custom property filters').exists();
 
           case 2:
           case "end":

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

@@ -11,8 +11,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _reactIntl = require("react-intl");
-
 var _reactFinalForm = require("react-final-form");
 
 var _components = require("@folio/stripes/components");
@@ -23,6 +21,8 @@ var _useValueProps = _interopRequireDefault(require("./useValueProps"));
 
 var _useOperators = _interopRequireDefault(require("./useOperators"));
 
+var _hooks = require("../../hooks");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -37,6 +37,9 @@ var propTypes = {
   ariaLabelledby: _propTypes.default.string.isRequired,
   clearRuleValue: _propTypes.default.func.isRequired,
   index: _propTypes.default.number.isRequired,
+  intlKey: _propTypes.default.string,
+  intlNS: _propTypes.default.string,
+  labelOverrides: _propTypes.default.object,
   name: _propTypes.default.string.isRequired,
   onDelete: _propTypes.default.func.isRequired,
   custPropDefinition: _propTypes.default.shape({
@@ -55,13 +58,18 @@ var CustomPropertiesRule = function CustomPropertiesRule(_ref) {
   var ariaLabelledby = _ref.ariaLabelledby,
       clearRuleValue = _ref.clearRuleValue,
       index = _ref.index,
+      passedIntlKey = _ref.intlKey,
+      passedIntlNS = _ref.intlNS,
+      _ref$labelOverrides = _ref.labelOverrides,
+      labelOverrides = _ref$labelOverrides === void 0 ? {} : _ref$labelOverrides,
       name = _ref.name,
       onDelete = _ref.onDelete,
       _ref$custPropDefiniti = _ref.custPropDefinition,
       custPropDefinition = _ref$custPropDefiniti === void 0 ? {} : _ref$custPropDefiniti,
       value = _ref.value;
-  var operators = (0, _useOperators.default)(custPropDefinition.type);
-  var valueProps = (0, _useValueProps.default)(custPropDefinition);
+  var operators = (0, _useOperators.default)(custPropDefinition.type, passedIntlKey, passedIntlNS, labelOverrides);
+  var valueProps = (0, _useValueProps.default)(custPropDefinition, passedIntlKey, passedIntlNS, labelOverrides);
+  var kintIntl = (0, _hooks.useKintIntl)(passedIntlKey, passedIntlNS);
   var selectedOperator = operators.find(function (o) {
     return o.value === (value === null || value === void 0 ? void 0 : value.operator);
   });
@@ -70,8 +78,9 @@ var CustomPropertiesRule = function CustomPropertiesRule(_ref) {
       xs: 2,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Layout, {
         className: "textCentered",
-        children: index === 0 ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-          id: "stripes-kint-components.OR"
+        children: index === 0 ? null : kintIntl.formatKintMessage({
+          id: 'OR',
+          overrideValue: labelOverrides.OR
         })
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Col, {
@@ -113,11 +122,11 @@ var CustomPropertiesRule = function CustomPropertiesRule(_ref) {
       xs: 2,
       children: index ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Tooltip, {
         id: (0, _uniqueId2.default)('delete-rule-btn'),
-        text: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
-          id: "stripes-kint-components.customProperty.removeRule",
-          values: {
-            number: index + 1
-          }
+        text: kintIntl.formatKintMessage({
+          id: 'customProperty.removeRule',
+          overrideValue: labelOverrides.removeRule
+        }, {
+          number: index + 1
         }),
         children: function children(_ref3) {
           var ref = _ref3.ref,

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

@@ -12,10 +12,10 @@ var _stripesTesting = require("@folio/stripes-testing");
 
 var _helpers = require("@folio/stripes-erm-components/test/jest/helpers");
 
-var _helpers2 = require("../../../../test/jest/helpers");
-
 var _CustomPropertiesRule = _interopRequireDefault(require("./CustomPropertiesRule"));
 
+var _jest = require("../../../../test/jest");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,12 +28,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 var onSubmit = jest.fn();
 var onDelete = jest.fn();
+jest.mock('../../hooks');
 
 var clearRuleValue = function clearRuleValue() {};
 
 describe('CustomPropertiesRule', function () {
   beforeEach(function () {
-    (0, _helpers2.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
+    (0, _jest.renderWithKintHarness)( /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.MemoryRouter, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_helpers.TestForm, {
         onSubmit: onSubmit,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomPropertiesRule.default, {

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

@@ -3,234 +3,42 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.labelOverrides = exports.filterHandlers = exports.fields = exports.data = exports.customProperties = exports.activeFilters = void 0;
+exports.filterHandlers = exports.data = exports.activeFilters = void 0;
+
+var _jest = require("../../../../test/jest");
+
+var _refdata$find, _refdata$find$values, _refdata$find$values$;
+
 var activeFilters = {
-  'agreementStatus': ['active', 'draft', 'in_negotiation', 'requested'],
-  'customProperties': ['customProperties.AuthorIdentification.value==2c91809c813e654501813e6c3bc50061']
+  'customProperties': ["customProperties.AuthorIdentification.value==".concat(_jest.refdata === null || _jest.refdata === void 0 ? void 0 : (_refdata$find = _jest.refdata.find(function (rdc) {
+    return rdc.desc === 'AuthIdent';
+  })) === null || _refdata$find === void 0 ? void 0 : (_refdata$find$values = _refdata$find.values) === null || _refdata$find$values === void 0 ? void 0 : (_refdata$find$values$ = _refdata$find$values.find(function (rdv) {
+    return rdv.value === 'email_domain';
+  })) === null || _refdata$find$values$ === void 0 ? void 0 : _refdata$find$values$.id)]
 };
 exports.activeFilters = activeFilters;
 var filterHandlers = {
-  'state': function state() {},
-  'checkbox': function checkbox() {},
-  'clear': function clear() {},
-  'clearGroup': function clearGroup() {},
-  'reset': function reset() {}
-};
-exports.filterHandlers = filterHandlers;
-var labelOverrides = {
-  'customProperty': 'Supplementary property',
-  'customProperties': 'Supplementrary properties',
-  'filtersApplied': function filtersApplied() {},
-  'editCustomPropertyFilters': '<Memo />',
-  'filterBuilder': '<Memo />',
-  'customPropertyFilter': function customPropertyFilter() {},
-  'removeFilter': function removeFilter() {},
-  'retiredName': function retiredName() {}
-};
-exports.labelOverrides = labelOverrides;
-var customProperties = [{
-  'id': '2c91809c813e654501813e6c3c6a0066',
-  'retired': false,
-  'ctx': 'OpenAccess',
-  'name': 'AuthorIdentification',
-  'primary': true,
-  'category': {
-    'id': '2c91809c813e654501813e6c3bbb005e',
-    'desc': 'AuthIdent',
-    'internal': false,
-    'values': [{
-      'id': '2c91809c813e654501813e6c3bcf0064',
-      'value': 'ringgold_id',
-      'label': 'Ringgold ID'
-    }, {
-      'id': '2c91809c813e654501813e6c3bbd005f',
-      'value': 'other',
-      'label': 'Other'
-    }, {
-      'id': '2c91809c813e654501813e6c3bcc0063',
-      'value': 'over_ip_range',
-      'label': 'Over IP Range'
-    }, {
-      'id': '2c91809c813e654501813e6c3bc20060',
-      'value': 'email_domain',
-      'label': 'Email Domain'
-    }, {
-      'id': '2c91809c813e654501813e6c3bc50061',
-      'value': 'orcid',
-      'label': 'ORCID'
-    }, {
-      'id': '2c91809c813e654501813e6c3bc90062',
-      'value': 'over_institute',
-      'label': 'Over Institute'
-    }, {
-      'id': '2c91809c813e654501813e6c3bd20065',
-      'value': 'ror_id',
-      'label': 'ROR ID'
-    }]
+  'state': function state() {
+    return {};
   },
-  'defaultInternal': true,
-  'label': 'Author Identification',
-  'description': 'Author Identification',
-  'weight': 0,
-  'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyRefdata'
-}, {
-  'id': '2c91809c813e654501813e6c3c7d0067',
-  'retired': false,
-  'ctx': 'OpenAccess',
-  'name': 'Eligible authors',
-  'primary': true,
-  'defaultInternal': true,
-  'label': 'Does this agreement support publishing',
-  'description': 'Does this agreement support publishing',
-  'weight': 0,
-  'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyText'
-}, {
-  'id': '2c91809c813e654501814287324e0070',
-  'retired': false,
-  'ctx': 'OpenAccess',
-  'name': 'Test',
-  'primary': true,
-  'category': {
-    'id': '2096ecb6794fae7aa29074cf31970b17',
-    'desc': 'SubscriptionAgreement.AgreementStatus',
-    'internal': true,
-    'values': '[{…}, {…}, {…}, {…}, {…}]'
+  'checkbox': function checkbox() {
+    return {};
   },
-  'defaultInternal': true,
-  'label': 'test',
-  'description': 'test description',
-  'weight': 1,
-  'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyRefdata'
-}, {
-  'id': '2c91809c813e6545018143f201040073',
-  'retired': false,
-  'name': 'TestTextSuppProp',
-  'primary': true,
-  'defaultInternal': false,
-  'label': 'TestTextSuppProp',
-  'description': 'TestTextSuppProp',
-  'weight': 0,
-  'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyText'
-}];
-exports.customProperties = customProperties;
-var fields = {
-  'name': 'filters',
-  'forEach': function forEach() {},
-  'length': 2,
-  'map': function map() {},
-  'insert': function insert() {},
-  'concat': function concat() {},
-  'move': function move() {},
-  'pop': function pop() {},
-  'push': function push() {},
-  'remove': function remove() {},
-  'removeBatch': function removeBatch() {},
-  'shift': function shift() {},
-  'swap': function swap() {},
-  'unshift': function unshift() {},
-  'update': function update() {},
-  'value': [{
-    'customProperty': 'AuthorIdentification',
-    'rules': [{
-      'operator': '==',
-      'value': '2c91809c813e654501813e6c3bc50061'
-    }]
-  }, {
-    'customProperty': 'AuthorIdentification',
-    'rules': [{
-      'operator': '==',
-      'value': '2c91809c813e654501813e6c3bd20065'
-    }]
-  }]
+  'clear': function clear() {
+    return {};
+  },
+  'clearGroup': function clearGroup() {
+    return {};
+  },
+  'reset': function reset() {
+    return {};
+  }
 };
-exports.fields = fields;
+exports.filterHandlers = filterHandlers;
 var data = {
-  'customProperties': [{
-    'id': '2c91809c813e654501813e6c3c6a0066',
-    'retired': false,
-    'ctx': 'OpenAccess',
-    'name': 'AuthorIdentification',
-    'primary': true,
-    'category': {
-      'id': '2c91809c813e654501813e6c3bbb005e',
-      'desc': 'AuthIdent',
-      'internal': false,
-      'values': [{
-        'id': '2c91809c813e654501813e6c3bd20065',
-        'value': 'ror_id',
-        'label': 'ROR ID'
-      }, {
-        'id': '2c91809c813e654501813e6c3bc20060',
-        'value': 'email_domain',
-        'label': 'Email Domain'
-      }, {
-        'id': '2c91809c813e654501813e6c3bc50061',
-        'value': 'orcid',
-        'label': 'ORCID'
-      }, {
-        'id': '2c91809c813e654501813e6c3bcf0064',
-        'value': 'ringgold_id',
-        'label': 'Ringgold ID'
-      }, {
-        'id': '2c91809c813e654501813e6c3bbd005f',
-        'value': 'other',
-        'label': 'Other'
-      }, {
-        'id': '2c91809c813e654501813e6c3bc90062',
-        'value': 'over_institute',
-        'label': 'Over Institute'
-      }, {
-        'id': '2c91809c813e654501813e6c3bcc0063',
-        'value': 'over_ip_range',
-        'label': 'Over IP Range'
-      }]
-    },
-    'defaultInternal': true,
-    'label': 'Author Identification',
-    'description': 'Author Identification',
-    'weight': 0,
-    'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyRefdata'
-  }, {
-    'id': '2c91809c813e654501813e6c3c7d0067',
-    'retired': false,
-    'ctx': 'OpenAccess',
-    'name': 'Eligible authors',
-    'primary': true,
-    'defaultInternal': true,
-    'label': 'Does this agreement support publishing',
-    'description': 'Does this agreement support publishing',
-    'weight': 0,
-    'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyText'
-  }, {
-    'id': '2c91809c813e654501814287324e0070',
-    'retired': false,
-    'ctx': 'OpenAccess',
-    'name': 'Test',
-    'primary': true,
-    'category': {
-      'id': '2096ecb6794fae7aa29074cf31970b17',
-      'desc': 'SubscriptionAgreement.AgreementStatus',
-      'internal': true,
-      'values': '[{…}, {…}, {…}, {…}, {…}]'
-    },
-    'defaultInternal': true,
-    'label': 'test',
-    'description': 'test description',
-    'weight': 1,
-    'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyRefdata'
-  }, {
-    'id': '2c91809c813e6545018143f201040073',
-    'retired': false,
-    'name': 'TestTextSuppProp',
-    'primary': true,
-    'defaultInternal': false,
-    'label': 'TestTextSuppProp',
-    'description': 'TestTextSuppProp',
-    'weight': 0,
-    'type': 'com.k_int.web.toolkit.custprops.types.CustomPropertyText'
-  }],
-  'editingFilters': true,
-  'filters': [{
+  customProperties: _jest.customProperties,
+  editingFilters: true,
+  filters: [{
     'customProperty': 'AuthorIdentification',
     'rules': [{
       'operator': '==',
@@ -244,19 +52,15 @@ var data = {
     }]
   }],
   'handlers': {
-    'closeEditModal': function closeEditModal() {},
-    'openEditModal': function openEditModal() {}
-  },
-  'labelOverrides': {
-    'customProperty': '<Memo />',
-    'customProperties': '<Memo />',
-    'filtersApplied': function filtersApplied() {},
-    'editCustomPropertyFilters': 'Edit supplementary property filters',
-    'filterBuilder': '<Memo />',
-    'customPropertyFilter': function customPropertyFilter() {},
-    'removeFilter': function removeFilter() {},
-    'retiredName': function retiredName() {}
+    'closeEditModal': function closeEditModal() {
+      return {};
+    },
+    'openEditModal': function openEditModal() {
+      return {};
+    }
   },
-  'onSubmit': function onSubmit() {}
+  'onSubmit': function onSubmit() {
+    return {};
+  }
 };
 exports.data = data;