refactor: folder fetching, folder sidebar and fix various issues

src/frontend/src/components/folderSidebarComponent/components/sidebarFolderSkeleton/index.tsx

@@ -0,0 +1,10 @@
+import { Skeleton } from "@/components/ui/skeleton";
+
+export function SidebarFolderSkeleton() {
+  return (
+    <div className="flex h-10 w-full shrink-0 animate-pulse cursor-pointer items-center gap-4 rounded-md border bg-background px-4 opacity-100 lg:min-w-full">
+      <Skeleton className="h-3 w-4 rounded-full" />
+      <Skeleton className="h-3 w-[40%]" />
+    </div>
+  );
+}

src/frontend/src/components/sidebarComponent/hooks/use-on-file-drop.tsx → src/frontend/src/components/folderSidebarComponent/hooks/use-on-file-drop.tsx

@@ -1,33 +1,24 @@
+import { usePostUploadFlowToFolder } from "@/controllers/API/queries/folders/use-post-upload-to-folder";
 import useSaveFlow from "@/hooks/flows/use-save-flow";
 import {
   UPLOAD_ALERT_LIST,
   WRONG_FILE_ERROR_ALERT,
 } from "../../../constants/alerts_constants";
-import { uploadFlowToFolder } from "../../../pages/MainPage/services";
 import useAlertStore from "../../../stores/alertStore";
 import useFlowsManagerStore from "../../../stores/flowsManagerStore";
 import { useFolderStore } from "../../../stores/foldersStore";
 import { addVersionToDuplicates } from "../../../utils/reactflowUtils";
 
