@commercetools-frontend-extensions/export-resources-modal 0.0.0-canary-20240823130607 → 0.0.0-canary-20240826115334

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -36,7 +36,6 @@ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-arr
36
36
  var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
37
37
  var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
38
38
  var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
39
- var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
40
39
  var moment = require('moment');
41
40
  var _someInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/some');
42
41
  var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
@@ -74,7 +73,6 @@ var _Array$isArray__default = /*#__PURE__*/_interopDefault(_Array$isArray);
74
73
  var _Set__default = /*#__PURE__*/_interopDefault(_Set);
75
74
  var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
76
75
  var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
77
- var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
78
76
  var moment__default = /*#__PURE__*/_interopDefault(moment);
79
77
  var _someInstanceProperty__default = /*#__PURE__*/_interopDefault(_someInstanceProperty);
80
78
  var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
@@ -637,14 +635,12 @@ function buildSelectedExportFilters(selectedResourceIds) {
637
635
  return `id in (${formattedIds})`;
638
636
  }
639
637
  function validateFilters(filters) {
640
- var _context;
641
- const hasQueryPredicate = typeof filters.queryPredicate === 'string' && _trimInstanceProperty__default["default"](_context = filters.queryPredicate).call(_context) !== '';
642
- const hasSearchQuery = !!(filters.searchQuery && typeof filters.searchQuery === 'object');
643
- const hasValidTotal = typeof filters.total === 'number' && filters.total >= 0;
638
+ const hasQueryPredicate = 'queryPredicate' in filters;
639
+ const hasSearchQuery = 'searchQuery' in filters;
644
640
 
645
- // Ensure only one of `queryPredicate` or `searchQuery` is applied
646
- const onlyOneFilterApplied = hasQueryPredicate && !hasSearchQuery || !hasQueryPredicate && hasSearchQuery;
647
- return onlyOneFilterApplied && hasValidTotal;
641
+ // Ensure only one of `queryPredicate` or `searchQuery` is applied but not both or none
642
+ const validFilterState = hasQueryPredicate && !hasSearchQuery || !hasQueryPredicate && hasSearchQuery;
643
+ return validFilterState;
648
644
  }
