diff --git a/frontend/src/components/AppNodeBadge.vue b/frontend/src/components/AppNodeBadge.vue index 620a820c..449167e6 100644 --- 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 index 0c6314f1..6006c8cf 100644 --- a/frontend/src/pages/node/AssociationsTable.vue +++ b/frontend/src/pages/node/AssociationsTable.vue @@ -80,7 +80,17 @@ : row.subject_taxon_label }} - + @@ -210,15 +220,25 @@ const cols = computed((): Cols => { /** taxon column. exists for many categories, so just add if any row has taxon. */ if ( - associations.value.items.some( - (item) => item.subject_taxon_label || item.object_taxon_label, - ) + props.category.id.includes("GeneToGeneHomology") || + props.category.id.includes("Interaction") ) extraCols.push({ slot: "taxon", heading: "Taxon", }); + if ( + props.node.in_taxon_label == "Homo sapiens" && + props.category.id.includes("GeneToPhenotypicFeature") + ) { + extraCols.push({ + slot: "disease_context", + key: "disease_context_qualifier", + heading: "Disease Context", + sortable: true, + }); + } /** phenotype specific columns */ if (props.category.id.includes("PhenotypicFeature")) { extraCols.push( @@ -235,6 +255,7 @@ const cols = computed((): Cols => { }, ); } + //include original subject and call it Source for D2P if (props.category.id.includes("DiseaseToPhenotypicFeature")) { extraCols.push({