@commercetools-frontend-extensions/export-resources-modal 5.0.3 → 5.1.0

package/dist/{index-6820b049.cjs.prod.js → index-bcefd2cf.cjs.prod.js}

@@ -43,6 +43,7 @@ var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _sortInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/sort');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/index-of');
 var _trimInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/trim');
+var _bindInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/bind');
 var _Promise = require('@babel/runtime-corejs3/core-js-stable/promise');
 var _sliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/slice');
 var _Object$values = require('@babel/runtime-corejs3/core-js-stable/object/values');
@@ -91,6 +92,7 @@ var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _sortInstanceProperty__default = /*#__PURE__*/_interopDefault(_sortInstanceProperty);
 var _indexOfInstanceProperty__default = /*#__PURE__*/_interopDefault(_indexOfInstanceProperty);
 var _trimInstanceProperty__default = /*#__PURE__*/_interopDefault(_trimInstanceProperty);
+var _bindInstanceProperty__default = /*#__PURE__*/_interopDefault(_bindInstanceProperty);
 var _Promise__default = /*#__PURE__*/_interopDefault(_Promise);
 var _sliceInstanceProperty__default = /*#__PURE__*/_interopDefault(_sliceInstanceProperty);
 var _Object$values__default = /*#__PURE__*/_interopDefault(_Object$values);
@@ -620,6 +622,26 @@ var messages = reactIntl.defineMessages({
     id: 'ExportResourcesModal.uploadErrorsDetected',
     description: 'Message shown when errors are detected during file upload',
     defaultMessage: 'There are <b>{total}</b> errors detected while uploading the file <b>{fileName}</b>. Use <templateLink>our template</templateLink> to review the right formatting and supported values, try exporting using our field selection first or visit <documentationLink>our documentation</documentationLink> for further information.'
+  },
+  queryPredicate: {
+    id: 'ExportResourcesModal.queryPredicate',
+    description: 'Label for query predicate option',
+    defaultMessage: 'Query predicate'
+  },
+  invalidQueryPredicate: {
+    id: 'ExportResourcesModal.invalidQueryPredicate',
+    description: 'Error when query predicate field is not valid',
+    defaultMessage: 'There is an error with the query predicate. Make sure the syntax is correct.'
+  },
+  missingQueryPredicateError: {
+    id: 'ExportResourcesModal.missingQueryPredicateError',
+    description: 'Error when query predicate field is missing',
+    defaultMessage: 'Please enter a query predicate'
+  },
+  noResourcesToExport: {
+    id: 'ExportResourcesModal.noResourcesToExport',
+    description: 'Error message when there are no resources to export',
+    defaultMessage: 'No resources match your query predicate. Please check your query predicate and try again.'
   }
 });
 
@@ -643,6 +665,16 @@ function renderLocaleError(key) {
       return null;
   }
 }
