Merge remote-tracking branch 'origin/dev' into db

src/frontend/src/App.tsx

@@ -49,7 +49,7 @@ export default function App() {
   // Initialize state variable for the version
   const [version, setVersion] = useState("");
   useEffect(() => {
-    fetch("/version")
+    fetch("api/v1/version")
       .then((res) => res.json())
       .then((data) => {
         setVersion(data.version);
@@ -159,7 +159,7 @@ export default function App() {
         className="absolute left-7 bottom-2 flex h-6 cursor-pointer flex-col items-center justify-start overflow-hidden rounded-lg bg-foreground px-2 text-center font-sans text-xs tracking-wide text-secondary transition-all duration-500 ease-in-out hover:h-12"
       >
         {version && <div className="mt-1">⛓️ LangFlow v{version}</div>}
-        <div className="mt-2">Created by Logspace</div>
+        <div className={version ? "mt-2" : "mt-1"}>Created by Logspace</div>
       </a>
     </div>
   );

src/frontend/src/contexts/tabsContext.tsx

@@ -89,39 +89,47 @@ export function TabsProvider({ children }: { children: ReactNode }) {
     let cookie = window.localStorage.getItem("tabsData");
     if (cookie && Object.keys(templates).length > 0) {
       let cookieObject: LangFlowState = JSON.parse(cookie);
-      cookieObject.flows.forEach((flow) => {
-        flow.data.edges.forEach((edge) => {
-          edge.className = "";
-          edge.style = { stroke: "#555555" };
-        });
-        flow.data.nodes.forEach((node) => {
-          const template = templates[node.data.type];
-          if (!template) {
-            setErrorData({ title: `Unknown node type: ${node.data.type}` });
+      try {
+        cookieObject.flows.forEach((flow) => {
+          if (!flow.data) {
             return;
           }
-          if (Object.keys(template["template"]).length > 0) {
-            node.data.node.base_classes = template["base_classes"];
-            flow.data.edges.forEach((edge) => {
-              if (edge.source === node.id) {
-                edge.sourceHandle = edge.sourceHandle
-                  .split("|")
-                  .slice(0, 2)
-                  .concat(template["base_classes"])
-                  .join("|");
-              }
-            });
-            node.data.node.description = template["description"];
-            node.data.node.template = updateTemplate(
-              template["template"] as unknown as APITemplateType,
-              node.data.node.template as APITemplateType
-            );
-          }
+          flow.data.edges.forEach((edge) => {
+            edge.className = "";
+            edge.style = { stroke: "#555555" };
+          });
+
+          flow.data.nodes.forEach((node) => {
+            const template = templates[node.data.type];
+            if (!template) {
+              setErrorData({ title: `Unknown node type: ${node.data.type}` });
+              return;
+            }
+            if (Object.keys(template["template"]).length > 0) {
+              node.data.node.base_classes = template["base_classes"];
+              flow.data.edges.forEach((edge) => {
+                if (edge.source === node.id) {
+                  edge.sourceHandle = edge.sourceHandle
+                    .split("|")
+                    .slice(0, 2)
+                    .concat(template["base_classes"])
+                    .join("|");
+                }
+              });
+              node.data.node.description = template["description"];
+              node.data.node.template = updateTemplate(
+                template["template"] as unknown as APITemplateType,
+                node.data.node.template as APITemplateType
+              );
+            }
+          });
         });
-      });
-      setTabIndex(cookieObject.tabIndex);
-      setFlows(cookieObject.flows);
-      setId(cookieObject.id);
+        setTabIndex(cookieObject.tabIndex);
+        setFlows(cookieObject.flows);
+        setId(cookieObject.id);
+      } catch (e) {
+        console.log(e);
+      }
     }
   }, [templates]);
 

src/frontend/src/controllers/API/index.ts

@@ -14,13 +14,13 @@ export async function sendAll(data: sendAllProps) {
 export async function checkCode(
   code: string
 ): Promise<AxiosResponse<errorsTypeAPI>> {
-  return await axios.post("api/v1/validate/code", { code });
+  return await axios.post("/validate/code", { code });
 }
 
 export async function checkPrompt(
   template: string
 ): Promise<AxiosResponse<PromptTypeAPI>> {
-  return await axios.post("api/v1/validate/prompt", { template });
+  return await axios.post("/validate/prompt", { template });
 }
 
 export async function getExamples(): Promise<FlowType[]> {
@@ -37,7 +37,5 @@ export async function getExamples(): Promise<FlowType[]> {
     return contentResponse.data;
   });
 
-  const contents = await Promise.all(contentsPromises);
-
-  return contents;
+  return await Promise.all(contentsPromises);
 }

src/frontend/src/modals/chatModal/index.tsx

@@ -215,19 +215,11 @@ export default function ChatModal({
         }
       };
       ws.current = newWs;
-    } catch {
+    } catch (error) {
       if (flow.id === "") {
         connectWS();
-      } else {
-        setErrorData({
-          title: "There was an error on web connection, please: ",
-          list: [
-            "Refresh the page",
-            "Use a new flow tab",
-            "Check if the backend is up",
-          ],
-        });
       }
+      console.log(error);
     }
   }
 
@@ -236,7 +228,7 @@ export default function ChatModal({
     return () => {
       console.log("unmount");
       console.log(ws);
-      if (ws) {
+      if (ws.current) {
         ws.current.close();
       }
     };
@@ -244,8 +236,9 @@ export default function ChatModal({
 
   useEffect(() => {
     if (
-      ws.current.readyState === ws.current.CLOSED ||
-      ws.current.readyState === ws.current.CLOSING
+      ws.current &&
+      (ws.current.readyState === ws.current.CLOSED ||
+        ws.current.readyState === ws.current.CLOSING)
     ) {
       connectWS();
       setLockChat(false);