Cool_Tools/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2024-11-20 06:27:09 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Filter out current playlist on playlist operators

Browse Source
This commit is contained in:
jeffvli 2024-05-02 22:49:25 -07:00
parent 3d6bb3801b
commit 152d0f0f18
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/renderer/features/playlists/components/playlist-query-builder.tsx
View File

@ -57,6 +57,7 @@ interface PlaylistQueryBuilderProps {
parsedFilter: any,
extraFilters: { limit?: number; sortBy?: string; sortOrder?: string },
) => void;
playlistId?: string;
query: any;
sortBy: SongListSort;
sortOrder: 'asc' | 'desc';
@ -89,7 +90,16 @@ export type PlaylistQueryBuilderRef = {
export const PlaylistQueryBuilder = forwardRef(
(
{ sortOrder, sortBy, limit, isSaving, query, onSave, onSaveAs }: PlaylistQueryBuilderProps,
{
sortOrder,
sortBy,
limit,
isSaving,
query,
onSave,
onSaveAs,
playlistId,
}: PlaylistQueryBuilderProps,
ref: Ref<PlaylistQueryBuilderRef>,
) => {
const { t } = useTranslation();
@ -105,11 +115,17 @@ export const PlaylistQueryBuilder = forwardRef(
const playlistData = useMemo(() => {
if (!playlists) return [];
return playlists.items.map((p) => ({
label: p.name,
value: p.id,
}));
}, [playlists]);
return playlists.items
.filter((p) => {
if (!playlistId) return true;
return p.id !== playlistId;
})
.map((p) => ({
label: p.name,
value: p.id,
}));
}, [playlistId, playlists]);
const extraFiltersForm = useForm({
initialValues: {

1
src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
View File

@ -196,6 +196,7 @@ const PlaylistDetailSongListRoute = () => {
key={JSON.stringify(detailQuery?.data?.rules)}
isSaving={createPlaylistMutation?.isLoading}
limit={detailQuery?.data?.rules?.limit}
playlistId={playlistId}
query={detailQuery?.data?.rules}
sortBy={detailQuery?.data?.rules?.sort || SongListSort.ALBUM}
sortOrder={detailQuery?.data?.rules?.order || 'asc'}