Make disease context qualifier a link, drive by cleanup of 'already o…

…n this page' check
monarch-initiative · Oct 17, 2024 · 5117639 · 5117639
1 parent 4c42ee6
commit 5117639
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/frontend/src/components/AppNodeBadge.vue b/frontend/src/components/AppNodeBadge.vue
@@ -88,7 +88,7 @@ const info = computed(() =>
 const isLink = computed(() => {
   /** make sure we're already on page we're linking to */
   return (
-    !window.location.pathname.endsWith("/node/" + (props.node.id || "")) &&
+    !window.location.pathname.endsWith("/" + (props.node.id || "")) &&
     /** make sure id is a valid curie */
     !!props.node.id?.match(/^\w/)
   );

diff --git a/frontend/src/pages/node/AssociationsTable.vue b/frontend/src/pages/node/AssociationsTable.vue
@@ -80,8 +80,16 @@
           : row.subject_taxon_label
       }}
     </template>
-    <template #disease_context_qualifier="{ row }">
-      {{ row.disease_context_qualifier_label }}
+    <template #disease_context="{ row }">
+      <AppNodeBadge
+        v-if="row.disease_context_qualifier"
+        :node="{
+          id: row.disease_context_qualifier,
+          name: row.disease_context_qualifier_label,
+          category: 'biolink:Disease',
+        }"
+      />
+      <span v-else class="empty">No info</span>
     </template>
     <!-- phenotype specific -->
     <!-- no template needed because info just plain text -->
@@ -225,7 +233,8 @@ const cols = computed((): Cols<Datum> => {
     props.category.id.includes("GeneToPhenotypicFeature")
   ) {
     extraCols.push({
-      key: "disease_context_qualifier_label",
+      slot: "disease_context",
+      key: "disease_context_qualifier",
       heading: "Disease Context",
       sortable: true,
     });