github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-13 02:07:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: Use natural sorting for lists of items in the UI

Browse source 
(cherry picked from commit 1a1c8e6c08a6db5fcd2b5d17e65fa1f943d2e746)

Closes #4912
Closes #4921
This commit is contained in:
Mark McDowall 2024-07-16 21:34:43 -07:00 • committed by Bogdan
commit 7f73a2e23a
29 changed files with 94 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/Store/Actions/artistIndexActions.js
View file

@ -1,6 +1,6 @@
import { createAction } from 'redux-actions';
import { filterBuilderTypes, filterBuilderValueTypes, filterTypePredicates, sortDirections } from 'Helpers/Props';
import sortByName from 'Utilities/Array/sortByName';
import sortByProp from 'Utilities/Array/sortByProp';
import translate from 'Utilities/String/translate';
import { filterPredicates, filters, sortPredicates } from './artistActions';
import createHandleActions from './Creators/createHandleActions';
@ -334,7 +334,7 @@ export const defaultState = {
return acc;
}, []);
return tagList.sort(sortByName);
return tagList.sort(sortByProp('name'));
}
},
{

5
frontend/src/Store/Selectors/createRootFoldersSelector.ts
View file

@ -1,11 +1,12 @@
import { createSelector } from 'reselect';
import { RootFolderAppState } from 'App/State/SettingsAppState';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import sortByName from 'Utilities/Array/sortByName';
import RootFolder from 'typings/RootFolder';
import sortByProp from 'Utilities/Array/sortByProp';
export default function createRootFoldersSelector() {
return createSelector(
createSortedSectionSelector('settings.rootFolders', sortByName),
createSortedSectionSelector<RootFolder>('rootFolders', sortByProp('name')),
(rootFolders: RootFolderAppState) => rootFolders
);
}

8
frontend/src/Store/Selectors/createSortedSectionSelector.js → frontend/src/Store/Selectors/createSortedSectionSelector.ts
View file

@ -1,14 +1,18 @@
import { createSelector } from 'reselect';
import getSectionState from 'Utilities/State/getSectionState';
function createSortedSectionSelector(section, comparer) {
function createSortedSectionSelector<T>(
section: string,
comparer: (a: T, b: T) => number
) {
return createSelector(
(state) => state,
(state) => {
const sectionState = getSectionState(state, section, true);
return {
...sectionState,
items: [...sectionState.items].sort(comparer)
items: [...sectionState.items].sort(comparer),
};
}
);