sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Add filterPredicate on transactions table to filter by account name (#73)

Browse Source 
* fix: add filterPredicate on transactions table to filter by account name

* Minor refactoring

* Update changelog

Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>
This commit is contained in:
Mantovani Gabriele 2021-05-06 22:57:15 +02:00 committed by GitHub
parent 993a491d24
commit de973d6bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Fixed
- Fixed the filtering by account name in the transactions table
## 1.0.0 - 05.05.2021 ## 1.0.0 - 05.05.2021
### Added ### Added

26
apps/client/src/app/components/transactions-table/transactions-table.component.ts
View File

@ -13,8 +13,8 @@ import { MatDialog } from '@angular/material/dialog';
import { MatSort } from '@angular/material/sort'; import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table'; import { MatTableDataSource } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { OrderWithAccount } from '@ghostfolio/api/app/order/interfaces/order-with-account.type';
import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper'; import { DEFAULT_DATE_FORMAT } from '@ghostfolio/helper';
import { Order as OrderModel } from '@prisma/client';
import { Subject, Subscription } from 'rxjs'; import { Subject, Subscription } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
@ -32,15 +32,15 @@ export class TransactionsTableComponent
@Input() deviceType: string; @Input() deviceType: string;
@Input() locale: string; @Input() locale: string;
@Input() showActions: boolean; @Input() showActions: boolean;
@Input() transactions: OrderModel[]; @Input() transactions: OrderWithAccount[];
@Output() transactionDeleted = new EventEmitter<string>(); @Output() transactionDeleted = new EventEmitter<string>();
@Output() transactionToClone = new EventEmitter<OrderModel>(); @Output() transactionToClone = new EventEmitter<OrderWithAccount>();
@Output() transactionToUpdate = new EventEmitter<OrderModel>(); @Output() transactionToUpdate = new EventEmitter<OrderWithAccount>();
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
public dataSource: MatTableDataSource<OrderModel> = new MatTableDataSource(); public dataSource: MatTableDataSource<OrderWithAccount> = new MatTableDataSource();
public defaultDateFormat = DEFAULT_DATE_FORMAT; public defaultDateFormat = DEFAULT_DATE_FORMAT;
public displayedColumns = []; public displayedColumns = [];
public isLoading = true; public isLoading = true;
@ -87,6 +87,18 @@ export class TransactionsTableComponent
if (this.transactions) { if (this.transactions) {
this.dataSource = new MatTableDataSource(this.transactions); this.dataSource = new MatTableDataSource(this.transactions);
this.dataSource.filterPredicate = (data, filter) => {
const accumulator = (currentTerm: string, key: string) => {
return key === 'Account'
? currentTerm + data.Account.name
: currentTerm + data[key];
};
const dataString = Object.keys(data)
.reduce(accumulator, '')
.toLowerCase();
const transformedFilter = filter.trim().toLowerCase();
return dataString.includes(transformedFilter);
};
this.dataSource.sort = this.sort; this.dataSource.sort = this.sort;
this.isLoading = false; this.isLoading = false;
@ -120,11 +132,11 @@ export class TransactionsTableComponent
}); });
} }
public onUpdateTransaction(aTransaction: OrderModel) { public onUpdateTransaction(aTransaction: OrderWithAccount) {
this.transactionToUpdate.emit(aTransaction); this.transactionToUpdate.emit(aTransaction);
} }
public onCloneTransaction(aTransaction: OrderModel) { public onCloneTransaction(aTransaction: OrderWithAccount) {
this.transactionToClone.emit(aTransaction); this.transactionToClone.emit(aTransaction);
} }