Merge branch 'main' into slider

CHANGELOG.md

@@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Added
+
+- Added the name to the tooltip of the chart of the holdings tab on the home page (experimental)
+
+### Changed
+
+- Improved the labels of the chart of the holdings tab on the home page (experimental)
+- Refactored the rule thresholds in the _X-ray_ section (experimental)
+- Exposed the timeout of the portfolio snapshot computation as an environment variable (`PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT`)
+- Harmonized the processor concurrency environment variables
+- Improved the portfolio unit tests to work with exported activity files
+
+### Fixed
+
+- Considered the language of the user settings on login with _Security Token_
+
+### Todo
+
+- Rename the environment variable from `PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE` to `PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY`
+- Rename the environment variable from `PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA` to `PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY`
+- Rename the environment variable from `PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT` to `PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY`
+
 ## 2.114.0 - 2024-10-10
 
 ### Added

apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts

@@ -1,3 +1,5 @@
+import { readFileSync } from 'fs';
+
 export const activityDummyData = {
   accountId: undefined,
   accountUserId: undefined,
@@ -29,3 +31,7 @@ export const symbolProfileDummyData = {
 export const userDummyData = {
   id: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
 };
+
+export function loadActivityExportFile(filePath: string) {
+  return JSON.parse(readFileSync(filePath, 'utf8')).activities;
+}

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts

@@ -1,6 +1,8 @@
+import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
+  loadActivityExportFile,
   symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
@@ -20,6 +22,7 @@ import { parseDate } from '@ghostfolio/common/helper';
 
 import { Big } from 'big.js';
 import { last } from 'lodash';
+import { join } from 'path';
 
 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
   return {
@@ -52,6 +55,8 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let activityDtos: CreateOrderDto[];
+
   let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
@@ -59,6 +64,15 @@ describe('PortfolioCalculator', () => {
   let portfolioSnapshotService: PortfolioSnapshotService;
   let redisCacheService: RedisCacheService;
 
+  beforeAll(() => {
+    activityDtos = loadActivityExportFile(
+      join(
+        __dirname,
+        '../../../../../../../test/import/ok-novn-buy-and-sell.json'
+      )
+    );
+  });
+
   beforeEach(() => {
     configurationService = new ConfigurationService();
 
@@ -88,38 +102,18 @@ describe('PortfolioCalculator', () => {
     it.only('with NOVN.SW buy and sell', async () => {
       jest.useFakeTimers().setSystemTime(parseDate('2022-04-11').getTime());
 
-      const activities: Activity[] = [
+      const activities: Activity[] = activityDtos.map((activity) => ({
-        {
+        ...activityDummyData,
-          ...activityDummyData,
+        ...activity,
-          date: new Date('2022-03-07'),
+        date: parseDate(activity.date),
-          fee: 0,
+        SymbolProfile: {
-          quantity: 2,
+          ...symbolProfileDummyData,
-          SymbolProfile: {
+          currency: activity.currency,
-            ...symbolProfileDummyData,
+          dataSource: activity.dataSource,
-            currency: 'CHF',
+          name: 'Novartis AG',
-            dataSource: 'YAHOO',
+          symbol: activity.symbol
-            name: 'Novartis AG',
-            symbol: 'NOVN.SW'
-          },
-          type: 'BUY',
-          unitPrice: 75.8
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2022-04-08'),
-          fee: 0,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Novartis AG',
-            symbol: 'NOVN.SW'
-          },
-          type: 'SELL',
-          unitPrice: 85.73
         }
-      ];
+      }));
 
       const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
         activities,

apps/api/src/app/portfolio/rules.service.ts

@@ -24,13 +24,10 @@ export class RulesService {
         return {
           evaluation,
           value,
+          configuration: rule.getConfiguration(),
           isActive: true,
           key: rule.getKey(),
-          name: rule.getName(),
+          name: rule.getName()
-          settings: <PortfolioReportRule['settings']>{
-            thresholdMax: settings['thresholdMax'],
-            thresholdMin: settings['thresholdMin']
-          }
         };
       } else {
         return {

apps/api/src/app/user/user.service.ts

@@ -2,6 +2,12 @@ import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
 import { environment } from '@ghostfolio/api/environments/environment';
 import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
+import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
+import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
+import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/base-currency-current-investment';
+import { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';
+import { EmergencyFundSetup } from '@ghostfolio/api/models/rules/emergency-fund/emergency-fund-setup';
+import { FeeRatioInitialInvestment } from '@ghostfolio/api/models/rules/fees/fee-ratio-initial-investment';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
@@ -200,17 +206,35 @@ export class UserService {
       (user.Settings.settings as UserSettings).viewMode = 'DEFAULT';
     }
 
-    // Set default values for X-ray rules
+    (user.Settings.settings as UserSettings).xRayRules = {
-    if (!(user.Settings.settings as UserSettings).xRayRules) {
+      AccountClusterRiskCurrentInvestment:
-      (user.Settings.settings as UserSettings).xRayRules = {
+        new AccountClusterRiskCurrentInvestment(undefined, {}).getSettings(
-        AccountClusterRiskCurrentInvestment: { isActive: true },
+          user.Settings.settings
-        AccountClusterRiskSingleAccount: { isActive: true },
+        ),
-        CurrencyClusterRiskBaseCurrencyCurrentInvestment: { isActive: true },
+      AccountClusterRiskSingleAccount: new AccountClusterRiskSingleAccount(
-        CurrencyClusterRiskCurrentInvestment: { isActive: true },
+        undefined,
-        EmergencyFundSetup: { isActive: true },
+        {}
-        FeeRatioInitialInvestment: { isActive: true }
+      ).getSettings(user.Settings.settings),
-      };
+      CurrencyClusterRiskBaseCurrencyCurrentInvestment:
-    }
+        new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
+          undefined,
+          undefined
+        ).getSettings(user.Settings.settings),
+      CurrencyClusterRiskCurrentInvestment:
+        new CurrencyClusterRiskCurrentInvestment(
+          undefined,
+          undefined
+        ).getSettings(user.Settings.settings),
+      EmergencyFundSetup: new EmergencyFundSetup(
+        undefined,
+        undefined
+      ).getSettings(user.Settings.settings),
+      FeeRatioInitialInvestment: new FeeRatioInitialInvestment(
+        undefined,
+        undefined,
+        undefined
+      ).getSettings(user.Settings.settings)
+    };
 
     let currentPermissions = getPermissions(user.role);
 

apps/api/src/models/rule.ts

@@ -1,7 +1,11 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { groupBy } from '@ghostfolio/common/helper';
-import { PortfolioPosition, UserSettings } from '@ghostfolio/common/interfaces';
+import {
+  PortfolioPosition,
+  PortfolioReportRule,
+  UserSettings
+} from '@ghostfolio/common/interfaces';
 
 import { Big } from 'big.js';
 
@@ -65,5 +69,9 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
 
   public abstract evaluate(aRuleSettings: T): EvaluationResult;
 
+  public abstract getConfiguration(): Partial<
+    PortfolioReportRule['configuration']
+  >;
+
   public abstract getSettings(aUserSettings: UserSettings): T;
 }

apps/api/src/models/rules/account-cluster-risk/current-investment.ts

@@ -76,11 +76,22 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
     };
   }
 
+  public getConfiguration() {
+    return {
+      threshold: {
+        max: 1,
+        min: 0,
+        step: 0.01
+      },
+      thresholdMax: true
+    };
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,
-      isActive: xRayRules[this.getKey()].isActive,
+      isActive: xRayRules?.[this.getKey()].isActive ?? true,
-      thresholdMax: xRayRules[this.getKey()]?.thresholdMax ?? 0.5
+      thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.5
     };
   }
 }

apps/api/src/models/rules/account-cluster-risk/single-account.ts

@@ -34,9 +34,13 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
     };
   }
 
+  public getConfiguration() {
+    return undefined;
+  }
+
   public getSettings({ xRayRules }: UserSettings): RuleSettings {
     return {
-      isActive: xRayRules[this.getKey()].isActive
+      isActive: xRayRules?.[this.getKey()].isActive ?? true
     };
   }
 }

apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts

@@ -61,10 +61,14 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
     };
   }
 
+  public getConfiguration() {
+    return undefined;
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,
-      isActive: xRayRules[this.getKey()].isActive
+      isActive: xRayRules?.[this.getKey()].isActive ?? true
     };
   }
 }

apps/api/src/models/rules/currency-cluster-risk/current-investment.ts

@@ -61,11 +61,22 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
     };
   }
 
