Skip to content

Commit

Permalink
Update link to ARS (ars-prod.transltr.io)
Browse files Browse the repository at this point in the history
ARS response list:
- add link to remove response from local cache
SmartAPI Info:
- add links to SmartAPI registration pages
- provide full report for automat* and Utilities
- add mouse-over help text to some status bubbles
  • Loading branch information
isbluis committed Jul 21, 2022
1 parent 9b502f6 commit 9ad6f41
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 6 deletions.
40 changes: 35 additions & 5 deletions code/UI/interactive/rtx.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (!araxQuery)
var providers = {
"ARAX" : { "url" : baseAPI },
"ARAXQ": { "url" : araxQuery },
"ARS" : { "url" : "https://ars.transltr.io/ars/api/submit" },
"ARS" : { "url" : "https://ars-prod.transltr.io/ars/api/submit" },
"EXT" : { "url" : "https://translator.broadinstitute.org/molepro/trapi/v1.2" }
};

Expand Down Expand Up @@ -939,6 +939,7 @@ function getIdStats(id) {
document.getElementById("respsize_"+id).innerHTML = '';
document.getElementById("nodedges_"+id).innerHTML = '';
document.getElementById("nsources_"+id).innerHTML = '';
document.getElementById("cachelink_"+id).innerHTML = '';
document.getElementById("istrapi_"+id).innerHTML = 'loading...';
document.getElementById("numresults_"+id).appendChild(getAnimatedWaitBar(null));
}
Expand Down Expand Up @@ -985,13 +986,19 @@ function sendId(is_ars_refresh) {
reset_vars();
if (cyobj[99999]) {cyobj[99999].elements().remove();}
input_qg = { "edges": {}, "nodes": {} };

for (var item of document.querySelectorAll('[id^="resparrow_"]'))
item.className = '';
if (document.getElementById("resparrow_"+id))
document.getElementById("resparrow_"+id).className = 'p7';
}

