Merge pull request #17777 from GordonSmith/HPCC-30297-WUDETAILS_RESULTS

HPCC-30297 WU Details Results Regression Reviewed-By: Jeremy Clements <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 15, 2023 · 31c9de0 · 31c9de0
2 parents 516d1db + 3101034
commit 31c9de0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/esp/src/src-react/components/controls/Grid.tsx b/esp/src/src-react/components/controls/Grid.tsx
@@ -43,16 +43,16 @@ interface IColumn extends _IColumn {
 
 function tooltipItemRenderer(item: any, index: number, column: IColumn) {
     const id = `${column.key}-${index}`;
-    const value = item[column.fieldName || column.key] ?? "";
+    const value = item[column.fieldName || column.key];
     const className = column.data.className ? column.data.className(value, item) : "";
     const style: React.CSSProperties = {
         display: "flex",
         justifyContent: column.data.justify === "right" ? "flex-end" : "flex-start"
     };
-    return <TooltipHost id={id} content={value} overflowMode={TooltipOverflowMode.Parent}>
+    return <TooltipHost id={id} content={value ?? ""} overflowMode={TooltipOverflowMode.Parent}>
         {column.data.formatter ?
-            <span style={style} className={className} aria-describedby={id}>{column.data.formatter(value, item)}</span> :
-            <span style={style} className={className} aria-describedby={id}>{value}</span>
+            <span style={style} className={className} aria-describedby={id}>{column.data.formatter(value, item) ?? ""}</span> :
+            <span style={style} className={className} aria-describedby={id}>{value ?? ""}</span>
         }
     </TooltipHost>;
 }