Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/migrate allocations page to work with filters of assistant (#2933)
Thomas Kaulbe93ca896816
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex c9d908b082..bb709950c2 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Migrated the portfolio allocations to work with the filters of the assistant (experimental)- Migrated the portfolio holdings to work with the filters of the assistant (experimental)## 2.45.0 - 2024-01-27diff --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 9ef2ed9d73..eb87c21cae 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@@ -148,9 +148,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {this.initialize();- return this.dataService.fetchPortfolioDetails({- filters: this.activeFilters- });+ return this.fetchPortfolioDetails();}),takeUntil(this.unsubscribeSubject))@@ -159,7 +157,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {this.portfolioDetails = portfolioDetails;- this.initializeAnalysisData();+ this.initializeAllocationsData();this.isLoading = false;@@ -210,6 +208,26 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {? `{0}%`: `{0} ${this.user?.settings?.baseCurrency}`;+ if (this.user?.settings?.isExperimentalFeatures === true) {+ this.isLoading = true;++ this.initialize();++ this.fetchPortfolioDetails()+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe((portfolioDetails) => {+ this.initialize();++ this.portfolioDetails = portfolioDetails;++ this.initializeAllocationsData();++ this.isLoading = false;++ this.changeDetectorRef.markForCheck();+ });+ }+this.changeDetectorRef.markForCheck();}});@@ -217,7 +235,52 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {this.initialize();}- public initialize() {+ public onAccountChartClicked({ symbol }: UniqueAsset) {+ if (symbol && symbol !== UNKNOWN_KEY) {+ this.router.navigate([], {+ queryParams: { accountId: symbol, accountDetailDialog: true }+ });+ }+ }++ public onSymbolChartClicked({ dataSource, symbol }: UniqueAsset) {+ if (dataSource && symbol) {+ this.router.navigate([], {+ queryParams: { dataSource, symbol, positionDetailDialog: true }+ });+ }+ }++ public ngOnDestroy() {+ this.unsubscribeSubject.next();+ this.unsubscribeSubject.complete();+ }++ private extractEtfProvider({+ assetSubClass,+ name+ }: {+ assetSubClass: PortfolioPosition['assetSubClass'];+ name: string;+ }) {+ if (assetSubClass === 'ETF') {+ const [firstWord] = name.split(' ');+ return firstWord;+ }++ return UNKNOWN_KEY;+ }++ private fetchPortfolioDetails() {+ return this.dataService.fetchPortfolioDetails({+ filters:+ this.activeFilters.length > 0+ ? this.activeFilters+ : this.userService.getFilters()+ });+ }++ private initialize() {this.accounts = {};this.continents = {[UNKNOWN_KEY]: {@@ -310,7 +373,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {};}- public initializeAnalysisData() {+ private initializeAllocationsData() {for (const [id,{ name, valueInBaseCurrency, valueInPercentage }@@ -540,27 +603,6 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {this.markets[UNKNOWN_KEY].value / marketsTotal;}- public onAccountChartClicked({ symbol }: UniqueAsset) {- if (symbol && symbol !== UNKNOWN_KEY) {- this.router.navigate([], {- queryParams: { accountId: symbol, accountDetailDialog: true }- });- }- }-- public onSymbolChartClicked({ dataSource, symbol }: UniqueAsset) {- if (dataSource && symbol) {- this.router.navigate([], {- queryParams: { dataSource, symbol, positionDetailDialog: true }- });- }- }-- public ngOnDestroy() {- this.unsubscribeSubject.next();- this.unsubscribeSubject.complete();- }-private openAccountDetailDialog(aAccountId: string) {const dialogRef = this.dialog.open(AccountDetailDialog, {autoFocus: false,@@ -621,19 +663,4 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {});});}-- private extractEtfProvider({- assetSubClass,- name- }: {- assetSubClass: PortfolioPosition['assetSubClass'];- name: string;- }) {- if (assetSubClass === 'ETF') {- const [firstWord] = name.split(' ');- return firstWord;- }-- return UNKNOWN_KEY;- }}diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.htmlindex b13e8c2d80..7088c177bf 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html@@ -2,12 +2,14 @@<div class="row"><div class="col"><h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>Allocations</h1>+ @if (!user?.settings?.isExperimentalFeatures) {<gf-activities-filter[allFilters]="allFilters"[isLoading]="isLoading"[placeholder]="placeholder"(valueChanged)="filters$.next($event)"/>+ }</div></div><div class="row">