Merge remote-tracking branch 'refs/remotes/upstream/main' into fix/consistent-type-assertions

# Conflicts:
#	CHANGELOG.md
#	apps/api/src/app/user/update-user-setting.dto.ts

CHANGELOG.md

@@ -9,8 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Switched the `no-empty-function` rule from `warn` to `error` in the `eslint` configuration
 - Switched the `consistent-type-definitions` rule from `warn` to `error` in the `eslint` configuration
+- Switched the `no-empty-function` rule from `warn` to `error` in the `eslint` configuration
 - Switched the `prefer-function-type` rule from `warn` to `error` in the `eslint` configuration
 - Switched the `consistent-type-assertions` rule from `warn` to `error` in the `eslint` configuration
 
@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed an issue with the X-axis scale of the dividend timeline on the analysis page
 - Fixed an issue with the X-axis scale of the investment timeline on the analysis page
 - Fixed an issue with the X-axis scale of the portfolio evolution chart on the analysis page
+- Fixed an issue in the calculation of the static portfolio analysis rule: Allocation Cluster Risk (Developed Markets)
+- Fixed an issue in the calculation of the static portfolio analysis rule: Allocation Cluster Risk (Emerging Markets)
 
 ## 2.118.0 - 2024-10-23
 

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

@@ -1169,6 +1169,12 @@ export class PortfolioService {
       withSummary: true
     });
 
