djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor filterColumnIds and move it to utils

Browse source
This commit is contained in:
Gabriel L Martinez 2020-04-15 04:46:17 -04:00
parent 21b43295b1
commit c59ea6ada6
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/products/components/ProductListPage/utils.ts
View file

@ -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);
}

16
src/products/views/ProductList/ProductList.tsx
View file

@ -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<ProductListProps> = ({ params }) => {
}
);
const columnIdsFilter = columns => {
columns = columns.filter(column => isAttributeColumnValue(column));
columns.forEach(
(attribute, index, arr) =>
(arr[index] = getAttributeIdFromColumnValue(attribute))
);
return columns;
};
return (
<AvailableInGridAttributesQuery
variables={{ first: 6, ids: columnIdsFilter(settings.columns) }}
variables={{ first: 6, ids: filterColumnIds(settings.columns) }}
>
{attributes => (
<TypedProductListQuery displayLoader variables={queryVariables}>