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 {
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}

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

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