@commercetools-frontend-extensions/export-resources-modal 3.7.0 → 4.0.1

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

@@ -11,14 +11,13 @@ var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
-var React = require('react');
+var reactIntl = require('react-intl');
+var applicationShellConnectors = require('@commercetools-frontend/application-shell-connectors');
 var uiKit = require('@commercetools-frontend/ui-kit');
 var jsxRuntime = require('@emotion/react/jsx-runtime');
 require('@commercetools-uikit/design-system');
-var reactIntl = require('react-intl');
 var _valuesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/values');
 var applicationComponents = require('@commercetools-frontend/application-components');
-var applicationShellConnectors = require('@commercetools-frontend/application-shell-connectors');
 var _Reflect$construct = require('@babel/runtime-corejs3/core-js-stable/reflect/construct');
 var _createClass = require('@babel/runtime-corejs3/helpers/createClass');
 var _classCallCheck = require('@babel/runtime-corejs3/helpers/classCallCheck');
@@ -26,31 +25,33 @@ var _inherits = require('@babel/runtime-corejs3/helpers/inherits');
 var _possibleConstructorReturn = require('@babel/runtime-corejs3/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime-corejs3/helpers/getPrototypeOf');
 var _wrapNativeSuper = require('@babel/runtime-corejs3/helpers/wrapNativeSuper');
-var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
-var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
+var React = require('react');
 var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/concat');
 var moment = require('moment');
+var _someInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/some');
 var _reduceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/reduce');
 var omitEmpty = require('omit-empty-es');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
-var _flatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/flat');
-var _flatMapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/flat-map');
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
-var _startsWithInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/starts-with');
-var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
+var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
 var sdk = require('@commercetools-frontend/sdk');
 var actionsGlobal = require('@commercetools-frontend/actions-global');
 var constants = require('@commercetools-frontend/constants');
 var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _styled = require('@emotion/styled/base');
 var _everyInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/every');
-var _someInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/some');
+var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
 var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
+var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
 var throttle = require('lodash/throttle');
 var react = require('@emotion/react');
-var PropTypes = require('prop-types');
+var get = require('lodash/get');
+require('prop-types');
 var formik = require('formik');
