@commercetools-frontend-extensions/export-resources-modal 4.6.0 → 4.6.2

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

@@ -48,6 +48,7 @@ var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/i
 var throttle = require('lodash/throttle');
 var react = require('@emotion/react');
 var get = require('lodash/get');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var formik = require('formik');
 var i18n = require('@commercetools-frontend/i18n');
 var sentry = require('@commercetools-frontend/sentry');
@@ -361,14 +362,14 @@ var messages = reactIntl.defineMessages({
   }
 });
 
-function ownKeys$7(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$7(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$7(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$7(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function ownKeys$6(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$6(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$6(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 function renderFileNameError(key) {
   switch (key) {
     case 'missing':
-      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$7({}, messages.missingFileNameError));
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$6({}, messages.missingFileNameError));
     case 'invalidInput':
-      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$7({}, messages.invalidFileNameError));
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$6({}, messages.invalidFileNameError));
     default:
       return null;
   }
@@ -376,7 +377,7 @@ function renderFileNameError(key) {
 function renderLocaleError(key) {
   switch (key) {
     case 'missing':
-      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$7({}, messages.missingLocaleError));
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$6({}, messages.missingLocaleError));
     default:
       return null;
   }
@@ -465,7 +466,7 @@ let MissingExportResourceProviderError = /*#__PURE__*/function (_Error) {
   function MissingExportResourceProviderError() {
     var _this;
     _classCallCheck(this, MissingExportResourceProviderError);
-    _this = _callSuper$3(this, MissingExportResourceProviderError, ['useExportResourcesContext must be used within ExportResourcesProvider']);
+    _this = _callSuper$3(this, MissingExportResourceProviderError, ['useExportResourcesModalContext must be used within ExportResourcesProvider']);
     _this.name = 'MissingExportResourceProviderError';
     return _this;
   }
@@ -504,10 +505,10 @@ let UnexpectedResourceTypeError = /*#__PURE__*/function (_Error) {
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct__default["default"](o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct__default["default"](Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function () { return !!t; })(); }
 let InvalidResponseError = /*#__PURE__*/function (_Error) {
-  function InvalidResponseError(message) {
+  function InvalidResponseError() {
     var _this;
     _classCallCheck(this, InvalidResponseError);
-    _this = _callSuper(this, InvalidResponseError, [message]);
+    _this = _callSuper(this, InvalidResponseError, ['Invalid response']);
     _this.name = 'InvalidResponseError';
     return _this;
   }
@@ -515,7 +516,7 @@ let InvalidResponseError = /*#__PURE__*/function (_Error) {
   return _createClass(InvalidResponseError);
 }( /*#__PURE__*/_wrapNativeSuper(Error));
 
-function useExportResourcesContext() {
+function useExportResourcesModalContext() {
   const context = React.useContext(ExportResourcesContext);
   if (!context) {
     throw new MissingExportResourceProviderError();
@@ -543,14 +544,11 @@ function validate(_ref) {
     fields: {}
   };
   if (uiKit.TextInput.isEmpty(fileName)) {
-    // @ts-ignore
     errors.fileName.missing = true;
   } else if (!/^[a-zA-Z0-9-_.]+$/.test(fileName)) {
-    // @ts-ignore
     errors.fileName.invalidInput = true;
   }
   if (locales.length < 1) {
-    // @ts-ignore
     errors.locales.missing = true;
   }
   if (step === 2) {
@@ -560,7 +558,6 @@ function validate(_ref) {
       return !field.isRequired && !field.isReadOnly && field.isChecked;
     }).length;
     if (checkedFieldsCount < 1) {
-      // @ts-ignore
       errors.fields.missing = true;
     }
   }
@@ -591,7 +588,7 @@ function mapLocalesToOptions(locales) {
   }));
 }
 function isFilledArray(maybeArray) {
-  return _Array$isArray__default["default"](maybeArray) && maybeArray.length;
+  return _Array$isArray__default["default"](maybeArray) && maybeArray.length > 0;
 }
 function appendCsvOrJsonExtensionIfAbsent(fileName, fileFormat) {
   const extensionRegex = /\.(csv|json)$/i;
@@ -614,10 +611,10 @@ const extractFieldNamesAndAdditionalFieldExtensions = fields => {
   return [...new _Set__default["default"](result)];
 };
 function sortFieldsByFieldOrder(_ref) {
-  let fields = _ref.fields,
+  let fieldNames = _ref.fieldNames,
     fieldOrder = _ref.fieldOrder;
   if (isFilledArray(fieldOrder)) {
-    return _sortInstanceProperty__default["default"](fields).call(fields, (a, b) => {
+    return _sortInstanceProperty__default["default"](fieldNames).call(fieldNames, (a, b) => {
       let orderA = _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, a) !== -1 ? _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, a) : _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, a.split('.')[0]);
       let orderB = _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, b) !== -1 ? _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, b) : _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, b.split('.')[0]);
 
@@ -627,7 +624,7 @@ function sortFieldsByFieldOrder(_ref) {
       return orderA - orderB;
     });
   }
-  return fields;
+  return fieldNames;
 }
 function buildSelectedExportFilters(selectedResourceIds) {
   if (!selectedResourceIds || selectedResourceIds?.length === 0) return undefined;
@@ -660,36 +657,37 @@ function getInitialExportType(args) {
   return EXPORT_TYPES.ALL;
 }
 
-function ownKeys$6(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$6(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$6(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$6(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function ownKeys$5(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$5(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$5(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const updateFieldGroupsWithIsCheckedValue = (groups, cachedSelectedGroups) => {
-  const updateFields = (fields, parentChecked, fieldName) => {
+  const updateFields = (fields, isParentChecked, parentFieldPath) => {
     return _mapInstanceProperty__default["default"](fields).call(fields, field => {
       let isChecked = false;
       if (field.isRequired) {
         isChecked = true;
       } else {
-        if (cachedSelectedGroups[`${fieldName}.${field.name}`] !== undefined) {
-          isChecked = cachedSelectedGroups[`${fieldName}.${field.name}`];
+        if (cachedSelectedGroups[`${parentFieldPath}.${field.name}`] !== undefined) {
+          isChecked = cachedSelectedGroups[`${parentFieldPath}.${field.name}`];
         } else if (!field.isReadOnly && field.isSelectedByDefault) {
           isChecked = true;
-        } else if (parentChecked) {
+        } else if (isParentChecked) {
           isChecked = true;
         }
       }
+      let updatedFields = field.fields;
       if (field.fields) {
-        const updatedFields = updateFields(field.fields, isChecked, `${fieldName}.${field.name}`);
+        updatedFields = updateFields(field.fields, isChecked, `${parentFieldPath}.${field.name}`);
         isChecked = false;
-        field.fields = updatedFields;
       }
-      return _objectSpread$6(_objectSpread$6({}, field), {}, {
-        isChecked
+      return _objectSpread$5(_objectSpread$5({}, field), {}, {
+        isChecked,
+        fields: updatedFields
       });
     });
   };
   return _mapInstanceProperty__default["default"](groups).call(groups, group => {
-    const updatedFields = updateFields(group.fields, false, group.groupLabel);
-    return _objectSpread$6(_objectSpread$6({}, group), {}, {
+    const updatedFields = updateFields(group.fields, false, group.groupName);
+    return _objectSpread$5(_objectSpread$5({}, group), {}, {
       fields: updatedFields
     });
   });
@@ -701,7 +699,7 @@ const updateFieldGroupWithAdditionalFieldExtensions = groups => {
       if (field.fields) {
         field.fields = updateAdditionalFieldExtensions(field.fields, updatedAdditionalFieldExtensions);
       }
-      return _objectSpread$6(_objectSpread$6({}, field), {}, {
+      return _objectSpread$5(_objectSpread$5({}, field), {}, {
         additionalFieldExtensions: updatedAdditionalFieldExtensions
       });
     });
@@ -718,7 +716,7 @@ const updateFieldGroupWithAdditionalFieldExtensions = groups => {
     }, []);
   }
   return _mapInstanceProperty__default["default"](groups).call(groups, group => {
-    return _objectSpread$6(_objectSpread$6({}, group), {}, {
+    return _objectSpread$5(_objectSpread$5({}, group), {}, {
       dependentGroupNames: combineDependentGroupNames(group.fields),
       fields: updateAdditionalFieldExtensions(group.fields, group.additionalFieldExtensions || [])
     });
@@ -735,7 +733,7 @@ const updateFieldGroupsWithIsExpandedValue = (groups, cachedExpandedGroups) => {
         field.fields = updateFields(field.fields, groupName);
       }
       if (isExpanded !== null) {
-        return _objectSpread$6(_objectSpread$6({}, field), {}, {
+        return _objectSpread$5(_objectSpread$5({}, field), {}, {
           isExpanded
         });
       }
@@ -744,21 +742,34 @@ const updateFieldGroupsWithIsExpandedValue = (groups, cachedExpandedGroups) => {
   }
   return _mapInstanceProperty__default["default"](groups).call(groups, group => {
     const updatedFields = updateFields(group.fields, group.groupName);
-    return _objectSpread$6(_objectSpread$6({}, group), {}, {
+    return _objectSpread$5(_objectSpread$5({}, group), {}, {
       isExpanded: cachedExpandedGroups[group.groupName] ?? group.isExpanded ?? false,
       fields: updatedFields
     });
   });
 };
+const mapFormikErrors = error => {
+  if (typeof error === 'string') {
+    return {
+      [error]: true
+    };
+  }
+  if (_Array$isArray__default["default"](error)) {
+    return _reduceInstanceProperty__default["default"](error).call(error, (errorAggregator, currentError) => _objectSpread$5(_objectSpread$5({}, errorAggregator), {}, {
+      [currentError]: true
+    }), {});
+  }
+  if (!error) return {};
+  return error;
+};
 
-const isRequiredGroupChecked = function () {
+const isAnyDependentGroupChecked = function () {
   let dependentGroupNames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  let formik = arguments.length > 1 ? arguments[1] : undefined;
+  let groups = arguments.length > 1 ? arguments[1] : undefined;
   let result = false;
   if (dependentGroupNames?.length) {
     _someInstanceProperty__default["default"](dependentGroupNames).call(dependentGroupNames, dependentGroupName => {
-      var _context;
-      const dependentGroup = _findInstanceProperty__default["default"](_context = _valuesInstanceProperty__default["default"](formik).groups).call(_context, group => group.groupName === dependentGroupName);
+      const dependentGroup = _findInstanceProperty__default["default"](groups).call(groups, group => group.groupName === dependentGroupName);
       if (dependentGroup) {
         result = checkAtLeastOneFieldChecked(dependentGroup.fields);
       }
@@ -809,7 +820,7 @@ const useInitialValues = props => {
   }, [props.fieldGroups, props.resourceType, props.outputFormat, cachedSelectedGroups, cachedExpandedGroups, locale]);
 };
 
-async function createExportOperation(_ref) {
+async function createExportOperation(_ref, asyncDispatchFn) {
   let projectKey = _ref.projectKey,
     resourceType = _ref.resourceType,
     fileName = _ref.fileName,
@@ -817,8 +828,7 @@ async function createExportOperation(_ref) {
     fields = _ref.fields,
     locales = _ref.locales,
     filters = _ref.filters,
-    where = _ref.where,
-    asyncDispatchFn = _ref.asyncDispatchFn;
+    where = _ref.where;
   const uri = `/${projectKey}/export-operations`;
   const response = await asyncDispatchFn(sdk.actions.post({
     mcApiProxyTarget: constants.MC_API_PROXY_TARGETS.EXPORT,
@@ -838,7 +848,9 @@ async function createExportOperation(_ref) {
       filters
     }
   }));
-  if (!response.state) throw new InvalidResponseError('Invalid response');
+  if (!response || typeof response !== 'object' || !('state' in response)) {
+    throw new InvalidResponseError();
+  }
   return response;
 }
 
@@ -851,14 +863,14 @@ const useStartExportOperation = props => {
       projectKey: applicationContext.project?.key
     })),
     projectKey = _useApplicationContex.projectKey;
-  const extractFieldsFromGroups = groups => {
-    let selectedGeneralFields = [];
+  const extractFieldNamesFromGroups = groups => {
+    let selectedFields = [];
     const getSelectedFields = fields => {
       return _filterInstanceProperty__default["default"](fields).call(fields, field => {
         if (field.fields) {
           return getSelectedFields(field.fields);
         }
-        if (field.isChecked) selectedGeneralFields.push(field);
+        if (field.isChecked) selectedFields.push(field);
         return field.isChecked ?? false;
       });
     };
@@ -866,13 +878,14 @@ const useStartExportOperation = props => {
       getSelectedFields(group.fields);
     });
     return sortFieldsByFieldOrder({
-      fields: extractFieldNamesAndAdditionalFieldExtensions(selectedGeneralFields),
+      fieldNames: extractFieldNamesAndAdditionalFieldExtensions(selectedFields),
       fieldOrder: props.fieldOrder
     });
   };
-  const startExportOperation = async values => {
+  const startExportOperation = async (values, exportType) => {
     try {
-      const fields = extractFieldsFromGroups(values.groups);
+      if (!projectKey) throw new Error('Project key is missing');
+      const fields = extractFieldNamesFromGroups(values.groups);
       const response = await createExportOperation({
         projectKey,
         resourceType: props.resourceType,
@@ -880,10 +893,9 @@ const useStartExportOperation = props => {
         fileFormat: values.outputFormat,
         locales: values.locales,
         fields,
-        where: props.exportType === EXPORT_TYPES.SELECTED ? buildSelectedExportFilters(props.selectedResourceIds) : props.filters?.queryPredicate,
-        filters: props.filters?.searchQuery,
-        asyncDispatchFn: asyncDispatch
-      });
+        where: exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length ? buildSelectedExportFilters(props.selectedResourceIds) : props.filters?.queryPredicate || undefined,
+        filters: props.filters?.searchQuery || undefined
+      }, asyncDispatch);
       switch (response.state) {
         case EXPORT_OPERATION_STATES.QUEUED:
         case EXPORT_OPERATION_STATES.PROCESSING:
@@ -921,18 +933,18 @@ const useStartExportOperation = props => {
   };
 };
 
-function ownKeys$5(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$5(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$5(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$5(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function ownKeys$4(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$4(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$4(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 function ExportScopeSection() {
   const intl = reactIntl.useIntl();
-  const _useExportResourcesCo = useExportResourcesContext(),
-    exportType = _useExportResourcesCo.exportType,
-    totalResourcesCount = _useExportResourcesCo.totalResourcesCount,
-    filters = _useExportResourcesCo.filters,
-    hasFilters = _useExportResourcesCo.hasFilters,
-    selectedResourceIds = _useExportResourcesCo.selectedResourceIds,
-    setExportType = _useExportResourcesCo.setExportType,
-    resourceType = _useExportResourcesCo.resourceType;
+  const _useExportResourcesMo = useExportResourcesModalContext(),
+    exportType = _useExportResourcesMo.exportType,
+    totalResourcesCount = _useExportResourcesMo.totalResourcesCount,
+    filters = _useExportResourcesMo.filters,
+    hasFilters = _useExportResourcesMo.hasFilters,
+    selectedResourceIds = _useExportResourcesMo.selectedResourceIds,
+    setExportType = _useExportResourcesMo.setExportType,
+    resourceType = _useExportResourcesMo.resourceType;
   return jsxRuntime.jsx(uiKit.Spacings.Stack, {
     scale: "m",
     children: jsxRuntime.jsxs(uiKit.RadioInput.Group, {
@@ -947,7 +959,7 @@ function ExportScopeSection() {
       children: [jsxRuntime.jsx(uiKit.RadioInput.Option, {
         value: EXPORT_TYPES.ALL,
         children: jsxRuntime.jsx(uiKit.Text.Body, {
-          intlMessage: _objectSpread$5(_objectSpread$5({}, resourceTypeMessages[resourceType].exportScopeAll), {}, {
+          intlMessage: _objectSpread$4(_objectSpread$4({}, resourceTypeMessages[resourceType].exportScopeAll), {}, {
             values: {
               total: intl.formatNumber(totalResourcesCount)
             }
@@ -958,7 +970,7 @@ function ExportScopeSection() {
         isDisabled: !filters.total || !hasFilters,
         children: jsxRuntime.jsx(uiKit.Text.Body, {
           tone: !filters.total || !hasFilters ? 'tertiary' : undefined,
-          intlMessage: filters.total ? _objectSpread$5(_objectSpread$5({}, resourceTypeMessages[resourceType].exportScopeFiltered), {}, {
+          intlMessage: filters.total ? _objectSpread$4(_objectSpread$4({}, resourceTypeMessages[resourceType].exportScopeFiltered), {}, {
             values: {
               total: intl.formatNumber(filters.total)
             }
@@ -969,7 +981,7 @@ function ExportScopeSection() {
         isDisabled: !selectedResourceIds?.length,
         children: jsxRuntime.jsx(uiKit.Text.Body, {
           tone: !selectedResourceIds?.length ? 'tertiary' : undefined,
-          intlMessage: selectedResourceIds?.length ? _objectSpread$5(_objectSpread$5({}, resourceTypeMessages[resourceType].exportScopeSelected), {}, {
+          intlMessage: selectedResourceIds?.length ? _objectSpread$4(_objectSpread$4({}, resourceTypeMessages[resourceType].exportScopeSelected), {}, {
             values: {
               total: intl.formatNumber(selectedResourceIds.length)
             }
@@ -982,10 +994,10 @@ function ExportScopeSection() {
 
 const ExportFileSettingsStep = () => {
   const intl = reactIntl.useIntl();
-  const _useExportResourcesCo = useExportResourcesContext(),
-    formik = _useExportResourcesCo.formik,
-    resourceType = _useExportResourcesCo.resourceType,
-    onClose = _useExportResourcesCo.onClose;
+  const _useExportResourcesMo = useExportResourcesModalContext(),
+    formik = _useExportResourcesMo.formik,
+    resourceType = _useExportResourcesMo.resourceType,
+    onClose = _useExportResourcesMo.onClose;
   const _useApplicationContex = applicationShellConnectors.useApplicationContext(applicationContext => ({
       locale: applicationContext.dataLocale,
       locales: applicationContext.project?.languages || []
@@ -1038,7 +1050,7 @@ const ExportFileSettingsStep = () => {
                     value: _valuesInstanceProperty__default["default"](formik).fileName,
                     title: intl.formatMessage(messages.fileName),
                     touched: formik.touched.fileName,
-                    errors: formik.errors.fileName,
+                    errors: mapFormikErrors(formik.errors.fileName),
                     renderError: renderFileNameError
                   })
                 }), jsxRuntime.jsxs(uiKit.Spacings.Stack, {
@@ -1053,7 +1065,7 @@ const ExportFileSettingsStep = () => {
                     onChange: formik.handleChange,
                     onBlur: formik.handleBlur,
                     touched: formik.touched.locales,
-                    errors: formik.errors.locales,
+                    errors: mapFormikErrors(formik.errors.locales),
                     renderError: renderLocaleError,
                     menuPortalTarget: document.body,
                     menuPortalZIndex: Z_INDEX_DROPDOWN
@@ -1074,8 +1086,8 @@ const ExportFileSettingsStep = () => {
   });
 };
 
-function ownKeys$4(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$4(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$4(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function ownKeys$3(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$3(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$3(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const exportFieldSelectionContextDefaultValues = {
   updateExpandedGroups: (_name, _value) => {}
 };
@@ -1093,7 +1105,7 @@ const ExportFieldSelectionProvider = _ref => {
     setCachedExpandedGroups = _useStorage2[1];
   const updateExpandedGroups = React.useCallback((name, value) => {
     setCachedExpandedGroups({
-      [resourceType]: _objectSpread$4(_objectSpread$4({}, cachedExpandedGroups[resourceType] || {}), {}, {
+      [resourceType]: _objectSpread$3(_objectSpread$3({}, cachedExpandedGroups[resourceType] || {}), {}, {
         [name]: value
       })
     });
@@ -1127,7 +1139,7 @@ const calculateTotalSelectedFields = (group, formik) => {
     _forEachInstanceProperty__default["default"](fields).call(fields, field => {
       if (field.fields) {
         countReadOnlyDependentFields(field.fields);
-      } else if (field.dependentGroupNames?.length && isRequiredGroupChecked(field.dependentGroupNames, formik)) {
+      } else if (field.dependentGroupNames?.length && isAnyDependentGroupChecked(field.dependentGroupNames, _valuesInstanceProperty__default["default"](formik).groups)) {
         result += 1;
       }
     });
@@ -1151,8 +1163,8 @@ const calculateTotalSelectedFields = (group, formik) => {
 };
 const ExportFieldSelectionStamp = _ref => {
   let group = _ref.group;
-  const _useExportResourcesCo = useExportResourcesContext(),
-    formik = _useExportResourcesCo.formik;
+  const _useExportResourcesMo = useExportResourcesModalContext(),
+    formik = _useExportResourcesMo.formik;
   const _useIntl = reactIntl.useIntl(),
     formatMessage = _useIntl.formatMessage;
   return jsxRuntime.jsx(uiKit.Card, {
@@ -1212,7 +1224,7 @@ const FieldSection = _ref3 => {
   return jsxRuntime.jsx(uiKit.Spacings.Stack, {
     scale: "s",
     children: fields?.map((field, index) => {
-      const isAnyOfTheChildFieldsChecked = checkAtLeastOneFieldChecked(field.fields);
+      const isAnyOfTheChildFieldsChecked = checkAtLeastOneFieldChecked(field.fields || []);
       const allAllFieldsSelected = checkAllFieldsSelected(field.fields || []);
       const checkIsChecked = () => {
         if (field.isExpandable) {
@@ -1220,7 +1232,7 @@ const FieldSection = _ref3 => {
         }
         if (field.isReadOnly) {
           if (field.dependentGroupNames) {
-            return isRequiredGroupChecked(field.dependentGroupNames, formik);
+            return isAnyDependentGroupChecked(field.dependentGroupNames, _valuesInstanceProperty__default["default"](formik).groups);
           }
           return isAnySiblingChecked;
         }
@@ -1307,8 +1319,8 @@ const FieldSection = _ref3 => {
   });
 };
 
-function ownKeys$3(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$3(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$3(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function ownKeys$2(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$2(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$2(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const StyledGroupCard = /*#__PURE__*/_styled__default["default"](uiKit.Card, {
   target: "e1igkh7t2"
 } )("height:100%;border-radius:0;", props => props.showTopBorder && /*#__PURE__*/react.css("border-top:", uiKit.designTokens.borderWidth1, " solid ", uiKit.designTokens.colorNeutral90, ";" + ("" ), "" ), ";" + ("" ));
@@ -1337,17 +1349,17 @@ const FieldGroupSection = _ref2 => {
     function updateAllFields(fields, checked) {
       return _mapInstanceProperty__default["default"](fields).call(fields, field => {
         if (field.fields) {
-          return _objectSpread$3(_objectSpread$3({}, field), {}, {
+          return _objectSpread$2(_objectSpread$2({}, field), {}, {
             fields: updateAllFields(field.fields, checked)
           });
         }
         if (field.isReadOnly || field.isRequired) return field;
-        return _objectSpread$3(_objectSpread$3({}, field), {}, {
+        return _objectSpread$2(_objectSpread$2({}, field), {}, {
           isChecked: checked
         });
       });
     }
-    formik.setFieldValue(parentKey, _objectSpread$3(_objectSpread$3({}, item), {}, {
+    formik.setFieldValue(parentKey, _objectSpread$2(_objectSpread$2({}, item), {}, {
       fields: updateAllFields(item.fields, e.target.checked)
     }));
   };
@@ -1378,7 +1390,7 @@ const FieldGroupSection = _ref2 => {
                 icon: isOpen ? jsxRuntime.jsx(uiKit.AngleDownIcon, {}) : jsxRuntime.jsx(uiKit.AngleRightIcon, {}),
                 label: ""
               }), jsxRuntime.jsx(uiKit.CheckboxInput, {
-                isIndeterminate: !allAllFieldsSelected && (isAtleastOneFieldChecked || isRequiredGroupChecked(group.dependentGroupNames, formik)),
+                isIndeterminate: !allAllFieldsSelected && (isAtleastOneFieldChecked || isAnyDependentGroupChecked(group.dependentGroupNames, _valuesInstanceProperty__default["default"](formik).groups)),
                 isChecked: allAllFieldsSelected,
                 onChange: handleChangeAllFields,
                 children: group.groupLabel
@@ -1447,8 +1459,8 @@ const NoSearchResults = () => {
   });
 };
 
-function ownKeys$2(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context5 = ownKeys$2(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context6 = ownKeys$2(Object(t))).call(_context6, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function ownKeys$1(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context5 = ownKeys$1(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context6 = ownKeys$1(Object(t))).call(_context6, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const totalSpacing = 32 * 2 + (
 // outer modal spacing
 32 + 40) +
@@ -1486,11 +1498,11 @@ const ExportFieldsSelectionStep = () => {
     _useStorage2 = _slicedToArray(_useStorage, 2);
     _useStorage2[0];
     const setCachedSelectedGroups = _useStorage2[1];
-  const _useExportResourcesCo = useExportResourcesContext(),
-    formik = _useExportResourcesCo.formik,
-    setCurrentStep = _useExportResourcesCo.setCurrentStep,
-    resourceType = _useExportResourcesCo.resourceType,
-    onClose = _useExportResourcesCo.onClose;
+  const _useExportResourcesMo = useExportResourcesModalContext(),
+    formik = _useExportResourcesMo.formik,
+    setCurrentStep = _useExportResourcesMo.setCurrentStep,
+    resourceType = _useExportResourcesMo.resourceType,
+    onClose = _useExportResourcesMo.onClose;
   React__default["default"].useEffect(() => {
     var _context2;
     formik.validateForm();
@@ -1503,7 +1515,12 @@ const ExportFieldsSelectionStep = () => {
       }
       selectedFields[fieldName] = field.isChecked;
     }
-    _forEachInstanceProperty__default["default"](_context2 = _valuesInstanceProperty__default["default"](formik).groups).call(_context2, group => getSelectedFields(group, group.groupLabel));
+    _forEachInstanceProperty__default["default"](_context2 = _valuesInstanceProperty__default["default"](formik).groups).call(_context2, group => {
+      var _context3;
+      _forEachInstanceProperty__default["default"](_context3 = group.fields).call(_context3, field => {
+        getSelectedFields(field, group.groupName);
+      });
+    });
     setCachedSelectedGroups({
       [resourceType]: selectedFields
     });
@@ -1511,33 +1528,35 @@ const ExportFieldsSelectionStep = () => {
   }, [_valuesInstanceProperty__default["default"](formik).groups]);
   // adds `isHidden` property to each field based on search term
   const filteredGroups = React__default["default"].useMemo(() => {
-    var _context4;
     const updateFields = (fields, parentMatches) => {
       return _mapInstanceProperty__default["default"](fields).call(fields, field => {
-        var _context3;
-        const matches = _includesInstanceProperty__default["default"](_context3 = field.label.toLowerCase()).call(_context3, fieldSearchTerm.toLowerCase());
+        var _context4;
+        const matches = _includesInstanceProperty__default["default"](_context4 = field.label.toLowerCase()).call(_context4, fieldSearchTerm.toLowerCase());
         let isHidden = !matches && !parentMatches;
         if (field.fields) {
           const updatedFields = updateFields(field.fields, matches);
           isHidden = isHidden && _everyInstanceProperty__default["default"](updatedFields).call(updatedFields, f => f.isHidden);
-          field = _objectSpread$2(_objectSpread$2({}, field), {}, {
+          field = _objectSpread$1(_objectSpread$1({}, field), {}, {
             fields: updatedFields
           });
         }
-        return _objectSpread$2(_objectSpread$2({}, field), {}, {
+        return _objectSpread$1(_objectSpread$1({}, field), {}, {
           isHidden
         });
       });
     };
     if (!fieldSearchTerm?.trim()?.length) return _valuesInstanceProperty__default["default"](formik).groups;
-    return _mapInstanceProperty__default["default"](_context4 = _valuesInstanceProperty__default["default"](formik).groups).call(_context4, group => {
-      const updatedFields = updateFields(group.fields, false);
-      const isHidden = _everyInstanceProperty__default["default"](updatedFields).call(updatedFields, field => field.isHidden);
-      return _objectSpread$2(_objectSpread$2({}, group), {}, {
-        fields: updatedFields,
-        isHidden
+    const updateGroups = groups => {
+      return _mapInstanceProperty__default["default"](groups).call(groups, group => {
+        const updatedFields = updateFields(group.fields, false);
+        const isHidden = _everyInstanceProperty__default["default"](updatedFields).call(updatedFields, field => field.isHidden);
+        return _objectSpread$1(_objectSpread$1({}, group), {}, {
+          fields: updatedFields,
+          isHidden
+        });
       });
-    });
+    };
+    return updateGroups(_valuesInstanceProperty__default["default"](formik).groups);
   }, [_valuesInstanceProperty__default["default"](formik).groups, fieldSearchTerm]);
   const onSearchChange = React__default["default"].useCallback(event => {
     setFieldSearchTerm(event.target.value);
@@ -1581,7 +1600,7 @@ const ExportFieldsSelectionStep = () => {
                 index: index,
                 formik: formik,
                 isForceExpanded: fieldSearchTerm?.trim()?.length > 0
-              }, group.groupLabel))
+              }, group.groupName))
             })
           }) : jsxRuntime.jsx(NoSearchResults, {})]
         })
@@ -1592,30 +1611,29 @@ const ExportFieldsSelectionStep = () => {
 
 const ExportResourcesContext = /*#__PURE__*/React.createContext();
 
-function ownKeys$1(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context = ownKeys$1(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context2 = ownKeys$1(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
-const ExportResourcesProvider = props => {
+const _excluded = ["children"];
+const ExportResourcesProvider = _ref => {
+  let children = _ref.children,
+    props = _objectWithoutProperties(_ref, _excluded);
   const initialValues = useInitialValues(props);
   const _React$useState = React__default["default"].useState(1),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     currentStep = _React$useState2[0],
     setCurrentStep = _React$useState2[1];
-  const _React$useState3 = React__default["default"].useState(getInitialExportType({
+  const _React$useState3 = React__default["default"].useState(() => getInitialExportType({
       selectedResourceIds: props.selectedResourceIds,
       filters: props.filters
     })),
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     exportType = _React$useState4[0],
     setExportType = _React$useState4[1];
-  const _useStartExportOperat = useStartExportOperation(_objectSpread$1(_objectSpread$1({}, props), {}, {
-      exportType
-    })),
+  const _useStartExportOperat = useStartExportOperation(props),
     startExportOperation = _useStartExportOperat.startExportOperation;
   const onSubmit = async values => {
     if (currentStep === 1) {
       setCurrentStep(2);
     } else {
-      startExportOperation(values);
+      startExportOperation(values, exportType);
     }
   };
   const formik$1 = formik.useFormik({
@@ -1643,13 +1661,13 @@ const ExportResourcesProvider = props => {
       hasFilters: areFiltersApplied(props.filters),
       setExportType
     },
-    children: props.children
+    children: children
   });
 };
 
 const CurrentStep = () => {
-  const _useExportResourcesCo = useExportResourcesContext(),
-    currentStep = _useExportResourcesCo.currentStep;
+  const _useExportResourcesMo = useExportResourcesModalContext(),
+    currentStep = _useExportResourcesMo.currentStep;
   const steps = {
     1: jsxRuntime.jsx(ExportFileSettingsStep, {}),
     2: jsxRuntime.jsx(ExportFieldsSelectionStep, {})
@@ -1751,7 +1769,8 @@ ExportResourcesModal.defaultProps = {
   isOpen: false,
   selectedResourceIds: [],
   outputFormat: OUTPUT_FORMATS.CSV,
-  fieldGroups: []
+  fieldGroups: [],
+  fieldOrder: []
 };
 
 exports.EXPORTABLE_RESOURCES = EXPORTABLE_RESOURCES;