From 3dda16cfe74c62c2c0e65b61d7a15e9b609951d3 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Sat, 29 Jan 2022 02:04:41 +0100
Subject: [PATCH] Fixed broken code modal popup

---
 backend/app_sdk/app_base.py                   | 10 +++++-----
 docker-compose.yml                            |  4 ++--
 frontend/src/components/ShuffleCodeEditor.jsx |  3 +++
 frontend/src/views/Workflows.jsx              |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index 637f3957..2a89f11a 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -139,15 +139,15 @@ class AppBase:
         try:
             new_input = input_data.split()
         except Exception as e:
-            self.logger.info(f"[ERROR] Failed to run magic parser (1): {e}")
+            self.logger.info(f"[ERROR] Failed to run magic parser during split (1): {e}")
             return input_data
 
         # Won't ever touch this one?
-        if isinstance(input_data, list) or isinstance(input_data, object):
+        if isinstance(new_input, list) or isinstance(new_input, object):
             try:
                 return json.dumps(new_input)
             except Exception as e:
-                self.logger.info(f"[ERROR] Failed to run magic parser: {e}")
+                self.logger.info(f"[ERROR] Failed to run magic parser (3): {e}")
             
         return new_input
 
@@ -165,7 +165,7 @@ class AppBase:
             else:
                 self.logger.warning(f"[ERROR] Magic output not defined.")
         except Exception as e:
-            self.logger.warning(f"[ERROR] Failed to run magic autoparser: {e}")
+            self.logger.warning(f"[ERROR] Failed to run magic autoparser (send result): {e}")
             pass
 
         # Try it with some magic
@@ -2871,7 +2871,7 @@ class AppBase:
                             except Exception as e:
                                 self.logger.warning("[ERROR] Failed to parse coroutine value for old app: {e}")
 
-                            self.logger.info("\n[INFO] Returned from execution with types %s" % type(newres))
+                            self.logger.info("\n[INFO] Returned from execution with type(s) %s" % type(newres))
                             #self.logger.info("\n[INFO] Returned from execution with %s of types %s" % (newres, type(newres)))#, newres)
                             if isinstance(newres, tuple):
                                 self.logger.info(f"[INFO] Handling return as tuple: {newres}")
diff --git a/docker-compose.yml b/docker-compose.yml
index be62e916..f8642281 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   frontend:
-    build: ./frontend
+    #build: ./frontend
     image: ghcr.io/frikky/shuffle-frontend:nightly
     container_name: shuffle-frontend
     hostname: shuffle-frontend
@@ -16,7 +16,7 @@ services:
     depends_on:
       - backend
   backend:
-    build: ./backend
+    #build: ./backend
     image: ghcr.io/frikky/shuffle-backend:nightly
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
diff --git a/frontend/src/components/ShuffleCodeEditor.jsx b/frontend/src/components/ShuffleCodeEditor.jsx
index a1124f60..4a416cf9 100644
--- a/frontend/src/components/ShuffleCodeEditor.jsx
+++ b/frontend/src/components/ShuffleCodeEditor.jsx
@@ -82,6 +82,8 @@ const CodeEditor = (props) => {
 
 	return (
 		<Dialog 
+      disableEnforceFocus={true}
+      hideBackdrop={true}
 			open={expansionModalOpen} 
 			onClose={() => {
 				//setExpansionModalOpen(false)
@@ -93,6 +95,7 @@ const CodeEditor = (props) => {
 					minWidth: 600,
 					padding: 25, 
 					border: theme.palette.defaultBorder,
+					zIndex: 10012,
 				},
 			}}
 		>
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index 797a6060..5930dd1a 100644
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -2823,7 +2823,7 @@ const Workflows = (props) => {
 									workflowDelay += 75
 								} else {
 									return (
-      							<Grid item xs={4} style={{ padding: "12px 10px 12px 10px" }}>
+      							<Grid key={index} item xs={4} style={{ padding: "12px 10px 12px 10px" }}>
 											<WorkflowPaper key={index} data={data} />
       							</Grid>
 									)