Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/restructure portfolio page (#1429)
Thomas Kaul43426c9b0147
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 5fe8f9e28c..839d41c389 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0## Unreleased+### Added++- Added tabs to the portfolio page+### Changed+- Merged the _FIRE_ calculator and the _X-ray_ section to a single page- Tightened the validation rule of the base currency environment variable (`BASE_CURRENCY`)## 1.209.0 - 05.11.2022diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.tsindex 2596f5e39a..7ce9761850 100644--- a/apps/api/src/app/portfolio/portfolio.controller.ts+++ b/apps/api/src/app/portfolio/portfolio.controller.ts@@ -429,16 +429,19 @@ export class PortfolioController {public async getReport(@Headers('impersonation-id') impersonationId: string): Promise<PortfolioReport> {+ const report = await this.portfolioService.getReport(impersonationId);+if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&this.request.user.subscription.type === 'Basic') {- throw new HttpException(- getReasonPhrase(StatusCodes.FORBIDDEN),- StatusCodes.FORBIDDEN- );+ for (const rule in report.rules) {+ if (report.rules[rule]) {+ report.rules[rule] = [];+ }+ }}- return await this.portfolioService.getReport(impersonationId);+ return report;}}diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.tsindex 71e46416b6..d09beffc34 100644--- a/apps/client/src/app/app-routing.module.ts+++ b/apps/client/src/app/app-routing.module.ts@@ -145,48 +145,6 @@ const routes: Routes = [(m) => m.PortfolioPageModule)},- {- path: 'portfolio/activities',- loadChildren: () =>- import('./pages/portfolio/activities/activities-page.module').then(- (m) => m.ActivitiesPageModule- )- },- {- path: 'portfolio/allocations',- loadChildren: () =>- import('./pages/portfolio/allocations/allocations-page.module').then(- (m) => m.AllocationsPageModule- )- },- {- path: 'portfolio/analysis',- loadChildren: () =>- import('./pages/portfolio/analysis/analysis-page.module').then(- (m) => m.AnalysisPageModule- )- },- {- path: 'portfolio/fire',- loadChildren: () =>- import('./pages/portfolio/fire/fire-page.module').then(- (m) => m.FirePageModule- )- },- {- path: 'portfolio/holdings',- loadChildren: () =>- import('./pages/portfolio/holdings/holdings-page.module').then(- (m) => m.HoldingsPageModule- )- },- {- path: 'portfolio/report',- loadChildren: () =>- import('./pages/portfolio/report/report-page.module').then(- (m) => m.ReportPageModule- )- },{path: 'pricing',loadChildren: () =>diff --git a/apps/client/src/app/components/rules/rules.component.html b/apps/client/src/app/components/rules/rules.component.htmlindex a049e6134d..1c7cedfc7e 100644--- a/apps/client/src/app/components/rules/rules.component.html+++ b/apps/client/src/app/components/rules/rules.component.html@@ -10,7 +10,7 @@></gf-no-transactions-info-indicator></mat-card>- <gf-rule *ngIf="rules === undefined" [isLoading]="true"></gf-rule>+ <gf-rule *ngIf="rules?.length === 0" [isLoading]="true"></gf-rule><ng-container *ngIf="rules !== null && rules !== undefined"><gf-rule *ngFor="let rule of rules" [rule]="rule"></gf-rule></ng-container>diff --git a/apps/client/src/app/components/rules/rules.component.ts b/apps/client/src/app/components/rules/rules.component.tsindex e5429bdcc7..e1f15d23fa 100644--- a/apps/client/src/app/components/rules/rules.component.ts+++ b/apps/client/src/app/components/rules/rules.component.ts@@ -9,7 +9,7 @@ import { PortfolioReportRule } from '@ghostfolio/common/interfaces';})export class RulesComponent {@Input() hasPermissionToCreateOrder: boolean;- @Input() rules: PortfolioReportRule;+ @Input() rules: PortfolioReportRule[];public constructor() {}}diff --git a/apps/client/src/app/components/rules/rules.module.ts b/apps/client/src/app/components/rules/rules.module.tsindex c5a3731bb5..ebf4eaeafc 100644--- a/apps/client/src/app/components/rules/rules.module.ts+++ b/apps/client/src/app/components/rules/rules.module.ts@@ -21,4 +21,4 @@ import { RulesComponent } from './rules.component';],schemas: [CUSTOM_ELEMENTS_SCHEMA]})-export class RulesModule {}+export class GfRulesModule {}diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.tsindex 18b543c094..ef0a21d4e8 100644--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts@@ -1,6 +1,5 @@import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';import { MatDialog } from '@angular/material/dialog';-import { MatSnackBar } from '@angular/material/snack-bar';import { ActivatedRoute, Router } from '@angular/router';import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';@@ -10,7 +9,6 @@ import { PositionDetailDialog } from '@ghostfolio/client/components/position/posimport { DataService } from '@ghostfolio/client/services/data.service';import { IcsService } from '@ghostfolio/client/services/ics/ics.service';import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';-import { ImportActivitiesService } from '@ghostfolio/client/services/import-activities.service';import { UserService } from '@ghostfolio/client/services/user/user.service';import { downloadAsFile } from '@ghostfolio/common/helper';import { User } from '@ghostfolio/common/interfaces';diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.component.tsindex 032cf3b315..fca1814d0f 100644--- a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts@@ -1,7 +1,7 @@import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';import { DataService } from '@ghostfolio/client/services/data.service';import { UserService } from '@ghostfolio/client/services/user/user.service';-import { User } from '@ghostfolio/common/interfaces';+import { PortfolioReportRule, User } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import Big from 'big.js';import { DeviceDetectorService } from 'ngx-device-detector';@@ -15,8 +15,12 @@ import { takeUntil } from 'rxjs/operators';templateUrl: './fire-page.html'})export class FirePageComponent implements OnDestroy, OnInit {+ public accountClusterRiskRules: PortfolioReportRule[];+ public currencyClusterRiskRules: PortfolioReportRule[];public deviceType: string;+ public feeRules: PortfolioReportRule[];public fireWealth: Big;+ public hasPermissionToCreateOrder: boolean;public hasPermissionToUpdateUserSettings: boolean;public isLoading = false;public user: User;@@ -53,12 +57,30 @@ export class FirePageComponent implements OnDestroy, OnInit {this.changeDetectorRef.markForCheck();});+ this.dataService+ .fetchPortfolioReport()+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe((portfolioReport) => {+ this.accountClusterRiskRules =+ portfolioReport.rules['accountClusterRisk'] || null;+ this.currencyClusterRiskRules =+ portfolioReport.rules['currencyClusterRisk'] || null;+ this.feeRules = portfolioReport.rules['fees'] || null;++ this.changeDetectorRef.markForCheck();+ });+this.userService.stateChanged.pipe(takeUntil(this.unsubscribeSubject)).subscribe((state) => {if (state?.user) {this.user = state.user;+ this.hasPermissionToCreateOrder = hasPermission(+ this.user.permissions,+ permissions.createOrder+ );+this.hasPermissionToUpdateUserSettings = hasPermission(this.user.permissions,permissions.updateUserSettingsdiff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.html b/apps/client/src/app/pages/portfolio/fire/fire-page.htmlindex f57ead4532..006dcb800d 100644--- a/apps/client/src/app/pages/portfolio/fire/fire-page.html+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.html@@ -79,3 +79,61 @@</div></div></div>++<div class="container mt-5">+ <div class="row">+ <div class="col">+ <h3 class="align-items-center d-flex justify-content-center mb-3">+ X-ray+ </h3>+ <p class="mb-4">+ Ghostfolio X-ray uses static analysis to identify potential issues and+ risks in your portfolio.+ <span class="d-none"+ >It will be highly configurable in the future: activate / deactivate+ rules and customize the thresholds to match your personal investment+ style.</span+ >+ </p>+ <div class="mb-4">+ <h4 class="align-items-center d-flex m-0">+ <span>Currency Cluster Risks</span+ ><gf-premium-indicator+ *ngIf="user?.subscription?.type === 'Basic'"+ class="ml-1"+ ></gf-premium-indicator>+ </h4>+ <gf-rules+ [hasPermissionToCreateOrder]="hasPermissionToCreateOrder"+ [rules]="currencyClusterRiskRules"+ ></gf-rules>+ </div>+ <div class="mb-4">+ <h4 class="align-items-center d-flex m-0">+ <span>Account Cluster Risks</span+ ><gf-premium-indicator+ *ngIf="user?.subscription?.type === 'Basic'"+ class="ml-1"+ ></gf-premium-indicator>+ </h4>+ <gf-rules+ [hasPermissionToCreateOrder]="hasPermissionToCreateOrder"+ [rules]="accountClusterRiskRules"+ ></gf-rules>+ </div>+ <div>+ <h4 class="align-items-center d-flex m-0">+ <span>Fees</span+ ><gf-premium-indicator+ *ngIf="user?.subscription?.type === 'Basic'"+ class="ml-1"+ ></gf-premium-indicator>+ </h4>+ <gf-rules+ [hasPermissionToCreateOrder]="hasPermissionToCreateOrder"+ [rules]="feeRules"+ ></gf-rules>+ </div>+ </div>+ </div>+</div>diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.module.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.module.tsindex 18fd4a99a8..7518a69d51 100644--- a/apps/client/src/app/pages/portfolio/fire/fire-page.module.ts+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.module.ts@@ -1,5 +1,6 @@import { CommonModule } from '@angular/common';import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';+import { GfRulesModule } from '@ghostfolio/client/components/rules/rules.module';import { GfFireCalculatorModule } from '@ghostfolio/ui/fire-calculator';import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';import { GfValueModule } from '@ghostfolio/ui/value';@@ -15,6 +16,7 @@ import { FirePageComponent } from './fire-page.component';FirePageRoutingModule,GfFireCalculatorModule,GfPremiumIndicatorModule,+ GfRulesModule,GfValueModule,NgxSkeletonLoaderModule],diff --git a/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts b/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.tsindex c0c5c55fb1..4fc013ee50 100644--- a/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts+++ b/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts@@ -7,9 +7,45 @@ import { PortfolioPageComponent } from './portfolio-page.component';const routes: Routes = [{canActivate: [AuthGuard],+ children: [+ { path: '', redirectTo: 'analysis', pathMatch: 'full' },+ {+ path: 'analysis',+ loadChildren: () =>+ import('./analysis/analysis-page.module').then(+ (m) => m.AnalysisPageModule+ )+ },+ {+ path: 'holdings',+ loadChildren: () =>+ import('./holdings/holdings-page.module').then(+ (m) => m.HoldingsPageModule+ )+ },+ {+ path: 'activities',+ loadChildren: () =>+ import('./activities/activities-page.module').then(+ (m) => m.ActivitiesPageModule+ )+ },+ {+ path: 'allocations',+ loadChildren: () =>+ import('./allocations/allocations-page.module').then(+ (m) => m.AllocationsPageModule+ )+ },+ {+ path: 'fire',+ loadChildren: () =>+ import('./fire/fire-page.module').then((m) => m.FirePageModule)+ }+ ],component: PortfolioPageComponent,path: '',- title: 'Portfolio'+ title: $localize`Portfolio`}];diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.component.ts b/apps/client/src/app/pages/portfolio/portfolio-page.component.tsindex 9c87f7bd11..b2c3933b0e 100644--- a/apps/client/src/app/pages/portfolio/portfolio-page.component.ts+++ b/apps/client/src/app/pages/portfolio/portfolio-page.component.ts@@ -1,19 +1,30 @@-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';+import {+ ChangeDetectorRef,+ Component,+ HostBinding,+ OnDestroy,+ OnInit+} from '@angular/core';import { DataService } from '@ghostfolio/client/services/data.service';import { UserService } from '@ghostfolio/client/services/user/user.service';-import { User } from '@ghostfolio/common/interfaces';+import { InfoItem, User } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import { Subject } from 'rxjs';import { takeUntil } from 'rxjs/operators';@Component({- host: { class: 'page' },selector: 'gf-portfolio-page',styleUrls: ['./portfolio-page.scss'],templateUrl: './portfolio-page.html'})export class PortfolioPageComponent implements OnDestroy, OnInit {- public hasPermissionForSubscription: boolean;+ @HostBinding('class.with-info-message') get getHasMessage() {+ return this.hasMessage;+ }++ public hasMessage: boolean;+ public info: InfoItem;+ public tabs: { iconName: string; path: string }[] = [];public user: User;private unsubscribeSubject = new Subject<void>();@@ -23,26 +34,34 @@ export class PortfolioPageComponent implements OnDestroy, OnInit {private dataService: DataService,private userService: UserService) {- const { globalPermissions } = this.dataService.fetchInfo();-- this.hasPermissionForSubscription = hasPermission(- globalPermissions,- permissions.enableSubscription- );- }+ this.info = this.dataService.fetchInfo();- public ngOnInit() {this.userService.stateChanged.pipe(takeUntil(this.unsubscribeSubject)).subscribe((state) => {if (state?.user) {+ this.tabs = [+ { iconName: 'analytics-outline', path: 'analysis' },+ { iconName: 'wallet-outline', path: 'holdings' },+ { iconName: 'swap-horizontal-outline', path: 'activities' },+ { iconName: 'pie-chart-outline', path: 'allocations' },+ { iconName: 'calculator-outline', path: 'fire' }+ ];this.user = state.user;+ this.hasMessage =+ hasPermission(+ this.user?.permissions,+ permissions.createUserAccount+ ) || !!this.info.systemMessage;+this.changeDetectorRef.markForCheck();}});}+ public ngOnInit() {}+public ngOnDestroy() {this.unsubscribeSubject.next();this.unsubscribeSubject.complete();diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.html b/apps/client/src/app/pages/portfolio/portfolio-page.htmlindex 14d4de50ec..ec3c3bfed7 100644--- a/apps/client/src/app/pages/portfolio/portfolio-page.html+++ b/apps/client/src/app/pages/portfolio/portfolio-page.html@@ -1,110 +1,15 @@-<div class="container">- <h3 class="d-flex justify-content-center mb-3" i18n>Portfolio</h3>- <div class="row">- <div class="col-xs-12 col-md-6 mb-3">- <mat-card class="d-flex flex-column h-100">- <h4 i18n>Holdings</h4>- <div class="flex-grow-1" i18n>- Get an overview of your current holdings.- </div>- <div class="mt-2 text-right">- <a- color="primary"- mat-button- [routerLink]="['/portfolio', 'holdings']"- >- <span i18n>Open Holdings</span>- <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>- </a>- </div>- </mat-card>- </div>- <div class="col-xs-12 col-md-6 mb-3">- <mat-card class="d-flex flex-column h-100">- <h4 i18n>Activities</h4>- <div class="flex-grow-1" i18n>- Manage your activities: stocks, ETFs, cryptocurrencies, dividend, and- valuables.- </div>- <div class="mt-2 text-right">- <a- color="primary"- mat-button- [routerLink]="['/portfolio', 'activities']"- >- <span i18n>Open Activities</span>- <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>- </a>- </div>- </mat-card>- </div>- <div class="col-xs-12 col-md-6 mb-3">- <mat-card class="d-flex flex-column h-100">- <h4 i18n>Allocations</h4>- <div class="flex-grow-1" i18n>- Check the allocations of your portfolio by account, asset class,- currency, sector and region.- </div>- <div class="mt-2 text-right">- <a- color="primary"- mat-button- [routerLink]="['/portfolio', 'allocations']"- >- <span i18n>Open Allocations</span>- <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>- </a>- </div>- </mat-card>- </div>- <div class="col-xs-12 col-md-6 mb-3">- <mat-card class="d-flex flex-column h-100">- <h4 i18n>Analysis</h4>- <div class="flex-grow-1" i18n>- Ghostfolio Analysis visualizes your portfolio and shows your top and- bottom performers.- </div>- <div class="mt-2 text-right">- <a- color="primary"- mat-button- [routerLink]="['/portfolio', 'analysis']"- >- <span i18n>Open Analysis</span>- <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>- </a>- </div>- </mat-card>- </div>- <div class="col-xs-12 col-md-6 mb-3">- <mat-card class="d-flex flex-column h-100">- <h4>X-ray</h4>- <div class="flex-grow-1" i18n>- Ghostfolio X-ray uses static analysis to identify potential issues and- risks in your portfolio.- </div>- <div class="mt-2 text-right">- <a color="primary" mat-button [routerLink]="['/portfolio', 'report']">- <span i18n>Open X-ray</span>- <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>- </a>- </div>- </mat-card>- </div>- <div class="col-xs-12 col-md-6 mb-3">- <mat-card class="d-flex flex-column h-100">- <h4>FIRE</h4>- <div class="flex-grow-1" i18n>- Ghostfolio FIRE calculates metrics for the- <i>Financial Independence, Retire Early</i> lifestyle.- </div>- <div class="mt-2 text-right">- <a color="primary" mat-button [routerLink]="['/portfolio', 'fire']">- <span i18n>Open FIRE</span>- <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>- </a>- </div>- </mat-card>- </div>- </div>-</div>+<router-outlet></router-outlet>++<nav mat-align-tabs="center" mat-tab-nav-bar>+ <a+ #rla="routerLinkActive"+ *ngFor="let tab of tabs"+ class="px-3"+ mat-tab-link+ routerLinkActive+ [active]="rla.isActive"+ [routerLink]="tab.path"+ >+ <ion-icon size="large" [name]="tab.iconName"></ion-icon>+ </a>+</nav>diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.module.ts b/apps/client/src/app/pages/portfolio/portfolio-page.module.tsindex 7c3977f0f2..0291179eb3 100644--- a/apps/client/src/app/pages/portfolio/portfolio-page.module.ts+++ b/apps/client/src/app/pages/portfolio/portfolio-page.module.ts@@ -1,7 +1,6 @@import { CommonModule } from '@angular/common';import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';-import { MatButtonModule } from '@angular/material/button';-import { MatCardModule } from '@angular/material/card';+import { MatTabsModule } from '@angular/material/tabs';import { RouterModule } from '@angular/router';import { PortfolioPageRoutingModule } from './portfolio-page-routing.module';@@ -11,8 +10,7 @@ import { PortfolioPageComponent } from './portfolio-page.component';declarations: [PortfolioPageComponent],imports: [CommonModule,- MatButtonModule,- MatCardModule,+ MatTabsModule,PortfolioPageRoutingModule,RouterModule],diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.scss b/apps/client/src/app/pages/portfolio/portfolio-page.scssindex 761afaa8c7..b5471d5ce8 100644--- a/apps/client/src/app/pages/portfolio/portfolio-page.scss+++ b/apps/client/src/app/pages/portfolio/portfolio-page.scss@@ -1,10 +1,46 @@+@import '~apps/client/src/styles/ghostfolio-style';+:host {color: rgb(var(--dark-primary-text));- display: block;+ display: flex;+ flex-direction: column;+ height: calc(100vh - 5rem);+ overflow-y: auto;++ padding-bottom: env(safe-area-inset-bottom);+ padding-bottom: constant(safe-area-inset-bottom);++ ::ng-deep {+ gf-activities-page,+ gf-allocations-page,+ gf-analysis-page,+ gf-holdings-page,+ gf-fire-page {+ flex: 1 1 auto;+ overflow-y: auto;+ }++ .mat-tab-header {+ border-bottom: 0;++ .mat-ink-bar {+ visibility: hidden !important;+ }++ .mat-tab-label-active {+ color: rgba(var(--palette-primary-500), 1);+ opacity: 1;+ }++ .mat-tab-link {+ &:hover {+ opacity: 0.75;+ }- .mat-card {- .mat-button-disabled {- pointer-events: none;+ @media (max-width: 599px) {+ min-width: unset;+ }+ }}}}diff --git a/apps/client/src/app/pages/portfolio/report/report-page-routing.module.ts b/apps/client/src/app/pages/portfolio/report/report-page-routing.module.tsdeleted file mode 100644index 9189debb02..0000000000--- a/apps/client/src/app/pages/portfolio/report/report-page-routing.module.ts+++ /dev/null@@ -1,20 +0,0 @@-import { NgModule } from '@angular/core';-import { RouterModule, Routes } from '@angular/router';-import { AuthGuard } from '@ghostfolio/client/core/auth.guard';--import { ReportPageComponent } from './report-page.component';--const routes: Routes = [- {- canActivate: [AuthGuard],- component: ReportPageComponent,- path: '',- title: 'X-ray'- }-];--@NgModule({- imports: [RouterModule.forChild(routes)],- exports: [RouterModule]-})-export class ReportPageRoutingModule {}diff --git a/apps/client/src/app/pages/portfolio/report/report-page.component.ts b/apps/client/src/app/pages/portfolio/report/report-page.component.tsdeleted file mode 100644index 4007b24086..0000000000--- a/apps/client/src/app/pages/portfolio/report/report-page.component.ts+++ /dev/null@@ -1,64 +0,0 @@-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';-import { DataService } from '@ghostfolio/client/services/data.service';-import { UserService } from '@ghostfolio/client/services/user/user.service';-import { PortfolioReportRule, User } from '@ghostfolio/common/interfaces';-import { hasPermission, permissions } from '@ghostfolio/common/permissions';-import { Subject } from 'rxjs';-import { takeUntil } from 'rxjs/operators';--@Component({- host: { class: 'page' },- selector: 'gf-report-page',- styleUrls: ['./report-page.scss'],- templateUrl: './report-page.html'-})-export class ReportPageComponent implements OnDestroy, OnInit {- public accountClusterRiskRules: PortfolioReportRule[];- public currencyClusterRiskRules: PortfolioReportRule[];- public feeRules: PortfolioReportRule[];- public hasPermissionToCreateOrder: boolean;- public user: User;-- private unsubscribeSubject = new Subject<void>();-- public constructor(- private changeDetectorRef: ChangeDetectorRef,- private dataService: DataService,- private userService: UserService- ) {}-- public ngOnInit() {- this.dataService- .fetchPortfolioReport()- .pipe(takeUntil(this.unsubscribeSubject))- .subscribe((portfolioReport) => {- this.accountClusterRiskRules =- portfolioReport.rules['accountClusterRisk'] || null;- this.currencyClusterRiskRules =- portfolioReport.rules['currencyClusterRisk'] || null;- this.feeRules = portfolioReport.rules['fees'] || null;-- this.changeDetectorRef.markForCheck();- });-- this.userService.stateChanged- .pipe(takeUntil(this.unsubscribeSubject))- .subscribe((state) => {- if (state?.user) {- this.user = state.user;-- this.hasPermissionToCreateOrder = hasPermission(- this.user.permissions,- permissions.createOrder- );-- this.changeDetectorRef.markForCheck();- }- });- }-- public ngOnDestroy() {- this.unsubscribeSubject.next();- this.unsubscribeSubject.complete();- }-}diff --git a/apps/client/src/app/pages/portfolio/report/report-page.html b/apps/client/src/app/pages/portfolio/report/report-page.htmldeleted file mode 100644index e2e1d71a34..0000000000--- a/apps/client/src/app/pages/portfolio/report/report-page.html+++ /dev/null@@ -1,57 +0,0 @@-<div class="container">- <div class="row">- <div class="col">- <h3 class="align-items-center d-flex justify-content-center mb-3">- X-ray- </h3>- <p class="mb-4">- Ghostfolio X-ray uses static analysis to identify potential issues and- risks in your portfolio.- <span class="d-none"- >It will be highly configurable in the future: activate / deactivate- rules and customize the thresholds to match your personal investment- style.</span- >- </p>- <div class="mb-4">- <h4 class="align-items-center d-flex m-0">- <span>Currency Cluster Risks</span- ><gf-premium-indicator- *ngIf="user?.subscription?.type === 'Basic'"- class="ml-1"- ></gf-premium-indicator>- </h4>- <gf-rules- [hasPermissionToCreateOrder]="hasPermissionToCreateOrder"- [rules]="currencyClusterRiskRules"- ></gf-rules>- </div>- <div class="mb-4">- <h4 class="align-items-center d-flex m-0">- <span>Account Cluster Risks</span- ><gf-premium-indicator- *ngIf="user?.subscription?.type === 'Basic'"- class="ml-1"- ></gf-premium-indicator>- </h4>- <gf-rules- [hasPermissionToCreateOrder]="hasPermissionToCreateOrder"- [rules]="accountClusterRiskRules"- ></gf-rules>- </div>- <div>- <h4 class="align-items-center d-flex m-0">- <span>Fees</span- ><gf-premium-indicator- *ngIf="user?.subscription?.type === 'Basic'"- class="ml-1"- ></gf-premium-indicator>- </h4>- <gf-rules- [hasPermissionToCreateOrder]="hasPermissionToCreateOrder"- [rules]="feeRules"- ></gf-rules>- </div>- </div>- </div>-</div>diff --git a/apps/client/src/app/pages/portfolio/report/report-page.module.ts b/apps/client/src/app/pages/portfolio/report/report-page.module.tsdeleted file mode 100644index 056b0d642e..0000000000--- a/apps/client/src/app/pages/portfolio/report/report-page.module.ts+++ /dev/null@@ -1,19 +0,0 @@-import { CommonModule } from '@angular/common';-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';-import { RulesModule } from '@ghostfolio/client/components/rules/rules.module';-import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';--import { ReportPageRoutingModule } from './report-page-routing.module';-import { ReportPageComponent } from './report-page.component';--@NgModule({- declarations: [ReportPageComponent],- imports: [- CommonModule,- GfPremiumIndicatorModule,- ReportPageRoutingModule,- RulesModule- ],- schemas: [CUSTOM_ELEMENTS_SCHEMA]-})-export class ReportPageModule {}diff --git a/apps/client/src/app/pages/portfolio/report/report-page.scss b/apps/client/src/app/pages/portfolio/report/report-page.scssdeleted file mode 100644index 39eb6792e8..0000000000--- a/apps/client/src/app/pages/portfolio/report/report-page.scss+++ /dev/null@@ -1,8 +0,0 @@-:host {- color: rgb(var(--dark-primary-text));- display: block;-}--:host-context(.is-dark-theme) {- color: rgb(var(--light-primary-text));-}