Added logic to getFilterHeaderText (#659)

equinor · Jan 29, 2025 · 0d63807 · 0d63807
1 parent bce37b1
commit 0d63807
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-fusion",
-  "version": "9.0.22",
+  "version": "9.0.23",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",