+var sentry = require('@commercetools-frontend/sentry');
+var i18n = require('@commercetools-frontend/i18n');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -62,27 +63,26 @@ var _forEachInstanceProperty__default = /*#__PURE__*/_interopDefault(_forEachIns
 var _Object$getOwnPropertyDescriptors__default = /*#__PURE__*/_interopDefault(_Object$getOwnPropertyDescriptors);
 var _Object$defineProperties__default = /*#__PURE__*/_interopDefault(_Object$defineProperties);
 var _Object$defineProperty__default = /*#__PURE__*/_interopDefault(_Object$defineProperty);
-var React__default = /*#__PURE__*/_interopDefault(React);
 var _valuesInstanceProperty__default = /*#__PURE__*/_interopDefault(_valuesInstanceProperty);
 var _Reflect$construct__default = /*#__PURE__*/_interopDefault(_Reflect$construct);
-var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
+var React__default = /*#__PURE__*/_interopDefault(React);
 var _concatInstanceProperty__default = /*#__PURE__*/_interopDefault(_concatInstanceProperty);
 var moment__default = /*#__PURE__*/_interopDefault(moment);
+var _someInstanceProperty__default = /*#__PURE__*/_interopDefault(_someInstanceProperty);
 var _reduceInstanceProperty__default = /*#__PURE__*/_interopDefault(_reduceInstanceProperty);
 var omitEmpty__default = /*#__PURE__*/_interopDefault(omitEmpty);
+var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _Array$isArray__default = /*#__PURE__*/_interopDefault(_Array$isArray);
-var _flatInstanceProperty__default = /*#__PURE__*/_interopDefault(_flatInstanceProperty);
-var _flatMapInstanceProperty__default = /*#__PURE__*/_interopDefault(_flatMapInstanceProperty);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
-var _startsWithInstanceProperty__default = /*#__PURE__*/_interopDefault(_startsWithInstanceProperty);
-var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
+var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
 var _styled__default = /*#__PURE__*/_interopDefault(_styled);
 var _everyInstanceProperty__default = /*#__PURE__*/_interopDefault(_everyInstanceProperty);
-var _someInstanceProperty__default = /*#__PURE__*/_interopDefault(_someInstanceProperty);
+var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
 var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
+var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
 var throttle__default = /*#__PURE__*/_interopDefault(throttle);
-var PropTypes__default = /*#__PURE__*/_interopDefault(PropTypes);
+var get__default = /*#__PURE__*/_interopDefault(get);
 
 function getBold(msg) {
   return jsxRuntime.jsx(uiKit.Text.Body, {
@@ -216,21 +216,6 @@ var messages = reactIntl.defineMessages({
     description: 'Label for "Field definitions" link',
     defaultMessage: 'Field definitions'
   },
-  allGeneralFields: {
-    id: 'ExportResourcesModal.allGeneralFields',
-    description: 'Label for "All general fields" checkbox',
-    defaultMessage: 'All general fields'
-  },
-  allCustomFields: {
-    id: 'ExportResourcesModal.allCustomFields',
-    description: 'Label for "All custom fields" checkbox',
-    defaultMessage: 'All custom fields'
-  },
-  customTypeKeyAndTypeId: {
-    id: 'ExportResourcesModal.customTypeKeyAndTypeId',
-    description: 'Label for "Custom type key and typeId" checkbox',
-    defaultMessage: 'Custom type key and typeId'
-  },
   unexpectedError: {
     id: 'ExportResourcesModal.unexpectedError',
     description: 'Generic notification message when starting export process fails',
@@ -263,14 +248,14 @@ var messages = reactIntl.defineMessages({
   }
 });
 
-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 renderFileNameError(key) {
   switch (key) {
     case 'missing':
-      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$5({}, messages.missingFileNameError));
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$4({}, messages.missingFileNameError));
     case 'invalidInput':
-      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$5({}, messages.invalidFileNameError));
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$4({}, messages.invalidFileNameError));
     default:
       return null;
   }
@@ -278,7 +263,7 @@ function renderFileNameError(key) {
 function renderLocaleError(key) {
   switch (key) {
     case 'missing':
-      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$5({}, messages.missingLocaleError));
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$4({}, messages.missingLocaleError));
     default:
       return null;
   }
@@ -373,7 +358,7 @@ let UnexpectedResourceTypeError = /*#__PURE__*/function (_Error) {
   function UnexpectedResourceTypeError(resourceType) {
     var _this;
     _classCallCheck(this, UnexpectedResourceTypeError);
-    _this = _super.call(this, "Unexpected resource type: ".concat(resourceType));
+    _this = _super.call(this, "Unexpected resource type \"".concat(resourceType, "\""));
     _this.name = 'UnexpectedResourceTypeError';
     return _this;
   }
@@ -403,41 +388,50 @@ function useExportResourcesContext() {
   return context;
 }
 
+function checkAtLeastOneFieldChecked$1(fields) {
+  return _someInstanceProperty__default["default"](fields).call(fields, field => {
+    if (field.fields) {
+      return field.isChecked || checkAtLeastOneFieldChecked$1(field.fields);
+    }
+    return field.isChecked;
+  });
+}
 function validate(_ref) {
   let values = _valuesInstanceProperty__default["default"](_ref),
     step = _ref.step;
   const fileName = values.fileName,
     locales = values.locales,
-    fields = values.fields,
-    customFields = values.customFields;
+    groups = values.groups;
   const errors = {
     fileName: {},
     locales: {},
     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) {
-    const checkedGeneralFieldsCount = _filterInstanceProperty__default["default"](fields).call(fields, field => field.isChecked).length;
-    const checkedCustomFieldsCount = _reduceInstanceProperty__default["default"](customFields).call(customFields, (count, customType) => {
-      var _context;
-      return count + _filterInstanceProperty__default["default"](_context = customType.fields).call(_context, field => field.isChecked).length;
-    }, 0);
-    if (checkedGeneralFieldsCount + checkedCustomFieldsCount < 2) {
+    const allFields = _reduceInstanceProperty__default["default"](groups).call(groups, (acc, group) => _concatInstanceProperty__default["default"](acc).call(acc, group.fields), []);
+    const checkedFieldsCount = _filterInstanceProperty__default["default"](allFields).call(allFields, field => {
+      if (field.fields) return checkAtLeastOneFieldChecked$1(field.fields);
+      return !field.isRequired && !field.isReadOnly && field.isChecked;
+    }).length;
+    if (checkedFieldsCount < 1) {
+      // @ts-ignore
       errors.fields.missing = true;
     }
   }
   return omitEmpty__default["default"](errors);
 }
 
-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 _context8, _context9; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context8 = ownKeys$4(Object(t), !0)).call(_context8, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context9 = ownKeys$4(Object(t))).call(_context9, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 function resourceTypeToDisplayName(_ref) {
   let resourceType = _ref.resourceType,
     _ref$isUpperCase = _ref.isUpperCase,
@@ -456,7 +450,7 @@ function resourceTypeToDisplayName(_ref) {
       displayName = isPlural ? 'Discount codes' : 'Discount code';
       break;
     default:
-      throw UnexpectedResourceTypeError(resourceType);
+      throw new UnexpectedResourceTypeError(resourceType);
   }
   return isUpperCase ? displayName : displayName.toLowerCase();
 }
@@ -475,84 +469,36 @@ function appendCsvOrJsonExtensionIfAbsent(fileName, fileFormat) {
   if (!extensionRegex.test(fileName)) return _concatInstanceProperty__default["default"](_context = "".concat(fileName, ".")).call(_context, fileFormat);
   return fileName;
 }
-function flattenNestedFields(fields) {
-  const result = (fields === null || fields === void 0 ? void 0 : _mapInstanceProperty__default["default"](fields).call(fields, field => {
-    if (isFilledArray(field.fields)) {
-      var _context2;
-      return _mapInstanceProperty__default["default"](_context2 = flattenNestedFields(field.fields)).call(_context2, nestedField => {
-        var _context3;
-        return _objectSpread$4(_objectSpread$4({}, nestedField), {}, {
-          name: _concatInstanceProperty__default["default"](_context3 = "".concat(field.name, ".")).call(_context3, nestedField.name)
-        });
-      });
-    }
-    return field;
-  })) || [];
-  return _flatInstanceProperty__default["default"](result).call(result);
-}
-function getSelectedGeneralFields(fields) {
-  return _filterInstanceProperty__default["default"](fields).call(fields, field => field.isChecked);
-}
-function getSelectedCustomFields(customFields) {
-  return _mapInstanceProperty__default["default"](customFields).call(customFields, customType => {
-    var _context4;
-    return _objectSpread$4(_objectSpread$4({}, customType), {}, {
-      fields: _filterInstanceProperty__default["default"](_context4 = customType.fields).call(_context4, field => field.isChecked)
-    });
-  });
-}
-function checkRequiredFields(fields) {
-  return _mapInstanceProperty__default["default"](fields).call(fields, field => field.isRequired ? _objectSpread$4(_objectSpread$4({}, field), {}, {
-    isChecked: true
-  }) : field);
-}
 function getExportLogsLink(projectKey, msg) {
   return jsxRuntime.jsx(uiKit.Link, {
     to: "/".concat(projectKey, "/operations/export/logs"),
     children: msg
   });
 }
-function setInitialCheckedStateForCustomFields(customFields) {
-  return _mapInstanceProperty__default["default"](customFields).call(customFields, customType => {
-    var _context5;
-    return _objectSpread$4(_objectSpread$4({}, customType), {}, {
-      fields: _mapInstanceProperty__default["default"](_context5 = customType.fields).call(_context5, field => _objectSpread$4(_objectSpread$4({}, field), {}, {
-        isChecked: false
-      }))
-    });
-  });
-}
-function extractGeneralFieldNames(generalFields) {
-  return _mapInstanceProperty__default["default"](generalFields).call(generalFields, field => field.name);
-}
-function extractCustomFieldNamesWithPrefix(customFields) {
-  const fields = _flatMapInstanceProperty__default["default"](customFields).call(customFields, customType => {
-    var _context6;
-    return _flatMapInstanceProperty__default["default"](_context6 = customType.fields).call(_context6, field => {
-      return getCustomFieldNameWithPrefix(field, customType.type.resourceTypeIds);
-    });
-  });
-  return [...new _Set__default["default"](fields)];
-}
-function getCustomFieldNameWithPrefix(field, resourceTypeIds) {
-  const prefixes = _mapInstanceProperty__default["default"](resourceTypeIds).call(resourceTypeIds, type => {
-    switch (type) {
-      case 'asset':
-        return 'assets.custom.fields.';
-      default:
-        return 'custom.fields.';
+const extractFieldNamesAndAdditionalFieldExtensions = fields => {
+  const result = _reduceInstanceProperty__default["default"](fields).call(fields, (acc, field) => {
+    if (field.additionalFieldExtensions) {
+      return [...acc, ...field.additionalFieldExtensions, field.name];
     }
-  });
-  return _mapInstanceProperty__default["default"](prefixes).call(prefixes, prefix => {
-    var _context7;
-    return _concatInstanceProperty__default["default"](_context7 = "".concat(prefix)).call(_context7, field.name);
-  });
-}
+    return [...acc, field.name];
+  }, []);
+  return [...new _Set__default["default"](result)];
+};
+function sortFieldsByFieldOrder(_ref2) {
+  let fields = _ref2.fields,
+    fieldOrder = _ref2.fieldOrder;
+  if (isFilledArray(fieldOrder)) {
+    return _sortInstanceProperty__default["default"](fields).call(fields, (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]);
 
-// Sorts an array of custom field names placing those starting with 'assets.custom.fields.' first
-// This function doesn't affect the order of other custom fields
-function sortCustomFields(fields) {
-  return _sortInstanceProperty__default["default"](fields).call(fields, (a, b) => _startsWithInstanceProperty__default["default"](b).call(b, 'assets.custom.fields.') - _startsWithInstanceProperty__default["default"](a).call(a, 'assets.custom.fields.'));
+      // If a field is not 'custom',then consider it as '*'
+      orderA = orderA === -1 ? _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, '*') : orderA;
+      orderB = orderB === -1 ? _indexOfInstanceProperty__default["default"](fieldOrder).call(fieldOrder, '*') : orderB;
+      return orderA - orderB;
+    });
+  }
+  return fields;
 }
 
 // TODO: remove this function when filters are passed directly from parent views
@@ -565,71 +511,69 @@ function tmpBuildFilters(selectedResourceIds) {
   return ["id in (".concat(formattedIds, ")")];
 }
 
-const parentKeyExtension = ['parent.key', 'parent.typeId'];
-const customFieldsExtension = ['custom.type.key', 'custom.type.typeId'];
-const assetsCustomFieldsExtension = ['assets.custom.type.key', 'assets.custom.type.typeId'];
-const assetsExtension = ['assets.key', 'assets.name', 'assets.sources.key', 'assets.sources.uri', 'assets.sources.contentType', 'assets.sources.dimensions.w', 'assets.sources.dimensions.h', 'assets.description', 'assets.tags'];
-const categoryFieldExtension = fields => {
-  return _reduceInstanceProperty__default["default"](fields).call(fields, (acc, field) => {
-    if (field === 'parent.key') {
-      return [...acc, ...parentKeyExtension];
-    }
-    if (_startsWithInstanceProperty__default["default"](field).call(field, 'custom.fields.') && !_includesInstanceProperty__default["default"](acc).call(acc, 'custom.type.key')) {
-      return [...acc, ...customFieldsExtension, field];
-    }
-    if (field === 'assets') {
-      return [...acc, ...assetsExtension];
-    }
-    if (_startsWithInstanceProperty__default["default"](field).call(field, 'assets.custom.fields.') && !_includesInstanceProperty__default["default"](acc).call(acc, 'assets.custom.type.key')) {
-      return [...acc, ...assetsCustomFieldsExtension, field];
-    }
-    return [...acc, field];
-  }, []);
-};
-const defaultFieldExtension = fields => fields;
-const fieldExtensionByResourceType = {
-  default: defaultFieldExtension,
-  category: categoryFieldExtension
+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 updateFieldGroupsWithIsCheckedValue = groups => {
+  const updateFields = (fields, parentChecked) => {
+    return _mapInstanceProperty__default["default"](fields).call(fields, field => {
+      var _field$isRequired;
+      let isChecked = ((_field$isRequired = field.isRequired) !== null && _field$isRequired !== void 0 ? _field$isRequired : !field.isReadOnly && field.isSelectedByDefault) || parentChecked;
+      if (field.fields) {
+        const updatedFields = updateFields(field.fields, isChecked);
+        isChecked = false;
+        field.fields = updatedFields;
+      }
+      return _objectSpread$3(_objectSpread$3({}, field), {}, {
+        isChecked
+      });
+    });
+  };
+  return _mapInstanceProperty__default["default"](groups).call(groups, group => {
+    const updatedFields = updateFields(group.fields, false);
+    return _objectSpread$3(_objectSpread$3({}, group), {}, {
+      fields: updatedFields
+    });
+  });
 };
-
-const extendFields = _ref => {
-  let resourceType = _ref.resourceType,
-    fields = _ref.fields;
-  const extensionFunction = fieldExtensionByResourceType[resourceType] || fieldExtensionByResourceType.default;
-  return extensionFunction(fields);
+const updateFieldGroupWithAdditionalFieldExtensions = groups => {
+  function updateAdditionalFieldExtensions(fields, additionalFieldExtensions) {
+    return _mapInstanceProperty__default["default"](fields).call(fields, field => {
+      const updatedAdditionalFieldExtensions = [...additionalFieldExtensions, ...(field.additionalFieldExtensions || [])];
+      if (field.fields) {
+        field.fields = updateAdditionalFieldExtensions(field.fields, updatedAdditionalFieldExtensions);
+      }
+      return _objectSpread$3(_objectSpread$3({}, field), {}, {
+        additionalFieldExtensions: updatedAdditionalFieldExtensions
+      });
+    });
+  }
+  return _mapInstanceProperty__default["default"](groups).call(groups, group => {
+    return _objectSpread$3(_objectSpread$3({}, group), {}, {
+      fields: updateAdditionalFieldExtensions(group.fields, group.additionalFieldExtensions || [])
+    });
+  });
 };
 
-const _excluded = ["isSelectedByDefault"];
-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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context3 = ownKeys$3(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context4 = ownKeys$3(Object(t))).call(_context4, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const useInitialValues = props => {
-  var _context;
   const todayFormatted = moment__default["default"]().format('DD-MM-YY_HH-mm');
   const _useApplicationContex = applicationShellConnectors.useApplicationContext(applicationContext => ({
       locale: applicationContext.dataLocale
     })),
     locale = _useApplicationContex.locale;
-  const fields = _mapInstanceProperty__default["default"](_context = flattenNestedFields(props.fields)).call(_context, _ref => {
-    let isSelectedByDefault = _ref.isSelectedByDefault,
-      field = _objectWithoutProperties(_ref, _excluded);
-    return _objectSpread$3(_objectSpread$3({}, field), {}, {
-      isChecked: isSelectedByDefault !== null && isSelectedByDefault !== void 0 ? isSelectedByDefault : true
-    });
-  });
+  const groups = updateFieldGroupsWithIsCheckedValue(props.fieldGroups);
   return React__default["default"].useMemo(() => {
-    var _context2;
+    var _context;
     return {
       outputFormat: props.outputFormat,
-      fileName: _concatInstanceProperty__default["default"](_context2 = "".concat(resourceTypeToDisplayName({
+      fileName: _concatInstanceProperty__default["default"](_context = "".concat(resourceTypeToDisplayName({
         resourceType: props.resourceType,
         isUpperCase: true,
         isPlural: true
-      }), "_Export_")).call(_context2, todayFormatted),
+      }), "_Export_")).call(_context, todayFormatted),
       locales: [locale],
-      fields: checkRequiredFields(fields),
-      customFields: setInitialCheckedStateForCustomFields(props.customFields)
+      groups: updateFieldGroupWithAdditionalFieldExtensions(groups)
     };
-  }, [props, locale, todayFormatted, fields]);
+  }, [props, locale, todayFormatted, groups]);
 };
 
 async function createExportOperation(_ref) {
@@ -644,6 +588,7 @@ async function createExportOperation(_ref) {
   const uri = "/proxy/export/".concat(projectKey, "/export-operations");
   const response = await asyncDispatchFn(sdk.actions.post({
     // FIXME: EXPORT is undefined
+    // @ts-ignore
     mcApiProxyTarget: constants.MC_API_PROXY_TARGETS.EXPORT,
     uri: uri,
     headers: {
@@ -674,12 +619,29 @@ const useStartExportOperation = props => {
       };
     }),
     projectKey = _useApplicationContex.projectKey;
+  const extractFieldsFromGroups = groups => {
+    let selectedGeneralFields = [];
+    const getSelectedFields = fields => {
+      return _filterInstanceProperty__default["default"](fields).call(fields, field => {
+        var _field$isChecked;
+        if (field.fields) {
+          return getSelectedFields(field.fields);
+        }
+        if (field.isChecked) selectedGeneralFields.push(field);
+        return (_field$isChecked = field.isChecked) !== null && _field$isChecked !== void 0 ? _field$isChecked : false;
+      });
+    };
+    _forEachInstanceProperty__default["default"](groups).call(groups, group => {
+      getSelectedFields(group.fields);
+    });
+    return sortFieldsByFieldOrder({
+      fields: extractFieldNamesAndAdditionalFieldExtensions(selectedGeneralFields),
+      fieldOrder: props.fieldOrder
+    });
+  };
   const startExportOperation = async values => {
     try {
-      const selectedGeneralFields = getSelectedGeneralFields(values.fields);
-      const selectedCustomFields = getSelectedCustomFields(values.customFields);
-      const generalFields = extractGeneralFieldNames(selectedGeneralFields);
-      const customFields = sortCustomFields(extractCustomFieldNamesWithPrefix(selectedCustomFields));
+      const fields = extractFieldsFromGroups(values.groups);
       const filters = tmpBuildFilters(props.selectedResourceIds);
       const response = await createExportOperation({
         projectKey,
@@ -687,10 +649,7 @@ const useStartExportOperation = props => {
         fileName: appendCsvOrJsonExtensionIfAbsent(values.fileName, values.outputFormat),
         fileFormat: values.outputFormat,
         locales: values.locales,
-        fields: extendFields({
-          resourceType: props.resourceType,
-          fields: [...generalFields, ...customFields]
-        }),
+        fields,
         filters,
         asyncDispatchFn: asyncDispatch
       });
@@ -700,6 +659,7 @@ const useStartExportOperation = props => {
           showNotification({
             kind: 'info',
             domain: constants.DOMAINS.SIDE,
+            // @ts-ignore
             text: intl.formatMessage(messages.exportOperationSuccessMessage, {
               newline: getNewLine,
               logsLink: msg => getExportLogsLink(projectKey, msg),
@@ -888,13 +848,154 @@ const NoSearchResults = () => {
 };
 
 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 _context22, _context23; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context22 = ownKeys$1(Object(t), !0)).call(_context22, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context23 = ownKeys$1(Object(t))).call(_context23, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _context7, _context8; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context7 = ownKeys$1(Object(t), !0)).call(_context7, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context8 = ownKeys$1(Object(t))).call(_context8, 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: "e1ocu3bb1"
+  target: "e3xiyhb1"
 } )("border-right:", uiKit.designTokens.borderWidth1, " solid ", uiKit.designTokens.colorNeutral90, ";background-color:", uiKit.designTokens.colorNeutral98, ";height:100%;border-radius:0;", props => props.showTopBorder && /*#__PURE__*/react.css("border-top:", uiKit.designTokens.borderWidth1, " solid ", uiKit.designTokens.colorNeutral90, ";" + ("" ), "" ), ";" + ("" ));
 const StyledFieldsCard = /*#__PURE__*/_styled__default["default"](uiKit.Card, {
-  target: "e1ocu3bb0"
+  target: "e3xiyhb0"
 } )("border-radius:0;", props => props.showTopBorder && /*#__PURE__*/react.css("border-top:", uiKit.designTokens.borderWidth1, " solid ", uiKit.designTokens.colorNeutral90, ";" + ("" ), "" ), ";" + ("" ));
+const FieldSections = _ref => {
+  let fields = _ref.fields,
+    parentKeys = _ref.parentKeys,
+    formik = _ref.formik,
+    isAnySiblingChecked = _ref.isAnySiblingChecked;
+  return jsxRuntime.jsx(uiKit.Spacings.Stack, {
+    scale: "s",
+    children: fields === null || fields === void 0 ? void 0 : _mapInstanceProperty__default["default"](fields).call(fields, (field, index) => {
+      var _context, _field$fields3;
+      const isAtleastOneChildChecked = () => {
+        function checkAtLeastOneFieldChecked(fields) {
+          return fields === null || fields === void 0 ? void 0 : _someInstanceProperty__default["default"](fields).call(fields, field => {
+            if (field.fields) {
+              return field.isChecked || checkAtLeastOneFieldChecked(field.fields);
+            }
+            return field.isChecked;
+          });
+        }
+        return checkAtLeastOneFieldChecked(field.fields);
+      };
+      const isAnyOfTheChildFieldsChecked = isAtleastOneChildChecked();
+      if (field.isHidden) return null;
+      return jsxRuntime.jsxs(React__default["default"].Fragment, {
+        children: [jsxRuntime.jsxs(uiKit.CheckboxInput, {
+          isChecked: field.isReadOnly ? isAnySiblingChecked : isAnyOfTheChildFieldsChecked || field.isChecked,
+          isReadOnly: field.isReadOnly || field.isRequired,
+          onChange: e => {
+            var _context2, _field$fields2;
+            const path = _concatInstanceProperty__default["default"](_context2 = "".concat(parentKeys.join('.'), ".fields[")).call(_context2, index, "]");
+            // Update all child fields
+            const updateAllChildFieldsChecked = (path, checked) => {
+              const item = get__default["default"](_valuesInstanceProperty__default["default"](formik), path);
+              if (item && item.fields) {
+                var _context3;
+                _forEachInstanceProperty__default["default"](_context3 = item.fields).call(_context3, (field, i) => {
+                  var _context4, _field$fields;
+                  const fieldPath = _concatInstanceProperty__default["default"](_context4 = "".concat(path, ".fields[")).call(_context4, i, "]");
+                  if (!((_field$fields = field.fields) !== null && _field$fields !== void 0 && _field$fields.length)) {
+                    formik.setFieldValue("".concat(fieldPath, ".isChecked"), checked,
+                    // pass `false` to avoid revalidating the form with intermediate values
+                    false);
+                  }
+                  updateAllChildFieldsChecked(fieldPath, checked);
+                });
+              }
+            };
+            if (!((_field$fields2 = field.fields) !== null && _field$fields2 !== void 0 && _field$fields2.length)) {
+              formik.setFieldValue("".concat(path, ".isChecked"), e.target.checked,
+              // pass `false` to avoid revalidating the form with intermediate values
+              false);
+            }
+            updateAllChildFieldsChecked(path, e.target.checked);
+          },
+          children: [field.label, " ", field.isRequired && '*']
+        }), field.fields && ((_field$fields3 = field.fields) === null || _field$fields3 === void 0 ? void 0 : _field$fields3.length) > 0 && jsxRuntime.jsxs(uiKit.Spacings.Inline, {
+          scale: "l",
+          children: [jsxRuntime.jsx("div", {}), jsxRuntime.jsx(FieldSections, {
+            fields: field.fields,
+            formik: formik,
+            parentKeys: [...parentKeys, "fields[".concat(index, "]")],
+            isAnySiblingChecked: isAnySiblingChecked
+          })]
+        })]
+      }, _concatInstanceProperty__default["default"](_context = "".concat(field.name, "-")).call(_context, index));
+    })
+  });
+};
+function checkAllFieldsSelected(fields) {
+  return _everyInstanceProperty__default["default"](fields).call(fields, field => {
+    if (field.fields) {
+      return checkAllFieldsSelected(field.fields);
+    }
+    return field.isChecked || field.isRequired || field.isReadOnly;
+  });
+}
+function checkAtLeastOneFieldChecked(fields) {
+  return _someInstanceProperty__default["default"](fields).call(fields, field => {
+    if (field.fields) {
+      return field.isChecked || checkAtLeastOneFieldChecked(field.fields);
+    }
+    return field.isChecked;
+  });
+}
+const FieldGroupSection = _ref2 => {
+  let group = _ref2.group,
+    index = _ref2.index,
+    formik = _ref2.formik;
+  const allAllFieldsSelected = React__default["default"].useMemo(() => checkAllFieldsSelected(group.fields), [group.fields]);
+  const isAtleastOneFieldChecked = React__default["default"].useMemo(() => checkAtLeastOneFieldChecked(group.fields), [group.fields]);
+  const parentKey = "groups[".concat(index, "]");
+  const handleChangeAllFields = e => {
+    const item = get__default["default"](_valuesInstanceProperty__default["default"](formik), parentKey);
+    function updateAllFields(fields, checked) {
+      return _mapInstanceProperty__default["default"](fields).call(fields, field => {
+        if (field.fields) {
+          return _objectSpread$1(_objectSpread$1({}, field), {}, {
+            fields: updateAllFields(field.fields, checked)
+          });
+        }
+        if (field.isReadOnly || field.isRequired) return field;
+        return _objectSpread$1(_objectSpread$1({}, field), {}, {
+          isChecked: checked
+        });
+      });
+    }
+    formik.setFieldValue(parentKey, _objectSpread$1(_objectSpread$1({}, item), {}, {
+      fields: updateAllFields(item.fields, e.target.checked)
+    }));
+  };
+  if (group.isHidden) return null;
+  return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [jsxRuntime.jsx(uiKit.Grid.Item, {
+      children: jsxRuntime.jsx(StyledGroupCard, {
+        type: "flat",
+        insetScale: "l",
+        showTopBorder: true,
+        children: jsxRuntime.jsx(uiKit.CheckboxInput, {
+          isIndeterminate: !allAllFieldsSelected && isAtleastOneFieldChecked,
+          isChecked: allAllFieldsSelected,
+          onChange: handleChangeAllFields,
+          children: group.groupLabel
+        })
+      })
+    }), jsxRuntime.jsx(uiKit.Grid.Item, {
+      children: jsxRuntime.jsx(StyledFieldsCard, {
+        type: "flat",
+        insetScale: "l",
+        showTopBorder: true,
+        children: jsxRuntime.jsx(uiKit.Spacings.Stack, {
+          scale: "s",
+          children: jsxRuntime.jsx(FieldSections, {
+            fields: group.fields,
+            formik: formik,
+            parentKeys: [parentKey],
+            isAnySiblingChecked: isAtleastOneFieldChecked
+          })
+        })
+      })
+    })]
+  });
+};
 const ExportFieldsSelectionStep = () => {
   const intl = reactIntl.useIntl();
   const _React$useState = React__default["default"].useState(''),
@@ -910,47 +1011,44 @@ const ExportFieldsSelectionStep = () => {
     resourceType: resourceType,
     isPlural: true
   });
-  const areAllGeneralFieldsChecked = React__default["default"].useMemo(() => {
-    var _context;
-    return _everyInstanceProperty__default["default"](_context = _valuesInstanceProperty__default["default"](formik).fields).call(_context, field => field.isChecked);
-  }, [_valuesInstanceProperty__default["default"](formik).fields]);
-  const isAtLeastOneGeneralFieldChecked = React__default["default"].useMemo(() => {
-    var _context2;
-    return _someInstanceProperty__default["default"](_context2 = _valuesInstanceProperty__default["default"](formik).fields).call(_context2, field => field.isChecked);
-  }, [_valuesInstanceProperty__default["default"](formik).fields]);
-  const allCustomFields = React__default["default"].useMemo(() => {
-    var _context3;
-    return _flatMapInstanceProperty__default["default"](_context3 = _valuesInstanceProperty__default["default"](formik).customFields).call(_context3, customType => customType.fields);
-  }, [_valuesInstanceProperty__default["default"](formik).customFields]);
-  const areAllCustomFieldsChecked = React__default["default"].useMemo(() => {
-    return _everyInstanceProperty__default["default"](allCustomFields).call(allCustomFields, field => field.isChecked);
-  }, [allCustomFields]);
-  const isAtLeastOneCustomFieldChecked = React__default["default"].useMemo(() => {
-    return _someInstanceProperty__default["default"](allCustomFields).call(allCustomFields, field => field.isChecked);
-  }, [allCustomFields]);
-  const filteredGeneralFields = React__default["default"].useMemo(() => {
-    var _context4;
-    return _filterInstanceProperty__default["default"](_context4 = _valuesInstanceProperty__default["default"](formik).fields).call(_context4, field => {
-      var _context5;
-      return _includesInstanceProperty__default["default"](_context5 = field.label.toLowerCase()).call(_context5, _trimInstanceProperty__default["default"](fieldSearchTerm).call(fieldSearchTerm).toLowerCase());
-    });
-  }, [_valuesInstanceProperty__default["default"](formik).fields, fieldSearchTerm]);
-  const filteredCustomFields = React__default["default"].useMemo(() => {
-    var _context6, _context7;
-    return _filterInstanceProperty__default["default"](_context6 = _mapInstanceProperty__default["default"](_context7 = _valuesInstanceProperty__default["default"](formik).customFields).call(_context7, customType => {
-      var _context8, _context9;
-      return _objectSpread$1(_objectSpread$1({}, customType), {}, {
-        fields: _includesInstanceProperty__default["default"](_context8 = customType.type.label.toLowerCase()).call(_context8, _trimInstanceProperty__default["default"](fieldSearchTerm).call(fieldSearchTerm).toLowerCase()) ? customType.fields : _filterInstanceProperty__default["default"](_context9 = customType.fields).call(_context9, field => {
-          var _context10;
-          return _includesInstanceProperty__default["default"](_context10 = field.label.toLowerCase()).call(_context10, _trimInstanceProperty__default["default"](fieldSearchTerm).call(fieldSearchTerm).toLowerCase());
-        })
+  React__default["default"].useEffect(() => {
+    formik.validateForm();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [_valuesInstanceProperty__default["default"](formik).groups]);
+  // adds `isHidden` property to each field based on search term
+  const filteredGroups = React__default["default"].useMemo(() => {
+    var _fieldSearchTerm$trim, _context6;
+    const updateFields = (fields, parentMatches) => {
+      return _mapInstanceProperty__default["default"](fields).call(fields, field => {
+        var _context5;
+        const matches = _includesInstanceProperty__default["default"](_context5 = field.label.toLowerCase()).call(_context5, 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$1(_objectSpread$1({}, field), {}, {
+            fields: updatedFields
+          });
+        }
+        return _objectSpread$1(_objectSpread$1({}, field), {}, {
+          isHidden
+        });
       });
-    })).call(_context6, customType => customType.fields.length > 0);
-  }, [_valuesInstanceProperty__default["default"](formik).customFields, fieldSearchTerm]);
+    };
+    if (!(fieldSearchTerm !== null && fieldSearchTerm !== void 0 && (_fieldSearchTerm$trim = _trimInstanceProperty__default["default"](fieldSearchTerm).call(fieldSearchTerm)) !== null && _fieldSearchTerm$trim !== void 0 && _fieldSearchTerm$trim.length)) return _valuesInstanceProperty__default["default"](formik).groups;
+    return _mapInstanceProperty__default["default"](_context6 = _valuesInstanceProperty__default["default"](formik).groups).call(_context6, 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
+      });
+    });
+  }, [_valuesInstanceProperty__default["default"](formik).groups, fieldSearchTerm]);
   const onSearchChange = React__default["default"].useCallback(event => {
     setFieldSearchTerm(event.target.value);
   }, [setFieldSearchTerm]);
-  const hasResults = filteredGeneralFields.length > 0 || filteredCustomFields.length > 0;
+  const hasResults = Boolean(_findInstanceProperty__default["default"](filteredGroups).call(filteredGroups, group => !group.isHidden));
   const onSearchChangeThrottled = React__default["default"].useMemo(() => throttle__default["default"](onSearchChange, 300), [onSearchChange]);
   const onSearchReset = () => {
     setFieldSearchTerm('');
@@ -986,194 +1084,28 @@ const ExportFieldsSelectionStep = () => {
           value: fieldSearchTerm,
           onChange: onSearchChangeThrottled,
           onReset: onSearchReset
-        }), !hasResults && jsxRuntime.jsx(NoSearchResults, {}), hasResults && jsxRuntime.jsx(uiKit.Card, {
+          // TODO: `SearchTextInput` props to be improved. The `onSubmit` callback shouldn't be mandatory
+          ,
+          onSubmit: () => {}
+        }), hasResults ? jsxRuntime.jsx(uiKit.Card, {
           insetScale: "none",
-          children: jsxRuntime.jsxs(uiKit.Grid, {
+          children: jsxRuntime.jsx(uiKit.Grid, {
             gridAutoFlow: "row",
             gridTemplateColumns: "".concat(uiKit.designTokens.constraint5, " auto"),
-            children: [filteredGeneralFields.length > 0 && jsxRuntime.jsxs(jsxRuntime.Fragment, {
-              children: [jsxRuntime.jsx(uiKit.Grid.Item, {
-                children: jsxRuntime.jsx(StyledGroupCard, {
-                  type: "flat",
-                  insetScale: "l",
-                  children: jsxRuntime.jsx(uiKit.CheckboxInput, {
-                    isIndeterminate: !areAllGeneralFieldsChecked && isAtLeastOneGeneralFieldChecked,
-                    isChecked: areAllGeneralFieldsChecked,
-                    onChange: e => {
-                      var _context11;
-                      formik.setFieldValue('fields', _mapInstanceProperty__default["default"](_context11 = _valuesInstanceProperty__default["default"](formik).fields).call(_context11, field => _objectSpread$1(_objectSpread$1({}, field), {}, {
-                        isChecked: field.isRequired ? true : e.target.checked
-                      })));
-                    },
-                    children: jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$1({}, messages.allGeneralFields))
-                  })
-                })
-              }), jsxRuntime.jsx(uiKit.Grid.Item, {
-                children: jsxRuntime.jsx(StyledFieldsCard, {
-                  type: "flat",
-                  insetScale: "l",
-                  children: jsxRuntime.jsx(uiKit.Spacings.Stack, {
-                    scale: "s",
-                    children: jsxRuntime.jsx(GeneralFieldsSelection, {
-                      fields: filteredGeneralFields,
-                      formik: formik
-                    })
-                  })
-                })
-              })]
-            }), filteredCustomFields.length > 0 && jsxRuntime.jsxs(jsxRuntime.Fragment, {
-              children: [jsxRuntime.jsx(uiKit.Grid.Item, {
-                children: jsxRuntime.jsx(StyledGroupCard, {
-                  type: "flat",
-                  insetScale: "l",
-                  showTopBorder: filteredGeneralFields.length > 0,
-                  children: jsxRuntime.jsx(uiKit.CheckboxInput, {
-                    isIndeterminate: !areAllCustomFieldsChecked && isAtLeastOneCustomFieldChecked,
-                    isChecked: areAllCustomFieldsChecked,
-                    onChange: e => {
-                      var _context12;
-                      formik.setFieldValue('customFields', _mapInstanceProperty__default["default"](_context12 = _valuesInstanceProperty__default["default"](formik).customFields).call(_context12, customType => {
-                        var _context13;
-                        return _objectSpread$1(_objectSpread$1({}, customType), {}, {
-                          fields: _mapInstanceProperty__default["default"](_context13 = customType.fields).call(_context13, field => _objectSpread$1(_objectSpread$1({}, field), {}, {
-                            isChecked: e.target.checked
-                          }))
-                        });
-                      }));
-                    },
-                    children: jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$1({}, messages.allCustomFields))
-                  })
-                })
-              }), jsxRuntime.jsx(uiKit.Grid.Item, {
-                children: jsxRuntime.jsx(StyledFieldsCard, {
-                  type: "flat",
-                  insetScale: "l",
-                  showTopBorder: filteredGeneralFields.length > 0,
-                  children: jsxRuntime.jsxs(uiKit.Spacings.Stack, {
-                    scale: "s",
-                    children: [jsxRuntime.jsxs(uiKit.CheckboxInput, {
-                      isReadOnly: true,
-                      onChange: () => {},
-                      isChecked: isAtLeastOneCustomFieldChecked,
-                      children: [jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$1({}, messages.customTypeKeyAndTypeId)), ' ', "*"]
-                    }), jsxRuntime.jsx(CustomFieldsSelection, {
-                      customFields: filteredCustomFields,
-                      formik: formik
-                    })]
-                  })
-                })
-              })]
-            })]
+            children: _mapInstanceProperty__default["default"](filteredGroups).call(filteredGroups, (group, index) => jsxRuntime.jsx(FieldGroupSection, {
+              group: group,
+              index: index,
+              formik: formik
+            }, group.groupLabel))
           })
-        })]
+        }) : jsxRuntime.jsx(NoSearchResults, {})]
       })
     })
   });
 };
