Moved Action Parsing out of AngularWorkflow. Should be reusable in App explorer UI

backend/go-app/main.go

@@ -6085,11 +6085,6 @@ func initHandlers() {
 		panic(fmt.Sprintf("DBclient error during init: %s", err))
 	}
 
-	//dbclient, err := shuffle.GetDatastoreClient(ctx, gceProject)
-	//if err != nil {
-	//	panic(fmt.Sprintf("Error setting datastore connector: %s", err))
-	//}
-
 	_ = shuffle.RunInit(*dbclient, storage.Client{}, gceProject, "onprem", true)
 	log.Printf("Finished Shuffle database init")
 

frontend/src/components/ConfigureWorkflow.jsx

@@ -95,7 +95,7 @@ const Workflow = (props) => {
 			}
 
 			if (action.errors !== undefined && action.errors !== null && action.errors.length > 0) {
-				console.log("Node has errors!: ", action.errors)
+				//console.log("Node has errors!: ", action.errors)
 			}
 
 			if (newaction.must_authenticate) {
@@ -103,19 +103,23 @@ const Workflow = (props) => {
 				for (var key in appAuthentication) {
 					const auth = appAuthentication[key]
 					if (auth.app.name === app.name && auth.active) {
-						console.log("Found auth: ", auth)
+						//console.log("Found auth: ", auth)
 						authenticationOptions.push(auth)
 						newaction.authenticationId = auth.id
 						break
 					}
 				}
 
-				console.log("APPAUTH: ", app.authentication, action)
 				if (newaction.authenticationId === null || newaction.authenticationId === undefined || newaction.authenticationId.length === "") {
-					console.log("FAILED to authentication node!")
+					//console.log("FAILED to authenticate node!")
-					newactions.push(newaction)
+
+					if (newactions.find(tmpaction => tmpaction.app_id === newaction.app_id && tmpaction.app_name === newaction.app_name) !== undefined) {
+						console.log("Action already found.")
+					} else {
+						newactions.push(newaction)
+					}
 				} else {
-					console.log("Skipping node as it's already authenticated.")
+					//console.log("Skipping node as it's already authenticated.")
 					newaction.authentication = authenticationOptions
 					workflow.actions[key] = newaction
 				}
@@ -157,16 +161,12 @@ const Workflow = (props) => {
 			setConfigureWorkflowModalOpen(false)
 		}
 
-		console.log("VARIABLES: ", requiredVariables)
-		console.log("ACTIONS: ", newactions)
 		setRequiredTriggers(requiredTriggers)
 		setRequiredVariables(requiredVariables)
 		setRequiredActions(newactions)
 	}
 
-	console.log("AUTH: ", appAuthentication)
 	if (appAuthentication.length !== previousAuth.length) {
-		console.log("APP AUTH CHANGED!")
 		var newactions = []
 		for (var actionkey in requiredActions) {
 			var newaction = requiredActions[actionkey]
@@ -175,7 +175,6 @@ const Workflow = (props) => {
 			for (var key in appAuthentication) {
 				const auth = appAuthentication[key]
 				if (auth.app.name === app.name && auth.active) {
-					console.log("FOUND AUTH FOR: ", auth.app.name)
 					newaction.auth_done = true
 					break
 				}
@@ -193,10 +192,7 @@ const Workflow = (props) => {
 	const TriggerSection = (props) => {
 		const {trigger} = props
 
-		console.log(trigger)
-
 		return (
-			<div>
 				<ListItem>
 					<ListItemAvatar>
 						<Avatar variant="rounded">
@@ -275,7 +271,6 @@ const Workflow = (props) => {
 						/>
 						*/}
 				</ListItem>
-			</div>
 		)
 	}
 
@@ -343,16 +338,13 @@ const Workflow = (props) => {
 					<ListItemText
 						primary={action.app_name}
 						secondary={action.app_version}
-						style={{minWidth: 175, maxWidth: 175, marginLeft: 10}}
+						style={{}}
 					/>
 					{action.must_authenticate ? 
 						action.auth_done ? 
-							<div>
+							<Button color="primary" variant="outlined" onClick={() => {}}>
-								<Button color="primary" variant="outlined" onClick={() => {
+								Authenticated	
-								}}>
+							</Button>
-									Finished	
-								</Button>
-							</div>
 						:
 							selectedAction.app_name === action.app_name ? 
 								<CircularProgress />
@@ -377,8 +369,6 @@ const Workflow = (props) => {
 		)
 	}
 
-	console.log(requiredActions)
-
 	return (
 		<div>
 			<Typography variant="h6">{workflow.name}</Typography>
@@ -401,11 +391,13 @@ const Workflow = (props) => {
 			{requiredVariables.length > 0 ? 
 				<span>
 					<Typography variant="body1" style={{marginTop: 10}}>Variables</Typography>
-					{requiredVariables.map((data, index) => {
+					<List>
-						return (
+						{requiredVariables.map((data, index) => {
-							<VariableSection key={index} variable={data} />
+							return (
-						)
+								<VariableSection key={index} variable={data} />
-					})}
+							)
+						})}
+					</List>
 				</span>
 			: null}
 
@@ -413,21 +405,25 @@ const Workflow = (props) => {
 			{requiredTriggers.length > 0 ? 
 				<span>
 					<Typography variant="body1" style={{marginTop: 10}}>Triggers</Typography>
-					{requiredTriggers.map((data, index) => {
+					<List>
-						return (
+						{requiredTriggers.map((data, index) => {
-							<TriggerSection key={index} trigger={data} />
+							return (
-						)
+								<TriggerSection key={index} trigger={data} />
-					})}
+							)
+						})}
+					</List>
 				</span>
 			: null }
 			<div style={{textAlign: "center", display: "flex", marginTop: 20, }}>
 				<ButtonGroup style={{margin: "auto",}}>
+					{/*
 					<Button color="primary" variant={"outlined"} style={{
 					}} onClick={() => {
 						setConfigureWorkflowModalOpen(false)
 					}}>
 						Skip 
 					</Button>
+					*/}
 					<Button color="primary" variant={"contained"} style={{
 					}} onClick={() => {
 						saveWorkflow(workflow)

frontend/src/theme.js

@@ -0,0 +1,57 @@
+import React from 'react';
+import { createMuiTheme } from '@material-ui/core/styles';
+
+const theme = createMuiTheme({
+	palette: {
+		primary: {
+			main: "#f85a3e"
+    },
+    secondary: {
+      main: '#e8eaf6',
+    },
+		text: {
+			secondary: "rgba(255,255,255,0.7)",
+		},
+		surfaceColor: "#27292d",
+		inputColor: "#383B40",
+		borderRadius: 5,
+		textFieldStyle: {
+			backgroundColor: "#383B40",
+			borderRadius: 5,
+		},
+		innerTextfieldStyle: {
+			color: "white",
+			minHeight: 50, 
+			marginLeft: "5px",
+			maxWidth: "95%",
+			fontSize: "1em",
+			borderRadius: 5,
+		}
+   },
+   typography: { 
+			"fontFamily": `"Roboto", "Helvetica", "Arial", sans-serif`,
+      useNextVariants: true,
+			h1: {
+				fontSize: 40,
+			},
+			h4: {
+				fontSize: 30,
+				fontWeight: 500,
+			},
+			h6: {
+				fontSize: 22,
+			},
+			body1: {
+				fontSize: 18,
+			},
+   },
+	overrides: {
+		MuiMenu: {
+			list: {
+				backgroundColor: "#383B40",
+			},
+		},
+	},
+});
+
+export default theme;