From 387731fbfe3f1ef0c38c6a859a70233a00f13c8a Mon Sep 17 00:00:00 2001 From: frikky Date: Sun, 5 Jun 2022 21:32:28 +0200 Subject: [PATCH] Added minor fix for coloring and text highlights --- backend/app_sdk/app_base.py | 2 +- frontend/src/components/ParsedAction.jsx | 17 +++-- frontend/src/views/AngularWorkflow.jsx | 85 +++++++++++++++--------- frontend/src/views/SettingsPage.jsx | 2 +- functions/onprem/orborus/orborus.go | 32 ++++++--- 5 files changed, 86 insertions(+), 52 deletions(-) diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py index 62e0e907..ab3e88e5 100644 --- a/backend/app_sdk/app_base.py +++ b/backend/app_sdk/app_base.py @@ -352,7 +352,7 @@ class AppBase: finished = True break else: - self.logger.info(f"[DEBUG] RESP: {ret.text}") + self.logger.info(f"[ERROR] RESP: {ret.text}") except requests.exceptions.RequestException as e: self.logger.info(f"[DEBUG] Request problem: {e}") diff --git a/frontend/src/components/ParsedAction.jsx b/frontend/src/components/ParsedAction.jsx index 7372b3b3..e1a8eae8 100644 --- a/frontend/src/components/ParsedAction.jsx +++ b/frontend/src/components/ParsedAction.jsx @@ -1884,7 +1884,6 @@ const ParsedAction = (props) => { const coverColor = "#82ccc3" //menuPosition.left -= 50 //menuPosition.top -= 250 - console.log(menuPosition) return parsedPaths.length > 0 ? ( { title="See previous results for this action" placement="top" > - + { title="Read app docs" placement="top" > - + { title="What are actions?" placement="top" > - + @@ -2448,7 +2447,7 @@ const ParsedAction = (props) => { title={selectedAction.run_magic_output === undefined || selectedAction.run_magic_output === null || selectedAction.run_magic_output === false ? "Click to enable magic parsing" : "Click to disable magic parsing"} placement="top" > - + @@ -2529,7 +2528,7 @@ const ParsedAction = (props) => { />
- Name + Name { placement="top" > - Delay + Delay { selectedAction.authentication !== null && selectedAction.authentication.length > 0 ? (
- Authentication + Authentication
{ } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Workflow error: ", error.toString()) }); }; @@ -539,7 +540,7 @@ const AngularWorkflow = (defaultprops) => { setUserSettings(responseJson); }) .catch((error) => { - console.log(error); + console.log("Apikey error: ", error); }); }; @@ -574,7 +575,7 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - console.log(error); + console.log("Settings error: ", error); }); }; @@ -608,7 +609,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("New auth error: ", error.toString()); }); }; @@ -692,7 +694,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Get execution error: ", error.toString()); }); }; @@ -719,7 +722,7 @@ const AngularWorkflow = (defaultprops) => { handleUpdateResults(responseJson, executionRequest); }) .catch((error) => { - console.log("Error: ", error); + console.log("Execution result Error: ", error); stop(); }); }; @@ -751,7 +754,8 @@ const AngularWorkflow = (defaultprops) => { return response.json(); }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Abort error: ", error.toString()); }); }; @@ -1262,7 +1266,8 @@ const AngularWorkflow = (defaultprops) => { }) .catch((error) => { setSavingState(0); - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Save workflow error: ", error.toString()); }); return success; @@ -1387,7 +1392,8 @@ const AngularWorkflow = (defaultprops) => { start(); }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Execute workflow err: ", error.toString()); }); }) }; @@ -1501,7 +1507,8 @@ const AngularWorkflow = (defaultprops) => { }) .catch((error) => { setAuthLoaded(true); - alert.error("Auth loading error: " + error.toString()); + //alert.error("Auth loading error: " + error.toString()); + console.log("AppAuth error: " + error.toString()); }); }; @@ -1578,7 +1585,8 @@ const AngularWorkflow = (defaultprops) => { }) .catch((error) => { setAppsLoaded(true) - alert.error("App loading error: "+error.toString()); + //alert.error("App loading error: "+error.toString()); + console.log("App loading error: "+error.toString()); }); }; @@ -1607,7 +1615,7 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - console.log(error); + console.log("Get userprofile error: ", error); }) } @@ -1825,7 +1833,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Get workflows error: ", error.toString()); }); }; @@ -2709,7 +2718,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch(error => { - alert.error(error.toString()) + //alert.error(error.toString()) + console.log("Activate app error: ", error.toString()) }); } @@ -3658,7 +3668,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Get environments error: ", error.toString()); }); }; @@ -4563,7 +4574,8 @@ const AngularWorkflow = (defaultprops) => { saveWorkflow(workflow); }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Stop schedule error: ", error.toString()); }); }; @@ -4615,7 +4627,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Get schedule error: ", error.toString()); }); }; @@ -5063,14 +5076,14 @@ const AngularWorkflow = (defaultprops) => { is_valid: true, label: "Webhook", environment: "onprem", - description: "Simple HTTP webhook", + description: "Custom HTTP input", long_description: "Execute a workflow with an unauthicated POST request", }, { name: "Schedule", type: "TRIGGER", status: "uninitialized", - description: "Schedule execution time", + description: "Specify time", trigger_type: "SCHEDULE", errors: null, large_image: @@ -5091,7 +5104,7 @@ const AngularWorkflow = (defaultprops) => { is_valid: true, label: "Subflow", environment: "onprem", - description: "Control another workflow", + description: "Control a workflow", long_description: "Execute another workflow from this workflow", }, { @@ -5112,7 +5125,7 @@ const AngularWorkflow = (defaultprops) => { name: "Office365", type: "TRIGGER", status: "uninitialized", - description: "Starts upon O365 email", + description: "O365 email trigger", trigger_type: "EMAIL", errors: null, is_valid: cloudSyncEnabled || isCloud ? true : false, @@ -5126,7 +5139,7 @@ const AngularWorkflow = (defaultprops) => { name: "Gmail", type: "TRIGGER", status: "uninitialized", - description: "Trigger based on Gmail", + description: "Gmail email trigger", trigger_type: "EMAIL", errors: null, is_valid: cloudSyncEnabled || isCloud ? true : false, @@ -5203,10 +5216,11 @@ const AngularWorkflow = (defaultprops) => { display: "flex", flexDirection: "column", marginLeft: "20px", + overflow: "hidden", }} > - -

+ +

{trigger.name}

@@ -7293,7 +7307,7 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - console.log(error.toString()); + console.log("Get gmail folder error: ", error.toString()); }); }; @@ -7347,7 +7361,7 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - console.log(error.toString()); + console.log("Get outlook folders error: ", error.toString()); }); }; @@ -7368,7 +7382,8 @@ const AngularWorkflow = (defaultprops) => { setTriggerAuthentication(responseJson); }) .catch((error) => { - console.log(error.toString()); + //console.log(error.toString()); + console.log("Set outlook auth error: ", error.toString()); }); }; @@ -7458,7 +7473,7 @@ const AngularWorkflow = (defaultprops) => { setGmailFolders(); }) .catch((error) => { - console.log(error.toString()); + console.log("Set gmail trigg error: ", error.toString()); }); }, 2500); @@ -7556,7 +7571,7 @@ const AngularWorkflow = (defaultprops) => { setOutlookFolders(); }) .catch((error) => { - console.log(error.toString()); + console.log("Set outlook trigger error: ", error.toString()); }); }, 2500); @@ -9476,7 +9491,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Stop mailsub error: ", error.toString()); }); }; @@ -9552,7 +9568,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + console.log("Start mailsub error: ", error.toString()); }); }; @@ -9636,7 +9653,8 @@ const AngularWorkflow = (defaultprops) => { } }) .catch((error) => { - console.log(error.toString()); + //console.log(error.toString()); + console.log("New webhook error: ", error.toString()); }); }; @@ -9679,7 +9697,8 @@ const AngularWorkflow = (defaultprops) => { setSelectedTrigger(trigger); }) .catch((error) => { - alert.error(error.toString()); + //alert.error(error.toString()); + alert.error("Delete webhook error: ", error.toString()); }); }; diff --git a/frontend/src/views/SettingsPage.jsx b/frontend/src/views/SettingsPage.jsx index a8e0e0e9..1bcd2344 100644 --- a/frontend/src/views/SettingsPage.jsx +++ b/frontend/src/views/SettingsPage.jsx @@ -733,7 +733,7 @@ const Settings = (props) => { {isCloud ? - By connecting your Github account, you agree to our Terms of Service, and acknowledge that your non-sensitive data will be turned into a creator account. This enables you to earn a passive income from Shuffle. This IS reversible. + By connecting your Github or Metamask account, you agree to our Terms of Service, and acknowledge that your non-sensitive data will be turned into a creator account. This enables you to earn a passive income from Shuffle. This IS reversible. Support: support@shuffler.io