Merge 6977647b758d788b52b54b3e9c61aebcfd7ac13f into 32e1313fc6ddf7100af094d14df13d47735a44bf

Signed-off-by: Deluan <deluan@navidrome.org>

Makefile

@@ -54,7 +54,7 @@ testall: test-race test-i18n test-js ##@Development Run Go and JS tests
 .PHONY: testall
 
 test-race: ##@Development Run Go tests with race detector
-	go test -tags netgo -race -shuffle=on ./...
+	go test -tags netgo -race -shuffle=on  $(PKG)
 .PHONY: test-race
 
 test-js: ##@Development Run JS tests

core/maintenance.go

@@ -166,7 +166,7 @@ func (s *maintenanceService) getAffectedAlbumIDs(ctx context.Context, ids []stri
 	if len(ids) > 0 {
 		filters = squirrel.And{
 			squirrel.Eq{"missing": true},
-			squirrel.Eq{"id": ids},
+			squirrel.Eq{"media_file.id": ids},
 		}
 	}
 

plugins/manager_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/core/agents"
@@ -22,8 +23,11 @@ var _ = Describe("Plugin Manager", func() {
 		// but, as this is an integration test, we can't use configtest.SetupConfig() as it causes
 		// data races.
 		originalPluginsFolder := conf.Server.Plugins.Folder
+		originalTimeout := conf.Server.DevPluginCompilationTimeout
+		conf.Server.DevPluginCompilationTimeout = 2 * time.Minute
 		DeferCleanup(func() {
 			conf.Server.Plugins.Folder = originalPluginsFolder
+			conf.Server.DevPluginCompilationTimeout = originalTimeout
 		})
 		conf.Server.Plugins.Enabled = true
 		conf.Server.Plugins.Folder = testDataDir

ui/package-lock.json

@@ -57,7 +57,7 @@
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-jsx-a11y": "^6.10.2",
         "eslint-plugin-react": "^7.37.5",
-        "eslint-plugin-react-hooks": "^5.2.0",
+        "eslint-plugin-react-hooks": "^7.0.1",
         "eslint-plugin-react-refresh": "^0.4.24",
         "happy-dom": "^20.0.8",
         "jsdom": "^26.1.0",
@@ -5417,12 +5417,20 @@
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz",
-      "integrity": "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz",
+      "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "hermes-parser": "^0.25.1",
+        "zod": "^3.25.0 || ^4.0.0",
+        "zod-validation-error": "^3.5.0 || ^4.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "peerDependencies": {
         "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
@@ -6314,6 +6322,23 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hermes-estree": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hermes-parser": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hermes-estree": "0.25.1"
+      }
+    },
     "node_modules/history": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
@@ -11712,6 +11737,29 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz",
+      "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zod-validation-error": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-4.0.2.tgz",
+      "integrity": "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.0 || ^4.0.0"
+      }
     }
   }
 }

ui/package.json

@@ -66,7 +66,7 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-refresh": "^0.4.24",
     "happy-dom": "^20.0.8",
     "jsdom": "^26.1.0",

ui/src/dataProvider/wrapperDataProvider.js

