liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak(dashboard): re-add sorting by birthday and creation

Browse Source
This commit is contained in:
Jake Fulmine 2022-11-27 21:27:49 +01:00
parent 2a5cadff13
commit 15a5f78cf1
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dashboard/src/components/list/ListControl.svelte
View File

@ -119,6 +119,9 @@ function resetPage() {
<option value="pronouns">Pronouns</option>
<option value="birthday">Birthday</option>
{/if}
{#if !pageOptions.isPublic}
<option value="created">Creation date</option>
{/if}
<option value="none">API response order</option>
</Input>
</InputGroup>

38
dashboard/src/components/list/functions.ts
View File

@ -100,24 +100,32 @@ function sort<T extends Member|Group>(list: T[], options: ListOptions): T[] {
let aa = (a as Member).birthday;
let bb = (b as Member).birthday;
if (aa === null) {
return 1;
}
if (bb === null) {
return -1;
}
if (aa === bb) return a.name.localeCompare(b.name);
if (aa === null) return 1;
if (bb === null) return -1;
let aBirthday = moment(aa.slice(5, aa.length), "MM-DD", true);
let bBirthday = moment(bb.slice(5, bb.length), "MM-DD", true);
if (aBirthday.isBefore(bBirthday)) {
return -1;
}
if (aBirthday.isAfter(bBirthday)) {
return 1;
}
if (aBirthday === bBirthday) {
return 0;
}
if (aBirthday.isAfter(bBirthday)) return 1;
if (aBirthday.isBefore(bBirthday)) return -1;
});
} else if (options.sort === 'created') {
newList = [...list].sort((a, b) => {
let aa = a.created;
let bb = b.created;
if (aa === bb) return a.name.localeCompare(b.name);
if (aa === null) return 1;
if (bb === null) return -1;
let aCreated = moment(aa);
let bCreated = moment(bb);
if (aCreated.isAfter(bCreated)) return 1;
if (aCreated.isBefore(bCreated)) return -1;
});
}
return newList;

2
dashboard/src/components/list/types.ts
View File

@ -47,7 +47,7 @@ export interface ListOptions {
}
// what it says on the tin
sort: 'name'|'description'|'birthday'|'pronouns'|'display_name'|'id'|'none',
sort: 'name'|'description'|'birthday'|'pronouns'|'display_name'|'id'|'none'|'created',
order: "ascending"|"descending",
show: "all"|"private"|"public",
// so we can change the key for duplicate members on the randomize page