From c4f502eb6315174aff2b09255d45ae75074876c2 Mon Sep 17 00:00:00 2001
From: Frikky <frikky@shuffler.io>
Date: Tue, 20 Aug 2024 14:49:03 +0200
Subject: [PATCH] Rebuild nightly with tons of workflow startup overrides.
 SHOULD fix user input + weird startup issues by removing weird mix with cloud

---
 backend/go-app/go.mod     |  2 +-
 backend/go-app/go.sum     |  2 ++
 backend/go-app/walkoff.go | 11 ++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index 6fa30913..ec998a09 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/h2non/filetype v1.1.3
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.6.61
+	github.com/shuffle/shuffle-shared v0.6.62
 	golang.org/x/crypto v0.22.0
 	google.golang.org/api v0.176.1
 	google.golang.org/grpc v1.63.2
diff --git a/backend/go-app/go.sum b/backend/go-app/go.sum
index ab143f6b..3297148f 100644
--- a/backend/go-app/go.sum
+++ b/backend/go-app/go.sum
@@ -463,6 +463,8 @@ github.com/shuffle/shuffle-shared v0.6.60 h1:8OaiNxNpzJmIbYIcXI3TIYZVrPJ1sSCa+u7
 github.com/shuffle/shuffle-shared v0.6.60/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus=
 github.com/shuffle/shuffle-shared v0.6.61 h1:+9CCLeZLiAVDgNRTkZxnIgz+FZ7UrEHez2BAGPS/axc=
 github.com/shuffle/shuffle-shared v0.6.61/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus=
+github.com/shuffle/shuffle-shared v0.6.62 h1:NWVjVbnNpm6osDHQS2NGqwAgWk1Fk3s5RKUO3P5n4js=
+github.com/shuffle/shuffle-shared v0.6.62/go.mod h1:RAJiSFjmuKmijKTbbEf9A6Ojb+3/te7g71lED7JjPus=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 98bb5d09..d11e47f9 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -1082,6 +1082,7 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 		return shuffle.WorkflowExecution{}, "Failed unmarshal during execution", err
 	}
 
+	/*
 	makeNew := true
 	start, startok := request.URL.Query()["start"]
 	if request.Method == "POST" {
@@ -1201,7 +1202,7 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 
 		answer, answerok := request.URL.Query()["answer"]
 		referenceId, referenceok := request.URL.Query()["reference_execution"]
-		if answerok && referenceok {
+		if answerok && referenceok && len(answer) > 0 && len(referenceId) > 0 {
 			// If answer is false, reference execution with result
 			log.Printf("[INFO] Answer is OK AND reference is OK!")
 			if answer[0] == "false" {
@@ -1225,7 +1226,7 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 					log.Printf("%s - %s", result.Action.ID, start[0])
 					if result.Action.ID == start[0] {
 						note, noteok := request.URL.Query()["note"]
-						if noteok {
+						if noteok && len(note) > 0 {
 							result.Result = fmt.Sprintf("User note: %s", note[0])
 						} else {
 							result.Result = fmt.Sprintf("User clicked %s", answer[0])
@@ -1555,7 +1556,6 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 	//	newTriggers = append(newTriggers, trigger)
 	//}
 	//workflowExecution.Workflow.Triggers = newTriggers
-	_ = removeTriggers
 
 	if !startFound {
 		if len(workflowExecution.Start) == 0 && len(workflowExecution.Workflow.Start) > 0 {
@@ -1580,12 +1580,17 @@ func handleExecution(id string, workflow shuffle.Workflow, request *http.Request
 	if len(workflowExecution.ExecutionOrg) == 0 && len(workflow.ExecutingOrg.Id) > 0 {
 		workflowExecution.ExecutionOrg = workflow.ExecutingOrg.Id
 	}
+	*/
 
+	//workflowExecution, execInfo, _, workflowExecErr := shuffle.PrepareWorkflowExecution(ctx, workflow, request, int64(maxExecutionDepth))
 	err = shuffle.SetWorkflowExecution(ctx, workflowExecution, true)
 	if err != nil {
 		log.Printf("[ERROR] Failed setting workflow execution during init (2): %s", err)
 	}
 
+	onpremExecution := execInfo.OnpremExecution
+	_ = onpremExecution
+	environments := execInfo.Environments
 	var allEnvs []shuffle.Environment
 	if len(workflowExecution.ExecutionOrg) > 0 {
 		//log.Printf("[INFO] Executing ORG: %s", workflowExecution.ExecutionOrg)