From fe380a1fe0eca65a5ed246594c205e9a347c189e Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Sat, 10 Jul 2021 10:52:56 +0200 Subject: [PATCH] Refactor ignoreList (by symbol) to ignoreTypes (by type) --- .../positions-table/positions-table.component.html | 4 ++-- .../positions-table/positions-table.component.ts | 4 ++-- .../app/components/positions/positions.component.ts | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/client/src/app/components/positions-table/positions-table.component.html b/apps/client/src/app/components/positions-table/positions-table.component.html index bfc8de79d..c6cee5f61 100644 --- a/apps/client/src/app/components/positions-table/positions-table.component.html +++ b/apps/client/src/app/components/positions-table/positions-table.component.html @@ -83,10 +83,10 @@ *matRowDef="let row; columns: displayedColumns" mat-row [ngClass]="{ - 'cursor-pointer': !this.ignoreList.includes(row.symbol) + 'cursor-pointer': !this.ignoreTypes.includes(row.type) }" (click)=" - !this.ignoreList.includes(row.symbol) && + !this.ignoreTypes.includes(row.type) && onOpenPositionDialog({ symbol: row.symbol, title: row.name }) " > diff --git a/apps/client/src/app/components/positions-table/positions-table.component.ts b/apps/client/src/app/components/positions-table/positions-table.component.ts index 0958f1e17..5ad58f4f2 100644 --- a/apps/client/src/app/components/positions-table/positions-table.component.ts +++ b/apps/client/src/app/components/positions-table/positions-table.component.ts @@ -14,7 +14,7 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { ActivatedRoute, Router } from '@angular/router'; -import { ghostfolioCashSymbol } from '@ghostfolio/common/config'; +import { Type } from '@ghostfolio/api/services/interfaces/interfaces'; import { PortfolioPosition } from '@ghostfolio/common/interfaces'; import { Order as OrderModel } from '@prisma/client'; import { Subject, Subscription } from 'rxjs'; @@ -43,11 +43,11 @@ export class PositionsTableComponent implements OnChanges, OnDestroy, OnInit { public dataSource: MatTableDataSource = new MatTableDataSource(); public displayedColumns = []; + public ignoreTypes = [Type.Cash]; public isLoading = true; public pageSize = 7; public routeQueryParams: Subscription; - private ignoreList = [ghostfolioCashSymbol]; private unsubscribeSubject = new Subject(); public constructor( diff --git a/apps/client/src/app/components/positions/positions.component.ts b/apps/client/src/app/components/positions/positions.component.ts index 1409835b6..cb308aef5 100644 --- a/apps/client/src/app/components/positions/positions.component.ts +++ b/apps/client/src/app/components/positions/positions.component.ts @@ -5,8 +5,10 @@ import { OnChanges, OnInit } from '@angular/core'; -import { MarketState } from '@ghostfolio/api/services/interfaces/interfaces'; -import { ghostfolioCashSymbol } from '@ghostfolio/common/config'; +import { + MarketState, + Type +} from '@ghostfolio/api/services/interfaces/interfaces'; import { PortfolioPosition } from '@ghostfolio/common/interfaces/portfolio-position.interface'; @Component({ @@ -26,7 +28,7 @@ export class PositionsComponent implements OnChanges, OnInit { public positionsRest: PortfolioPosition[] = []; public positionsWithPriority: PortfolioPosition[] = []; - private ignoreList = [ghostfolioCashSymbol]; + private ignoreTypes = [Type.Cash]; public constructor() {} @@ -44,7 +46,7 @@ export class PositionsComponent implements OnChanges, OnInit { this.positionsWithPriority = []; for (const [, portfolioPosition] of Object.entries(this.positions)) { - if (this.ignoreList.includes(portfolioPosition.symbol)) { + if (this.ignoreTypes.includes(portfolioPosition.type)) { continue; }