Fix savings rate in impersonation mode

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

@@ -491,14 +491,14 @@ export class PortfolioController {
       filterByTags: tags
     });
 
-    let { investments, streaks } = await this.portfolioService.getInvestments({
-      filters,
-      groupBy,
-      impersonationId,
-      dateRange: range,
-      savingsRate: this.request.user?.settings?.settings.savingsRate,
-      userId: this.request.user.id
-    });
+    let { investments, savingsRate, streaks } =
+      await this.portfolioService.getInvestments({
+        filters,
+        groupBy,
+        impersonationId,
+        dateRange: range,
+        userId: this.request.user.id
+      });
 
     if (
       hasReadRestrictedAccessPermission({
@@ -521,6 +521,8 @@ export class PortfolioController {
         'currentStreak',
         'longestStreak'
       ]);
+
+      savingsRate = null;
     }
 
     if (
@@ -537,7 +539,7 @@ export class PortfolioController {
       ]);
     }
 
-    return { investments, streaks };
+    return { investments, savingsRate, streaks };
   }
 
   @Get('performance')

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

@@ -413,19 +413,18 @@ export class PortfolioService {
     filters,
     groupBy,
     impersonationId,
-    savingsRate,
     userId
   }: {
     dateRange: DateRange;
     filters?: Filter[];
     groupBy?: GroupBy;
     impersonationId: string;
-    savingsRate: number;
     userId: string;
   }): Promise<PortfolioInvestmentsResponse> {
     userId = await this.getUserId(impersonationId, userId);
     const user = await this.userService.user({ id: userId });
     const userCurrency = this.getUserCurrency(user);
+    const savingsRate = (user.settings?.settings as UserSettings)?.savingsRate;
 
     const { endDate, startDate } = getIntervalFromDateRange({ dateRange });
 
@@ -438,6 +437,7 @@ export class PortfolioService {
 
     if (activities.length === 0) {
       return {
+        savingsRate,
         investments: [],
         streaks: { currentStreak: 0, longestStreak: 0 }
       };
@@ -484,6 +484,7 @@ export class PortfolioService {
 
     return {
       investments,
+      savingsRate,
       streaks
     };
   }

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

@@ -63,6 +63,7 @@ export class GfAppComponent implements OnInit {
   public hasPermissionToChangeFilters: boolean;
   public hasPromotion = false;
   public hasTabs = false;
+  public impersonationId: string | null;
   public info: InfoItem;
   public pageTitle: string;
   public routerLinkRegister = publicRoutes.register.routerLink;
@@ -117,6 +118,7 @@ export class GfAppComponent implements OnInit {
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe((impersonationId) => {
         this.hasImpersonationId = !!impersonationId;
+        this.impersonationId = impersonationId;
       });
 
     this.router.events
@@ -291,7 +293,6 @@ export class GfAppComponent implements OnInit {
             baseCurrency: this.user?.settings?.baseCurrency,
             colorScheme: this.user?.settings?.colorScheme,
             deviceType: this.deviceType,
-            hasImpersonationId: this.hasImpersonationId,
             hasPermissionToAccessAdminControl: hasPermission(
               this.user?.permissions,
               permissions.accessAdminControl
@@ -314,6 +315,7 @@ export class GfAppComponent implements OnInit {
                 permissions.updateActivity
               ) &&
               !this.user?.settings?.isRestrictedView,
+            impersonationId: this.impersonationId,
             locale: this.user?.settings?.locale
           },
           height: this.deviceType === 'mobile' ? '98vh' : '80vh',

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html

@@ -382,7 +382,7 @@
           [hasPermissionToCreateActivity]="false"
           [hasPermissionToDeleteActivity]="false"
           [hasPermissionToExportActivities]="
-            !data.hasImpersonationId && !user?.settings?.isRestrictedView
+            !data.impersonationId && !user?.settings?.isRestrictedView
           "
           [hasPermissionToFilter]="false"
           [hasPermissionToOpenDetails]="false"
@@ -390,8 +390,8 @@
           [pageIndex]="pageIndex"
           [pageSize]="pageSize"
           [showActions]="
-            !data.hasImpersonationId &&
             data.hasPermissionToCreateActivity &&
+            !data.impersonationId &&
             user?.settings?.isExperimentalFeatures &&
             !user?.settings?.isRestrictedView
           "

apps/client/src/app/components/holding-detail-dialog/interfaces/interfaces.ts

@@ -7,11 +7,11 @@ export interface HoldingDetailDialogParams {
   colorScheme: ColorScheme;
   dataSource: DataSource;
   deviceType: string;
-  hasImpersonationId: boolean;
   hasPermissionToAccessAdminControl: boolean;
   hasPermissionToCreateActivity: boolean;
   hasPermissionToReportDataGlitch: boolean;
   hasPermissionToUpdateActivity: boolean;
+  impersonationId: string | null;
   locale: string;
   symbol: string;
 }

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

@@ -83,7 +83,6 @@ export class GfAnalysisPageComponent implements OnInit {
   protected bottom3: PortfolioPosition[];
   protected dividendsByGroup: InvestmentItem[];
   protected readonly dividendTimelineDataLabel = $localize`Dividend`;
-  protected hasImpersonationId: boolean;
   protected hasPermissionToReadAiPrompt: boolean;
   protected impersonationId: string | null;
   protected investments: InvestmentItem[];
@@ -105,6 +104,7 @@ export class GfAnalysisPageComponent implements OnInit {
   protected performanceDataItemsInPercentage: HistoricalDataItem[];
   protected readonly portfolioEvolutionDataLabel = $localize`Investment`;
   protected precision = 2;
+  protected savingsRatePerMonth: number;
   protected streaks: PortfolioInvestmentsResponse['streaks'];
   protected top3: PortfolioPosition[];
   protected unitCurrentStreak: string;
@@ -136,18 +136,13 @@ export class GfAnalysisPageComponent implements OnInit {
   }
 
   get savingsRate() {
-    const savingsRatePerMonth =
-      this.hasImpersonationId || this.user.settings.isRestrictedView
-        ? undefined
-        : this.user?.settings?.savingsRate;
-
-    if (savingsRatePerMonth === undefined) {
+    if (!this.savingsRatePerMonth) {
       return undefined;
     }
 
     return this.mode() === 'year'
-      ? savingsRatePerMonth * 12
-      : savingsRatePerMonth;
+      ? this.savingsRatePerMonth * 12
+      : this.savingsRatePerMonth;
   }
 
   public ngOnInit() {
@@ -155,7 +150,6 @@ export class GfAnalysisPageComponent implements OnInit {
       .onChangeHasImpersonation()
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe((impersonationId) => {
-        this.hasImpersonationId = !!impersonationId;
         this.impersonationId = impersonationId;
 
         this.changeDetectorRef.markForCheck();
@@ -282,8 +276,9 @@ export class GfAnalysisPageComponent implements OnInit {
         range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE
       })
       .pipe(takeUntilDestroyed(this.destroyRef))
-      .subscribe(({ investments, streaks }) => {
+      .subscribe(({ investments, savingsRate, streaks }) => {
         this.investmentsByGroup = investments;
+        this.savingsRatePerMonth = savingsRate;
         this.streaks = streaks;
         this.unitCurrentStreak =
           this.mode() === 'year'

libs/common/src/lib/interfaces/responses/portfolio-investments.interface.ts

@@ -2,5 +2,6 @@ import { InvestmentItem } from '../investment-item.interface';
 
 export interface PortfolioInvestmentsResponse {
   investments: InvestmentItem[];
+  savingsRate: number;
   streaks: { currentStreak: number; longestStreak: number };
 }

libs/common/src/lib/permissions.ts

@@ -201,14 +201,14 @@ export function hasReadRestrictedAccessPermission({
   accesses = [],
   impersonationId
 }: {
-  accesses: Pick<Access, 'id' | 'permissions'>[];
+  accesses?: Pick<Access, 'id' | 'permissions'>[];
   impersonationId: string | null;
 }) {
   if (!impersonationId) {
     return false;
   }
 
-  const access = accesses?.find(({ id }) => {
+  const access = accesses.find(({ id }) => {
     return id === impersonationId;
   });