refactor: remove hideSuggestion from SearchBar components and related types

Author: TheauW

packages/diracx-web-components/src/components/JobMonitor/JobSearchBar.tsx

@@ -103,7 +103,7 @@ async function createSuggestions({
   previousEquation,
   columns,
   searchBody,
-  searchBodyIndex = 0,
+  searchBodyIndex,
 }: {
   diracxUrl: string | null;
   accessToken: string | undefined;
@@ -150,15 +150,11 @@ async function createSuggestions({
     const type = columns.map(
       (column) => column.meta?.type || CategoryType.STRING,
     ) as CategoryType[];
-    const hideSuggestion = columns.map(
-      (column) => column.meta?.isQuasiUnique || false,
-    );
 
     return {
       items: items,
       type,
       nature: Array(items.length).fill(SearchBarTokenNature.CATEGORY),
-      hideSuggestion: hideSuggestion,
     };
   }
 
@@ -169,16 +165,26 @@ async function createSuggestions({
         items: ["minute", "hour", "day", "week", "month", "year"],
         nature: Array(6).fill(SearchBarTokenNature.VALUE),
         type: Array(6).fill(CategoryType.DATE),
-        hideSuggestion: Array(6).fill(previousToken.hideSuggestion),
       };
     }
 
-    if (!previousToken.hideSuggestion) {
+    const hideSuggestion = columns.some(
+      (column) =>
+        column.header === previousEquation.items[0].label &&
+        column.meta?.isQuasiUnique === true,
+    );
+
+    if (!hideSuggestion) {
       // Load the suggestions for the selected category
+
+      /**
+       * The internal name of the category is used to fetch the job summary
+       */
       const category = fromHumanReadableText(
         String(previousEquation.items[0].label),
         columns,
       );
+
       await fetchJobSummary(category);
       const items = data.map((item) =>
         String(item[category as keyof JobSummary]),
@@ -188,7 +194,6 @@ async function createSuggestions({
         items: items,
         nature: Array(items.length).fill(SearchBarTokenNature.VALUE),
         type: Array(items.length).fill(previousToken.type),
-        hideSuggestion: Array(items.length).fill(previousToken.hideSuggestion),
       };
     }
   }
@@ -201,58 +206,41 @@ async function createSuggestions({
           items: items,
           type: Array(items.length).fill(CategoryType.STRING),
           nature: Array(items.length).fill(SearchBarTokenNature.OPERATOR),
-          hideSuggestion: Array(items.length).fill(
-            previousToken.hideSuggestion,
-          ),
         };
       case CategoryType.NUMBER:
         items = Operators.getNumberOperators().map((op) => op.getDisplay());
         return {
           items: items,
           type: Array(items.length).fill(CategoryType.NUMBER),
           nature: Array(items.length).fill(SearchBarTokenNature.OPERATOR),
-          hideSuggestion: Array(items.length).fill(
-            previousToken.hideSuggestion,
-          ),
         };
       case CategoryType.BOOLEAN:
         items = Operators.getBooleanOperators().map((op) => op.getDisplay());
         return {
           items: items,
           type: Array(items.length).fill(CategoryType.BOOLEAN),
           nature: Array(items.length).fill(SearchBarTokenNature.OPERATOR),
-          hideSuggestion: Array(items.length).fill(
-            previousToken.hideSuggestion,
-          ),
         };
       case CategoryType.DATE:
         items = Operators.getDateOperators().map((op) => op.getDisplay());
         return {
           items: items,
           type: Array(items.length).fill(CategoryType.DATE),
           nature: Array(items.length).fill(SearchBarTokenNature.OPERATOR),
-          hideSuggestion: Array(items.length).fill(
-            previousToken.hideSuggestion,
-          ),
         };
       case CategoryType.CUSTOM:
         items = Operators.getDefaultOperators().map((op) => op.getDisplay());
         return {
           items: items,
           nature: Array(items.length).fill(SearchBarTokenNature.OPERATOR),
           type: Array(items.length).fill(CategoryType.CUSTOM),
-          hideSuggestion: Array(items.length).fill(
-            previousToken.hideSuggestion,
-          ),
         };
 
-      // We don't want suggestions for the number and in case of a custom token
       default:
         return {
           items: [],
           nature: [],
           type: [],
-          hideSuggestion: [],
         };
     }
   }
@@ -261,6 +249,5 @@ async function createSuggestions({
     items: [],
     nature: [],
     type: [],
-    hideSuggestion: [],
   };
 }

packages/diracx-web-components/src/components/shared/SearchBar/DisplayTokenEquation.tsx

@@ -75,6 +75,7 @@ export function DisplayTokenEquation({
               }}
               key={tokenIndex}
               onClick={(e) => handleClick(e, tokenIndex)}
+              id={`tokenid:equation-${equationIndex}-token-${tokenIndex}`}
               onContextMenu={(e) => {
                 e.preventDefault();
                 handleRightClick();