machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into simon/display-opening-closing-transactions

Browse Source
This commit is contained in:
wiz 2022-08-20 20:40:46 +09:00 committed by GitHub
commit ffd8a527f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/api/explorer/channels.api.ts
View File

@ -223,23 +223,25 @@ class ChannelsApi {
// Channels originating from node // Channels originating from node
let query = ` let query = `
SELECT node2.alias, node2.public_key, channels.status, channels.node1_fee_rate, SELECT COALESCE(node2.alias, SUBSTRING(node2_public_key, 0, 20)) AS alias, COALESCE(node2.public_key, node2_public_key) AS public_key,
channels.status, channels.node1_fee_rate,
channels.capacity, channels.short_id, channels.id channels.capacity, channels.short_id, channels.id
FROM channels FROM channels
JOIN nodes AS node2 ON node2.public_key = channels.node2_public_key LEFT JOIN nodes AS node2 ON node2.public_key = channels.node2_public_key
WHERE node1_public_key = ? AND channels.status ${channelStatusFilter} WHERE node1_public_key = ? AND channels.status ${channelStatusFilter}
`; `;
const [channelsFromNode]: any = await DB.query(query, [public_key, index, length]); const [channelsFromNode]: any = await DB.query(query, [public_key]);
// Channels incoming to node // Channels incoming to node
query = ` query = `
SELECT node1.alias, node1.public_key, channels.status, channels.node2_fee_rate, SELECT COALESCE(node1.alias, SUBSTRING(node1_public_key, 0, 20)) AS alias, COALESCE(node1.public_key, node1_public_key) AS public_key,
channels.status, channels.node2_fee_rate,
channels.capacity, channels.short_id, channels.id channels.capacity, channels.short_id, channels.id
FROM channels FROM channels
JOIN nodes AS node1 ON node1.public_key = channels.node1_public_key LEFT JOIN nodes AS node1 ON node1.public_key = channels.node1_public_key
WHERE node2_public_key = ? AND channels.status ${channelStatusFilter} WHERE node2_public_key = ? AND channels.status ${channelStatusFilter}
`; `;
const [channelsToNode]: any = await DB.query(query, [public_key, index, length]); const [channelsToNode]: any = await DB.query(query, [public_key]);
let allChannels = channelsFromNode.concat(channelsToNode); let allChannels = channelsFromNode.concat(channelsToNode);
allChannels.sort((a, b) => { allChannels.sort((a, b) => {

6
frontend/src/app/lightning/channels-list/channels-list.component.html
View File

@ -19,7 +19,11 @@
</tbody> </tbody>
</table> </table>
<ngb-pagination *ngIf="response.channels.length > 0" class="pagination-container float-right" [size]="paginationSize" [collectionSize]="response.totalItems" [rotate]="true" [pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)" [maxSize]="paginationMaxSize" [boundaryLinks]="true" [ellipses]="false"></ngb-pagination> <ngb-pagination *ngIf="response.channels.length > 0" class="pagination-container float-right"
[size]="paginationSize" [collectionSize]="response.totalItems" [rotate]="true"
[pageSize]="itemsPerPage" [(page)]="page" (pageChange)="pageChange(page)"
[maxSize]="paginationMaxSize" [boundaryLinks]="true" [ellipses]="false">
</ngb-pagination>
<table class="table table-borderless" *ngIf="response.channels.length === 0"> <table class="table table-borderless" *ngIf="response.channels.length === 0">
<div class="d-flex justify-content-center" i18n="lightning.empty-channels-list">No channels to display</div> <div class="d-flex justify-content-center" i18n="lightning.empty-channels-list">No channels to display</div>

4
frontend/src/app/lightning/channels-list/channels-list.component.ts
View File

@ -47,7 +47,7 @@ export class ChannelsListComponent implements OnInit, OnChanges {
} }
ngOnChanges(): void { ngOnChanges(): void {
this.channelStatusForm.get('status').setValue(this.defaultStatus, { emitEvent: false }); this.channelStatusForm.get('status').setValue(this.defaultStatus, { emitEvent: true });
this.channelsPage$.next(1); this.channelsPage$.next(1);
this.channels$ = merge( this.channels$ = merge(
@ -70,7 +70,7 @@ export class ChannelsListComponent implements OnInit, OnChanges {
map((response) => { map((response) => {
return { return {
channels: response.body, channels: response.body,
totalItems: parseInt(response.headers.get('x-total-count'), 10) + 1 totalItems: parseInt(response.headers.get('x-total-count'), 10)
}; };
}), }),
); );