Refactoring

apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html

@@ -20,7 +20,7 @@
       <mat-select
         name="benchmark"
         [disabled]="user?.subscription?.type === 'Basic'"
-        [value]="benchmark"
+        [value]="benchmark?.id"
         (selectionChange)="onChangeBenchmark($event.value)"
       >
         <mat-option [value]="null" />

apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts

@@ -46,8 +46,8 @@ import annotationPlugin from 'chartjs-plugin-annotation';
   styleUrls: ['./benchmark-comparator.component.scss']
 })
 export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
+  @Input() benchmark: Partial<SymbolProfile>;
   @Input() benchmarkDataItems: LineChartItem[] = [];
-  @Input() benchmark: string;
   @Input() benchmarks: Partial<SymbolProfile>[];
   @Input() colorScheme: ColorScheme;
   @Input() daysInMarket: number;
@@ -98,10 +98,6 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
   }
 
   private initialize() {
-    const benchmarkAssetProfile = this.benchmarks.find(({ id }) => {
-      return id === this.benchmark;
-    });
-
     const data: ChartData<'line'> = {
       datasets: [
         {
@@ -120,7 +116,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
           data: this.benchmarkDataItems.map(({ date, value }) => {
             return { x: parseDate(date).getTime(), y: value };
           }),
-          label: benchmarkAssetProfile?.name ?? $localize`Benchmark`
+          label: this.benchmark?.name ?? $localize`Benchmark`
         }
       ]
     };

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

@@ -32,6 +32,7 @@ import { takeUntil } from 'rxjs/operators';
   templateUrl: './analysis-page.html'
 })
 export class AnalysisPageComponent implements OnDestroy, OnInit {
+  public benchmark: Partial<SymbolProfile>;
   public benchmarkDataItems: HistoricalDataItem[] = [];
   public benchmarks: Partial<SymbolProfile>[];
   public bottom3: Position[];
@@ -122,6 +123,10 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
         if (state?.user) {
           this.user = state.user;
 
+          this.benchmark = this.benchmarks.find(({ id }) => {
+            return id === this.user.settings?.benchmark;
+          });
+
           this.update();
         }
       });

apps/client/src/app/pages/portfolio/analysis/analysis-page.html

@@ -4,7 +4,7 @@
     <div class="col-lg">
       <gf-benchmark-comparator
         class="h-100"
-        [benchmark]="user?.settings?.benchmark"
+        [benchmark]="benchmark"
         [benchmarkDataItems]="benchmarkDataItems"
         [benchmarks]="benchmarks"
         [colorScheme]="user?.settings?.colorScheme"