@@ -12,7 +12,21 @@ const isAdmin = () => {
 const getSelectedLibraries = () => {
   try {
     const state = JSON.parse(localStorage.getItem('state'))
-    return state?.library?.selectedLibraries || []
+    const selectedLibraries = state?.library?.selectedLibraries || []
+    const userLibraries = state?.library?.userLibraries || []
+
+    // Validate selected libraries against current user libraries
+    const userLibraryIds = userLibraries.map((lib) => lib.id)
+    const validatedSelection = selectedLibraries.filter((id) =>
+      userLibraryIds.includes(id),
+    )
+
+    // If user has only one library, return empty array (no filter needed)
+    if (userLibraryIds.length === 1) {
+      return []
+    }
+
+    return validatedSelection
   } catch (err) {
     return []
   }

ui/src/library/LibraryListActions.jsx

@@ -1,5 +1,5 @@
 import React, { cloneElement } from 'react'
-import { sanitizeListRestProps, TopToolbar } from 'react-admin'
+import { sanitizeListRestProps, TopToolbar, CreateButton } from 'react-admin'
 import LibraryScanButton from './LibraryScanButton'
 
 const LibraryListActions = ({
@@ -23,6 +23,7 @@ const LibraryListActions = ({
         })}
       <LibraryScanButton fullScan={false} />
       <LibraryScanButton fullScan={true} />
+      <CreateButton />
     </TopToolbar>
   )
 }

ui/src/reducers/libraryReducer.js

@@ -8,18 +8,39 @@ const initialState = {
 export const libraryReducer = (previousState = initialState, payload) => {
   const { type, data } = payload
   switch (type) {
-    case SET_USER_LIBRARIES:
+    case SET_USER_LIBRARIES: {
+      const newUserLibraryIds = data.map((lib) => lib.id)
+
+      // Validate and filter selected libraries to only include IDs that exist in new user libraries
+      const validatedSelection = previousState.selectedLibraries.filter((id) =>
+        newUserLibraryIds.includes(id),
+      )
+
+      // Determine the final selection:
+      // 1. If first time setting libraries (no previous user libraries), select all
+      // 2. If user now has only one library, reset to empty (no filter needed)
+      // 3. Otherwise, use validated selection (may be empty if all previous selections were invalid)
+      let finalSelection
+      if (
+        previousState.selectedLibraries.length === 0 &&
+        previousState.userLibraries.length === 0
+      ) {
+        // First time: select all libraries
+        finalSelection = newUserLibraryIds
+      } else if (newUserLibraryIds.length === 1) {
+        // Single library: reset selection (empty means "all accessible")
+        finalSelection = []
+      } else {
+        // Multiple libraries: use validated selection
+        finalSelection = validatedSelection
+      }
+
       return {
         ...previousState,
         userLibraries: data,
-        // If this is the first time setting user libraries and no selection exists,
-        // default to all libraries
-        selectedLibraries:
-          previousState.selectedLibraries.length === 0 &&
-          previousState.userLibraries.length === 0
-            ? data.map((lib) => lib.id)
-            : previousState.selectedLibraries,
+        selectedLibraries: finalSelection,
       }
+    }
     case SET_SELECTED_LIBRARIES:
       return {
         ...previousState,

ui/src/reducers/libraryReducer.test.js

@@ -0,0 +1,186 @@
+import { describe, it, expect } from 'vitest'
+import { libraryReducer } from './libraryReducer'
+import { SET_SELECTED_LIBRARIES, SET_USER_LIBRARIES } from '../actions'
+
+describe('libraryReducer', () => {
+  const mockLibraries = [
+    { id: '1', name: 'Music Library' },
+    { id: '2', name: 'Podcasts' },
+    { id: '3', name: 'Audiobooks' },
+  ]
+
+  const initialState = {
+    userLibraries: [],
+    selectedLibraries: [],
+  }
+
+  describe('SET_USER_LIBRARIES', () => {
+    it('should set user libraries and select all on first load', () => {
+      const action = {
+        type: SET_USER_LIBRARIES,
+        data: mockLibraries,
+      }
+
+      const result = libraryReducer(initialState, action)
+
+      expect(result.userLibraries).toEqual(mockLibraries)
+      expect(result.selectedLibraries).toEqual(['1', '2', '3'])
+    })
+
+    it('should reset selection to empty when user has only one library', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1', '2'],
+      }
+
+      const action = {
+        type: SET_USER_LIBRARIES,
+        data: [mockLibraries[0]], // Only one library now
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.userLibraries).toEqual([mockLibraries[0]])
+      expect(result.selectedLibraries).toEqual([]) // Reset for single library
+    })
+
+    it('should filter out invalid library IDs from selection', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1', '2', '3'],
+      }
+
+      const action = {
+        type: SET_USER_LIBRARIES,
+        data: [mockLibraries[0], mockLibraries[1]], // Only libraries 1 and 2 remain
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.userLibraries).toEqual([mockLibraries[0], mockLibraries[1]])
+      expect(result.selectedLibraries).toEqual(['1', '2']) // Library 3 removed
+    })
+
+    it('should keep valid selection when libraries change', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1'],
+      }
+
+      const action = {
+        type: SET_USER_LIBRARIES,
+        data: mockLibraries, // Same libraries
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.userLibraries).toEqual(mockLibraries)
+      expect(result.selectedLibraries).toEqual(['1']) // Selection preserved
+    })
+
+    it('should handle selection becoming empty after filtering invalid IDs', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1', '2'],
+      }
+
+      const newLibraries = [{ id: '4', name: 'New Library' }]
+      const action = {
+        type: SET_USER_LIBRARIES,
+        data: newLibraries,
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.userLibraries).toEqual(newLibraries)
+      expect(result.selectedLibraries).toEqual([]) // All selected IDs were invalid
+    })
+
+    it('should handle transition from multiple to single library with invalid selection', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['2', '3'], // User had libraries 2 and 3 selected
+      }
+
+      const action = {
+        type: SET_USER_LIBRARIES,
+        data: [mockLibraries[0]], // Now only has access to library 1
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.userLibraries).toEqual([mockLibraries[0]])
+      expect(result.selectedLibraries).toEqual([]) // Reset for single library
+    })
+
+    it('should handle empty library list', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1', '2'],
+      }
+
+      const action = {
+        type: SET_USER_LIBRARIES,
+        data: [],
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.userLibraries).toEqual([])
+      expect(result.selectedLibraries).toEqual([]) // All selections filtered out
+    })
+  })
+
+  describe('SET_SELECTED_LIBRARIES', () => {
+    it('should update selected libraries', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1'],
+      }
+
+      const action = {
+        type: SET_SELECTED_LIBRARIES,
+        data: ['2', '3'],
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.selectedLibraries).toEqual(['2', '3'])
+      expect(result.userLibraries).toEqual(mockLibraries) // Unchanged
+    })
+
+    it('should allow setting empty selection', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1', '2'],
+      }
+
+      const action = {
+        type: SET_SELECTED_LIBRARIES,
+        data: [],
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result.selectedLibraries).toEqual([])
+    })
+  })
+
+  describe('unknown action', () => {
+    it('should return previous state for unknown action', () => {
+      const previousState = {
+        userLibraries: mockLibraries,
+        selectedLibraries: ['1'],
+      }
+
+      const action = {
+        type: 'UNKNOWN_ACTION',
+        data: null,
+      }
+
+      const result = libraryReducer(previousState, action)
+
+      expect(result).toBe(previousState) // Same reference
+    })
+  })
+})