MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-04 10:26:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[web] Fix sorting that is not kept in some situations

Browse Source
This commit is contained in:
Alain Nussbaumer 2024-03-12 13:45:53 +01:00
parent 006093c643
commit 9513097dd0
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web-src/src/lib/GroupedList.js
View File

@ -120,29 +120,26 @@ export class GroupedList {
}
group(options, filterFns = []) {
const itemsFiltered = filterFns
? this.items.filter((item) => filterFns.every((fn) => fn(item)))
: this.items
const itemsFiltered = this.items.filter((item) =>
filterFns.every((fn) => fn(item))
)
this.count = itemsFiltered.length
// Sort item list
const itemsSorted = options.compareFn
? [...itemsFiltered].sort(options.compareFn)
: itemsFiltered
// Create index list
this.indices = [...new Set(itemsSorted.map(options.groupKeyFn))]
// Group item list
this.itemsGrouped = itemsSorted.reduce((r, item) => {
this.itemsGrouped = itemsSorted.reduce((map, item) => {
const groupKey = options.groupKeyFn(item)
r[groupKey] = [...(r[groupKey] || []), item]
return r
}, {})
map.set(groupKey, [...(map.get(groupKey) || []), item])
return map
}, new Map())
// Create index list
this.indices = Array.from(this.itemsGrouped.keys())
}
*generate() {
for (const key in this.itemsGrouped) {
for (const [key, items] of this.itemsGrouped.entries()) {
if (key !== GROUP_KEY_NONE) {
yield {
groupKey: key,
@ -151,7 +148,7 @@ export class GroupedList {
item: {}
}
}
for (const item of this.itemsGrouped[key]) {
for (const item of items) {
yield {
groupKey: key,
itemId: item.id,