mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Table column order resetting after refresh 

#4297

(cherry picked from commit 044cb563a6488c16916ea7617d1f91404330b06f)
This commit is contained in:
Mark McDowall 2021-02-07 11:50:37 -08:00 committed by Qstick
parent 294a50e0a3
commit 0cb54d1520
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
frontend/src/Store/Middleware/createPersistState.js
View File

@ -29,27 +29,29 @@ function mergeColumns(path, initialState, persistedState, computedState) {
const columns = [];
initialColumns.forEach((initialColumn) => {
const persistedColumnIndex = _.findIndex(persistedColumns, { name: initialColumn.name });
const column = Object.assign({}, initialColumn);
const persistedColumn = persistedColumnIndex > -1 ? persistedColumns[persistedColumnIndex] : undefined;
// Add persisted columns in the same order they're currently in
// as long as they haven't been removed.
if (persistedColumn) {
column.isVisible = persistedColumn.isVisible;
persistedColumns.forEach((persistedColumn) => {
const columnIndex = initialColumns.findIndex((i) => i.name === persistedColumn.name);
if (columnIndex >= 0) {
columns.push({ ...persistedColumn });
}
// If there is a persisted column, it's index doesn't exceed the column list
// and it's modifiable, insert it in the proper position.
if (persistedColumn && columns.length - 1 > persistedColumnIndex && persistedColumn.isModifiable !== false) {
columns.splice(persistedColumnIndex, 0, column);
} else {
columns.push(column);
}
// Set the columns in the persisted state
_.set(computedState, path, columns);
});
// Add any columns added to the app in the initial position.
initialColumns.forEach((initialColumn, index) => {
const persistedColumnIndex = persistedColumns.findIndex((i) => i.name === initialColumn.name);
const column = Object.assign({}, initialColumn);
if (persistedColumnIndex === -1) {
columns.splice(index, 0, column);
}
});
// Set the columns in the persisted state
_.set(computedState, path, columns);
}
function slicer(paths_) {