From 9ae252c418fe3884524a33eea3d262e569c3ac6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= <deluan@navidrome.org>
Date: Tue, 14 Jul 2026 07:20:17 -0400
Subject: [PATCH] feat(ui): add Artists, Songs, and Playlists to Default View
 options (#5754)

* Add resource lists to default view options

* refactor(ui): reuse getStoredDefaultView in AlbumList default-view redirect

Avoid duplicating the localStorage fallback logic and skip the unused
albumLists lookup in the resource-redirect branch, per PR review feedback.
---
 ui/src/album/AlbumList.jsx            | 12 +++++--
 ui/src/personal/SelectDefaultView.jsx |  9 ++---
 ui/src/personal/defaultViews.js       | 20 +++++++++++
 ui/src/personal/defaultViews.test.js  | 48 +++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 ui/src/personal/defaultViews.js
 create mode 100644 ui/src/personal/defaultViews.test.js

diff --git a/ui/src/album/AlbumList.jsx b/ui/src/album/AlbumList.jsx
index 0b8c256df..a860c85bb 100644
--- a/ui/src/album/AlbumList.jsx
+++ b/ui/src/album/AlbumList.jsx
@@ -28,7 +28,11 @@ import {
 import AlbumListActions from './AlbumListActions'
 import AlbumTableView from './AlbumTableView'
 import AlbumGridView from './AlbumGridView'
-import albumLists, { defaultAlbumList } from './albumLists'
+import albumLists from './albumLists'
+import {
+  getStoredDefaultView,
+  isResourceDefaultView,
+} from '../personal/defaultViews'
 import config from '../config'
 import AlbumInfo from './AlbumInfo'
 import ExpandInfoDialog from '../dialogs/ExpandInfoDialog'
@@ -220,8 +224,10 @@ const AlbumList = (props) => {
   // If it does not have filter/sort params (usually coming from Menu),
   // reload with correct filter/sort params
   if (!location.search) {
-    const type =
-      albumListType || localStorage.getItem('defaultView') || defaultAlbumList
+    const type = albumListType || getStoredDefaultView()
+    if (isResourceDefaultView(type)) {
+      return <Redirect to={`/${type}`} />
+    }
     const listParams = albumLists[type]
     if (type === 'random') {
       refresh()
diff --git a/ui/src/personal/SelectDefaultView.jsx b/ui/src/personal/SelectDefaultView.jsx
index 71c87305c..e90fd65bc 100644
--- a/ui/src/personal/SelectDefaultView.jsx
+++ b/ui/src/personal/SelectDefaultView.jsx
@@ -1,13 +1,10 @@
 import { SelectInput, useTranslate } from 'react-admin'
-import albumLists, { defaultAlbumList } from '../album/albumLists'
+import { getDefaultViewChoices, getStoredDefaultView } from './defaultViews'
 
 export const SelectDefaultView = (props) => {
   const translate = useTranslate()
-  const current = localStorage.getItem('defaultView') || defaultAlbumList
-  const choices = Object.keys(albumLists).map((type) => ({
-    id: type,
-    name: translate(`resources.album.lists.${type}`),
-  }))
+  const current = getStoredDefaultView()
+  const choices = getDefaultViewChoices(translate)
 
   return (
     <SelectInput
diff --git a/ui/src/personal/defaultViews.js b/ui/src/personal/defaultViews.js
new file mode 100644
index 000000000..09e615419
--- /dev/null
+++ b/ui/src/personal/defaultViews.js
@@ -0,0 +1,20 @@
+import albumLists, { defaultAlbumList } from '../album/albumLists'
+
+export const resourceDefaultViews = ['artist', 'song', 'playlist']
+
+export const isResourceDefaultView = (defaultView) =>
+  resourceDefaultViews.includes(defaultView)
+
+export const getDefaultViewChoices = (translate) => [
+  ...Object.keys(albumLists).map((type) => ({
+    id: type,
+    name: translate(`resources.album.lists.${type}`),
+  })),
+  ...resourceDefaultViews.map((resource) => ({
+    id: resource,
+    name: translate(`resources.${resource}.name`, { smart_count: 2 }),
+  })),
+]
+
+export const getStoredDefaultView = () =>
+  localStorage.getItem('defaultView') || defaultAlbumList
diff --git a/ui/src/personal/defaultViews.test.js b/ui/src/personal/defaultViews.test.js
new file mode 100644
index 000000000..44057a736
--- /dev/null
+++ b/ui/src/personal/defaultViews.test.js
@@ -0,0 +1,48 @@
+import {
+  getDefaultViewChoices,
+  getStoredDefaultView,
+  isResourceDefaultView,
+  resourceDefaultViews,
+} from './defaultViews'
+import albumLists, { defaultAlbumList } from '../album/albumLists'
+
+describe('defaultViews', () => {
+  beforeEach(() => {
+    localStorage.clear()
+  })
+
+  it('includes album lists and top-level resource lists as choices', () => {
+    const choices = getDefaultViewChoices((key, options) =>
+      options?.smart_count ? `${key}:${options.smart_count}` : key,
+    )
+
+    expect(choices.map((choice) => choice.id)).toEqual([
+      ...Object.keys(albumLists),
+      ...resourceDefaultViews,
+    ])
+    expect(choices).toEqual(
+      expect.arrayContaining([
+        { id: 'artist', name: 'resources.artist.name:2' },
+        { id: 'song', name: 'resources.song.name:2' },
+        { id: 'playlist', name: 'resources.playlist.name:2' },
+      ]),
+    )
+  })
+
+  it('identifies resource-backed default views', () => {
+    expect(isResourceDefaultView('artist')).toBe(true)
+    expect(isResourceDefaultView('song')).toBe(true)
+    expect(isResourceDefaultView('playlist')).toBe(true)
+    expect(isResourceDefaultView('recentlyAdded')).toBe(false)
+  })
+
+  it('falls back to the default album list when no default view is stored', () => {
+    expect(getStoredDefaultView()).toBe(defaultAlbumList)
+  })
+
+  it('returns the stored default view', () => {
+    localStorage.setItem('defaultView', 'playlist')
+
+    expect(getStoredDefaultView()).toBe('playlist')
+  })
+})