Merge pull request cBioPortal#128 from onursumer/gnomad-no-data-fix

Fix the broken tooltip for the no gnomad data case
onursumer · Nov 20, 2019 · 3f6d7a7 · 3f6d7a7
1 parent b1e1ec9
commit 3f6d7a7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/packages/react-mutation-mapper/package.json b/packages/react-mutation-mapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-mutation-mapper",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Generic Mutation Mapper",
   "author": "cBioPortal",
   "license": "GNU Affero General Public License v3.0",

diff --git a/packages/react-mutation-mapper/src/component/gnomad/GnomadFrequency.tsx b/packages/react-mutation-mapper/src/component/gnomad/GnomadFrequency.tsx
@@ -89,7 +89,6 @@ export default class GnomadFrequency extends React.Component<GnomadFrequencyProp
         let gnomadUrl = "";
         let display: JSX.Element;
         let overlay: (() => JSX.Element) | null = null;
-        let content: JSX.Element | null = null;
         let result : {[key:string]: GnomadSummary} = {};
 
         // Checking if gnomad data is valid
@@ -144,37 +143,27 @@ export default class GnomadFrequency extends React.Component<GnomadFrequencyProp
             // The column will show the total frequency
             // Column will show 0 if the total frequency is 0, still has the tooltip to show the gnomad table (since gnomad data is still available)
             if (result["Total"].alleleFrequency === 0) {
-                display = <span>0</span>
+                display = <span>0</span>;
             } else {
-                display = <span>{parseFloat(result["Total"].alleleFrequency.toString()).toExponential(1)}</span>
+                display = <span>{parseFloat(result["Total"].alleleFrequency.toString()).toExponential(1)}</span>;
             }
 
             overlay = () => <GnomadFrequencyTable data={sorted} gnomadUrl={gnomadUrl} />;
         }
         else {
-            display =
-                <DefaultTooltip
-                    placement="topRight"
-                    overlay={(<span>Variant has no data in gnomAD.</span>)}
-                >
-                    <span style={{height: '100%', width: '100%', display: 'block', overflow: 'hidden'}}>&nbsp;</span>
-                </DefaultTooltip>
+            display = <span style={{height: '100%', width: '100%', display: 'block', overflow: 'hidden'}}>&nbsp;</span>;
+            overlay = () => <span>Variant has no data in gnomAD.</span>;
         }
 
-        // add a tooltip if the gnomad value is valid
-        if (overlay) {
-            content = (
-                <DefaultTooltip
-                    overlay={overlay}
-                    placement="topRight"
-                    trigger={['hover', 'focus']}
-                    destroyTooltipOnHide={true}
-                >
-                    {display}
-                </DefaultTooltip>
-            );
-        }
-
-        return content;
+        return (
+            <DefaultTooltip
+                overlay={overlay}
+                placement="topRight"
+                trigger={['hover', 'focus']}
+                destroyTooltipOnHide={true}
+            >
+                {display}
+            </DefaultTooltip>
+        );
     }
 }