vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-16 05:36:00 +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/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 { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner';
import { AlbumArtistListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const AlbumArtistListInfiniteGrid = lazy(() =>
@@ -55,13 +56,16 @@ export const AlbumArtistListContent = () => {
);
};
export type OverrideAlbumArtistListQuery = Omit<AlbumArtistListQuery, 'limit' | 'startIndex'>;
export const AlbumArtistListView = ({
display,
grid,
itemsPerPage,
overrideQuery,
pagination,
table,
}: ItemListSettings) => {
}: ItemListSettings & { overrideQuery?: OverrideAlbumArtistListQuery }) => {
const server = useCurrentServer();
const { query } = useAlbumArtistListFilters();
@@ -75,7 +79,7 @@ export const AlbumArtistListView = ({
gap={grid.itemGap}
itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
/>
);
@@ -86,7 +90,7 @@ export const AlbumArtistListView = ({
gap={grid.itemGap}
itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
/>
);
@@ -107,7 +111,7 @@ export const AlbumArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
size={table.size}
/>
@@ -123,7 +127,7 @@ export const AlbumArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
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 { ItemListSettings, useCurrentServer, useListSettings } from '/@/renderer/store';
import { Spinner } from '/@/shared/components/spinner/spinner';
import { ArtistListQuery } from '/@/shared/types/domain-types';
import { ItemListKey, ListDisplayType, ListPaginationType } from '/@/shared/types/types';
const ArtistListInfiniteGrid = lazy(() =>
@@ -24,9 +25,11 @@ const ArtistListInfiniteTable = lazy(() =>
);
const ArtistListPaginatedTable = lazy(() =>
import('/@/renderer/features/artists/components/artist-list-paginated-table').then((module) => ({
default: module.ArtistListPaginatedTable,
})),
import('/@/renderer/features/artists/components/artist-list-paginated-table').then(
(module) => ({
default: module.ArtistListPaginatedTable,
}),
),
);
export const ArtistListContent = () => {
@@ -45,13 +48,16 @@ export const ArtistListContent = () => {
);
};
export type OverrideArtistListQuery = Omit<ArtistListQuery, 'limit' | 'startIndex'>;
export const ArtistListView = ({
display,
grid,
itemsPerPage,
overrideQuery,
pagination,
table,
}: ItemListSettings) => {
}: ItemListSettings & { overrideQuery?: OverrideArtistListQuery }) => {
const server = useCurrentServer();
const { query } = useArtistListFilters();
@@ -65,7 +71,7 @@ export const ArtistListView = ({
gap={grid.itemGap}
itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
/>
);
@@ -76,7 +82,7 @@ export const ArtistListView = ({
gap={grid.itemGap}
itemsPerPage={itemsPerPage}
itemsPerRow={grid.itemsPerRowEnabled ? grid.itemsPerRow : undefined}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
/>
);
@@ -97,7 +103,7 @@ export const ArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
size={table.size}
/>
@@ -113,7 +119,7 @@ export const ArtistListView = ({
enableRowHoverHighlight={table.enableRowHoverHighlight}
enableVerticalBorders={table.enableVerticalBorders}
itemsPerPage={itemsPerPage}
query={query}
query={overrideQuery ?? query}
serverId={server.id}
size={table.size}
/>