Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-22 16:29:09 +01:00
Code Issues Projects Releases Wiki Activity

[EC-1025] fix: sort on each data field separately (#4609)

Browse Source
This commit is contained in:
Andreas Coroiu 2023-02-06 09:46:27 +01:00 committed by GitHub
parent e62d0b2987
commit 82b273651f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/web/src/app/organizations/shared/components/access-selector/access-selector.component.ts
View File

@ -285,12 +285,11 @@ export class AccessSelectorComponent implements ControlValueAccessor, OnInit, On
} }
private _itemComparator(a: AccessItemView, b: AccessItemView) { private _itemComparator(a: AccessItemView, b: AccessItemView) {
if (a.type != b.type) { return (
return a.type - b.type; a.type - b.type ||
} this.i18nService.collator.compare(a.listName, b.listName) ||
return this.i18nService.collator.compare( this.i18nService.collator.compare(a.labelName, b.labelName) ||
a.listName + a.labelName + a.readonly, Number(b.readonly) - Number(a.readonly)
b.listName + b.labelName + b.readonly
); );
} }
} }