+    const marketsTotalInBaseCurrency = getSum(
+      Object.values(markets).map(({ valueInBaseCurrency }) => {
+        return new Big(valueInBaseCurrency);
+      })
+    ).toNumber();
+
     return {
       rules: {
         accountClusterRisk:
@@ -1193,12 +1199,12 @@ export class PortfolioService {
                 [
                   new AllocationClusterRiskDevelopedMarkets(
                     this.exchangeRateDataService,
-                    summary.currentValueInBaseCurrency,
+                    marketsTotalInBaseCurrency,
                     markets.developedMarkets.valueInBaseCurrency
                   ),
                   new AllocationClusterRiskEmergingMarkets(
                     this.exchangeRateDataService,
-                    summary.currentValueInBaseCurrency,
+                    marketsTotalInBaseCurrency,
                     markets.emergingMarkets.valueInBaseCurrency
                   )
                 ],
@@ -1358,20 +1364,20 @@ export class PortfolioService {
       }
     }
 
-    const marketsTotal =
+    const marketsTotalInBaseCurrency = getSum(
-      markets.developedMarkets.valueInBaseCurrency +
+      Object.values(markets).map(({ valueInBaseCurrency }) => {
-      markets.emergingMarkets.valueInBaseCurrency +
+        return new Big(valueInBaseCurrency);
-      markets.otherMarkets.valueInBaseCurrency +
+      })
-      markets[UNKNOWN_KEY].valueInBaseCurrency;
+    ).toNumber();
 
     markets.developedMarkets.valueInPercentage =
-      markets.developedMarkets.valueInBaseCurrency / marketsTotal;
+      markets.developedMarkets.valueInBaseCurrency / marketsTotalInBaseCurrency;
     markets.emergingMarkets.valueInPercentage =
-      markets.emergingMarkets.valueInBaseCurrency / marketsTotal;
+      markets.emergingMarkets.valueInBaseCurrency / marketsTotalInBaseCurrency;
     markets.otherMarkets.valueInPercentage =
-      markets.otherMarkets.valueInBaseCurrency / marketsTotal;
+      markets.otherMarkets.valueInBaseCurrency / marketsTotalInBaseCurrency;
     markets[UNKNOWN_KEY].valueInPercentage =
-      markets[UNKNOWN_KEY].valueInBaseCurrency / marketsTotal;
+      markets[UNKNOWN_KEY].valueInBaseCurrency / marketsTotalInBaseCurrency;
 
     const marketsAdvancedTotal =
       marketsAdvanced.asiaPacific.valueInBaseCurrency +

apps/api/src/app/user/update-user-setting.dto.ts

@@ -1,9 +1,10 @@
+import { IsCurrencyCode } from '@ghostfolio/api/validators/is-currency-code';
+import { XRayRulesSettings } from '@ghostfolio/common/interfaces';
 import type {
   ColorScheme,
   DateRange,
   HoldingsViewMode,
-  ViewMode,
+  ViewMode
-  XRayRulesSettings
 } from '@ghostfolio/common/types';
 
 import {
@@ -17,8 +18,6 @@ import {
 } from 'class-validator';
 import { eachYearOfInterval, format } from 'date-fns';
 
-import { IsCurrencyCode } from '../../validators/is-currency-code';
-
 export class UpdateUserSettingDto {
   @IsNumber()
   @IsOptional()

apps/client/src/app/components/home-holdings/home-holdings.component.ts

@@ -4,14 +4,11 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
 import {
   AssetProfileIdentifier,
   PortfolioPosition,
+  ToggleOption,
   User
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import {
+import { HoldingType, HoldingsViewMode } from '@ghostfolio/common/types';
-  HoldingType,
-  HoldingsViewMode,
-  ToggleOption
-} from '@ghostfolio/common/types';
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';

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

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

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

@@ -1,4 +1,4 @@
-import { XRayRulesSettings } from '@ghostfolio/common/types';
+import { XRayRulesSettings } from '@ghostfolio/common/interfaces';
 
 import { CommonModule } from '@angular/common';
 import { Component, Inject } from '@angular/core';

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

@@ -1,7 +1,9 @@
 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 {
-import { XRayRulesSettings } from '@ghostfolio/common/types';
+  PortfolioReportRule,
+  XRayRulesSettings
+} from '@ghostfolio/common/interfaces';
 
 import {
   ChangeDetectionStrategy,

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

@@ -1,6 +1,8 @@
 import { UpdateUserSettingDto } from '@ghostfolio/api/app/user/update-user-setting.dto';
-import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
+import {
-import { XRayRulesSettings } from '@ghostfolio/common/types';
+  PortfolioReportRule,
+  XRayRulesSettings
+} from '@ghostfolio/common/interfaces';
 
 import {
   ChangeDetectionStrategy,

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

@@ -1,4 +1,4 @@
-import { ToggleOption } from '@ghostfolio/common/types';
+import { ToggleOption } from '@ghostfolio/common/interfaces';
 
 import {
   ChangeDetectionStrategy,

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

@@ -4,13 +4,14 @@ import { ImpersonationStorageService } from '@ghostfolio/client/services/imperso
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import {
   HistoricalDataItem,
+  InvestmentItem,
   PortfolioInvestments,
   PortfolioPerformance,
   PortfolioPosition,
+  ToggleOption,
   User
 } from '@ghostfolio/common/interfaces';
-import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
+import { GroupBy } from '@ghostfolio/common/types';
-import { GroupBy, ToggleOption } from '@ghostfolio/common/types';
 import { translate } from '@ghostfolio/ui/i18n';
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';

libs/common/src/lib/interfaces/index.ts

@@ -50,8 +50,10 @@ import type { Subscription } from './subscription.interface';
 import type { SymbolMetrics } from './symbol-metrics.interface';
 import type { SystemMessage } from './system-message.interface';
 import type { TabConfiguration } from './tab-configuration.interface';
+import type { ToggleOption } from './toggle-option.interface';
 import type { UserSettings } from './user-settings.interface';
 import type { User } from './user.interface';
+import type { XRayRulesSettings } from './x-ray-rules-settings.interface';
 
 export {
   Access,
@@ -104,6 +106,8 @@ export {
   Subscription,
   SymbolMetrics,
   TabConfiguration,
+  ToggleOption,
   User,
-  UserSettings
+  UserSettings,
+  XRayRulesSettings
 };

libs/common/src/lib/interfaces/user-settings.interface.ts

@@ -1,9 +1,9 @@
+import { XRayRulesSettings } from '@ghostfolio/common/interfaces/x-ray-rules-settings.interface';
 import {
   ColorScheme,
   DateRange,
   HoldingsViewMode,
-  ViewMode,
+  ViewMode
-  XRayRulesSettings
 } from '@ghostfolio/common/types';
 
 export interface UserSettings {

libs/common/src/lib/types/index.ts

@@ -16,10 +16,8 @@ import type { Market } from './market.type';
 import type { OrderWithAccount } from './order-with-account.type';
 import type { RequestWithUser } from './request-with-user.type';
 import type { SubscriptionOffer } from './subscription-offer.type';
-import type { ToggleOption } from './toggle-option.type';
 import type { UserWithSettings } from './user-with-settings.type';
 import type { ViewMode } from './view-mode.type';
-import type { XRayRulesSettings } from './x-ray-rules-settings.type';
 
 export type {
   AccessType,
@@ -40,8 +38,6 @@ export type {
   OrderWithAccount,
   RequestWithUser,
   SubscriptionOffer,
-  ToggleOption,
   UserWithSettings,
-  ViewMode,
+  ViewMode
-  XRayRulesSettings
 };