From 0d63807bb1d4cbc04d01fdf150e36b51395076f4 Mon Sep 17 00:00:00 2001
From: Karolina Slazyk <76835138+kslazykv@users.noreply.github.com>
Date: Wed, 29 Jan 2025 09:52:06 +0100
Subject: [PATCH] Added logic to getFilterHeaderText (#659)

---
 packages/filter/package.json                  |  2 +-
 .../src/lib/utils/getFilterHeaderText.tsx     | 27 +++++++++++++------
 packages/workspace-fusion/package.json        |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/filter/package.json b/packages/filter/package.json
index a7f7a2048..371622ea4 100644
--- a/packages/filter/package.json
+++ b/packages/filter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-filter",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",
diff --git a/packages/filter/src/lib/utils/getFilterHeaderText.tsx b/packages/filter/src/lib/utils/getFilterHeaderText.tsx
index 3cf007fd7..856e36c13 100644
--- a/packages/filter/src/lib/utils/getFilterHeaderText.tsx
+++ b/packages/filter/src/lib/utils/getFilterHeaderText.tsx
@@ -6,13 +6,24 @@ export function getFilterHeaderText(
   name: string,
   checkedValues: string[]
 ): string | JSX.Element {
-  if (isAllChecked || checkedValues.length === 0) return <StyledNormalText>{name}</StyledNormalText>;
+  const selectedCount = checkedValues.length;
 
-  return (
-    <div style={{ color: tokens.colors.interactive.primary__resting.hex }}>
-      {checkedValues.length - 1 > 0
-        ? `${checkedValues[0] ?? '(Blank)'}(+${checkedValues.length - 1})`
-        : `${checkedValues[0]}`}{' '}
-    </div>
-  );
+  const hasBlank = checkedValues.includes('(Blank)');
+  const nonBlankCount = hasBlank ? selectedCount - 1 : selectedCount;
+
+  if (hasBlank && nonBlankCount > 0) {
+    return <StyledNormalText>{`${name} (Blank) (+${nonBlankCount})`}</StyledNormalText>;
+  }
+
+  if (selectedCount === 1 && hasBlank) {
+    return <StyledNormalText>{`${name} (Blank)`}</StyledNormalText>;
+  }
+
+  const displayText = selectedCount > 0 ? `${name} (+${selectedCount})` : name;
+
+  if (isAllChecked || selectedCount === 0) {
+    return <StyledNormalText>{displayText}</StyledNormalText>;
+  }
+
+  return <div style={{ color: tokens.colors.interactive.primary__resting.hex }}>{displayText}</div>;
 }
diff --git a/packages/workspace-fusion/package.json b/packages/workspace-fusion/package.json
index 924b66c09..e1e51e23b 100644
--- a/packages/workspace-fusion/package.json
+++ b/packages/workspace-fusion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-fusion",
-  "version": "9.0.22",
+  "version": "9.0.23",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",