From 0385a7f11c243d5021875f6c3917fb14b3303b1f Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 13 May 2023 11:53:24 +0200
Subject: [PATCH] Refactoring

---
 .../lib/activities-table/activities-table.component.html | 6 +++---
 .../lib/activities-table/activities-table.component.ts   | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 550c484dc..b4dc5c404 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -78,11 +78,11 @@
         <mat-checkbox
           color="primary"
           [checked]="
-            selectedRows.hasValue() &&
             areAllRowsSelected() &&
-            !isAnyActivityDuplicate
+            !hasDuplicateActivity &&
+            selectedRows.hasValue()
           "
-          [disabled]="isAnyActivityDuplicate"
+          [disabled]="hasDuplicateActivity"
           [indeterminate]="selectedRows.hasValue() && !areAllRowsSelected()"
           (change)="$event ? toggleAllRows() : null"
         ></mat-checkbox>
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index b3767edfd..63d8811a6 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -66,6 +66,7 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
   public endOfToday = endOfToday();
   public filters$ = new Subject<Filter[]>();
   public hasDrafts = false;
+  public hasDuplicateActivity = false;
   public isAfter = isAfter;
   public isLoading = true;
   public isUUID = isUUID;
@@ -76,7 +77,6 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
   public selectedRows = new SelectionModel<Activity>(true, []);
   public totalFees: number;
   public totalValue: number;
-  public isAnyActivityDuplicate: boolean = false;
 
   private readonly SEARCH_STRING_SEPARATOR = ',';
   private unsubscribeSubject = new Subject<void>();
@@ -99,11 +99,8 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
         });
     }
 
-    this.activities.some(({ isDuplicate }) => {
-      if (isDuplicate) {
-        this.isAnyActivityDuplicate = true;
-        return;
-      }
+    this.hasDuplicateActivity = this.activities.some(({ isDuplicate }) => {
+      return isDuplicate;
     });
   }