Skip to content

Fix undefined sorting params in playlists table #1689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
owi92 wants to merge 1 commit into
base: r/21.x
Choose a base branch
from
Open

Fix undefined sorting params in playlists table #1689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ const tableFilterProfilesPersistConfig = { key: "tableFilterProfiles", storage,
const eventsPersistConfig = { key: "events", storage, whitelist: ["columns"] };
const seriesPersistConfig = { key: "series", storage, whitelist: ["columns"] };
const playlistPersistConfig = { key: "playlists", storage, whitelist: ["columns"] };
const tablePersistConfig = { key: "table", storage, whitelist: ["pagination", "sortBy", "reverse"] };
const tablePersistConfig = {
key: "table",
storage,
whitelist: ["pagination", "sortBy", "reverse"],
// Shallow merge persisted values into defaults, so resources added later still get their default sorting
// instead of `undefined:undefined` when the stored value was missing.
stateReconciler: autoMergeLevel2,
Comment thread
Arnei marked this conversation as resolved.
};
const recordingsPersistConfig = { key: "recordings", storage, whitelist: ["columns"] };
const jobsPersistConfig = { key: "jobs", storage, whitelist: ["columns"] };
const serversPersistConfig = { key: "servers", storage, whitelist: ["columns"] };
Expand All @@ -59,7 +66,7 @@ const reducers = combineReducers({
events: persistReducer(eventsPersistConfig, events),
series: persistReducer(seriesPersistConfig, series),
playlists: persistReducer(playlistPersistConfig, playlists),
table: persistReducer(tablePersistConfig, table),
table: persistReducer<ReturnType<typeof table>>(tablePersistConfig, table),
recordings: persistReducer(recordingsPersistConfig, recordings),
jobs: persistReducer(jobsPersistConfig, jobs),
servers: persistReducer(serversPersistConfig, servers),
Expand Down
Loading