From 2b368c4e39aa79e31857ed019e26c584344df9b9 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Fri, 28 Oct 2022 17:34:46 -0700 Subject: [PATCH] Column width dynamic --- .../query-routes/query-routes.component.html | 4 +- .../query-routes/query-routes.component.scss | 11 ----- .../liquidity-ads-list.component.html | 4 +- .../liquidity-ads-list.component.scss | 12 ----- .../liquidity-ads-list.component.ts | 2 + .../utxo-tables/utxos/utxos.component.html | 8 ++-- .../utxo-tables/utxos/utxos.component.scss | 15 +----- .../utxo-tables/utxos/utxos.component.ts | 6 ++- .../channel-open-table.component.html | 10 ++-- .../channel-open-table.component.scss | 31 ++---------- .../channel-open-table.component.ts | 2 + .../channel-pending-table.component.html | 10 ++-- .../channel-pending-table.component.scss | 25 ---------- .../channel-pending-table.component.ts | 2 + .../peers-channels/peers/peers.component.html | 8 ++-- .../peers-channels/peers/peers.component.scss | 13 ----- .../peers-channels/peers/peers.component.ts | 2 + .../transactions-report.component.ts | 2 + .../failed-transactions.component.html | 4 +- .../failed-transactions.component.scss | 11 ----- .../failed-transactions.component.ts | 4 +- .../forwarding-history.component.html | 6 +-- .../forwarding-history.component.scss | 11 ----- .../forwarding-history.component.ts | 4 +- .../local-failed-transactions.component.html | 4 +- .../local-failed-transactions.component.scss | 11 ----- .../local-failed-transactions.component.ts | 4 +- .../routing-peers.component.html | 8 ++-- .../routing-peers/routing-peers.component.ts | 2 + .../create-invoice.component.scss | 3 -- .../lightning-invoices-table.component.html | 10 ++-- .../lightning-invoices-table.component.scss | 12 ----- .../lightning-invoices-table.component.ts | 6 ++- .../create-offer.component.scss | 3 -- .../offer-bookmarks-table.component.html | 6 +-- .../offer-bookmarks-table.component.scss | 11 ----- .../offer-bookmarks-table.component.ts | 2 + .../offers-table/offers-table.component.html | 6 +-- .../offers-table/offers-table.component.scss | 12 ----- .../offers-table/offers-table.component.ts | 2 + .../lightning-payments.component.html | 30 ++++++------ .../lightning-payments.component.scss | 12 ----- .../payments/lightning-payments.component.ts | 6 ++- .../send-payment.component.scss | 10 ---- .../query-routes/query-routes.component.html | 8 +++- .../query-routes/query-routes.component.scss | 11 ----- ...n-chain-transaction-history.component.html | 6 +-- ...n-chain-transaction-history.component.scss | 11 ----- .../on-chain-transaction-history.component.ts | 4 +- .../channel-inactive-table.component.html | 6 +-- .../channel-inactive-table.component.scss | 29 +----------- .../channel-inactive-table.component.ts | 2 + .../channel-open-table.component.html | 6 +-- .../channel-open-table.component.scss | 34 +------------- .../channel-open-table.component.ts | 6 ++- .../channel-pending-table.component.html | 4 +- .../channel-pending-table.component.scss | 12 ----- .../channel-pending-table.component.ts | 2 + .../peers-channels/peers/peers.component.html | 6 +-- .../peers-channels/peers/peers.component.scss | 12 ----- .../peers-channels/peers/peers.component.ts | 2 + .../transactions-report.component.ts | 2 + .../forwarding-history.component.html | 12 ++--- .../forwarding-history.component.scss | 13 ----- .../forwarding-history.component.ts | 4 +- .../routing-peers.component.html | 8 ++-- .../routing-peers/routing-peers.component.ts | 2 + .../create-invoice.component.scss | 3 -- .../lightning-invoices.component.html | 8 ++-- .../lightning-invoices.component.scss | 12 ----- .../invoices/lightning-invoices.component.ts | 6 ++- .../lightning-payments.component.scss | 20 -------- .../send-payment.component.scss | 10 ---- .../channel-backup-table.component.html | 2 +- .../channel-restore-table.component.html | 2 +- .../query-routes/query-routes.component.html | 6 +-- .../query-routes/query-routes.component.scss | 10 ---- .../query-routes/query-routes.component.ts | 2 + ...n-chain-transaction-history.component.html | 6 +-- ...n-chain-transaction-history.component.scss | 10 ---- .../on-chain-transaction-history.component.ts | 2 + .../utxo-tables/utxos/utxos.component.html | 6 +-- .../utxo-tables/utxos/utxos.component.scss | 12 ----- .../utxo-tables/utxos/utxos.component.ts | 2 + .../channel-active-htlcs-table.component.scss | 2 - .../channel-active-htlcs-table.component.ts | 2 + .../channel-closed-table.component.html | 12 ++--- .../channel-closed-table.component.ts | 2 + .../channel-open-table.component.html | 12 ++--- .../channel-open-table.component.scss | 47 ++----------------- .../channel-open-table.component.ts | 2 + .../channel-pending-table.component.html | 28 +++++------ .../channel-pending-table.component.scss | 8 ---- .../peers-channels/peers/peers.component.html | 6 +-- .../peers-channels/peers/peers.component.scss | 10 ---- .../peers-channels/peers/peers.component.ts | 2 + .../transactions-report.component.ts | 2 + .../forwarding-history.component.html | 8 ++-- .../forwarding-history.component.scss | 10 ---- .../forwarding-history.component.ts | 2 + .../non-routing-peers.component.html | 8 ++-- .../non-routing-peers.component.scss | 33 ------------- .../non-routing-peers.component.ts | 4 +- .../routing-peers.component.html | 8 ++-- .../routing-peers/routing-peers.component.ts | 2 + .../create-invoice.component.scss | 3 -- .../lightning-invoices.component.html | 20 ++++---- .../lightning-invoices.component.scss | 13 ----- .../invoices/lightning-invoices.component.ts | 4 +- .../lightning-payments.component.html | 22 ++++----- .../lightning-payments.component.scss | 12 ----- .../payments/lightning-payments.component.ts | 4 +- .../send-payment.component.scss | 10 ---- .../boltz/swaps/swaps.component.html | 14 +++--- .../boltz/swaps/swaps.component.scss | 12 ----- .../boltz/swaps/swaps.component.ts | 4 +- .../loop/swaps/swaps.component.html | 6 +-- .../loop/swaps/swaps.component.scss | 12 ----- .../ln-services/loop/swaps/swaps.component.ts | 4 +- .../transactions-report-table.component.scss | 3 -- .../shared/services/consts-enums-functions.ts | 4 +- src/app/shared/theme/styles/root.scss | 12 +++-- src/app/shared/theme/styles/theme-color.scss | 21 +++++++-- 123 files changed, 309 insertions(+), 769 deletions(-) diff --git a/src/app/cln/graph/query-routes/query-routes.component.html b/src/app/cln/graph/query-routes/query-routes.component.html index 0d634d3b..f3d27638 100644 --- a/src/app/cln/graph/query-routes/query-routes.component.html +++ b/src/app/cln/graph/query-routes/query-routes.component.html @@ -29,7 +29,7 @@ ID -
+
{{hop?.id}}
@@ -37,7 +37,7 @@ Alias -
+
{{hop?.alias}}
diff --git a/src/app/cln/graph/query-routes/query-routes.component.scss b/src/app/cln/graph/query-routes/query-routes.component.scss index dc75eed4..e69de29b 100644 --- a/src/app/cln/graph/query-routes/query-routes.component.scss +++ b/src/app/cln/graph/query-routes/query-routes.component.scss @@ -1,11 +0,0 @@ -.mat-column-id, .mat-column-alias { - flex: 0 0 22%; - width: 22%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html index 4319765a..8198b0c9 100644 --- a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html +++ b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.html @@ -63,7 +63,7 @@ Alias -
+
{{lqNode?.alias}} @@ -78,7 +78,7 @@ Node Id -
+
{{lqNode?.nodeid}}
diff --git a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.scss b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.scss index 06772fd0..e69de29b 100644 --- a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.scss +++ b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.scss @@ -1,12 +0,0 @@ -.mat-column-alias, .mat-column-nodeid { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.ts b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.ts index ef0411fd..abb30453 100644 --- a/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.ts +++ b/src/app/cln/liquidity-ads/liquidity-ads-list/liquidity-ads-list.component.ts @@ -34,6 +34,7 @@ export class CLNLiquidityAdsListComponent implements OnInit, OnDestroy { @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'liquidity_ads'; public tableSetting: TableSetting = { tableId: 'liquidity_ads', recordsPerPage: PAGE_SIZE, sortBy: 'channel_opening_fee', sortOrder: SortOrderEnum.ASCENDING }; public askTooltipMsg = ''; @@ -83,6 +84,7 @@ export class CLNLiquidityAdsListComponent implements OnInit, OnDestroy { } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); combineLatest([this.store.select(nodeInfoAndNodeSettingsAndBalance), this.dataService.listNetworkNodes('?liquidity_ads=yes')]).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html index a97c252c..cec7b4e3 100644 --- a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html +++ b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.html @@ -10,7 +10,7 @@ - + @@ -34,7 +34,7 @@ @@ -42,7 +42,7 @@ diff --git a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.scss b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.scss index 9cbf811a..4ccf74d1 100644 --- a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.scss +++ b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.scss @@ -1,15 +1,4 @@ .mat-column-status { - width: 6rem; -} - -.mat-column-txid, .mat-column-address, .mat-column-scriptpubkey { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; + max-width: 1.2rem; + width:1.2rem; } diff --git a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.ts b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.ts index 3f5dbaf9..349cc1af 100644 --- a/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.ts +++ b/src/app/cln/on-chain/utxo-tables/utxos/utxos.component.ts @@ -32,6 +32,7 @@ export class CLNOnChainUtxosComponent implements OnInit, AfterViewInit, OnDestro @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; @Input() numDustUTXOs = 0; @Input() isDustUTXO = false; + public colWidth = '20rem'; public PAGE_ID = 'on_chain'; public tableSetting: TableSetting = { tableId: 'utxos', recordsPerPage: PAGE_SIZE, sortBy: 'status', sortOrder: SortOrderEnum.DESCENDING }; public displayedColumns: any[] = []; @@ -71,6 +72,7 @@ export class CLNOnChainUtxosComponent implements OnInit, AfterViewInit, OnDestro this.displayedColumns.unshift('status'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(utxos).pipe(takeUntil(this.unSubs[1])). @@ -81,7 +83,7 @@ export class CLNOnChainUtxosComponent implements OnInit, AfterViewInit, OnDestro this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.utxos = (this.isDustUTXO) ? utxosSeletor.utxos?.filter((utxo) => +(utxo.value || 0) < 1000) : utxosSeletor.utxos ? utxosSeletor.utxos : []; - if (this.utxos && this.utxos.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.utxos && this.utxos.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadUTXOsTable(this.utxos); } this.logger.info(utxosSeletor); @@ -89,7 +91,7 @@ export class CLNOnChainUtxosComponent implements OnInit, AfterViewInit, OnDestro } ngAfterViewInit() { - if (this.utxos && this.utxos.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.utxos && this.utxos.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadUTXOsTable(this.utxos); } } diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html index 002153ea..5321f19b 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html @@ -18,7 +18,7 @@ @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,7 +42,7 @@ @@ -50,7 +50,7 @@ diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss index c0edfa1a..86a77caa 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss @@ -1,35 +1,10 @@ -@import "../../../../../shared/theme/styles/mixins.scss"; - .mat-column-private { max-width: 1.2rem; width:1.2rem; } -.mat-column-short_channel_id, .mat-column-alias, .mat-column-id, .mat-column-channel_id, .mat-column-funding_txid { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - .mat-column-balancedness { - padding-left: 3rem; - flex: 0 0 22%; - width: 22%; -} - -.mat-column-state, .mat-column-msatoshi_to_us, .mat-column-msatoshi_to_them { - flex: 1 1 15%; - width: 15%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - @include for_screensize(phone) { - white-space: unset; - } -} - -.mat-column-actions { - min-height: 4.8rem; + padding-left: 2rem; + min-width: 15rem; + max-width: 30rem; } diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts index 438699fd..c2ea5bac 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts @@ -38,6 +38,7 @@ export class CLNChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faEye = faEye; public faEyeSlash = faEyeSlash; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'open_channels', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public totalBalance = 0; @@ -87,6 +88,7 @@ export class CLNChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe this.displayedColumns.unshift('private'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(channels).pipe(takeUntil(this.unSubs[2])). diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html index 375a2adb..8dca2525 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html @@ -18,7 +18,7 @@ @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,7 +42,7 @@ @@ -53,7 +53,7 @@ - + diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss index fc701231..2b4219f5 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss @@ -1,29 +1,4 @@ -@import "../../../../../shared/theme/styles/mixins.scss"; - .mat-column-private { max-width: 1.2rem; width:1.2rem; } - -.mat-column-short_channel_id, .mat-column-alias, .mat-column-id, .mat-column-channel_id, .mat-column-funding_txid { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-state, .mat-column-msatoshi_to_us, .mat-column-msatoshi_to_them { - flex: 1 1 15%; - width: 15%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - @include for_screensize(phone) { - white-space: unset; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts index ba752cc1..66a90754 100644 --- a/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts +++ b/src/app/cln/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts @@ -36,6 +36,7 @@ export class CLNChannelPendingTableComponent implements OnInit, AfterViewInit, O @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faEye = faEye; public faEyeSlash = faEyeSlash; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'pending_inactive_channels', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public isCompatibleVersion = false; @@ -89,6 +90,7 @@ export class CLNChannelPendingTableComponent implements OnInit, AfterViewInit, O this.displayedColumns.unshift('private'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(channels).pipe(takeUntil(this.unSubs[2])). diff --git a/src/app/cln/peers-channels/peers/peers.component.html b/src/app/cln/peers-channels/peers/peers.component.html index 8fe9bc6e..85c3e509 100644 --- a/src/app/cln/peers-channels/peers/peers.component.html +++ b/src/app/cln/peers-channels/peers/peers.component.html @@ -18,7 +18,7 @@
@@ -26,7 +26,7 @@ Transaction ID - + {{utxo.txid}} Address - + {{utxo.address}} Script Pubkey - + {{utxo.scriptpubkey}} Short Channel ID -
+
{{channel?.short_channel_id}}
Alias -
+
{{channel?.alias}}
Id -
+
{{channel?.id}}
Channel Id -
+
{{channel?.channel_id}}
Funding Transaction Id -
+
{{channel?.funding_txid}}
Alias -
+
{{channel?.alias}}
Id -
+
{{channel?.id}}
Channel Id -
+
{{channel?.channel_id}}
Funding Transaction Id -
+
{{channel?.funding_txid}}
State {{CLNChannelPendingState[channel?.state]}} {{CLNChannelPendingState[channel?.state]}} Local Reserve (Sats)
- + @@ -35,7 +35,7 @@ @@ -43,7 +43,7 @@ diff --git a/src/app/cln/peers-channels/peers/peers.component.scss b/src/app/cln/peers-channels/peers/peers.component.scss index 79eb80d6..259e0818 100644 --- a/src/app/cln/peers-channels/peers/peers.component.scss +++ b/src/app/cln/peers-channels/peers/peers.component.scss @@ -2,16 +2,3 @@ max-width: 1.2rem; width:1.2rem; } - -.mat-column-alias, .mat-column-id, .mat-column-netaddr { - flex: 0 0 20%; - width: 20%; - white-space: nowrap; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/peers-channels/peers/peers.component.ts b/src/app/cln/peers-channels/peers/peers.component.ts index 37fdf2cf..2e9c2413 100644 --- a/src/app/cln/peers-channels/peers/peers.component.ts +++ b/src/app/cln/peers-channels/peers/peers.component.ts @@ -37,6 +37,7 @@ export class CLNPeersComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faUsers = faUsers; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'peers', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public newlyAddedPeer = ''; @@ -82,6 +83,7 @@ export class CLNPeersComponent implements OnInit, AfterViewInit, OnDestroy { this.displayedColumns.unshift('connected'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(peers).pipe(takeUntil(this.unSubs[2])). diff --git a/src/app/cln/reports/transactions/transactions-report.component.ts b/src/app/cln/reports/transactions/transactions-report.component.ts index 2c9d986a..4e4a475c 100644 --- a/src/app/cln/reports/transactions/transactions-report.component.ts +++ b/src/app/cln/reports/transactions/transactions-report.component.ts @@ -27,6 +27,7 @@ export class CLNTransactionsReportComponent implements OnInit, OnDestroy { public secondsInADay = 24 * 60 * 60; public payments: Payment[] = []; public invoices: Invoice[] = []; + public colWidth = '20rem'; public PAGE_ID = 'reports'; public tableSetting: TableSetting = { tableId: 'transactions', recordsPerPage: PAGE_SIZE, sortBy: 'date', sortOrder: SortOrderEnum.DESCENDING }; public displayedColumns: any[] = ['date', 'amount_paid', 'num_payments', 'amount_received', 'num_invoices']; @@ -61,6 +62,7 @@ export class CLNTransactionsReportComponent implements OnInit, OnDestroy { this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection)); } this.displayedColumns.push('actions'); + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(payments).pipe(takeUntil(this.unSubs[1]), diff --git a/src/app/cln/routing/failed-transactions/failed-transactions.component.html b/src/app/cln/routing/failed-transactions/failed-transactions.component.html index 12417f27..6e3f7950 100644 --- a/src/app/cln/routing/failed-transactions/failed-transactions.component.html +++ b/src/app/cln/routing/failed-transactions/failed-transactions.component.html @@ -30,7 +30,7 @@ @@ -42,7 +42,7 @@ diff --git a/src/app/cln/routing/failed-transactions/failed-transactions.component.scss b/src/app/cln/routing/failed-transactions/failed-transactions.component.scss index 7582584c..e69de29b 100644 --- a/src/app/cln/routing/failed-transactions/failed-transactions.component.scss +++ b/src/app/cln/routing/failed-transactions/failed-transactions.component.scss @@ -1,11 +0,0 @@ -.mat-column-in_channel_alias, .mat-column-out_channel_alias { - flex: 0 0 10%; - width: 10%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/routing/failed-transactions/failed-transactions.component.ts b/src/app/cln/routing/failed-transactions/failed-transactions.component.ts index e2c8648f..ed4d65a3 100644 --- a/src/app/cln/routing/failed-transactions/failed-transactions.component.ts +++ b/src/app/cln/routing/failed-transactions/failed-transactions.component.ts @@ -33,6 +33,7 @@ export class CLNFailedTransactionsComponent implements OnInit, AfterViewInit, On @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'routing'; public tableSetting: TableSetting = { tableId: 'failed', recordsPerPage: PAGE_SIZE, sortBy: 'received_time', sortOrder: SortOrderEnum.DESCENDING }; public faExclamationTriangle = faExclamationTriangle; @@ -73,6 +74,7 @@ export class CLNFailedTransactionsComponent implements OnInit, AfterViewInit, On } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(failedForwardingHistory).pipe(takeUntil(this.unSubs[1])). @@ -84,7 +86,7 @@ export class CLNFailedTransactionsComponent implements OnInit, AfterViewInit, On } this.totalFailedTransactions = ffhSeletor.failedForwardingHistory.totalForwards || 0; this.failedEvents = ffhSeletor.failedForwardingHistory.listForwards || []; - if (this.failedEvents.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.failedEvents.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadFailedEventsTable(this.failedEvents); } this.logger.info(ffhSeletor); diff --git a/src/app/cln/routing/forwarding-history/forwarding-history.component.html b/src/app/cln/routing/forwarding-history/forwarding-history.component.html index 3c02885c..9b7398f0 100644 --- a/src/app/cln/routing/forwarding-history/forwarding-history.component.html +++ b/src/app/cln/routing/forwarding-history/forwarding-history.component.html @@ -24,7 +24,7 @@ @@ -36,7 +36,7 @@ @@ -44,7 +44,7 @@ diff --git a/src/app/cln/routing/forwarding-history/forwarding-history.component.scss b/src/app/cln/routing/forwarding-history/forwarding-history.component.scss index cbb4c67a..e69de29b 100644 --- a/src/app/cln/routing/forwarding-history/forwarding-history.component.scss +++ b/src/app/cln/routing/forwarding-history/forwarding-history.component.scss @@ -1,11 +0,0 @@ -.mat-column-in_channel_alias, .mat-column-out_channel_alias, .mat-column-payment_hash { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/routing/forwarding-history/forwarding-history.component.ts b/src/app/cln/routing/forwarding-history/forwarding-history.component.ts index 9601427a..b7623b2e 100644 --- a/src/app/cln/routing/forwarding-history/forwarding-history.component.ts +++ b/src/app/cln/routing/forwarding-history/forwarding-history.component.ts @@ -36,6 +36,7 @@ export class CLNForwardingHistoryComponent implements OnInit, OnChanges, AfterVi @Input() tableId = 'forwarding_history'; @Input() eventsData = []; @Input() filterValue = ''; + public colWidth = '20rem'; public tableSetting: TableSetting = { tableId: 'forwarding_history', recordsPerPage: PAGE_SIZE, sortBy: 'received_time', sortOrder: SortOrderEnum.DESCENDING }; public successfulEvents: ForwardingEvent[] = []; public displayedColumns: any[] = []; @@ -73,6 +74,7 @@ export class CLNForwardingHistoryComponent implements OnInit, OnChanges, AfterVi } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.pipe(take(1)).subscribe((state) => { @@ -90,7 +92,7 @@ export class CLNForwardingHistoryComponent implements OnInit, OnChanges, AfterVi if (this.eventsData.length <= 0 && fhSeletor.forwardingHistory.listForwards) { this.totalForwardedTransactions = fhSeletor.forwardingHistory.totalForwards || 0; this.successfulEvents = fhSeletor.forwardingHistory.listForwards || []; - if (this.successfulEvents.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.successfulEvents.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadForwardingEventsTable(this.successfulEvents); } this.logger.info(fhSeletor); diff --git a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html index 169ef55f..a3583835 100644 --- a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html +++ b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.html @@ -26,7 +26,7 @@ @@ -38,7 +38,7 @@ diff --git a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.scss b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.scss index 7582584c..e69de29b 100644 --- a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.scss +++ b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.scss @@ -1,11 +0,0 @@ -.mat-column-in_channel_alias, .mat-column-out_channel_alias { - flex: 0 0 10%; - width: 10%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.ts b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.ts index 9ea274c8..9417db89 100644 --- a/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.ts +++ b/src/app/cln/routing/local-failed-transactions/local-failed-transactions.component.ts @@ -34,6 +34,7 @@ export class CLNLocalFailedTransactionsComponent implements OnInit, AfterViewIni @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faExclamationTriangle = faExclamationTriangle; + public colWidth = '20rem'; public PAGE_ID = 'routing'; public tableSetting: TableSetting = { tableId: 'local_failed', recordsPerPage: PAGE_SIZE, sortBy: 'received_time', sortOrder: SortOrderEnum.DESCENDING }; public CLNFailReason = CLNFailReason; @@ -74,6 +75,7 @@ export class CLNLocalFailedTransactionsComponent implements OnInit, AfterViewIni } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(localFailedForwardingHistory).pipe(takeUntil(this.unSubs[1])). @@ -85,7 +87,7 @@ export class CLNLocalFailedTransactionsComponent implements OnInit, AfterViewIni } this.totalLocalFailedTransactions = lffhSeletor.localFailedForwardingHistory.totalForwards || 0; this.failedLocalEvents = lffhSeletor.localFailedForwardingHistory.listForwards || []; - if (this.failedLocalEvents.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.failedLocalEvents.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadLocalfailedLocalEventsTable(this.failedLocalEvents); } this.logger.info(lffhSeletor); diff --git a/src/app/cln/routing/routing-peers/routing-peers.component.html b/src/app/cln/routing/routing-peers/routing-peers.component.html index 93a58f3b..709ffafc 100644 --- a/src/app/cln/routing/routing-peers/routing-peers.component.html +++ b/src/app/cln/routing/routing-peers/routing-peers.component.html @@ -14,7 +14,7 @@ @@ -22,7 +22,7 @@ @@ -67,7 +67,7 @@ @@ -75,7 +75,7 @@ diff --git a/src/app/cln/routing/routing-peers/routing-peers.component.ts b/src/app/cln/routing/routing-peers/routing-peers.component.ts index c312e9de..bccf8c0c 100644 --- a/src/app/cln/routing/routing-peers/routing-peers.component.ts +++ b/src/app/cln/routing/routing-peers/routing-peers.component.ts @@ -33,6 +33,7 @@ export class CLNRoutingPeersComponent implements OnInit, OnChanges, AfterViewIni @ViewChild('paginatorOut', { static: false }) paginatorOut: MatPaginator | undefined; @Input() eventsData = []; @Input() filterValue = ''; + public colWidth = '20rem'; public PAGE_ID = 'routing'; public tableSetting: TableSetting = { tableId: 'routing_peers', recordsPerPage: PAGE_SIZE, sortBy: 'total_fee', sortOrder: SortOrderEnum.DESCENDING }; public successfulEvents: ForwardingEvent[] = []; @@ -74,6 +75,7 @@ export class CLNRoutingPeersComponent implements OnInit, OnChanges, AfterViewIni this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection)); } this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(forwardingHistory).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/cln/transactions/invoices/create-invoice-modal/create-invoice.component.scss b/src/app/cln/transactions/invoices/create-invoice-modal/create-invoice.component.scss index 0ad983c7..e69de29b 100644 --- a/src/app/cln/transactions/invoices/create-invoice-modal/create-invoice.component.scss +++ b/src/app/cln/transactions/invoices/create-invoice-modal/create-invoice.component.scss @@ -1,3 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html index 855e5716..56f94636 100644 --- a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html +++ b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.html @@ -31,7 +31,7 @@
@@ -27,7 +27,7 @@ Alias -
+
{{peer?.alias}}
ID -
+
{{peer?.id}}
Network Address -
+
{{addr}},
In Channel - + {{fhEvent?.in_channel_alias}} Out Channel - + {{fhEvent?.out_channel_alias}} In Channel -
+
{{fhEvent?.in_channel_alias}}
Out Channel -
+
{{fhEvent?.out_channel_alias}}
Payment Hash -
+
{{fhEvent?.payment_hash}}
In Channel - + {{fhEvent?.in_channel_alias}} Out Channel - + {{fhEvent?.out_channel_alias}} Channel ID -
+
{{rPeer.channel_id}}
Peer Alias -
+
{{rPeer.alias}}
Channel ID -
+
{{rPeer.channel_id}}
Peer Alias -
+
{{rPeer.alias}}
- + @@ -63,7 +63,7 @@ @@ -71,7 +71,7 @@ @@ -79,7 +79,7 @@ diff --git a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.scss b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.scss index f8f2da31..4ccf74d1 100644 --- a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.scss +++ b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.scss @@ -2,15 +2,3 @@ max-width: 1.2rem; width:1.2rem; } - -.mat-column-description, .mat-column-label, .mat-column-payment_hash, .mat-column-bolt11 { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.ts b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.ts index ff0ca4fc..1da6c1f3 100644 --- a/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.ts +++ b/src/app/cln/transactions/invoices/invoices-table/lightning-invoices-table.component.ts @@ -40,6 +40,7 @@ export class CLNLightningInvoicesTableComponent implements OnInit, AfterViewInit @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; faHistory = faHistory; + public colWidth = '20rem'; public PAGE_ID = 'transactions'; public tableSetting: TableSetting = { tableId: 'invoices', recordsPerPage: PAGE_SIZE, sortBy: 'expires_at', sortOrder: SortOrderEnum.DESCENDING }; public selNode: SelNodeChild | null = {}; @@ -93,6 +94,7 @@ export class CLNLightningInvoicesTableComponent implements OnInit, AfterViewInit this.displayedColumns.unshift('status'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(listInvoices).pipe(takeUntil(this.unSubs[3])). @@ -103,7 +105,7 @@ export class CLNLightningInvoicesTableComponent implements OnInit, AfterViewInit this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.invoiceJSONArr = invoicesSeletor.listInvoices.invoices || []; - if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadInvoicesTable(this.invoiceJSONArr); } this.logger.info(invoicesSeletor); @@ -120,7 +122,7 @@ export class CLNLightningInvoicesTableComponent implements OnInit, AfterViewInit } ngAfterViewInit() { - if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadInvoicesTable(this.invoiceJSONArr); } } diff --git a/src/app/cln/transactions/offers/create-offer-modal/create-offer.component.scss b/src/app/cln/transactions/offers/create-offer-modal/create-offer.component.scss index 0ad983c7..e69de29b 100644 --- a/src/app/cln/transactions/offers/create-offer-modal/create-offer.component.scss +++ b/src/app/cln/transactions/offers/create-offer-modal/create-offer.component.scss @@ -1,3 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html index c3bcf457..08c8c951 100644 --- a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html +++ b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.html @@ -20,7 +20,7 @@ @@ -32,7 +32,7 @@ @@ -44,7 +44,7 @@ diff --git a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.scss b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.scss index c326d020..e69de29b 100644 --- a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.scss +++ b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.scss @@ -1,11 +0,0 @@ -.mat-column-title, .mat-column-description, .mat-column-bolt12 { - flex: 0 0 20%; - width: 20%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts index 1f5fe27d..797547ad 100644 --- a/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts +++ b/src/app/cln/transactions/offers/offer-bookmarks-table/offer-bookmarks-table.component.ts @@ -35,6 +35,7 @@ export class CLNOfferBookmarksTableComponent implements OnInit, AfterViewInit, O @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; faHistory = faHistory; + public colWidth = '20rem'; public PAGE_ID = 'transactions'; public tableSetting: TableSetting = { tableId: 'offer_bookmarks', recordsPerPage: PAGE_SIZE, sortBy: 'lastUpdatedAt', sortOrder: SortOrderEnum.DESCENDING }; public displayedColumns: any[] = []; @@ -70,6 +71,7 @@ export class CLNOfferBookmarksTableComponent implements OnInit, AfterViewInit, O } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(offerBookmarks).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/cln/transactions/offers/offers-table/offers-table.component.html b/src/app/cln/transactions/offers/offers-table/offers-table.component.html index 53015fde..ffdd08bd 100644 --- a/src/app/cln/transactions/offers/offers-table/offers-table.component.html +++ b/src/app/cln/transactions/offers/offers-table/offers-table.component.html @@ -16,7 +16,7 @@
@@ -55,7 +55,7 @@ Description -
+
{{invoice?.description}}
Label -
+
{{invoice?.label}}
Payment Hash -
+
{{invoice?.payment_hash}}
Invoice -
+
{{invoice?.bolt11}}
Title -
+
{{offersbookmark.title}}
Description -
+
{{offersbookmark.description}}
Invoice -
+
{{offersbookmark.bolt12}}
- +
@@ -25,7 +25,7 @@ Offer ID -
+
{{offer.offer_id}} @@ -45,7 +45,7 @@
Invoice -
+
{{offer.bolt12}} diff --git a/src/app/cln/transactions/offers/offers-table/offers-table.component.scss b/src/app/cln/transactions/offers/offers-table/offers-table.component.scss index 4a21e2cf..5d86c71f 100644 --- a/src/app/cln/transactions/offers/offers-table/offers-table.component.scss +++ b/src/app/cln/transactions/offers/offers-table/offers-table.component.scss @@ -2,15 +2,3 @@ max-width: 1.2rem; width:1.2rem; } - -.mat-column-offer_id, .mat-column-bolt12 { - flex: 0 0 35%; - width: 35%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/cln/transactions/offers/offers-table/offers-table.component.ts b/src/app/cln/transactions/offers/offers-table/offers-table.component.ts index 8e371d91..590b6f43 100644 --- a/src/app/cln/transactions/offers/offers-table/offers-table.component.ts +++ b/src/app/cln/transactions/offers/offers-table/offers-table.component.ts @@ -42,6 +42,7 @@ export class CLNOffersTableComponent implements OnInit, AfterViewInit, OnDestroy @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; faHistory = faHistory; + public colWidth = '20rem'; public PAGE_ID = 'transactions'; public tableSetting: TableSetting = { tableId: 'offers', recordsPerPage: PAGE_SIZE, sortBy: 'offer_id', sortOrder: SortOrderEnum.DESCENDING }; public selNode: SelNodeChild | null = {}; @@ -95,6 +96,7 @@ export class CLNOffersTableComponent implements OnInit, AfterViewInit, OnDestroy this.displayedColumns.unshift('active'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(offers).pipe(takeUntil(this.unSubs[3])). diff --git a/src/app/cln/transactions/payments/lightning-payments.component.html b/src/app/cln/transactions/payments/lightning-payments.component.html index fe723ae2..0f3b6034 100644 --- a/src/app/cln/transactions/payments/lightning-payments.component.html +++ b/src/app/cln/transactions/payments/lightning-payments.component.html @@ -28,7 +28,7 @@ - + @@ -55,7 +55,7 @@ @@ -63,7 +63,7 @@ @@ -71,7 +71,7 @@ @@ -79,7 +79,7 @@ @@ -148,7 +148,7 @@
@@ -47,7 +47,7 @@ Payment Hash - + {{payment?.payment_hash}} Invoice - + {{payment?.bolt11}} Label - + {{payment?.label}} Destination - + {{payment?.destination}} Memo - + {{payment?.memo}} - + {{payment?.payment_hash}} @@ -160,11 +160,11 @@ - + {{payment?.bolt11}} - + @@ -172,11 +172,11 @@ - + {{payment?.label}} - + @@ -184,11 +184,11 @@ - + {{payment?.destination}} - + @@ -196,11 +196,11 @@ - + {{payment?.memo}} - + diff --git a/src/app/cln/transactions/payments/lightning-payments.component.scss b/src/app/cln/transactions/payments/lightning-payments.component.scss index c6b13fdb..50298673 100644 --- a/src/app/cln/transactions/payments/lightning-payments.component.scss +++ b/src/app/cln/transactions/payments/lightning-payments.component.scss @@ -3,18 +3,6 @@ width:1.2rem; } -.mat-column-payment_hash, .mat-column-bolt11, .mat-column-destination, .mat-column-label, .mat-column-memo { - flex: 0 0 10%; - width: 10%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} - .mat-column-group_actions { min-height: 4.8rem; diff --git a/src/app/cln/transactions/payments/lightning-payments.component.ts b/src/app/cln/transactions/payments/lightning-payments.component.ts index e0ad7f03..b6c5a4bc 100644 --- a/src/app/cln/transactions/payments/lightning-payments.component.ts +++ b/src/app/cln/transactions/payments/lightning-payments.component.ts @@ -40,6 +40,7 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD @ViewChild('sendPaymentForm', { static: false }) form; @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'transactions'; public tableSetting: TableSetting = { tableId: 'payments', recordsPerPage: PAGE_SIZE, sortBy: 'created_at', sortOrder: SortOrderEnum.DESCENDING }; public faHistory = faHistory; @@ -92,6 +93,7 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD this.mppColumns = []; this.displayedColumns.map((col) => this.mppColumns.push('group_' + col)); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); this.logger.info(this.mppColumns); }); @@ -103,7 +105,7 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.paymentJSONArr = paymentsSeletor.payments || []; - if (this.paymentJSONArr.length && this.paymentJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.paymentJSONArr.length && this.paymentJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadPaymentsTable(this.paymentJSONArr); } this.logger.info(paymentsSeletor); @@ -111,7 +113,7 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD } ngAfterViewInit() { - if (this.paymentJSONArr.length && this.paymentJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.paymentJSONArr.length && this.paymentJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadPaymentsTable(this.paymentJSONArr); } } diff --git a/src/app/cln/transactions/send-payment-modal/send-payment.component.scss b/src/app/cln/transactions/send-payment-modal/send-payment.component.scss index f18d5d79..e69de29b 100644 --- a/src/app/cln/transactions/send-payment-modal/send-payment.component.scss +++ b/src/app/cln/transactions/send-payment-modal/send-payment.component.scss @@ -1,10 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} - -.mat-column-payment_hash { - flex: 1 1 20%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} \ No newline at end of file diff --git a/src/app/eclair/graph/query-routes/query-routes.component.html b/src/app/eclair/graph/query-routes/query-routes.component.html index d8e6d6ab..4baf3572 100644 --- a/src/app/eclair/graph/query-routes/query-routes.component.html +++ b/src/app/eclair/graph/query-routes/query-routes.component.html @@ -39,12 +39,16 @@ - + diff --git a/src/app/eclair/graph/query-routes/query-routes.component.scss b/src/app/eclair/graph/query-routes/query-routes.component.scss index 18b999e4..e69de29b 100644 --- a/src/app/eclair/graph/query-routes/query-routes.component.scss +++ b/src/app/eclair/graph/query-routes/query-routes.component.scss @@ -1,11 +0,0 @@ -.mat-column-nodeId { - flex: 0 0 50%; - width: 50%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html index 959f07bd..eef89759 100644 --- a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html +++ b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.html @@ -36,7 +36,7 @@ @@ -44,7 +44,7 @@ @@ -52,7 +52,7 @@ diff --git a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.scss b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.scss index 45941047..e69de29b 100644 --- a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.scss +++ b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.scss @@ -1,11 +0,0 @@ -.mat-column-blockHash, .mat-column-txid, .mat-column-address { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts index 9101759d..c879bd6d 100644 --- a/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts +++ b/src/app/eclair/on-chain/on-chain-transaction-history/on-chain-transaction-history.component.ts @@ -32,7 +32,8 @@ export class ECLOnChainTransactionHistoryComponent implements OnInit, OnDestroy @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; - faHistory = faHistory; + public faHistory = faHistory; + public colWidth = '20rem'; public PAGE_ID = 'on_chain'; public tableSetting: TableSetting = { tableId: 'transaction', recordsPerPage: PAGE_SIZE, sortBy: 'timestamp', sortOrder: SortOrderEnum.DESCENDING }; public displayedColumns: any[] = []; @@ -68,6 +69,7 @@ export class ECLOnChainTransactionHistoryComponent implements OnInit, OnDestroy } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(transactions).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html index bdf7aa77..7711f936 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.html @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ @@ -42,7 +42,7 @@ diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.scss b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.scss index 74493a2c..13cfbdfe 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.scss +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.scss @@ -1,35 +1,10 @@ -@import "../../../../../shared/theme/styles/mixins.scss"; - .mat-column-announceChannel { max-width: 1.2rem; width:1.2rem; } -.mat-column-alias, .mat-column-channelId, .mat-column-nodeId { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - .mat-column-balancedness { padding-left: 3rem; - flex: 0 0 20%; - width: 20%; -} - -.mat-column-shortChannelId, .mat-column-toLocal, .mat-column-toRemote { - flex: 1 1 15%; - width: 15%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - @include for_screensize(phone) { - white-space: unset; - } -} - -.mat-column-actions { - min-height: 4.8rem; + min-width: 15rem; + max-width: 30rem; } diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts index 2a509e18..97ebfbde 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-inactive-table/channel-inactive-table.component.ts @@ -35,6 +35,7 @@ export class ECLChannelInactiveTableComponent implements OnInit, AfterViewInit, @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faEye = faEye; public faEyeSlash = faEyeSlash; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'inactive_channels', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public inactiveChannels: Channel[]; @@ -76,6 +77,7 @@ export class ECLChannelInactiveTableComponent implements OnInit, AfterViewInit, this.displayedColumns.unshift('announceChannel'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(allChannelsInfo).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html index bd13df58..05b87901 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html @@ -22,7 +22,7 @@ @@ -30,7 +30,7 @@ @@ -38,7 +38,7 @@ diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss index efa0a85e..bc1f695b 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss @@ -1,40 +1,10 @@ -@import "../../../../../shared/theme/styles/mixins.scss"; - .mat-column-announceChannel { max-width: 1.2rem; width:1.2rem; } -.mat-column-alias, .mat-column-channelId, .mat-column-nodeId { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-state, .mat-column-feeBaseMsat, .mat-column-feeProportionalMillionths, .mat-column-toLocal, .mat-column-toRemote { - flex: 1 1 10%; - width: 10%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - @include for_screensize(tab-port) { - white-space: unset; - flex: 1 1 20%; - width: 20%; - } - @include for_screensize(phone) { - white-space: unset; - } -} - .mat-column-balancedness { padding-left: 2rem; - flex: 0 0 17%; - width: 17%; -} - -.mat-column-actions { - min-height: 4.8rem; + min-width: 15rem; + max-width: 30rem; } diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts index 3ea63612..fc87aa26 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts @@ -36,6 +36,7 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faEye = faEye; public faEyeSlash = faEyeSlash; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'open_channels', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public activeChannels: Channel[]; @@ -78,6 +79,7 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe this.displayedColumns.unshift('announceChannel'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(allChannelsInfo).pipe(takeUntil(this.unSubs[1])). @@ -88,7 +90,7 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.activeChannels = allChannelsSelector.activeChannels; - if (this.activeChannels.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.activeChannels.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadChannelsTable(); } this.logger.info(allChannelsSelector); @@ -108,7 +110,7 @@ export class ECLChannelOpenTableComponent implements OnInit, AfterViewInit, OnDe } ngAfterViewInit() { - if (this.activeChannels.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.activeChannels.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadChannelsTable(); } } diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html index d5fdc514..4f4aca7f 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html @@ -22,7 +22,7 @@ @@ -34,7 +34,7 @@ diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss index bbe4e2a2..4f321d27 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss @@ -2,15 +2,3 @@ max-width: 1.2rem; width:1.2rem; } - -.mat-column-alias, .mat-column-channelId, .mat-column-nodeId { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts index 2dd29bae..4597689a 100644 --- a/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts +++ b/src/app/eclair/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.ts @@ -35,6 +35,7 @@ export class ECLChannelPendingTableComponent implements OnInit, AfterViewInit, O @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faEye = faEye; public faEyeSlash = faEyeSlash; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'pending_channels', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public pendingChannels: Channel[]; @@ -76,6 +77,7 @@ export class ECLChannelPendingTableComponent implements OnInit, AfterViewInit, O this.displayedColumns.unshift('announceChannel'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(allChannelsInfo).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/eclair/peers-channels/peers/peers.component.html b/src/app/eclair/peers-channels/peers/peers.component.html index def67dbe..6c0e86e4 100644 --- a/src/app/eclair/peers-channels/peers/peers.component.html +++ b/src/app/eclair/peers-channels/peers/peers.component.html @@ -18,7 +18,7 @@
Alias {{hop?.alias}} + + {{hop?.alias}} + + ID - + {{hop?.nodeId}} Address -
+
{{transaction?.address}}
Blockhash -
+
{{transaction?.blockHash}}
Transaction Id -
+
{{transaction?.txid}}
Channel Id -
+
{{channel?.channelId}}
Alias -
+
{{channel.alias}}
Node Id -
+
{{channel?.nodeId}}
Channel Id -
+
{{channel?.channelId}}
Alias -
+
{{channel?.alias}}
Node Id -
+
{{channel?.nodeId}}
Channel Id -
+
{{channel?.channelId}}
Node Id -
+
{{channel?.nodeId}}
- + @@ -35,7 +35,7 @@ diff --git a/src/app/eclair/peers-channels/peers/peers.component.scss b/src/app/eclair/peers-channels/peers/peers.component.scss index ad2e8aa0..6e0dcbe8 100644 --- a/src/app/eclair/peers-channels/peers/peers.component.scss +++ b/src/app/eclair/peers-channels/peers/peers.component.scss @@ -2,15 +2,3 @@ max-width: 1.2rem; width:1.2rem; } - -.mat-column-alias, .mat-column-nodeId, .mat-column-address { - flex: 0 0 20%; - width: 20%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/eclair/peers-channels/peers/peers.component.ts b/src/app/eclair/peers-channels/peers/peers.component.ts index 6e648411..d653bcf3 100644 --- a/src/app/eclair/peers-channels/peers/peers.component.ts +++ b/src/app/eclair/peers-channels/peers/peers.component.ts @@ -36,6 +36,7 @@ export class ECLPeersComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'peers', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public faUsers = faUsers; @@ -81,6 +82,7 @@ export class ECLPeersComponent implements OnInit, AfterViewInit, OnDestroy { this.displayedColumns.unshift('state'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); diff --git a/src/app/eclair/reports/transactions/transactions-report.component.ts b/src/app/eclair/reports/transactions/transactions-report.component.ts index 379eda71..7cefa2d4 100644 --- a/src/app/eclair/reports/transactions/transactions-report.component.ts +++ b/src/app/eclair/reports/transactions/transactions-report.component.ts @@ -27,6 +27,7 @@ export class ECLTransactionsReportComponent implements OnInit, OnDestroy { public secondsInADay = 24 * 60 * 60; public payments: PaymentSent[] = []; public invoices: Invoice[] = []; + public colWidth = '20rem'; public PAGE_ID = 'reports'; public tableSetting: TableSetting = { tableId: 'transactions', recordsPerPage: PAGE_SIZE, sortBy: 'date', sortOrder: SortOrderEnum.DESCENDING }; public displayedColumns: any[] = ['date', 'amount_paid', 'num_payments', 'amount_received', 'num_invoices']; @@ -61,6 +62,7 @@ export class ECLTransactionsReportComponent implements OnInit, OnDestroy { this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection)); } this.displayedColumns.push('actions'); + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.html b/src/app/eclair/routing/forwarding-history/forwarding-history.component.html index 1ae398fd..39412917 100644 --- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.html +++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.html @@ -10,7 +10,7 @@
@@ -27,7 +27,7 @@ Alias -
+
{{peer?.alias}}
ID -
+
{{peer?.nodeId}}
- + @@ -24,7 +24,7 @@ @@ -36,7 +36,7 @@ @@ -44,7 +44,7 @@ @@ -56,7 +56,7 @@ @@ -76,7 +76,7 @@ diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss b/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss index a6c93495..0a4b3933 100644 --- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss +++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.scss @@ -6,16 +6,3 @@ width:1.6rem; } } - -.mat-column-fromChannelId, .mat-column-fromChannelAlias, .mat-column-toChannelId, .mat-column-toChannelAlias, .mat-column-paymentHash { - padding-left: 1rem; - flex: 0 0 25%; - width: 25%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts b/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts index 42ce1fce..a5736a95 100644 --- a/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts +++ b/src/app/eclair/routing/forwarding-history/forwarding-history.component.ts @@ -34,6 +34,7 @@ export class ECLForwardingHistoryComponent implements OnInit, OnChanges, AfterVi @Input() tableId = 'forwarding_history'; @Input() eventsData: PaymentRelayed[] = []; @Input() filterValue = ''; + public colWidth = '20rem'; public tableSetting: TableSetting = { tableId: 'forwarding_history', recordsPerPage: PAGE_SIZE, sortBy: 'timestamp', sortOrder: SortOrderEnum.DESCENDING }; public displayedColumns: any[] = []; public forwardingHistoryEvents: any = new MatTableDataSource([]); @@ -68,6 +69,7 @@ export class ECLForwardingHistoryComponent implements OnInit, OnChanges, AfterVi this.displayedColumns.unshift('type'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(payments).pipe(takeUntil(this.unSubs[1])). @@ -79,7 +81,7 @@ export class ECLForwardingHistoryComponent implements OnInit, OnChanges, AfterVi this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.eventsData = paymentsSelector.payments && paymentsSelector.payments.relayed ? paymentsSelector.payments.relayed : []; - if (this.eventsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.eventsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadForwardingEventsTable(this.eventsData); } this.logger.info(this.eventsData); diff --git a/src/app/eclair/routing/routing-peers/routing-peers.component.html b/src/app/eclair/routing/routing-peers/routing-peers.component.html index e7fb087a..fbdfc15c 100644 --- a/src/app/eclair/routing/routing-peers/routing-peers.component.html +++ b/src/app/eclair/routing/routing-peers/routing-peers.component.html @@ -14,7 +14,7 @@ @@ -22,7 +22,7 @@ @@ -67,7 +67,7 @@ @@ -75,7 +75,7 @@ diff --git a/src/app/eclair/routing/routing-peers/routing-peers.component.ts b/src/app/eclair/routing/routing-peers/routing-peers.component.ts index 9b3c1710..68d223fe 100644 --- a/src/app/eclair/routing/routing-peers/routing-peers.component.ts +++ b/src/app/eclair/routing/routing-peers/routing-peers.component.ts @@ -30,6 +30,7 @@ export class ECLRoutingPeersComponent implements OnInit, AfterViewInit, OnDestro @ViewChild('tableOut', { read: MatSort, static: false }) sortOut: MatSort; @ViewChild('paginatorIn', { static: false }) paginatorIn: MatPaginator | undefined; @ViewChild('paginatorOut', { static: false }) paginatorOut: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'routing'; public tableSetting: TableSetting = { tableId: 'routing_peers', recordsPerPage: PAGE_SIZE, sortBy: 'totalFee', sortOrder: SortOrderEnum.DESCENDING }; public routingPeersData: PaymentRelayed[] = []; @@ -66,6 +67,7 @@ export class ECLRoutingPeersComponent implements OnInit, AfterViewInit, OnDestro this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection)); } this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(payments).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/eclair/transactions/create-invoice-modal/create-invoice.component.scss b/src/app/eclair/transactions/create-invoice-modal/create-invoice.component.scss index 0ad983c7..e69de29b 100644 --- a/src/app/eclair/transactions/create-invoice-modal/create-invoice.component.scss +++ b/src/app/eclair/transactions/create-invoice-modal/create-invoice.component.scss @@ -1,3 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/eclair/transactions/invoices/lightning-invoices.component.html b/src/app/eclair/transactions/invoices/lightning-invoices.component.html index c21d12fb..0a7718f6 100644 --- a/src/app/eclair/transactions/invoices/lightning-invoices.component.html +++ b/src/app/eclair/transactions/invoices/lightning-invoices.component.html @@ -31,7 +31,7 @@
In Channel Id -
+
{{fhEvent?.fromChannelId}}
In Channel -
+
{{fhEvent?.fromChannelAlias}}
Out Channel Id -
+
{{fhEvent?.toChannelId}}
Out Channel -
+
{{fhEvent?.toChannelAlias}}
Payment Hash -
+
{{fhEvent?.paymentHash}}
Channel ID -
+
{{rPeer?.channelId}}
Peer Alias -
+
{{rPeer?.alias}}
Channel ID -
+
{{rPeer?.channelId}}
Peer Alias -
+
{{rPeer?.alias}}
- + @@ -61,7 +61,7 @@ @@ -69,7 +69,7 @@ diff --git a/src/app/eclair/transactions/invoices/lightning-invoices.component.scss b/src/app/eclair/transactions/invoices/lightning-invoices.component.scss index 769dcacb..4ccf74d1 100644 --- a/src/app/eclair/transactions/invoices/lightning-invoices.component.scss +++ b/src/app/eclair/transactions/invoices/lightning-invoices.component.scss @@ -2,15 +2,3 @@ max-width: 1.2rem; width:1.2rem; } - -.mat-column-nodeId, .mat-column-paymentHash, .mat-column-description { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/eclair/transactions/invoices/lightning-invoices.component.ts b/src/app/eclair/transactions/invoices/lightning-invoices.component.ts index 1d94458d..ab6f7abc 100644 --- a/src/app/eclair/transactions/invoices/lightning-invoices.component.ts +++ b/src/app/eclair/transactions/invoices/lightning-invoices.component.ts @@ -39,6 +39,7 @@ export class ECLLightningInvoicesComponent implements OnInit, AfterViewInit, OnD @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; faHistory = faHistory; + public colWidth = '20rem'; public PAGE_ID = 'transactions'; public tableSetting: TableSetting = { tableId: 'invoices', recordsPerPage: PAGE_SIZE, sortBy: 'expiresAt', sortOrder: SortOrderEnum.DESCENDING }; public selNode: SelNodeChild | null = {}; @@ -92,6 +93,7 @@ export class ECLLightningInvoicesComponent implements OnInit, AfterViewInit, OnD this.displayedColumns.unshift('status'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(invoices).pipe(takeUntil(this.unSubs[3])). @@ -102,7 +104,7 @@ export class ECLLightningInvoicesComponent implements OnInit, AfterViewInit, OnD this.errorMessage = !this.apiCallStatus.message ? '' : (typeof (this.apiCallStatus.message) === 'object') ? JSON.stringify(this.apiCallStatus.message) : this.apiCallStatus.message; } this.invoiceJSONArr = (invoicesSelector.invoices && invoicesSelector.invoices.length > 0) ? invoicesSelector.invoices : []; - if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadInvoicesTable(this.invoiceJSONArr); } this.logger.info(invoicesSelector); @@ -119,7 +121,7 @@ export class ECLLightningInvoicesComponent implements OnInit, AfterViewInit, OnD } ngAfterViewInit() { - if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.invoiceJSONArr && this.invoiceJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadInvoicesTable(this.invoiceJSONArr); } } diff --git a/src/app/eclair/transactions/payments/lightning-payments.component.scss b/src/app/eclair/transactions/payments/lightning-payments.component.scss index 26e19a93..db7c786d 100644 --- a/src/app/eclair/transactions/payments/lightning-payments.component.scss +++ b/src/app/eclair/transactions/payments/lightning-payments.component.scss @@ -1,20 +1,3 @@ -.mat-column-id, .mat-column-recipientNodeAlias, -.mat-column-recipientNodeId, .mat-column-description, -.mat-column-paymentHash, .mat-column-paymentPreimage, -.mat-column-group_id, .mat-column-group_recipientNodeId, -.mat-column-group_recipientNodeAlias, .mat-column-group_recipientAmount, -.mat-column-group_description, .mat-column-group_paymentHash, .mat-column-group_paymentPreimage { - flex: 0 0 20%; - width: 20%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} - .mat-column-group_actions { min-height: 4.8rem; @@ -40,9 +23,6 @@ min-height: 4.2rem; place-content: center flex-start; align-items: center; - &.ellipsis-parent { - display: flex; - } } .mat-column-group_firstPartTimestamp { diff --git a/src/app/eclair/transactions/send-payment-modal/send-payment.component.scss b/src/app/eclair/transactions/send-payment-modal/send-payment.component.scss index f18d5d79..e69de29b 100644 --- a/src/app/eclair/transactions/send-payment-modal/send-payment.component.scss +++ b/src/app/eclair/transactions/send-payment-modal/send-payment.component.scss @@ -1,10 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} - -.mat-column-payment_hash { - flex: 1 1 20%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} \ No newline at end of file diff --git a/src/app/lnd/backup/channel-backup-table/channel-backup-table.component.html b/src/app/lnd/backup/channel-backup-table/channel-backup-table.component.html index 50e5f393..dd5bdceb 100644 --- a/src/app/lnd/backup/channel-backup-table/channel-backup-table.component.html +++ b/src/app/lnd/backup/channel-backup-table/channel-backup-table.component.html @@ -29,7 +29,7 @@ diff --git a/src/app/lnd/backup/channel-restore-table/channel-restore-table.component.html b/src/app/lnd/backup/channel-restore-table/channel-restore-table.component.html index 2f6d9fc4..c7323ca4 100644 --- a/src/app/lnd/backup/channel-restore-table/channel-restore-table.component.html +++ b/src/app/lnd/backup/channel-restore-table/channel-restore-table.component.html @@ -24,7 +24,7 @@ diff --git a/src/app/lnd/graph/query-routes/query-routes.component.html b/src/app/lnd/graph/query-routes/query-routes.component.html index 7511fbb7..11e4f040 100644 --- a/src/app/lnd/graph/query-routes/query-routes.component.html +++ b/src/app/lnd/graph/query-routes/query-routes.component.html @@ -33,7 +33,7 @@ @@ -41,7 +41,7 @@ @@ -49,7 +49,7 @@ diff --git a/src/app/lnd/graph/query-routes/query-routes.component.scss b/src/app/lnd/graph/query-routes/query-routes.component.scss index e6072534..e69de29b 100644 --- a/src/app/lnd/graph/query-routes/query-routes.component.scss +++ b/src/app/lnd/graph/query-routes/query-routes.component.scss @@ -1,10 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} - -.mat-column-pubkey_alias, .mat-column-pub_key, .mat-column-chan_id { - flex: 1 1 20%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} diff --git a/src/app/lnd/graph/query-routes/query-routes.component.ts b/src/app/lnd/graph/query-routes/query-routes.component.ts index 960074ca..a6fd152e 100644 --- a/src/app/lnd/graph/query-routes/query-routes.component.ts +++ b/src/app/lnd/graph/query-routes/query-routes.component.ts @@ -27,6 +27,7 @@ import { LoggerService } from '../../../shared/services/logger.service'; export class QueryRoutesComponent implements OnInit, OnDestroy { @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; + public colWidth = '20rem'; public PAGE_ID = 'graph_lookup'; public tableSetting: TableSetting = { tableId: 'query_routes', recordsPerPage: PAGE_SIZE, sortBy: 'hop_sequence', sortOrder: SortOrderEnum.ASCENDING }; public destinationPubkey = ''; @@ -54,6 +55,7 @@ export class QueryRoutesComponent implements OnInit, OnDestroy { this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection)); } this.displayedColumns.push('actions'); + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.lndEffects.setQueryRoutes.pipe(takeUntil(this.unSubs[1])).subscribe((queryRoute) => { diff --git a/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html index 699974a1..8f6a373e 100644 --- a/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html +++ b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.html @@ -15,7 +15,7 @@ @@ -23,7 +23,7 @@ @@ -31,7 +31,7 @@ diff --git a/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.scss b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.scss index 67c9524a..e69de29b 100644 --- a/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.scss +++ b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.scss @@ -1,10 +0,0 @@ -.mat-column-label, .mat-column-block_hash, .mat-column-tx_hash { - 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/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.ts b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.ts index 5c9d96aa..15f56866 100644 --- a/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.ts +++ b/src/app/lnd/on-chain/utxo-tables/on-chain-transaction-history/on-chain-transaction-history.component.ts @@ -31,6 +31,7 @@ export class OnChainTransactionHistoryComponent implements OnInit, OnChanges, On @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'on_chain'; public tableSetting: TableSetting = { tableId: 'transactions', recordsPerPage: PAGE_SIZE, sortBy: 'time_stamp', sortOrder: SortOrderEnum.DESCENDING }; public transactions: Transaction[]; @@ -67,6 +68,7 @@ export class OnChainTransactionHistoryComponent implements OnInit, OnChanges, On } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(transactions).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html index 5c455705..a485072a 100644 --- a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html +++ b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.html @@ -20,7 +20,7 @@ @@ -34,7 +34,7 @@ @@ -50,7 +50,7 @@ diff --git a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.scss b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.scss index 8bfbe048..0999a85f 100644 --- a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.scss +++ b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.scss @@ -2,15 +2,3 @@ max-width: 1.2rem; width:1.2rem; } - -.mat-column-label, .mat-column-tx_id, .mat-column-address { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.ts b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.ts index a021ff9f..a25a6a65 100644 --- a/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.ts +++ b/src/app/lnd/on-chain/utxo-tables/utxos/utxos.component.ts @@ -38,6 +38,7 @@ export class OnChainUTXOsComponent implements OnInit, OnChanges, OnDestroy { @Input() isDustUTXO = false; public faMoneyBillWave = faMoneyBillWave; public DUST_AMOUNT = 1000; + public colWidth = '20rem'; public PAGE_ID = 'on_chain'; public tableSetting: TableSetting = { tableId: 'utxos', recordsPerPage: PAGE_SIZE, sortBy: 'tx_id', sortOrder: SortOrderEnum.DESCENDING }; public utxos: UTXO[]; @@ -78,6 +79,7 @@ export class OnChainUTXOsComponent implements OnInit, OnChanges, OnDestroy { } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(utxos).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss index 09e475db..1358bc55 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.scss @@ -23,8 +23,6 @@ } .mat-column-actions { - min-height: 4.8rem; - & .btn-htlc-expand { min-width: 10rem; width: 10rem; diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.ts b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.ts index 0a9ecd5f..1218a95a 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.ts +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-active-htlcs-table/channel-active-htlcs-table.component.ts @@ -30,6 +30,7 @@ export class ChannelActiveHTLCsTableComponent implements OnInit, AfterViewInit, @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'active_HTLCs', recordsPerPage: PAGE_SIZE, sortBy: 'expiration_height', sortOrder: SortOrderEnum.DESCENDING }; public channels: any = new MatTableDataSource([]); @@ -66,6 +67,7 @@ export class ChannelActiveHTLCsTableComponent implements OnInit, AfterViewInit, } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(channels).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html index 67f2203d..e35e535b 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.html @@ -20,7 +20,7 @@ @@ -28,7 +28,7 @@ @@ -36,7 +36,7 @@ @@ -44,7 +44,7 @@ @@ -52,7 +52,7 @@ @@ -60,7 +60,7 @@ diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.ts b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.ts index c39fa19d..37fab7a2 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.ts +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-closed-table/channel-closed-table.component.ts @@ -30,6 +30,7 @@ export class ChannelClosedTableComponent implements OnInit, AfterViewInit, OnDes @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'closed', recordsPerPage: PAGE_SIZE, sortBy: 'close_type', sortOrder: SortOrderEnum.DESCENDING }; public channelClosureType = CHANNEL_CLOSURE_TYPE; @@ -67,6 +68,7 @@ export class ChannelClosedTableComponent implements OnInit, AfterViewInit, OnDes } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(closedChannels).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html index d225b315..4de9b547 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.html @@ -9,14 +9,14 @@
@@ -53,7 +53,7 @@ Node Id -
+
{{invoice?.nodeId}}
Description -
+
{{invoice?.description}}
Payment Hash -
+
{{invoice?.paymentHash}}
Channel Point -
+
{{channel?.channel_point}}
Channel Point -
+
{{channel?.channel_point}}
Peer -
+
{{hop?.pubkey_alias}}
Peer Pubkey -
+
{{hop?.pub_key}}
Channel -
+
{{hop?.chan_id}}
Label -
+
{{transaction?.label}}
Block Hash -
+
{{transaction?.block_hash}}
Transaction Hash -
+
{{transaction?.tx_hash}}
Transaction ID - + {{utxo.outpoint.txid_str}} Label - + {{utxo.label}} Address - + {{utxo?.address}} Peer -
+
{{channel?.remote_alias}}
Pubkey -
+
{{channel?.remote_pubkey}}
Channel Point -
+
{{channel?.channel_point}}
Channel Id -
+
{{channel?.chan_id}}
Closing Tx Hash -
+
{{channel?.closing_tx_hash}}
Chain Hash -
+
{{channel?.chain_hash}}
- + - + @@ -33,7 +33,7 @@ @@ -41,7 +41,7 @@ @@ -49,7 +49,7 @@ diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss index cb0650b2..99b7bfb8 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.scss @@ -1,5 +1,3 @@ -@import "../../../../../shared/theme/styles/mixins.scss"; - .mat-column-active { max-width: 1.2rem; width:1.2rem; @@ -10,47 +8,8 @@ width:1.6rem; } -.mat-column-remote_alias, .mat-column-remote_pubkey, .mat-column-channel_point, .mat-column-chan_id { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - .mat-column-balancedness { - flex: 0 0 20%; - width: 20%; - @include for_screensize(tab-land) { - flex: 0 0 35%; - width: 35%; - } - @include for_screensize(tab-port) { - flex: 0 0 25%; - width: 25%; - } -} - -.mat-column-uptime, .mat-column-lifetime, .mat-column-local_balance, .mat-column-remote_balance, .mat-column-total_satoshis_sent, .mat-column-total_satoshis_received { - flex: 1 1 10%; - width: 10%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - @include for_screensize(tab-land) { - white-space: unset; - flex: 1 1 25%; - width: 25%; - } - @include for_screensize(tab-port) { - flex: 0 0 15%; - width: 15%; - } - @include for_screensize(phone) { - white-space: unset; - } -} - -.mat-column-actions { - min-height: 4.8rem; + padding-left: 2rem; + min-width: 15rem; + max-width: 30rem; } diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts index 8d64e83f..5884feb4 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-open-table/channel-open-table.component.ts @@ -41,6 +41,7 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'open', recordsPerPage: PAGE_SIZE, sortBy: 'balancedness', sortOrder: SortOrderEnum.DESCENDING }; public timeUnit = 'mins:secs'; @@ -101,6 +102,7 @@ export class ChannelOpenTableComponent implements OnInit, AfterViewInit, OnDestr this.displayedColumns.unshift('active'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(peers).pipe(takeUntil(this.unSubs[3])). diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html index 77b9fe32..2c6066ce 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.html @@ -12,7 +12,7 @@ @@ -20,7 +20,7 @@ @@ -28,7 +28,7 @@ @@ -106,7 +106,7 @@ @@ -114,7 +114,7 @@ @@ -122,7 +122,7 @@ @@ -130,7 +130,7 @@ @@ -202,7 +202,7 @@ @@ -210,7 +210,7 @@ @@ -218,7 +218,7 @@ @@ -226,7 +226,7 @@ @@ -282,7 +282,7 @@ @@ -290,7 +290,7 @@ @@ -298,7 +298,7 @@ diff --git a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss index 71c5c601..8d46ac13 100644 --- a/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss +++ b/src/app/lnd/peers-channels/channels/channels-tables/channel-pending-table/channel-pending-table.component.scss @@ -1,11 +1,3 @@ -.mat-column-channel_point, .mat-column-remote_alias, .mat-column-remote_node_pub, .mat-column-closing_txid { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - tr.mat-footer-row td.mat-footer-cell { border-bottom: none; } diff --git a/src/app/lnd/peers-channels/peers/peers.component.html b/src/app/lnd/peers-channels/peers/peers.component.html index 2c4ba249..82e00567 100644 --- a/src/app/lnd/peers-channels/peers/peers.component.html +++ b/src/app/lnd/peers-channels/peers/peers.component.html @@ -18,7 +18,7 @@ @@ -26,7 +26,7 @@ @@ -34,7 +34,7 @@ diff --git a/src/app/lnd/peers-channels/peers/peers.component.scss b/src/app/lnd/peers-channels/peers/peers.component.scss index 880d2262..e69de29b 100644 --- a/src/app/lnd/peers-channels/peers/peers.component.scss +++ b/src/app/lnd/peers-channels/peers/peers.component.scss @@ -1,10 +0,0 @@ -.mat-column-alias, .mat-column-address, .mat-column-pub_key { - 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/peers-channels/peers/peers.component.ts b/src/app/lnd/peers-channels/peers/peers.component.ts index 0b761635..ea727702 100644 --- a/src/app/lnd/peers-channels/peers/peers.component.ts +++ b/src/app/lnd/peers-channels/peers/peers.component.ts @@ -34,6 +34,7 @@ export class PeersComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'peers_channels'; public tableSetting: TableSetting = { tableId: 'peers', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING }; public availableBalance = 0; @@ -73,6 +74,7 @@ export class PeersComponent implements OnInit, AfterViewInit, OnDestroy { } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(blockchainBalance).pipe(takeUntil(this.unSubs[2])). diff --git a/src/app/lnd/reports/transactions/transactions-report.component.ts b/src/app/lnd/reports/transactions/transactions-report.component.ts index 8af7a391..6f61c21c 100644 --- a/src/app/lnd/reports/transactions/transactions-report.component.ts +++ b/src/app/lnd/reports/transactions/transactions-report.component.ts @@ -29,6 +29,7 @@ export class TransactionsReportComponent implements OnInit, OnDestroy { public secondsInADay = 24 * 60 * 60; public payments: Payment[] = []; public invoices: Invoice[] = []; + public colWidth = '20rem'; public PAGE_ID = 'reports'; public tableSetting: TableSetting = { tableId: 'transactions', recordsPerPage: PAGE_SIZE, sortBy: 'date', sortOrder: SortOrderEnum.DESCENDING }; public displayedColumns: any[] = ['date', 'amount_paid', 'num_payments', 'amount_received', 'num_invoices']; @@ -66,6 +67,7 @@ export class TransactionsReportComponent implements OnInit, OnDestroy { this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection)); } this.displayedColumns.push('actions'); + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); 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 a1a2cc28..8140e9a9 100644 --- a/src/app/lnd/routing/forwarding-history/forwarding-history.component.html +++ b/src/app/lnd/routing/forwarding-history/forwarding-history.component.html @@ -16,7 +16,7 @@ @@ -24,7 +24,7 @@ @@ -32,7 +32,7 @@ @@ -40,7 +40,7 @@ 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 0d62b368..e69de29b 100644 --- a/src/app/lnd/routing/forwarding-history/forwarding-history.component.scss +++ b/src/app/lnd/routing/forwarding-history/forwarding-history.component.scss @@ -1,10 +0,0 @@ -.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 1edcd456..c8c8c599 100644 --- a/src/app/lnd/routing/forwarding-history/forwarding-history.component.ts +++ b/src/app/lnd/routing/forwarding-history/forwarding-history.component.ts @@ -34,6 +34,7 @@ export class ForwardingHistoryComponent implements OnInit, AfterViewInit, OnChan @Input() tableId = 'forwarding_history'; @Input() eventsData = []; @Input() filterValue = ''; + public colWidth = '20rem'; public PAGE_ID = 'routing'; public tableSetting: TableSetting = { tableId: 'forwarding_history', recordsPerPage: PAGE_SIZE, sortBy: 'timestamp', sortOrder: SortOrderEnum.DESCENDING }; public forwardingHistoryData: ForwardingEvent[] = []; @@ -69,6 +70,7 @@ export class ForwardingHistoryComponent implements OnInit, AfterViewInit, OnChan } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(forwardingHistory).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html index 13f55cb1..23eb2e68 100644 --- a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html +++ b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.html @@ -13,7 +13,7 @@ @@ -21,7 +21,7 @@ @@ -29,7 +29,7 @@ @@ -37,7 +37,7 @@ diff --git a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.scss b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.scss index 0119765d..e69de29b 100644 --- a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.scss +++ b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.scss @@ -1,33 +0,0 @@ -@import "../../../shared/theme/styles/mixins.scss"; - -.mat-column-chan_id, .mat-column-remote_alias, .mat-column-remote_pubkey, .mat-column-channel_point { - flex: 1 1 20%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.mat-column-uptime, .mat-column-lifetime, .mat-column-local_balance, .mat-column-remote_balance, .mat-column-total_satoshis_sent, .mat-column-total_satoshis_received { - flex: 1 1 10%; - width: 10%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - @include for_screensize(tab-land) { - white-space: unset; - flex: 1 1 25%; - width: 25%; - } - @include for_screensize(tab-port) { - flex: 0 0 15%; - width: 15%; - } - @include for_screensize(phone) { - white-space: unset; - } -} - - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.ts b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.ts index 05987d79..32e9374e 100644 --- a/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.ts +++ b/src/app/lnd/routing/non-routing-peers/non-routing-peers.component.ts @@ -29,6 +29,7 @@ export class NonRoutingPeersComponent implements OnInit, AfterViewInit, OnDestro @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'routing'; public tableSetting: TableSetting = { tableId: 'non_routing_peers', recordsPerPage: PAGE_SIZE, sortBy: 'remote_alias', sortOrder: SortOrderEnum.DESCENDING }; public routingPeersData: any[] = []; @@ -66,6 +67,7 @@ export class NonRoutingPeersComponent implements OnInit, AfterViewInit, OnDestro } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(forwardingHistory).pipe(takeUntil(this.unSubs[1])). @@ -80,7 +82,7 @@ export class NonRoutingPeersComponent implements OnInit, AfterViewInit, OnDestro } else { this.routingPeersData = []; } - if (this.routingPeersData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.routingPeersData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadNonRoutingPeersTable(this.routingPeersData); } this.logger.info(fhSelector.apiCallStatus); diff --git a/src/app/lnd/routing/routing-peers/routing-peers.component.html b/src/app/lnd/routing/routing-peers/routing-peers.component.html index a13ac1e1..1e8fc4b0 100644 --- a/src/app/lnd/routing/routing-peers/routing-peers.component.html +++ b/src/app/lnd/routing/routing-peers/routing-peers.component.html @@ -14,7 +14,7 @@ @@ -22,7 +22,7 @@ @@ -71,7 +71,7 @@ @@ -79,7 +79,7 @@ diff --git a/src/app/lnd/routing/routing-peers/routing-peers.component.ts b/src/app/lnd/routing/routing-peers/routing-peers.component.ts index 683d6da1..944182e8 100644 --- a/src/app/lnd/routing/routing-peers/routing-peers.component.ts +++ b/src/app/lnd/routing/routing-peers/routing-peers.component.ts @@ -30,6 +30,7 @@ export class RoutingPeersComponent implements OnInit, AfterViewInit, OnDestroy { @ViewChild('tableOut', { read: MatSort, static: false }) sortOut: MatSort; @ViewChild('paginatorIn', { static: false }) paginatorIn: MatPaginator | undefined; @ViewChild('paginatorOut', { static: false }) paginatorOut: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'routing'; public tableSetting: TableSetting = { tableId: 'routing_peers', recordsPerPage: PAGE_SIZE, sortBy: 'total_amount', sortOrder: SortOrderEnum.DESCENDING }; public routingPeersData: any[] = []; @@ -66,6 +67,7 @@ export class RoutingPeersComponent implements OnInit, AfterViewInit, OnDestroy { this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.columnSelection)); } this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(forwardingHistory).pipe(takeUntil(this.unSubs[1])). diff --git a/src/app/lnd/transactions/create-invoice-modal/create-invoice.component.scss b/src/app/lnd/transactions/create-invoice-modal/create-invoice.component.scss index 0ad983c7..e69de29b 100644 --- a/src/app/lnd/transactions/create-invoice-modal/create-invoice.component.scss +++ b/src/app/lnd/transactions/create-invoice-modal/create-invoice.component.scss @@ -1,3 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/lnd/transactions/invoices/lightning-invoices.component.html b/src/app/lnd/transactions/invoices/lightning-invoices.component.html index 2b86596d..399415e5 100644 --- a/src/app/lnd/transactions/invoices/lightning-invoices.component.html +++ b/src/app/lnd/transactions/invoices/lightning-invoices.component.html @@ -30,7 +30,7 @@
@@ -25,7 +25,7 @@ Peer -
+
{{channel.remote_alias || channel.remote_pubkey}}
Pubkey -
+
{{channel.remote_pubkey}}
Channel Point -
+
{{channel.channel_point}}
Channel Id -
+
{{channel.chan_id}}
Peer -
+
{{channel.channel.remote_alias}}
Pubkey -
+
{{channel.channel.remote_node_pub}}
Channel -
+
{{channel.channel.channel_point}}
Closing Tx Id -
+
{{channel.closing_txid}}
Peer -
+
{{channel.channel.remote_alias}}
Pubkey -
+
{{channel.channel.remote_node_pub}}
Channel -
+
{{channel.channel.channel_point}}
Closing Tx Id -
+
{{channel.closing_txid}}
Peer -
+
{{channel.channel.remote_alias}}
Pubkey -
+
{{channel.channel.remote_node_pub}}
Channel -
+
{{channel.channel.channel_point}}
Peer -
+
{{channel.channel.remote_alias}}
Pubkey -
+
{{channel.channel.remote_node_pub}}
Channel -
+
{{channel.channel.channel_point}}
Alias -
+
{{peer?.alias}}
Public Key -
+
{{peer?.pub_key}}
Address -
+
{{peer?.address}}
Inbound Alias -
+
{{fhEvent?.alias_in}}
Inbound Channel -
+
{{fhEvent?.chan_id_in}}
Outbound Alias -
+
{{fhEvent?.alias_out}}
Outbound Channel -
+
{{fhEvent?.chan_id_out}}
Channel ID -
+
{{nonRPeer?.chan_id}}
Peer Alias -
+
{{nonRPeer?.remote_alias}}
Peer Pubkey -
+
{{nonRPeer?.remote_pubkey}}
Channel Point -
+
{{nonRPeer?.channel_point}}
Channel ID -
+
{{rPeer?.chan_id}}
Peer Alias -
+
{{rPeer?.alias}}
Channel ID -
+
{{rPeer?.chan_id}}
Peer Alias -
+
{{rPeer?.alias}}
- + + - + - + @@ -78,7 +78,7 @@ @@ -86,7 +86,7 @@ @@ -94,7 +94,7 @@ @@ -102,7 +102,7 @@ @@ -110,7 +110,7 @@ diff --git a/src/app/lnd/transactions/invoices/lightning-invoices.component.scss b/src/app/lnd/transactions/invoices/lightning-invoices.component.scss index 83cc56a3..ab6bdb40 100644 --- a/src/app/lnd/transactions/invoices/lightning-invoices.component.scss +++ b/src/app/lnd/transactions/invoices/lightning-invoices.component.scss @@ -7,16 +7,3 @@ max-width: 1.6rem; width:1.6rem; } - -.mat-column-memo, .mat-column-r_preimage, .mat-column-r_hash, -.mat-column-payment_addr, .mat-column-payment_request, .mat-column-description_hash { - flex: 0 0 10%; - width: 10%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/lnd/transactions/invoices/lightning-invoices.component.ts b/src/app/lnd/transactions/invoices/lightning-invoices.component.ts index 6eaafb4a..bee389a1 100644 --- a/src/app/lnd/transactions/invoices/lightning-invoices.component.ts +++ b/src/app/lnd/transactions/invoices/lightning-invoices.component.ts @@ -45,6 +45,7 @@ export class LightningInvoicesComponent implements OnInit, AfterViewInit, OnDest public faArrowsTurnRight = faArrowsTurnRight; public faBurst = faBurst; public faMoneyBill1 = faMoneyBill1; + public colWidth = '20rem'; public PAGE_ID = 'transactions'; public tableSetting: TableSetting = { tableId: 'invoices', recordsPerPage: PAGE_SIZE, sortBy: 'creation_date', sortOrder: SortOrderEnum.DESCENDING }; public selNode: SelNodeChild | null = {}; @@ -97,6 +98,7 @@ export class LightningInvoicesComponent implements OnInit, AfterViewInit, OnDest this.displayedColumns.unshift('state'); this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(invoices).pipe(takeUntil(this.unSubs[3])). @@ -110,7 +112,7 @@ export class LightningInvoicesComponent implements OnInit, AfterViewInit, OnDest this.firstOffset = +(invoicesSelector.listInvoices.first_index_offset || -1); this.lastOffset = +(invoicesSelector.listInvoices.last_index_offset || -1); this.invoicesData = invoicesSelector.listInvoices.invoices || []; - if (this.invoicesData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.invoicesData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadInvoicesTable(this.invoicesData); } this.logger.info(invoicesSelector); diff --git a/src/app/lnd/transactions/payments/lightning-payments.component.html b/src/app/lnd/transactions/payments/lightning-payments.component.html index 1d5ba129..d9ed0dd2 100644 --- a/src/app/lnd/transactions/payments/lightning-payments.component.html +++ b/src/app/lnd/transactions/payments/lightning-payments.component.html @@ -28,7 +28,7 @@
@@ -38,21 +38,21 @@ - @@ -70,7 +70,7 @@ Memo -
+
{{invoice?.memo}}
Preimage -
+
{{invoice?.r_preimage}}
Preimage Hash -
+
{{invoice?.r_hash}}
Payment Address -
+
{{invoice?.payment_addr}}
Payment Request -
+
{{invoice?.payment_request}}
Description Hash -
+
{{invoice?.description_hash}}
- + @@ -51,7 +51,7 @@ @@ -59,7 +59,7 @@ @@ -67,7 +67,7 @@ @@ -75,7 +75,7 @@ @@ -151,7 +151,7 @@ @@ -31,7 +31,7 @@ @@ -51,7 +51,7 @@ @@ -59,7 +59,7 @@ @@ -67,7 +67,7 @@ @@ -75,7 +75,7 @@ @@ -83,7 +83,7 @@ diff --git a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.scss b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.scss index 23ff3c79..e69de29b 100755 --- a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.scss +++ b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.scss @@ -1,12 +0,0 @@ -.mat-column-claimAddress, .mat-column-lockupAddress, .mat-column-error, .mat-column-privateKey, .mat-column-preimage, .mat-column-redeemScript, .mat-column-invoice { - flex: 0 0 10%; - width: 10%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} - \ No newline at end of file diff --git a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts index d94dc846..1da6522e 100755 --- a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts +++ b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.ts @@ -35,6 +35,7 @@ export class BoltzSwapsComponent implements OnInit, AfterViewInit, OnChanges, On @Input() emptyTableMessage = 'No swaps available.'; @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'boltz'; public tableSettingSwapOut: TableSetting = { tableId: 'swap_out', recordsPerPage: PAGE_SIZE, sortBy: 'status', sortOrder: SortOrderEnum.DESCENDING }; public tableSettingSwapIn: TableSetting = { tableId: 'swap_in', recordsPerPage: PAGE_SIZE, sortBy: 'status', sortOrder: SortOrderEnum.DESCENDING }; @@ -60,9 +61,10 @@ export class BoltzSwapsComponent implements OnInit, AfterViewInit, OnChanges, On this.tableSettingSwapOut = settings.pageSettings.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSettingSwapOut.tableId) || LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSettingSwapOut.tableId)!; this.tableSettingSwapIn = settings.pageSettings.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSettingSwapIn.tableId) || LND_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSettingSwapIn.tableId)!; this.setTableColumns(); - if (this.swapsData && this.swapsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.swapsData && this.swapsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadSwapsTable(this.swapsData); } + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); } diff --git a/src/app/shared/components/ln-services/loop/swaps/swaps.component.html b/src/app/shared/components/ln-services/loop/swaps/swaps.component.html index 140be2b4..55f70740 100755 --- a/src/app/shared/components/ln-services/loop/swaps/swaps.component.html +++ b/src/app/shared/components/ln-services/loop/swaps/swaps.component.html @@ -46,7 +46,7 @@ @@ -54,7 +54,7 @@ @@ -62,7 +62,7 @@ diff --git a/src/app/shared/components/ln-services/loop/swaps/swaps.component.scss b/src/app/shared/components/ln-services/loop/swaps/swaps.component.scss index ba63493f..e69de29b 100755 --- a/src/app/shared/components/ln-services/loop/swaps/swaps.component.scss +++ b/src/app/shared/components/ln-services/loop/swaps/swaps.component.scss @@ -1,12 +0,0 @@ -.mat-column-htlc_address, .mat-column-id, .mat-column-id_bytes { - flex: 0 0 15%; - width: 15%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} - \ No newline at end of file diff --git a/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts b/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts index 6071fafb..77c72ba6 100755 --- a/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts +++ b/src/app/shared/components/ln-services/loop/swaps/swaps.component.ts @@ -35,6 +35,7 @@ export class SwapsComponent implements OnInit, AfterViewInit, OnChanges, OnDestr @Input() emptyTableMessage = 'No swaps available.'; @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; + public colWidth = '20rem'; public PAGE_ID = 'loop'; public tableSetting: TableSetting = { tableId: 'loop', recordsPerPage: PAGE_SIZE, sortBy: 'initiation_time', sortOrder: SortOrderEnum.DESCENDING }; public LoopStateEnum = LoopStateEnum; @@ -64,9 +65,10 @@ export class SwapsComponent implements OnInit, AfterViewInit, OnChanges, OnDestr } this.displayedColumns.push('actions'); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; - if (this.swapsData && this.swapsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.swapsData && this.swapsData.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { this.loadSwapsTable(this.swapsData); } + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); } diff --git a/src/app/shared/components/transactions-report-table/transactions-report-table.component.scss b/src/app/shared/components/transactions-report-table/transactions-report-table.component.scss index 0ad983c7..e69de29b 100644 --- a/src/app/shared/components/transactions-report-table/transactions-report-table.component.scss +++ b/src/app/shared/components/transactions-report-table/transactions-report-table.component.scss @@ -1,3 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} diff --git a/src/app/shared/services/consts-enums-functions.ts b/src/app/shared/services/consts-enums-functions.ts index 3173b221..0aedc255 100644 --- a/src/app/shared/services/consts-enums-functions.ts +++ b/src/app/shared/services/consts-enums-functions.ts @@ -1041,7 +1041,7 @@ export const ECL_DEFAULT_PAGE_SETTINGS: PageSettings[] = [ { pageId: 'on_chain', tables: [ { tableId: 'transaction', recordsPerPage: PAGE_SIZE, sortBy: 'timestamp', sortOrder: SortOrderEnum.DESCENDING, columnSelectionSM: ['timestamp', 'amount'], - columnSelection: ['timestamp', 'amount', 'fees', 'confirmations', 'address'] } + columnSelection: ['timestamp', 'address', 'amount', 'fees', 'confirmations'] } ] }, { pageId: 'peers_channels', tables: [ { tableId: 'open_channels', recordsPerPage: PAGE_SIZE, sortBy: 'alias', sortOrder: SortOrderEnum.DESCENDING, @@ -1087,7 +1087,7 @@ export const ECL_TABLES_DEF = { on_chain: { transaction: { maxColumns: 6, - allowedColumns: ['timestamp', 'amount', 'fees', 'confirmations', 'address', 'blockHash', 'txid'] + allowedColumns: ['timestamp', 'address', 'blockHash', 'txid', 'amount', 'fees', 'confirmations'] } }, peers_channels: { diff --git a/src/app/shared/theme/styles/root.scss b/src/app/shared/theme/styles/root.scss index a9c37a0d..aec989e3 100644 --- a/src/app/shared/theme/styles/root.scss +++ b/src/app/shared/theme/styles/root.scss @@ -1552,11 +1552,13 @@ th.mat-header-cell:last-of-type, td.mat-cell:last-of-type, td.mat-footer-cell:la text-align: left; } -// .table-container { -// height: 25rem; -// overflow: auto; -// overflow-x: hidden; -// } +.ellipsis-parent { + display: flex; +} + +.mat-column-actions { + min-height: 4.8rem; +} .mat-expansion-panel.flat-expansion-panel { box-shadow: none; diff --git a/src/app/shared/theme/styles/theme-color.scss b/src/app/shared/theme/styles/theme-color.scss index 68fd2f89..bc278ffb 100644 --- a/src/app/shared/theme/styles/theme-color.scss +++ b/src/app/shared/theme/styles/theme-color.scss @@ -190,9 +190,20 @@ thead tr th { color: $foreground-base; } - thead tr th:not(:first-of-type), tbody tr td:not(:first-of-type) { + thead tr th:not(:first-of-type), tbody tr td:not(:first-of-type) { padding-left: 1rem; } + tbody tr td.mat-cell { + @include for_screensize(tab-land) { + white-space: unset; + } + @include for_screensize(tab-port) { + white-space: unset; + } + @include for_screensize(phone) { + white-space: unset; + } + } &.error-border { border: 1px solid red; box-shadow: 0 3px 1px -2px rgba(255,0,0,.2), 0 2px 2px 0 rgba(255,0,0,.14), 0 1px 5px 0 rgba(255,0,0,.12) !important; @@ -281,9 +292,9 @@ .table-actions-select { padding: 0.5rem 1rem; margin: 0.9rem 0; - min-width: 10rem; min-height: 3.6rem; - width: 10rem; + min-width: 9rem; + width: 9rem; float: right; & .mat-select-placeholder { color: $foreground-text; @@ -291,8 +302,8 @@ } .table-actions-button { - min-width: 10rem; - width: 10rem; + min-width: 9rem; + width: 9rem; } .mat-select-panel .mat-option.mat-active {
@@ -43,7 +43,7 @@ Payment Hash - + {{payment?.payment_hash}} Payment Request - + {{payment?.payment_request}} Payment Preimage - + {{payment?.payment_preimage}} Description - + {{payment?.description}} Description Hash - + {{payment?.description_hash}} - + {{payment?.payment_hash}} @@ -163,7 +163,7 @@ - + {{payment?.payment_request}} @@ -174,7 +174,7 @@ - + {{payment?.payment_preimage}} @@ -186,7 +186,7 @@ - + {{payment?.description}} @@ -197,7 +197,7 @@ - + {{payment?.description_hash}} diff --git a/src/app/lnd/transactions/payments/lightning-payments.component.scss b/src/app/lnd/transactions/payments/lightning-payments.component.scss index 823110a0..d3566660 100644 --- a/src/app/lnd/transactions/payments/lightning-payments.component.scss +++ b/src/app/lnd/transactions/payments/lightning-payments.component.scss @@ -3,18 +3,6 @@ width: 1.2rem; } -.mat-column-payment_hash, .mat-column-payment_request, .mat-column-payment_preimage, .mat-column-description, .mat-column-description_hash { - flex: 0 0 10%; - width: 10%; - & .ellipsis-parent { - display: flex; - } -} - -.mat-column-actions { - min-height: 4.8rem; -} - .mat-column-group_actions { min-height: 4.8rem; diff --git a/src/app/lnd/transactions/payments/lightning-payments.component.ts b/src/app/lnd/transactions/payments/lightning-payments.component.ts index cc8abac6..ec25b52d 100644 --- a/src/app/lnd/transactions/payments/lightning-payments.component.ts +++ b/src/app/lnd/transactions/payments/lightning-payments.component.ts @@ -41,6 +41,7 @@ export class LightningPaymentsComponent implements OnInit, AfterViewInit, OnDest @ViewChild(MatSort, { static: false }) sort: MatSort | undefined; @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined; public faHistory = faHistory; + public colWidth = '20rem'; public PAGE_ID = 'transactions'; public tableSetting: TableSetting = { tableId: 'payments', recordsPerPage: PAGE_SIZE, sortBy: 'creation_date', sortOrder: SortOrderEnum.DESCENDING }; public newlyAddedPayment = ''; @@ -96,6 +97,7 @@ export class LightningPaymentsComponent implements OnInit, AfterViewInit, OnDest this.htlcColumns = []; this.displayedColumns.map((col) => this.htlcColumns.push('group_' + col)); this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE; + this.colWidth = this.displayedColumns.length ? ((this.commonService.getContainerSize().width / this.displayedColumns.length) / 10) + 'rem' : '20rem'; this.logger.info(this.displayedColumns); }); this.store.select(payments).pipe(takeUntil(this.unSubs[5])). @@ -109,7 +111,7 @@ export class LightningPaymentsComponent implements OnInit, AfterViewInit, OnDest this.totalPayments = this.paymentJSONArr.length; this.firstOffset = +(paymentsSelector.listPayments.first_index_offset || -1); this.lastOffset = +(paymentsSelector.listPayments.last_index_offset || -1); - if (this.paymentJSONArr && this.paymentJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { + if (this.paymentJSONArr && this.paymentJSONArr.length > 0 && this.sort && this.paginator && this.displayedColumns.length > 0) { // this.loadPaymentsTable(this.paymentJSONArr); this.loadPaymentsTable(this.paymentJSONArr.slice(0, this.pageSize)); } diff --git a/src/app/lnd/transactions/send-payment-modal/send-payment.component.scss b/src/app/lnd/transactions/send-payment-modal/send-payment.component.scss index f18d5d79..e69de29b 100644 --- a/src/app/lnd/transactions/send-payment-modal/send-payment.component.scss +++ b/src/app/lnd/transactions/send-payment-modal/send-payment.component.scss @@ -1,10 +0,0 @@ -.mat-column-actions { - min-height: 4.8rem; -} - -.mat-column-payment_hash { - flex: 1 1 20%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} \ No newline at end of file diff --git a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html index 706397a7..fcd10888 100755 --- a/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html +++ b/src/app/shared/components/ln-services/boltz/swaps/swaps.component.html @@ -23,7 +23,7 @@ Claim Address - + {{swap?.claimAddress}} Lockup Address - + {{swap?.lockupAddress}} Error - + {{swap?.error}} Private Key - + {{swap?.privateKey}} Preimage - + {{swap?.preimage}} Redeem Script - + {{swap?.redeemScript}} Invoice - + {{swap?.invoice}} HTLC Address - + {{swap?.htlc_address}} ID - + {{swap?.id}} ID (Bytes) - + {{swap?.id_bytes}}