From 0d7f5d280f3e4fc4ca446d5036c01590ecaefeb4 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Thu, 4 Sep 2025 12:41:49 +0530 Subject: [PATCH] first person bug fix --- .../components/layout/scenes/MainScene.tsx | 2 +- .../versionHisory/VersionHistory.tsx | 11 +- .../versionHisory/VersionSaved.tsx | 251 +++++++++--------- .../eventHandler/useDecalEventHandlers.ts | 2 + app/src/modules/builder/builder.tsx | 6 +- app/src/modules/scene/camera/camMode.tsx | 4 +- app/src/modules/scene/clouds/clouds.tsx | 30 +-- app/src/modules/scene/setup/setup.tsx | 3 +- 8 files changed, 149 insertions(+), 160 deletions(-) diff --git a/app/src/components/layout/scenes/MainScene.tsx b/app/src/components/layout/scenes/MainScene.tsx index 1234246..58e4da2 100644 --- a/app/src/components/layout/scenes/MainScene.tsx +++ b/app/src/components/layout/scenes/MainScene.tsx @@ -80,7 +80,7 @@ function MainScene() { } }) } - }, [setSelectedVersion, versionHistory]) + }, [setSelectedVersion, versionHistory, projectId]) const handleSelectVersion = (option: string) => { const version = versionHistory.find((version) => version.versionName === option); diff --git a/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx b/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx index a0255f4..8cc35e1 100644 --- a/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx +++ b/app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx @@ -1,10 +1,4 @@ -import { - AddIcon, - ArrowIcon, - CloseIcon, - KebabIcon, - LocationIcon, -} from "../../../icons/ExportCommonIcons"; +import { AddIcon, ArrowIcon, CloseIcon, KebabIcon, LocationIcon } from "../../../icons/ExportCommonIcons"; import RenameInput from "../../../ui/inputs/RenameInput"; import { useVersionHistoryStore } from "../../../../store/builder/useVersionHistoryStore"; import { useSubModuleStore } from "../../../../store/useModuleStore"; @@ -30,9 +24,8 @@ const VersionHistory = () => { getVersionDataApi(projectId, version.versionId).then((versionData) => { setSelectedVersion(version); - // console.log(versionData); }).catch((err) => { - // console.log(err); + echo.error(err); }) }; diff --git a/app/src/components/layout/sidebarRight/versionHisory/VersionSaved.tsx b/app/src/components/layout/sidebarRight/versionHisory/VersionSaved.tsx index fb60ecc..d099b6f 100644 --- a/app/src/components/layout/sidebarRight/versionHisory/VersionSaved.tsx +++ b/app/src/components/layout/sidebarRight/versionHisory/VersionSaved.tsx @@ -1,8 +1,5 @@ import { useEffect, useState } from "react"; -import { - FinishEditIcon, - RenameVersionIcon, -} from "../../../icons/ExportCommonIcons"; +import { FinishEditIcon, RenameVersionIcon } from "../../../icons/ExportCommonIcons"; import RenderOverlay from "../../../templates/Overlay"; import { useVersionHistoryStore } from "../../../../store/builder/useVersionHistoryStore"; import { createVersionApi } from "../../../../services/factoryBuilder/versionControl/addVersionApi"; @@ -11,144 +8,144 @@ import { getUserData } from "../../../../functions/getUserData"; import { useVersionContext } from "../../../../modules/builder/version/versionContext"; const VersionSaved = () => { - const { addVersion, createNewVersion, setCreateNewVersion } = useVersionHistoryStore(); - const { selectedVersionStore } = useVersionContext(); - const { selectedVersion, setSelectedVersion } = selectedVersionStore(); - const [newName, setNewName] = useState(new Date().toLocaleString("en-US", { - month: "short", - day: "numeric", - year: "numeric", - hour: "numeric", - minute: "2-digit", - })); - const [description, setDescription] = useState(""); - const [showSaveFinish, setSaveFinish] = useState(false); - const { projectId } = useParams(); - const { userId } = getUserData(); - - useEffect(() => { - if (createNewVersion) { - const defaultName = new Date().toLocaleString("en-US", { + const { addVersion, createNewVersion, setCreateNewVersion } = useVersionHistoryStore(); + const { selectedVersionStore } = useVersionContext(); + const { selectedVersion, setSelectedVersion } = selectedVersionStore(); + const [newName, setNewName] = useState(new Date().toLocaleString("en-US", { month: "short", day: "numeric", year: "numeric", hour: "numeric", minute: "2-digit", - }); - setNewName(defaultName); - setDescription(""); - } - }, [createNewVersion]); + })); + const [description, setDescription] = useState(""); + const [saveFinish, setSaveFinish] = useState(false); + const { projectId } = useParams(); + const { userId } = getUserData(); - const handleSave = () => { - if (!selectedVersion || !projectId) return; + useEffect(() => { + if (createNewVersion) { + const defaultName = new Date().toLocaleString("en-US", { + month: "short", + day: "numeric", + year: "numeric", + hour: "numeric", + minute: "2-digit", + }); + setNewName(defaultName); + setDescription(""); + } + }, [createNewVersion]); - const updatedName = (newName.trim() || selectedVersion.versionName) ?? selectedVersion.timeStamp; - const updatedDescription = (description.trim() || selectedVersion.versionName) ?? selectedVersion.timeStamp; + const handleSave = () => { + if (!selectedVersion || !projectId) return; - createVersionApi(projectId, userId, selectedVersion.versionId, updatedName, updatedDescription).then((data) => { - setSaveFinish(true); - setCreateNewVersion(false); + const updatedName = (newName.trim() || selectedVersion.versionName) ?? selectedVersion.timeStamp; + const updatedDescription = (description.trim() || selectedVersion.versionName) ?? selectedVersion.timeStamp; - addVersion({ - version: data.version, - versionId: data.versionId, - versionName: data.versionName, - versionDescription: data.description, - timeStamp: data.createdAt, - createdBy: data.createdBy.userName - }) + createVersionApi(projectId, userId, selectedVersion.versionId, updatedName, updatedDescription).then((data) => { + setSaveFinish(true); + setCreateNewVersion(false); - setSelectedVersion({ - version: data.version, - versionId: data.versionId, - versionName: data.versionName, - versionDescription: data.description, - timeStamp: data.createdAt, - createdBy: data.createdBy.userName - }) + addVersion({ + version: data.version, + versionId: data.versionId, + versionName: data.versionName, + versionDescription: data.description, + timeStamp: data.createdAt, + createdBy: data.createdBy.userName + }) - setTimeout(() => { + setSelectedVersion({ + version: data.version, + versionId: data.versionId, + versionName: data.versionName, + versionDescription: data.description, + timeStamp: data.createdAt, + createdBy: data.createdBy.userName + }) + + setTimeout(() => { + setSaveFinish(false); + }, 3000); + }).catch((err) => { + setSaveFinish(false); + setCreateNewVersion(false); + }) + }; + + const handleCancel = () => { setSaveFinish(false); - }, 3000); - }).catch((err) => { - setSaveFinish(false); - setCreateNewVersion(false); - }) - }; + setCreateNewVersion(false); + }; - const handleCancel = () => { - setSaveFinish(false); - setCreateNewVersion(false); - }; + if (!selectedVersion) return null; - if (!selectedVersion) return null; + return ( +
+ {createNewVersion && + +
+
+
+ +
Create Version
+
+
+
+ setNewName(e.target.value)} + placeholder="Enter new version name" + /> +
+ by @{selectedVersion.createdBy}{" "}{new Date(selectedVersion.timeStamp).toLocaleDateString("en-US", { + year: "numeric", + month: "long", + day: "2-digit", + })} +
+
+
+