Navigation bug fixes

Author: baebranch

src/custom/subflow.tsx

@@ -1,17 +1,18 @@
 import "./custom.css";
 import { memo } from "react";
 import { Button } from "react-bootstrap";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 
 import { Handle, Position, NodeResizer } from 'reactflow';
 
 
 function SubFlowNode({ data, selected }: { data: any, selected: any }) {
   const navigate = useNavigate();
+  const { state } = useLocation();
 
 
   const navigateToFlow = () => {
-    navigate(window.location.pathname + '/' + data.slug);
+    navigate(window.location.pathname + '/' + data.slug, { state });
   };
 
   return (
@@ -31,7 +32,6 @@ function SubFlowNode({ data, selected }: { data: any, selected: any }) {
         </div>
         <div className="card-footer">
           <Button variant="secondary" size="sm" onClick={() => {
-              console.log("Loading flow...");
               navigateToFlow();
             }}>
             {data.flow}

src/designer/designer.tsx

@@ -174,6 +174,7 @@ export default function Designer({ activeWorkspace, setActiveWorkspace, flow }:
     }`;
 
     Client(query).then((data: any) => {
+      data.getFlows.flows.sort((a: any, b: any) => slugs.indexOf(a.slug) - slugs.indexOf(b.slug));
       if (data.getFlows.flows[data.getFlows.flows.length - 1].id !== flow?.activeFlow?.id) {
         flow.setFlows(data.getFlows.flows)
       }
@@ -364,7 +365,7 @@ export default function Designer({ activeWorkspace, setActiveWorkspace, flow }:
         if (activeWorkspace.default?.position !== null) {
           setViewport(activeWorkspace.default.position);
         }
-  
+        
         flow.setActiveFlow(activeWorkspace.default);
         flow.setFlows([activeWorkspace.default]);
         loadFlowNodesAndEdges(activeWorkspace.default);
@@ -378,7 +379,7 @@ export default function Designer({ activeWorkspace, setActiveWorkspace, flow }:
         if (activeWorkspace.default?.position !== null) {
           setViewport(activeWorkspace.default.position);
         }
-  
+        
         flow.setActiveFlow(activeWorkspace.default);
         flow.setFlows([activeWorkspace.default]);
         loadFlowNodesAndEdges(activeWorkspace.default);

src/home/home.tsx

@@ -47,13 +47,9 @@ export default function Home({setActiveWorkspace, flow}: {setActiveWorkspace: an
       }
     }`;
 
-    try {
-      await Client(query).then((data: any) => {
-        setWorkspaces(data.getWorkspaces.workspaces);
-      })
-    } catch (error) {
-      console.error('Error fetching data:', error);
-    }
+    await Client(query).then((data: any) => {
+      setWorkspaces(data.getWorkspaces.workspaces);
+    })
   }, []);
 
   useEffect(() => {