From b010aef239e42a7074cd7526752572f93e28ce85 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Wed, 7 Feb 2024 20:30:02 +0100 Subject: [PATCH] Refactoring --- .../app/components/header/header.component.ts | 4 ++-- .../home-overview/home-overview.component.ts | 4 ++-- apps/client/src/app/core/layout.service.ts | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts index a9974cfc0..6f467c238 100644 --- a/apps/client/src/app/components/header/header.component.ts +++ b/apps/client/src/app/components/header/header.component.ts @@ -195,8 +195,8 @@ export class HeaderComponent implements OnChanges { } public onLogoClick() { - if (this.currentRoute === 'home') { - this.layoutService.triggerReload(); + if (this.currentRoute === 'home' || this.currentRoute === 'zen') { + this.layoutService.getShouldReloadSubject().next(); } } diff --git a/apps/client/src/app/components/home-overview/home-overview.component.ts b/apps/client/src/app/components/home-overview/home-overview.component.ts index 9baf83dcf..d1e7415cb 100644 --- a/apps/client/src/app/components/home-overview/home-overview.component.ts +++ b/apps/client/src/app/components/home-overview/home-overview.component.ts @@ -13,7 +13,7 @@ import { import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { DateRange } from '@ghostfolio/common/types'; import { DeviceDetectorService } from 'ngx-device-detector'; -import { Subject, Subscription } from 'rxjs'; +import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @Component({ @@ -81,7 +81,7 @@ export class HomeOverviewComponent implements OnDestroy, OnInit { this.unit = this.showDetails ? this.user.settings.baseCurrency : '%'; - this.layoutService.shouldReload$ + this.layoutService.shouldReloadContent$ .pipe(takeUntil(this.unsubscribeSubject)) .subscribe(() => { this.update(); diff --git a/apps/client/src/app/core/layout.service.ts b/apps/client/src/app/core/layout.service.ts index 24fbc0fb8..3ba7af91e 100644 --- a/apps/client/src/app/core/layout.service.ts +++ b/apps/client/src/app/core/layout.service.ts @@ -1,19 +1,19 @@ import { Injectable } from '@angular/core'; -import { Subject } from 'rxjs'; +import { Observable, Subject } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class LayoutService { - private shouldReloadSubject = new Subject(); + public shouldReloadContent$: Observable; - // Observable stream - public shouldReload$ = this.shouldReloadSubject.asObservable(); + private shouldReloadSubject = new Subject(); - public constructor() {} + public constructor() { + this.shouldReloadContent$ = this.shouldReloadSubject.asObservable(); + } - // Method to trigger the reload - public triggerReload() { - this.shouldReloadSubject.next(); + public getShouldReloadSubject() { + return this.shouldReloadSubject; } }