Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/improve market data tab of holding detail dialog (#7693)
Thomas Kaulaa9595ba5997
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.tsindex 33a0695aa8..b8f5ac5697 100644--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts@@ -34,6 +34,7 @@ import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historicalimport { translate } from '@ghostfolio/ui/i18n';import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart';+import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';import { DataService } from '@ghostfolio/ui/services';import { GfTagsSelectorComponent } from '@ghostfolio/ui/tags-selector';import { GfValueComponent } from '@ghostfolio/ui/value';@@ -102,6 +103,7 @@ import {GfHistoricalMarketDataEditorComponent,GfLineChartComponent,GfPortfolioProportionChartComponent,+ GfPremiumIndicatorComponent,GfTagsSelectorComponent,GfValueComponent,IonIcon,@@ -161,6 +163,7 @@ export class GfHoldingDetailDialogComponent implements OnInit {protected investmentInBaseCurrencyWithCurrencyEffect: number;protected investmentInBaseCurrencyWithCurrencyEffectPrecision = 2;protected isLoading = true;+ protected isOwnAssetProfile: boolean;protected readonly isUUID = isUUID;protected marketDataItems: MarketData[] = [];protected marketPrice: number;@@ -367,13 +370,10 @@ export class GfHoldingDetailDialogComponent implements OnInit {this.feeInBaseCurrency = feeInBaseCurrency;- this.hasPermissionToReadMarketDataOfOwnAssetProfile =- hasPermission(- this.user?.permissions,- permissions.readMarketDataOfOwnAssetProfile- ) &&- assetProfile?.dataSource === 'MANUAL' &&- assetProfile?.userId === this.user?.id;+ this.hasPermissionToReadMarketDataOfOwnAssetProfile = hasPermission(+ this.user?.permissions,+ permissions.readMarketDataOfOwnAssetProfile+ );this.historicalDataItems = historicalData.map(({ averagePrice, date, marketPrice }) => {@@ -400,6 +400,10 @@ export class GfHoldingDetailDialogComponent implements OnInit {this.investmentInBaseCurrencyWithCurrencyEffectPrecision = 0;}+ this.isOwnAssetProfile =+ assetProfile?.dataSource === 'MANUAL' &&+ assetProfile?.userId === this.user?.id;+this.marketPrice = marketPrice;this.marketPriceMax = marketPriceMax;@@ -574,7 +578,10 @@ export class GfHoldingDetailDialogComponent implements OnInit {});- if (this.hasPermissionToReadMarketDataOfOwnAssetProfile) {+ if (+ this.hasPermissionToReadMarketDataOfOwnAssetProfile &&+ this.isOwnAssetProfile+ ) {this.fetchMarketData();}diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.htmlindex 35a8ed3aa2..51a0783fc3 100644--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html@@ -424,14 +424,14 @@[showValueInBaseCurrency]="false"/></mat-tab>- @if (- hasPermissionToReadMarketDataOfOwnAssetProfile &&- user?.settings?.isExperimentalFeatures- ) {- <mat-tab>+ @if (isOwnAssetProfile && user?.settings?.isExperimentalFeatures) {+ <mat-tab [disabled]="!hasPermissionToReadMarketDataOfOwnAssetProfile"><ng-template mat-tab-label><ion-icon name="server-outline" /><div class="d-none d-sm-block ml-2" i18n>Market Data</div>+ @if (user?.subscription?.type === 'Basic') {+ <gf-premium-indicator class="ml-1" [enableLink]="false" />+ }</ng-template><gf-historical-market-data-editor[currency]="assetProfile?.currency"