Merge pull request #180 from mirumee/add/attribute-sort

Allow sorting products by attribute

CHANGELOG.md

@@ -28,3 +28,4 @@ All notable, unreleased changes to this project will be documented in this file.
 - Add testcafe tags to attributes, categories, collections and product types - #178 by @dominik-zeglen
 - Fix input error style - #183 by @benekex2
 - Fix staff return link - #190 by @dominik-zeglen
+- Allow sorting products by attribute - #180 by @dominik-zeglen

src/misc.ts

@@ -480,5 +480,8 @@ export function findInEnum<TEnum extends object>(
 }
 
 export function parseBoolean(a: string): boolean {
+  if (a === undefined) {
+    return true;
+  }
   return a === "true";
 }

src/products/components/ProductList/ProductList.tsx

@@ -101,12 +101,14 @@ interface ProductListProps
     ListActions,
     SortPage<ProductListUrlSortField>,
     WithStyles<typeof styles> {
+  activeAttributeSortId: string;
   gridAttributes: AvailableInGridAttributes_grid_edges_node[];
   products: ProductList_products_edges_node[];
 }
 
 export const ProductList = withStyles(styles, { name: "ProductList" })(
   ({
+    activeAttributeSortId,
     classes,
     settings,
     disabled,
@@ -219,23 +221,35 @@ export const ProductList = withStyles(styles, { name: "ProductList" })(
                 />
               </TableCellHeader>
             </DisplayColumn>
-            {gridAttributesFromSettings.map(gridAttributeFromSettings => (
+            {gridAttributesFromSettings.map(gridAttributeFromSettings => {
-              <TableCell
+              const attributeId = getAttributeIdFromColumnValue(
-                className={classes.colAttribute}
+                gridAttributeFromSettings
-                key={gridAttributeFromSettings}
+              );
-              >
+
-                {maybe<React.ReactNode>(
+              return (
-                  () =>
+                <TableCellHeader
-                    gridAttributes.find(
+                  className={classes.colAttribute}
-                      gridAttribute =>
+                  direction={
-                        getAttributeIdFromColumnValue(
+                    sort.sort === ProductListUrlSortField.attribute &&
-                          gridAttributeFromSettings
+                    attributeId === activeAttributeSortId
-                        ) === gridAttribute.id
+                      ? getArrowDirection(sort.asc)
-                    ).name,
+                      : undefined
-                  <Skeleton />
+                  }
-                )}
+                  onClick={() =>
-              </TableCell>
+                    onSort(ProductListUrlSortField.attribute, attributeId)
-            ))}
+                  }
+                  key={gridAttributeFromSettings}
+                >
+                  {maybe<React.ReactNode>(
+                    () =>
+                      gridAttributes.find(
+                        gridAttribute => attributeId === gridAttribute.id
+                      ).name,
+                    <Skeleton />
+                  )}
+                </TableCellHeader>
+              );
+            })}
             <DisplayColumn column="price" displayColumns={settings.columns}>
               <TableCellHeader
                 className={classes.colPrice}

src/products/components/ProductListPage/ProductListPage.tsx

@@ -34,6 +34,7 @@ export interface ProductListPageProps
     FilterPageProps<ProductFilterKeys>,
     FetchMoreProps,
     SortPage<ProductListUrlSortField> {
+  activeAttributeSortId: string;
   availableInGridAttributes: AvailableInGridAttributes_availableInGrid_edges_node[];
   currencySymbol: string;
   gridAttributes: AvailableInGridAttributes_grid_edges_node[];

src/products/urls.ts

@@ -31,18 +31,22 @@ export enum ProductListUrlFiltersEnum {
 }
 export type ProductListUrlFilters = Filters<ProductListUrlFiltersEnum>;
 export enum ProductListUrlSortField {
+  attribute = "attribute",
   name = "name",
   productType = "productType",
   status = "status",
   price = "price"
 }
 export type ProductListUrlSort = Sort<ProductListUrlSortField>;
-export type ProductListUrlQueryParams = BulkAction &
+export interface ProductListUrlQueryParams
-  Dialog<ProductListUrlDialog> &
+  extends BulkAction,
-  ProductListUrlFilters &
+    Dialog<ProductListUrlDialog>,
-  ProductListUrlSort &
+    ProductListUrlFilters,
-  Pagination &
+    ProductListUrlSort,
-  ActiveTab;
+    Pagination,
+    ActiveTab {
+  attributeId?: string;
+}
 export const productListUrl = (params?: ProductListUrlQueryParams): string =>
   productListPath + "?" + stringifyQs(params);
 

src/products/views/ProductList/ProductList.tsx

@@ -42,6 +42,7 @@ import {
   ProductListUrlDialog,
   ProductListUrlFilters,
   ProductListUrlQueryParams,
+  ProductListUrlSortField,
   productUrl
 } from "../../urls";
 import {
@@ -153,6 +154,15 @@ export const ProductList: React.StatelessComponent<ProductListProps> = ({
     handleTabChange(tabs.length + 1);
   };
 
+  const handleSort = (field: ProductListUrlSortField, attributeId?: string) =>
+    navigate(
+      productListUrl({
+        ...params,
+        ...getSortUrlVariables(field, params),
+        attributeId
+      })
+    );
+
   const paginationState = createPaginationState(settings.rowNumber, params);
   const currencySymbol = maybe(() => shop.defaultCurrency, "USD");
   const filter = getFilterVariables(params);
@@ -230,18 +240,12 @@ export const ProductList: React.StatelessComponent<ProductListProps> = ({
                       return (
                         <>
                           <ProductListPage
+                            activeAttributeSortId={params.attributeId}
                             sort={{
                               asc: params.asc,
                               sort: params.sort
                             }}
-                            onSort={field =>
+                            onSort={handleSort}
-                              navigate(
-                                productListUrl({
-                                  ...params,
-                                  ...getSortUrlVariables(field, params)
-                                })
-                              )
-                            }
                             availableInGridAttributes={maybe(
                               () =>
                                 attributes.data.availableInGrid.edges.map(

src/products/views/ProductList/sort.ts

@@ -17,12 +17,20 @@ export function getSortQueryField(
       return ProductOrderField.TYPE;
     case ProductListUrlSortField.status:
       return ProductOrderField.PUBLISHED;
+    default:
+      return undefined;
   }
 }
 
 export function getSortQueryVariables(
   params: ProductListUrlQueryParams
 ): ProductOrder {
+  if (params.sort === ProductListUrlSortField.attribute) {
+    return {
+      attributeId: params.attributeId,
+      direction: getOrderDirection(params.asc)
+    };
+  }
   return {
     direction: getOrderDirection(params.asc),
     field: getSortQueryField(params.sort)

src/storybook/stories/products/ProductListPage.tsx

@@ -34,6 +34,7 @@ const props: ProductListPageProps = {
       sort: ProductListUrlSortField.name
     }
   },
+  activeAttributeSortId: undefined,
   availableInGridAttributes: attributes,
   defaultSettings: defaultListSettings[ListViews.PRODUCT_LIST],
   gridAttributes: attributes,

src/types.ts

@@ -50,7 +50,7 @@ export interface ListProps<TColumns extends string = string> {
 
 export interface SortPage<TSortKey extends string> {
   sort: Sort<TSortKey>;
-  onSort: (field: TSortKey) => void;
+  onSort: (field: TSortKey, id?: string) => void;
 }
 export interface ListActionsWithoutToolbar {
   toggle: (id: string) => void;

src/types/globalTypes.ts

@@ -589,7 +589,8 @@ export interface ProductFilterInput {
 }
 
 export interface ProductOrder {
-  field: ProductOrderField;
+  field?: ProductOrderField | null;
+  attributeId?: string | null;
   direction: OrderDirection;
 }