From 3adf98df74967cb9372c719754cbe1fd9dda99ac Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Fri, 14 Jan 2022 00:58:11 +0100
Subject: [PATCH] Continued work on sample use cases towards onboarding

---
 frontend/src/components/DetectionFramework.jsx | 12 ++++++------
 frontend/src/views/AppCreator.jsx              | 11 ++++++++++-
 functions/onprem/worker/worker.go              |  4 ++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/DetectionFramework.jsx b/frontend/src/components/DetectionFramework.jsx
index 031dc01c..e66d09b7 100644
--- a/frontend/src/components/DetectionFramework.jsx
+++ b/frontend/src/components/DetectionFramework.jsx
@@ -1348,7 +1348,7 @@ const Framework = (props) => {
 					})}
 				</div>
 			}
-  		{
+  		{/*
 				Object.getOwnPropertyNames(discoveryData).length > 0 ? 
 					<div style={{position: "absolute", top: 20, right: 50, }}>
 						<Typography variant="h6" color="textPrimary" style={{marginBottom: 10, textAlign: "center",}}>
@@ -1362,7 +1362,7 @@ const Framework = (props) => {
 							)
 						})}
 					</div>
-				: null}
+				: null*/}
 
   		{
 				Object.getOwnPropertyNames(discoveryData).length > 0 ? 
@@ -1457,15 +1457,15 @@ const Framework = (props) => {
 									<Typography variant="body2" color="textSecondary" style={{marginTop: 10, marginBottom: 10, }}>
 										{discoveryData.description}
 									</Typography>
-									{isCloud && defaultSearch !== undefined && defaultSearch.length > 0 ? 
-										<WorkflowSearch 
+									{/*isCloud && defaultSearch !== undefined && defaultSearch.length > 0 ? 
+										{<WorkflowSearch 
 											newSelectedApp={newSelectedApp}
 											setNewSelectedApp={setNewSelectedApp}
 											defaultSearch={defaultSearch}
-										/>
+										/>}
 										: 
 										null
-									}
+									*/}
 								</span>
 							: 
 								selectionOpen 
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 7afaad07..bdece0f2 100644
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -641,6 +641,12 @@ const AppCreator = (defaultprops) => {
             example_response: "",
           };
 
+					if (newaction.url !== undefined && newaction.url !== null && newaction.url.includes("_shuffle_replace_")) {
+						const regex = /_shuffle_replace_\d/i;
+						//console.log("NEW: ", 
+						newaction.url = newaction.url.replace(regex, "")
+					}
+
           // Finding category
           if (path.includes("/")) {
             const pathsplit = path.split("/");
@@ -665,9 +671,10 @@ const AppCreator = (defaultprops) => {
           }
 					
 					if (path === "/files/{file_id}/content") {
-						console.log("Method: ", path, method, methodvalue)
+						console.log("FILE DOWNLOAD Method: ", path, method, methodvalue)
 					}
 
+
           // Typescript? I think not ;)
           if (methodvalue["requestBody"] !== undefined) {
             //console.log("Handle requestbody: ", methodvalue["requestBody"], method, path)
@@ -1354,6 +1361,8 @@ const AppCreator = (defaultprops) => {
             }
           }
 
+
+
           newActions.push(newaction);
         }
       }
diff --git a/functions/onprem/worker/worker.go b/functions/onprem/worker/worker.go
index 70d2f473..baa2b94b 100644
--- a/functions/onprem/worker/worker.go
+++ b/functions/onprem/worker/worker.go
@@ -1294,7 +1294,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 						return
 					}
 
-					log.Printf("[DEBUG][%s] Failed deploy. Downloading image %s", workflowExecution.ExecutionId, image)
+					log.Printf("[DEBUG][%s] Failed deploy. Downloading image %s: %s", workflowExecution.ExecutionId, image, err)
 					err := downloadDockerImageBackend(topClient, image)
 					executed := false
 					if err == nil {
@@ -1322,7 +1322,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 								return
 							}
 
-							log.Printf("[WARNING] Failed deploying image THREE TIMES. Attempting to download %s as last resort from backend and dockerhub.", image)
+							log.Printf("[WARNING] Failed deploying image THREE TIMES. Attempting to download %s as last resort from backend and dockerhub: %s", image, err)
 
 							reader, err := dockercli.ImagePull(context.Background(), image, pullOptions)
 							if err != nil && !strings.Contains(err.Error(), "Conflict. The container name") {