From 80c9c1f0ac58c8b9aba4c3352734581ee5d07b85 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Thu, 19 Jun 2025 18:08:26 +0530 Subject: [PATCH] refactor: clean up imports and improve aisle data fetching in AislesGroup component --- app/src/app.tsx | 3 +-- app/src/components/Dashboard/DashboardCard.tsx | 6 ------ .../sidebarRight/versionHisory/VersionHistory.tsx | 5 ++++- app/src/modules/builder/aisle/aislesGroup.tsx | 13 +++++++------ 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/src/app.tsx b/app/src/app.tsx index 6aa1547..b03d4df 100644 --- a/app/src/app.tsx +++ b/app/src/app.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from "react"; import { Cache } from "three"; -import { BrowserRouter as Router, Routes, Route, useParams } from "react-router-dom"; +import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; import Dashboard from "./pages/Dashboard"; import Project from "./pages/Project"; import UserAuth from "./pages/UserAuth"; @@ -14,7 +14,6 @@ const App: React.FC = () => { Cache.enabled = true; }, []); - return ( diff --git a/app/src/components/Dashboard/DashboardCard.tsx b/app/src/components/Dashboard/DashboardCard.tsx index bcd123d..5dbbd5a 100644 --- a/app/src/components/Dashboard/DashboardCard.tsx +++ b/app/src/components/Dashboard/DashboardCard.tsx @@ -60,12 +60,6 @@ const DashboardCard: React.FC = ({ const navigateToProject = async (e: any) => { if (active && active == "trash") return; - try { - const viewedProject = await viewProject(organization, projectId, userId); - // console.log("Viewed project:", viewedProject); - } catch (error) { - // console.error("Error opening project:", error); - } setLoadingProgress(1) setProjectName(projectName); navigate(`/${projectId}`); diff --git a/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx b/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx index 723cb41..f4c4bb4 100644 --- a/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx +++ b/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx @@ -18,7 +18,7 @@ const VersionHistory = () => { const { setVersionHistoryVisible } = useVersionHistoryVisibleStore(); const { versionHistory, setCreateNewVersion } = useVersionHistoryStore(); const { selectedVersionStore } = useVersionContext(); - const { selectedVersion } = selectedVersionStore(); + const { selectedVersion, setSelectedVersion } = selectedVersionStore(); const { projectId } = useParams(); const addNewVersion = () => { @@ -29,7 +29,10 @@ const VersionHistory = () => { if (!projectId) return; getVersionDataApi(projectId, version.versionId).then((verdionData) => { + setSelectedVersion(version); console.log(verdionData); + }).catch((err) => { + console.log(err); }) }; diff --git a/app/src/modules/builder/aisle/aislesGroup.tsx b/app/src/modules/builder/aisle/aislesGroup.tsx index c6a6dd6..18f3dec 100644 --- a/app/src/modules/builder/aisle/aislesGroup.tsx +++ b/app/src/modules/builder/aisle/aislesGroup.tsx @@ -8,15 +8,16 @@ import { useAisleStore } from '../../../store/builder/useAisleStore'; function AislesGroup() { const { projectId } = useParams(); const { setAisles } = useAisleStore(); + useEffect(() => { - const fetchAisle = async () => { - if (projectId) { - const aisles = await getAisleApi(projectId); + if (projectId) { + getAisleApi(projectId).then((aisles) => { setAisles(aisles); - } + }).catch((err) => { + console.log(err); + }) } - fetchAisle() - }, []) + }, [projectId]) return (