Merge branch 'main-dev' into dev-refactor

app/src/pages/Project.tsx

@@ -29,7 +29,6 @@ import { SceneProvider } from "../modules/scene/sceneContext";
 import { getVersionHistoryApi } from "../services/factoryBuilder/versionControl/getVersionHistoryApi";
 import { useVersionHistoryStore } from "../store/builder/useVersionHistoryStore";
 import { VersionProvider } from "../modules/builder/version/versionContext";
-import ThreadChat from "../components/ui/collaboration/ThreadChat";
 
 const Project: React.FC = () => {
 	let navigate = useNavigate();
@@ -47,7 +46,7 @@ const Project: React.FC = () => {
 	const { selectedUser } = useSelectedUserStore();
 	const { isLogListVisible } = useLogger();
 	const { setVersions } = useVersionHistoryStore();
-	const { selectedComment, commentPositionState } = useSelectedComment();
+
 
 	useEffect(() => {
 		if (!email || !userId) {
@@ -56,11 +55,14 @@ const Project: React.FC = () => {
 		}
 
 		getAllProjects(userId, organization).then((projects) => {
+			if (!projects || !projects.Projects) return;
 			const filterProject = projects?.Projects.find((val: any) => val.projectUuid === projectId || val._id === projectId)
 			setProjectName(filterProject.projectName)
 			viewProject(organization, filterProject._id, userId).then((viewedProject) => {
 			});
-		});
+		}).catch(() => {
+			console.error("Error fetching projects")
+		})
 
 	}, []);
 
@@ -79,6 +81,8 @@ const Project: React.FC = () => {
 				})
 			})
 			setVersions(versions);
+		}).catch(() => {
+			console.error("Error fetching version history")
 		})
 	}, [projectId])
 
@@ -127,8 +131,6 @@ const Project: React.FC = () => {
 					<LogList />
 				</RenderOverlay>
 			)}
-			{(commentPositionState !== null || selectedComment !== null) && <ThreadChat />}
-			
 		</div>
 	);
 };

app/src/pages/UserAuth.tsx

@@ -43,7 +43,6 @@ const UserAuth: React.FC = () => {
     const organization = email.split("@")[1].split(".")[0];
     try {
       const res = await signInApi(email, password, organization, fingerprint);
-      console.log('res: ', res);
       if (res.message.message === "login successfull") {
         setError("");
         setOrganization(organization);
@@ -57,6 +56,7 @@ const UserAuth: React.FC = () => {
 
         try {
           const projects = await recentlyViewed(organization, res.message.userId);
+          console.log('projects: ', projects);
           if (res.message.isShare) {
             if (Object.values(projects.RecentlyViewed).length > 0) {
               const firstId = (Object.values(projects?.RecentlyViewed || {})[0] as any)?._id;
@@ -72,7 +72,6 @@ const UserAuth: React.FC = () => {
             }
           }
 
-
         } catch (error) {
           console.error("Error fetching recent projects:", error);
         }