From 8dc950bbe0267d071c78fe28747c5937065c4977 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 17 Dec 2021 01:18:46 +0100
Subject: [PATCH] #398: Added priorities to executions

---
 backend/go-app/walkoff.go              |  3 +++
 frontend/src/views/AngularWorkflow.jsx | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index e2d27443..204e3c90 100644
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -922,6 +922,7 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 			//}
 
 			//log.Printf("Execution request: %#v", executionRequest)
+			executionRequest.Priority = workflowExecution.Priority
 			err = shuffle.SetWorkflowQueue(ctx, executionRequest, environment)
 			if err != nil {
 				log.Printf("[ERROR] Failed adding execution to db: %s", err)
@@ -2577,6 +2578,7 @@ func executeSingleAction(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	workflowExecution.Priority = 10
 	environments, err := shuffle.GetEnvironments(ctx, user.ActiveOrg.Id)
 	environment := "Shuffle"
 	if len(environments) >= 1 {
@@ -2597,6 +2599,7 @@ func executeSingleAction(resp http.ResponseWriter, request *http.Request) {
 		Environments:  []string{environment},
 	}
 
+	executionRequest.Priority = workflowExecution.Priority
 	err = shuffle.SetWorkflowQueue(ctx, executionRequest, environment)
 	if err != nil {
 		log.Printf("[ERROR] Failed adding execution to db: %s", err)
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 06e3f820..90fb2466 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -1855,6 +1855,7 @@ const AngularWorkflow = (props) => {
     const nodedata = event.target.data();
     if (nodedata.finished === false) {
 			console.log("NOT FINISHED - ADD EXAMPLE BRANCHES TO CLOSEST!!")
+			return
     }
 
     if (nodedata.app_name !== undefined) {
@@ -2282,14 +2283,14 @@ const AngularWorkflow = (props) => {
         (a) => a.id === data.id
       );
 
-			console.log("Trigger: ", data, trigger_index)
+			//console.log("Trigger: ", data, trigger_index)
 			if (trigger_index === -1) {
 				workflow.triggers.push(data)
 				trigger_index = workflow.triggers.length-1
 				setWorkflow(workflow)
 			}
 
-			console.log("Trigger2: ", data, trigger_index)
+			//console.log("Trigger2: ", data, trigger_index)
 			//if (data.id !== undefined && data.app_name !== undefined) {
 			//	//newapps.push(data)
 			//	workflow.actions.push(data)
@@ -3553,9 +3554,9 @@ const AngularWorkflow = (props) => {
     const nodedata = event.target.data();
 
 		//console.log("NODE: ", nodedata)
-    //if (nodedata.finished === false) {
-    //  return;
-    //}
+    if (nodedata.finished === false) {
+      return;
+    }
 
     //var parentNode = cy.$("#" + event.target.data("id"));
     //if (parentNode.data("isButton") || parentNode.data("buttonId")) return;