@commercetools-frontend-extensions/export-resources-modal 4.4.0 → 4.4.2

package/dist/commercetools-frontend-extensions-export-resources-modal.cjs.dev.js

@@ -35,6 +35,7 @@ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-arr
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
+var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
 var moment = require('moment');
 var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
 var _everyInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/every');
@@ -44,7 +45,6 @@ var actionsGlobal = require('@commercetools-frontend/actions-global');
 var constants = require('@commercetools-frontend/constants');
 var _styled = require('@emotion/styled/base');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
-var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
 var throttle = require('lodash/throttle');
 var formik = require('formik');
 var react = require('@emotion/react');
@@ -74,12 +74,12 @@ var _Array$isArray__default = /*#__PURE__*/_interopDefault(_Array$isArray);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
 var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
+var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
 var moment__default = /*#__PURE__*/_interopDefault(moment);
 var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
 var _everyInstanceProperty__default = /*#__PURE__*/_interopDefault(_everyInstanceProperty);
 var _styled__default = /*#__PURE__*/_interopDefault(_styled);
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
-var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
 var throttle__default = /*#__PURE__*/_interopDefault(throttle);
 var get__default = /*#__PURE__*/_interopDefault(get);
 
@@ -557,21 +557,19 @@ function buildSelectedExportFilters(selectedResourceIds) {
   const formattedIds = _mapInstanceProperty__default["default"](selectedResourceIds).call(selectedResourceIds, id => "\"".concat(id, "\"")).join(', ');
   return "id in (".concat(formattedIds, ")");
 }
