@commercetools-frontend-extensions/export-resources-modal 4.8.0 → 4.8.1

package/README.md

@@ -129,12 +129,13 @@ import ExportResourcesModal from '@commercetools-frontend-extensions/export-reso
     outputFormat="csv"
     resourceType="category"
     filters={{
-      where: 'key = "category-key"',
-      filters: { query: 'key = "category-key"' } | [ 'key = "category-key"']
-      fullText: {
-        text: 'category-text',
-        locale: 'en'
-      }
+      { 
+        filters: [ 'key = "category-key"'], 
+        fullText: {
+          text: 'category-text',
+          locale: 'en'
+        } 
+      },
       total: 20
     }}
     totalResourcesCount={143}

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

@@ -777,22 +777,45 @@ function buildSelectedExportFilters(selectedResourceIds) {
   const formattedIds = _mapInstanceProperty__default["default"](selectedResourceIds).call(selectedResourceIds, id => `"${id}"`).join(', ');
   return `id in (${formattedIds})`;
 }
-function validateFilters(filters) {
-  const hasWhere = 'where' in filters;
-  const hasFilters = 'filters' in filters;
-  const hasFullText = 'fullText' in filters;
-  // Ensure only one of `where` or `filters` is applied but not both or none
-  const validFilterState = hasWhere && !hasFilters || !hasWhere && hasFilters || hasFullText && filters?.fullText?.text?.trim() !== '';
-  return validFilterState;
+function isQueryFilter(filters) {
+  return filters?.query !== undefined;
 }
-function areFiltersApplied(filterObject) {
-  if (!filterObject) {
+function isSearchFilter(filters) {
+  return filters?.filters?.length || filters?.fullText !== undefined;
+}
+function validateFilters(filtersObject) {
+  var _context2;
+  if (filtersObject.where && filtersObject.filters) {
     return false;
   }
-  let filters = filterObject.filters,
-    where = filterObject.where;
-  let hasFilters = where && _trimInstanceProperty__default["default"](where).call(where) !== '' || Boolean(_Array$isArray__default["default"](filters) && filters.length > 0 || typeof filters === 'object' && _Object$keys__default["default"](filters).length > 0);
-  return hasFilters;
+  if (isQueryFilter(filtersObject.filters)) {
+    return Boolean(filtersObject.filters?.query);
+  }
+  if (isSearchFilter(filtersObject.filters)) {
+    const searchFilters = filtersObject.filters;
+    return Boolean(searchFilters.filters?.length || searchFilters.fullText?.text?.trim());
+  }
+  if (filtersObject.where && _trimInstanceProperty__default["default"](_context2 = filtersObject.where).call(_context2) !== '') {
+    return true;
+  }
+  return false;
+}
+function areFiltersApplied(filtersObject) {
+  var _context3;
+  if (!filtersObject) {
+    return false;
+  }
+  if (filtersObject.where && _trimInstanceProperty__default["default"](_context3 = filtersObject.where).call(_context3) !== '') {
+    return true;
+  }
+  if (filtersObject.filters && 'query' in filtersObject.filters) {
+    return Boolean(filtersObject.filters.query);
+  }
+  if (filtersObject.filters && ('filters' in filtersObject.filters || 'fullText' in filtersObject.filters)) {
+    const _filters = filtersObject.filters;
+    return Boolean(_filters.filters?.length || _filters.fullText?.text?.trim());
+  }
+  return false;
 }
 function getInitialExportType(args) {
   if (args.selectedResourceIds?.length) {
@@ -977,8 +1000,7 @@ async function createExportOperation(_ref, asyncDispatchFn) {
     locales = _ref.locales,
     filters = _ref.filters,
     where = _ref.where,
-    fillRows = _ref.fillRows,
-    fullText = _ref.fullText;
+    fillRows = _ref.fillRows;
   const uri = `/${projectKey}/export-operations`;
   const response = await asyncDispatchFn(sdk.actions.post({
     mcApiProxyTarget: constants.MC_API_PROXY_TARGETS.EXPORT,
@@ -996,8 +1018,7 @@ async function createExportOperation(_ref, asyncDispatchFn) {
       // Query predicate
       where,
       // Search API filters or Category API filters
-      filters,
-      fullText
+      filters
     }
   }));
   if (!response || typeof response !== 'object' || !('state' in response)) {
@@ -1040,16 +1061,17 @@ const useStartExportOperation = props => {
       const fields = extractFieldNamesFromGroups(values.groups);
       let where = undefined;
       let filters = undefined;
-      let fullText = undefined;
       if (exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length) {
         where = buildSelectedExportFilters(props.selectedResourceIds);
-      } else if (exportType === EXPORT_TYPES.FILTERED) {
-        if (props.filters) {
-          ;
-          var _props$filters = props.filters;
-          filters = _props$filters.filters;
-          where = _props$filters.where;
-          fullText = _props$filters.fullText;
+      } else if (exportType === EXPORT_TYPES.FILTERED && props.filters) {
+        where = props.filters.where;
+        if (isQueryFilter(props.filters.filters)) {
+          const _filters = props.filters.filters;
+          filters = {
+            query: _filters.query
+          };
+        } else if (isSearchFilter(props.filters.filters)) {
+          filters = props.filters.filters;
         }
       }
       const response = await createExportOperation({
@@ -1061,8 +1083,7 @@ const useStartExportOperation = props => {
         fillRows: values.fillRows,
         fields,
         where,
-        filters,
-        fullText
+        filters
       }, asyncDispatch);
       switch (response.state) {
         case EXPORT_OPERATION_STATES.QUEUED:

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

@@ -777,22 +777,45 @@ function buildSelectedExportFilters(selectedResourceIds) {
   const formattedIds = _mapInstanceProperty__default["default"](selectedResourceIds).call(selectedResourceIds, id => `"${id}"`).join(', ');
   return `id in (${formattedIds})`;
 }
-function validateFilters(filters) {
-  const hasWhere = 'where' in filters;
-  const hasFilters = 'filters' in filters;
-  const hasFullText = 'fullText' in filters;
-  // Ensure only one of `where` or `filters` is applied but not both or none
-  const validFilterState = hasWhere && !hasFilters || !hasWhere && hasFilters || hasFullText && filters?.fullText?.text?.trim() !== '';
-  return validFilterState;
+function isQueryFilter(filters) {
+  return filters?.query !== undefined;
 }
-function areFiltersApplied(filterObject) {
-  if (!filterObject) {
+function isSearchFilter(filters) {
+  return filters?.filters?.length || filters?.fullText !== undefined;
+}
+function validateFilters(filtersObject) {
+  var _context2;
+  if (filtersObject.where && filtersObject.filters) {
     return false;
   }
-  let filters = filterObject.filters,
-    where = filterObject.where;
-  let hasFilters = where && _trimInstanceProperty__default["default"](where).call(where) !== '' || Boolean(_Array$isArray__default["default"](filters) && filters.length > 0 || typeof filters === 'object' && _Object$keys__default["default"](filters).length > 0);
-  return hasFilters;
+  if (isQueryFilter(filtersObject.filters)) {
+    return Boolean(filtersObject.filters?.query);
+  }
+  if (isSearchFilter(filtersObject.filters)) {
+    const searchFilters = filtersObject.filters;
+    return Boolean(searchFilters.filters?.length || searchFilters.fullText?.text?.trim());
+  }
+  if (filtersObject.where && _trimInstanceProperty__default["default"](_context2 = filtersObject.where).call(_context2) !== '') {
+    return true;
+  }
+  return false;
+}
+function areFiltersApplied(filtersObject) {
+  var _context3;
+  if (!filtersObject) {
+    return false;
+  }
+  if (filtersObject.where && _trimInstanceProperty__default["default"](_context3 = filtersObject.where).call(_context3) !== '') {
+    return true;
+  }
+  if (filtersObject.filters && 'query' in filtersObject.filters) {
+    return Boolean(filtersObject.filters.query);
+  }
+  if (filtersObject.filters && ('filters' in filtersObject.filters || 'fullText' in filtersObject.filters)) {
+    const _filters = filtersObject.filters;
+    return Boolean(_filters.filters?.length || _filters.fullText?.text?.trim());
+  }
+  return false;
 }
 function getInitialExportType(args) {
   if (args.selectedResourceIds?.length) {
@@ -977,8 +1000,7 @@ async function createExportOperation(_ref, asyncDispatchFn) {
     locales = _ref.locales,
     filters = _ref.filters,
     where = _ref.where,
-    fillRows = _ref.fillRows,
-    fullText = _ref.fullText;
+    fillRows = _ref.fillRows;
   const uri = `/${projectKey}/export-operations`;
   const response = await asyncDispatchFn(sdk.actions.post({
     mcApiProxyTarget: constants.MC_API_PROXY_TARGETS.EXPORT,
@@ -996,8 +1018,7 @@ async function createExportOperation(_ref, asyncDispatchFn) {
       // Query predicate
       where,
       // Search API filters or Category API filters
-      filters,
-      fullText
+      filters
     }
   }));
   if (!response || typeof response !== 'object' || !('state' in response)) {
@@ -1040,16 +1061,17 @@ const useStartExportOperation = props => {
       const fields = extractFieldNamesFromGroups(values.groups);
       let where = undefined;
       let filters = undefined;
-      let fullText = undefined;
       if (exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length) {
         where = buildSelectedExportFilters(props.selectedResourceIds);
-      } else if (exportType === EXPORT_TYPES.FILTERED) {
-        if (props.filters) {
-          ;
-          var _props$filters = props.filters;
-          filters = _props$filters.filters;
-          where = _props$filters.where;
-          fullText = _props$filters.fullText;
+      } else if (exportType === EXPORT_TYPES.FILTERED && props.filters) {
+        where = props.filters.where;
+        if (isQueryFilter(props.filters.filters)) {
+          const _filters = props.filters.filters;
+          filters = {
+            query: _filters.query
+          };
+        } else if (isSearchFilter(props.filters.filters)) {
+          filters = props.filters.filters;
         }
       }
       const response = await createExportOperation({
@@ -1061,8 +1083,7 @@ const useStartExportOperation = props => {
         fillRows: values.fillRows,
         fields,
         where,
-        filters,
-        fullText
+        filters
       }, asyncDispatch);
       switch (response.state) {
         case EXPORT_OPERATION_STATES.QUEUED:

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

@@ -738,22 +738,45 @@ function buildSelectedExportFilters(selectedResourceIds) {
   const formattedIds = _mapInstanceProperty(selectedResourceIds).call(selectedResourceIds, id => `"${id}"`).join(', ');
   return `id in (${formattedIds})`;
 }
-function validateFilters(filters) {
-  const hasWhere = 'where' in filters;
-  const hasFilters = 'filters' in filters;
-  const hasFullText = 'fullText' in filters;
-  // Ensure only one of `where` or `filters` is applied but not both or none
-  const validFilterState = hasWhere && !hasFilters || !hasWhere && hasFilters || hasFullText && filters?.fullText?.text?.trim() !== '';
-  return validFilterState;
+function isQueryFilter(filters) {
+  return filters?.query !== undefined;
 }
-function areFiltersApplied(filterObject) {
-  if (!filterObject) {
+function isSearchFilter(filters) {
+  return filters?.filters?.length || filters?.fullText !== undefined;
+}
+function validateFilters(filtersObject) {
+  var _context2;
+  if (filtersObject.where && filtersObject.filters) {
     return false;
   }
-  let filters = filterObject.filters,
-    where = filterObject.where;
-  let hasFilters = where && _trimInstanceProperty(where).call(where) !== '' || Boolean(_Array$isArray(filters) && filters.length > 0 || typeof filters === 'object' && _Object$keys(filters).length > 0);
-  return hasFilters;
+  if (isQueryFilter(filtersObject.filters)) {
+    return Boolean(filtersObject.filters?.query);
+  }
+  if (isSearchFilter(filtersObject.filters)) {
+    const searchFilters = filtersObject.filters;
+    return Boolean(searchFilters.filters?.length || searchFilters.fullText?.text?.trim());
+  }
+  if (filtersObject.where && _trimInstanceProperty(_context2 = filtersObject.where).call(_context2) !== '') {
+    return true;
+  }
+  return false;
+}
+function areFiltersApplied(filtersObject) {
+  var _context3;
+  if (!filtersObject) {
+    return false;
+  }
+  if (filtersObject.where && _trimInstanceProperty(_context3 = filtersObject.where).call(_context3) !== '') {
+    return true;
+  }
+  if (filtersObject.filters && 'query' in filtersObject.filters) {
+    return Boolean(filtersObject.filters.query);
+  }
+  if (filtersObject.filters && ('filters' in filtersObject.filters || 'fullText' in filtersObject.filters)) {
+    const _filters = filtersObject.filters;
+    return Boolean(_filters.filters?.length || _filters.fullText?.text?.trim());
+  }
+  return false;
 }
 function getInitialExportType(args) {
   if (args.selectedResourceIds?.length) {
@@ -938,8 +961,7 @@ async function createExportOperation(_ref, asyncDispatchFn) {
     locales = _ref.locales,
     filters = _ref.filters,
     where = _ref.where,
-    fillRows = _ref.fillRows,
-    fullText = _ref.fullText;
+    fillRows = _ref.fillRows;
   const uri = `/${projectKey}/export-operations`;
   const response = await asyncDispatchFn(actions.post({
     mcApiProxyTarget: MC_API_PROXY_TARGETS.EXPORT,
@@ -957,8 +979,7 @@ async function createExportOperation(_ref, asyncDispatchFn) {
       // Query predicate
       where,
       // Search API filters or Category API filters
-      filters,
-      fullText
+      filters
     }
   }));
   if (!response || typeof response !== 'object' || !('state' in response)) {
@@ -1001,16 +1022,17 @@ const useStartExportOperation = props => {
       const fields = extractFieldNamesFromGroups(values.groups);
       let where = undefined;
       let filters = undefined;
-      let fullText = undefined;
       if (exportType === EXPORT_TYPES.SELECTED && props.selectedResourceIds?.length) {
         where = buildSelectedExportFilters(props.selectedResourceIds);
-      } else if (exportType === EXPORT_TYPES.FILTERED) {
-        if (props.filters) {
-          ;
-          var _props$filters = props.filters;
-          filters = _props$filters.filters;
-          where = _props$filters.where;
-          fullText = _props$filters.fullText;
+      } else if (exportType === EXPORT_TYPES.FILTERED && props.filters) {
+        where = props.filters.where;
+        if (isQueryFilter(props.filters.filters)) {
+          const _filters = props.filters.filters;
+          filters = {
+            query: _filters.query
+          };
+        } else if (isSearchFilter(props.filters.filters)) {
+          filters = props.filters.filters;
         }
       }
       const response = await createExportOperation({
@@ -1022,8 +1044,7 @@ const useStartExportOperation = props => {
         fillRows: values.fillRows,
         fields,
         where,
-        filters,
-        fullText
+        filters
       }, asyncDispatch);
       switch (response.state) {
         case EXPORT_OPERATION_STATES.QUEUED:

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

@@ -1,3 +1,4 @@
+import type { QueryFilter, SearchFilter } from "./export-resources-modal-types.js";
 export interface ExportApiRequest {
     projectKey: string;
     resourceType: string;
@@ -5,9 +6,7 @@ export interface ExportApiRequest {
     fileFormat: string;
     fields: string[];
     locales: string[];
-    filters?: {
-        query: Record<string, unknown>;
-    } | Array<string>;
+    filters?: QueryFilter | SearchFilter;
     where?: string;
     fillRows?: boolean;
     fullText?: {

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

@@ -32,14 +32,18 @@ export interface ExportResourcesModalProps {
     onExportSuccess?: () => void;
 }
 export type ExportType = keyof typeof EXPORT_TYPES;
-export type Filters = {
-    filters?: {
-        query: Record<string, unknown>;
-    } | Array<string>;
-    where?: string;
+export type QueryFilter = {
+    query: Record<string, unknown>;
+};
+export type SearchFilter = {
+    filters?: string[];
     fullText?: {
         text: string;
         locale: string;
     };
+};
+export type Filters = {
+    filters?: QueryFilter | SearchFilter;
+    where?: string;
     total: number;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@commercetools-frontend-extensions/export-resources-modal",
   "description": "Shared export modal for exporting resources",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "license": "BSD-3-Clause",
   "publishConfig": {
     "access": "public"