Localize name

apps/api/src/models/rule.ts

@@ -16,23 +16,19 @@ import { RuleInterface } from './interfaces/rule.interface';
 export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
   private key: string;
   private languageCode: string;
-  private name: string;
 
   public constructor(
     protected exchangeRateDataService: ExchangeRateDataService,
     {
       key,
-      languageCode = DEFAULT_LANGUAGE_CODE,
+      languageCode = DEFAULT_LANGUAGE_CODE
-      name
     }: {
       key: string;
       languageCode?: string; // TODO: Make mandatory
-      name: string;
     }
   ) {
     this.key = key;
     this.languageCode = languageCode;
-    this.name = name;
   }
 
   public getKey() {
@@ -43,10 +39,6 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
     return this.languageCode;
   }
 
-  public getName() {
-    return this.name;
-  }
-
   public groupCurrentHoldingsByAttribute(
     holdings: PortfolioPosition[],
     attribute: keyof PortfolioPosition,
@@ -82,5 +74,7 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
     PortfolioReportRule['configuration']
   >;
 
+  public abstract getName(): string;
+
   public abstract getSettings(aUserSettings: UserSettings): T;
 }

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

@@ -15,8 +15,7 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
     accounts: PortfolioDetails['accounts']
   ) {
     super(exchangeRateDataService, {
-      key: AccountClusterRiskCurrentInvestment.name,
+      key: AccountClusterRiskCurrentInvestment.name
-      name: 'Investment'
     });
 
     this.accounts = accounts;
@@ -88,6 +87,10 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Investment';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

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

@@ -11,8 +11,7 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
     accounts: PortfolioDetails['accounts']
   ) {
     super(exchangeRateDataService, {
-      key: AccountClusterRiskSingleAccount.name,
+      key: AccountClusterRiskSingleAccount.name
-      name: 'Single Account'
     });
 
     this.accounts = accounts;
@@ -38,6 +37,10 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
     return undefined;
   }
 
