From 5d3b039e60dfec8e571b5b1835016ee5029fb604 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 1 Aug 2026 22:07:49 +0200
Subject: [PATCH] Fix handling of Exclude from Analysis tag

---
 libs/ui/eslint.config.cjs                              | 10 +++++++++-
 .../lib/activities-table/activities-table.component.ts |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libs/ui/eslint.config.cjs b/libs/ui/eslint.config.cjs
index 65d17debdc..59b0abad85 100644
--- a/libs/ui/eslint.config.cjs
+++ b/libs/ui/eslint.config.cjs
@@ -42,7 +42,15 @@ module.exports = [
         ],
         '@angular-eslint/prefer-inject': 'off',
         '@angular-eslint/prefer-standalone': 'off',
-        '@typescript-eslint/prefer-nullish-coalescing': 'error'
+        '@typescript-eslint/prefer-nullish-coalescing': [
+          'error',
+          {
+            ignorePrimitives: {
+              boolean: true,
+              string: true
+            }
+          }
+        ]
       },
       languageOptions: {
         parserOptions: {
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 6fac6d1625..3318ca4309 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -298,7 +298,7 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
 
   public isExcludedFromAnalysis(activity: Activity) {
     return (
-      (activity.account && isAccountExcluded(activity.account)) ??
+      (activity.account && isAccountExcluded(activity.account)) ||
       activity.tags?.some(({ id }) => {
         return id === TAG_ID_EXCLUDE_FROM_ANALYSIS;
       }) === true