Synced over bugfixes and theme control

frontend/src/views/AngularWorkflow.jsx

@@ -13032,7 +13032,7 @@ const AngularWorkflow = (defaultprops) => {
                       event.preventDefault()
                       setExpansionModalOpen(true)
                       setActiveDialog("codeeditor")
-                      navigate(`?condition_id=${data.id}&field=${data.name}`)
+                      navigate(`?condition_id=${data.id}&condition_field=${data.name}`)
                       setEditorData({
                         "name": data.name,
                         "value": data.value || "",
@@ -13117,9 +13117,9 @@ const AngularWorkflow = (defaultprops) => {
         
           // Update the field value based on type
           if (type === "source") {
-            handleConditionFieldChange("source", "value", toComplete);
+            handleConditionFieldChange("source", toComplete);
           } else if (type === "destination") {
-            handleConditionFieldChange("destination", "value", toComplete);
+            handleConditionFieldChange("destination", toComplete);
           }
         
           handleMenuClose();
@@ -13996,7 +13996,7 @@ const AngularWorkflow = (defaultprops) => {
       />
     </Dialog>
 
-  const handleConditionFieldChange = (fieldType, fieldName, value) => {
+  const handleConditionFieldChange = (fieldType, value) => {
     if (fieldType === "source") {
       setSourceValue({
         ...sourceValue,
@@ -15197,7 +15197,7 @@ const AngularWorkflow = (defaultprops) => {
     }
   ]
 
-  const handleSubflowParamChange = (triggerId, triggerField, newData) => {
+  const handleTriggerParamChange = (triggerId, triggerField, newData) => {
 	var updateFail = "" 
 
     if (workflow !== undefined && workflow !== null) {  
@@ -17336,9 +17336,13 @@ const AngularWorkflow = (defaultprops) => {
           fullWidth
           rows="4"
           multiline
-          defaultValue={selectedTrigger.parameters[0]?.value}
+          value={selectedTriggerValue || ""}
           color="primary"
           placeholder=""
+          onChange={(e) => {  
+            setLastSaved(false)
+            setSelectedTriggerValue(e.target.value)
+          }}
           onBlur={(e) => {
             setLastSaved(false)
             setTriggerTextInformationWrapper(e.target.value);
@@ -25472,7 +25476,7 @@ const AngularWorkflow = (defaultprops) => {
             // selectedTrigger={selectedTrigger}
             aiSubmit={aiSubmit}
             toolsAppId={toolsApp.id}
-            handleSubflowParamChange={handleSubflowParamChange}
+            handleTriggerParamChange={handleTriggerParamChange}
             codedata={editorData.value}
             setcodedata={setcodedata}
             selectedEdge={selectedEdge}

frontend/src/views/LoginPage.jsx

@@ -314,12 +314,15 @@ const LoginPage = props => {
       },
     })
 
-	if (serverside !== true) {
-		const tmpMessage = new URLSearchParams(window.location.search).get("message")
-		if (tmpMessage !== undefined && tmpMessage !== null && message !== tmpMessage) {
-			setMessage(tmpMessage)
+	useEffect(() => {
+		if (serverside !== true) {
+			const tmpMessage = new URLSearchParams(window.location.search).get("message")
+			if (tmpMessage !== undefined && tmpMessage !== null && message !== tmpMessage) {
+				setMessage(tmpMessage)
+				toast(tmpMessage)
+			}
 		}
-	}
+	}, [])
 
 	if (document !== undefined) {
 		if (register) {
@@ -444,13 +447,17 @@ const LoginPage = props => {
 	}
 
 	if (isLoggedIn === true && serverside !== true) {
-		const tmpView = new URLSearchParams(window.location.search).get("view")
-		if (tmpView !== undefined && tmpView !== null && tmpView === "pricing") {
-			window.location.pathname = "/pricing"
-			return
-		} else if (tmpView !== undefined && tmpView !== null) {
-			window.location.pathname = tmpView
-			return
+		const tmpView = new URLSearchParams(window.location.search).get("view");
+		if (tmpView !== undefined && tmpView !== null) {
+			let pathOnly = tmpView.split("?")[0];
+			if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
+
+			if (pathOnly === "/pricing" || pathOnly === "admin") {
+				window.location.replace(pathOnly + window.location.search);
+			} else {
+				window.location.replace(pathOnly);
+			}
+			return;
 		}
 
 		window.location.pathname = "/workflows"
@@ -575,20 +582,17 @@ const LoginPage = props => {
 							setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
 						}
 
-						const tmpView = new URLSearchParams(window.location.search).get("view")
+						const tmpView = new URLSearchParams(window.location.search).get("view");
 						if (tmpView !== undefined && tmpView !== null) {
-							//const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
-							// Check if slash in the url
+							let pathOnly = tmpView.split("?")[0];
+							if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
 
-							var newUrl = `/${tmpView}`
-							if (tmpView.startsWith("/")) {
-								newUrl = `${tmpView}`
+							if (pathOnly === "/pricing" || pathOnly === "admin") {
+								window.location.replace(pathOnly + window.location.search);
+							} else {
+								window.location.replace(pathOnly);
 							}
-
-							console.log("Found url: ", newUrl)
-
-							window.location.pathname = newUrl
-							return
+							return;
 						}
 
 						console.log("LOGIN DATA: ", responseJson)
@@ -647,9 +651,14 @@ const LoginPage = props => {
 
 								const tmpView = new URLSearchParams(window.location.search).get("view")
 								if (tmpView !== undefined && tmpView !== null) {
-									//const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}`
-									const newUrl = `/${tmpView}`
-									window.location.pathname = newUrl
+									let pathOnly = tmpView.split("?")[0];
+									if (!pathOnly.startsWith("/")) pathOnly = "/" + pathOnly;
+
+									if (pathOnly === "/pricing" || pathOnly === "admin") {
+										window.location.replace(pathOnly + window.location.search);
+									} else {
+										window.location.replace(pathOnly);
+									}
 									return
 								}
 

frontend/src/views/SettingsPage.jsx

@@ -458,7 +458,12 @@ const Settings = (props) => {
           if (responseJson["success"] === false) {
             setPasswordFormMessage(responseJson["reason"]);
           } else {
-            toast("Changed password!");
+			var reason = ""
+			if (responseJson.reason !== undefined && responseJson.reason !== null && responseJson.reason.length > 0) {
+				reason += responseJson.reason
+			}
+
+            toast.success("Changed password! " + reason);
             setPasswordFormMessage("");
           }
         })

frontend/src/views/Workflows2.jsx

@@ -5071,7 +5071,7 @@ const Workflows2 = (props) => {
 
     //isLoaded && isLoggedIn && workflowDone ? (
     const loadedCheck =
-        workflowDone ? (
+        workflowDone && isLoaded ? (
             <div>
                 {/*
 				<ShepherdTour steps={newSteps} tourOptions={tourOptions}>
@@ -5134,7 +5134,9 @@ const Workflows2 = (props) => {
                 }}
             >
                 <CircularProgress />
-                <Typography>Loading Workflows</Typography>
+                <Typography style={{marginTop: 5, }}>
+					Loading Workflows and Apps
+				</Typography>
             </div>
         );