+  public getConfiguration() {
+    return {
+      threshold: {
+        max: 1,
+        min: 0,
+        step: 0.01
+      },
+      thresholdMax: true
+    };
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,
-      isActive: xRayRules[this.getKey()].isActive,
+      isActive: xRayRules?.[this.getKey()].isActive ?? true,
-      thresholdMax: xRayRules[this.getKey()]?.thresholdMax ?? 0.5
+      thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.5
     };
   }
 }

apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts

@@ -32,10 +32,14 @@ export class EmergencyFundSetup extends Rule<Settings> {
     };
   }
 
+  public getConfiguration() {
+    return undefined;
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,
-      isActive: xRayRules[this.getKey()].isActive
+      isActive: xRayRules?.[this.getKey()].isActive ?? true
     };
   }
 }

apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts

@@ -43,11 +43,22 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
     };
   }
 
+  public getConfiguration() {
+    return {
+      threshold: {
+        max: 0.1,
+        min: 0,
+        step: 0.005
+      },
+      thresholdMax: true
+    };
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,
-      isActive: xRayRules[this.getKey()].isActive,
+      isActive: xRayRules?.[this.getKey()].isActive ?? true,
-      thresholdMax: xRayRules[this.getKey()]?.thresholdMax ?? 0.01
+      thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.01
     };
   }
 }

