Merge pull request #429 from ZihengSun/master

fix the prompt panel history table details
ESIPFed · Nov 27, 2023 · 56c48a3 · 56c48a3
2 parents 7064479 + 54d863d
commit 56c48a3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 38 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>com.gw</groupId>
 	<artifactId>geoweaver</artifactId>
-	<version>1.2.5</version>
+	<version>1.2.6</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.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.2.5",
+					version: "1.2.6",
 
 					author: "open source contributors",
 

diff --git a/src/main/resources/static/js/gw.process.js b/src/main/resources/static/js/gw.process.js
@@ -525,9 +525,6 @@ GW.process = {
 	 */
 	showHistoryDifference: function(history_id, previous_history_id) {
 
-		console.log("current history id: " + history_id);
-		console.log("previous history id: " + previous_history_id);
-
 		// ajax call for the current history id details:
 		$.ajax({
 
@@ -571,20 +568,10 @@ GW.process = {
 
 			// }
 
-			console.log("Sorted Array: ", msg);
-
 			msg = GW.general.parseResponse(msg);
 
 			msg.code = msg.input;
 
-			// GW.process.display(msg);
-
-			//GW.process.displayOutput(msg);
-
-			//GW.process.switchTab(document.getElementById("main-process-info-code-tab"), "main-process-info-code");
-
-			//if(GW.editor.isfullscreen) GW.editor.switchFullScreen();
-
 			// current code for dialogue box
 			console.log("current code: " + msg.code);
 			//GW.process.diffDialog(msg.code, "");
@@ -610,12 +597,11 @@ GW.process = {
 					return;
 
 				}
-				console.log("Sorted Array: ", msg_prv);
+
 				msg_prv = GW.general.parseResponse(msg_prv);
+
 				msg_prv.code = msg_prv.input;
 
-				// code for dialogue box
-				console.log("previous code: " + msg_prv.code);
 				GW.process.diffDialog(msg, msg_prv);
 
 			}).fail(function(jxr, status){
@@ -930,8 +916,6 @@ GW.process = {
 	 */
 	showHistoryDetails: function(history_id){
 
-		console.log("history id: " + history_id);
-
 		GW.process.history_id = history_id;
 
 		$.ajax({
@@ -944,8 +928,6 @@ GW.process = {
 
 		}).done(function(msg){
 
-			console.log("Log Message: " + msg);
-
 			if(msg==""){
 
 				alert("Cannot find the process history in the database.");
@@ -1811,8 +1793,6 @@ GW.process = {
 
 			var paramval = inputfield.val()
 
-			console.log(paramname + " - " +paramval);
-
 			pcode.params.push({name: paramname.substring(6), value: paramval})
 
 		});
@@ -2062,16 +2042,12 @@ GW.process = {
 
 			if(msg){
 
-				console.log(msg)
-
 				msg = GW.general.parseResponse(msg);
 
 				if(msg.ret == "success"){
 
 					console.log("the process is under execution.");
 
-					console.log("history id: " + msg.history_id);
-
 					GW.process.history_id = msg.history_id
 
 				}else if(msg.ret == "fail"){
@@ -2434,10 +2410,6 @@ GW.process = {
 
 				var hostip = $("#hostselector").children(":selected").attr("value");
 
-				console.log("host ip: " + hostip);
-
-				console.log("selected host: " + hostid);
-
 				if(hostip=="127.0.0.1"){
 
 					GW.host.local_hid = hostid;

diff --git a/src/main/resources/static/js/gw.process.sidepanel.js b/src/main/resources/static/js/gw.process.sidepanel.js
@@ -89,8 +89,6 @@ GW.process.sidepanel = {
 
     showHistoryDetails: function(history_id){
 
-		console.log("history id: " + history_id);
-
         GW.process.history_id = history_id;
 
 		$.ajax({
@@ -102,9 +100,7 @@ GW.process.sidepanel = {
 			data: "type=process&id=" + history_id
 
 		}).done(function(msg){
-
-			console.log("Log Message: " + msg);
-
+
 			if(msg==""){
 
 				alert("Cannot find the process history in the database.");
@@ -117,7 +113,7 @@ GW.process.sidepanel = {
 
 			msg.code = msg.input;
 
-            GW.process.history_id = msg.history_id
+            GW.process.history_id = msg.hid
 
 			GW.process.sidepanel.display(msg);