+const renderQueryPredicateError = key => {
+  switch (key) {
+    case 'missing':
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$h({}, messages.missingQueryPredicateError));
+    case 'invalidInput':
+      return jsxRuntime.jsx(reactIntl.FormattedMessage, _objectSpread$h({}, messages.invalidQueryPredicate));
+    default:
+      return null;
+  }
+};
 
 function _callSuper$3(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct$3() ? _Reflect$construct__default["default"](o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct$3() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct__default["default"](Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct$3 = function () { return !!t; })(); }
@@ -787,7 +819,8 @@ const EXPORT_OPERATION_STATES = {
 const EXPORT_TYPES = {
   ALL: 'all',
   FILTERED: 'filtered',
-  SELECTED: 'selected'
+  SELECTED: 'selected',
+  QUERY_PREDICATE: 'query-predicate'
 };
 
 const EXPORTABLE_RESOURCES = {
@@ -864,6 +897,140 @@ const DEFAULT_SHORT_LIVED_FLAGS = {};
 const DEFAULT_LONG_LIVED_FLAGS = {};
 _objectSpread$f(_objectSpread$f({}, DEFAULT_SHORT_LIVED_FLAGS), DEFAULT_LONG_LIVED_FLAGS);
 
+function resourceTypeToFileName(resourceType, locale) {
+  var _context;
+  const date = new Date();
+  const dateFormatter = new Intl.DateTimeFormat(locale, {
+    year: '2-digit',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false
+  });
+  const parts = dateFormatter.formatToParts(date);
+  const dateParts = _reduceInstanceProperty__default["default"](parts).call(parts, (acc, part) => {
+    if (part.type !== 'literal') {
+      acc[part.type] = part.value;
+    }
+    return acc;
+  }, {});
+  const orderedDateParts = _mapInstanceProperty__default["default"](_context = _filterInstanceProperty__default["default"](parts).call(parts, part => part.type === 'day' || part.type === 'month' || part.type === 'year')).call(_context, part => dateParts[part.type]).join('-');
+  const formattedDate = `${orderedDateParts}_${dateParts.hour}-${dateParts.minute}`;
+  const resourceTypeMap = {
+    [EXPORTABLE_RESOURCES.CATEGORY]: 'Categories',
+    [EXPORTABLE_RESOURCES.PRODUCT]: 'Products',
+    [EXPORTABLE_RESOURCES.PRODUCT_TYPE]: 'Product_Types',
+    [EXPORTABLE_RESOURCES.DISCOUNT_CODE]: 'Discount_Codes',
+    [EXPORTABLE_RESOURCES.INVENTORY_ENTRY]: 'Inventories',
+    [EXPORTABLE_RESOURCES.CUSTOMER]: 'Customers',
+    [EXPORTABLE_RESOURCES.ORDER]: 'Orders'
+  };
+  const displayName = resourceTypeMap[resourceType];
+  if (!displayName) {
+    throw new UnexpectedResourceTypeError(resourceType);
+  }
+  return `${displayName}_Export_${formattedDate}`;
+}
+function mapLocalesToOptions(locales) {
+  return _mapInstanceProperty__default["default"](locales).call(locales, locale => ({
+    value: locale,
+    label: locale
+  }));
+}
+function isFilledArray(maybeArray) {
+  return _Array$isArray__default["default"](maybeArray) && maybeArray.length > 0;
+}
+function appendCsvOrJsonExtensionIfAbsent(fileName, fileFormat) {
+  const extensionRegex = /\.(csv|json)$/i;
+  if (!extensionRegex.test(fileName)) return `${fileName}.${fileFormat}`;
+  return fileName;
+}
+function getExportLogsLink(projectKey, msg) {
+  return jsxRuntime.jsx(uiKit.Link, {
+    to: `/${projectKey}/operations/export/logs`,
+    children: msg
+  }, "link");
+}
+const extractFieldNamesAndAdditionalFieldExtensions = fields => {
+  const result = _reduceInstanceProperty__default["default"](fields).call(fields, (acc, field) => {
+    if (field.extendedFieldNames) {
+      return [...acc, field.name, ...field.extendedFieldNames];
+    }
+    return [...acc, field.name];
+  }, []);
+  return [...new _Set__default["default"](result)];
+};
+function sortFieldsByFieldOrder(_ref) {
+  let fieldNames = _ref.fieldNames,
+    fieldOrder = _ref.fieldOrder;
+  if (isFilledArray(fieldOrder)) {
+    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]);
+
+      // 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 fieldNames;
+}
+function buildSelectedExportFilters(selectedResourceIds) {
+  if (!selectedResourceIds || selectedResourceIds?.length === 0) return undefined;
+  const formattedIds = _mapInstanceProperty__default["default"](selectedResourceIds).call(selectedResourceIds, id => `"${id}"`).join(', ');
+  return `id in (${formattedIds})`;
+}
+function isQueryFilter(filters) {
+  if (!filters) return false;
+  return 'query' in filters;
+}
+function isSearchFilter(filters) {
+  if (!filters) return false;
+  return 'filters' in filters || 'fullText' in filters;
+}
+function isPredicateFilter(filters) {
+  if (!filters) return false;
+  return 'where' in filters;
+}
+function validateFilters(filtersObject) {
+  if (filtersObject.where && filtersObject.filters) {
+    return false;
+  }
+  return Boolean(isQueryFilter(filtersObject.filters) || isSearchFilter(filtersObject.filters) || isPredicateFilter(filtersObject));
+}
+function areFiltersApplied(filtersObject) {
+  var _context2;
+  if (!filtersObject) {
+    return false;
+  }
+  if (filtersObject.where && _trimInstanceProperty__default["default"](_context2 = filtersObject.where).call(_context2) !== '') {
+    return true;
+  }
+  if (isQueryFilter(filtersObject.filters)) {
+    return Boolean(filtersObject.filters.query);
+  }
+  if (isSearchFilter(filtersObject.filters)) {
+    var _context3, _context4;
+    const _filters = filtersObject.filters;
+    return Boolean(_filters.filters?.length || ((_context3 = _filters.fullText?.text) == null ? void 0 : _bindInstanceProperty__default["default"](_context4 = Function.call).call(_context4, _trimInstanceProperty__default["default"](_context3), _context3))?.());
+  }
+  return false;
+}
+function getInitialExportType(args) {
+  if (args.selectedResourceIds?.length) {
+    return EXPORT_TYPES.SELECTED;
+  }
+  if (args.filters?.total && areFiltersApplied(args.filters)) {
+    return EXPORT_TYPES.FILTERED;
+  }
+  return EXPORT_TYPES.ALL;
+}
+function removeEmptyGroups(groups) {
+  return _filterInstanceProperty__default["default"](groups).call(groups, group => group.fields && group.fields.length > 0);
+}
+
 const isAnyFieldChecked = fields => {
   return _someInstanceProperty__default["default"](fields).call(fields, field => field.isChecked || field.fields && isAnyFieldChecked(field.fields));
 };
@@ -977,6 +1144,25 @@ const getSelectedFieldLabels = group => {
   findSelectedFieldLabels(group.fields);
   return selectedLabels;
 };
+const extractFieldNamesFromGroups = (groups, fieldOrder) => {
+  let checkedFields = [];
+  const getCheckedFields = fields => {
+    return _filterInstanceProperty__default["default"](fields).call(fields, field => {
+      if (field.fields) {
+        return getCheckedFields(field.fields);
+      }
+      if (field.isChecked) checkedFields.push(field);
+      return field.isChecked ?? false;
+    });
+  };
+  _forEachInstanceProperty__default["default"](groups).call(groups, group => {
+    getCheckedFields(group.fields);
+  });
+  return sortFieldsByFieldOrder({
+    fieldNames: extractFieldNamesAndAdditionalFieldExtensions(checkedFields),
+    fieldOrder
+  });
+};
 
 let Step = /*#__PURE__*/function (Step) {
   Step["FileSettings"] = "file-settings";
@@ -997,21 +1183,27 @@ function validate(_ref) {
   let values = _valuesInstanceProperty__default["default"](_ref),
     step = _ref.step,
     fieldSelectionMode = _ref.fieldSelectionMode,
-    importedHeaders = _ref.importedHeaders;
+    importedHeaders = _ref.importedHeaders,
+    exportType = _ref.exportType;
   const fileName = values.fileName,
+    queryPredicate = values.queryPredicate,
     locales = values.locales,
     groups = values.groups;
   const errors = {
     fileName: {},
     locales: {},
     fields: {},
-    importedCsvTemplateFile: {}
+    importedCsvTemplateFile: {},
+    queryPredicate: {}
   };
   if (uiKit.TextInput.isEmpty(fileName)) {
     errors.fileName.missing = true;
   } else if (!/^[a-zA-Z0-9-_.]+$/.test(fileName)) {
     errors.fileName.invalidInput = true;
   }
+  if (exportType === 'query-predicate' && uiKit.TextInput.isEmpty(queryPredicate)) {
+    errors.queryPredicate.missing = true;
+  }
   if (step === Step.FieldsSelection) {
     if (fieldSelectionMode === 'selected-fields') {
       const allFields = _reduceInstanceProperty__default["default"](groups).call(groups, (acc, group) => _concatInstanceProperty__default["default"](acc).call(acc, group.fields), []);
@@ -1041,139 +1233,6 @@ function isFieldNameValid(header) {
   return /^[a-zA-Z0-9._-]+$/.test(processedHeader);
 }
 
-function resourceTypeToFileName(resourceType, locale) {
-  var _context;
-  const date = new Date();
-  const dateFormatter = new Intl.DateTimeFormat(locale, {
-    year: '2-digit',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    hour12: false
-  });
-  const parts = dateFormatter.formatToParts(date);
-  const dateParts = _reduceInstanceProperty__default["default"](parts).call(parts, (acc, part) => {
-    if (part.type !== 'literal') {
-      acc[part.type] = part.value;
-    }
-    return acc;
-  }, {});
-  const orderedDateParts = _mapInstanceProperty__default["default"](_context = _filterInstanceProperty__default["default"](parts).call(parts, part => part.type === 'day' || part.type === 'month' || part.type === 'year')).call(_context, part => dateParts[part.type]).join('-');
-  const formattedDate = `${orderedDateParts}_${dateParts.hour}-${dateParts.minute}`;
-  const resourceTypeMap = {
-    [EXPORTABLE_RESOURCES.CATEGORY]: 'Categories',
-    [EXPORTABLE_RESOURCES.PRODUCT]: 'Products',
-    [EXPORTABLE_RESOURCES.PRODUCT_TYPE]: 'Product_Types',
-    [EXPORTABLE_RESOURCES.DISCOUNT_CODE]: 'Discount_Codes',
-    [EXPORTABLE_RESOURCES.INVENTORY_ENTRY]: 'Inventories',
-    [EXPORTABLE_RESOURCES.CUSTOMER]: 'Customers',
-    [EXPORTABLE_RESOURCES.ORDER]: 'Orders'
-  };
-  const displayName = resourceTypeMap[resourceType];
-  if (!displayName) {
-    throw new UnexpectedResourceTypeError(resourceType);
-  }
-  return `${displayName}_Export_${formattedDate}`;
-}
-function mapLocalesToOptions(locales) {
-  return _mapInstanceProperty__default["default"](locales).call(locales, locale => ({
-    value: locale,
-    label: locale
-  }));
-}
-function isFilledArray(maybeArray) {
-  return _Array$isArray__default["default"](maybeArray) && maybeArray.length > 0;
-}
-function appendCsvOrJsonExtensionIfAbsent(fileName, fileFormat) {
-  const extensionRegex = /\.(csv|json)$/i;
-  if (!extensionRegex.test(fileName)) return `${fileName}.${fileFormat}`;
-  return fileName;
-}
-function getExportLogsLink(projectKey, msg) {
-  return jsxRuntime.jsx(uiKit.Link, {
-    to: `/${projectKey}/operations/export/logs`,
-    children: msg
-  }, "link");
-}
-const extractFieldNamesAndAdditionalFieldExtensions = fields => {
-  const result = _reduceInstanceProperty__default["default"](fields).call(fields, (acc, field) => {
-    if (field.extendedFieldNames) {
-      return [...acc, field.name, ...field.extendedFieldNames];
-    }
-    return [...acc, field.name];
-  }, []);
-  return [...new _Set__default["default"](result)];
-};
-function sortFieldsByFieldOrder(_ref) {
-  let fieldNames = _ref.fieldNames,
-    fieldOrder = _ref.fieldOrder;
-  if (isFilledArray(fieldOrder)) {
-    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]);
-
-      // 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 fieldNames;
-}
-function buildSelectedExportFilters(selectedResourceIds) {
-  if (!selectedResourceIds || selectedResourceIds?.length === 0) return undefined;
-  const formattedIds = _mapInstanceProperty__default["default"](selectedResourceIds).call(selectedResourceIds, id => `"${id}"`).join(', ');
-  return `id in (${formattedIds})`;
-}
-function isQueryFilter(filters) {
-  if (!filters) return false;
-  return 'query' in filters;
-}
-function isSearchFilter(filters) {
-  if (!filters) return false;
-  return 'filters' in filters || 'fullText' in filters;
-}
-function isPredicateFilter(filters) {
-  if (!filters) return false;
-  return 'where' in filters;
-}
-function validateFilters(filtersObject) {
-  if (filtersObject.where && filtersObject.filters) {
-    return false;
-  }
-  return Boolean(isQueryFilter(filtersObject.filters) || isSearchFilter(filtersObject.filters) || isPredicateFilter(filtersObject));
-}
-function areFiltersApplied(filtersObject) {
-  var _context2;
-  if (!filtersObject) {
-    return false;
-  }
-  if (filtersObject.where && _trimInstanceProperty__default["default"](_context2 = filtersObject.where).call(_context2) !== '') {
-    return true;
-  }
-  if (isQueryFilter(filtersObject.filters)) {
-    return Boolean(filtersObject.filters.query);
-  }
-  if (isSearchFilter(filtersObject.filters)) {
-    const _filters = filtersObject.filters;
-    return Boolean(_filters.filters?.length || _filters.fullText?.text?.trim());
-  }
-  return false;
-}
-function getInitialExportType(args) {
-  if (args.selectedResourceIds?.length) {
-    return EXPORT_TYPES.SELECTED;
-  }
-  if (args.filters?.total && areFiltersApplied(args.filters)) {
-    return EXPORT_TYPES.FILTERED;
-  }
-  return EXPORT_TYPES.ALL;
-}
-function removeEmptyGroups(groups) {
-  return _filterInstanceProperty__default["default"](groups).call(groups, group => group.fields && group.fields.length > 0);
-}
-
 function ownKeys$e(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(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context2 = ownKeys$e(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context3 = ownKeys$e(Object(t))).call(_context3, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const updateFieldGroupsWithIsCheckedValue = (groups, cachedSelectedGroups) => {
@@ -1398,6 +1457,13 @@ function groupFieldValidationErrors(errors, intl) {
   });
 }
 
+function isExportApiSuccessResponse(response) {
+  return 'id' in response && 'state' in response && 'resourceType' in response && 'resourceCount' in response;
+}
+function isExportApiErrorResponse(error) {
+  return Boolean(error && typeof error === 'object' && 'body' in error && error.body && typeof error.body === 'object' && ('validationErrors' in error.body || 'errors' in error.body) && 'message' in error.body && 'statusCode' in error.body && 'error' in error.body);
+}
+
 const useInitialValues = props => {
   var _context;
   const _useApplicationContex = applicationShellConnectors.useApplicationContext(applicationContext => ({
@@ -1430,6 +1496,7 @@ const useInitialValues = props => {
       fileName: `${resourceTypeToFileName(props.resourceType, userLocale)}`,
       locales: [locale],
       groups: updateFieldGroupWithAdditionalFieldExtensions(groups),
+      queryPredicate: '',
       // Preferences
       fillRows: false,
       importedCsvTemplateFile: null
@@ -1441,37 +1508,30 @@ const _excluded$3 = ["projectKey"];
 function ownKeys$c(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$c(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$c(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$c(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 async function makeExportRequest(params, asyncDispatchFn) {
-  try {
-    const projectKey = params.projectKey,
-      requestData = _objectWithoutProperties(params, _excluded$3);
-    const uri = `/${projectKey}/export-operations`;
-    const requestAction = sdk.actions.post({
-      mcApiProxyTarget: constants.MC_API_PROXY_TARGETS.EXPORT,
-      uri,
-      headers: {
-        accept: 'application/json'
-      },
-      payload: requestData
-    });
-    const response = await asyncDispatchFn(requestAction);
-    if (!response || typeof response !== 'object') {
-      throw new InvalidResponseError();
-    }
-    if (!('state' in response)) {
-      throw new InvalidResponseError('Response missing state field');
-    }
-    return response;
-  } catch (responseError) {
-    if (responseError && typeof responseError === 'object' && 'body' in responseError && responseError.body && typeof responseError.body === 'object' && 'validationErrors' in responseError.body) {
-      throw responseError.body;
-    }
-    throw responseError;
+  const projectKey = params.projectKey,
+    requestData = _objectWithoutProperties(params, _excluded$3);
+  const uri = `/${projectKey}/export-operations`;
+  const requestAction = sdk.actions.post({
+    mcApiProxyTarget: constants.MC_API_PROXY_TARGETS.EXPORT,
+    uri,
+    headers: {
+      accept: 'application/json'
+    },
+    payload: requestData
+  });
+  const response = await asyncDispatchFn(requestAction);
+  if (!response || typeof response !== 'object') {
+    throw new InvalidResponseError();
+  }
+  if (!('state' in response)) {
+    throw new InvalidResponseError('Response missing state field');
   }
+  return response;
 }
 function createExportOperation(params, asyncDispatchFn) {
   return makeExportRequest(params, asyncDispatchFn);
 }
-function validateImportedHeaders(params, asyncDispatchFn) {
+function validateExportOperation(params, asyncDispatchFn) {
   return makeExportRequest(_objectSpread$c(_objectSpread$c({}, params), {}, {
     dryRun: true
   }), asyncDispatchFn);
@@ -1486,25 +1546,6 @@ const useStartExportOperation = props => {
       projectKey: applicationContext.project?.key
     })),
     projectKey = _useApplicationContex.projectKey;
-  const extractFieldNamesFromGroups = groups => {
-    let checkedFields = [];
-    const getCheckedFields = fields => {
-      return _filterInstanceProperty__default["default"](fields).call(fields, field => {
-        if (field.fields) {
-          return getCheckedFields(field.fields);
-        }
-        if (field.isChecked) checkedFields.push(field);
-        return field.isChecked ?? false;
-      });
-    };
-    _forEachInstanceProperty__default["default"](groups).call(groups, group => {
-      getCheckedFields(group.fields);
-    });
-    return sortFieldsByFieldOrder({
-      fieldNames: extractFieldNamesAndAdditionalFieldExtensions(checkedFields),
-      fieldOrder: props.fieldOrder
-    });
-  };
   const startExportOperation = async (values, exportType, fieldSelectionMode, localeOption, importedHeaders) => {
     try {
       if (!projectKey) throw new Error('Project key is missing');
@@ -1512,7 +1553,7 @@ const useStartExportOperation = props => {
       if (fieldSelectionMode === 'imported-csv-template' && values.importedCsvTemplateFile) {
         fields = importedHeaders;
       } else {
-        fields = extractFieldNamesFromGroups(values.groups);
+        fields = extractFieldNamesFromGroups(values.groups, props.fieldOrder);
       }
       let where = undefined;
       let filters = undefined;
@@ -1525,6 +1566,9 @@ const useStartExportOperation = props => {
         } else if (isSearchFilter(props.filters.filters)) {
           filters = props.filters.filters;
         }
+      } else if (exportType === EXPORT_TYPES.QUERY_PREDICATE) {
+        var _context;
+        where = _trimInstanceProperty__default["default"](_context = values.queryPredicate).call(_context);
       }
       let locales = undefined;
       if (localeOption !== 'onlyLocalesFoundInCsvFile') {
@@ -1541,29 +1585,32 @@ const useStartExportOperation = props => {
         where,
         filters
       }, asyncDispatch);
-      switch (response.state) {
-        case EXPORT_OPERATION_STATES.QUEUED:
-        case EXPORT_OPERATION_STATES.PROCESSING:
-        case EXPORT_OPERATION_STATES.COMPLETED:
-          showNotification({
-            kind: 'info',
-            domain: constants.DOMAINS.SIDE,
-            // @ts-ignore
-            text: intl.formatMessage(messages.exportOperationSuccessMessage, {
-              newline: getNewLine,
-              logsLink: msg => getExportLogsLink(projectKey, msg),
-              b: getBold
-            })
-          }, {
-            dismissAfter: 5000
-          });
-          if (typeof props.onExportSuccess === 'function') props.onExportSuccess();
-          break;
-        default:
-          throw new UnexpectedExportOperationStateError(response.state);
+      if (isExportApiSuccessResponse(response)) {
+        switch (response.state) {
+          case EXPORT_OPERATION_STATES.QUEUED:
+          case EXPORT_OPERATION_STATES.PROCESSING:
+          case EXPORT_OPERATION_STATES.COMPLETED:
+            showNotification({
+              kind: 'info',
+              domain: constants.DOMAINS.SIDE,
+              // @ts-ignore
+              text: intl.formatMessage(messages.exportOperationSuccessMessage, {
+                newline: getNewLine,
+                logsLink: msg => getExportLogsLink(projectKey, msg),
+                b: getBold
+              })
+            }, {
+              dismissAfter: 5000
+            });
+            if (typeof props.onExportSuccess === 'function') props.onExportSuccess();
+            break;
+          default:
+            throw new UnexpectedExportOperationStateError(response.state);
+        }
+      } else {
+        throw new Error(response.message || 'Unknown error occurred during export operation');
       }
     } catch (error) {
-      // TODO: custom error messages for each error type
       showNotification({
         text: intl.formatMessage(messages.unexpectedError),
         kind: 'error',
@@ -1580,7 +1627,7 @@ const useStartExportOperation = props => {
 
 const _excluded$2 = ["fields"];
 function ownKeys$b(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$b(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context2 = ownKeys$b(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context3 = ownKeys$b(Object(t))).call(_context3, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function _objectSpread$b(e) { for (var r = 1; r < arguments.length; r++) { var _context6, _context7; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context6 = ownKeys$b(Object(t), !0)).call(_context6, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context7 = ownKeys$b(Object(t))).call(_context7, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const getFieldFullName = _ref => {
   var _context;
   let fieldPrefix = _ref.fieldPrefix,
@@ -1590,6 +1637,7 @@ const getFieldFullName = _ref => {
 const localizeTypeDefinitionLabels = function () {
   let fieldDefinitions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return _mapInstanceProperty__default["default"](fieldDefinitions).call(fieldDefinitions, _ref2 => {
+    var _context2, _context3;
     let fields = _ref2.fields,
       fieldsType = _objectWithoutProperties(_ref2, _excluded$2);
     const isFieldTypeLabelLocalized = _Array$isArray__default["default"](fieldsType.label);
@@ -1599,7 +1647,7 @@ const localizeTypeDefinitionLabels = function () {
         from: 'label',
         to: 'label'
       }]).label : fieldsType.label,
-      fields: fields?.map(field => {
+      fields: ((_context2 = fields) == null ? void 0 : _bindInstanceProperty__default["default"](_context3 = Function.call).call(_context3, _mapInstanceProperty__default["default"](_context2), _context2))?.(field => {
         const isFieldLabelLocalized = _Array$isArray__default["default"](field.label);
         if (!isFieldLabelLocalized) {
           return field;
@@ -1637,6 +1685,7 @@ const useConvertFieldDefinitionsForExport = () => {
     if (!fieldDefinitions) return [];
     const localizedTypeDefinitions = localizeTypeDefinitionLabels(fieldDefinitions);
     const results = _mapInstanceProperty__default["default"](localizedTypeDefinitions).call(localizedTypeDefinitions, transformedType => {
+      var _context4, _context5;
       const isTypeLabelLocalized = typeof transformedType.label !== 'string';
       return {
         isExpandable: true,
@@ -1650,7 +1699,7 @@ const useConvertFieldDefinitionsForExport = () => {
           fallbackOrder: languages,
           fallback: transformedType.name
         }) : transformedType.label,
-        fields: sortByField(transformedType.fields?.map(fieldDefinition => {
+        fields: sortByField(((_context4 = transformedType.fields) == null ? void 0 : _bindInstanceProperty__default["default"](_context5 = Function.call).call(_context5, _mapInstanceProperty__default["default"](_context4), _context4))?.(fieldDefinition => {
           const isFieldLabelLocalized = typeof fieldDefinition.label !== 'string';
           return {
             name: getFieldFullName({
@@ -1677,7 +1726,7 @@ const useConvertFieldDefinitionsForExport = () => {
   };
 };
 
-const useValidateImportedHeaders = () => {
+const useValidateExportOperation = () => {
   const intl = reactIntl.useIntl();
   const asyncDispatch = sdk.useAsyncDispatch();
   const showNotification = actionsGlobal.useShowNotification();
@@ -1685,9 +1734,9 @@ const useValidateImportedHeaders = () => {
       projectKey: context.project?.key
     })),
     projectKey = _useApplicationContex.projectKey;
-  const validateHeaders = async params => {
+  const validateExport = async params => {
     try {
-      var _context;
+      var _context, _context2, _context3;
       if (!projectKey) return;
       const invalidFields = _filterInstanceProperty__default["default"](_context = params.fields).call(_context, field => !isFieldNameValid(field));
       if (invalidFields.length > 0) {
@@ -1699,25 +1748,46 @@ const useValidateImportedHeaders = () => {
           }))
         };
       }
-      await validateImportedHeaders({
+      const response = await validateExportOperation({
         projectKey,
         resourceType: params.resourceType,
         fileName: params.fileName,
         fileFormat: params.outputFormat,
         fields: params.fields,
-        locales: params.locales
+        locales: params.locales,
+        where: ((_context2 = params.queryPredicate) == null ? void 0 : _bindInstanceProperty__default["default"](_context3 = Function.call).call(_context3, _trimInstanceProperty__default["default"](_context2), _context2))?.() || undefined
       }, asyncDispatch);
-      return {
-        success: true,
-        validationErrors: []
-      };
-    } catch (error) {
-      if (typeof error === 'object' && error && 'validationErrors' in error && _Array$isArray__default["default"](error.validationErrors)) {
+      if (isExportApiSuccessResponse(response) && response.resourceCount === 0) {
         return {
           success: false,
-          validationErrors: error.validationErrors
+          noResourcesToExport: true
         };
       }
+      return {
+        success: true
+      };
+    } catch (error) {
+      if (isExportApiErrorResponse(error)) {
+        if (error.body.errors?.length) {
+          var _context4;
+          const whereError = _findInstanceProperty__default["default"](_context4 = error.body.errors).call(_context4, error => {
+            var _context5;
+            return error.message && _includesInstanceProperty__default["default"](_context5 = error.message).call(_context5, 'Malformed parameter: where');
+          });
+          if (whereError) {
+            return {
+              success: false,
+              invalidQueryPredicate: true
+            };
+          }
+        }
+        if (error.body.validationErrors?.length) {
+          return {
+            success: false,
+            validationErrors: error.body.validationErrors
+          };
+        }
+      }
       showNotification({
         text: intl.formatMessage(messages.unexpectedError),
         kind: 'error',
@@ -1730,7 +1800,7 @@ const useValidateImportedHeaders = () => {
     }
   };
   return {
-    validateHeaders
+    validateExport
   };
 };
 
@@ -1778,6 +1848,7 @@ function ownKeys$9(e, r) { var t = _Object$keys__default["default"](e); if (_Obj
 function _objectSpread$9(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$9(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$9(Object(t))).call(_context2, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 function ExportScopeSection() {
   const _useExportResourcesMo = useExportResourcesModalContext(),
+    formik = _useExportResourcesMo.formik,
     exportType = _useExportResourcesMo.exportType,
     totalResourcesCount = _useExportResourcesMo.totalResourcesCount,
     filters = _useExportResourcesMo.filters,
@@ -1785,10 +1856,11 @@ function ExportScopeSection() {
     selectedResourceIds = _useExportResourcesMo.selectedResourceIds,
     setExportType = _useExportResourcesMo.setExportType,
     resourceType = _useExportResourcesMo.resourceType,
-    hideExportSelectedResourcesOption = _useExportResourcesMo.hideExportSelectedResourcesOption;
-  return jsxRuntime.jsx(uiKit.Spacings.Stack, {
-    scale: "m",
-    children: jsxRuntime.jsxs(uiKit.RadioInput.Group, {
+    hideExportSelectedResourcesOption = _useExportResourcesMo.hideExportSelectedResourcesOption,
+    showQueryPredicateOption = _useExportResourcesMo.showQueryPredicateOption;
+  const shouldShowQueryPredicateField = exportType === EXPORT_TYPES.QUERY_PREDICATE;
+  return jsxRuntime.jsxs(jsxRuntime.Fragment, {
+    children: [jsxRuntime.jsxs(uiKit.RadioInput.Group, {
       value: exportType,
       onChange: e => {
         setExportType(e.target.value);
@@ -1828,8 +1900,23 @@ function ExportScopeSection() {
             }
           }) : messages.exportScopeSelectedWithoutCount
         })
+      }), showQueryPredicateOption && jsxRuntime.jsx(uiKit.RadioInput.Option, {
+        value: EXPORT_TYPES.QUERY_PREDICATE,
+        children: jsxRuntime.jsx(uiKit.Text.Body, {
+          intlMessage: messages.queryPredicate
+        })
       })]
-    })
+    }), shouldShowQueryPredicateField && jsxRuntime.jsx(uiKit.TextField, {
+      name: "queryPredicate",
+      "data-testid": "query-predicate-field",
+      title: "",
+      onChange: formik.handleChange,
+      onBlur: formik.handleBlur,
+      value: _valuesInstanceProperty__default["default"](formik).queryPredicate,
+      touched: formik.touched.queryPredicate,
+      errors: mapFormikErrors(formik.errors.queryPredicate),
+      renderError: renderQueryPredicateError
+    })]
   });
 }
 
@@ -2117,6 +2204,7 @@ const CollapsibleFieldWrapper = _ref => {
   });
 };
 const FieldSection = _ref3 => {
+  var _context, _context2, _context7, _context8;
   let fields = _ref3.fields,
     parentKeys = _ref3.parentKeys,
     formik = _ref3.formik,
@@ -2126,9 +2214,12 @@ const FieldSection = _ref3 => {
     maxVisibleChildren = _ref3.maxVisibleChildren;
   const _useExportFieldSelect = useExportFieldSelectionContext(),
     updateExpandedGroups = _useExportFieldSelect.updateExpandedGroups;
-  const visibleFields = isSearchActive || !maxVisibleChildren ? fields : fields?.slice(0, maxVisibleChildren);
+  const visibleFields = isSearchActive || !maxVisibleChildren ? fields : ((_context = fields) == null ? void 0 : _bindInstanceProperty__default["default"](_context2 = Function.call).call(_context2, _sliceInstanceProperty__default["default"](_context), _context))?.(0, maxVisibleChildren);
   const hasMoreFields = maxVisibleChildren && !isSearchActive && fields && fields.length > maxVisibleChildren;
-  const visibleIndex = field => fields?.filter(f => !f.isHidden).indexOf(field) || -1;
+  const visibleIndex = field => {
+    var _context3, _context4, _context5, _context6;
+    return ((_context3 = ((_context4 = fields) == null ? void 0 : _bindInstanceProperty__default["default"](_context5 = Function.call).call(_context5, _filterInstanceProperty__default["default"](_context4), _context4))?.(f => !f.isHidden)) == null ? void 0 : _bindInstanceProperty__default["default"](_context6 = Function.call).call(_context6, _indexOfInstanceProperty__default["default"](_context3), _context3))?.(field) || -1;
+  };
   const shouldDisplayField = field => {
     if (field.isHidden) return false;
     if (!maxVisibleChildren) return true;
@@ -2139,7 +2230,7 @@ const FieldSection = _ref3 => {
   };
   return jsxRuntime.jsxs(uiKit.Spacings.Stack, {
     scale: "s",
-    children: [visibleFields?.map((field, index) => {
+    children: [((_context7 = visibleFields) == null ? void 0 : _bindInstanceProperty__default["default"](_context8 = Function.call).call(_context8, _mapInstanceProperty__default["default"](_context7), _context7))?.((field, index) => {
       const isChildrenCountDisplayed = shouldDisplayChildrenCount(field);
       const hasDependents = Boolean(field.dependentGroupNames?.length || field.dependentFieldNames?.length);
       const isAnyOfTheChildFieldsChecked = isAnyFieldChecked(field.fields || []);
@@ -2187,8 +2278,8 @@ const FieldSection = _ref3 => {
                     const updateAllChildFieldsChecked = (path, checked) => {
                       const item = get__default["default"](_valuesInstanceProperty__default["default"](formik), path);
                       if (item && item.fields) {
-                        var _context;
-                        _forEachInstanceProperty__default["default"](_context = item.fields).call(_context, (field, i) => {
+                        var _context9;
+                        _forEachInstanceProperty__default["default"](_context9 = item.fields).call(_context9, (field, i) => {
                           const fieldPath = `${path}.fields[${i}]`;
                           if (!field.fields?.length) {
                             formik.setFieldValue(`${fieldPath}.isChecked`, checked || field.isRequired,
@@ -2405,7 +2496,7 @@ const NoSearchResults = () => {
 };
 
 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 _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context5 = ownKeys$5(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$5(Object(t))).call(_context6, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
+function _objectSpread$5(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$5(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$5(Object(t))).call(_context8, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
 const totalSpacing = 56 +
 // MC header
 32 * 2 + (
@@ -2447,6 +2538,7 @@ const StyledGridCard = /*#__PURE__*/_styled__default["default"](uiKit.Card, {
   target: "e1odwg620"
 } )("max-height:calc(100vh - ", totalSpacing, "px);overflow:auto;" + ("" ));
 const SelectedFieldsForm = () => {
+  var _context, _context2;
   const intl = reactIntl.useIntl();
   const _React$useState = React__default["default"].useState(''),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -2463,22 +2555,22 @@ const SelectedFieldsForm = () => {
   const _useExportResourcesMo = useExportResourcesModalContext(),
     formik = _useExportResourcesMo.formik,
     resourceType = _useExportResourcesMo.resourceType;
-  const isSearchActive = fieldSearchTerm?.trim()?.length >= MIN_SEARCH_LENGTH;
+  const isSearchActive = ((_context = fieldSearchTerm) == null ? void 0 : _bindInstanceProperty__default["default"](_context2 = Function.call).call(_context2, _trimInstanceProperty__default["default"](_context), _context))?.()?.length >= MIN_SEARCH_LENGTH;
   React__default["default"].useEffect(() => {
-    var _context2;
+    var _context4;
     updateFieldDependenciesStatus(formik);
     const checkedFields = {};
     function getCheckedFields(field, groupName) {
       const fieldName = field.name ? `${groupName}.${field.name}` : groupName;
       if (field.fields) {
-        var _context;
-        return _forEachInstanceProperty__default["default"](_context = field.fields).call(_context, f => getCheckedFields(f, fieldName));
+        var _context3;
+        return _forEachInstanceProperty__default["default"](_context3 = field.fields).call(_context3, f => getCheckedFields(f, fieldName));
       }
       checkedFields[fieldName] = field.isChecked;
     }
-    _forEachInstanceProperty__default["default"](_context2 = _valuesInstanceProperty__default["default"](formik).groups).call(_context2, group => {
-      var _context3;
-      _forEachInstanceProperty__default["default"](_context3 = group.fields).call(_context3, field => {
+    _forEachInstanceProperty__default["default"](_context4 = _valuesInstanceProperty__default["default"](formik).groups).call(_context4, group => {
+      var _context5;
+      _forEachInstanceProperty__default["default"](_context5 = group.fields).call(_context5, field => {
         getCheckedFields(field, group.groupName);
       });
     });
@@ -2491,8 +2583,8 @@ const SelectedFieldsForm = () => {
   const filteredGroups = React__default["default"].useMemo(() => {
     const updateFields = (fields, parentMatches) => {
       return _mapInstanceProperty__default["default"](fields).call(fields, field => {
-        var _context4;
-        const matches = _includesInstanceProperty__default["default"](_context4 = field.label.toLowerCase()).call(_context4, fieldSearchTerm.toLowerCase());
+        var _context6;
+        const matches = _includesInstanceProperty__default["default"](_context6 = field.label.toLowerCase()).call(_context6, fieldSearchTerm.toLowerCase());
         let isHidden = !matches && !parentMatches;
         if (field.fields) {
           const updatedFields = updateFields(field.fields, matches);
@@ -2638,6 +2730,8 @@ const _excluded$1 = ["children"];
 const ExportResourcesProvider = _ref => {
   let children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded$1);
+  const intl = reactIntl.useIntl();
+  const showNotification = actionsGlobal.useShowNotification();
   const initialValues = useInitialValues(props);
   const _React$useState = React__default["default"].useState(Step.FileSettings),
     _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -2668,47 +2762,70 @@ const ExportResourcesProvider = _ref => {
     setValidationErrors = _React$useState12[1];
   const _useStartExportOperat = useStartExportOperation(props),
     startExportOperation = _useStartExportOperat.startExportOperation;
-  const _useValidateImportedH = useValidateImportedHeaders(),
-    validateHeaders = _useValidateImportedH.validateHeaders;
-  const onSubmit = async values => {
-    if (currentStep === Step.FileSettings) {
-      setCurrentStep(Step.FieldsSelection);
-    } else if (currentStep === Step.FieldsSelection) {
-      if (fieldSelectionMode !== 'imported-csv-template') {
-        setCurrentStep(Step.ConfirmExport);
-        return;
-      }
-      const isUsingImportedCsvLocales = localeOption === 'onlyLocalesFoundInCsvFile';
-      const validationResult = await validateHeaders({
-        fileName: values.fileName,
-        outputFormat: values.outputFormat,
-        resourceType: props.resourceType,
-        fields: importedHeaders,
-        locales: isUsingImportedCsvLocales ? undefined : values.locales
-      });
-      if (validationResult?.success) {
-        setCurrentStep(Step.ConfirmExport);
-      } else {
-        setValidationErrors(validationResult?.validationErrors);
-        setCurrentStep(Step.ValidationErrors);
-      }
-    } else {
-      startExportOperation(values, exportType, fieldSelectionMode, localeOption, importedHeaders);
-    }
-  };
+  const _useValidateExportOpe = useValidateExportOperation(),
+    validateExport = _useValidateExportOpe.validateExport;
   const formik$1 = formik.useFormik({
     initialValues,
     validate: values => validate({
       values,
       step: currentStep,
       fieldSelectionMode,
-      importedHeaders
+      importedHeaders,
+      exportType
     }),
-    onSubmit
+    onSubmit: async values => {
+      if (currentStep === Step.FileSettings) {
+        if (exportType === EXPORT_TYPES.QUERY_PREDICATE) {
+          const validationResult = await validateExport({
+            fileName: values.fileName,
+            outputFormat: values.outputFormat,
+            resourceType: props.resourceType,
+            fields: extractFieldNamesFromGroups(values.groups, props.fieldOrder),
+            locales: values.locales,
+            queryPredicate: values.queryPredicate
+          });
+          if (validationResult?.invalidQueryPredicate) {
+            formik$1.setFieldError('queryPredicate', 'invalidInput');
+            return;
+          }
+          if (validationResult?.noResourcesToExport) {
+            showNotification({
+              text: intl.formatMessage(messages.noResourcesToExport),
+              kind: 'error',
+              domain: constants.DOMAINS.PAGE
+            });
+            return;
+          }
+        }
+        setCurrentStep(Step.FieldsSelection);
+      } else if (currentStep === Step.FieldsSelection) {
+        if (fieldSelectionMode !== 'imported-csv-template') {
+          setCurrentStep(Step.ConfirmExport);
+          return;
+        }
+        const isUsingImportedCsvLocales = localeOption === 'onlyLocalesFoundInCsvFile';
+        const validationResult = await validateExport({
+          fileName: values.fileName,
+          outputFormat: values.outputFormat,
+          resourceType: props.resourceType,
+          fields: importedHeaders,
+          locales: isUsingImportedCsvLocales ? undefined : values.locales,
+          queryPredicate: values.queryPredicate
+        });
+        if (validationResult?.success) {
+          setCurrentStep(Step.ConfirmExport);
+        } else {
+          setValidationErrors(validationResult?.validationErrors);
+          setCurrentStep(Step.ValidationErrors);
+        }
+      } else {
+        startExportOperation(values, exportType, fieldSelectionMode, localeOption, importedHeaders);
+      }
+    }
   });
   React__default["default"].useEffect(() => {
     formik$1.validateForm();
-  }, [currentStep, fieldSelectionMode, importedHeaders]);
+  }, [currentStep, fieldSelectionMode, importedHeaders, exportType]);
   return jsxRuntime.jsx(ExportResourcesContext.Provider, {
     value: {
       formik: formik$1,
@@ -2720,6 +2837,7 @@ const ExportResourcesProvider = _ref => {
       totalResourcesCount: props.totalResourcesCount,
       selectedResourceIds: props.selectedResourceIds,
       hideExportSelectedResourcesOption: props.hideExportSelectedResourcesOption,
+      showQueryPredicateOption: props.showQueryPredicateOption,
       filters: props.filters,
       hasFilters: areFiltersApplied(props.filters),
       setExportType,
@@ -3068,11 +3186,11 @@ function getDefaultDropWrapperStyles(_dropAreaState) {
   return /*#__PURE__*/react.css("" , "" );
 }
 
-var ActiveDragDropArea = /*#__PURE__*/React.lazy(() => Promise.resolve().then(function () { return require('./active-drag-drop-area-90d26dc9.cjs.prod.js' /* webpackChunkName: "active-drag-drop-area" */); }));
+var ActiveDragDropArea = /*#__PURE__*/React.lazy(() => Promise.resolve().then(function () { return require('./active-drag-drop-area-7fd53916.cjs.prod.js' /* webpackChunkName: "active-drag-drop-area" */); }));
 
-var EnabledDropArea = /*#__PURE__*/React.lazy(() => Promise.resolve().then(function () { return require('./enabled-drop-area-f4b604d3.cjs.prod.js' /* webpackChunkName: "enabled-drop-area" */); }));
+var EnabledDropArea = /*#__PURE__*/React.lazy(() => Promise.resolve().then(function () { return require('./enabled-drop-area-4c8d613f.cjs.prod.js' /* webpackChunkName: "enabled-drop-area" */); }));
 
-var FileDropped = /*#__PURE__*/React.lazy(() => Promise.resolve().then(function () { return require('./file-dropped-area-38e2f1eb.cjs.prod.js' /* webpackChunkName: "filed-dropped-area" */); }));
+var FileDropped = /*#__PURE__*/React.lazy(() => Promise.resolve().then(function () { return require('./file-dropped-area-b685a683.cjs.prod.js' /* webpackChunkName: "filed-dropped-area" */); }));
 
 function getDropArea(_ref) {
   let dropAreaState = _ref.dropAreaState,