From 3957e059426865c6659c7f202547fd430aff928c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 7 Jan 2024 16:41:40 +0100
Subject: [PATCH] Prepare for filters.tags

---
 .../activities/activities-page.component.ts     | 11 +----------
 .../analysis/analysis-page.component.ts         | 16 ++++++++--------
 .../pages/portfolio/analysis/analysis-page.html |  4 +++-
 .../src/app/services/user/user.service.ts       | 17 ++++++++++++++++-
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
index 4beb90df9..376aa6d9b 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
@@ -122,18 +122,9 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit {
 
   public fetchActivities() {
     if (this.user?.settings?.isExperimentalFeatures === true) {
-      const filters: Filter[] = [];
-
-      if (this.user?.settings?.['filters.tags']) {
-        filters.push({
-          id: this.user.settings['filters.tags'][0],
-          type: 'TAG'
-        });
-      }
-
       this.dataService
         .fetchActivities({
-          filters,
+          filters: this.userService.getFilters() ?? [],
           skip: this.pageIndex * this.pageSize,
           sortColumn: this.sortColumn,
           sortDirection: this.sortDirection,
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
index 51dcee24c..4247aea47 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
@@ -225,7 +225,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
   private fetchDividendsAndInvestments() {
     this.dataService
       .fetchDividends({
-        filters: this.activeFilters,
+        filters: this.userService.getFilters() ?? this.activeFilters,
         groupBy: this.mode,
         range: this.user?.settings?.dateRange
       })
@@ -238,7 +238,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
 
     this.dataService
       .fetchInvestments({
-        filters: this.activeFilters,
+        filters: this.userService.getFilters() ?? this.activeFilters,
         groupBy: this.mode,
         range: this.user?.settings?.dateRange
       })
@@ -252,16 +252,16 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
               ? translate('YEAR')
               : translate('YEARS')
             : this.streaks?.currentStreak === 1
-            ? translate('MONTH')
-            : translate('MONTHS');
+              ? translate('MONTH')
+              : translate('MONTHS');
         this.unitLongestStreak =
           this.mode === 'year'
             ? this.streaks?.longestStreak === 1
               ? translate('YEAR')
               : translate('YEARS')
             : this.streaks?.longestStreak === 1
-            ? translate('MONTH')
-            : translate('MONTHS');
+              ? translate('MONTH')
+              : translate('MONTHS');
 
         this.changeDetectorRef.markForCheck();
       });
@@ -313,7 +313,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
 
     this.dataService
       .fetchPortfolioPerformance({
-        filters: this.activeFilters,
+        filters: this.userService.getFilters() ?? this.activeFilters,
         range: this.user?.settings?.dateRange
       })
       .pipe(takeUntil(this.unsubscribeSubject))
@@ -358,7 +358,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
 
     this.dataService
       .fetchPositions({
-        filters: this.activeFilters,
+        filters: this.userService.getFilters() ?? this.activeFilters,
         range: this.user?.settings?.dateRange
       })
       .pipe(takeUntil(this.unsubscribeSubject))
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
index 74bb4719a..ae14d205a 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -1,6 +1,7 @@
 <div class="container">
   <h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>Analysis</h1>
-  <div *ngIf="!user?.settings?.isExperimentalFeatures" class="my-4 text-center">
+  @if (!user?.settings?.isExperimentalFeatures) {
+  <div class="my-4 text-center">
     <gf-toggle
       [defaultValue]="user?.settings?.dateRange"
       [isLoading]="isLoadingBenchmarkComparator || isLoadingInvestmentChart"
@@ -14,6 +15,7 @@
     [placeholder]="placeholder"
     (valueChanged)="filters$.next($event)"
   ></gf-activities-filter>
+  }
   <div class="mb-5 row">
     <div class="col-lg">
       <gf-benchmark-comparator
diff --git a/apps/client/src/app/services/user/user.service.ts b/apps/client/src/app/services/user/user.service.ts
index d041776dd..8094a7545 100644
--- a/apps/client/src/app/services/user/user.service.ts
+++ b/apps/client/src/app/services/user/user.service.ts
@@ -4,7 +4,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { ObservableStore } from '@codewithdan/observable-store';
 import { SubscriptionInterstitialDialogParams } from '@ghostfolio/client/components/subscription-interstitial-dialog/interfaces/interfaces';
 import { SubscriptionInterstitialDialog } from '@ghostfolio/client/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component';
-import { User } from '@ghostfolio/common/interfaces';
+import { Filter, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { parseISO } from 'date-fns';
 import { DeviceDetectorService } from 'ngx-device-detector';
@@ -46,6 +46,21 @@ export class UserService extends ObservableStore<UserStoreState> {
     }
   }
 
+  public getFilters() {
+    const user = this.getState().user;
+
+    return user?.settings?.isExperimentalFeatures === true
+      ? user.settings['filters.tags']
+        ? <Filter[]>[
+            {
+              id: user.settings['filters.tags'][0],
+              type: 'TAG'
+            }
+          ]
+        : []
+      : undefined;
+  }
+
   public remove() {
     this.setState({ user: null }, UserStoreActions.RemoveUser);
   }