Refactoring

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@@ -77,8 +77,8 @@
         <gf-holdings-table
           [baseCurrency]="user?.settings?.baseCurrency"
           [deviceType]="data.deviceType"
+          [holdings]="holdings"
           [locale]="user?.settings?.locale"
-          [positions]="holdings"
         ></gf-holdings-table>
       </mat-tab>
       <mat-tab>

apps/client/src/app/pages/portfolio/holdings/holdings-page.html

@@ -16,8 +16,8 @@
         [baseCurrency]="user?.settings?.baseCurrency"
         [deviceType]="deviceType"
         [hasPermissionToCreateActivity]="hasPermissionToCreateOrder"
+        [holdings]="holdings"
         [locale]="user?.settings?.locale"
-        [positions]="holdings"
       ></gf-holdings-table>
       <div
         *ngIf="hasPermissionToCreateOrder && holdings?.length > 0"

apps/client/src/app/pages/public/public-page.component.ts

@@ -28,6 +28,7 @@ export class PublicPageComponent implements OnInit {
     [code: string]: { name: string; value: number };
   };
   public deviceType: string;
+  public holdings: PortfolioPublicDetails['holdings'][string][];
   public markets: {
     [key in Market]: { name: string; value: number };
   };
@@ -37,7 +38,6 @@ export class PublicPageComponent implements OnInit {
       value: number;
     };
   };
-  public positionsArray: PortfolioPublicDetails['holdings'][string][];
   public sectors: {
     [name: string]: { name: string; value: number };
   };
@@ -99,6 +99,7 @@ export class PublicPageComponent implements OnInit {
         value: 0
       }
     };
+    this.holdings = [];
     this.markets = {
       [UNKNOWN_KEY]: {
         name: UNKNOWN_KEY,
@@ -118,7 +119,6 @@ export class PublicPageComponent implements OnInit {
       }
     };
     this.positions = {};
-    this.positionsArray = [];
     this.sectors = {
       [UNKNOWN_KEY]: {
         name: UNKNOWN_KEY,
@@ -136,14 +136,13 @@ export class PublicPageComponent implements OnInit {
     for (const [symbol, position] of Object.entries(
       this.portfolioPublicDetails.holdings
     )) {
-      const value = position.allocationInPercentage;
+      this.holdings.push(position);
 
       this.positions[symbol] = {
-        value,
         currency: position.currency,
-        name: position.name
+        name: position.name,
+        value: position.allocationInPercentage
       };
-      this.positionsArray.push(position);
 
       if (position.countries.length > 0) {
         this.markets.developedMarkets.value +=

apps/client/src/app/pages/public/public-page.html

@@ -133,8 +133,8 @@
       <gf-holdings-table
         [deviceType]="deviceType"
         [hasPermissionToShowValues]="false"
+        [holdings]="holdings"
         [pageSize]="7"
-        [positions]="positionsArray"
       ></gf-holdings-table>
     </div>
   </div>

libs/ui/src/lib/holdings-table/holdings-table.component.ts

@@ -1,12 +1,10 @@
 import {
   ChangeDetectionStrategy,
   Component,
-  EventEmitter,
   Input,
   OnChanges,
   OnDestroy,
   OnInit,
-  Output,
   ViewChild
 } from '@angular/core';
 import { MatPaginator } from '@angular/material/paginator';
@@ -14,7 +12,7 @@ import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { Router } from '@angular/router';
 import { PortfolioPosition, UniqueAsset } from '@ghostfolio/common/interfaces';
-import { AssetClass, Order as OrderModel } from '@prisma/client';
+import { AssetClass } from '@prisma/client';
 import { Subject, Subscription } from 'rxjs';
 
 @Component({
@@ -28,12 +26,9 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit {
   @Input() deviceType: string;
   @Input() hasPermissionToCreateActivity: boolean;
   @Input() hasPermissionToShowValues = true;
+  @Input() holdings: PortfolioPosition[];
   @Input() locale: string;
   @Input() pageSize = Number.MAX_SAFE_INTEGER;
-  @Input() positions: PortfolioPosition[];
-
-  @Output() transactionDeleted = new EventEmitter<string>();
-  @Output() transactionToUpdate = new EventEmitter<OrderModel>();
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
@@ -63,8 +58,8 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit {
 
     this.isLoading = true;
 
-    if (this.positions) {
+    if (this.holdings) {
-      this.dataSource = new MatTableDataSource(this.positions);
+      this.dataSource = new MatTableDataSource(this.holdings);
       this.dataSource.paginator = this.paginator;
       this.dataSource.sort = this.sort;