vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-10 04:30:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

add overrideQuery to all list views

Browse Source
This commit is contained in:
jeffvli
2025-11-15 13:23:27 -08:00
parent 6d50454e72
commit 00a012df78
6 changed files with 78 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/albums/components/album-list-content.tsx
+9 -5
View File
@@ -3,6 +3,7 @@ import { lazy, Suspense } from 'react';
import { useAlbumListFilters } from '/@/renderer/features/albums/hooks/use-album-list-filters'; import { useAlbumListFilters } from '/@/renderer/features/albums/hooks/use-album-list-filters';
import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store'; import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner'; import { Spinner } from '/@/shared/components/spinner/spinner';
import { AlbumListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types'; import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const AlbumListInfiniteGrid = lazy(() => const AlbumListInfiniteGrid = lazy(() =>
@@ -45,13 +46,16 @@ export const AlbumListContent = () => {
); );
}; };
export type OverrideAlbumListQuery = Omit<AlbumListQuery, 'limit' | 'startIndex'>;
export const AlbumListView = ({ export const AlbumListView = ({
display, display,
grid, grid,
itemsPerPage, itemsPerPage,
overrideQuery,
pagination, pagination,
table, table,
}: ItemListSettings) => { }: ItemListSettings & { overrideQuery?: OverrideAlbumListQuery }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { query } = useAlbumListFilters(); const { query } = useAlbumListFilters();
@@ -65,7 +69,7 @@ export const AlbumListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -76,7 +80,7 @@ export const AlbumListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -97,7 +101,7 @@ export const AlbumListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
@@ -113,7 +117,7 @@ export const AlbumListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
src/renderer/features/artists/components/album-artist-list-content.tsx
+9 -5
View File
@@ -3,6 +3,7 @@ import { lazy, Suspense } from 'react';
import { useAlbumArtistListFilters } from '/@/renderer/features/artists/hooks/use-album-artist-list-filters'; import { useAlbumArtistListFilters } from '/@/renderer/features/artists/hooks/use-album-artist-list-filters';
import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store'; import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner'; import { Spinner } from '/@/shared/components/spinner/spinner';
import { AlbumArtistListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types'; import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const AlbumArtistListInfiniteGrid = lazy(() => const AlbumArtistListInfiniteGrid = lazy(() =>
@@ -55,13 +56,16 @@ export const AlbumArtistListContent = () => {
); );
}; };
export type OverrideAlbumArtistListQuery = Omit<AlbumArtistListQuery, 'limit' | 'startIndex'>;
export const AlbumArtistListView = ({ export const AlbumArtistListView = ({
display, display,
grid, grid,
itemsPerPage, itemsPerPage,
overrideQuery,
pagination, pagination,
table, table,
}: ItemListSettings) => { }: ItemListSettings & { overrideQuery?: OverrideAlbumArtistListQuery }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { query } = useAlbumArtistListFilters(); const { query } = useAlbumArtistListFilters();
@@ -75,7 +79,7 @@ export const AlbumArtistListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -86,7 +90,7 @@ export const AlbumArtistListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -107,7 +111,7 @@ export const AlbumArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
@@ -123,7 +127,7 @@ export const AlbumArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
src/renderer/features/artists/components/artist-list-content.tsx
+14 -8
View File
@@ -3,6 +3,7 @@ import { lazy, Suspense } from 'react';
import { useArtistListFilters } from '/@/renderer/features/artists/hooks/use-artist-list-filters'; import { useArtistListFilters } from '/@/renderer/features/artists/hooks/use-artist-list-filters';
import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store'; import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner'; import { Spinner } from '/@/shared/components/spinner/spinner';
import { ArtistListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types'; import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const ArtistListInfiniteGrid = lazy(() => const ArtistListInfiniteGrid = lazy(() =>
@@ -24,9 +25,11 @@ const ArtistListInfiniteTable = lazy(() =>
); );
const ArtistListPaginatedTable = lazy(() => const ArtistListPaginatedTable = lazy(() =>
import('/@/renderer/features/artists/components/artist-list-paginated-table').then((module) => ({ import('/@/renderer/features/artists/components/artist-list-paginated-table').then(
default: module.ArtistListPaginatedTable, (module) => ({
})), default: module.ArtistListPaginatedTable,
}),
),
); );
export const ArtistListContent = () => { export const ArtistListContent = () => {
@@ -45,13 +48,16 @@ export const ArtistListContent = () => {
); );
}; };
export type OverrideArtistListQuery = Omit<ArtistListQuery, 'limit' | 'startIndex'>;
export const ArtistListView = ({ export const ArtistListView = ({
display, display,
grid, grid,
itemsPerPage, itemsPerPage,
overrideQuery,
pagination, pagination,
table, table,
}: ItemListSettings) => { }: ItemListSettings & { overrideQuery?: OverrideArtistListQuery }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { query } = useArtistListFilters(); const { query } = useArtistListFilters();
@@ -65,7 +71,7 @@ export const ArtistListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -76,7 +82,7 @@ export const ArtistListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -97,7 +103,7 @@ export const ArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
@@ -113,7 +119,7 @@ export const ArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
src/renderer/features/genres/components/genre-list-content.tsx
+7 -5
View File
@@ -3,6 +3,7 @@ import { lazy, Suspense } from 'react';
import { useGenreListFilters } from '/@/renderer/features/genres/hooks/use-genre-list-filters'; import { useGenreListFilters } from '/@/renderer/features/genres/hooks/use-genre-list-filters';
import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store'; import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner'; import { Spinner } from '/@/shared/components/spinner/spinner';
import { GenreListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types'; import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const GenreListInfiniteGrid = lazy(() => const GenreListInfiniteGrid = lazy(() =>
@@ -49,9 +50,10 @@ export const GenreListView = ({
display, display,
grid, grid,
itemsPerPage, itemsPerPage,
overrideQuery,
pagination, pagination,
table, table,
}: ItemListSettings) => { }: ItemListSettings & { overrideQuery?: Omit<GenreListQuery, 'limit' | 'startIndex'> }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { query } = useGenreListFilters(); const { query } = useGenreListFilters();
@@ -65,7 +67,7 @@ export const GenreListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -76,7 +78,7 @@ export const GenreListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -97,7 +99,7 @@ export const GenreListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
@@ -113,7 +115,7 @@ export const GenreListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
src/renderer/features/playlists/components/playlist-list-content.tsx
+30 -18
View File
@@ -3,34 +3,45 @@ import { lazy, Suspense } from 'react';
import { usePlaylistListFilters } from '/@/renderer/features/playlists/hooks/use-playlist-list-filters'; import { usePlaylistListFilters } from '/@/renderer/features/playlists/hooks/use-playlist-list-filters';
import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store'; import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner'; import { Spinner } from '/@/shared/components/spinner/spinner';
import { PlaylistListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types'; import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const PlaylistListInfiniteGrid = lazy(() => const PlaylistListInfiniteGrid = lazy(() =>
import('/@/renderer/features/playlists/components/playlist-list-infinite-grid').then((module) => ({ import('/@/renderer/features/playlists/components/playlist-list-infinite-grid').then(
default: module.PlaylistListInfiniteGrid, (module) => ({
})), default: module.PlaylistListInfiniteGrid,
}),
),
); );
const PlaylistListPaginatedGrid = lazy(() => const PlaylistListPaginatedGrid = lazy(() =>
import('/@/renderer/features/playlists/components/playlist-list-paginated-grid').then((module) => ({ import('/@/renderer/features/playlists/components/playlist-list-paginated-grid').then(
default: module.PlaylistListPaginatedGrid, (module) => ({
})), default: module.PlaylistListPaginatedGrid,
}),
),
); );
const PlaylistListInfiniteTable = lazy(() => const PlaylistListInfiniteTable = lazy(() =>
import('/@/renderer/features/playlists/components/playlist-list-infinite-table').then((module) => ({ import('/@/renderer/features/playlists/components/playlist-list-infinite-table').then(
default: module.PlaylistListInfiniteTable, (module) => ({
})), default: module.PlaylistListInfiniteTable,
}),
),
); );
const PlaylistListPaginatedTable = lazy(() => const PlaylistListPaginatedTable = lazy(() =>
import('/@/renderer/features/playlists/components/playlist-list-paginated-table').then((module) => ({ import('/@/renderer/features/playlists/components/playlist-list-paginated-table').then(
default: module.PlaylistListPaginatedTable, (module) => ({
})), default: module.PlaylistListPaginatedTable,
}),
),
); );
export const PlaylistListContent = () => { export const PlaylistListContent = () => {
const { display, grid, itemsPerPage, pagination, table } = useListSettings(ItemListKey.PLAYLIST); const { display, grid, itemsPerPage, pagination, table } = useListSettings(
ItemListKey.PLAYLIST,
);
return ( return (
<Suspense fallback={<Spinner container />}> <Suspense fallback={<Spinner container />}>
@@ -49,9 +60,10 @@ export const PlaylistListView = ({
display, display,
grid, grid,
itemsPerPage, itemsPerPage,
overrideQuery,
pagination, pagination,
table, table,
}: ItemListSettings) => { }: ItemListSettings & { overrideQuery?: Omit<PlaylistListQuery, 'limit' | 'startIndex'> }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { query } = usePlaylistListFilters(); const { query } = usePlaylistListFilters();
@@ -65,7 +77,7 @@ export const PlaylistListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -76,7 +88,7 @@ export const PlaylistListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -97,7 +109,7 @@ export const PlaylistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
@@ -113,7 +125,7 @@ export const PlaylistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
src/renderer/features/songs/components/song-list-content.tsx
+9 -5
View File
@@ -3,6 +3,7 @@ import { lazy, Suspense } from 'react';
import { useSongListFilters } from '/@/renderer/features/songs/hooks/use-song-list-filters'; import { useSongListFilters } from '/@/renderer/features/songs/hooks/use-song-list-filters';
import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store'; import { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner'; import { Spinner } from '/@/shared/components/spinner/spinner';
import { SongListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types'; import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const SongListInfiniteGrid = lazy(() => const SongListInfiniteGrid = lazy(() =>
@@ -42,13 +43,16 @@ export const SongListContent = () => {
); );
}; };
export type OverrideSongListQuery = Omit<SongListQuery, 'limit' | 'startIndex'>;
export const SongListView = ({ export const SongListView = ({
display, display,
grid, grid,
itemsPerPage, itemsPerPage,
overrideQuery,
pagination, pagination,
table, table,
}: ItemListSettings) => { }: ItemListSettings & { overrideQuery?: OverrideSongListQuery }) => {
const server = useCurrentServer(); const server = useCurrentServer();
const { query } = useSongListFilters(); const { query } = useSongListFilters();
@@ -62,7 +66,7 @@ export const SongListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -72,7 +76,7 @@ export const SongListView = ({
gap={grid.itemGap} gap={grid.itemGap}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined} itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
/> />
); );
@@ -92,7 +96,7 @@ export const SongListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />
@@ -107,7 +111,7 @@ export const SongListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight} enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders} enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage} itemsPerPage={itemsPerPage}
query={query} query={overrideQuery ?? query}
serverId={server.id} serverId={server.id}
size={table.size} size={table.size}
/> />