if (document.getElementById("numresults_"+id)) {
document.getElementById("numresults_"+id).innerHTML = '';
document.getElementById("respsize_"+id).innerHTML = '';
document.getElementById("nodedges_"+id).innerHTML = '';
document.getElementById("nsources_"+id).innerHTML = '';
document.getElementById("cachelink_"+id).innerHTML = '';
document.getElementById("istrapi_"+id).innerHTML = 'loading...';
document.getElementById("numresults_"+id).appendChild(getAnimatedWaitBar(null));
}
Expand Down Expand Up @@ -1055,7 +1062,7 @@ function process_ars_message(ars_msg, level) {
table.className = 'sumtab';

tr = document.createElement("tr");
for (var head of ["","Agent","Status / Code","Message Id","Size","TRAPI 1.2?","N_Results","Nodes / Edges","Sources"] ) {
for (var head of ["","Agent","Status / Code","Message Id","Size","TRAPI 1.2?","N_Results","Nodes / Edges","Sources","Cache"] ) {
td = document.createElement("th")
td.style.paddingRight = "15px";
td.appendChild(document.createTextNode(head));
Expand All @@ -1075,6 +1082,8 @@ function process_ars_message(ars_msg, level) {
tr = document.createElement("tr");
tr.className = 'hoverable';
td = document.createElement("td");
if (level)
td.id = "resparrow_"+ars_msg.message;
td.appendChild(document.createTextNode('\u25BA'.repeat(level)));
tr.appendChild(td);
td = document.createElement("td");
Expand Down Expand Up @@ -1132,6 +1141,11 @@ function process_ars_message(ars_msg, level) {
td.style.textAlign = "center";
tr.appendChild(td);

td = document.createElement("td");
td.id = "cachelink_"+ars_msg.message;
td.style.textAlign = "right";
tr.appendChild(td);

table.appendChild(tr);

if (go)
Expand Down Expand Up @@ -1416,6 +1430,7 @@ function update_response_stats_on_error(rid,msg,clearall) {
document.getElementById("nodedges_"+rid).innerHTML = '';
document.getElementById("nsources_"+rid).innerHTML = '';
document.getElementById("istrapi_"+rid).innerHTML = '';
document.getElementById("cachelink_"+rid).innerHTML = '';
}
}

Expand Down Expand Up @@ -5145,9 +5160,16 @@ function retrieveKPInfo() {
text.title = "TRAPI version";
td.appendChild(text);

text = document.createElement("h3");
text = document.createElement("a");
text.style.display = "inline-block";
text.appendChild(document.createTextNode(item["title"]));
text.style.color = "#000";
text.style.fontWeight = 'bold';
text.style.fontSize = 'initial';
text.style.padding = '15px 0px';
text.href = item["smartapi_url"];
text.target = 'smartapi_reg';
text.title = 'View SmartAPI registration for this '+component;
text.innerHTML = item["title"];
td.appendChild(text);
td.appendChild(document.createElement("br"));
td.appendChild(document.createTextNode(item["infores_name"]));
Expand All @@ -5158,7 +5180,7 @@ function retrieveKPInfo() {
var is_first = true;
for (var mature of ["production","staging","testing","development"] ) {
var status_nodes = [];
var had_transltr_io = (item["infores_name"].startsWith("infores:automat") || component == "Utility");
var had_transltr_io = false; //(item["infores_name"].startsWith("infores:automat") || component == "Utility");
var was_mature = false;
for (var server of item["servers"]) {
if (server["maturity"] == mature) {
Expand Down Expand Up @@ -5196,6 +5218,7 @@ function retrieveKPInfo() {
td.appendChild(document.createTextNode(server[what]));
else {
td.className = "error";
td.title = "No data!";
td.appendChild(document.createTextNode("-- null --"));
}
tr.appendChild(td);
Expand All @@ -5219,6 +5242,7 @@ function retrieveKPInfo() {
td = document.createElement("td");
var span = document.createElement("span");
span.className = "explevel p3";
span.title = "No servers found at this maturity level";
span.appendChild(document.createTextNode('\u00A0'));
span.appendChild(document.createTextNode('\u00A0'));
td.appendChild(span);
Expand Down Expand Up @@ -5249,6 +5273,7 @@ function retrieveKPInfo() {
td = document.createElement("td");
var span = document.createElement("span");
span.className = "explevel p1";
span.title = "Maturity does not match expected list [production, staging, testing, development]";
span.appendChild(document.createTextNode('\u00A0'));
span.appendChild(document.createTextNode('\u00A0'));
td.appendChild(span);
Expand All @@ -5259,6 +5284,7 @@ function retrieveKPInfo() {
if (server[what])
td.appendChild(document.createTextNode(server[what]));
else {
td.title = "No data!";
td.appendChild(document.createTextNode("-- null --"));
}
tr.appendChild(td);
Expand Down Expand Up @@ -5816,6 +5842,8 @@ function display_cache() {
for (var pid in response_cache) {
numitems++;
listhtml += "<tr><td>"+numitems+".</td><td>"+pid+"</td><td><a href='javascript:remove_from_cache(\"" + pid +"\");'/>Remove</a></td></tr>";
if (document.getElementById("cachelink_"+pid))
document.getElementById("cachelink_"+pid).innerHTML = "<a href='javascript:remove_from_cache(\"" + pid +"\");'/>Clear</a>";
}

if (numitems == 0) {
Expand All @@ -5833,6 +5861,8 @@ function display_cache() {

function remove_from_cache(item) {
delete response_cache[item];
if (document.getElementById("cachelink_"+item))
document.getElementById("cachelink_"+item).innerHTML = '';
display_cache();
}
function delete_cache(item) {
Expand Down
2 changes: 1 addition & 1 deletion code/UI/interactive/rtx.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Drab Peregrine falcon
Opulent Anteater

0 comments on commit 9ad6f41

Please sign in to comment.