From 93e01f390ebebc3757816607b28b1ccdb1649eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deluan=20Quint=C3=A3o?= Date: Mon, 9 Nov 2026 08:07:00 -0500 Subject: [PATCH] fix(ui): remember the player play mode across reloads (#6433) * fix(ui): remember the player play mode across reloads - #6361 The play mode was kept only in memory, so a page reload always reset it to "In order". It is now saved to localStorage with the rest of the player state, and clearing the queue (closing the player) keeps it too. * test(ui): wait for the throttled save before reloading the store --- ui/src/reducers/playerReducer.js | 8 ++++++-- ui/src/reducers/playerReducer.test.js | 13 +++++++++++++ ui/src/store/createAdminStore.js | 3 ++- ui/src/store/createAdminStore.test.js | 27 +++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 ui/src/store/createAdminStore.test.js diff --git a/ui/src/reducers/playerReducer.js b/ui/src/reducers/playerReducer.js index d6ab7484b..ecf6aa86d 100644 --- a/ui/src/reducers/playerReducer.js +++ b/ui/src/reducers/playerReducer.js @@ -98,7 +98,11 @@ const mapToAudioLists = (item) => { } } -const reduceClearQueue = () => ({ ...initialState, clear: true }) +const reduceClearQueue = (state) => ({ + ...initialState, + mode: state.mode, + clear: true, +}) const reducePlayTracks = (state, { data, id }) => { let playIndex = 0 @@ -212,7 +216,7 @@ export const playerReducer = (previousState = initialState, payload) => { const { type } = payload switch (type) { case PLAYER_CLEAR_QUEUE: - return reduceClearQueue() + return reduceClearQueue(previousState) case PLAYER_PLAY_TRACKS: return reducePlayTracks(previousState, payload) case PLAYER_SET_TRACK: diff --git a/ui/src/reducers/playerReducer.test.js b/ui/src/reducers/playerReducer.test.js index 110ce8c53..acd6e484b 100644 --- a/ui/src/reducers/playerReducer.test.js +++ b/ui/src/reducers/playerReducer.test.js @@ -4,6 +4,8 @@ import { PLAYER_SYNC_QUEUE, PLAYER_CURRENT, PLAYER_REFRESH_QUEUE, + clearQueue, + setPlayMode, } from '../actions' describe('playerReducer', () => { @@ -96,6 +98,17 @@ describe('playerReducer', () => { }) }) + describe('play mode', () => { + it('is kept when the queue is cleared', () => { + const state = playerReducer(undefined, setPlayMode('singleLoop')) + + const result = playerReducer(state, clearQueue()) + + expect(result.mode).toBe('singleLoop') + expect(result.queue).toEqual([]) + }) + }) + describe('play new album after closing player (issue #5440)', () => { it('SYNC_QUEUE preserves pending playIndex=0 after clearQueue', () => { // Scenario: user plays album A, advances to track 3, closes player, diff --git a/ui/src/store/createAdminStore.js b/ui/src/store/createAdminStore.js index 4888e49e4..e0caf7129 100644 --- a/ui/src/store/createAdminStore.js +++ b/ui/src/store/createAdminStore.js @@ -58,10 +58,11 @@ const createAdminStore = ({ saveState({ theme: state.theme, library: state.library, - player: (({ queue, volume, savedPlayIndex }) => ({ + player: (({ queue, volume, savedPlayIndex, mode }) => ({ queue, volume, savedPlayIndex, + mode, }))(state.player), albumView: state.albumView, settings: state.settings, diff --git a/ui/src/store/createAdminStore.test.js b/ui/src/store/createAdminStore.test.js new file mode 100644 index 000000000..f644b0124 --- /dev/null +++ b/ui/src/store/createAdminStore.test.js @@ -0,0 +1,27 @@ +import { describe, it, expect, beforeEach, vi } from 'vitest' +import { createMemoryHistory } from 'history' +import createAdminStore from './createAdminStore' +import { loadState } from './persistState' +import { playerReducer } from '../reducers' +import { setPlayMode } from '../actions' + +const newStore = () => + createAdminStore({ + authProvider: {}, + dataProvider: {}, + history: createMemoryHistory(), + customReducers: { player: playerReducer }, + }) + +describe('createAdminStore', () => { + beforeEach(() => { + localStorage.clear() + }) + + it('restores the player play mode after a reload', async () => { + newStore().dispatch(setPlayMode('orderLoop')) + await vi.waitFor(() => expect(loadState()?.player?.mode).toBe('orderLoop')) + + expect(newStore().getState().player.mode).toBe('orderLoop') + }) +})