From 900457449376dd6217d414390f52c2b4838696b0 Mon Sep 17 00:00:00 2001
From: Munyoki Kilyungi
Date: Mon, 8 Jan 2024 18:23:19 +0300
Subject: Add dataset metadata to probeset page when a dataset is specified.

* gn2/wqflask/templates/probeset.html: Add extra dataset metadata
elements for groups, species, tissue name and dataset link.
* gn2/wqflask/views.py (get_probeset): Extend probeset URL to enable
specifying the dataset name.

Signed-off-by: Munyoki Kilyungi <me@bonfacemunyoki.com>
---
 gn2/wqflask/templates/probeset.html | 26 ++++++++++++++++----------
 gn2/wqflask/views.py                |  4 +++-
 2 files changed, 19 insertions(+), 11 deletions(-)

(limited to 'gn2/wqflask')

diff --git a/gn2/wqflask/templates/probeset.html b/gn2/wqflask/templates/probeset.html
index 53d7136e..ed96e6c3 100644
--- a/gn2/wqflask/templates/probeset.html
+++ b/gn2/wqflask/templates/probeset.html
@@ -26,23 +26,22 @@ mRNA Expression:
     <h3>{{ metadata.description }}</h3>
     {% endif %}
     <table class="table">
-	{% if metadata.dataset %}
+	{% if metadata.group and metadata.species %}
 	<tr>
             <td><b>Group </b></td>
             <td>
-		<a href="{{ metadata.group }}" target="_blank">{{ metadata.dataset }}</a>
+		{{ metadata.species|capitalize }}: {{ metadata.group }}
 	    </td>
 	</tr>
+	{% endif %}
+
+	{% if metadata.tissue %}
 	<tr>
-            <td><b>Dataset </b></td>
-            <td>
-		<a href="{{ metadata.group }}" target="_blank">{{ metadata.datasetName }}</a>
+	    <td><b>Tissue</b></td>
+	    <td>
+		{{ metadata.tissue }}
 	    </td>
-        </tr>
-	<tr>
-            <td><b>Tissue</b></td>
-            <td>{{ metadata.tissue}}</td>
-		</tr>
+	</tr>
 	{% endif %}
 
 	{% if metadata.symbol %}
@@ -82,6 +81,13 @@ mRNA Expression:
         </tr>
         {% endif %}
 
+	{% if metadata.dataset and dataset %}
+	<tr>
+	    <td><b>Database</b></td>
+	    <td><a href={{ url_for('get_dataset', name=dataset) }} target="_blank">{{ metadata.dataset }}</a></td>
+	</tr>
+	{% endif %}
+
 	{% if metadata.specificity or metadata.blatScore %}
         <tr>
 	    <td><b>Target Score</b></td>
diff --git a/gn2/wqflask/views.py b/gn2/wqflask/views.py
index 837677dd..cbf530c6 100644
--- a/gn2/wqflask/views.py
+++ b/gn2/wqflask/views.py
@@ -1183,7 +1183,8 @@ def get_phenotype(name, group=None):
 
 
 @app.route("/probesets/<name>", methods=('GET',))
-def get_probeset(name):
+@app.route("/probesets/<dataset>/<name>", methods=["GET"])
+def get_probeset(name, dataset=None):
     metadata = requests.get(
         urljoin(
             GN3_LOCAL_URL,
@@ -1192,6 +1193,7 @@ def get_probeset(name):
     return render_template(
         "probeset.html",
         name=name,
+        dataset=dataset,
         metadata=metadata,
     )
 
-- 
cgit 1.4.1