-const GeneralFieldsSelection = _ref => {
-  let fields = _ref.fields,
-    formik = _ref.formik;
-  return _mapInstanceProperty__default["default"](fields).call(fields, field => jsxRuntime.jsxs(uiKit.CheckboxInput, {
-    isChecked: field.isChecked,
-    isReadOnly: field.isRequired,
-    onChange: e => {
-      var _context14;
-      formik.setFieldValue('fields', _mapInstanceProperty__default["default"](_context14 = _valuesInstanceProperty__default["default"](formik).fields).call(_context14, _field => field.name === _field.name ? _objectSpread$1(_objectSpread$1({}, _field), {}, {
-        isChecked: e.target.checked
-      }) : _field));
-    },
-    children: [field.label, " ", field.isRequired && '*']
-  }, field.name));
-};
-const CustomFieldsSelection = _ref2 => {
-  let customFields = _ref2.customFields,
-    formik = _ref2.formik;
-  return _mapInstanceProperty__default["default"](customFields).call(customFields, customType => {
-    var _context15, _context16, _context19;
-    const areAllFieldsChecked = _everyInstanceProperty__default["default"](_context15 = customType.fields).call(_context15, field => field.isChecked);
-    const isAtLeastOneFieldChecked = _someInstanceProperty__default["default"](_context16 = customType.fields).call(_context16, field => field.isChecked);
-    return jsxRuntime.jsxs(uiKit.Spacings.Stack, {
-      scale: "s",
-      children: [jsxRuntime.jsx(uiKit.CheckboxInput, {
-        isIndeterminate: !areAllFieldsChecked && isAtLeastOneFieldChecked,
-        isChecked: areAllFieldsChecked,
-        onChange: e => {
-          var _context17;
-          formik.setFieldValue('customFields', _mapInstanceProperty__default["default"](_context17 = _valuesInstanceProperty__default["default"](formik).customFields).call(_context17, _customType => {
-            var _context18;
-            return _customType.type.key === customType.type.key ? _objectSpread$1(_objectSpread$1({}, _customType), {}, {
-              fields: _mapInstanceProperty__default["default"](_context18 = _customType.fields).call(_context18, field => _objectSpread$1(_objectSpread$1({}, field), {}, {
-                isChecked: e.target.checked
-              }))
-            }) : _customType;
-          }));
-        },
-        children: jsxRuntime.jsx(uiKit.Text.Body, {
-          children: customType.type.label
-        })
-      }), jsxRuntime.jsxs(uiKit.Spacings.Inline, {
-        scale: "l",
-        children: [jsxRuntime.jsx("div", {}), jsxRuntime.jsx(uiKit.Spacings.Stack, {
-          scale: "s",
-          children: _mapInstanceProperty__default["default"](_context19 = customType.fields).call(_context19, field => jsxRuntime.jsx(uiKit.CheckboxInput, {
-            isChecked: field.isChecked,
-            onChange: e => {
-              var _context20;
-              formik.setFieldValue('customFields', _mapInstanceProperty__default["default"](_context20 = _valuesInstanceProperty__default["default"](formik).customFields).call(_context20, _customType => {
-                var _context21;
-                return _customType.type.key === customType.type.key ? _objectSpread$1(_objectSpread$1({}, _customType), {}, {
-                  fields: _mapInstanceProperty__default["default"](_context21 = _customType.fields).call(_context21, _field => _field.name === field.name ? _objectSpread$1(_objectSpread$1({}, _field), {}, {
-                    isChecked: e.target.checked
-                  }) : _field)
-                }) : _customType;
-              }));
-            },
-            children: jsxRuntime.jsx(uiKit.Text.Body, {
-              children: field.label
-            })
-          }, field.name))
-        })]
-      })]
-    }, customType.type.key);
-  });
-};
 
 const ExportResourcesContext = /*#__PURE__*/React.createContext();
 
