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

Set descending order when ordering by rank (#1976)

Browse source
This commit is contained in:
Dominik Żegleń 2022-04-14 14:15:09 +02:00 committed by GitHub
parent b7b6def0c2
commit fe3b965019
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandl
import createFilterHandlers from "@saleor/utils/handlers/filterHandlers";
import { mapEdgesToItems, mapNodeToChoice } from "@saleor/utils/maps";
import { getSortUrlVariables } from "@saleor/utils/sort";
import React, { useEffect, useState } from "react";
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import ProductListPage from "../../components/ProductListPage";
@ -76,7 +76,8 @@ import {
getFilterVariables,
saveFilterTab
} from "./filters";
import { canBeSorted, DEFAULT_SORT_KEY, getSortQueryVariables } from "./sort";
import { getSortQueryVariables } from "./sort";
import { useSortRedirects } from "./useSortRedirects";
import { getAvailableProductKinds, getProductKindOpts } from "./utils";
interface ProductListProps {
@ -176,6 +177,8 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
channel => channel.slug === params.channel
);
useSortRedirects(params, !!selectedChannel);
const [openModal, closeModal] = createDialogActionHandlers<
ProductListUrlDialog,
ProductListUrlQueryParams
@ -223,32 +226,6 @@ export const ProductList: React.FC<ProductListProps> = ({ params }) => {
params
});
useEffect(() => {
const sortWithQuery = ProductListUrlSortField.rank;
const sortWithoutQuery =
params.sort === ProductListUrlSortField.rank
? DEFAULT_SORT_KEY
: params.sort;
navigate(
productListUrl({
...params,
asc: params.query ? undefined : params.asc,
sort: params.query ? sortWithQuery : sortWithoutQuery
})
);
}, [params.query]);
useEffect(() => {
if (!canBeSorted(params.sort, !!selectedChannel)) {
navigate(
productListUrl({
...params,
sort: DEFAULT_SORT_KEY
})
);
}
}, [params]);
const handleTabChange = (tab: number) => {
reset();
navigate(

42
src/products/views/ProductList/useSortRedirects.ts Normal file
View file

@ -0,0 +1,42 @@
import useNavigator from "@saleor/hooks/useNavigator";
import {
productListUrl,
ProductListUrlQueryParams,
ProductListUrlSortField
} from "@saleor/products/urls";
import { useEffect } from "react";
import { canBeSorted, DEFAULT_SORT_KEY } from "./sort";
export function useSortRedirects(
params: ProductListUrlQueryParams,
isChannelSelected: boolean
) {
const navigate = useNavigator();
useEffect(() => {
const sortWithQuery = ProductListUrlSortField.rank;
const sortWithoutQuery =
params.sort === ProductListUrlSortField.rank
? DEFAULT_SORT_KEY
: params.sort;
navigate(
productListUrl({
...params,
asc: params.query ? false : params.asc,
sort: params.query ? sortWithQuery : sortWithoutQuery
})
);
}, [params.query]);
useEffect(() => {
if (!canBeSorted(params.sort, isChannelSelected)) {
navigate(
productListUrl({
...params,
sort: DEFAULT_SORT_KEY
})
);
}
}, [params]);
}