Fixed usecase merging to go through cloud

frontend/src/views/Welcome.jsx

@@ -309,7 +309,7 @@ const Welcome = (props) => {
 		}
 
     return (
-				<div style={{width: 1000, margin: "auto", backgroundColor: theme.palette.platformColor, paddingBottom: 150, minHeight: 1500,}}>
+				<div style={{width: 1000, margin: "auto", backgroundColor: theme.palette.platformColor, paddingBottom: 150, minHeight: 1500, }}>
 					{/*
 					<div style={{position: "fixed", bottom: 110, right: 110, display: "flex", }}>
 						<img src="/images/Arrow.png" style={{width: 250, height: "100%",}} />
@@ -317,7 +317,7 @@ const Welcome = (props) => {
 					*/}
 					{showWelcome === true ? 
 						<div>
-							<div style={{minWidth: 500, maxWidth: 500, margin: "auto",}}>
+							<div style={{minWidth: 500, maxWidth: 500, margin: "auto", marginTop: isCloud ? "auto" : 20, }}>
 								<Stepper 
 									activeStep={activeStep} 
 									color="primary"
@@ -430,6 +430,8 @@ const Welcome = (props) => {
 													action: "click_welcome_continue",
 													label: "",
 												})
+										} else {
+											//setActiveStep(1)
 										}
 
 										setShowWelcome(true)

frontend/src/views/Workflows.jsx

@@ -569,7 +569,6 @@ const Workflows = (props) => {
 
 	const sidebarKey = "getting_started_sidebar"
 	if (isLoggedIn === true && gettingStartedItems.length === 0 && (userdata.tutorials !== undefined && userdata.tutorials !== null && userdata.tutorials.length > 0) && workflowDone === true) {
-
 		const activeFiltered = userdata.tutorials.filter((item) => item.active === true)
 		if (activeFiltered.length > 0) {
 			var newfiltered = []
@@ -583,6 +582,7 @@ const Workflows = (props) => {
 
 				newfiltered.push(activeFiltered[key])
 			}
+
 			setGettingStartedItems(activeFiltered)
 
 			const doneFiltered = activeFiltered.filter((item) => item.done === true)
@@ -1583,7 +1583,7 @@ const Workflows = (props) => {
     };
 
     return (
-      <Grid item xs={isMobile ? 12 : 4} style={{ padding: "12px 10px 12px 10px" }}>
+      <Grid item xs={isMobile || workflows.length === 0 ? 12 : 4} style={{ padding: "12px 10px 12px 10px" }}>
         <Paper
           square
           style={setupPaperStyle}
@@ -3710,7 +3710,7 @@ const Workflows = (props) => {
           color: "white",
           fontSize: 18,
 					borderLeft: theme.palette.defaultBorder,
-					marginTop: 64,
+					marginTop: 66,
 					borderRadius: "5px 0px 0px 0px",
         },
       }}