diff --git a/src/app/lnd/reports/routing/routing-report.component.html b/src/app/lnd/reports/routing/routing-report.component.html index 127f08a9..8228221f 100644 --- a/src/app/lnd/reports/routing/routing-report.component.html +++ b/src/app/lnd/reports/routing/routing-report.component.html @@ -41,7 +41,7 @@
- +
diff --git a/src/app/lnd/routing/forwarding-history/forwarding-history.component.html b/src/app/lnd/routing/forwarding-history/forwarding-history.component.html index f6664f40..5b0950bb 100644 --- a/src/app/lnd/routing/forwarding-history/forwarding-history.component.html +++ b/src/app/lnd/routing/forwarding-history/forwarding-history.component.html @@ -14,12 +14,20 @@ {{(fhEvent.timestamp * 1000) | date:'dd/MMM/y HH:mm'}} - Inbound Channel - {{fhEvent.alias_in}} + Inbound Alias + {{fhEvent.alias_in}} + + + Inbound Channel + {{fhEvent.chan_id_in}} - Outbound Channel - {{fhEvent.alias_out}} + Outbound Alias + {{fhEvent.alias_out}} + + + Outbound Channel + {{fhEvent.chan_id_out}} Inbound Amount (Sats) diff --git a/src/app/lnd/routing/forwarding-history/forwarding-history.component.scss b/src/app/lnd/routing/forwarding-history/forwarding-history.component.scss index 0ad983c7..0d62b368 100644 --- a/src/app/lnd/routing/forwarding-history/forwarding-history.component.scss +++ b/src/app/lnd/routing/forwarding-history/forwarding-history.component.scss @@ -1,3 +1,10 @@ +.mat-column-alias_in, .mat-column-alias_out, .mat-column-chan_id_in, .mat-column-chan_id_out { + flex: 1 1 20%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + .mat-column-actions { min-height: 4.8rem; } diff --git a/src/app/lnd/routing/forwarding-history/forwarding-history.component.ts b/src/app/lnd/routing/forwarding-history/forwarding-history.component.ts index 3da60feb..0370489e 100644 --- a/src/app/lnd/routing/forwarding-history/forwarding-history.component.ts +++ b/src/app/lnd/routing/forwarding-history/forwarding-history.component.ts @@ -30,6 +30,8 @@ export class ForwardingHistoryComponent implements OnInit, AfterViewInit, OnChan @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + @Input() pageId = 'routing'; + @Input() tableId = 'forwarding_history'; @Input() eventsData = []; @Input() filterValue = ''; public PAGE_ID = 'routing'; @@ -58,7 +60,8 @@ export class ForwardingHistoryComponent implements OnInit, AfterViewInit, OnChan if (this.apiCallStatus.status === APICallStatusEnum.ERROR) { this.errorMessage = this.apiCallStatus.message || ''; } - this.tableSetting = settings.pageSettings.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSetting.tableId) || LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSetting.tableId)!; + this.tableSetting.tableId = this.tableId; + this.tableSetting = settings.pageSettings.find((page) => page.pageId === this.pageId)?.tables.find((table) => table.tableId === this.tableSetting.tableId) || LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === this.pageId)?.tables.find((table) => table.tableId === this.tableSetting.tableId)!; if (this.screenSize === ScreenSizeEnum.XS || this.screenSize === ScreenSizeEnum.SM) { this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelectionSM)); } else { diff --git a/src/app/shared/services/consts-enums-functions.ts b/src/app/shared/services/consts-enums-functions.ts index 54a2ca45..38a6ca1c 100644 --- a/src/app/shared/services/consts-enums-functions.ts +++ b/src/app/shared/services/consts-enums-functions.ts @@ -991,7 +991,7 @@ export const LND_TABLES_DEF = { routing: { forwarding_history: { maxColumns: 6, - allowedColumns: ['timestamp', 'alias_in', 'alias_out', 'amt_in', 'amt_out', 'fee_msat'] + allowedColumns: ['timestamp', 'alias_in', 'chan_id_in', 'alias_out', 'chan_id_out', 'amt_in', 'amt_out', 'fee_msat'] }, routing_peers: { maxColumns: 4, @@ -1005,7 +1005,7 @@ export const LND_TABLES_DEF = { reports: { routing: { maxColumns: 6, - allowedColumns: ['timestamp', 'alias_in', 'alias_out', 'amt_in', 'amt_out', 'fee_msat'] + allowedColumns: ['timestamp', 'alias_in', 'chan_id_in', 'alias_out', 'chan_id_out', 'amt_in', 'amt_out', 'fee_msat'] }, transactions: { maxColumns: 5,