neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Endpoint sort fix (#6864)

Browse Source
This commit is contained in:
Jaco 2022-01-22 08:49:58 +01:00 committed by GitHub
parent 40dc34ebce
commit 33daad697d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/apps-config/src/endpoints/util.ts
View File

@ -8,8 +8,12 @@ interface SortOption {
isUnreachable?: boolean;
}
function sortNoop (): number {
return 0;
}
function sortLinks (a: SortOption, b: SortOption): number {
return a.isUnreachable !== b.isUnreachable
return !!a.isUnreachable !== !!b.isUnreachable
? a.isUnreachable
? 1
: -1
@ -67,7 +71,8 @@ function expandEndpoint (t: TFunction, { dnslink, genesisHash, homepage, info, i
const last = result[result.length - 1];
const options: LinkOption[] = [];
(withSort ? linked.sort(sortLinks) : linked)
linked
.sort(withSort ? sortLinks : sortNoop)
.filter(({ paraId }) => paraId)
.forEach((o) =>
options.push(...expandEndpoint(t, o, firstOnly, withSort))
@ -81,7 +86,8 @@ function expandEndpoint (t: TFunction, { dnslink, genesisHash, homepage, info, i
}
export function expandEndpoints (t: TFunction, input: EndpointOption[], firstOnly: boolean, withSort: boolean): LinkOption[] {
return (withSort ? input.sort(sortLinks) : input).reduce<LinkOption[]>((result, input) =>
result.concat(expandEndpoint(t, input, firstOnly, withSort)), []
);
return input
.sort(withSort ? sortLinks : sortNoop)
.reduce((all: LinkOption[], e) =>
all.concat(expandEndpoint(t, e, firstOnly, withSort)), []);
}