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

Simplify code

Browse source
This commit is contained in:
dominik-zeglen 2019-12-30 13:51:01 +01:00
parent e520f30a86
commit bfd754b9b2
2 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/orders/views/OrderList/OrderList.tsx
View file

@ -31,7 +31,6 @@ import { OrderBulkCancel } from "../../types/OrderBulkCancel";
import { OrderDraftCreate } from "../../types/OrderDraftCreate"; import { OrderDraftCreate } from "../../types/OrderDraftCreate";
import { import {
orderListUrl, orderListUrl,
OrderListUrlFilters,
OrderListUrlQueryParams, OrderListUrlQueryParams,
orderUrl, orderUrl,
OrderListUrlDialog OrderListUrlDialog
@ -88,17 +87,7 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
: 0 : 0
: parseInt(params.activeTab, 0); : parseInt(params.activeTab, 0);
const changeFilters = (filters: OrderListUrlFilters) => { const changeFilters = (filter: IFilter<OrderFilterKeys>) => {
reset();
navigate(
orderListUrl({
...params,
...filters
})
);
};
const changeFilterField = (filter: IFilter<OrderFilterKeys>) => {
reset(); reset();
navigate( navigate(
orderListUrl({ 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) => { const handleSearchChange = (query: string) => {
reset(); reset();
navigate( navigate(
@ -231,17 +230,13 @@ export const OrderList: React.FC<OrderListProps> = ({ params }) => {
</Button> </Button>
} }
onSearchChange={handleSearchChange} onSearchChange={handleSearchChange}
onFilterChange={filter => changeFilterField(filter)} onFilterChange={filter => changeFilters(filter)}
onTabSave={() => openModal("save-search")} onTabSave={() => openModal("save-search")}
onTabDelete={() => openModal("delete-search")} onTabDelete={() => openModal("delete-search")}
onTabChange={handleTabChange} onTabChange={handleTabChange}
initialSearch={params.query || ""} initialSearch={params.query || ""}
tabs={getFilterTabs().map(tab => tab.name)} tabs={getFilterTabs().map(tab => tab.name)}
onAll={() => onAll={resetFilters}
changeFilters({
status: undefined
})
}
/> />
<OrderBulkCancelDialog <OrderBulkCancelDialog
confirmButtonState={orderBulkCancelOpts.status} confirmButtonState={orderBulkCancelOpts.status}

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

@ -40,7 +40,6 @@ import { productBulkPublish } from "../../types/productBulkPublish";
import { import {
productAddUrl, productAddUrl,
productListUrl, productListUrl,
ProductListUrlFilters,
ProductListUrlQueryParams, ProductListUrlQueryParams,
ProductListUrlSortField, ProductListUrlSortField,
productUrl, productUrl,
@ -103,12 +102,7 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
ProductListUrlQueryParams ProductListUrlQueryParams
>(navigate, productListUrl, params); >(navigate, productListUrl, params);
const changeFilters = (filters: ProductListUrlFilters) => { const changeFilters = (filter: IFilter<ProductFilterKeys>) => {
reset();
navigate(productListUrl(filters));
};
const changeFilterField = (filter: IFilter<ProductFilterKeys>) => {
reset(); reset();
navigate( navigate(
productListUrl({ 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) => { const handleSearchChange = (query: string) => {
reset(); reset();
navigate( navigate(
@ -291,11 +295,7 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
onUpdateListSettings={updateListSettings} onUpdateListSettings={updateListSettings}
pageInfo={pageInfo} pageInfo={pageInfo}
onRowClick={id => () => navigate(productUrl(id))} onRowClick={id => () => navigate(productUrl(id))}
onAll={() => onAll={resetFilters}
changeFilters({
status: undefined
})
}
toolbar={ toolbar={
<> <>
<Button <Button
@ -341,7 +341,7 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
toggle={toggle} toggle={toggle}
toggleAll={toggleAll} toggleAll={toggleAll}
onSearchChange={handleSearchChange} onSearchChange={handleSearchChange}
onFilterChange={filter => changeFilterField(filter)} onFilterChange={changeFilters}
onTabSave={() => openModal("save-search")} onTabSave={() => openModal("save-search")}
onTabDelete={() => openModal("delete-search")} onTabDelete={() => openModal("delete-search")}
onTabChange={handleTabChange} onTabChange={handleTabChange}