From 0acac9d1d27d922e69fc2a2163429df5a69862a3 Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Wed, 5 Jun 2024 16:37:12 -0500
Subject: Build search URI endpoint on server rather than on JS

To help with maintenance, build the search URI on the server rather
than in the javascript.
---
 gn2/wqflask/oauth2/data.py                                  | 2 +-
 gn2/wqflask/static/new/javascript/auth/search_phenotypes.js | 2 +-
 gn2/wqflask/templates/oauth2/data-list-phenotype.html       | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'gn2')

diff --git a/gn2/wqflask/oauth2/data.py b/gn2/wqflask/oauth2/data.py
index b7c7800c..767de1a3 100644
--- a/gn2/wqflask/oauth2/data.py
+++ b/gn2/wqflask/oauth2/data.py
@@ -69,7 +69,7 @@ def __search_phenotypes__(query, template, **kwargs):
             template, traits=[], per_page=per_page, query=query,
             selected_traits=selected_traits, search_results=search_results,
             search_endpoint=urljoin(
-                authserver_uri(), "auth/data/search"),
+                request.host_url, "oauth2/data/phenotype/search"),
             auth_server_url=authserver_uri(),
             pheno_results_template=urljoin(
                 authserver_uri(), "auth/data/search/phenotype/<jobid>"),
diff --git a/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js b/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js
index e9ef2683..8689af75 100644
--- a/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js
+++ b/gn2/wqflask/static/new/javascript/auth/search_phenotypes.js
@@ -119,7 +119,7 @@ function search_phenotypes() {
     per_page = document.getElementById("txt-per-page").value
     search_table = new TableDataSource(
 	"#tbl-phenotypes", "data-traits", search_checkbox);
-    endpoint = "/auth/data/phenotype/search"
+    endpoint = endpoint = $("#frm-search-traits").attr("data-search-endpoint");
     $.ajax(
 	endpoint,
 	{
diff --git a/gn2/wqflask/templates/oauth2/data-list-phenotype.html b/gn2/wqflask/templates/oauth2/data-list-phenotype.html
index b23c16e2..d355f3f9 100644
--- a/gn2/wqflask/templates/oauth2/data-list-phenotype.html
+++ b/gn2/wqflask/templates/oauth2/data-list-phenotype.html
@@ -113,6 +113,7 @@
     <form id="frm-search-traits"
 	  action="#"
 	  method="POST"
+          data-search-endpoint="{{search_endpoint}}"
           data-pheno-results-template="{{pheno_results_template}}">
       {%if dataset_type == "mrna"%}
       <legend>mRNA: Search</legend>
-- 
cgit v1.2.3