diff --git a/src/webapp/features/collections/components/collectionFilters/CollectionFilters.tsx b/src/webapp/features/collections/components/collectionFilters/CollectionFilters.tsx index a608577d..4c13fd6c 100644 --- a/src/webapp/features/collections/components/collectionFilters/CollectionFilters.tsx +++ b/src/webapp/features/collections/components/collectionFilters/CollectionFilters.tsx @@ -106,7 +106,7 @@ export function CollectionFiltersSortSelect() { > Card Count - {/* onChange(CollectionSortField.NAME)} rightSection={ optimisticSort === CollectionSortField.NAME && @@ -114,7 +114,7 @@ export function CollectionFiltersSortSelect() { closeMenuOnClick={false} > Name - */} + ); } diff --git a/src/webapp/features/collections/lib/dal.ts b/src/webapp/features/collections/lib/dal.ts index cc286063..20287ef2 100644 --- a/src/webapp/features/collections/lib/dal.ts +++ b/src/webapp/features/collections/lib/dal.ts @@ -49,6 +49,7 @@ export const getCollections = cache( limit: params?.limit, page: params?.page, sortBy: params?.collectionSortBy, + sortOrder: params?.sortOrder, searchText: params?.searchText, }); diff --git a/src/webapp/features/collections/lib/queries/useCollections.tsx b/src/webapp/features/collections/lib/queries/useCollections.tsx index 6ab31db2..b77d6b3a 100644 --- a/src/webapp/features/collections/lib/queries/useCollections.tsx +++ b/src/webapp/features/collections/lib/queries/useCollections.tsx @@ -2,6 +2,7 @@ import { useSuspenseInfiniteQuery } from '@tanstack/react-query'; import { getCollections } from '../dal'; import { collectionKeys } from '../collectionKeys'; import { CollectionSortField } from '@semble/types'; +import { getCollectionsSortParams } from '../utils'; interface Props { didOrHandle: string; @@ -18,7 +19,9 @@ export default function useCollections(props: Props) { props.didOrHandle, props.limit, props?.sortBy, - undefined, // sortOrder + props.sortBy + ? getCollectionsSortParams(props.sortBy).sortOrder + : undefined, props.query, ), initialPageParam: 1, @@ -27,6 +30,9 @@ export default function useCollections(props: Props) { limit, page: pageParam, collectionSortBy: props.sortBy, + sortOrder: props.sortBy + ? getCollectionsSortParams(props.sortBy).sortOrder + : undefined, searchText: props?.query, }), getNextPageParam: (lastPage) => { diff --git a/src/webapp/features/collections/lib/queries/useSearchCollections.tsx b/src/webapp/features/collections/lib/queries/useSearchCollections.tsx index c3ef160a..405642e1 100644 --- a/src/webapp/features/collections/lib/queries/useSearchCollections.tsx +++ b/src/webapp/features/collections/lib/queries/useSearchCollections.tsx @@ -37,8 +37,9 @@ export default function useSearchCollections(props: Props) { limit, page: pageParam as number, collectionSortBy: props.sortBy, - sortOrder: - props.sortBy && getCollectionsSortParams(props.sortBy).sortOrder, + sortOrder: props.sortBy + ? getCollectionsSortParams(props.sortBy).sortOrder + : undefined, accessType: props.accessType, identifier: props.identifier, }), diff --git a/src/webapp/features/collections/lib/queries/useSembleCollectionts.tsx b/src/webapp/features/collections/lib/queries/useSembleCollectionts.tsx index 5d0cec00..a24bf26c 100644 --- a/src/webapp/features/collections/lib/queries/useSembleCollectionts.tsx +++ b/src/webapp/features/collections/lib/queries/useSembleCollectionts.tsx @@ -21,8 +21,9 @@ export default function useSembleCollections(props: Props) { page: pageParam, limit, collectionSortBy: props.sortBy, - sortOrder: - props.sortBy && getCollectionsSortParams(props.sortBy).sortOrder, + sortOrder: props.sortBy + ? getCollectionsSortParams(props.sortBy).sortOrder + : undefined, }); }, getNextPageParam: (lastPage) => {