diff --git a/src/products/components/ProductListPage/utils.ts b/src/products/components/ProductListPage/utils.ts index 2f0735182..2c5fc9e2b 100644 --- a/src/products/components/ProductListPage/utils.ts +++ b/src/products/components/ProductListPage/utils.ts @@ -1,3 +1,5 @@ +import { ProductListColumns } from "@saleor/config"; + const prefix = "attribute"; export function getAttributeColumnValue(id: string) { @@ -11,3 +13,9 @@ export function isAttributeColumnValue(value: string) { export function getAttributeIdFromColumnValue(value: string) { return value.substr(prefix.length + 1); } + +export function filterColumnIds(columns: ProductListColumns[]) { + return columns + .filter(isAttributeColumnValue) + .map(getAttributeIdFromColumnValue); +} diff --git a/src/products/views/ProductList/ProductList.tsx b/src/products/views/ProductList/ProductList.tsx index e0f83cee9..53c9cd79b 100644 --- a/src/products/views/ProductList/ProductList.tsx +++ b/src/products/views/ProductList/ProductList.tsx @@ -33,10 +33,7 @@ import createFilterHandlers from "@saleor/utils/handlers/filterHandlers"; import useCategorySearch from "@saleor/searches/useCategorySearch"; import useCollectionSearch from "@saleor/searches/useCollectionSearch"; import useProductTypeSearch from "@saleor/searches/useProductTypeSearch"; -import { - getAttributeIdFromColumnValue, - isAttributeColumnValue -} from "@saleor/products/components/ProductListPage/utils"; +import { filterColumnIds } from "@saleor/products/components/ProductListPage/utils"; import ProductListPage from "../../components/ProductListPage"; import { TypedProductBulkDeleteMutation, @@ -219,18 +216,9 @@ export const ProductList: React.FC = ({ params }) => { } ); - const columnIdsFilter = columns => { - columns = columns.filter(column => isAttributeColumnValue(column)); - columns.forEach( - (attribute, index, arr) => - (arr[index] = getAttributeIdFromColumnValue(attribute)) - ); - return columns; - }; - return ( {attributes => (