From 47993ec03007e126cce7fb962b4384b5c21809af Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Mon, 24 Aug 2020 10:11:49 +0200
Subject: [PATCH] #118: Fixed webhook view issue

---
 backend/go-app/codegen.go              |  6 ++--
 frontend/src/views/AngularWorkflow.jsx | 42 +++++---------------------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/backend/go-app/codegen.go b/backend/go-app/codegen.go
index 1f4f9d47..a2c0ca5c 100644
--- a/backend/go-app/codegen.go
+++ b/backend/go-app/codegen.go
@@ -261,7 +261,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
             url += f"&%s={%s}"`, query, query, query)
 		}
 	} else {
-		log.Printf("No optional queries?")
+		//log.Printf("No optional queries?")
 	}
 
 	// api.Authentication.Parameters[0].Value = "BearerAuth"
@@ -401,9 +401,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 		verifyAddin,
 	)
 
-	log.Printf(data)
-
-	//log.Printf("%s", data)
+	//log.Printf(data)
 	return functionname, data
 }
 
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 600c9264..64b85d30 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -2001,9 +2001,9 @@ const AngularWorkflow = (props) => {
 					position: newposition,
 				}
 
-				//if (data.trigger_type === "WEBHOOK") {
-				//	newAppData.status = "running"
-				//}
+				if (data.trigger_type === "WEBHOOK") {
+					newAppData.status = "running"
+				}
 
 				// Can all the data be in here? hmm
 				const nodeToBeAdded = {
@@ -2049,8 +2049,8 @@ const AngularWorkflow = (props) => {
 
 				setWorkflow(workflow)
 				if (data.trigger_type === "WEBHOOK") {
-					//newWebhook(newAppData)
-					//saveWorkflow(workflow)
+					newWebhook(newAppData)
+					saveWorkflow(workflow)
 				}
 			}
 		}
@@ -4331,42 +4331,14 @@ const AngularWorkflow = (props) => {
 									setTriggerCronWrapper(e.target.value)
 								}}
 							/>
-							<div style={{marginTop: "20px", marginBottom: "7px", display: "flex"}}>
-								<div style={{width: "17px", height: "17px", borderRadius: 17 / 2, backgroundColor: "#f85a3e", marginRight: "10px"}}/>
-								<div style={{flex: "10"}}> 
-									<b>Execution argument: </b> 
-								</div>
-							</div>
-							<TextField
-								style={{backgroundColor: inputColor}} 
-								InputProps={{
-									style:{
-										color: "white",
-										marginLeft: "5px",
-										maxWidth: "95%",
-										marginTop: "3px",
-										fontSize: "1em",
-									},
-								}}
-								fullWidth
-								disabled
-								rows="6"
-								multiline
-								color="primary"
-								defaultValue={workflow.triggers[selectedTriggerIndex].parameters[1].value}
-								placeholder='{"example": {"json": "is cool"}}'
-								onBlur={(e) => {
-									setTriggerBodyWrapper(e.target.value)
-								}}
-							/>
 							<Divider style={{marginTop: "20px", height: "1px", width: "100%", backgroundColor: "rgb(91, 96, 100)"}}/>
 							<div style={{marginTop: "20px", marginBottom: "7px", display: "flex"}}>
-								<Button style={{flex: "1",}} disabled={selectedTrigger.status === "running"} onClick={() => {
+								<Button  variant="contained" style={{flex: "1",}} disabled={selectedTrigger.status === "running"} onClick={() => {
 									newWebhook(selectedTrigger)
 								}} color="primary">
 	    		    	    		Start	
 	    		    	  		</Button>
-								<Button style={{flex: "1",}} disabled={selectedTrigger.status !== "running"} onClick={() => {
+								<Button variant="contained" style={{flex: "1",}} disabled={selectedTrigger.status !== "running"} onClick={() => {
 									deleteWebhook(selectedTrigger, selectedTriggerIndex)
 								}} color="primary">
 	    		    	    		Stop