tooltip condition updated

opentargets · Nov 22, 2023 · 5da106a · 5da106a
1 parent ff941cb
commit 5da106a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/packages/sections/src/drug/Pharmacogenomics/Body.jsx b/packages/sections/src/drug/Pharmacogenomics/Body.jsx
@@ -148,20 +148,24 @@ function Body({ id: chemblId, label: name, entity }) {
     {
       id: "drugResponse",
       label: "Drug Response Phenotype",
-      renderCell: ({ phenotypeText = naLabel, phenotypeFromSourceId, genotypeAnnotationText }) => {
+      renderCell: ({ phenotypeText, phenotypeFromSourceId, genotypeAnnotationText }) => {
         let phenotypeTextElement;
 
         if (phenotypeText) {
-          phenotypeTextElement = phenotypeFromSourceId ? (
-            <Tooltip title={genotypeAnnotationText} showHelpIcon>
-              <Link to={`/disease/${phenotypeFromSourceId}`}>{phenotypeText}</Link>
-            </Tooltip>
-          ) : (
+          phenotypeTextElement = phenotypeText;
+        } else phenotypeTextElement = naLabel;
+
+        if (phenotypeFromSourceId)
+          phenotypeTextElement = (
+            <Link to={`/disease/${phenotypeFromSourceId}`}>{phenotypeTextElement}</Link>
+          );
+
+        if (genotypeAnnotationText)
+          phenotypeTextElement = (
             <Tooltip title={genotypeAnnotationText} showHelpIcon>
-              {phenotypeText}
+              {phenotypeTextElement}
             </Tooltip>
           );
-        } else phenotypeTextElement = naLabel;
 
         return phenotypeTextElement;
       },
@@ -174,6 +178,7 @@ function Body({ id: chemblId, label: name, entity }) {
     {
       id: "confidenceLevel",
       label: "Confidence Level",
+      sortable: true,
       tooltip: (
         <>
           As defined by

diff --git a/packages/sections/src/target/Pharmacogenomics/PharmacogenomicsTable.jsx b/packages/sections/src/target/Pharmacogenomics/PharmacogenomicsTable.jsx
@@ -133,16 +133,20 @@ function OverviewTab({ pharmacogenomics, query, variables }) {
         let phenotypeTextElement;
 
         if (phenotypeText) {
-          phenotypeTextElement = phenotypeFromSourceId ? (
-            <Tooltip title={genotypeAnnotationText} showHelpIcon>
-              <Link to={`/disease/${phenotypeFromSourceId}`}>{phenotypeText}</Link>
-            </Tooltip>
-          ) : (
+          phenotypeTextElement = phenotypeText;
+        } else phenotypeTextElement = naLabel;
+
+        if (phenotypeFromSourceId)
+          phenotypeTextElement = (
+            <Link to={`/disease/${phenotypeFromSourceId}`}>{phenotypeTextElement}</Link>
+          );
+
+        if (genotypeAnnotationText)
+          phenotypeTextElement = (
             <Tooltip title={genotypeAnnotationText} showHelpIcon>
-              {phenotypeText}
+              {phenotypeTextElement}
             </Tooltip>
           );
-        } else phenotypeTextElement = naLabel;
 
         return phenotypeTextElement;
       },
@@ -155,6 +159,7 @@ function OverviewTab({ pharmacogenomics, query, variables }) {
     {
       id: "confidenceLevel",
       label: "Confidence Level",
+      sortable: true,
       tooltip: (
         <>
           As defined by