From dc258d1497f86ab118edfc0586492a7a5853a70b Mon Sep 17 00:00:00 2001 From: Frikky Date: Mon, 13 Jan 2025 14:26:03 +0100 Subject: [PATCH] Frontend merges --- backend/go-app/go.mod | 2 +- frontend/src/components/ParsedAction.jsx | 14 ++++++++++---- frontend/src/components/ShuffleCodeEditor1.jsx | 5 ++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 11ecca3f..b9ee6c05 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.90 + github.com/shuffle/shuffle-shared v0.6.94 golang.org/x/crypto v0.22.0 google.golang.org/api v0.176.1 google.golang.org/grpc v1.63.2 diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx index 5749edfa..df84ad89 100755 --- a/frontend/src/components/ParsedAction.jsx +++ b/frontend/src/components/ParsedAction.jsx @@ -1484,6 +1484,14 @@ const ParsedAction = (props) => { const selectedAppIcon = selectedAction.large_image + + var newAppname = selectedAction?.name?.charAt(0).toUpperCase() + selectedAction?.name?.substring(1) + if (newAppname === undefined || newAppname === null) { + newAppname = "" + } else { + newAppname = newAppname.replaceAll("_", " ") + } + return (
@@ -1506,11 +1514,9 @@ const ParsedAction = (props) => { border: "2px solid rgba(255,255,255,0.3)", }} /> +

- {( - selectedAction?.app_name?.charAt(0).toUpperCase() + - selectedAction?.app_name?.substring(1) - )?.replaceAll("_", " ")} + {newAppname}

diff --git a/frontend/src/components/ShuffleCodeEditor1.jsx b/frontend/src/components/ShuffleCodeEditor1.jsx index 85469445..f28668fa 100644 --- a/frontend/src/components/ShuffleCodeEditor1.jsx +++ b/frontend/src/components/ShuffleCodeEditor1.jsx @@ -1843,7 +1843,10 @@ const CodeEditor = (props) => { variant='body2' color='textSecondary' > - Output is based on the last VALID run of the node(s) you are referencing. Only updates when you refresh the Workflow Window. + Output is based on the last VALID run of the node(s) you are referencing. Refresh the page to get updated Variable values.  + {selectedAction?.name === "execute_python" ? + "For Python: exit() to stop a python script ANYWHERE." + : null} No test output yet.