Browse Source

Fix Zen mode

pull/723/head
Thomas 3 years ago
parent
commit
b64bb06428
  1. 2
      apps/api/src/app/portfolio/portfolio.controller.ts
  2. 4
      apps/client/src/app/components/home-holdings/home-holdings.component.ts
  3. 2
      apps/client/src/app/components/home-holdings/home-holdings.html
  4. 10
      apps/client/src/app/components/home-overview/home-overview.component.ts
  5. 4
      apps/client/src/app/components/home-overview/home-overview.html

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

@ -33,6 +33,7 @@ import {
} from '@nestjs/common';
import { REQUEST } from '@nestjs/core';
import { AuthGuard } from '@nestjs/passport';
import { ViewMode } from '@prisma/client';
import { StatusCodes, getReasonPhrase } from 'http-status-codes';
import { PortfolioPositionDetail } from './interfaces/portfolio-position-detail.interface';
@ -213,6 +214,7 @@ export class PortfolioController {
if (
impersonationId ||
this.request.user.Settings.viewMode === ViewMode.ZEN ||
this.userService.isRestrictedView(this.request.user)
) {
performanceInformation.performance = nullifyValuesInObject(

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

@ -93,7 +93,9 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
});
this.dateRange =
<DateRange>this.settingsStorageService.getSetting(RANGE) || 'max';
this.user.settings.viewMode === 'ZEN'
? 'max'
: <DateRange>this.settingsStorageService.getSetting(RANGE) ?? 'max';
this.update();
}

2
apps/client/src/app/components/home-holdings/home-holdings.html

@ -1,5 +1,5 @@
<div class="container justify-content-center p-3">
<div class="mb-3 text-center">
<div *ngIf="user.settings.viewMode !== 'ZEN'" class="mb-3 text-center">
<gf-toggle
[defaultValue]="dateRange"
[isLoading]="positions === undefined"

10
apps/client/src/app/components/home-overview/home-overview.component.ts

@ -32,6 +32,7 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
public isAllTimeLow: boolean;
public isLoadingPerformance = true;
public performance: PortfolioPerformance;
public showDetails = false;
public user: User;
private unsubscribeSubject = new Subject<void>();
@ -79,7 +80,14 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
});
this.dateRange =
<DateRange>this.settingsStorageService.getSetting(RANGE) || 'max';
this.user.settings.viewMode === 'ZEN'
? 'max'
: <DateRange>this.settingsStorageService.getSetting(RANGE) ?? 'max';
this.showDetails =
!this.hasImpersonationId &&
!this.user.settings.isRestrictedView &&
this.user.settings.viewMode !== 'ZEN';
this.update();
}

4
apps/client/src/app/components/home-overview/home-overview.html

@ -34,9 +34,9 @@
[isLoading]="isLoadingPerformance"
[locale]="user?.settings?.locale"
[performance]="performance"
[showDetails]="!hasImpersonationId && !user.settings.isRestrictedView"
[showDetails]="showDetails"
></gf-portfolio-performance>
<div class="text-center">
<div *ngIf="showDetails" class="text-center">
<gf-toggle
[defaultValue]="dateRange"
[isLoading]="isLoadingPerformance"

Loading…
Cancel
Save