From 09002f4aa316e66a702745e2cc6ef3e16988d355 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 22 Jan 2021 13:27:28 +0100
Subject: [PATCH] Moved executions to workflow view

---
 backend/go-app/walkoff.go              | 1 -
 frontend/src/views/AngularWorkflow.jsx | 6 ++++++
 frontend/src/views/Workflows.jsx       | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 66555157..fa8389ea 100644
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -4940,7 +4940,6 @@ func addAppAuthentication(resp http.ResponseWriter, request *http.Request) {
 
 		if foundIndex >= 0 {
 			log.Printf("[INFO] Found app %s by looping auth", appAuth.App.ID)
-			app = &workflowapps[foundIndex]
 		} else {
 			log.Printf("[ERROR] Failed finding app %s which has auth after looping", appAuth.App.ID)
 			resp.WriteHeader(409)
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 36c07f4e..9e494d91 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -1536,6 +1536,12 @@ const AngularWorkflow = (props) => {
 			getWorkflowExecution(props.match.params.key)
 			getAvailableWorkflows(-1) 
 			getSettings() 
+
+			const cursearch = typeof window === 'undefined' || window.location === undefined ? "" : window.location.search
+			const tmpView = new URLSearchParams(cursearch).get("view")
+			if (tmpView !== undefined && tmpView !== null && tmpView === "executions") {
+				setExecutionModalOpen(true)
+			}
 			return
 		} 
 
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index ca0351ec..960a7fbc 100644
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -907,7 +907,7 @@ const Workflows = (props) => {
 				</div>
 				:
 				<h4>
-					There are no executions for this workflow yet
+					Executions have been moved to the Workflow itself. <Link to={`/workflows/${selectedWorkflow.id}?view=executions`} style={{textDecoration: "none", color: "#f85a3e"}}>Click here to see them</Link>
 				</h4>
 		)
 	}
@@ -1247,7 +1247,8 @@ const Workflows = (props) => {
 						<ExecutionsView />
 					</div>
 				</div>
-				<div style={{flex: viewSize.executionResults, marginLeft: "10px", marginRight: "10px", minWidth: "33%"}}>
+				{/*
+				<div style={{flex: viewSize.executionResults, marginLeft: "10px", marginRight: "10px", minWidth: "40%"}}>
 					<div style={{display: "flex"}}>
 						<div style={{flex: "1"}}>
 							<h2>Execution Timeline</h2>
@@ -1265,6 +1266,7 @@ const Workflows = (props) => {
 						<ExecutionDetails />
 					</div>
 				</div>
+				*/}
 			</div>
 		)
 	}