Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/remove deprecated attributes from portfolio position interface (#6950)
Thomas Kaulab6fdf6c4fe5
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 9842a2b197..e0c416fb0b 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed- Extended the countries mapping in the data enhancer for asset profile data via _Trackinsight_+- Removed the deprecated attributes (`assetClass`, `assetClassLabel`, `assetSubClass`, `assetSubClassLabel`, `countries`, `currency`, `dataSource`, `holdings`, `name`, `sectors`, `symbol` and `url`) from the holdings of the portfolio details endpoint response## 3.6.0 - 2026-05-28diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.tsindex 8aa94ee925..9515c7a216 100644--- a/apps/api/src/app/portfolio/portfolio.controller.ts+++ b/apps/api/src/app/portfolio/portfolio.controller.ts@@ -144,10 +144,10 @@ export class PortfolioController {.reduce((a, b) => a + b, 0);const totalValue = Object.values(holdings)- .filter(({ assetClass, assetSubClass }) => {+ .filter(({ assetProfile }) => {return (- assetClass !== AssetClass.LIQUIDITY &&- assetSubClass !== AssetSubClass.CASH+ assetProfile.assetClass !== AssetClass.LIQUIDITY &&+ assetProfile.assetSubClass !== AssetSubClass.CASH);}).map(({ valueInBaseCurrency }) => {@@ -217,37 +217,41 @@ export class PortfolioController {for (const [symbol, portfolioPosition] of Object.entries(holdings)) {holdings[symbol] = {...portfolioPosition,- assetClass:- hasDetails || portfolioPosition.assetClass === AssetClass.LIQUIDITY- ? portfolioPosition.assetClass- : undefined,assetProfile: {...portfolioPosition.assetProfile,+ assetClass:+ hasDetails ||+ portfolioPosition.assetProfile.assetClass === AssetClass.LIQUIDITY+ ? portfolioPosition.assetProfile.assetClass+ : undefined,+ assetClassLabel:+ hasDetails ||+ portfolioPosition.assetProfile.assetClass === AssetClass.LIQUIDITY+ ? portfolioPosition.assetProfile.assetClassLabel+ : undefined,+ assetSubClass:+ hasDetails ||+ portfolioPosition.assetProfile.assetSubClass === AssetSubClass.CASH+ ? portfolioPosition.assetProfile.assetSubClass+ : undefined,+ assetSubClassLabel:+ hasDetails ||+ portfolioPosition.assetProfile.assetSubClass === AssetSubClass.CASH+ ? portfolioPosition.assetProfile.assetSubClassLabel+ : undefined,...(hasDetails? {}: {- assetClass: undefined,- assetClassLabel: undefined,- assetSubClass: undefined,- assetSubClassLabel: undefined,countries: [],currency: undefined,holdings: [],sectors: []})},- assetSubClass:- hasDetails || portfolioPosition.assetSubClass === AssetSubClass.CASH- ? portfolioPosition.assetSubClass- : undefined,- countries: hasDetails ? portfolioPosition.countries : [],- currency: hasDetails ? portfolioPosition.currency : undefined,- holdings: hasDetails ? portfolioPosition.holdings : [],markets: hasDetails ? portfolioPosition.markets : undefined,marketsAdvanced: hasDetails? portfolioPosition.marketsAdvanced- : undefined,- sectors: hasDetails ? portfolioPosition.sectors : []+ : undefined};}diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex cee36ec27a..ab39a00a5e 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -584,7 +584,6 @@ export class PortfolioService {for (const {activitiesCount,- currency,dataSource,dateOfFirstActivity,dividend,@@ -638,16 +637,13 @@ export class PortfolioService {holdings[symbol] = {activitiesCount,- currency,markets,marketsAdvanced,marketPrice,- symbol,tags,allocationInPercentage: filteredValueInBaseCurrency.eq(0)? 0: valueInBaseCurrency.div(filteredValueInBaseCurrency).toNumber(),- assetClass: assetProfile.assetClass,assetProfile: {assetClass: assetProfile.assetClass,assetSubClass: assetProfile.assetSubClass,@@ -670,9 +666,6 @@ export class PortfolioService {symbol: assetProfile.symbol,url: assetProfile.url},- assetSubClass: assetProfile.assetSubClass,- countries: assetProfile.countries,- dataSource: assetProfile.dataSource,dateOfFirstActivity: parseDate(dateOfFirstActivity),dividend: dividend?.toNumber() ?? 0,grossPerformance: grossPerformance?.toNumber() ?? 0,@@ -681,19 +674,7 @@ export class PortfolioService {grossPerformancePercentageWithCurrencyEffect?.toNumber() ?? 0,grossPerformanceWithCurrencyEffect:grossPerformanceWithCurrencyEffect?.toNumber() ?? 0,- holdings: assetProfile.holdings.map(- ({ allocationInPercentage, name }) => {- return {- allocationInPercentage,- name,- valueInBaseCurrency: valueInBaseCurrency- .mul(allocationInPercentage)- .toNumber()- };- }- ),investment: investment.toNumber(),- name: assetProfile.name,netPerformance: netPerformance?.toNumber() ?? 0,netPerformancePercent: netPerformancePercentage?.toNumber() ?? 0,netPerformancePercentWithCurrencyEffect:@@ -703,8 +684,6 @@ export class PortfolioService {netPerformanceWithCurrencyEffect:netPerformanceWithCurrencyEffectMap?.[dateRange]?.toNumber() ?? 0,quantity: quantity.toNumber(),- sectors: assetProfile.sectors,- url: assetProfile.url,valueInBaseCurrency: valueInBaseCurrency.toNumber()};}@@ -1472,8 +1451,8 @@ export class PortfolioService {for (const [, position] of Object.entries(holdings)) {const value = position.valueInBaseCurrency;- if (position.assetClass !== AssetClass.LIQUIDITY) {- if (position.countries.length > 0) {+ if (position.assetProfile.assetClass !== AssetClass.LIQUIDITY) {+ if (position.assetProfile.countries.length > 0) {markets.developedMarkets.valueInBaseCurrency +=position.markets.developedMarkets * value;markets.emergingMarkets.valueInBaseCurrency +=@@ -1719,11 +1698,8 @@ export class PortfolioService {currency: string;}): PortfolioPosition {return {- currency,activitiesCount: 0,allocationInPercentage: 0,- assetClass: AssetClass.LIQUIDITY,- assetSubClass: AssetSubClass.CASH,assetProfile: {currency,assetClass: AssetClass.LIQUIDITY,@@ -1735,25 +1711,19 @@ export class PortfolioService {sectors: [],symbol: currency},- countries: [],- dataSource: undefined,dateOfFirstActivity: undefined,dividend: 0,grossPerformance: 0,grossPerformancePercent: 0,grossPerformancePercentWithCurrencyEffect: 0,grossPerformanceWithCurrencyEffect: 0,- holdings: [],investment: balance,marketPrice: 0,- name: currency,netPerformance: 0,netPerformancePercent: 0,netPerformancePercentWithCurrencyEffect: 0,netPerformanceWithCurrencyEffect: 0,quantity: 0,- sectors: [],- symbol: currency,tags: [],valueInBaseCurrency: balance};diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.tsindex 1e943824c6..decb306823 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts@@ -139,7 +139,7 @@ export class GfCreateOrUpdateActivityDialogComponent {return !['CASH'].includes(assetProfile.assetSubClass);}).sort((a, b) => {- return a.name?.localeCompare(b.name);+ return a.assetProfile.name?.localeCompare(b.assetProfile.name);}).map(({ assetProfile }) => {return {diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.tsindex 42260d648d..c3dbe6cf29 100644--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts@@ -226,7 +226,8 @@ export class GfImportActivitiesDialogComponent {this.assetProfileForm.controls.assetProfileIdentifier.disable();const { dataSource, symbol } =- this.assetProfileForm.controls.assetProfileIdentifier.value ?? {};+ this.assetProfileForm.controls.assetProfileIdentifier.value+ ?.assetProfile ?? {};if (!dataSource || !symbol) {return;diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.tsindex a7f8cd2ec6..f48b551bb4 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts@@ -73,15 +73,14 @@ export class GfAllocationsPageComponent implements OnInit {public hasImpersonationId: boolean;public holdings: {[symbol: string]: Pick<- PortfolioPosition,+ PortfolioPosition['assetProfile'],| 'assetClass'| 'assetClassLabel'| 'assetSubClass'| 'assetSubClassLabel'| 'currency'- | 'exchange'| 'name'- > & { etfProvider: string; value: number };+ > & { etfProvider: string; exchange?: string; value: number };};public isLoading = false;public markets: {@@ -206,7 +205,7 @@ export class GfAllocationsPageComponent implements OnInit {assetSubClass,name}: {- assetSubClass: PortfolioPosition['assetSubClass'];+ assetSubClass: PortfolioPosition['assetProfile']['assetSubClass'];name: string;}) {if (assetSubClass === 'ETF') {@@ -333,24 +332,27 @@ export class GfAllocationsPageComponent implements OnInit {this.holdings[symbol] = {value,- assetClass: position.assetClass || (UNKNOWN_KEY as AssetClass),- assetClassLabel: position.assetClassLabel || UNKNOWN_KEY,- assetSubClass: position.assetSubClass || (UNKNOWN_KEY as AssetSubClass),- assetSubClassLabel: position.assetSubClassLabel || UNKNOWN_KEY,- currency: position.currency,+ assetClass:+ position.assetProfile.assetClass || (UNKNOWN_KEY as AssetClass),+ assetClassLabel: position.assetProfile.assetClassLabel || UNKNOWN_KEY,+ assetSubClass:+ position.assetProfile.assetSubClass || (UNKNOWN_KEY as AssetSubClass),+ assetSubClassLabel:+ position.assetProfile.assetSubClassLabel || UNKNOWN_KEY,+ currency: position.assetProfile.currency,etfProvider: this.extractEtfProvider({- assetSubClass: position.assetSubClass,- name: position.name+ assetSubClass: position.assetProfile.assetSubClass,+ name: position.assetProfile.name}),exchange: position.exchange,- name: position.name+ name: position.assetProfile.name};- if (position.assetClass !== AssetClass.LIQUIDITY) {+ if (position.assetProfile.assetClass !== AssetClass.LIQUIDITY) {// Prepare analysis data by continents, countries, holdings and sectors except for liquidity- if (position.countries.length > 0) {- for (const country of position.countries) {+ if (position.assetProfile.countries.length > 0) {+ for (const country of position.assetProfile.countries) {const { code, continent, name, weight } = country;if (this.continents[continent]?.value) {@@ -401,12 +403,12 @@ export class GfAllocationsPageComponent implements OnInit {: this.portfolioDetails.holdings[symbol].valueInPercentage;}- if (position.holdings.length > 0) {+ if (position.assetProfile.holdings.length > 0) {for (const {allocationInPercentage,name,valueInBaseCurrency- } of position.holdings) {+ } of position.assetProfile.holdings) {const normalizedAssetName = this.normalizeAssetName(name);if (this.topHoldingsMap[normalizedAssetName]?.value) {@@ -428,8 +430,8 @@ export class GfAllocationsPageComponent implements OnInit {}}- if (position.sectors.length > 0) {- for (const sector of position.sectors) {+ if (position.assetProfile.sectors.length > 0) {+ for (const sector of position.assetProfile.sectors) {const { name, weight } = sector;if (this.sectors[name]?.value) {@@ -463,8 +465,8 @@ export class GfAllocationsPageComponent implements OnInit {}this.symbols[prettifySymbol(symbol)] = {- dataSource: position.dataSource,- name: position.name,+ dataSource: position.assetProfile.dataSource,+ name: position.assetProfile.name,symbol: prettifySymbol(symbol),value: isNumber(position.valueInBaseCurrency)? position.valueInBaseCurrency@@ -517,8 +519,8 @@ export class GfAllocationsPageComponent implements OnInit {this.totalValueInEtf > 0 ? value / this.totalValueInEtf : 0,parents: Object.entries(this.portfolioDetails.holdings).map(([symbol, holding]) => {- if (holding.holdings.length > 0) {- const currentParentHolding = holding.holdings.find(+ if (holding.assetProfile.holdings.length > 0) {+ const currentParentHolding = holding.assetProfile.holdings.find((parentHolding) => {return (this.normalizeAssetName(parentHolding.name) ===@@ -531,7 +533,7 @@ export class GfAllocationsPageComponent implements OnInit {? {allocationInPercentage:currentParentHolding.valueInBaseCurrency / value,- name: holding.name,+ name: holding.assetProfile.name,position: holding,symbol: prettifySymbol(symbol),valueInBaseCurrency:diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.htmlindex 4c5c61bd8e..b93be91826 100644--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html@@ -310,13 +310,15 @@<aclass="d-flex"[queryParams]="{- dataSource: holding.dataSource,+ dataSource: holding.assetProfile.dataSource,holdingDetailDialog: true,- symbol: holding.symbol+ symbol: holding.assetProfile.symbol}"[routerLink]="[]">- <div class="flex-grow-1 mr-2">{{ holding.name }}</div>+ <div class="flex-grow-1 mr-2">+ {{ holding.assetProfile.name }}+ </div><div class="d-flex justify-content-end"><gf-valueclass="justify-content-end"@@ -359,13 +361,15 @@<aclass="d-flex"[queryParams]="{- dataSource: holding.dataSource,+ dataSource: holding.assetProfile.dataSource,holdingDetailDialog: true,- symbol: holding.symbol+ symbol: holding.assetProfile.symbol}"[routerLink]="[]">- <div class="flex-grow-1 mr-2">{{ holding.name }}</div>+ <div class="flex-grow-1 mr-2">+ {{ holding.assetProfile.name }}+ </div><div class="d-flex justify-content-end"><gf-valueclass="justify-content-end"diff --git a/apps/client/src/app/pages/public/public-page.component.ts b/apps/client/src/app/pages/public/public-page.component.tsindex 43eb23eb94..f52639db60 100644--- a/apps/client/src/app/pages/public/public-page.component.ts+++ b/apps/client/src/app/pages/public/public-page.component.ts@@ -74,7 +74,10 @@ export class GfPublicPageComponent implements OnInit {};protected readonly pageSize = Number.MAX_SAFE_INTEGER;protected positions: {- [symbol: string]: Pick<PortfolioPosition, 'currency' | 'name'> & {+ [symbol: string]: Pick<+ PortfolioPosition['assetProfile'],+ 'currency' | 'name'+ > & {value: number;};};diff --git a/libs/common/src/lib/interfaces/portfolio-position.interface.ts b/libs/common/src/lib/interfaces/portfolio-position.interface.tsindex c4ef2e3dc7..c94a1efa52 100644--- a/libs/common/src/lib/interfaces/portfolio-position.interface.ts+++ b/libs/common/src/lib/interfaces/portfolio-position.interface.ts@@ -1,22 +1,12 @@import { Market, MarketAdvanced } from '@ghostfolio/common/types';-import { AssetClass, AssetSubClass, DataSource, Tag } from '@prisma/client';+import { Tag } from '@prisma/client';-import { Country } from './country.interface';import { EnhancedSymbolProfile } from './enhanced-symbol-profile.interface';-import { Holding } from './holding.interface';-import { Sector } from './sector.interface';export interface PortfolioPosition {activitiesCount: number;allocationInPercentage: number;-- /** @deprecated */- assetClass?: AssetClass;-- /** @deprecated */- assetClassLabel?: string;-assetProfile: Pick<EnhancedSymbolProfile,| 'assetClass'@@ -33,22 +23,6 @@ export interface PortfolioPosition {assetClassLabel?: string;assetSubClassLabel?: string;};-- /** @deprecated */- assetSubClass?: AssetSubClass;-- /** @deprecated */- assetSubClassLabel?: string;-- /** @deprecated */- countries: Country[];-- /** @deprecated */- currency: string;-- /** @deprecated */- dataSource: DataSource;-dateOfFirstActivity: Date;dividend: number;exchange?: string;@@ -56,38 +30,19 @@ export interface PortfolioPosition {grossPerformancePercent: number;grossPerformancePercentWithCurrencyEffect: number;grossPerformanceWithCurrencyEffect: number;-- /** @deprecated */- holdings: Holding[];-investment: number;marketChange?: number;marketChangePercent?: number;marketPrice: number;markets?: { [key in Market]: number };marketsAdvanced?: { [key in MarketAdvanced]: number };-- /** @deprecated */- name: string;-netPerformance: number;netPerformancePercent: number;netPerformancePercentWithCurrencyEffect: number;netPerformanceWithCurrencyEffect: number;quantity: number;-- /** @deprecated */- sectors: Sector[];-- /** @deprecated */- symbol: string;-tags?: Tag[];type?: string;-- /** @deprecated */- url?: string;-valueInBaseCurrency?: number;valueInPercentage?: number;}diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.tsindex a0985a9794..3c162a310d 100644--- a/libs/ui/src/lib/assistant/assistant.component.ts+++ b/libs/ui/src/lib/assistant/assistant.component.ts@@ -504,11 +504,16 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ holdings }) => {this.holdings = holdings- .filter(({ assetSubClass }) => {- return assetSubClass && !['CASH'].includes(assetSubClass);+ .filter(({ assetProfile }) => {+ return (+ assetProfile.assetSubClass &&+ !['CASH'].includes(assetProfile.assetSubClass)+ );}).sort((a, b) => {- return a.name?.localeCompare(b.name);+ return (a.assetProfile.name ?? '').localeCompare(+ b.assetProfile.name ?? ''+ );});this.setPortfolioFilterFormValues();@@ -530,11 +535,11 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {type: 'ASSET_CLASS'},{- id: filterValue?.holding?.dataSource ?? '',+ id: filterValue?.holding?.assetProfile?.dataSource ?? '',type: 'DATA_SOURCE'},{- id: filterValue?.holding?.symbol ?? '',+ id: filterValue?.holding?.assetProfile?.symbol ?? '',type: 'SYMBOL'},{@@ -718,18 +723,16 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {return EMPTY;}),map(({ holdings }) => {- return holdings.map(- ({ assetSubClass, currency, dataSource, name, symbol }) => {- return {- currency,- dataSource,- name,- symbol,- assetSubClassString: translate(assetSubClass ?? ''),- mode: SearchMode.HOLDING as const- };- }- );+ return holdings.map(({ assetProfile }) => {+ return {+ assetSubClassString: translate(assetProfile.assetSubClass ?? ''),+ currency: assetProfile.currency ?? '',+ dataSource: assetProfile.dataSource,+ mode: SearchMode.HOLDING as const,+ name: assetProfile.name ?? '',+ symbol: assetProfile.symbol+ };+ });}),takeUntilDestroyed(this.destroyRef));@@ -777,8 +780,8 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {return (!!(dataSource && symbol) &&getAssetProfileIdentifier({- dataSource: holding.dataSource,- symbol: holding.symbol+ dataSource: holding.assetProfile.dataSource,+ symbol: holding.assetProfile.symbol}) === getAssetProfileIdentifier({ dataSource, symbol }));});diff --git a/libs/ui/src/lib/mocks/holdings.ts b/libs/ui/src/lib/mocks/holdings.tsindex b32eb527aa..11f3bec0e8 100644--- a/libs/ui/src/lib/mocks/holdings.ts+++ b/libs/ui/src/lib/mocks/holdings.ts@@ -4,11 +4,11 @@ export const holdings: PortfolioPosition[] = [{activitiesCount: 1,allocationInPercentage: 0.042990776363386086,- assetClass: 'EQUITY',- assetClassLabel: 'Equity',assetProfile: {assetClass: 'EQUITY',+ assetClassLabel: 'Equity',assetSubClass: 'STOCK',+ assetSubClassLabel: 'Stock',countries: [{code: 'US',@@ -20,60 +20,40 @@ export const holdings: PortfolioPosition[] = [currency: 'USD',dataSource: 'YAHOO',holdings: [],+ name: 'Apple Inc',sectors: [{name: 'Technology',weight: 1}],- symbol: 'AAPL'+ symbol: 'AAPL',+ url: 'https://www.apple.com'},- assetSubClass: 'STOCK',- assetSubClassLabel: 'Stock',- countries: [- {- code: 'US',- continent: 'North America',- name: 'United States',- weight: 1- }- ],- currency: 'USD',- dataSource: 'YAHOO',dateOfFirstActivity: new Date('2021-12-01T00:00:00.000Z'),dividend: 0,grossPerformance: 3856,grossPerformancePercent: 0.46047289228564603,grossPerformancePercentWithCurrencyEffect: 0.46047289228564603,grossPerformanceWithCurrencyEffect: 3856,- holdings: [],investment: 8374,marketPrice: 244.6,- name: 'Apple Inc',netPerformance: 3855,netPerformancePercent: 0.460353475041796,netPerformancePercentWithCurrencyEffect: 0.036440677966101696,netPerformanceWithCurrencyEffect: 430,quantity: 50,- sectors: [- {- name: 'Technology',- weight: 1- }- ],- symbol: 'AAPL',tags: [],- url: 'https://www.apple.com',valueInBaseCurrency: 12230},{activitiesCount: 2,allocationInPercentage: 0.02377401948293552,- assetClass: 'EQUITY',- assetClassLabel: 'Equity',assetProfile: {assetClass: 'EQUITY',+ assetClassLabel: 'Equity',assetSubClass: 'STOCK',+ assetSubClassLabel: 'Stock',countries: [{code: 'DE',@@ -85,60 +65,40 @@ export const holdings: PortfolioPosition[] = [currency: 'EUR',dataSource: 'YAHOO',holdings: [],+ name: 'Allianz SE',sectors: [{name: 'Financial Services',weight: 1}],- symbol: 'ALV.DE'+ symbol: 'ALV.DE',+ url: 'https://www.allianz.com'},- assetSubClass: 'STOCK',- assetSubClassLabel: 'Stock',- countries: [- {- code: 'DE',- continent: 'Europe',- name: 'Germany',- weight: 1- }- ],- currency: 'EUR',- dataSource: 'YAHOO',dateOfFirstActivity: new Date('2021-04-23T00:00:00.000Z'),dividend: 192,grossPerformance: 2226.700251889169,grossPerformancePercent: 0.49083842309827874,grossPerformancePercentWithCurrencyEffect: 0.29306136948826367,grossPerformanceWithCurrencyEffect: 1532.8272791336772,- holdings: [],investment: 4536.523929471033,marketPrice: 322.2,- name: 'Allianz SE',netPerformance: 2222.2921914357685,netPerformancePercent: 0.48986674069961134,netPerformancePercentWithCurrencyEffect: 0.034489367670592026,netPerformanceWithCurrencyEffect: 225.48257403052068,quantity: 20,- sectors: [- {- name: 'Financial Services',- weight: 1- }- ],- symbol: 'ALV.DE',tags: [],- url: 'https://www.allianz.com',valueInBaseCurrency: 6763.224181360202},{activitiesCount: 1,allocationInPercentage: 0.08038536990007467,- assetClass: 'EQUITY',- assetClassLabel: 'Equity',assetProfile: {assetClass: 'EQUITY',+ assetClassLabel: 'Equity',assetSubClass: 'STOCK',+ assetSubClassLabel: 'Stock',countries: [{code: 'US',@@ -150,101 +110,73 @@ export const holdings: PortfolioPosition[] = [currency: 'USD',dataSource: 'YAHOO',holdings: [],+ name: 'Amazon.com, Inc.',sectors: [{name: 'Consumer Discretionary',weight: 1}],- symbol: 'AMZN'+ symbol: 'AMZN',+ url: 'https://www.aboutamazon.com'},- assetSubClass: 'STOCK',- assetSubClassLabel: 'Stock',- countries: [- {- code: 'US',- continent: 'North America',- name: 'United States',- weight: 1- }- ],- currency: 'USD',- dataSource: 'YAHOO',dateOfFirstActivity: new Date('2018-10-01T00:00:00.000Z'),dividend: 0,grossPerformance: 12758.05,grossPerformancePercent: 1.2619300787837724,grossPerformancePercentWithCurrencyEffect: 1.2619300787837724,grossPerformanceWithCurrencyEffect: 12758.05,- holdings: [],investment: 10109.95,marketPrice: 228.68,- name: 'Amazon.com, Inc.',netPerformance: 12677.26,netPerformancePercent: 1.253938941339967,netPerformancePercentWithCurrencyEffect: -0.037866008722316276,netPerformanceWithCurrencyEffect: -899.99926757812,quantity: 100,- sectors: [- {- name: 'Consumer Discretionary',- weight: 1- }- ],- symbol: 'AMZN',tags: [],- url: 'https://www.aboutamazon.com',valueInBaseCurrency: 22868},{activitiesCount: 1,allocationInPercentage: 0.19216416482928922,- assetClass: 'LIQUIDITY',- assetClassLabel: 'Liquidity',assetProfile: {assetClass: 'LIQUIDITY',- assetSubClass: 'CASH',+ assetClassLabel: 'Liquidity',+ assetSubClass: 'CRYPTOCURRENCY',+ assetSubClassLabel: 'Cryptocurrency',countries: [],currency: 'USD',dataSource: 'COINGECKO',holdings: [],+ name: 'Bitcoin',sectors: [],- symbol: 'bitcoin'+ symbol: 'bitcoin',+ url: undefined},- assetSubClass: 'CRYPTOCURRENCY',- assetSubClassLabel: 'Cryptocurrency',- countries: [],- currency: 'USD',- dataSource: 'COINGECKO',dateOfFirstActivity: new Date('2017-08-16T00:00:00.000Z'),dividend: 0,grossPerformance: 52666.7898248,grossPerformancePercent: 26.333394912400003,grossPerformancePercentWithCurrencyEffect: 26.333394912400003,grossPerformanceWithCurrencyEffect: 52666.7898248,- holdings: [],investment: 1999.9999999999998,marketPrice: 97364,- name: 'Bitcoin',netPerformance: 52636.8898248,netPerformancePercent: 26.3184449124,netPerformancePercentWithCurrencyEffect: -0.04760906442310894,netPerformanceWithCurrencyEffect: -2732.737808972287,quantity: 0.5614682,- sectors: [],- symbol: 'bitcoin',tags: [],- url: undefined,valueInBaseCurrency: 54666.7898248},{activitiesCount: 1,allocationInPercentage: 0.04307127421937313,- assetClass: 'EQUITY',- assetClassLabel: 'Equity',assetProfile: {assetClass: 'EQUITY',+ assetClassLabel: 'Equity',assetSubClass: 'STOCK',+ assetSubClassLabel: 'Stock',countries: [{code: 'US',@@ -256,60 +188,40 @@ export const holdings: PortfolioPosition[] = [currency: 'USD',dataSource: 'YAHOO',holdings: [],+ name: 'Microsoft Corporation',sectors: [{name: 'Technology',weight: 1}],- symbol: 'MSFT'+ symbol: 'MSFT',+ url: 'https://www.microsoft.com'},- assetSubClass: 'STOCK',- assetSubClassLabel: 'Stock',- countries: [- {- code: 'US',- continent: 'North America',- name: 'United States',- weight: 1- }- ],- currency: 'USD',- dataSource: 'YAHOO',dateOfFirstActivity: new Date('2023-01-03T00:00:00.000Z'),dividend: 0,grossPerformance: 5065.5,grossPerformancePercent: 0.7047750229568411,grossPerformancePercentWithCurrencyEffect: 0.7047750229568411,grossPerformanceWithCurrencyEffect: 5065.5,- holdings: [],investment: 7187.4,marketPrice: 408.43,- name: 'Microsoft Corporation',netPerformance: 5065.5,netPerformancePercent: 0.7047750229568411,netPerformancePercentWithCurrencyEffect: -0.015973588391056275,netPerformanceWithCurrencyEffect: -198.899926757814,quantity: 30,- sectors: [- {- name: 'Technology',- weight: 1- }- ],- symbol: 'MSFT',tags: [],- url: 'https://www.microsoft.com',valueInBaseCurrency: 12252.9},{activitiesCount: 1,allocationInPercentage: 0.18762679306394897,- assetClass: 'EQUITY',- assetClassLabel: 'Equity',assetProfile: {assetClass: 'EQUITY',+ assetClassLabel: 'Equity',assetSubClass: 'STOCK',+ assetSubClassLabel: 'Stock',countries: [{code: 'US',@@ -321,60 +233,40 @@ export const holdings: PortfolioPosition[] = [currency: 'USD',dataSource: 'YAHOO',holdings: [],+ name: 'Tesla, Inc.',sectors: [{name: 'Consumer Discretionary',weight: 1}],- symbol: 'TSLA'+ symbol: 'TSLA',+ url: 'https://www.tesla.com'},- assetSubClass: 'STOCK',- assetSubClassLabel: 'Stock',- countries: [- {- code: 'US',- continent: 'North America',- name: 'United States',- weight: 1- }- ],- currency: 'USD',- dataSource: 'YAHOO',dateOfFirstActivity: new Date('2017-01-03T00:00:00.000Z'),dividend: 0,grossPerformance: 51227.500000005,grossPerformancePercent: 23.843379101756675,grossPerformancePercentWithCurrencyEffect: 23.843379101756675,grossPerformanceWithCurrencyEffect: 51227.500000005,- holdings: [],investment: 2148.499999995,marketPrice: 355.84,- name: 'Tesla, Inc.',netPerformance: 51197.500000005,netPerformancePercent: 23.829415871596066,netPerformancePercentWithCurrencyEffect: -0.12051410125545206,netPerformanceWithCurrencyEffect: -7314.00091552734,quantity: 150,- sectors: [- {- name: 'Consumer Discretionary',- weight: 1- }- ],- symbol: 'TSLA',tags: [],- url: 'https://www.tesla.com',valueInBaseCurrency: 53376},{activitiesCount: 5,allocationInPercentage: 0.053051250766657634,- assetClass: 'EQUITY',- assetClassLabel: 'Equity',assetProfile: {assetClass: 'EQUITY',+ assetClassLabel: 'Equity',assetSubClass: 'ETF',+ assetSubClassLabel: 'ETF',countries: [{code: 'US',@@ -386,50 +278,30 @@ export const holdings: PortfolioPosition[] = [currency: 'USD',dataSource: 'YAHOO',holdings: [],+ name: 'Vanguard Total Stock Market Index Fund ETF Shares',sectors: [{name: 'Equity',weight: 1}],- symbol: 'VTI'+ symbol: 'VTI',+ url: 'https://www.vanguard.com'},- assetSubClass: 'ETF',- assetSubClassLabel: 'ETF',- countries: [- {- code: 'US',- weight: 1,- continent: 'North America',- name: 'United States'- }- ],- currency: 'USD',- dataSource: 'YAHOO',dateOfFirstActivity: new Date('2019-03-01T00:00:00.000Z'),dividend: 0,grossPerformance: 6845.8,grossPerformancePercent: 1.0164758094605268,grossPerformancePercentWithCurrencyEffect: 1.0164758094605268,grossPerformanceWithCurrencyEffect: 6845.8,- holdings: [],investment: 8246.2,marketPrice: 301.84,- name: 'Vanguard Total Stock Market Index Fund ETF Shares',netPerformance: 6746.3,netPerformancePercent: 1.0017018833976383,netPerformancePercentWithCurrencyEffect: 0.01085061564051406,netPerformanceWithCurrencyEffect: 161.99969482422,quantity: 50,- sectors: [- {- name: 'Equity',- weight: 1- }- ],- symbol: 'VTI',tags: [],- url: 'https://www.vanguard.com',valueInBaseCurrency: 15092}];diff --git a/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.html b/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.htmlindex f5dbac698e..33bde3fd6c 100644--- a/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.html+++ b/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.html@@ -29,18 +29,19 @@[compareWith]="holdingComparisonFunction"><mat-select-trigger>{{- filterForm.get('holding')?.value?.name+ filterForm.get('holding')?.value?.assetProfile?.name}}</mat-select-trigger><mat-option [value]="null" />- @for (holding of holdings(); track holding.name) {+ @for (holding of holdings(); track holding.assetProfile.name) {<mat-option [value]="holding"><div class="line-height-1 text-truncate"><span- ><b>{{ holding.name }}</b></span+ ><b>{{ holding.assetProfile.name }}</b></span><br /><small class="text-muted"- >{{ holding.symbol | gfSymbol }} · {{ holding.currency }}</small+ >{{ holding.assetProfile.symbol | gfSymbol }} ·+ {{ holding.assetProfile.currency }}</small></div></mat-option>diff --git a/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts b/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.tsindex c1f82315c1..20e8b0f0f7 100644--- a/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts+++ b/libs/ui/src/lib/portfolio-filter-form/portfolio-filter-form.component.ts@@ -109,7 +109,8 @@ export class GfPortfolioFilterFormComponent}return (- getAssetProfileIdentifier(option) === getAssetProfileIdentifier(value)+ getAssetProfileIdentifier(option.assetProfile) ===+ getAssetProfileIdentifier(value.assetProfile));}