From bfd754b9b2b801ccb55d34a0d7e1bdaf3efc82b0 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 30 Dec 2019 13:51:01 +0100
Subject: [PATCH] Simplify code

---
 src/orders/views/OrderList/OrderList.tsx      | 31 ++++++++-----------
 .../views/ProductList/ProductList.tsx         | 26 ++++++++--------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/src/orders/views/OrderList/OrderList.tsx b/src/orders/views/OrderList/OrderList.tsx
index aef862f0f..8b32ee357 100644
--- a/src/orders/views/OrderList/OrderList.tsx
+++ b/src/orders/views/OrderList/OrderList.tsx
@@ -31,7 +31,6 @@ import { OrderBulkCancel } from "../../types/OrderBulkCancel";
 import { OrderDraftCreate } from "../../types/OrderDraftCreate";
 import {
   orderListUrl,
-  OrderListUrlFilters,
   OrderListUrlQueryParams,
   orderUrl,
   OrderListUrlDialog
@@ -88,17 +87,7 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
         : 0
       : parseInt(params.activeTab, 0);
 
-  const changeFilters = (filters: OrderListUrlFilters) => {
-    reset();
-    navigate(
-      orderListUrl({
-        ...params,
-        ...filters
-      })
-    );
-  };
-
-  const changeFilterField = (filter: IFilter<OrderFilterKeys>) => {
+  const changeFilters = (filter: IFilter<OrderFilterKeys>) => {
     reset();
     navigate(
       orderListUrl({
@@ -109,6 +98,16 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
     );
   };
 
+  const resetFilters = () => {
+    reset();
+    navigate(
+      orderListUrl({
+        asc: params.asc,
+        sort: params.sort
+      })
+    );
+  };
+
   const handleSearchChange = (query: string) => {
     reset();
     navigate(
@@ -231,17 +230,13 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
                 </Button>
               }
               onSearchChange={handleSearchChange}
-              onFilterChange={filter => changeFilterField(filter)}
+              onFilterChange={filter => changeFilters(filter)}
               onTabSave={() => openModal("save-search")}
               onTabDelete={() => openModal("delete-search")}
               onTabChange={handleTabChange}
               initialSearch={params.query || ""}
               tabs={getFilterTabs().map(tab => tab.name)}
-              onAll={() =>
-                changeFilters({
-                  status: undefined
-                })
-              }
+              onAll={resetFilters}
             />
             <OrderBulkCancelDialog
               confirmButtonState={orderBulkCancelOpts.status}
diff --git a/src/products/views/ProductList/ProductList.tsx b/src/products/views/ProductList/ProductList.tsx
index 45b2586c2..3cf59a9c5 100644
--- a/src/products/views/ProductList/ProductList.tsx
+++ b/src/products/views/ProductList/ProductList.tsx
@@ -40,7 +40,6 @@ import { productBulkPublish } from "../../types/productBulkPublish";
 import {
   productAddUrl,
   productListUrl,
-  ProductListUrlFilters,
   ProductListUrlQueryParams,
   ProductListUrlSortField,
   productUrl,
@@ -103,12 +102,7 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
     ProductListUrlQueryParams
   >(navigate, productListUrl, params);
 
-  const changeFilters = (filters: ProductListUrlFilters) => {
-    reset();
-    navigate(productListUrl(filters));
-  };
-
-  const changeFilterField = (filter: IFilter<ProductFilterKeys>) => {
+  const changeFilters = (filter: IFilter<ProductFilterKeys>) => {
     reset();
     navigate(
       productListUrl({
@@ -119,6 +113,16 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
     );
   };
 
+  const resetFilters = () => {
+    reset();
+    navigate(
+      productListUrl({
+        asc: params.asc,
+        sort: params.sort
+      })
+    );
+  };
+
   const handleSearchChange = (query: string) => {
     reset();
     navigate(
@@ -291,11 +295,7 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
                           onUpdateListSettings={updateListSettings}
                           pageInfo={pageInfo}
                           onRowClick={id => () => navigate(productUrl(id))}
-                          onAll={() =>
-                            changeFilters({
-                              status: undefined
-                            })
-                          }
+                          onAll={resetFilters}
                           toolbar={
                             <>
                               <Button
@@ -341,7 +341,7 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
                           toggle={toggle}
                           toggleAll={toggleAll}
                           onSearchChange={handleSearchChange}
-                          onFilterChange={filter => changeFilterField(filter)}
+                          onFilterChange={changeFilters}
                           onTabSave={() => openModal("save-search")}
                           onTabDelete={() => openModal("delete-search")}
                           onTabChange={handleTabChange}