From 2807a408a8bf5eac4273f3e9a1c5a3b5fe9a3197 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Wed, 2 Nov 2022 16:17:49 -0700 Subject: [PATCH] CLN Filter mapping with constants --- .../channel-pending-table.component.ts | 6 +++++- .../local-failed-transactions.component.ts | 2 +- .../on-chain/utxo-tables/utxos/utxos.component.ts | 14 +++----------- 3 files changed, 9 insertions(+), 13 deletions(-) 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 29aab4f1..1466cfc0 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 @@ -201,11 +201,15 @@ export class CLNChannelPendingTableComponent implements OnInit, AfterViewInit, O rowToFilter = ((+(rowData[this.selFilterBy] || 0)) / 1000)?.toString() || ''; break; + case 'state': + rowToFilter = rowData?.state ? this.CLNChannelPendingState[rowData?.state] : ''; + break; + default: rowToFilter = typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString(); break; } - return this.selFilterBy === 'connected' ? rowToFilter.indexOf(fltr) === 0 : rowToFilter.includes(fltr); + return (this.selFilterBy === 'connected' || this.selFilterBy === 'state') ? rowToFilter.indexOf(fltr) === 0 : rowToFilter.includes(fltr); }; } 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 42764a59..b7814465 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 @@ -157,7 +157,7 @@ export class CLNLocalFailedTransactionsComponent implements OnInit, AfterViewIni rowToFilter = typeof rowData[this.selFilterBy] === 'string' ? rowData[this.selFilterBy].toLowerCase() : typeof rowData[this.selFilterBy] === 'boolean' ? (rowData[this.selFilterBy] ? 'yes' : 'no') : rowData[this.selFilterBy].toString(); break; } - return rowToFilter.includes(fltr); + return this.selFilterBy === 'failreason' ? rowToFilter.indexOf(fltr) === 0 : rowToFilter.includes(fltr); }; } 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 2958213f..2857c1eb 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 @@ -125,17 +125,9 @@ export class OnChainUTXOsComponent implements OnInit, OnChanges, OnDestroy { let rowToFilter = ''; switch (this.selFilterBy) { case 'all': - for (let i = 0; i < this.displayedColumns.length - 1; i++) { - rowToFilter = rowToFilter + ( - (this.displayedColumns[i] === 'tx_id') ? - (rowData.outpoint && rowData.outpoint.txid_str ? rowData.outpoint.txid_str.toLowerCase() : '') : - (this.displayedColumns[i] === 'output') ? - (rowData.outpoint && rowData.outpoint.output_index ? rowData.outpoint.output_index.toString() : '0') : - (this.displayedColumns[i] === 'address_type') ? - (rowData.address_type && this.addressType[rowData.address_type] && this.addressType[rowData.address_type].name ? this.addressType[rowData.address_type].name.toLowerCase() : '') : - (rowData[this.displayedColumns[i]] ? rowData[this.displayedColumns[i]].toLowerCase() : '') - ) + ', '; - } + rowToFilter = ((rowData.label ? rowData.label.toLowerCase() : '') + (rowData.outpoint?.txid_str ? rowData.outpoint.txid_str.toLowerCase() : '') + (rowData.outpoint?.output_index ? rowData.outpoint?.output_index : '') + + (rowData.outpoint?.txid_bytes ? rowData.outpoint?.txid_bytes.toLowerCase() : '') + (rowData.address ? rowData.address.toLowerCase() : '') + (rowData.address_type ? this.addressType[rowData.address_type].name.toLowerCase() : '') + + (rowData.amount_sat ? rowData.amount_sat : '') + (rowData.confirmations ? rowData.confirmations : '')); break; case 'is_dust':