From 10128c65e7405f375b95339a43f7979464f3486a Mon Sep 17 00:00:00 2001 From: frikky Date: Fri, 18 Mar 2022 18:25:31 +0100 Subject: [PATCH] Fixed bad naming when dragging trigger into field --- backend/app_sdk/app_base.py | 4 ++-- frontend/src/views/AngularWorkflow.jsx | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 7937387c..6d60db98 100644 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -357,8 +357,8 @@ class AppBase: if not finished: # Not sure why this would work tho :) action_result["status"] = "FAILURE" - action_result["result"] = f"POST error: {e}" - self.logger.info(f"[DEBUG] Before typeerror stream result: {e}") + action_result["result"] = f"POST failed to get info!" + self.logger.info(f"[DEBUG] Before typeerror stream result - NOT finished") ret = requests.post("%s%s" % (self.base_url, stream_path), headers=headers, json=action_result) self.logger.info(f"""[DEBUG] Successful request result request: Status= {ret.status_code} & Response= {ret.text}. Action status: {action_result["status"]}""") diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx index 5349cc3f..85636fee 100644 --- a/frontend/src/views/AngularWorkflow.jsx +++ b/frontend/src/views/AngularWorkflow.jsx @@ -2002,6 +2002,11 @@ const AngularWorkflow = (defaultprops) => { if (curElement !== null && curElement !== undefined) { curElement.style.border = curElement.style.original_border; var newValue = "$" + nodedata.label.toLowerCase().replaceAll(" ", "_"); + if (nodedata.type === "TRIGGER") { + if (nodedata.trigger_type === "WEBHOOK" || nodedata.trigger_type === "SCHEDULE" || nodedata.trigger_type === "EMAIL") { + var newValue = "$exec" + } + } var paramname = ""; var idnumber = -1; if (curElement.id.startsWith("rightside_field_")) { @@ -2401,7 +2406,10 @@ const AngularWorkflow = (defaultprops) => { setWorkflow(workflow) curaction = data } else { - alert.error("Action not found. Please remake it."); + if (workflow.public !== true) { + alert.error("Action not found. Please remake it."); + } + event.target.remove(); return; }