thm
/
upend
1
0
Fork 0
Code Issues 75 Pull Requests Packages Projects Releases 6 Wiki Activity

[ui] fix & optimize sort (wow)

feat/vaults
Tomáš Mládek 2022-02-19 18:38:36 +01:00
parent 5cef2b8960
commit 9ce4c21b93
No known key found for this signature in database
GPG Key ID: 65E225C8B3E2ED8A
2 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webui/src/components/widgets/Table.svelte
View File

@ -113,7 +113,8 @@
entries.forEach((entry) => { entries.forEach((entry) => {
addSortKeys( addSortKeys(
entry.entity, entry.entity,
$labelListing.getObject(entry.entity).identify() $labelListing.getObject(entry.entity).identify(),
false
); );
if (entry.value.t === "Address") { if (entry.value.t === "Address") {

31
webui/src/util/sort.ts
View File

@ -3,11 +3,10 @@ import type { UpEntry } from "upend";
export type SortKeys = { [key: string]: string[] }; export type SortKeys = { [key: string]: string[] };
export function sortByValue(entries: UpEntry[], sortKeys: SortKeys): void { export function sortByValue(entries: UpEntry[], sortKeys: SortKeys): void {
entries entries.sort((aEntry, bEntry) => {
.sort((aEntry, bEntry) => {
return String(aEntry.value.c).length - String(bEntry.value.c).length; return String(aEntry.value.c).length - String(bEntry.value.c).length;
}) });
.sort((aEntry, bEntry) => { entries.sort((aEntry, bEntry) => {
if (aEntry.value.t === "Number" && bEntry.value.t === "Number") { if (aEntry.value.t === "Number" && bEntry.value.t === "Number") {
return bEntry.value.c - aEntry.value.c; return bEntry.value.c - aEntry.value.c;
} }
@ -50,15 +49,11 @@ export function sortByAttribute(entries: UpEntry[]): void {
} }
export function sortByEntity(entries: UpEntry[], sortKeys: SortKeys): void { export function sortByEntity(entries: UpEntry[], sortKeys: SortKeys): void {
entries entries.sort((aEntry, bEntry) => {
.sort((aEntry, bEntry) => {
return aEntry.attribute.localeCompare(bEntry.attribute); return aEntry.attribute.localeCompare(bEntry.attribute);
}) });
.sort((aEntry, bEntry) => { entries.sort((aEntry, bEntry) => {
if ( if (!sortKeys[aEntry.entity]?.length || !sortKeys[bEntry.entity]?.length) {
!sortKeys[aEntry.entity]?.length ||
!sortKeys[bEntry.entity]?.length
) {
if ( if (
Boolean(sortKeys[aEntry.entity]?.length) && Boolean(sortKeys[aEntry.entity]?.length) &&
!sortKeys[bEntry.entity]?.length !sortKeys[bEntry.entity]?.length
@ -85,9 +80,9 @@ export function defaultEntitySort(
sortKeys: SortKeys sortKeys: SortKeys
): UpEntry[] { ): UpEntry[] {
const result = entries.concat(); const result = entries.concat();
sortByValue(entries, sortKeys); sortByValue(result, sortKeys);
sortByAttribute(entries); sortByAttribute(result);
sortByEntity(entries, sortKeys); sortByEntity(result, sortKeys);
return result; return result;
} }
@ -96,8 +91,8 @@ export function entityValueSort(
sortKeys: SortKeys sortKeys: SortKeys
): UpEntry[] { ): UpEntry[] {
const result = entries.concat(); const result = entries.concat();
sortByEntity(entries, sortKeys); sortByEntity(result, sortKeys);
sortByAttribute(entries); sortByAttribute(result);
sortByValue(entries, sortKeys); sortByValue(result, sortKeys);
return result; return result;
} }