From 10c7007568296e617dd39380e2176cf2ef2793cc Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Mon, 16 Jan 2023 00:42:29 +0100
Subject: [PATCH] Fixed better login handling and redirects

---
 frontend/src/views/Welcome.jsx   | 15 ++++----
 frontend/src/views/Workflows.jsx | 62 ++++++++++++++++----------------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/frontend/src/views/Welcome.jsx b/frontend/src/views/Welcome.jsx
index 111a0076..4546c1a3 100644
--- a/frontend/src/views/Welcome.jsx
+++ b/frontend/src/views/Welcome.jsx
@@ -20,7 +20,7 @@ import theme from '../theme';
 import { useNavigate, Link } from "react-router-dom";
 
 const Welcome = (props) => {
-    const { globalUrl, surfaceColor, newColor, mini, inputColor, userdata, isLoggedIn, isLoaded } = props;
+    const { globalUrl, surfaceColor, newColor, mini, inputColor, userdata, isLoggedIn, isLoaded, serverside } = props;
     const [skipped, setSkipped] = React.useState(new Set());
     const [inputUsecase, setInputUsecase] = useState({});
   	const [frameworkData, setFrameworkData] = useState(undefined);
@@ -33,6 +33,14 @@ const Welcome = (props) => {
   	const [usecases, setUsecases] = React.useState([]);
   	const [workflows, setWorkflows] = React.useState([]);
 
+		let navigate = useNavigate();
+    //if (serverside === false && isLoaded === true && isLoggedIn === false) {
+		//	console.log("Redirecting to login?")
+		//	console.log(window.location.pathname)
+		//	console.log(window.location)
+		//	navigate(`/login?view=${window.location.pathname}${window.location.search}`)
+		//}
+
   	const isCloud =
 			window.location.host === "localhost:3002" ||
 			window.location.host === "shuffler.io";
@@ -43,7 +51,6 @@ const Welcome = (props) => {
 			"Discover Usecases",
 		])
 
-		let navigate = useNavigate();
 
 		const handleKeysetting = (categorydata, workflows) => {
 			//workflows[0].category = ["detect"]
@@ -238,7 +245,6 @@ const Welcome = (props) => {
 		}]
 
 		const handleSetSearch = (input, orgupdate) => {
-			console.log("INPUT & ORGUPDATE: ", input, orgupdate, defaultSearch)
 			if (input !== defaultSearch) {
 				setDefaultSearch(input)
 				setSelectionOpen(false)
@@ -268,11 +274,8 @@ const Welcome = (props) => {
 				const params = Object.fromEntries(urlSearchParams.entries());
 				const foundTab = params["tab"];
 				if (foundTab !== null && foundTab !== undefined && !isNaN(foundTab)) {
-					console.log("FOUND TAB: ", foundTab)
 					setShowWelcome(true)
 					if (foundTab === 3 || foundTab === "3") {
-						console.log("SET SEARCH!!")
-
 						handleSetSearch(usecaseButtons[0].name, usecaseButtons[0].usecase)
 					}
 
diff --git a/frontend/src/views/Workflows.jsx b/frontend/src/views/Workflows.jsx
index df9ffad4..19a14c0a 100644
--- a/frontend/src/views/Workflows.jsx
+++ b/frontend/src/views/Workflows.jsx
@@ -569,6 +569,7 @@ 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 = []
@@ -582,7 +583,6 @@ 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 || workflows.length === 0 ? 12 : 4} style={{ padding: "12px 10px 12px 10px" }}>
+      <Grid item xs={isMobile ? 12 : 4} style={{ padding: "12px 10px 12px 10px" }}>
         <Paper
           square
           style={setupPaperStyle}
@@ -2271,35 +2271,35 @@ const Workflows = (props) => {
 						"",
 						data.status,
           )
-					.then((response) => {
-						if (response !== undefined) {
-							// SET THE FULL THING
-							data.id = response.id;
-							data.first_save = false;
-							data.previously_saved = false;
-							data.is_valid = false;
+            .then((response) => {
+              if (response !== undefined) {
+                // SET THE FULL THING
+                data.id = response.id;
+                data.first_save = false;
+                data.previously_saved = false;
+                data.is_valid = false;
 
-							// Actually create it
-							setNewWorkflow(
-								data.name,
-								data.description,
-								data.tags,
-								data.default_return_value,
-								data,
-								false,
-								[],
-								"",
-								data.status,
-							).then((response) => {
-								if (response !== undefined) {
-									alert.success("Successfully imported " + data.name);
-								}
-							});
-						}
-					})
-					.catch((error) => {
-						alert.error("Import error: " + error.toString());
-					});
+                // Actually create it
+                setNewWorkflow(
+                  data.name,
+                  data.description,
+                  data.tags,
+                  data.default_return_value,
+                  data,
+                  false,
+									[],
+									"",
+									data.status,
+                ).then((response) => {
+                  if (response !== undefined) {
+                    alert.success("Successfully imported " + data.name);
+                  }
+                });
+              }
+            })
+            .catch((error) => {
+              alert.error("Import error: " + error.toString());
+            });
         });
 
         // Actually reads
@@ -3710,7 +3710,7 @@ const Workflows = (props) => {
           color: "white",
           fontSize: 18,
 					borderLeft: theme.palette.defaultBorder,
-					marginTop: 66,
+					marginTop: 64,
 					borderRadius: "5px 0px 0px 0px",
         },
       }}