ringtools/ringtools-web-v2
1
0
Fork 0
mirror of https://github.com/ringtools/ringtools-web-v2.git synced 2024-11-18 23:30:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix overview listener

Browse Source
This commit is contained in:
Djuri Baars 2022-01-17 22:09:54 +01:00
parent e94e21f516
commit 53749eaffe
2 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/components/overview/overview.component.ts
View File

@ -1,9 +1,10 @@
import { Component, OnDestroy } from '@angular/core';
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
import { Observable, Subscriber, Subscription } from 'rxjs';
import * as svg from 'save-svg-as-png';
import { upsertNodeInfo } from 'src/app/actions/node-info.actions';
import { setViewMode } from 'src/app/actions/setting.actions';
import { ChannelEdge } from 'src/app/models/channel_edge.model';
import { NodeInfo } from 'src/app/models/node-info.model';
import { NodeOwner } from 'src/app/models/node-owner.model';
import { IRing } from 'src/app/models/ring.model';
@ -25,10 +26,11 @@ export class OverviewComponent implements OnDestroy {
settings!: SettingState;
ring: IRing = [];
nodeData: Map<string, NodeInfo> = new Map<string, NodeInfo>();
sub: Subscription = new Subscription();
constructor(
private store: Store<fromRoot.State>,
private lnData: LnDataService,
private lnData: LnDataService
) {
this.nodeOwners$ = this.store.select(selectNodeOwners);
this.settings$ = this.store.select(selectSettings);
@ -37,25 +39,55 @@ export class OverviewComponent implements OnDestroy {
this.settings = settings;
});
this.nodeOwners$.subscribe((nodeOwners: NodeOwner[]) => {
this.lnData.nodeSocket.emit(
'subscribe',
nodeOwners.map((no) => no.pub_key)
);
this.sub.add(
this.nodeOwners$.subscribe((nodeOwners: NodeOwner[]) => {
this.lnData.nodeSocket.emit(
'subscribe',
nodeOwners.map((no) => no.pub_key)
);
this.ring = this.makeRing(nodeOwners);
});
this.ring = this.makeRing(nodeOwners);
})
);
this.lnData.nodeSocket.on('node', (data: NodeInfo) => {
this.store.dispatch(upsertNodeInfo({ nodeInfo: data }));
this.nodeData.set(data.node.pub_key, Object.assign(new NodeInfo(), data));
this.refreshRing();
const channelIds = this.ring.map((r) => r[2]).filter((r) => r != null);
if (channelIds.length) {
this.lnData.channelSocket.emit('subscribe', channelIds);
}
});
this.lnData.channelSocket.on('channel', (data: ChannelEdge) => {
let node1 = this.nodeData.get(data.node1_pub)
let channelIndex1 = node1?.channels.findIndex(c => c.channel_id == data.channel_id)
if (node1 && channelIndex1) {
node1.channels = [...node1.channels];
node1.channels[channelIndex1] = data;
this.nodeData.set(data.node1_pub, node1);
}
let node2 = this.nodeData.get(data.node2_pub)
let channelIndex2 = node2?.channels.findIndex(c => c.channel_id == data.channel_id)
if (node2 && channelIndex2) {
node2.channels = [...node2.channels];
node2.channels[channelIndex2] = data;
this.nodeData.set(data.node2_pub, node2);
}
this.refreshRing();
});
}
ngOnDestroy(): void {
this.lnData.nodeSocket.emit('unsubscribe_all');
this.lnData.channelSocket.emit('unsubscribe_all');
this.sub.unsubscribe();
}
viewChange(event: any) {

26
src/app/partials/participant-table/participant-table.component.html
View File

@ -14,7 +14,9 @@
<ng-container *ngFor="let item of participants; let i = index">
<tr [class.error]="item.channel_id && (!item.initiator_fee || !item.receiver_fee)">
<ng-template #popTitle let-title="title">Node policy <strong>{{title}}</strong></ng-template>
<ng-template #popContent let-value="value"><pre><code [innerHTML]="value"></code></pre></ng-template>
<ng-template #popContent let-value="value">
<pre><code [innerHTML]="value"></code></pre>
</ng-template>
<th scope="row" [style.background-color]="getColor(i)" class="channelCol">{{ item[2] }}</th>
<ng-template [ngIf]="settings.viewMode === 'tg'" [ngIfElse]="elseBlock">
@ -25,11 +27,25 @@
<td *ngIf="item[0]" class="node_key"><span>{{ item[0].nodename }}</span></td>
<td *ngIf="item[1]" class="node_key"><span>{{ item[1].nodename }}</span></td>
</ng-template>
<td [ngbPopover]="popContent" [popoverTitle]="popTitle" #p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][0], item[0])"><span *ngIf="item[3]">{{ item[3][0].fee_base_msat }}</span></td>
<td [ngbPopover]="popContent" [popoverTitle]="popTitle" #p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][0], item[0])"><span *ngIf="item[3]">{{ item[3][0].fee_rate_milli_msat }}</span>
<td>
<div *ngIf="item[3] && item[3][0]" [ngbPopover]="popContent" [popoverTitle]="popTitle"
#p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][0], item[0])">
<span>{{ item[3][0].fee_base_msat }}</span></div>
</td>
<td [ngbPopover]="popContent" [popoverTitle]="popTitle" #p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][1], item[1])"><span *ngIf="item[3]">{{ item[3][1].fee_base_msat }}</span></td>
<td [ngbPopover]="popContent" [popoverTitle]="popTitle" #p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][1], item[1])"><span *ngIf="item[3]">{{ item[3][1].fee_rate_milli_msat }}</span>
<td>
<div *ngIf="item[3] && item[3][0]" [ngbPopover]="popContent" [popoverTitle]="popTitle"
#p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][0], item[0])">
<span>{{ item[3][0].fee_rate_milli_msat }}</span></div>
</td>
<td>
<div *ngIf="item[3] && item[3][1]" [ngbPopover]="popContent" [popoverTitle]="popTitle"
#p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][1], item[1])">
<span>{{ item[3][1].fee_base_msat }}</span></div>
</td>
<td>
<div *ngIf="item[3] && item[3][1]" [ngbPopover]="popContent" [popoverTitle]="popTitle"
#p1="ngbPopover" triggers="manual" (click)="routingPolicyPopover(p1, item[3][1], item[1])">
<span>{{ item[3][1].fee_rate_milli_msat }}</span></div>
</tr>
</ng-container>
</tbody>