fix the delete button for 10001 host, and the layout problem of host …

…info form
ESIPFed · Feb 16, 2024 · 49f11fd · 49f11fd
1 parent 3e77070
commit 49f11fd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>com.gw</groupId>
 	<artifactId>geoweaver</artifactId>
-	<version>1.3.6</version>
+	<version>1.3.7</version>
 	<name>geoweaver</name>
 	<description>A lightweight workflow management software for organizing data analysis workflows, 
 	preserving history of every workflow run, and improving scientist producitvity and workflow FAIRness,

diff --git a/src/main/resources/static/js/gw.host.js b/src/main/resources/static/js/gw.host.js
@@ -1483,7 +1483,7 @@ GW.host = {
 
 				if(typeof val =='object')
 				{
-				  val = JSON.stringify(val);
+					val = JSON.stringify(val);
 				}
 
 				if(i=="id"){
@@ -1521,21 +1521,21 @@ GW.host = {
 
 				}
 
-
+				content += `<div class="row m-0">`;
 
 				if(i=="id" || i=="ip" || i=="type" || i=="url"){
 
 					if(i=="ip"){
 
-						content += "<div style=\"margin-top: 10px;\" class=\"col col-md-3 control-label\">"+"IP Address"+"</div>";  
+						content += "<div class=\"col col-md-3 control-label\">"+"IP Address"+"</div>";  
 
 					}else if (i=="id") {
 
-						content += "<div class=\"form-group\"><label class=\"col col-md-3 control-label\">"+i.toUpperCase()+"</label>";
+						content += "<div class=\"col col-md-3 control-label\">"+i.toUpperCase()+"</div>";
 
 					}else if (i=="url") {
 
-						content += "<div style=\"margin-top: 10px;\" class=\"col col-md-3 control-label\">"+"URL"+"</div>"; 
+						content += "<div class=\"col col-md-3 control-label\">"+"URL"+"</div>"; 
 
 					}else {
 
@@ -1545,7 +1545,7 @@ GW.host = {
 
 				}else {
 
-					content += "<div style=\"margin-top: 10px;\" class=\"col col-md-3 control-label\">"+i.charAt(0).toUpperCase()+ i.slice(1)+"</div>";
+					content += "<div class=\"col col-md-3 control-label\">"+i.charAt(0).toUpperCase()+ i.slice(1)+"</div>";
 				}
 
 
@@ -1588,15 +1588,17 @@ GW.host = {
 
 					}
 
-
 				}
 
-
+				content += `</div>`;
+
 			}
 
 		});
 
-		content += "<div style=\"margin-top: 5px; \" class=\"col col-md-3 control-label\">Confidential</div>"+
+		content += `<div class="row m-0">`;
+
+		content += "<div class=\"col col-md-3 control-label\">Confidential</div>"+
 						"<div class=\"col col-md-7\">";
 
 		if(confidential=="FALSE"){
@@ -1618,13 +1620,15 @@ GW.host = {
 				'       <label id="private_radio" for="confidential">Private</label>';
 
 		}
+
+		content += `</div></div>`;
 
 		content += "</form>"
 
 		var delbtn = "";
 
 //          if(hostip!="127.0.0.1")
-		if(msg.name!="localhost")
+		if(msg.id!="100001")
 			delbtn = "<i class=\"fa fa-minus subalignicon\" style=\"color:red;\" data-toggle=\"tooltip\" title=\"Delete this host\" onclick=\"GW.menu.del('" +hostid+"','host')\"></i>";
 
 		content += "</div>"+

diff --git a/src/main/resources/static/js/gw.js b/src/main/resources/static/js/gw.js
@@ -9,7 +9,7 @@ edu = {
 
 					sponsor: "ESIPLab incubator project, NASA ACCESS project, NSF Geoinformatics project, NSF Cybertraining project",
 
-					version: "1.3.6",
+					version: "1.3.7",
 
 					author: "open source contributors",
 

diff --git a/src/main/resources/static/js/gw.test.js b/src/main/resources/static/js/gw.test.js
@@ -217,7 +217,7 @@ GW.test = {
                       </div>
                     
                     <div id="main-host-info" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;padding-bottom:25px;">
-                          <div id="main-host-content" style="height:100%; overflow-y: scroll; padding: 10px; ">
+                          <div id="main-host-content" style="height:100%; width: 100%; overflow-y: scroll; padding: 0px; ">
                               <h2 style="color:black">Please select a host on the right panel! </h2>
                           </div>
                     </div>

diff --git a/src/main/resources/templates/geoweaver.html b/src/main/resources/templates/geoweaver.html
@@ -542,7 +542,7 @@ <h2>Workflow</h2>
 							</div>
 
 							<div id="main-host-info" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;padding-bottom:0px;">
-									<div id="main-host-content" style="height:100%; overflow-y: scroll; padding: 10px; ">
+									<div id="main-host-content" style="height:100%; width: 100%; overflow-y: scroll; padding: 0px; ">
 									<h2 style="color:black">Please select a host on the left panel or <button id="host-entry-create-btn" type="button" class="btn btn-success" onclick="GW.host.newDialog()">create</button> a new host! </h2>
 									</div>
 							</div>