-const useFileDrop = (
-  folderId: string,
-  folderChangeCallback: (folderId: string) => void,
-) => {
+const useFileDrop = (folderId: string) => {
   const setFolderDragging = useFolderStore((state) => state.setFolderDragging);
   const setFolderIdDragging = useFolderStore(
     (state) => state.setFolderIdDragging,
   );
 
   const setErrorData = useAlertStore((state) => state.setErrorData);
-  const refreshFolders = useFolderStore((state) => state.refreshFolders);
   const flows = useFlowsManagerStore((state) => state.flows);
   const saveFlow = useSaveFlow();
-
-  const triggerFolderChange = (folderId) => {
-    if (folderChangeCallback) {
-      folderChangeCallback(folderId);
-    }
-  };
+  const { mutate: uploadFlowToFolder } = usePostUploadFlowToFolder();
   const handleFileDrop = async (e) => {
     if (e.dataTransfer.types.some((type) => type === "Files")) {
       if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
@@ -121,10 +112,7 @@ const useFileDrop = (
     setFolderDragging(false);
     setFolderIdDragging("");
 
-    saveFlow(updatedFlow).then(() => {
-      refreshFolders();
-      triggerFolderChange(folderId);
-    });
+    saveFlow(updatedFlow);
   };
 
   const uploadFormData = (data) => {
@@ -133,10 +121,7 @@ const useFileDrop = (
     setFolderDragging(false);
     setFolderIdDragging("");
 
-    uploadFlowToFolder(formData, folderId).then(() => {
-      refreshFolders();
-      triggerFolderChange(folderId);
-    });
+    uploadFlowToFolder({ flows: formData, folderId });
   };
 
   return {

src/frontend/src/components/folderSidebarComponent/index.tsx

@@ -0,0 +1,38 @@
+import { useGetFoldersQuery } from "@/controllers/API/queries/folders/use-get-folders";
+import { useLocation } from "react-router-dom";
+import { FolderType } from "../../pages/MainPage/entities";
+import { cn } from "../../utils/utils";
+import HorizontalScrollFadeComponent from "../horizontalScrollFadeComponent";
+import SideBarFoldersButtonsComponent from "./components/sideBarFolderButtons";
+
+type SidebarNavProps = {
+  handleChangeFolder?: (id: string) => void;
+  handleDeleteFolder?: (item: FolderType) => void;
+  className?: string;
+};
+
+export default function FolderSidebarNav({
+  className,
+  handleChangeFolder,
+  handleDeleteFolder,
+  ...props
+}: SidebarNavProps) {
+  const location = useLocation();
+  const pathname = location.pathname;
+
+  const { data: folders, isPending } = useGetFoldersQuery();
+
+  return (
+    <nav className={cn(className)} {...props}>
+      <HorizontalScrollFadeComponent>
+        <SideBarFoldersButtonsComponent
+          loading={isPending || !folders}
+          pathname={pathname}
+          handleChangeFolder={handleChangeFolder}
+          handleDeleteFolder={handleDeleteFolder}
+          folders={folders}
+        />
+      </HorizontalScrollFadeComponent>
+    </nav>
+  );
+}

src/frontend/src/components/headerComponent/components/menuBar/index.tsx

@@ -54,6 +54,7 @@ export const MenuBar = ({}: {}): JSX.Element => {
   const currentSavedFlow = useFlowsManagerStore((state) => state.currentFlow);
   const updatedAt = currentSavedFlow?.updated_at;
   const onFlowPage = useFlowStore((state) => state.onFlowPage);
+  const setCurrentFlow = useFlowsManagerStore((state) => state.setCurrentFlow);
 
   const changesNotSaved =
     customStringify(currentFlow) !== customStringify(currentSavedFlow) &&
@@ -71,6 +72,7 @@ export const MenuBar = ({}: {}): JSX.Element => {
   function handleAddFlow() {
     try {
       addFlow().then((id) => {
+        setCurrentFlow(undefined); // Reset current flow for useEffect of flowPage to update the current flow
         navigate("/flow/" + id);
       });
     } catch (err) {

src/frontend/src/components/headerComponent/index.tsx

@@ -55,16 +55,12 @@ export default function Header(): JSX.Element {
   }`;
 
   const redirectToLastLocation = () => {
-    const lastFlowVisitedIndex = routeHistory
+    const lastVisitedIndex = routeHistory
       .reverse()
-      .findIndex(
-        (path) => path.includes("/flow/") && path !== location.pathname,
-      );
+      .findIndex((path) => path !== location.pathname);
 
-    const lastFlowVisited = routeHistory[lastFlowVisitedIndex];
-    lastFlowVisited && !location.pathname.includes("/flow")
-      ? navigate(lastFlowVisited)
-      : navigate("/all");
+    const lastFlowVisited = routeHistory[lastVisitedIndex];
+    lastFlowVisited ? navigate(lastFlowVisited) : navigate("/all");
   };
 
   const visitedFlowPathBefore = () => {
@@ -108,7 +104,7 @@ export default function Header(): JSX.Element {
       </div>
 
       <div className="round-button-div">
-        <Link to="/">
+        <Link to="/all">
           <Button
             className="gap-2"
             variant={

src/frontend/src/components/sidebarComponent/index.tsx

@@ -1,55 +1,29 @@
 import { useLocation } from "react-router-dom";
-import { FolderType } from "../../pages/MainPage/entities";
-import { useFolderStore } from "../../stores/foldersStore";
 import { cn } from "../../utils/utils";
 import HorizontalScrollFadeComponent from "../horizontalScrollFadeComponent";
 import SideBarButtonsComponent from "./components/sideBarButtons";
-import SideBarFoldersButtonsComponent from "./components/sideBarFolderButtons";
 
 type SidebarNavProps = {
   items: {
     href?: string;
     title: string;
     icon: React.ReactNode;
   }[];
-  handleChangeFolder?: (id: string) => void;
-  handleEditFolder?: (item: FolderType) => void;
-  handleDeleteFolder?: (item: FolderType) => void;
   className?: string;
 };
 
 export default function SidebarNav({
   className,
   items,
-  handleChangeFolder,
-  handleEditFolder,
-  handleDeleteFolder,
   ...props
 }: SidebarNavProps) {
   const location = useLocation();
   const pathname = location.pathname;
-  const loadingFolders = useFolderStore((state) => state.isLoadingFolders);
-  const folders = useFolderStore((state) => state.folders);
-
-  const pathValues = ["folder", "components", "flows", "all"];
-  const isFolderPath = pathValues.some((value) => pathname.includes(value));
-
-  // Ensure all conditions are covered and provide a default case if necessary
-  const sidebarContent =
-    items.length > 0 ? (
-      <SideBarButtonsComponent items={items} pathname={pathname} />
-    ) : !loadingFolders && folders?.length > 0 && isFolderPath ? (
-      <SideBarFoldersButtonsComponent
-        pathname={pathname}
-        handleChangeFolder={handleChangeFolder}
-        handleDeleteFolder={handleDeleteFolder}
-      />
-    ) : null;
 
   return (
     <nav className={cn(className)} {...props}>
       <HorizontalScrollFadeComponent>
-        {sidebarContent!}
+        <SideBarButtonsComponent items={items} pathname={pathname} />
       </HorizontalScrollFadeComponent>
     </nav>
   );

src/frontend/src/contexts/authContext.tsx

@@ -8,7 +8,6 @@ import useAuthStore from "@/stores/authStore";
 import { createContext, useEffect, useState } from "react";
 import Cookies from "universal-cookie";
 import useAlertStore from "../stores/alertStore";
-import { useFolderStore } from "../stores/foldersStore";
 import { useStoreStore } from "../stores/storeStore";
 import { Users } from "../types/api";
 import { AuthContextType } from "../types/contexts/auth";
@@ -38,8 +37,6 @@ export function AuthProvider({ children }): React.ReactElement {
     cookies.get(LANGFLOW_API_TOKEN),
   );
 
-  const getFoldersApi = useFolderStore((state) => state.getFoldersApi);
-
   const checkHasStore = useStoreStore((state) => state.checkHasStore);
   const fetchApiData = useStoreStore((state) => state.fetchApiData);
   const setIsAuthenticated = useAuthStore((state) => state.setIsAuthenticated);
@@ -68,7 +65,6 @@ export function AuthProvider({ children }): React.ReactElement {
           setUserData(user);
           const isSuperUser = user!.is_superuser;
           useAuthStore.getState().setIsAdmin(isSuperUser);
-          getFoldersApi(true, true);
           checkHasStore();
           fetchApiData();
         },

src/frontend/src/controllers/API/queries/flows/use-delete-delete-flows.ts

@@ -12,7 +12,7 @@ export const useDeleteDeleteFlows: useMutationFunctionType<
   undefined,
   IDeleteFlows
 > = (options?) => {
-  const { mutate } = UseRequestProcessor();
+  const { mutate, queryClient } = UseRequestProcessor();
 
   const deleteFlowsFn = async (payload: IDeleteFlows): Promise<any> => {
     const response = await api.delete<any>(`${getURL("FLOWS")}/`, {
@@ -25,7 +25,12 @@ export const useDeleteDeleteFlows: useMutationFunctionType<
   const mutation: UseMutationResult<IDeleteFlows, any, IDeleteFlows> = mutate(
     ["useLoginUser"],
     deleteFlowsFn,
-    options,
+    {
+      ...options,
+      onSettled: () => {
+        queryClient.refetchQueries({ queryKey: ["useGetFolder"] });
+      },
+    },
   );
 
   return mutation;

src/frontend/src/controllers/API/queries/flows/use-patch-update-flow.ts

@@ -18,7 +18,7 @@ export const usePatchUpdateFlow: useMutationFunctionType<
   undefined,
   IPatchUpdateFlow
 > = (options?) => {
-  const { mutate } = UseRequestProcessor();
+  const { mutate, queryClient } = UseRequestProcessor();
 
   const PatchUpdateFlowFn = async (payload: IPatchUpdateFlow): Promise<any> => {
     const response = await api.patch(`${getURL("FLOWS")}/${payload.id}`, {
@@ -33,7 +33,14 @@ export const usePatchUpdateFlow: useMutationFunctionType<
   };
 
   const mutation: UseMutationResult<IPatchUpdateFlow, any, IPatchUpdateFlow> =
-    mutate(["usePatchUpdateFlow"], PatchUpdateFlowFn, options);
+    mutate(["usePatchUpdateFlow"], PatchUpdateFlowFn, {
+      ...options,
+      onSettled: () => {
+        queryClient.refetchQueries({
+          queryKey: ["useGetFolder"],
+        });
+      },
+    });
 
   return mutation;
 };

src/frontend/src/controllers/API/queries/flows/use-post-add-flow.ts

@@ -18,7 +18,7 @@ export const usePostAddFlow: useMutationFunctionType<
   undefined,
   IPostAddFlow
 > = (options?) => {
-  const { mutate } = UseRequestProcessor();
+  const { mutate, queryClient } = UseRequestProcessor();
 
   const postAddFlowFn = async (payload: IPostAddFlow): Promise<any> => {
     const response = await api.post(`${getURL("FLOWS")}/`, {
@@ -36,7 +36,12 @@ export const usePostAddFlow: useMutationFunctionType<
   const mutation: UseMutationResult<IPostAddFlow, any, IPostAddFlow> = mutate(
     ["usePostAddFlow"],
     postAddFlowFn,
-    options,
+    {
+      ...options,
+      onSettled: () => {
+        queryClient.refetchQueries({ queryKey: ["useGetFolder"] });
+      },
+    },
   );
 
   return mutation;

src/frontend/src/controllers/API/queries/folders/use-delete-folders.ts

@@ -12,7 +12,7 @@ export const useDeleteFolders: useMutationFunctionType<
   undefined,
   DeleteFoldersParams
 > = (options?) => {
-  const { mutate } = UseRequestProcessor();
+  const { mutate, queryClient } = UseRequestProcessor();
 
   const deleteFolder = async ({
     folder_id,
@@ -25,7 +25,12 @@ export const useDeleteFolders: useMutationFunctionType<
     DeleteFoldersParams,
     any,
     DeleteFoldersParams
-  > = mutate(["useDeleteFolders"], deleteFolder, options);
+  > = mutate(["useDeleteFolders"], deleteFolder, {
+    ...options,
+    onSettled: () => {
+      queryClient.refetchQueries({ queryKey: ["useGetFolders"] });
+    },
+  });
 
   return mutation;
 };

src/frontend/src/controllers/API/queries/folders/use-get-folder.ts

@@ -0,0 +1,30 @@
+import { FolderType } from "@/pages/MainPage/entities";
+import { useQueryFunctionType } from "@/types/api";
+import { api } from "../../api";
+import { getURL } from "../../helpers/constants";
+import { UseRequestProcessor } from "../../services/request-processor";
+
+interface IGetFolder {
+  id: string;
+}
+
+export const useGetFolderQuery: useQueryFunctionType<IGetFolder, FolderType> = (
+  params,
+  options,
+) => {
+  const { query } = UseRequestProcessor();
+
+  const getFolderFn = async (): Promise<FolderType> => {
+    const res = await api.get(`${getURL("FOLDERS")}/${params.id}`);
+    const data = res.data;
+
+    return data;
+  };
+
+  const queryResult = query(
+    ["useGetFolder", { id: params.id }],
+    getFolderFn,
+    options,
+  );
+  return queryResult;
+};