vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-06-13 07:42:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix initial list order on artist discography (#1378)

Browse Source
This commit is contained in:
jeffvli
2025-12-15 21:07:24 -08:00
parent 8dc5f2a580
commit 9e49a45db9
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/albums/components/album-list-content.tsx
+2 -1
View File
@@ -87,8 +87,9 @@ export const AlbumListView = ({
table, table,
}: ItemListSettings & { overrideQuery?: OverrideAlbumListQuery }) => { }: ItemListSettings & { overrideQuery?: OverrideAlbumListQuery }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { pageKey } = useListContext();
const { query } = useAlbumListFilters(); const { query } = useAlbumListFilters(pageKey as ItemListKey);
const mergedQuery = useMemo(() => { const mergedQuery = useMemo(() => {
if (!overrideQuery) { if (!overrideQuery) {
src/renderer/features/albums/hooks/use-album-list-filters.ts
+5 -3
View File
@@ -15,13 +15,15 @@ import {
import { AlbumListSort, SortOrder } from '/@/shared/types/domain-types'; import { AlbumListSort, SortOrder } from '/@/shared/types/domain-types';
import { ItemListKey } from '/@/shared/types/types'; import { ItemListKey } from '/@/shared/types/types';
export const useAlbumListFilters = () => { export const useAlbumListFilters = (listKey?: ItemListKey) => {
const resolvedListKey = listKey ?? ItemListKey.ALBUM;
const { setSortBy, sortBy } = useSortByFilter<AlbumListSort>( const { setSortBy, sortBy } = useSortByFilter<AlbumListSort>(
AlbumListSort.NAME, AlbumListSort.NAME,
ItemListKey.ALBUM, resolvedListKey,
); );
const { setSortOrder, sortOrder } = useSortOrderFilter(SortOrder.ASC, ItemListKey.ALBUM); const { setSortOrder, sortOrder } = useSortOrderFilter(SortOrder.ASC, resolvedListKey);
const { searchTerm, setSearchTerm } = useSearchTermFilter(''); const { searchTerm, setSearchTerm } = useSearchTermFilter('');
src/renderer/features/songs/components/song-list-content.tsx
+2 -1
View File
@@ -84,8 +84,9 @@ export const SongListView = ({
table, table,
}: ItemListSettings & { overrideQuery?: OverrideSongListQuery }) => { }: ItemListSettings & { overrideQuery?: OverrideSongListQuery }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { pageKey } = useListContext();
const { query } = useSongListFilters(); const { query } = useSongListFilters(pageKey as ItemListKey);
const mergedQuery = useMemo(() => { const mergedQuery = useMemo(() => {
if (!overrideQuery) { if (!overrideQuery) {
src/renderer/features/songs/hooks/use-song-list-filters.ts
+5 -6
View File
@@ -16,13 +16,12 @@ import {
import { SongListSort, SortOrder } from '/@/shared/types/domain-types'; import { SongListSort, SortOrder } from '/@/shared/types/domain-types';
import { ItemListKey } from '/@/shared/types/types'; import { ItemListKey } from '/@/shared/types/types';
export const useSongListFilters = () => { export const useSongListFilters = (listKey?: ItemListKey) => {
const { setSortBy, sortBy } = useSortByFilter<SongListSort>( const resolvedListKey = listKey ?? ItemListKey.SONG;
SongListSort.NAME,
ItemListKey.SONG,
);
const { setSortOrder, sortOrder } = useSortOrderFilter(SortOrder.ASC, ItemListKey.SONG); const { setSortBy, sortBy } = useSortByFilter<SongListSort>(SongListSort.NAME, resolvedListKey);
const { setSortOrder, sortOrder } = useSortOrderFilter(SortOrder.ASC, resolvedListKey);
const { searchTerm, setSearchTerm } = useSearchTermFilter(''); const { searchTerm, setSearchTerm } = useSearchTermFilter('');