mirror of
https://github.com/1f349/admin.1f349.com.git
synced 2025-02-22 21:44:57 +00:00
Trim wildcards in target management ordering
This commit is contained in:
parent
1581a7b810
commit
27b5cfbb6d
@ -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 {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user