+  public getName() {
+    return 'Single Account';
+  }
+
   public getSettings({ xRayRules }: UserSettings): RuleSettings {
     return {
       isActive: xRayRules?.[this.getKey()].isActive ?? true

apps/api/src/models/rules/asset-class-cluster-risk/equity.ts

@@ -11,8 +11,7 @@ export class AssetClassClusterRiskEquity extends Rule<Settings> {
     holdings: PortfolioPosition[]
   ) {
     super(exchangeRateDataService, {
-      key: AssetClassClusterRiskEquity.name,
+      key: AssetClassClusterRiskEquity.name
-      name: 'Equity'
     });
 
     this.holdings = holdings;
@@ -78,6 +77,10 @@ export class AssetClassClusterRiskEquity extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Equity';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts

@@ -11,8 +11,7 @@ export class AssetClassClusterRiskFixedIncome extends Rule<Settings> {
     holdings: PortfolioPosition[]
   ) {
     super(exchangeRateDataService, {
-      key: AssetClassClusterRiskFixedIncome.name,
+      key: AssetClassClusterRiskFixedIncome.name
-      name: 'Fixed Income'
     });
 
     this.holdings = holdings;
@@ -78,6 +77,10 @@ export class AssetClassClusterRiskFixedIncome extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Fixed Income';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

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

@@ -11,8 +11,7 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
     holdings: PortfolioPosition[]
   ) {
     super(exchangeRateDataService, {
-      key: CurrencyClusterRiskBaseCurrencyCurrentInvestment.name,
+      key: CurrencyClusterRiskBaseCurrencyCurrentInvestment.name
-      name: 'Investment: Base Currency'
     });
 
     this.holdings = holdings;
@@ -68,6 +67,10 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
     return undefined;
   }
 
+  public getName() {
+    return 'Investment: Base Currency';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

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

@@ -11,8 +11,7 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
     holdings: PortfolioPosition[]
   ) {
     super(exchangeRateDataService, {
-      key: CurrencyClusterRiskCurrentInvestment.name,
+      key: CurrencyClusterRiskCurrentInvestment.name
-      name: 'Investment'
     });
 
     this.holdings = holdings;
@@ -73,6 +72,10 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Investment';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts

@@ -13,8 +13,7 @@ export class EconomicMarketClusterRiskDevelopedMarkets extends Rule<Settings> {
     developedMarketsValueInBaseCurrency: number
   ) {
     super(exchangeRateDataService, {
-      key: EconomicMarketClusterRiskDevelopedMarkets.name,
+      key: EconomicMarketClusterRiskDevelopedMarkets.name
-      name: 'Developed Markets'
     });
 
     this.currentValueInBaseCurrency = currentValueInBaseCurrency;
@@ -67,6 +66,10 @@ export class EconomicMarketClusterRiskDevelopedMarkets extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Developed Markets';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts

@@ -13,8 +13,7 @@ export class EconomicMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     emergingMarketsValueInBaseCurrency: number
   ) {
     super(exchangeRateDataService, {
-      key: EconomicMarketClusterRiskEmergingMarkets.name,
+      key: EconomicMarketClusterRiskEmergingMarkets.name
-      name: 'Emerging Markets'
     });
 
     this.currentValueInBaseCurrency = currentValueInBaseCurrency;
@@ -67,6 +66,10 @@ export class EconomicMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Emerging Markets';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

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

@@ -11,8 +11,7 @@ export class EmergencyFundSetup extends Rule<Settings> {
     emergencyFund: number
   ) {
     super(exchangeRateDataService, {
-      key: EmergencyFundSetup.name,
+      key: EmergencyFundSetup.name
-      name: 'Emergency Fund: Set up'
     });
 
     this.emergencyFund = emergencyFund;
@@ -36,6 +35,10 @@ export class EmergencyFundSetup extends Rule<Settings> {
     return undefined;
   }
 
+  public getName() {
+    return 'Emergency Fund: Set up';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

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

@@ -17,8 +17,7 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
   ) {
     super(exchangeRateDataService, {
       languageCode,
-      key: FeeRatioInitialInvestment.name,
+      key: FeeRatioInitialInvestment.name
-      name: 'Fee Ratio'
     });
 
     this.fees = fees;
@@ -69,6 +68,13 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return this.i18nService.getTranslation({
+      id: 'rule.feeRatioInitialInvestment',
+      languageCode: this.getLanguageCode()
+    });
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts

@@ -14,8 +14,7 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
     asiaPacificValueInBaseCurrency: number
   ) {
     super(exchangeRateDataService, {
-      key: RegionalMarketClusterRiskAsiaPacific.name,
+      key: RegionalMarketClusterRiskAsiaPacific.name
-      name: 'Asia-Pacific'
     });
 
     this.asiaPacificValueInBaseCurrency = asiaPacificValueInBaseCurrency;
@@ -66,6 +65,10 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Asia-Pacific';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts

@@ -14,8 +14,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     emergingMarketsValueInBaseCurrency: number
   ) {
     super(exchangeRateDataService, {
-      key: RegionalMarketClusterRiskEmergingMarkets.name,
+      key: RegionalMarketClusterRiskEmergingMarkets.name
-      name: 'Emerging Markets'
     });
 
     this.currentValueInBaseCurrency = currentValueInBaseCurrency;
@@ -68,6 +67,10 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Emerging Markets';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/regional-market-cluster-risk/europe.ts

@@ -14,8 +14,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
     europeValueInBaseCurrency: number
   ) {
     super(exchangeRateDataService, {
-      key: RegionalMarketClusterRiskEurope.name,
+      key: RegionalMarketClusterRiskEurope.name
-      name: 'Europe'
     });
 
     this.currentValueInBaseCurrency = currentValueInBaseCurrency;
@@ -66,6 +65,10 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Europe';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/regional-market-cluster-risk/japan.ts

@@ -14,8 +14,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
     japanValueInBaseCurrency: number
   ) {
     super(exchangeRateDataService, {
-      key: RegionalMarketClusterRiskJapan.name,
+      key: RegionalMarketClusterRiskJapan.name
-      name: 'Japan'
     });
 
     this.currentValueInBaseCurrency = currentValueInBaseCurrency;
@@ -66,6 +65,10 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'Japan';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts

@@ -14,8 +14,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
     northAmericaValueInBaseCurrency: number
   ) {
     super(exchangeRateDataService, {
-      key: RegionalMarketClusterRiskNorthAmerica.name,
+      key: RegionalMarketClusterRiskNorthAmerica.name
-      name: 'North America'
     });
 
     this.currentValueInBaseCurrency = currentValueInBaseCurrency;
@@ -66,6 +65,10 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
     };
   }
 
+  public getName() {
+    return 'North America';
+  }
+
   public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
     return {
       baseCurrency,

apps/client/src/app/pages/i18n/i18n-page.html

@@ -11,6 +11,7 @@
         performance, portfolio, software, stock, trading, wealth, web3
       </li>
       <li i18n="@@myAccount">My Account</li>
+      <li i18n="@@rule.feeRatioInitialInvestment">Fee Ratio</li>
       <li i18n="@@rule.feeRatioInitialInvestment.false">
         The fees do exceed &#123;thresholdMax&#125;% of your initial investment
         (&#123;feeRatio&#125;%)