649
645
  function areFiltersApplied(filters) {
650
646
  if (!filters) {
@@ -1772,7 +1768,7 @@ const ExportResourcesModal = props => {
1772
1768
  const messages = useAsyncIntlMessages(locale, loadMessages);
1773
1769
  if (!props.isOpen || messages.isLoading) return null;
1774
1770
  if (props.filters && !validateFilters(props.filters)) {
1775
- console.error('Invalid filters prop:', props.filters, 'Filters must have either a valid `queryPredicate` or a valid `searchQuery`, but not both.');
1771
+ console.error('Invalid filters prop:', props.filters, 'Filters must contain either `queryPredicate` or `searchQuery`, but not both, and it cannot be empty');
1776
1772
  return null;
1777
1773
  }
1778
1774
  return jsxRuntime.jsx(reactIntl.IntlProvider, {
@@ -36,7 +36,6 @@ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-arr
36
36
  var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
37
37
  var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
38
38
  var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
39
- var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
40
39
  var moment = require('moment');
41
40
  var _someInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/some');
42
41
  var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
@@ -74,7 +73,6 @@ var _Array$isArray__default = /*#__PURE__*/_interopDefault(_Array$isArray);
74
73
  var _Set__default = /*#__PURE__*/_interopDefault(_Set);
75
74
  var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
76
75
  var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
77
- var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
78
76
  var moment__default = /*#__PURE__*/_interopDefault(moment);
79
77
  var _someInstanceProperty__default = /*#__PURE__*/_interopDefault(_someInstanceProperty);
80
78
  var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
@@ -637,14 +635,12 @@ function buildSelectedExportFilters(selectedResourceIds) {
637
635
  return `id in (${formattedIds})`;
638
636
  }
639
637
  function validateFilters(filters) {
640
- var _context;
641
- const hasQueryPredicate = typeof filters.queryPredicate === 'string' && _trimInstanceProperty__default["default"](_context = filters.queryPredicate).call(_context) !== '';
642
- const hasSearchQuery = !!(filters.searchQuery && typeof filters.searchQuery === 'object');
643
- const hasValidTotal = typeof filters.total === 'number' && filters.total >= 0;
638
+ const hasQueryPredicate = 'queryPredicate' in filters;
639
+ const hasSearchQuery = 'searchQuery' in filters;
644
640
 
645
- // Ensure only one of `queryPredicate` or `searchQuery` is applied
646
- const onlyOneFilterApplied = hasQueryPredicate && !hasSearchQuery || !hasQueryPredicate && hasSearchQuery;
647
- return onlyOneFilterApplied && hasValidTotal;
641
+ // Ensure only one of `queryPredicate` or `searchQuery` is applied but not both or none
642
+ const validFilterState = hasQueryPredicate && !hasSearchQuery || !hasQueryPredicate && hasSearchQuery;
643
+ return validFilterState;
648
644
  }
649
645
  function areFiltersApplied(filters) {
650
646
  if (!filters) {
@@ -1739,7 +1735,7 @@ const ExportResourcesModal = props => {
1739
1735
  const messages = useAsyncIntlMessages(locale, loadMessages);
1740
1736
  if (!props.isOpen || messages.isLoading) return null;
1741
1737
  if (props.filters && !validateFilters(props.filters)) {
1742
- console.error('Invalid filters prop:', props.filters, 'Filters must have either a valid `queryPredicate` or a valid `searchQuery`, but not both.');
1738
+ console.error('Invalid filters prop:', props.filters, 'Filters must contain either `queryPredicate` or `searchQuery`, but not both, and it cannot be empty');
1743
1739
  return null;
1744
1740
  }
1745
1741
  return jsxRuntime.jsx(reactIntl.IntlProvider, {
@@ -32,7 +32,6 @@ import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array
32
32
  import _Set from '@babel/runtime-corejs3/core-js-stable/set';
33
33
  import _sortInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/sort';
34
34
  import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
35
- import _trimInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/trim';
36
35
  import moment from 'moment';
37
36
  import _someInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/some';
38
37
  import _findInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/find';
@@ -602,14 +601,12 @@ function buildSelectedExportFilters(selectedResourceIds) {
602
601
  return `id in (${formattedIds})`;
603
602
  }
604
603
  function validateFilters(filters) {
605
- var _context;
606
- const hasQueryPredicate = typeof filters.queryPredicate === 'string' && _trimInstanceProperty(_context = filters.queryPredicate).call(_context) !== '';
607
- const hasSearchQuery = !!(filters.searchQuery && typeof filters.searchQuery === 'object');
608
- const hasValidTotal = typeof filters.total === 'number' && filters.total >= 0;
604
+ const hasQueryPredicate = 'queryPredicate' in filters;
605
+ const hasSearchQuery = 'searchQuery' in filters;
609
606
 
610
- // Ensure only one of `queryPredicate` or `searchQuery` is applied
611
- const onlyOneFilterApplied = hasQueryPredicate && !hasSearchQuery || !hasQueryPredicate && hasSearchQuery;
612
- return onlyOneFilterApplied && hasValidTotal;
607
+ // Ensure only one of `queryPredicate` or `searchQuery` is applied but not both or none
608
+ const validFilterState = hasQueryPredicate && !hasSearchQuery || !hasQueryPredicate && hasSearchQuery;
609
+ return validFilterState;
613
610
  }
614
611
  function areFiltersApplied(filters) {
615
612
  if (!filters) {
@@ -1737,7 +1734,7 @@ const ExportResourcesModal = props => {
1737
1734
  const messages = useAsyncIntlMessages(locale, loadMessages);
1738
1735
  if (!props.isOpen || messages.isLoading) return null;
1739
1736
  if (props.filters && !validateFilters(props.filters)) {
1740
- console.error('Invalid filters prop:', props.filters, 'Filters must have either a valid `queryPredicate` or a valid `searchQuery`, but not both.');
1737
+ console.error('Invalid filters prop:', props.filters, 'Filters must contain either `queryPredicate` or `searchQuery`, but not both, and it cannot be empty');
1741
1738
  return null;
1742
1739
  }
1743
1740
  return jsx(IntlProvider, {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@commercetools-frontend-extensions/export-resources-modal",
3
3
  "description": "Shared export modal for exporting resources",
4
- "version": "0.0.0-canary-20240823130607",
4
+ "version": "0.0.0-canary-20240826115334",
5
5
  "license": "BSD-3-Clause",
6
6
  "publishConfig": {
7
7
  "access": "public"