Merge pull request #200 from ICRAR/liu-296

Liu 296
ICRAR · Oct 14, 2022 · 2405183 · 2405183
2 parents 7bb0b24 + 53a6fa2
commit 2405183
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/daliuge-engine/dlg/manager/web/dim.html b/daliuge-engine/dlg/manager/web/dim.html
@@ -97,12 +97,12 @@ <h4>Nodes</h4>
     var sessionsTbodyEl = d3.select('#sessionsTable tbody');
 
     var serverIP = serverUrl.split("//").pop().split(":").shift();// Show/hide parts of the UI depending on whether we're zooming in or not
-    console.log(selectedNode)
+
     // into a specific node
     if (selectedNode) {
         d3.select('#nodes').remove();
         d3.select('#islandDisplay').html("<a href="+serverUrl+">DIM: " + serverIP+"</a>");
-		d3.select('#nodeDisplay').text("/Node: " + selectedNode);
+		d3.select('#nodeDisplay').html("<a href="+serverUrl+"/?node="+selectedNode+"&dim_url="+serverUrl+">Node: " + selectedNode+"</a>");
     } else {
         d3.select('#zoom-notice').remove();
         d3.select('#nodeDisplay').remove();

diff --git a/daliuge-engine/dlg/manager/web/session.html b/daliuge-engine/dlg/manager/web/session.html
@@ -54,8 +54,8 @@
 	</nav>
 	<div id="graphNameWrapper">
 		<ol id="graphName">
-			<li><a id="local-manager-a"></a></li>
 			<li id="islandDisplay"></li>
+			<li><a id="local-manager-a"></a></li>
 			<li id="nodeDisplay"></li>
 			<li>Session: {{sessionId}}</li>
 		</ol>
@@ -389,6 +389,7 @@
         /* Modify breadcums depending on whether we are zooming into a node or not */
         if (selectedNode) {
             d3.select('#local-manager-a').attr('href', '/?node=' + selectedNode).text("Node: " + selectedNode);
+			d3.select('#nodeDisplay').remove()
         } else {
             d3.select('#local-manager-a').node().parentNode.remove();
         }

diff --git a/daliuge-engine/dlg/manager/web/static/js/dm.js b/daliuge-engine/dlg/manager/web/static/js/dm.js
@@ -152,7 +152,6 @@ function loadSessions(serverUrl, tbodyEl, refreshBtn, selectedNode, delay) {
 		var dimUrl = dimUrlQuery.searchParams.get("dim_url");
 		if(dimUrl){
 			url+="&dim_url="+dimUrl;
-			console.log(dimUrl)
 		}
 		return url;
 	};