From 779f68ffbb18d140cf625fa81f02a4c69b0d9dfe Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:22:26 +0100
Subject: [PATCH] Refactoring

---
 libs/ui/src/lib/assistant/assistant.component.ts | 14 ++++++++------
 libs/ui/src/lib/assistant/assistant.html         |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index 2350b24e8..18ca55dca 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/libs/ui/src/lib/assistant/assistant.component.ts
@@ -270,10 +270,6 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
 
     this.filterForm.disable({ emitEvent: false });
 
-    if (this.hasPermissionToChangeFilters) {
-      this.filterForm.enable({ emitEvent: false });
-    }
-
     this.tags =
       this.user?.tags
         ?.filter(({ isUsed }) => {
@@ -328,6 +324,9 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       this.searchElement?.nativeElement?.focus();
     });
 
+    this.isLoading = false;
+    this.setIsOpen(true);
+
     this.dataService
       .fetchPortfolioHoldings()
       .pipe(takeUntil(this.unsubscribeSubject))
@@ -340,8 +339,11 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
             return a.name?.localeCompare(b.name);
           });
         this.setFilterFormValues();
-        this.isLoading = false;
-        this.setIsOpen(true);
+
+        if (this.hasPermissionToChangeFilters) {
+          this.filterForm.enable({ emitEvent: false });
+        }
+
         this.changeDetectorRef.markForCheck();
       });
   }
diff --git a/libs/ui/src/lib/assistant/assistant.html b/libs/ui/src/lib/assistant/assistant.html
index 228c9cc56..b6faecffd 100644
--- a/libs/ui/src/lib/assistant/assistant.html
+++ b/libs/ui/src/lib/assistant/assistant.html
@@ -87,7 +87,7 @@
     </div>
   </div>
   <form [formGroup]="filterForm">
-    <ng-container *ngIf="!(isLoading || searchFormControl.value)">
+    <ng-container *ngIf="!searchFormControl.value">
       <div class="date-range-selector-container p-3">
         <mat-form-field appearance="outline" class="w-100 without-hint">
           <mat-label i18n>Date Range</mat-label>