-PropTypes__default["default"].shape({
-  isOpen: PropTypes__default["default"].bool,
-  resourceType: PropTypes__default["default"].string.isRequired,
-  outputFormat: PropTypes__default["default"].string,
-  onClose: PropTypes__default["default"].func,
-  onExportSuccess: PropTypes__default["default"].func,
-  totalResourcesCount: PropTypes__default["default"].number.isRequired,
-  selectedResourceIds: PropTypes__default["default"].array,
-  // TODO: Circular reference
-  fields: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({
-    name: PropTypes__default["default"].string.isRequired,
-    label: PropTypes__default["default"].string,
-    fields: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({
-      name: PropTypes__default["default"].string.isRequired,
-      label: PropTypes__default["default"].string,
-      isSelectedByDefault: PropTypes__default["default"].bool,
-      isRequired: PropTypes__default["default"].bool
-    }))
-  })).isRequired,
-  customFields: PropTypes__default["default"].shape({
-    type: PropTypes__default["default"].shape({
-      key: PropTypes__default["default"].string.isRequired,
-      label: PropTypes__default["default"].string.isRequired,
-      resourceTypeIds: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string)
-    }).isRequired,
-    fields: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({
-      name: PropTypes__default["default"].string.isRequired,
-      label: PropTypes__default["default"].string
-    })).isRequired
-  }),
-  exportType: PropTypes__default["default"].string,
-  renderProperties: PropTypes__default["default"].func
-}).isRequired;
-
 const ExportResourcesProvider = props => {
   const initialValues = useInitialValues(props);
   const _useStartExportOperat = useStartExportOperation(props),
@@ -1214,8 +1146,6 @@ const ExportResourcesProvider = props => {
     children: props.children
   });
 };
