diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 2071f1d9..974f9dbb 100755 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -105,7 +105,7 @@ def base64_encode(a): def base64_decode(a): a = str(a) try: - return base64.b64decode(a).encode("utf-8").decode("unicode_escape") + return base64.b64decode(a).decode("unicode_escape") except: try: return base64.b64decode(a).decode() diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 5cda4d26..4647cfca 100755 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -19,7 +19,7 @@ require ( github.com/gorilla/mux v1.8.0 github.com/h2non/filetype v1.1.3 github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.4.36 + github.com/shuffle/shuffle-shared v0.4.41 golang.org/x/crypto v0.9.0 google.golang.org/api v0.125.0 google.golang.org/appengine v1.6.7 diff --git a/backend/go-app/main.go b/backend/go-app/main.go index 2b944bfd..26eb4760 100755 --- a/backend/go-app/main.go +++ b/backend/go-app/main.go @@ -6001,7 +6001,7 @@ func initHandlers() { // New for recommendations in Shuffle r.HandleFunc("/api/v1/recommendations/get_actions", shuffle.HandleActionRecommendation).Methods("POST", "OPTIONS") r.HandleFunc("/api/v1/recommendations/modify", shuffle.HandleRecommendationAction).Methods("POST", "OPTIONS") - // r.HandleFunc("/api/v1/workflows/{key}/revisions", shuffle.GetWorkflowRevisions).Methods("GET", "OPTIONS") + r.HandleFunc("/api/v1/workflows/{key}/revisions", shuffle.GetWorkflowRevisions).Methods("GET", "OPTIONS") // Triggers r.HandleFunc("/api/v1/hooks/new", shuffle.HandleNewHook).Methods("POST", "OPTIONS") diff --git a/frontend/public/images/workflows/UserInput.svg b/frontend/public/images/workflows/UserInput.svg new file mode 100644 index 00000000..edd09fd1 --- /dev/null +++ b/frontend/public/images/workflows/UserInput.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/public/images/workflows/UserInput2.svg b/frontend/public/images/workflows/UserInput2.svg new file mode 100644 index 00000000..f1d8c40e --- /dev/null +++ b/frontend/public/images/workflows/UserInput2.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx index 44024d8c..517fad9f 100644 --- a/frontend/src/components/Header.jsx +++ b/frontend/src/components/Header.jsx @@ -521,7 +521,7 @@ const { globalUrl, setNotifications, notifications, isLoggedIn, removeCookie, ho } // Handle top bar or something - const defaultTop = 0 + const defaultTop = isCloud ? 0 : 6 const loginTextBrowser = !isLoggedIn ?
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index bc65c90e..d17b7d1d 100755 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -10904,13 +10904,7 @@ const AngularWorkflow = (defaultprops) => { .value === "true" } onChange={() => { - const newvalue = - workflow.triggers[selectedTriggerIndex].parameters[4] === - undefined || - workflow.triggers[selectedTriggerIndex].parameters[4] - .value === "false" - ? "true" - : "false"; + const newvalue = workflow.triggers[selectedTriggerIndex].parameters[4] === undefined || workflow.triggers[selectedTriggerIndex].parameters[4].value === "false"? "true" : "false"; workflow.triggers[selectedTriggerIndex].parameters[4] = { name: "check_result", value: newvalue, @@ -11997,43 +11991,43 @@ const AngularWorkflow = (defaultprops) => { }} />
- {isCloud && workflow.triggers[selectedTriggerIndex].parameters.length > 4 ? - - { - if (selectedTrigger.parameters === null) { - selectedTrigger.parameters = []; - } + {workflow.triggers[selectedTriggerIndex].parameters.length > 4 ? + + { + if (selectedTrigger.parameters === null) { + selectedTrigger.parameters = []; + } - // Sets the webhook to run as version 2.. kinda - var value = "v2" - if (workflow.triggers[selectedTriggerIndex].parameters[4].value.includes("v2")) { - value = "v1" - } + // Sets the webhook to run as version 2.. kinda + var value = "v2" + if (workflow.triggers[selectedTriggerIndex].parameters[4].value.includes("v2")) { + value = "v1" + } - workflow.triggers[selectedTriggerIndex].parameters[4] = { - name: "await_response", - value: value - } + workflow.triggers[selectedTriggerIndex].parameters[4] = { + name: "await_response", + value: value + } - setWorkflow(workflow) - setUpdate(Math.random()) - }} - color="primary" - value="await_response" - /> - } - label={
Wait For Response
} - /> - - : null} + setWorkflow(workflow) + setUpdate(Math.random()) + }} + color="primary" + value="await_response" + /> + } + label={
Wait For Response
} + /> + + : null}