apps/api/src/services/configuration/configuration.service.ts

@@ -1,9 +1,10 @@
 import { Environment } from '@ghostfolio/api/services/interfaces/environment.interface';
 import {
   CACHE_TTL_NO_CACHE,
-  DEFAULT_PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE,
+  DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY,
-  DEFAULT_PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA,
+  DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY,
-  DEFAULT_PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT,
+  DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY,
+  DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT,
   DEFAULT_ROOT_URL
 } from '@ghostfolio/common/config';
 
@@ -50,14 +51,17 @@ export class ConfigurationService {
       MAX_ACTIVITIES_TO_IMPORT: num({ default: Number.MAX_SAFE_INTEGER }),
       MAX_CHART_ITEMS: num({ default: 365 }),
       PORT: port({ default: 3333 }),
-      PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE: num({
+      PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY: num({
-        default: DEFAULT_PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE
+        default: DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY
       }),
-      PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA: num({
+      PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY: num({
-        default: DEFAULT_PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA
+        default: DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY
       }),
-      PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT: num({
+      PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY: num({
-        default: DEFAULT_PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT
+        default: DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY
+      }),
+      PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT: num({
+        default: DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT
       }),
       REDIS_DB: num({ default: 0 }),
       REDIS_HOST: str({ default: 'localhost' }),

apps/api/src/services/interfaces/environment.interface.ts

@@ -30,6 +30,10 @@ export interface Environment extends CleanedEnvAccessors {
   MAX_ACTIVITIES_TO_IMPORT: number;
   MAX_CHART_ITEMS: number;
   PORT: number;
+  PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY: number;
+  PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY: number;
+  PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY: number;
+  PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT: number;
   REDIS_DB: number;
   REDIS_HOST: string;
   REDIS_PASSWORD: string;

apps/api/src/services/queues/data-gathering/data-gathering.processor.ts

@@ -3,8 +3,8 @@ import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfac
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import {
   DATA_GATHERING_QUEUE,
-  DEFAULT_PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE,
+  DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY,
-  DEFAULT_PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA,
+  DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY,
   GATHER_ASSET_PROFILE_PROCESS,
   GATHER_HISTORICAL_MARKET_DATA_PROCESS_JOB_NAME
 } from '@ghostfolio/common/config';
@@ -38,8 +38,8 @@ export class DataGatheringProcessor {
 
   @Process({
     concurrency: parseInt(
-      process.env.PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE ??
+      process.env.PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY ??
-        DEFAULT_PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE.toString(),
+        DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY.toString(),
       10
     ),
     name: GATHER_ASSET_PROFILE_PROCESS
@@ -69,8 +69,8 @@ export class DataGatheringProcessor {
 
   @Process({
     concurrency: parseInt(
-      process.env.PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA ??
+      process.env.PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY ??
-        DEFAULT_PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA.toString(),
+        DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY.toString(),
       10
     ),
     name: GATHER_HISTORICAL_MARKET_DATA_PROCESS_JOB_NAME

apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts

@@ -8,7 +8,10 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
-import { PORTFOLIO_SNAPSHOT_QUEUE } from '@ghostfolio/common/config';
+import {
+  DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT,
+  PORTFOLIO_SNAPSHOT_QUEUE
+} from '@ghostfolio/common/config';
 
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
@@ -20,7 +23,14 @@ import { PortfolioSnapshotProcessor } from './portfolio-snapshot.processor';
   imports: [
     AccountBalanceModule,
     BullModule.registerQueue({
-      name: PORTFOLIO_SNAPSHOT_QUEUE
+      name: PORTFOLIO_SNAPSHOT_QUEUE,
+      settings: {
+        lockDuration: parseInt(
+          process.env.PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT ??
+            DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT.toString(),
+          10
+        )
+      }
     }),
     ConfigurationModule,
     DataProviderModule,

apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts

@@ -9,7 +9,7 @@ import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.s
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import {
   CACHE_TTL_INFINITE,
-  DEFAULT_PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT,
+  DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY,
   PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME,
   PORTFOLIO_SNAPSHOT_QUEUE
 } from '@ghostfolio/common/config';
@@ -35,7 +35,7 @@ export class PortfolioSnapshotProcessor {
   @Process({
     concurrency: parseInt(
       process.env.PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT ??
-        DEFAULT_PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT.toString(),
+        DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY.toString(),
       10
     ),
     name: PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME

apps/client/src/app/components/header/header.component.ts

@@ -261,7 +261,18 @@ export class HeaderComponent implements OnChanges {
       this.settingsStorageService.getSetting(KEY_STAY_SIGNED_IN) === 'true'
     );
 
-    this.router.navigate(['/']);
+    this.userService
+      .get()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((user) => {
+        const userLanguage = user?.settings?.language;
+
+        if (userLanguage && document.documentElement.lang !== userLanguage) {
+          window.location.href = `../${userLanguage}`;
+        } else {
+          this.router.navigate(['/']);
+        }
+      });
   }
 
   public ngOnDestroy() {

apps/client/src/app/components/rule/rule-settings-dialog/interfaces/interfaces.ts

@@ -1,5 +1,7 @@
 import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
+import { XRayRulesSettings } from '@ghostfolio/common/types';
 
 export interface IRuleSettingsDialogParams {
   rule: PortfolioReportRule;
+  settings: XRayRulesSettings['AccountClusterRiskCurrentInvestment'];
 }

apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.component.ts

@@ -1,4 +1,4 @@
-import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
+import { XRayRulesSettings } from '@ghostfolio/common/types';
 
 import { CommonModule } from '@angular/common';
 import { Component, Inject } from '@angular/core';
@@ -31,12 +31,10 @@ import { IRuleSettingsDialogParams } from './interfaces/interfaces';
   templateUrl: './rule-settings-dialog.html'
 })
 export class GfRuleSettingsDialogComponent {
-  public settings: PortfolioReportRule['settings'];
+  public settings: XRayRulesSettings['AccountClusterRiskCurrentInvestment'];
 
   public constructor(
     @Inject(MAT_DIALOG_DATA) public data: IRuleSettingsDialogParams,
     public dialogRef: MatDialogRef<GfRuleSettingsDialogComponent>
-  ) {
+  ) {}
-    this.settings = this.data.rule.settings;
-  }
 }

apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html

@@ -4,6 +4,7 @@
   
     <div
     class="w-100"
+
     [ngClass]="{ 'd-none': settings.thresholdMin === undefined }">
     <label i18n>Threshold Min</label>
     <mat-slider
@@ -32,11 +33,15 @@
   ></mat-slider>
 </div>
 
-</div>
+
 
 <div mat-dialog-actions fxLayout="row" fxLayoutAlign="end">
   <button i18n mat-button (click)="dialogRef.close()">Close</button>
-  <button color="primary" mat-flat-button (click)="dialogRef.close(settings)">
+  <button
+    color="primary"
+    mat-flat-button
+    (click)="dialogRef.close(data.settings)"
+  >
     <ng-container i18n>Save</ng-container>
   </button>
 </div>

apps/client/src/app/components/rule/rule.component.html

@@ -62,7 +62,7 @@
             <ion-icon name="ellipsis-horizontal" />
           </button>
           <mat-menu #rulesMenu="matMenu" xPosition="before">
-            @if (rule?.isActive && !isEmpty(rule.settings)) {
+            @if (rule?.isActive && rule?.configuration) {
               <button mat-menu-item (click)="onCustomizeRule(rule)">
                 <ng-container i18n>Customize</ng-container>...
               </button>

apps/client/src/app/components/rule/rule.component.ts

@@ -1,5 +1,7 @@
 import { UpdateUserSettingDto } from '@ghostfolio/api/app/user/update-user-setting.dto';
+import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
+import { XRayRulesSettings } from '@ghostfolio/common/types';
 
 import {
   ChangeDetectionStrategy,
@@ -10,7 +12,6 @@ import {
   Output
 } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { isEmpty } from 'lodash';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject, takeUntil } from 'rxjs';
 
@@ -27,11 +28,10 @@ export class RuleComponent implements OnInit {
   @Input() hasPermissionToUpdateUserSettings: boolean;
   @Input() isLoading: boolean;
   @Input() rule: PortfolioReportRule;
+  @Input() settings: XRayRulesSettings['AccountClusterRiskCurrentInvestment'];
 
   @Output() ruleUpdated = new EventEmitter<UpdateUserSettingDto>();
 
-  public isEmpty = isEmpty;
-
   private deviceType: string;
   private unsubscribeSubject = new Subject<void>();
 
@@ -46,16 +46,17 @@ export class RuleComponent implements OnInit {
 
   public onCustomizeRule(rule: PortfolioReportRule) {
     const dialogRef = this.dialog.open(GfRuleSettingsDialogComponent, {
-      data: <IRuleSettingsDialogParams>{
+      data: {
-        rule
+        rule,
-      },
+        settings: this.settings
+      } as IRuleSettingsDialogParams,
       width: this.deviceType === 'mobile' ? '100vw' : '50rem'
     });
 
     dialogRef
       .afterClosed()
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((settings: PortfolioReportRule['settings']) => {
+      .subscribe((settings: RuleSettings) => {
         if (settings) {
           this.ruleUpdated.emit({
             xRayRules: {

apps/client/src/app/components/rules/rules.component.html

@@ -12,6 +12,7 @@
               hasPermissionToUpdateUserSettings
             "
             [rule]="rule"
+            [settings]="settings?.[rule.key]"
             (ruleUpdated)="onRuleUpdated($event)"
           />
         }

apps/client/src/app/components/rules/rules.component.ts

@@ -1,5 +1,6 @@
 import { UpdateUserSettingDto } from '@ghostfolio/api/app/user/update-user-setting.dto';
 import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
+import { XRayRulesSettings } from '@ghostfolio/common/types';
 
 import {
   ChangeDetectionStrategy,
@@ -19,11 +20,10 @@ export class RulesComponent {
   @Input() hasPermissionToUpdateUserSettings: boolean;
   @Input() isLoading: boolean;
   @Input() rules: PortfolioReportRule[];
+  @Input() settings: XRayRulesSettings;
 
   @Output() rulesUpdated = new EventEmitter<UpdateUserSettingDto>();
 
-  public constructor() {}
-
   public onRuleUpdated(event: UpdateUserSettingDto) {
     this.rulesUpdated.emit(event);
   }

apps/client/src/app/pages/portfolio/fire/fire-page.component.ts

@@ -138,6 +138,11 @@ export class FirePageComponent implements OnDestroy, OnInit {
       .putUserSetting(event)
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(() => {
+        this.userService
+          .get(true)
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe();
+
         this.initializePortfolioReport();
       });
   }

apps/client/src/app/pages/portfolio/fire/fire-page.html

@@ -132,6 +132,7 @@
           "
           [isLoading]="isLoadingPortfolioReport"
           [rules]="emergencyFundRules"
+          [settings]="user?.settings?.xRayRules"
           (rulesUpdated)="onRulesUpdated($event)"
         />
       </div>
@@ -150,6 +151,7 @@
           "
           [isLoading]="isLoadingPortfolioReport"
           [rules]="currencyClusterRiskRules"
+          [settings]="user?.settings?.xRayRules"
           (rulesUpdated)="onRulesUpdated($event)"
         />
       </div>
@@ -168,6 +170,7 @@
           "
           [isLoading]="isLoadingPortfolioReport"
           [rules]="accountClusterRiskRules"
+          [settings]="user?.settings?.xRayRules"
           (rulesUpdated)="onRulesUpdated($event)"
         />
       </div>
@@ -186,6 +189,7 @@
           "
           [isLoading]="isLoadingPortfolioReport"
           [rules]="feeRules"
+          [settings]="user?.settings?.xRayRules"
           (rulesUpdated)="onRulesUpdated($event)"
         />
       </div>
@@ -200,6 +204,7 @@
             "
             [isLoading]="isLoadingPortfolioReport"
             [rules]="inactiveRules"
+            [settings]="user?.settings?.xRayRules"
             (rulesUpdated)="onRulesUpdated($event)"
           />
         </div>

libs/common/src/lib/config.ts

@@ -48,9 +48,10 @@ export const DEFAULT_CURRENCY = 'USD';
 export const DEFAULT_DATE_FORMAT_MONTH_YEAR = 'MMM yyyy';
 export const DEFAULT_LANGUAGE_CODE = 'en';
 export const DEFAULT_PAGE_SIZE = 50;
-export const DEFAULT_PROCESSOR_CONCURRENCY_GATHER_ASSET_PROFILE = 1;
+export const DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY = 1;
-export const DEFAULT_PROCESSOR_CONCURRENCY_GATHER_HISTORICAL_MARKET_DATA = 1;
+export const DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY = 1;
-export const DEFAULT_PROCESSOR_CONCURRENCY_PORTFOLIO_SNAPSHOT = 1;
+export const DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY = 1;
+export const DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT = 30000;
 export const DEFAULT_ROOT_URL = 'https://localhost:4200';
 
 // USX is handled separately

libs/common/src/lib/interfaces/portfolio-report-rule.interface.ts

@@ -1,11 +1,16 @@
 export interface PortfolioReportRule {
+  configuration?: {
+    threshold?: {
+      max: number;
+      min: number;
+      step: number;
+    };
+    thresholdMax?: boolean;
+    thresholdMin?: boolean;
+  };
   evaluation?: string;
   isActive: boolean;
   key: string;
   name: string;
-  settings?: {
-    thresholdMax?: number;
-    thresholdMin?: number;
-  };
   value?: boolean;
 }

libs/common/src/lib/types/x-ray-rules-settings.type.ts

@@ -1,5 +1,3 @@
-import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
-
 export type XRayRulesSettings = {
   AccountClusterRiskCurrentInvestment?: RuleSettings;
   AccountClusterRiskSingleAccount?: RuleSettings;
@@ -9,6 +7,8 @@ export type XRayRulesSettings = {
   FeeRatioInitialInvestment?: RuleSettings;
 };
 
-interface RuleSettings extends Pick<PortfolioReportRule, 'settings'> {
+interface RuleSettings {
   isActive: boolean;
+  thresholdMax?: number;
+  thresholdMin?: number;
 }

libs/ui/src/lib/treemap-chart/treemap-chart.component.ts

@@ -151,13 +151,12 @@ export class GfTreemapChartComponent
             align: 'left',
             color: ['white'],
             display: true,
-            font: [{ size: 14 }, { size: 11 }, { lineHeight: 2, size: 14 }],
+            font: [{ size: 16 }, { lineHeight: 1.5, size: 14 }],
             formatter(ctx) {
               const netPerformancePercentWithCurrencyEffect =
                 ctx.raw._data.netPerformancePercentWithCurrencyEffect;
 
               return [
-                ctx.raw._data.name,
                 ctx.raw._data.symbol,
                 `${netPerformancePercentWithCurrencyEffect > 0 ? '+' : ''}${(ctx.raw._data.netPerformancePercentWithCurrencyEffect * 100).toFixed(2)}%`
               ];
@@ -227,16 +226,24 @@ export class GfTreemapChartComponent
       }),
       callbacks: {
         label: (context) => {
+          const name = context.raw._data.name;
+          const symbol = context.raw._data.symbol;
+
           if (context.raw._data.valueInBaseCurrency !== null) {
             const value = <number>context.raw._data.valueInBaseCurrency;
-            return `${value.toLocaleString(this.locale, {
+
-              maximumFractionDigits: 2,
+            return [
-              minimumFractionDigits: 2
+              `${name ?? symbol}`,
-            })} ${this.baseCurrency}`;
+              `${value.toLocaleString(this.locale, {
+                maximumFractionDigits: 2,
+                minimumFractionDigits: 2
+              })} ${this.baseCurrency}`
+            ];
           } else {
             const percentage =
               <number>context.raw._data.allocationInPercentage * 100;
-            return `${percentage.toFixed(2)}%`;
+
+            return [`${name ?? symbol}`, `${percentage.toFixed(2)}%`];
           }
         },
         title: () => {

test/import/ok-novn-buy-and-sell.json

@@ -11,7 +11,7 @@
       "unitPrice": 85.73,
       "currency": "CHF",
       "dataSource": "YAHOO",
-      "date": "2022-04-07T22:00:00.000Z",
+      "date": "2022-04-08T00:00:00.000Z",
       "symbol": "NOVN.SW"
     },
     {
@@ -21,7 +21,7 @@
       "unitPrice": 75.8,
       "currency": "CHF",
       "dataSource": "YAHOO",
-      "date": "2022-03-06T23:00:00.000Z",
+      "date": "2022-03-07T00:00:00.000Z",
       "symbol": "NOVN.SW"
     }
   ]