-ExportResourcesProvider.displayName = 'ExportResourcesProvider';
-ExportResourcesProvider.propTypes = {};
 
 const CurrentStep = () => {
   const _useExportResourcesCo = useExportResourcesContext(),
@@ -1227,22 +1157,100 @@ const CurrentStep = () => {
   return steps[currentStep] || null;
 };
 
+const loadMessages = locale => {
+  const intlLocale = i18n.mapLocaleToIntlLocale(locale);
+  switch (intlLocale) {
+    case 'de':
+      return Promise.resolve().then(function () { return require( /* webpackChunkName: "export-resources-modal-i18n-de" */'./de-d954fe3d.cjs.prod.js'); });
+    case 'es':
+      return Promise.resolve().then(function () { return require( /* webpackChunkName: "export-resources-modal-i18n-es" */'./es-042343bd.cjs.prod.js'); });
+    case 'fr-FR':
+      return Promise.resolve().then(function () { return require( /* webpackChunkName: "export-resources-modal-i18n-fr-FR" */'./fr-FR-fce1ca96.cjs.prod.js'); });
+    case 'zh-CN':
+      return Promise.resolve().then(function () { return require( /* webpackChunkName: "export-resources-modal-i18n-zh-CN" */'./zh-CN-52baa549.cjs.prod.js'); });
+    case 'ja':
+      return Promise.resolve().then(function () { return require( /* webpackChunkName: "export-resources-modal-i18n-ja" */'./ja-37632763.cjs.prod.js'); });
+    case 'pt-BR':
+      return Promise.resolve().then(function () { return require( /* webpackChunkName: "change-history-i18n-pt-BR" */'./pt-BR-ec2a1a11.cjs.prod.js'); });
+    default:
+      return Promise.resolve().then(function () { return require( /* webpackChunkName: "export-resources-modal-i18n-en" */'./en-c7757448.cjs.prod.js'); });
+  }
+};
+
+// eslint-disable-next-line import/prefer-default-export
+const loadI18n = async locale => {
+  try {
+    const messages = await loadMessages(locale);
+    return messages.default || messages;
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.warn("Something went wrong while loading the export-resources-modal messages for ".concat(locale), error);
+    sentry.reportErrorToSentry(new Error("Something went wrong while loading the export-resources-modal messages for ".concat(locale)), {
+      extra: error
+    });
+    return {};
+  }
+};
+
+const useAsyncIntlMessages = (locale, loader) => {
+  const _useState = React.useState({
+      isLoading: true,
+      messages: undefined,
+      error: undefined
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  React.useEffect(() => {
+    let _isUnmounting = false;
+    async function load() {
+      try {
+        if (!_isUnmounting) {
+          const messages = await loader(locale);
+          setState({
+            isLoading: false,
+            messages
+          });
+        }
+      } catch (error) {
+        setState({
+          isLoading: false,
+          error
+        });
+      }
+    }
+    if (locale) load();
+    return () => {
+      _isUnmounting = true;
+    };
+  }, [locale, loader]);
+  return state;
+};
+
 function ownKeys(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(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(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(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const ExportResourcesModal = props => {
-  if (!props.isOpen) return null;
-  return jsxRuntime.jsx(ExportResourcesProvider, _objectSpread(_objectSpread({}, props), {}, {
-    children: jsxRuntime.jsx(CurrentStep, {})
-  }));
+  const _useApplicationContex = applicationShellConnectors.useApplicationContext(context => ({
+      locale: context.user && context.user.locale
+    })),
+    locale = _useApplicationContex.locale;
+  const messages = useAsyncIntlMessages('en', loadI18n);
+  if (!props.isOpen || messages.isLoading) return null;
+  return jsxRuntime.jsx(reactIntl.IntlProvider, {
+    locale: locale,
+    messages: messages.messages,
+    children: jsxRuntime.jsx(ExportResourcesProvider, _objectSpread(_objectSpread({}, props), {}, {
+      children: jsxRuntime.jsx(CurrentStep, {})
+    }))
+  });
 };
 ExportResourcesModal.displayName = 'ExportResourcesModal';
-ExportResourcesModal.propTypes = {};
 ExportResourcesModal.defaultProps = {
   isOpen: false,
   selectedResourceIds: [],
   exportType: EXPORT_TYPES.ALL,
   outputFormat: OUTPUT_FORMATS.CSV,
-  customFields: []
+  fieldGroups: []
 };
 
 exports.EXPORTABLE_RESOURCES = EXPORTABLE_RESOURCES;