diff --git a/app/src/components/layout/scenes/MainScene.tsx b/app/src/components/layout/scenes/MainScene.tsx index eebab29..56849c5 100644 --- a/app/src/components/layout/scenes/MainScene.tsx +++ b/app/src/components/layout/scenes/MainScene.tsx @@ -73,6 +73,7 @@ function MainScene() { }, [activeModule]) useEffect(() => { + console.log('versionHistory: ', versionHistory); if (versionHistory.length > 0) { setSelectedVersion(versionHistory[0]) } diff --git a/app/src/modules/builder/aisle/aislesGroup.tsx b/app/src/modules/builder/aisle/aislesGroup.tsx index 1415eac..966a45b 100644 --- a/app/src/modules/builder/aisle/aislesGroup.tsx +++ b/app/src/modules/builder/aisle/aislesGroup.tsx @@ -14,7 +14,7 @@ function AislesGroup() { const { projectId } = useParams(); useEffect(() => { - if (projectId) { + if (projectId && selectedVersion) { getAisleApi(projectId, selectedVersion?.versionId || '').then((aisles) => { if (aisles && aisles.length > 0) { setAisles(aisles); diff --git a/app/src/modules/builder/geomentries/lines/distanceText/distanceText.tsx b/app/src/modules/builder/geomentries/lines/distanceText/distanceText.tsx index 5d13d09..cdb586e 100644 --- a/app/src/modules/builder/geomentries/lines/distanceText/distanceText.tsx +++ b/app/src/modules/builder/geomentries/lines/distanceText/distanceText.tsx @@ -98,7 +98,7 @@ const DistanceText = () => { useEffect(() => { - if (!email) return; + if (!email || !selectedVersion) return; getLines(organization, projectId, selectedVersion?.versionId || '').then((data) => { data = objectLinesToArray(data); diff --git a/app/src/modules/builder/groups/floorPlanGroup.tsx b/app/src/modules/builder/groups/floorPlanGroup.tsx index 4739c21..8f1c2f2 100644 --- a/app/src/modules/builder/groups/floorPlanGroup.tsx +++ b/app/src/modules/builder/groups/floorPlanGroup.tsx @@ -49,6 +49,7 @@ const FloorPlanGroup = ({ floorPlanGroup, floorPlanGroupLine, floorPlanGroupPoin }, [toolMode, state]); useEffect(() => { + if (!selectedVersion) return; getLines(organization, projectId, selectedVersion?.versionId || '').then((data) => { diff --git a/app/src/modules/builder/groups/wallsMesh.tsx b/app/src/modules/builder/groups/wallsMesh.tsx index 7d51d71..6b22a8d 100644 --- a/app/src/modules/builder/groups/wallsMesh.tsx +++ b/app/src/modules/builder/groups/wallsMesh.tsx @@ -23,6 +23,10 @@ const WallsMeshComponent = ({ lines }: any) => { useEffect(() => { if (updateScene) { + if (!selectedVersion) { + setUpdateScene(false); + return; + }; getLines(organization, projectId, selectedVersion?.versionId || '').then((data) => { const Lines: Types.Lines = objectLinesToArray(data); localStorage.setItem("Lines", JSON.stringify(Lines)); diff --git a/app/src/modules/builder/groups/zoneGroup.tsx b/app/src/modules/builder/groups/zoneGroup.tsx index 095c168..929256f 100644 --- a/app/src/modules/builder/groups/zoneGroup.tsx +++ b/app/src/modules/builder/groups/zoneGroup.tsx @@ -72,6 +72,7 @@ const ZoneGroup: React.FC = () => { ); useEffect(() => { + if (!selectedVersion) return; getZonesApi(organization, projectId, selectedVersion?.versionId || '').then((data) => { if (data && data.length > 0) { const fetchedZones = data.map((zone: any) => ({ @@ -90,10 +91,10 @@ const ZoneGroup: React.FC = () => { ); setZonePoints(fetchedPoints); - }else{ + } else { setZones([]); } - }).catch((err)=>{ + }).catch((err) => { console.error(err); }) }, [selectedVersion?.versionId]); diff --git a/app/src/modules/simulation/products/products.tsx b/app/src/modules/simulation/products/products.tsx index 1839447..e3ade5e 100644 --- a/app/src/modules/simulation/products/products.tsx +++ b/app/src/modules/simulation/products/products.tsx @@ -41,6 +41,7 @@ function Products() { }, [comparisonProduct]) useEffect(() => { + if (!selectedVersion) return; getAllProductsApi(projectId || '', selectedVersion?.versionId || '').then((data) => { if (data && data.length === 0) { const id = THREE.MathUtils.generateUUID();