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

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

@@ -886,6 +886,20 @@ const useStartExportOperation = props => {
     try {
       if (!projectKey) throw new Error('Project key is missing');
       const fields = extractFieldNamesFromGroups(values.groups);
+      let where = undefined;
+      let filters = undefined;
+      if (exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length) {
+        where = buildSelectedExportFilters(props.selectedResourceIds);
+      } else if (exportType === EXPORT_TYPES.FILTERED) {
+        if (props.filters?.queryPredicate) {
+          where = props.filters.queryPredicate;
+        }
+        if (props.filters?.searchQuery) {
+          filters = {
+            query: props.filters.searchQuery
+          };
+        }
+      }
       const response = await createExportOperation({
         projectKey,
         resourceType: props.resourceType,
@@ -893,8 +907,8 @@ const useStartExportOperation = props => {
         fileFormat: values.outputFormat,
         locales: values.locales,
         fields,
-        where: exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length ? buildSelectedExportFilters(props.selectedResourceIds) : props.filters?.queryPredicate || undefined,
-        filters: props.filters?.searchQuery || undefined
+        where,
+        filters
       }, asyncDispatch);
       switch (response.state) {
         case EXPORT_OPERATION_STATES.QUEUED:
@@ -944,7 +958,8 @@ function ExportScopeSection() {
     hasFilters = _useExportResourcesMo.hasFilters,
     selectedResourceIds = _useExportResourcesMo.selectedResourceIds,
     setExportType = _useExportResourcesMo.setExportType,
-    resourceType = _useExportResourcesMo.resourceType;
+    resourceType = _useExportResourcesMo.resourceType,
+    hideExportSelectedResourcesOption = _useExportResourcesMo.hideExportSelectedResourcesOption;
   return jsxRuntime.jsx(uiKit.Spacings.Stack, {
     scale: "m",
     children: jsxRuntime.jsxs(uiKit.RadioInput.Group, {
@@ -976,7 +991,7 @@ function ExportScopeSection() {
             }
           }) : messages.exportScopeFilteredWithoutCount
         })
-      }), jsxRuntime.jsx(uiKit.RadioInput.Option, {
+      }), !hideExportSelectedResourcesOption && jsxRuntime.jsx(uiKit.RadioInput.Option, {
         value: EXPORT_TYPES.SELECTED,
         isDisabled: !selectedResourceIds?.length,
         children: jsxRuntime.jsx(uiKit.Text.Body, {
@@ -1690,6 +1705,7 @@ const ExportResourcesProvider = _ref => {
       exportType: exportType,
       totalResourcesCount: props.totalResourcesCount,
       selectedResourceIds: props.selectedResourceIds,
+      hideExportSelectedResourcesOption: props.hideExportSelectedResourcesOption,
       filters: props.filters,
       hasFilters: areFiltersApplied(props.filters),
       setExportType

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

@@ -886,6 +886,20 @@ const useStartExportOperation = props => {
     try {
       if (!projectKey) throw new Error('Project key is missing');
       const fields = extractFieldNamesFromGroups(values.groups);
+      let where = undefined;
+      let filters = undefined;
+      if (exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length) {
+        where = buildSelectedExportFilters(props.selectedResourceIds);
+      } else if (exportType === EXPORT_TYPES.FILTERED) {
+        if (props.filters?.queryPredicate) {
+          where = props.filters.queryPredicate;
+        }
+        if (props.filters?.searchQuery) {
+          filters = {
+            query: props.filters.searchQuery
+          };
+        }
+      }
       const response = await createExportOperation({
         projectKey,
         resourceType: props.resourceType,
@@ -893,8 +907,8 @@ const useStartExportOperation = props => {
         fileFormat: values.outputFormat,
         locales: values.locales,
         fields,
-        where: exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length ? buildSelectedExportFilters(props.selectedResourceIds) : props.filters?.queryPredicate || undefined,
-        filters: props.filters?.searchQuery || undefined
+        where,
+        filters
       }, asyncDispatch);
       switch (response.state) {
         case EXPORT_OPERATION_STATES.QUEUED:
@@ -944,7 +958,8 @@ function ExportScopeSection() {
     hasFilters = _useExportResourcesMo.hasFilters,
     selectedResourceIds = _useExportResourcesMo.selectedResourceIds,
     setExportType = _useExportResourcesMo.setExportType,
-    resourceType = _useExportResourcesMo.resourceType;
+    resourceType = _useExportResourcesMo.resourceType,
+    hideExportSelectedResourcesOption = _useExportResourcesMo.hideExportSelectedResourcesOption;
   return jsxRuntime.jsx(uiKit.Spacings.Stack, {
     scale: "m",
     children: jsxRuntime.jsxs(uiKit.RadioInput.Group, {
@@ -976,7 +991,7 @@ function ExportScopeSection() {
             }
           }) : messages.exportScopeFilteredWithoutCount
         })
-      }), jsxRuntime.jsx(uiKit.RadioInput.Option, {
+      }), !hideExportSelectedResourcesOption && jsxRuntime.jsx(uiKit.RadioInput.Option, {
         value: EXPORT_TYPES.SELECTED,
         isDisabled: !selectedResourceIds?.length,
         children: jsxRuntime.jsx(uiKit.Text.Body, {
@@ -1657,6 +1672,7 @@ const ExportResourcesProvider = _ref => {
       exportType: exportType,
       totalResourcesCount: props.totalResourcesCount,
       selectedResourceIds: props.selectedResourceIds,
+      hideExportSelectedResourcesOption: props.hideExportSelectedResourcesOption,
       filters: props.filters,
       hasFilters: areFiltersApplied(props.filters),
       setExportType

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

@@ -852,6 +852,20 @@ const useStartExportOperation = props => {
     try {
       if (!projectKey) throw new Error('Project key is missing');
       const fields = extractFieldNamesFromGroups(values.groups);
+      let where = undefined;
+      let filters = undefined;
+      if (exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length) {
+        where = buildSelectedExportFilters(props.selectedResourceIds);
+      } else if (exportType === EXPORT_TYPES.FILTERED) {
+        if (props.filters?.queryPredicate) {
+          where = props.filters.queryPredicate;
+        }
+        if (props.filters?.searchQuery) {
+          filters = {
+            query: props.filters.searchQuery
+          };
+        }
+      }
       const response = await createExportOperation({
         projectKey,
         resourceType: props.resourceType,
@@ -859,8 +873,8 @@ const useStartExportOperation = props => {
         fileFormat: values.outputFormat,
         locales: values.locales,
         fields,
-        where: exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length ? buildSelectedExportFilters(props.selectedResourceIds) : props.filters?.queryPredicate || undefined,
-        filters: props.filters?.searchQuery || undefined
+        where,
+        filters
       }, asyncDispatch);
       switch (response.state) {
         case EXPORT_OPERATION_STATES.QUEUED:
@@ -910,7 +924,8 @@ function ExportScopeSection() {
     hasFilters = _useExportResourcesMo.hasFilters,
     selectedResourceIds = _useExportResourcesMo.selectedResourceIds,
     setExportType = _useExportResourcesMo.setExportType,
-    resourceType = _useExportResourcesMo.resourceType;
+    resourceType = _useExportResourcesMo.resourceType,
+    hideExportSelectedResourcesOption = _useExportResourcesMo.hideExportSelectedResourcesOption;
   return jsx(Spacings.Stack, {
     scale: "m",
     children: jsxs(RadioInput.Group, {
@@ -942,7 +957,7 @@ function ExportScopeSection() {
             }
           }) : messages.exportScopeFilteredWithoutCount
         })
-      }), jsx(RadioInput.Option, {
+      }), !hideExportSelectedResourcesOption && jsx(RadioInput.Option, {
         value: EXPORT_TYPES.SELECTED,
         isDisabled: !selectedResourceIds?.length,
         children: jsx(Text.Body, {
@@ -1656,6 +1671,7 @@ const ExportResourcesProvider = _ref => {
       exportType: exportType,
       totalResourcesCount: props.totalResourcesCount,
       selectedResourceIds: props.selectedResourceIds,
+      hideExportSelectedResourcesOption: props.hideExportSelectedResourcesOption,
       filters: props.filters,
       hasFilters: areFiltersApplied(props.filters),
       setExportType

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

@@ -5,7 +5,9 @@ export interface ExportApiRequest {
     fileFormat: string;
     fields: string[];
     locales: string[];
-    filters?: Record<string, unknown>;
+    filters?: {
+        query: Record<string, unknown>;
+    };
     where?: string;
 }
 export interface ExportApiResponse {

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

@@ -14,4 +14,5 @@ export interface ExportResourcesModalContext {
     filters: Filters;
     hasFilters: boolean;
     setExportType: React.Dispatch<React.SetStateAction<ExportType>>;
+    hideExportSelectedResourcesOption?: boolean;
 }

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@commercetools-frontend-extensions/export-resources-modal",
   "description": "Shared export modal for exporting resources",
-  "version": "4.6.2",
+  "version": "4.6.4",
   "license": "BSD-3-Clause",
   "publishConfig": {
     "access": "public"
@@ -40,8 +40,8 @@
     "@commercetools-frontend/jest-preset-mc-app": "22.31.0",
     "@commercetools-frontend/sdk": "22.31.0",
     "@commercetools-frontend/sentry": "22.31.0",
-    "@commercetools-frontend/ui-kit": "19.10.0",
-    "@commercetools-uikit/design-system": "19.10.0",
+    "@commercetools-frontend/ui-kit": "19.11.0",
+    "@commercetools-uikit/design-system": "19.11.0",
     "@preconstruct/cli": "2.8.7",
     "@types/jest": "29.5.12",
     "@types/testing-library__jest-dom": "^5.14.5",