CLN Payment Sort

backend/controllers/cln/payments.js

@@ -73,10 +73,6 @@ export const listPayments = (req, res, next) => {
     options.url = req.session.selectedNode.ln_server_url + '/v1/pay/listPayments';
     request(options).then((body) => {
         logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Payment List Received', data: body.payments });
-        // if (body && body.payments && body.payments.length > 0) {
-        //   body.payments = common.sortDescByKey(body.payments, 'created_at');
-        // }
-        logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sorted Payments List Received', data: body.payments });
         res.status(200).json(groupBy(body.payments));
     }).catch((errRes) => {
         const err = common.handleError(errRes, 'Payments', 'List Payments Error', req.session.selectedNode);

backend/models/database.model.js

@@ -43,8 +43,8 @@ export const validateOffer = (documentToValidate) => {
 };
 export var SortOrderEnum;
 (function (SortOrderEnum) {
-    SortOrderEnum["ASCENDING"] = "Ascending";
+    SortOrderEnum["ASCENDING"] = "asc";
-    SortOrderEnum["DESCENDING"] = "Descending";
+    SortOrderEnum["DESCENDING"] = "desc";
 })(SortOrderEnum || (SortOrderEnum = {}));
 export var PageSettingsFieldsEnum;
 (function (PageSettingsFieldsEnum) {

server/controllers/cln/payments.ts

@@ -63,10 +63,6 @@ export const listPayments = (req, res, next) => {
   options.url = req.session.selectedNode.ln_server_url + '/v1/pay/listPayments';
   request(options).then((body) => {
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Payments', msg: 'Payment List Received', data: body.payments });
-    // if (body && body.payments && body.payments.length > 0) {
-    //   body.payments = common.sortDescByKey(body.payments, 'created_at');
-    // }
-    logger.log({ selectedNode: req.session.selectedNode, level: 'INFO', fileName: 'Payments', msg: 'Sorted Payments List Received', data: body.payments });
     res.status(200).json(groupBy(body.payments));
   }).catch((errRes) => {
     const err = common.handleError(errRes, 'Payments', 'List Payments Error', req.session.selectedNode);

server/models/database.model.ts

@@ -47,8 +47,8 @@ export const validateOffer = (documentToValidate): any => {
 };
 
 export enum SortOrderEnum {
-  ASCENDING = 'Ascending',
+  ASCENDING = 'asc',
-  DESCENDING = 'Descending'
+  DESCENDING = 'desc'
 }
 
 export enum PageSettingsFieldsEnum {

src/app/cln/transactions/payments/lightning-payments.component.ts

@@ -6,7 +6,7 @@ import { Store } from '@ngrx/store';
 import { faHistory } from '@fortawesome/free-solid-svg-icons';
 
 import { MatPaginator, MatPaginatorIntl } from '@angular/material/paginator';
-import { MatSort, Sort } from '@angular/material/sort';
+import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { GetInfo, Payment, PayRequest } from '../../../shared/models/clnModels';
 import { PAGE_SIZE, PAGE_SIZE_OPTIONS, getPaginatorLabel, AlertTypeEnum, DataTypeEnum, ScreenSizeEnum, CurrencyUnitEnum, CURRENCY_UNIT_FORMATS, APICallStatusEnum, UI_MESSAGES, PaymentTypes, CLN_TABLES_DEF, CLN_DEFAULT_PAGE_SETTINGS, SORT_ORDERS, SortOrderEnum } from '../../../shared/services/consts-enums-functions';
@@ -24,7 +24,7 @@ import { RTLState } from '../../../store/rtl.state';
 import { openAlert, openConfirmation } from '../../../store/rtl.actions';
 import { sendPayment } from '../../store/cln.actions';
 import { clnNodeInformation, clnNodeSettings, clnPageSettings, payments } from '../../store/cln.selector';
-import { PageSettingsCLN } from '../../../shared/models/pageSettings';
+import { PageSettingsCLN, TableSetting } from '../../../shared/models/pageSettings';
 
 @Component({
   selector: 'rtl-cln-lightning-payments',
@@ -41,7 +41,7 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD
   @ViewChild(MatSort, { static: false }) sort: MatSort | undefined;
   @ViewChild(MatPaginator, { static: false }) paginator: MatPaginator | undefined;
   public PAGE_ID = 'payments';
-  public TABLE_ID = 'payments';
+  public tableSetting: TableSetting = { tableId: 'payments' };
   public faHistory = faHistory;
   public newlyAddedPayment = '';
   public selNode: SelNodeChild | null = {};
@@ -55,8 +55,6 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD
   public paymentDecodedHint = '';
   public pageSize = PAGE_SIZE;
   public pageSizeOptions = PAGE_SIZE_OPTIONS;
-  public sortBy = 'created_at';
-  public sortOrder = SortOrderEnum.DESCENDING;
   public screenSize = '';
   public screenSizeEnum = ScreenSizeEnum;
   public errorMessage = '';
@@ -85,20 +83,17 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD
           this.errorMessage = this.apiCallStatus.message || '';
         }
         this.pageSettings = settings.pageSettings;
-        let tableSettings: any = {};
+        this.tableSetting = this.pageSettings.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSetting.tableId) || CLN_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.tableSetting.tableId)!;
-        tableSettings = this.pageSettings.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.TABLE_ID) || CLN_DEFAULT_PAGE_SETTINGS.find((page) => page.pageId === this.PAGE_ID)?.tables.find((table) => table.tableId === this.TABLE_ID);
         if (this.screenSize === ScreenSizeEnum.XS || this.screenSize === ScreenSizeEnum.SM) {
-          this.displayedColumns = JSON.parse(JSON.stringify(tableSettings.showColumnsSM));
+          this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.showColumnsSM));
         } else {
-          this.displayedColumns = JSON.parse(JSON.stringify(tableSettings.showColumns));
+          this.displayedColumns = JSON.parse(JSON.stringify(this.tableSetting.showColumns));
         }
         this.displayedColumns.unshift('status');
         this.displayedColumns.push('actions');
         this.mppColumns = [];
         this.displayedColumns.map((col) => this.mppColumns.push('group_' + col));
-        this.pageSize = tableSettings.recordsPerPage;
+        this.pageSize = this.tableSetting.recordsPerPage ? +this.tableSetting.recordsPerPage : PAGE_SIZE;
-        this.sortBy = tableSettings.sortBy;
-        this.sortOrder = tableSettings.sortOrder;
         this.logger.info(this.displayedColumns);
         this.logger.info(this.mppColumns);
       });
@@ -306,6 +301,7 @@ export class CLNLightningPaymentsComponent implements OnInit, AfterViewInit, OnD
     this.payments = (payments) ? new MatTableDataSource<Payment>([...payments]) : new MatTableDataSource([]);
     this.payments.sort = this.sort;
     this.payments.sortingDataAccessor = (data: any, sortHeaderId: string) => ((data[sortHeaderId] && isNaN(data[sortHeaderId])) ? data[sortHeaderId].toLocaleLowerCase() : data[sortHeaderId] ? +data[sortHeaderId] : null);
+    this.payments.sort.sort({ id: this.tableSetting.sortBy, start: this.tableSetting.sortOrder, disableClear: false });
     this.payments.filterPredicate = (rowData: Payment, fltr: string) => {
       const newRowData = ((rowData.created_at) ? this.datePipe.transform(new Date(rowData.created_at * 1000), 'dd/MMM/YYYY HH:mm')?.toLowerCase() : '') + ((rowData.bolt12) ? 'bolt12' : (rowData.bolt11) ? 'bolt11' : 'keysend') + JSON.stringify(rowData).toLowerCase();
       return newRowData.includes(fltr);

src/app/shared/services/consts-enums-functions.ts

@@ -668,11 +668,11 @@ export const ECL_CHANNEL_TYPES = [
 ];
 
 export enum SortOrderEnum {
-  ASCENDING = 'Ascending',
+  ASCENDING = 'asc',
-  DESCENDING = 'Descending'
+  DESCENDING = 'desc'
 }
 
-export const SORT_ORDERS = ['Ascending', 'Descending'];
+export const SORT_ORDERS = ['asc', 'desc'];
 
 export const CLN_DEFAULT_PAGE_SETTINGS: PageSettingsCLN[] = [
   { pageId: 'payments', tables: [{ tableId: 'payments', recordsPerPage: 10, sortBy: 'created_at', sortOrder: SortOrderEnum.DESCENDING,