Merge pull request #559 from VisheshSaluja/process_save

Issue#524 -- Overwritting of code in processes
ESIPFed · Sep 16, 2024 · 3455227 · 3455227
2 parents 783d2f8 + ebfdee3
commit 3455227
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/main/resources/static/js/gw.process.js b/src/main/resources/static/js/gw.process.js
@@ -764,6 +764,7 @@ GW.process = {
 
     $("#add-process-" + GW.process.cmid).click(function () {
       if (GW.process.add(false, GW.process.cmid)) frame.closeFrame();
+      // cmid = Math.floor(Math.random() * 1000);
     });
 
     $("#run-process-" + GW.process.cmid).click(function () {
@@ -1326,6 +1327,9 @@ GW.process = {
 
     owner = msg.owner;
 
+
+    // GW.process.cmid = Math.floor(Math.random() * 1000);
+
     var confidential_field =
       '     <div class="col-sm-1 col-form-label control-label">Confidential </div>' +
       '     <div class="col-sm-2" style="padding-left:30px;">';
@@ -1466,11 +1470,12 @@ GW.process = {
     $("#processid").val(process_id);
 
     GW.process.displayCodeArea(process_id, process_name, code_type, code);
+    // GW.process.displayCodeArea(process_id, process_name, code_type, code, GW.process.cmid);
 
     GW.process.displayToolbar(process_id, process_name, code_type);
 
     $("#showCurrent").click(function () {
-      GW.menu.details(process_id, "process");
+      GW.menu.details(process_id);
 
       GW.process.showSaved();
     });
@@ -1607,6 +1612,7 @@ GW.process = {
         GW.process.current_pid = $("#processid").val();
 
         GW.process.update(GW.process.current_pid);
+        // GW.process.update(GW.process.current_pid, GW.process.cmid);
 
         $("#processcategory").prop("disabled", true); //don't allow change of process category
 
@@ -1903,6 +1909,7 @@ GW.process = {
 
     var pdesc = $("#processcategory").val();
 
+    // var pcode = GW.process.getCode(cmid);
     var pcode = GW.process.getCode();
 
     var confidential = $('input[name="confidential_process"]:checked').val();
@@ -1967,6 +1974,19 @@ GW.process = {
 
           GW.process.expand(req.lang);
 
+          // GW.menu.details(msg.id, 'process').click();
+
+          // GW.process.display(msg);
+          console.log("add process id: " + msg.id);
+
+          setTimeout(function() {
+            // if (GW.process.editor) {
+            //     GW.process.editor.setValue(req.code); // Set the editor's content to the added process code
+            // }
+            GW.menu.details(msg.id, 'process')?.click();
+          }, 100); 
+
+
           if (run)
             GW.process.runProcess(
               msg.id,
@@ -1984,6 +2004,8 @@ GW.process = {
 
       return false;
     }
+    // cmid = Math.floor(Math.random() * 1000);
+    // console.log("after add: " + cmid);
   },
 
   /**
@@ -2022,8 +2044,10 @@ GW.process = {
     }
   },
 
-  sendExecuteRequest: function (req, dialog, button) {
+  sendExecuteRequest: function (req, dialog, button, log_pid) {
+    console.log("sendExecRequest-1");
     GW.process.clearProcessLogging();
+    console.log("sendExecRequest-2");
 
     var newhistid = GW.general.makeid(12);
 

diff --git a/src/main/resources/static/js/gw.process.util.js b/src/main/resources/static/js/gw.process.util.js
@@ -8,6 +8,7 @@ GW.process.util = {
     code,
     code_editor_container_id,
     process_window_container_id,
+    cmid,
   )
    {
     $(code_editor_container_id).html("");
@@ -180,6 +181,10 @@ GW.process.util = {
 
       // Add any additional editor options or event listeners here
   });
+  if(cmid!=null){
+    console.log("Editor cmid: " + cmid);
+  }
+
 
 }
   // GW.process.util.refreshCodeEditor();