Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/extend holding detail dialog by historical market data editor (#4281)
Amandee Ellawalaab379f9abfe6
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 9e65772d16..32623c5284 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Added a new static portfolio analysis rule: _Regional Market Cluster Risk_ (Japan)- Extended the tags selector component by a `readonly` attribute- Extended the tags selector component to support creating custom tags+- Extended the holding detail dialog by the historical market data editor (experimental)- Added global styles to the _Storybook_ setup### Changeddiff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.tsindex 7665e43d9f..30d10c8d6d 100644--- a/apps/api/src/app/user/user.service.ts+++ b/apps/api/src/app/user/user.service.ts@@ -346,7 +346,10 @@ export class UserService {currentPermissions,permissions.accessHoldingsChart,permissions.createAccess,- permissions.readAiPrompt+ permissions.createMarketDataOfOwnAssetProfile,+ permissions.readAiPrompt,+ permissions.readMarketDataOfOwnAssetProfile,+ permissions.updateMarketDataOfOwnAssetProfile);// Reset benchmarkdiff --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 297a990ec0..4f7e4efd4d 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@@ -13,8 +13,10 @@ import {LineChartItem,User} from '@ghostfolio/common/interfaces';+import { hasPermission, permissions } from '@ghostfolio/common/permissions';import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';import { GfDataProviderCreditsComponent } from '@ghostfolio/ui/data-provider-credits';+import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historical-market-data-editor';import { translate } from '@ghostfolio/ui/i18n';import { GfLineChartComponent } from '@ghostfolio/ui/line-chart';import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart';@@ -44,7 +46,7 @@ import { SortDirection } from '@angular/material/sort';import { MatTableDataSource } from '@angular/material/table';import { MatTabsModule } from '@angular/material/tabs';import { Router } from '@angular/router';-import { Account, Tag } from '@prisma/client';+import { Account, MarketData, Tag } from '@prisma/client';import { format, isSameMonth, isToday, parseISO } from 'date-fns';import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';import { Subject } from 'rxjs';@@ -62,6 +64,7 @@ import { HoldingDetailDialogParams } from './interfaces/interfaces';GfDataProviderCreditsComponent,GfDialogFooterModule,GfDialogHeaderModule,+ GfHistoricalMarketDataEditorComponent,GfLineChartComponent,GfPortfolioProportionChartComponent,GfTagsSelectorComponent,@@ -95,9 +98,11 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {public dividendYieldPercentWithCurrencyEffect: number;public feeInBaseCurrency: number;public firstBuyDate: string;+ public hasPermissionToReadMarketDataOfOwnAssetProfile: boolean;public historicalDataItems: LineChartItem[];public investment: number;public investmentPrecision = 2;+ public marketDataItems: MarketData[] = [];public marketPrice: number;public maxPrice: number;public minPrice: number;@@ -231,6 +236,14 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {this.feeInBaseCurrency = feeInBaseCurrency;this.firstBuyDate = firstBuyDate;+ this.hasPermissionToReadMarketDataOfOwnAssetProfile =+ hasPermission(+ this.user?.permissions,+ permissions.readMarketDataOfOwnAssetProfile+ ) &&+ SymbolProfile?.dataSource === 'MANUAL' &&+ SymbolProfile?.userId === this.user?.id;+this.historicalDataItems = historicalData.map(({ averagePrice, date, marketPrice }) => {this.benchmarkDataItems.push({@@ -393,6 +406,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {});+ if (this.hasPermissionToReadMarketDataOfOwnAssetProfile) {+ this.fetchMarketData();+ }+this.changeDetectorRef.markForCheck();});@@ -448,6 +465,12 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {});}+ public onMarketDataChanged(withRefresh = false) {+ if (withRefresh) {+ this.fetchMarketData();+ }+ }+public onTagsChanged(tags: Tag[]) {this.activityForm.get('tags').setValue(tags);}@@ -464,4 +487,27 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {this.unsubscribeSubject.next();this.unsubscribeSubject.complete();}++ private fetchMarketData() {+ this.dataService+ .fetchMarketDataBySymbol({+ dataSource: this.data.dataSource,+ symbol: this.data.symbol+ })+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe(({ marketData }) => {+ this.marketDataItems = marketData;++ this.historicalDataItems = this.marketDataItems.map(+ ({ date, marketPrice }) => {+ return {+ date: format(date, DATE_FORMAT),+ value: marketPrice+ };+ }+ );++ this.changeDetectorRef.markForCheck();+ });+ }}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 d820ddf7db..e7b3cc1b27 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@@ -364,6 +364,27 @@[showValueInBaseCurrency]="false"/></mat-tab>+ @if (+ hasPermissionToReadMarketDataOfOwnAssetProfile &&+ user?.settings?.isExperimentalFeatures+ ) {+ <mat-tab>+ <ng-template mat-tab-label>+ <ion-icon name="server-outline" />+ <div class="d-none d-sm-block ml-2" i18n>Market Data</div>+ </ng-template>+ <gf-historical-market-data-editor+ [currency]="SymbolProfile?.currency"+ [dataSource]="SymbolProfile?.dataSource"+ [dateOfFirstActivity]="firstBuyDate"+ [locale]="data.locale"+ [marketData]="marketDataItems"+ [symbol]="SymbolProfile?.symbol"+ [user]="user"+ (marketDataChanged)="onMarketDataChanged($event)"+ />+ </mat-tab>+ }</mat-tab-group><gf-tags-selectordiff --git a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.htmlindex b35e1d8129..b72ba15f8e 100644--- a/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html+++ b/libs/ui/src/lib/historical-market-data-editor/historical-market-data-editor.component.html@@ -48,6 +48,7 @@cdkTextareaAutosizeformControlName="csvString"matInput+ rows="2"type="text"(keyup.enter)="$event.stopPropagation()"></textarea>