Trim wildcards in target management ordering

This commit is contained in:
Melon 2024-06-23 17:54:03 +01:00
parent 1581a7b810
commit 27b5cfbb6d
Signed by: melon
GPG Key ID: 6C9D970C50D26A25

View File

@ -19,7 +19,12 @@
let table = new TargetTable<T>(apiUrl, (item: T) => ""); let table = new TargetTable<T>(apiUrl, (item: T) => "");
function rowOrdering(rows: RestItem<T>[], domain: string): RestItem<T>[] { function rowOrdering(rows: RestItem<T>[], domain: string): RestItem<T>[] {
return rows.filter(x => domainFilter(x.data, domain)).sort((a, b) => a.data.src.localeCompare(b.data.src)); return rows.filter(x => domainFilter(x.data, domain)).sort((a, b) => trimWildcards(a.data.src).localeCompare(trimWildcards(b.data.src)));
}
function trimWildcards(a: string) {
if (a.startsWith("*.")) return a.substring(2);
return a;
} }
function domainFilter(item: T, domain: string): boolean { function domainFilter(item: T, domain: string): boolean {