From e7830afc86e088bf7cab40e16aa8b4a4fd564d67 Mon Sep 17 00:00:00 2001
From: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
Date: Thu, 4 Jun 2026 21:02:06 -0700
Subject: [PATCH] feat: Support role filters for (album) artist role for
 Navidrome

- Adds an optional (Navidrome only, currently) field `roles` to type `AlbumArtist`
- `roles` is populated using artist.stats (excludign maincredit)
- `getAlbumList` supports a role filter; if specified, only filter artists with that role (ND only)
- Album list on artist page can filter by role if specified (only one)
- Album query is no longer suspend, as it can change multiple times
---
 src/i18n/locales/en.json                      |  1 +
 .../api/navidrome/navidrome-controller.ts     |  4 +-
 .../album-artist-detail-content.tsx           | 35 +++++++++++++--
 .../components/album-artist-detail-header.tsx |  4 +-
 .../routes/album-artist-detail-route.tsx      | 43 +++++++++++--------
 src/shared/api/jellyfin/jellyfin-normalize.ts |  1 +
 .../api/navidrome/navidrome-normalize.ts      |  4 ++
 src/shared/api/subsonic/subsonic-normalize.ts |  1 +
 src/shared/types/domain-types.ts              |  2 +
 9 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 4e96df9ac..abee3ac3b 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -143,6 +143,7 @@
         "resetToDefault": "Reset to default",
         "restartRequired": "Restart required",
         "right": "Right",
+        "role": "Role",
         "sampleRate": "Sample rate",
         "save": "Save",
         "saveAndReplace": "Save and replace",
