Bugfix/fix zen mode (#723)

* Fix Zen mode

* Update changelog
This commit is contained in:
Thomas Kaul 2022-02-25 08:04:42 +01:00 committed by GitHub
parent 46b91d3c3b
commit 745ba978a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 5 deletions

View File

@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Distinguished the labels _Other_ and _Unknown_ in the portfolio proportion chart component - Distinguished the labels _Other_ and _Unknown_ in the portfolio proportion chart component
- Improved the portfolio entry page - Improved the portfolio entry page
### Fixed
- Fixed the _Zen Mode_
## 1.119.0 - 21.02.2022 ## 1.119.0 - 21.02.2022
### Added ### Added

View File

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

View File

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

View File

@ -1,5 +1,5 @@
<div class="container justify-content-center p-3"> <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 <gf-toggle
[defaultValue]="dateRange" [defaultValue]="dateRange"
[isLoading]="positions === undefined" [isLoading]="positions === undefined"

View File

@ -32,6 +32,7 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
public isAllTimeLow: boolean; public isAllTimeLow: boolean;
public isLoadingPerformance = true; public isLoadingPerformance = true;
public performance: PortfolioPerformance; public performance: PortfolioPerformance;
public showDetails = false;
public user: User; public user: User;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -79,7 +80,14 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
}); });
this.dateRange = 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(); this.update();
} }

View File

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