Merge pull request #851 from VEuPathDB/allow-html-in-table-column-too…

…ltips Allow html in result table column tooltips
VEuPathDB · Feb 15, 2024 · 78e36f1 · 78e36f1
2 parents 3cf63c0 + 2e85bf9
commit 78e36f1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/packages/libs/coreui/src/components/Mesa/Ui/HeadingCell.jsx b/packages/libs/coreui/src/components/Mesa/Ui/HeadingCell.jsx
@@ -184,12 +184,13 @@ class HeadingCell extends React.PureComponent {
     const { top, left, height } = offset ? offset : {};
     const position = { top: top + height, left };
 
-    if (!column.helpText) return null;
+    if (!column.helpText && !column.htmlHelp) return null;
     return (
       <Tooltip
         position={position}
         className="Trigger HelpTrigger"
-        content={column.helpText}
+        content={column.htmlHelp ?? column.helpText}
+        renderHtml={!!column.htmlHelp}
       >
         <Icon fa="question-circle" />
       </Tooltip>

diff --git a/packages/libs/wdk-client/src/Service/Decoders/RecordClassDecoders.ts b/packages/libs/wdk-client/src/Service/Decoders/RecordClassDecoders.ts
@@ -32,6 +32,7 @@ export const attributeFieldDecoder: Decode.Decoder<AttributeField> =
   Decode.combine(
     namedModelEntityDecoder,
     Decode.field('help', Decode.optional(Decode.string)),
+    Decode.field('htmlHelp', Decode.optional(Decode.string)),
     Decode.field('align', Decode.optional(Decode.string)),
     Decode.field('isSortable', Decode.boolean),
     Decode.field('isRemovable', Decode.boolean),

diff --git a/packages/libs/wdk-client/src/Utils/WdkModel.ts b/packages/libs/wdk-client/src/Utils/WdkModel.ts
@@ -311,6 +311,7 @@ export type ParamUIState =
 
 export interface AttributeField extends NamedModelEntity {
   help?: string;
+  htmlHelp?: string;
   align?: string;
   isSortable: boolean;
   isRemovable: boolean;

diff --git a/packages/libs/wdk-client/src/Views/ResultTableSummaryView/ResultTable.tsx b/packages/libs/wdk-client/src/Views/ResultTableSummaryView/ResultTable.tsx
@@ -339,6 +339,7 @@ function getColumns({
         attribute.name !== recordClass.recordIdAttributeName &&
         attribute.isRemovable,
       helpText: attribute.help,
+      htmlHelp: attribute.htmlHelp,
       name: attribute.displayName,
       renderCell: ({ row, key }: { row: RecordInstance; key: string }) =>
         key === recordClass.recordIdAttributeName ? (