diff --git a/src/renderer/api/navidrome/navidrome-controller.ts b/src/renderer/api/navidrome/navidrome-controller.ts
index 0c8416f75..ae0319d76 100644
--- a/src/renderer/api/navidrome/navidrome-controller.ts
+++ b/src/renderer/api/navidrome/navidrome-controller.ts
@@ -428,16 +428,18 @@ export const NavidromeController: InternalControllerEndpoint = {
             ? query.artistIds
             : query.artistIds?.[0];
 
+        const key = query.role ? `role_${query.role}_id` : 'artist_id';
+
         const res = await ndApiClient(apiClientProps).getAlbumList({
             query: {
                 _end: query.startIndex + (query.limit || 0),
                 _order: sortOrderMap.navidrome[query.sortOrder],
                 _sort: albumListSortMap.navidrome[query.sortBy],
                 _start: query.startIndex,
-                artist_id: artistIds,
                 compilation: query.compilation,
                 genre_id: genres,
                 has_rating: query.hasRating,
+                [key]: artistIds,
                 library_id: getLibraryId(query.musicFolderId),
                 name: query.searchTerm,
                 recently_played: query.isRecentlyPlayed,
diff --git a/src/renderer/features/artists/components/album-artist-detail-content.tsx b/src/renderer/features/artists/components/album-artist-detail-content.tsx
index 383085104..53636628f 100644
--- a/src/renderer/features/artists/components/album-artist-detail-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-content.tsx
@@ -1,6 +1,7 @@
 import {
     useQuery,
     useQueryClient,
+    UseQueryResult,
     useSuspenseQuery,
     UseSuspenseQueryResult,
 } from '@tanstack/react-query';
@@ -1061,6 +1062,7 @@ const AlbumArtistMetadataSimilarArtists = ({
                 mbz: null,
                 name: relatedArtist.name,
                 playCount: null,
+                roles: null,
                 similarArtists: null,
                 songCount: null,
                 userFavorite: relatedArtist.userFavorite,
@@ -1101,13 +1103,17 @@ const AlbumArtistMetadataSimilarArtists = ({
 };
 
 interface AlbumArtistDetailContentProps {
-    albumsQuery: UseSuspenseQueryResult<AlbumListResponse, Error>;
+    albumsQuery: UseQueryResult<AlbumListResponse, Error>;
     detailQuery: UseSuspenseQueryResult<AlbumArtistDetailResponse, Error>;
+    role: null | string;
+    setRole: (role: null | string) => void;
 }
 
 export const AlbumArtistDetailContent = ({
     albumsQuery,
     detailQuery,
+    role,
+    setRole,
 }: AlbumArtistDetailContentProps) => {
     const artistItems = useArtistItems();
     const artistRadioCount = useArtistRadioCount();
@@ -1220,7 +1226,13 @@ export const AlbumArtistDetailContent = ({
                             routeId={routeId}
                         />
                     )}
-                    <ArtistAlbums albumsQuery={albumsQuery} order={itemOrder.recentAlbums} />
+                    <ArtistAlbums
+                        albumsQuery={albumsQuery}
+                        order={itemOrder.recentAlbums}
+                        role={role}
+                        roles={detailQuery.data?.roles}
+                        setRole={setRole}
+                    />
                     {enabledItem.similarArtists && (
                         <AlbumArtistMetadataSimilarArtists
                             order={itemOrder.similarArtists}
@@ -1420,13 +1432,17 @@ const AlbumSection = memo(function AlbumSection({
 });
 
 import { useArtistAlbumsGrouped } from '/@/renderer/features/artists/hooks/use-artist-albums-grouped';
+import { Select } from '/@/shared/components/select/select';
 
 interface ArtistAlbumsProps {
-    albumsQuery: UseSuspenseQueryResult<AlbumListResponse, Error>;
+    albumsQuery: UseQueryResult<AlbumListResponse, Error>;
     order?: number;
+    role: null | string;
+    roles?: null | string[];
+    setRole: (role: null | string) => void;
 }
 
-const ArtistAlbums = ({ albumsQuery, order }: ArtistAlbumsProps) => {
+const ArtistAlbums = ({ albumsQuery, order, role, roles, setRole }: ArtistAlbumsProps) => {
     const { t } = useTranslation();
     const [searchTerm, setSearchTerm] = useState('');
     const [debouncedSearchTerm] = useDebouncedValue(searchTerm, 300);
@@ -1521,6 +1537,17 @@ const ArtistAlbums = ({ albumsQuery, order }: ArtistAlbumsProps) => {
                         }}
                         value={searchTerm}
                     />
+                    {roles?.length && (
+                        <Select
+                            aria-label="role"
+                            clearable
+                            data={roles}
+                            onChange={setRole}
+                            placeholder={t('common.role')}
+                            value={role}
+                            w={200}
+                        />
+                    )}
                     <ListSortByDropdownControlled
                         filters={CLIENT_SIDE_ALBUM_FILTERS}
                         itemType={LibraryItem.ALBUM}
diff --git a/src/renderer/features/artists/components/album-artist-detail-header.tsx b/src/renderer/features/artists/components/album-artist-detail-header.tsx
index 924a20a92..a6fe5d30d 100644
--- a/src/renderer/features/artists/components/album-artist-detail-header.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-header.tsx
@@ -1,4 +1,4 @@
-import { useSuspenseQuery, UseSuspenseQueryResult } from '@tanstack/react-query';
+import { UseQueryResult, useSuspenseQuery } from '@tanstack/react-query';
 import { forwardRef, Fragment, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
@@ -38,7 +38,7 @@ import { ServerFeature } from '/@/shared/types/features-types';
 import { Play } from '/@/shared/types/types';
 
 interface AlbumArtistDetailHeaderProps {
-    albumsQuery: UseSuspenseQueryResult<AlbumListResponse, Error>;
+    albumsQuery: UseQueryResult<AlbumListResponse, Error>;
 }
 
 function ArtistImageUploadOverlay({
diff --git a/src/renderer/features/artists/routes/album-artist-detail-route.tsx b/src/renderer/features/artists/routes/album-artist-detail-route.tsx
index 874f4de6f..8a85fd525 100644
--- a/src/renderer/features/artists/routes/album-artist-detail-route.tsx
+++ b/src/renderer/features/artists/routes/album-artist-detail-route.tsx
@@ -1,5 +1,5 @@
-import { useSuspenseQueries } from '@tanstack/react-query';
-import { Suspense, useRef } from 'react';
+import { useQuery, useSuspenseQuery } from '@tanstack/react-query';
+import { Suspense, useRef, useState } from 'react';
 import { useParams } from 'react-router';
 
 import { useItemImageUrl } from '/@/renderer/components/item-image/item-image';
@@ -34,22 +34,24 @@ const AlbumArtistDetailRouteContent = () => {
     };
 
     const routeId = (artistId || albumArtistId) as string;
+    const [role, setRole] = useState<null | string>(null);
 
-    const [detailQuery, albumsQuery] = useSuspenseQueries({
-        queries: [
-            artistsQueries.albumArtistDetail({ query: { id: routeId }, serverId: server?.id }),
-            albumQueries.list({
-                query: {
-                    artistIds: [routeId],
-                    limit: -1,
-                    sortBy: AlbumListSort.RELEASE_DATE,
-                    sortOrder: SortOrder.DESC,
-                    startIndex: 0,
-                },
-                serverId,
-            }),
-        ],
-    });
+    const detailQuery = useSuspenseQuery(
+        artistsQueries.albumArtistDetail({ query: { id: routeId }, serverId: server?.id }),
+    );
+    const albumsQuery = useQuery(
+        albumQueries.list({
+            query: {
+                artistIds: [routeId],
+                limit: -1,
+                role: role || undefined,
+                sortBy: AlbumListSort.RELEASE_DATE,
+                sortOrder: SortOrder.DESC,
+                startIndex: 0,
+            },
+            serverId,
+        }),
+    );
 
     const imageUrl = useItemImageUrl({
         id: detailQuery.data?.imageId || undefined,
@@ -117,7 +119,12 @@ const AlbumArtistDetailRouteContent = () => {
                         albumsQuery={albumsQuery}
                         ref={headerRef as React.Ref<HTMLDivElement>}
                     />
-                    <AlbumArtistDetailContent albumsQuery={albumsQuery} detailQuery={detailQuery} />
+                    <AlbumArtistDetailContent
+                        albumsQuery={albumsQuery}
+                        detailQuery={detailQuery}
+                        role={role}
+                        setRole={setRole}
+                    />
                 </LibraryContainer>
             </NativeScrollArea>
         </AnimatedPage>
diff --git a/src/shared/api/jellyfin/jellyfin-normalize.ts b/src/shared/api/jellyfin/jellyfin-normalize.ts
index e10f85506..f0ac8bc97 100644
--- a/src/shared/api/jellyfin/jellyfin-normalize.ts
+++ b/src/shared/api/jellyfin/jellyfin-normalize.ts
@@ -395,6 +395,7 @@ const normalizeAlbumArtist = (
         mbz: item.ProviderIds?.MusicBrainzArtist || null,
         name: item.Name,
         playCount: item.UserData?.PlayCount || 0,
+        roles: null,
         similarArtists,
         songCount: item.SongCount ?? null,
         uploadedImage: item.ImageTags?.Primary ?? undefined,
diff --git a/src/shared/api/navidrome/navidrome-normalize.ts b/src/shared/api/navidrome/navidrome-normalize.ts
index 2a45227e8..1ca8636c7 100644
--- a/src/shared/api/navidrome/navidrome-normalize.ts
+++ b/src/shared/api/navidrome/navidrome-normalize.ts
@@ -410,10 +410,12 @@ const normalizeAlbumArtist = (
 
     if (item.stats) {
         albumCount = Math.max(
+            item.stats.maincredit?.albumCount ?? 0,
             item.stats.albumartist?.albumCount ?? 0,
             item.stats.artist?.albumCount ?? 0,
         );
         songCount = Math.max(
+            item.stats.maincredit?.songCount ?? 0,
             item.stats.albumartist?.songCount ?? 0,
             item.stats.artist?.songCount ?? 0,
         );
@@ -453,6 +455,8 @@ const normalizeAlbumArtist = (
         mbz: item.mbzArtistId || null,
         name: item.name,
         playCount: item.playCount || 0,
+        // filter out specifically maincredit. This is not filterable properly
+        roles: item.stats ? Object.keys(item.stats).filter((key) => key !== 'maincredit') : null,
         similarArtists:
             item.similarArtists?.map((artist) => ({
                 id: artist.id,
diff --git a/src/shared/api/subsonic/subsonic-normalize.ts b/src/shared/api/subsonic/subsonic-normalize.ts
index dbc8ebcfd..942dd24d3 100644
--- a/src/shared/api/subsonic/subsonic-normalize.ts
+++ b/src/shared/api/subsonic/subsonic-normalize.ts
@@ -274,6 +274,7 @@ const normalizeAlbumArtist = (
         mbz: null,
         name: item.name,
         playCount: null,
+        roles: null,
         similarArtists:
             item.similarArtists?.map((artist) => ({
                 id: artist.id,
diff --git a/src/shared/types/domain-types.ts b/src/shared/types/domain-types.ts
index 24e3ef858..370a0e571 100644
--- a/src/shared/types/domain-types.ts
+++ b/src/shared/types/domain-types.ts
@@ -223,6 +223,7 @@ export type AlbumArtist = {
     mbz: null | string;
     name: string;
     playCount: null | number;
+    roles: null | string[];
     similarArtists: null | RelatedArtist[];
     songCount: null | number;
     uploadedImage?: string;
@@ -500,6 +501,7 @@ export interface AlbumListQuery extends AlbumListNavidromeQuery, BaseQuery<Album
     maxYear?: number;
     minYear?: number;
     musicFolderId?: string | string[];
+    role?: string;
     searchTerm?: string;
     startIndex: number;
 }