-function hasFilters(filters) {
+function areFiltersApplied(filters) {
+  var _filters$where;
   if (!filters) {
     return false;
   }
-  if (_Array$isArray__default["default"](filters)) {
-    return filters.length > 0;
-  }
-  return _Object$keys__default["default"](filters).length > 0;
+  return filters.where !== undefined && ((_filters$where = filters.where) === null || _filters$where === void 0 ? void 0 : _trimInstanceProperty__default["default"](_filters$where).call(_filters$where)) !== '';
 }
 function getInitialExportType(args) {
   var _args$selectedResourc, _args$filters;
   if ((_args$selectedResourc = args.selectedResourceIds) !== null && _args$selectedResourc !== void 0 && _args$selectedResourc.length) {
     return EXPORT_TYPES.SELECTED;
   }
-  if ((_args$filters = args.filters) !== null && _args$filters !== void 0 && _args$filters.total) {
+  if ((_args$filters = args.filters) !== null && _args$filters !== void 0 && _args$filters.total && areFiltersApplied(args.filters)) {
     return EXPORT_TYPES.FILTERED;
   }
   return EXPORT_TYPES.ALL;
@@ -860,8 +858,8 @@ function ExportScopeSection() {
     exportType = _useExportResourcesCo.exportType,
     totalResourcesCount = _useExportResourcesCo.totalResourcesCount,
     filters = _useExportResourcesCo.filters,
-    selectedResourceIds = _useExportResourcesCo.selectedResourceIds,
     hasFilters = _useExportResourcesCo.hasFilters,
+    selectedResourceIds = _useExportResourcesCo.selectedResourceIds,
     setExportType = _useExportResourcesCo.setExportType,
     resourceType = _useExportResourcesCo.resourceType;
   return jsxRuntime.jsx(uiKit.Spacings.Stack, {
@@ -886,9 +884,9 @@ function ExportScopeSection() {
         })
       }), filters && jsxRuntime.jsx(uiKit.RadioInput.Option, {
         value: EXPORT_TYPES.FILTERED,
-        isDisabled: !filters.total,
+        isDisabled: !filters.total || !hasFilters,
         children: jsxRuntime.jsx(uiKit.Text.Body, {
-          tone: !hasFilters ? 'tertiary' : undefined,
+          tone: !filters.total || !hasFilters ? 'tertiary' : undefined,
           intlMessage: filters.total ? _objectSpread$5(_objectSpread$5({}, resourceTypeMessages[resourceType].exportScopeFiltered), {}, {
             values: {
               total: intl.formatNumber(filters.total)
@@ -1609,7 +1607,7 @@ const ExportResourcesProvider = props => {
       totalResourcesCount: props.totalResourcesCount,
       selectedResourceIds: props.selectedResourceIds,
       filters: props.filters,
-      hasFilters: hasFilters(props.filters),
+      hasFilters: areFiltersApplied(props.filters),
       setExportType
     },
     children: props.children

package/dist/commercetools-frontend-extensions-export-resources-modal.cjs.prod.js

@@ -35,6 +35,7 @@ var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-arr
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
+var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
 var moment = require('moment');
 var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
 var _everyInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/every');
@@ -44,7 +45,6 @@ var actionsGlobal = require('@commercetools-frontend/actions-global');
 var constants = require('@commercetools-frontend/constants');
 var _styled = require('@emotion/styled/base');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
-var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
 var throttle = require('lodash/throttle');
 var react = require('@emotion/react');
 var get = require('lodash/get');
@@ -74,12 +74,12 @@ var _Array$isArray__default = /*#__PURE__*/_interopDefault(_Array$isArray);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
 var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
+var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
 var moment__default = /*#__PURE__*/_interopDefault(moment);
 var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
 var _everyInstanceProperty__default = /*#__PURE__*/_interopDefault(_everyInstanceProperty);
 var _styled__default = /*#__PURE__*/_interopDefault(_styled);
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
-var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
 var throttle__default = /*#__PURE__*/_interopDefault(throttle);
 var get__default = /*#__PURE__*/_interopDefault(get);
 
@@ -557,21 +557,19 @@ function buildSelectedExportFilters(selectedResourceIds) {
   const formattedIds = _mapInstanceProperty__default["default"](selectedResourceIds).call(selectedResourceIds, id => "\"".concat(id, "\"")).join(', ');
   return "id in (".concat(formattedIds, ")");
 }
-function hasFilters(filters) {
+function areFiltersApplied(filters) {
+  var _filters$where;
   if (!filters) {
     return false;
   }
-  if (_Array$isArray__default["default"](filters)) {
-    return filters.length > 0;
-  }
-  return _Object$keys__default["default"](filters).length > 0;
+  return filters.where !== undefined && ((_filters$where = filters.where) === null || _filters$where === void 0 ? void 0 : _trimInstanceProperty__default["default"](_filters$where).call(_filters$where)) !== '';
 }
 function getInitialExportType(args) {
   var _args$selectedResourc, _args$filters;
   if ((_args$selectedResourc = args.selectedResourceIds) !== null && _args$selectedResourc !== void 0 && _args$selectedResourc.length) {
     return EXPORT_TYPES.SELECTED;
   }
-  if ((_args$filters = args.filters) !== null && _args$filters !== void 0 && _args$filters.total) {
+  if ((_args$filters = args.filters) !== null && _args$filters !== void 0 && _args$filters.total && areFiltersApplied(args.filters)) {
     return EXPORT_TYPES.FILTERED;
   }
   return EXPORT_TYPES.ALL;
@@ -860,8 +858,8 @@ function ExportScopeSection() {
     exportType = _useExportResourcesCo.exportType,
     totalResourcesCount = _useExportResourcesCo.totalResourcesCount,
     filters = _useExportResourcesCo.filters,
-    selectedResourceIds = _useExportResourcesCo.selectedResourceIds,
     hasFilters = _useExportResourcesCo.hasFilters,
+    selectedResourceIds = _useExportResourcesCo.selectedResourceIds,
     setExportType = _useExportResourcesCo.setExportType,
     resourceType = _useExportResourcesCo.resourceType;
   return jsxRuntime.jsx(uiKit.Spacings.Stack, {
@@ -886,9 +884,9 @@ function ExportScopeSection() {
         })
       }), filters && jsxRuntime.jsx(uiKit.RadioInput.Option, {
         value: EXPORT_TYPES.FILTERED,
-        isDisabled: !filters.total,
+        isDisabled: !filters.total || !hasFilters,
         children: jsxRuntime.jsx(uiKit.Text.Body, {
-          tone: !hasFilters ? 'tertiary' : undefined,
+          tone: !filters.total || !hasFilters ? 'tertiary' : undefined,
           intlMessage: filters.total ? _objectSpread$5(_objectSpread$5({}, resourceTypeMessages[resourceType].exportScopeFiltered), {}, {
             values: {
               total: intl.formatNumber(filters.total)
@@ -1570,7 +1568,7 @@ const ExportResourcesProvider = props => {
       totalResourcesCount: props.totalResourcesCount,
       selectedResourceIds: props.selectedResourceIds,
       filters: props.filters,
-      hasFilters: hasFilters(props.filters),
+      hasFilters: areFiltersApplied(props.filters),
       setExportType
     },
     children: props.children

package/dist/commercetools-frontend-extensions-export-resources-modal.esm.js

@@ -31,6 +31,7 @@ import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array
 import _Set from '@babel/runtime-corejs3/core-js-stable/set';
 import _sortInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/sort';
 import _indexOfInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/index-of';
+import _trimInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/trim';
 import moment from 'moment';
 import _findInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/find';
 import _everyInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/every';
@@ -40,7 +41,6 @@ import { useShowNotification } from '@commercetools-frontend/actions-global';
 import { MC_API_PROXY_TARGETS, DOMAINS } from '@commercetools-frontend/constants';
 import _styled from '@emotion/styled/base';
 import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
-import _trimInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/trim';
 import throttle from 'lodash/throttle';
 import { useFormik } from 'formik';
 import { css } from '@emotion/react';
@@ -522,21 +522,19 @@ function buildSelectedExportFilters(selectedResourceIds) {
   const formattedIds = _mapInstanceProperty(selectedResourceIds).call(selectedResourceIds, id => "\"".concat(id, "\"")).join(', ');
   return "id in (".concat(formattedIds, ")");
 }
-function hasFilters(filters) {
+function areFiltersApplied(filters) {
+  var _filters$where;
   if (!filters) {
     return false;
   }
-  if (_Array$isArray(filters)) {
-    return filters.length > 0;
-  }
-  return _Object$keys(filters).length > 0;
+  return filters.where !== undefined && ((_filters$where = filters.where) === null || _filters$where === void 0 ? void 0 : _trimInstanceProperty(_filters$where).call(_filters$where)) !== '';
 }
 function getInitialExportType(args) {
   var _args$selectedResourc, _args$filters;
   if ((_args$selectedResourc = args.selectedResourceIds) !== null && _args$selectedResourc !== void 0 && _args$selectedResourc.length) {
     return EXPORT_TYPES.SELECTED;
   }
-  if ((_args$filters = args.filters) !== null && _args$filters !== void 0 && _args$filters.total) {
+  if ((_args$filters = args.filters) !== null && _args$filters !== void 0 && _args$filters.total && areFiltersApplied(args.filters)) {
     return EXPORT_TYPES.FILTERED;
   }
   return EXPORT_TYPES.ALL;
@@ -825,8 +823,8 @@ function ExportScopeSection() {
     exportType = _useExportResourcesCo.exportType,
     totalResourcesCount = _useExportResourcesCo.totalResourcesCount,
     filters = _useExportResourcesCo.filters,
-    selectedResourceIds = _useExportResourcesCo.selectedResourceIds,
     hasFilters = _useExportResourcesCo.hasFilters,
+    selectedResourceIds = _useExportResourcesCo.selectedResourceIds,
     setExportType = _useExportResourcesCo.setExportType,
     resourceType = _useExportResourcesCo.resourceType;
   return jsx(Spacings.Stack, {
@@ -851,9 +849,9 @@ function ExportScopeSection() {
         })
       }), filters && jsx(RadioInput.Option, {
         value: EXPORT_TYPES.FILTERED,
-        isDisabled: !filters.total,
+        isDisabled: !filters.total || !hasFilters,
         children: jsx(Text.Body, {
-          tone: !hasFilters ? 'tertiary' : undefined,
+          tone: !filters.total || !hasFilters ? 'tertiary' : undefined,
           intlMessage: filters.total ? _objectSpread$5(_objectSpread$5({}, resourceTypeMessages[resourceType].exportScopeFiltered), {}, {
             values: {
               total: intl.formatNumber(filters.total)
@@ -1574,7 +1572,7 @@ const ExportResourcesProvider = props => {
       totalResourcesCount: props.totalResourcesCount,
       selectedResourceIds: props.selectedResourceIds,
       filters: props.filters,
-      hasFilters: hasFilters(props.filters),
+      hasFilters: areFiltersApplied(props.filters),
       setExportType
     },
     children: props.children

package/dist/declarations/src/@types/export-resources-modal-types.d.ts

@@ -28,7 +28,6 @@ export interface ExportResourcesModalShape {
     selectedResourceIds?: string[];
     fieldGroups: FieldGroup[];
     fieldOrder?: string[];
-    withFilters?: boolean;
     onClose: () => void;
     onExportSuccess?: () => void;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@commercetools-frontend-extensions/export-resources-modal",
   "description": "Shared export modal for exporting resources",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "license": "BSD-3-Clause",
   "publishConfig": {
     "access": "public"
@@ -15,11 +15,11 @@
     "README.md"
   ],
   "dependencies": {
-    "@babel/runtime": "7.24.8",
-    "@babel/runtime-corejs3": "7.24.8",
+    "@babel/runtime": "7.25.0",
+    "@babel/runtime-corejs3": "7.25.0",
     "@commercetools-frontend/experimental-components": "6.1.3",
-    "@emotion/react": "11.11.4",
-    "@emotion/styled": "11.11.5",
+    "@emotion/react": "11.13.0",
+    "@emotion/styled": "11.13.0",
     "@formatjs/cli": "6.2.12",
     "formik": "2.4.6",
     "jest": "29.7.0",