Merge remote-tracking branch 'origin/merge/wall-collab' into main-dev

app/src/components/Dashboard/DashboardProjects.tsx

@@ -216,139 +216,3 @@ const DashboardProjects: React.FC = () => {
 export default DashboardProjects;
 
 
-
-// const MyProjects = () => {
-//   const { projectSocket } = useSocketStore();
-//   const { userId, organization } = getUserData();
-
-//   const fetchAllProjects = async () => {
-//     try {
-//       const projects = await getAllProjects(userId, organization);
-//       if (!projects || !projects.Projects) return;
-
-//       if (JSON.stringify(projects) !== JSON.stringify(workspaceProjects)) {
-//         setWorkspaceProjects(projects);
-//       }
-//     } catch (error) {
-//       console.error("Error fetching projects:", error);
-//     }
-//   };
-//   const handleDeleteProject = async (projectId: any) => {
-//     try {
-//       // const deletedProject = await deleteProject(
-//       //   projectId,
-//       //   userId,
-//       //   organization
-//       // );
-//       // console.log('deletedProject: ', deletedProject);
-//       const deleteProjects = {
-//         projectId,
-//         organization,
-//         userId,
-//       };
-
-//       //socket for deleting the project
-//       if (projectSocket) {
-//         projectSocket.emit("v1:project:delete", deleteProjects);
-//       } else {
-//         console.error("Socket is not connected.");
-//       }
-//       setWorkspaceProjects((prevDiscardedProjects: WorkspaceProjects) => {
-//         if (!Array.isArray(prevDiscardedProjects?.Projects)) {
-//           return prevDiscardedProjects;
-//         }
-//         const updatedProjectDatas = prevDiscardedProjects.Projects.filter(
-//           (project) => project._id !== projectId
-//         );
-//         return {
-//           ...prevDiscardedProjects,
-//           Projects: updatedProjectDatas,
-//         };
-//       });
-//       setIsSearchActive(false);
-//     } catch (error) {
-//       console.error("Error deleting project:", error);
-//     }
-//   };
-
-//   const handleDuplicateWorkspaceProject = async (
-//     projectId: string,
-//     projectName: string,
-//     thumbnail: string
-//   ) => {
-//     // await handleDuplicateProjects({
-//     //   userId,
-//     //   organization,
-//     //   projectId,
-//     //   projectName,
-//     //   projectSocket,
-//     //   thumbnail,
-//     //   setWorkspaceProjects,
-//     //   setIsSearchActive
-//     // });
-//     const duplicateProjectData = {
-//       userId,
-//       thumbnail,
-//       organization,
-//       projectUuid: projectId,
-//       projectName,
-//     };
-//     projectSocket.emit("v1:project:Duplicate", duplicateProjectData);
-//   };
-
-//   const renderProjects = () => {
-//     if (activeFolder !== "myProjects") return null;
-
-//     const projectList = workspaceProjects[Object.keys(workspaceProjects)[0]];
-
-//     if (!projectList?.length) {
-//       return <div className="empty-state">No projects found</div>;
-//     }
-
-//     return projectList.map((project) => (
-//       <DashboardCard
-//         key={project._id}
-//         projectName={project.projectName}
-//         thumbnail={project.thumbnail}
-//         projectId={project._id}
-//         createdAt={project.createdAt}
-//         handleDeleteProject={handleDeleteProject}
-//         setIsSearchActive={setIsSearchActive}
-//         handleDuplicateWorkspaceProject={handleDuplicateWorkspaceProject}
-//         setProjectDuplicateData={setProjectDuplicateData}
-//       />
-//     ));
-//   };
-
-//   const renderSharedProjects = () => {
-//     if (activeFolder !== "shared") return null;
-
-//     const projectList = workspaceProjects[Object.keys(workspaceProjects)[0]];
-
-//     if (!projectList?.length) {
-//       return <div className="empty-state">No projects found</div>;
-//     }
-
-//     return projectList.map((project) => (
-//       <DashboardCard
-//         key={project._id}
-//         projectName={project.projectName}
-//         thumbnail={project.thumbnail}
-//         projectId={project._id}
-//         createdAt={project.createdAt}
-//         handleDeleteProject={handleDeleteProject}
-//         setIsSearchActive={setIsSearchActive}
-//         handleDuplicateWorkspaceProject={handleDuplicateWorkspaceProject}
-//         setProjectDuplicateData={setProjectDuplicateData}
-//       />
-//     ));
-//   };
-
-//   useEffect(() => {
-//     if (!isSearchActive) {
-//       fetchAllProjects();
-//     }
-//   }, [isSearchActive]);
-
-//   return null
-// }

app/src/components/templates/CollaborationPopup.tsx

@@ -9,7 +9,6 @@ import { useActiveUsers } from "../../store/builder/store";
 import { getUserData } from "../../functions/getUserData";
 import { getProjectSharedList } from "../../services/factoryBuilder/collab/getProjectSharedList";
 import { useParams } from "react-router-dom";
-import { projection } from "@turf/turf";
 import { shareAccess } from "../../services/factoryBuilder/collab/shareAccess";
 import { getAvatarColor } from "../../modules/collaboration/functions/getAvatarColor";
 

app/src/components/templates/LoadingPage.tsx

@@ -6,7 +6,6 @@ import { useProjectName } from "../../store/builder/store";
 import { getAllProjects } from "../../services/dashboard/getAllProjects";
 import { useComparisonProduct } from "../../store/simulation/useSimulationStore";
 import { getUserData } from "../../functions/getUserData";
-import { recentlyViewed } from "../../services/dashboard/recentlyViewed";
 import { sharedWithMeProjects } from "../../services/dashboard/sharedWithMeProject";
 
 interface LoadingPageProps {
@@ -20,23 +19,6 @@ const LoadingPage: React.FC<LoadingPageProps> = ({ progress }) => {
   const { userId, organization } = getUserData();
 
   const validatedProgress = Math.min(100, Math.max(0, progress));
-
-  // useEffect(() => {
-  //   if (!userId) return;
-
-
-  //   // getAllProjects(userId, organization).then((projects) => {
-  //   //   sharedWithMeProjects().then((shared) => {
-  //   //     console.log('filterProject: ', shared);
-  //   //     const filterProject = (projects?.Projects || shared)?.find((val: any) => val.projectUuid === projectId || val._id === projectId)
-  //   //     console.log('filterProject: ', filterProject);
-  //   //     // setProjectName(filterProject?.projectName)
-
-  //   //   })
-  //   // }).catch(() => {
-  //   //   console.error("Error fetching projects")
-  //   // })
-  // }, []);
   useEffect(() => {
     if (!userId) {
       console.error("User data not found in localStorage");

app/src/components/temporary/SelectFloorPlan.tsx

@@ -1,21 +1,26 @@
 import React, { useEffect, useState } from "react";
 import useLayoutStore from "../../store/builder/uselayoutStore";
-import { useDfxUpload } from "../../store/builder/store";
+import { useActiveLayer, useDfxUpload } from "../../store/builder/store";
 import DxfParser from "dxf-parser";
 import { getWallPointsFromBlueprint } from "../../modules/builder/dfx/functions/getWallPointsFromBlueprint";
 import { convertDXFToThree } from "../../modules/builder/dfx/functions/convertDxfToThree";
 import { AIIcon } from "../icons/ExportCommonIcons";
+import { useBuilderStore } from "../../store/builder/useBuilderStore";
+import { useSceneContext } from "../../modules/scene/sceneContext";
 type DXFData = any;
 const SelectFloorPlan: React.FC = () => {
   // Access layout state and state setters
   const { currentLayout, setLayout } = useLayoutStore();
   // Access DXF-related states and setters
-  const { setDfxUploaded, setDfxGenerate, setObjValue, objValue } =
+  const { setDfxUploaded, setDxfWallGenerate, setObjValue, objValue } =
     useDfxUpload();
-
+  const { activeLayer } = useActiveLayer();
+  const { wallThickness, wallHeight, insideMaterial, outsideMaterial } = useBuilderStore();
+  const { wallStore } = useSceneContext();
+  const { addWall } = wallStore();
   // Local state to store the parsed DXF file
   const [parsedFile, setParsedFile] = useState<DXFData | undefined>(undefined);
-
+  const { walls } = wallStore();
   // Flag to trigger generation after file upload
   const [generate, setGenerate] = useState<boolean>(false);
 
@@ -58,8 +63,9 @@ const SelectFloorPlan: React.FC = () => {
     if (parsedFile !== undefined) {
       getWallPointsFromBlueprint({
         parsedData: parsedFile,
-        setDfxGenerate,
+        setDxfWallGenerate,
         objValue,
+        wallThickness, wallHeight, outsideMaterial, insideMaterial, activeLayer, addWall, walls
       });
     }
   }, [generate]);

app/src/components/ui/inputs/MultiEmailInvite.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from "react";
-import { getSearchUsers } from "../../../services/factoryBuilder/collab/getSearchUsers";
 import { useParams } from "react-router-dom";
+
+import { getSearchUsers } from "../../../services/factoryBuilder/collab/getSearchUsers";
 import { shareProject } from "../../../services/factoryBuilder/collab/shareProject";
 import { getUserData } from "../../../functions/getUserData";
 
@@ -11,59 +12,61 @@ interface UserData {
 }
 
 interface MultiEmailProps {
-  users: any,
-  getData: any,
+  users: Array<any>;
+  getData: () => void;
 }
+
 const MultiEmailInvite: React.FC<MultiEmailProps> = ({ users, getData }) => {
-  const [emails, setEmails] = useState<any>([]);
-  const [searchedEmail, setSearchedEmail] = useState<UserData[]>([]);
-  const [inputFocus, setInputFocus] = useState(false);
+  const [selectedUsers, setSelectedUsers] = useState<UserData[]>([]);
+  const [searchResults, setSearchResults] = useState<UserData[]>([]);
   const [inputValue, setInputValue] = useState("");
+  const [isFocused, setIsFocused] = useState(false);
+
   const { projectId } = useParams();
   const { userId } = getUserData();
 
-  const handleAddEmail = async (selectedUser: UserData) => {
-    if (!projectId || !selectedUser) return
-    const trimmedEmail = inputValue.trim();
-    setEmails((prev: any[]) => {
-      if (!selectedUser) return prev;
-      const isNotCurrentUser = selectedUser._id !== userId;
-      const alreadyExistsInEmails = prev.some(email => email._id === selectedUser._id);
-      const alreadyExistsInUsers = users.some((val: any) => val.userId === selectedUser._id);
-      if (isNotCurrentUser && !alreadyExistsInEmails && !alreadyExistsInUsers) {
-        return [...prev, selectedUser];
-      }
 
-      return prev;
-    });
-    setInputValue(""); // Clear the input field after adding
-  };
-  const handleSearchMail = async (e: any) => {
-    setInputValue(e.target.value);
-    const trimmedEmail = e.target.value.trim();
+  const handleSearchInput = async (e: React.ChangeEvent<HTMLInputElement>) => {
+    const value = e.target.value.trim();
+    setInputValue(value);
+
+    if (value.length < 3) return;
 
-    if (trimmedEmail.length < 3) return;
     try {
-      const searchedMail = await getSearchUsers(trimmedEmail);
-      const filteredEmail = searchedMail.sharchMail?.filtered;
-      if (filteredEmail) {
-        setSearchedEmail(filteredEmail)
-      }
-    } catch (error) {
-      console.error("Failed to search mail:", error);
+      const result = await getSearchUsers(value);
+      const filtered = result?.sharchMail?.filtered || [];
+      setSearchResults(filtered);
+    } catch (err) {
+      console.error("Search failed:", err);
     }
   };
 
+  const handleAddUser = (user: UserData) => {
+    if (!user || user._id === userId) return;
 
-  const handleKeyDown = async (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (e.key === "Enter" || e.key === "," && searchedEmail.length > 0) {
-      e.preventDefault();
-      handleAddEmail(searchedEmail[0]);
+    const isAlreadySelected = selectedUsers.some(u => u._id === user._id);
+    const isAlreadyShared = users.some(u => u.userId === user._id);
+
+    if (!isAlreadySelected && !isAlreadyShared) {
+      setSelectedUsers(prev => [...prev, user]);
     }
+
+    setInputValue("");
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if ((e.key === "Enter" || e.key === ",") && searchResults.length > 0) {
+      e.preventDefault();
+      handleAddUser(searchResults[0]);
+    }
+  };
+
+  const handleRemoveUser = (userIdToRemove: string) => {
+    setSelectedUsers(prev => prev.filter(user => user._id !== userIdToRemove));
   };
 
   const handleRemoveEmail = (idToRemove: string) => {
-    setEmails((prev: any) => prev.filter((email: any) => email._id !== idToRemove));
+    setSelectedUsers((prev: any) => prev.filter((email: any) => email._id !== idToRemove));
   };
 
 
@@ -72,60 +75,62 @@ const MultiEmailInvite: React.FC<MultiEmailProps> = ({ users, getData }) => {
     return emailRegex.test(email);
   };
 
-  const handleInvite = () => {
+  const handleAddEmail = async () => {
     if (!projectId) return;
-    try {
-      emails.forEach((user: any) => {
-        shareProject(user._id, projectId)
-          .then((res) => {
-            console.log("sharedProject:", res);
 
-          })
-          .catch((err) => {
-            console.error("Error sharing project:", err);
-          });
-        setEmails([])
-        setInputValue("")
-      });
-      setTimeout(() => {
-        getData()
-      }, 1000);
+    try {
+      await Promise.all(
+        selectedUsers.map(user =>
+          shareProject(user._id, projectId)
+            .then(res => console.log("Shared:", res))
+            .catch(err => console.error("Share error:", err))
+        )
+      );
+
+      setSelectedUsers([]);
+      setInputValue("");
+      setTimeout(getData, 1000);
     } catch (error) {
-      console.error("General error:", error);
+      console.error("Invite error:", error);
     }
   };
 
+
   return (
     <div className="multi-email-invite-input-container">
-      <div className={`multi-email-invite-input${inputFocus ? " active" : ""}`}>
-        {emails.map((email: any, index: number) => (
-          <div key={index} className="entered-emails">
-            {email.Email}
-            <span onClick={() => handleRemoveEmail(email._id)}>&times;</span>
+      <div className={`multi-email-invite-input${isFocused ? " active" : ""}`}>
+        {selectedUsers.map(user => (
+          <div key={user._id} className="entered-emails">
+            {user.Email}
+            <span onClick={() => handleRemoveUser(user._id)}>&times;</span>
           </div>
         ))}
+
         <input
           type="text"
           value={inputValue}
-          onChange={(e) => handleSearchMail(e)}
-          onFocus={() => setInputFocus(true)}
-          // onBlur={() => setInputFocus(false)}
+          onChange={handleSearchInput}
+          onFocus={() => setIsFocused(true)}
           onKeyDown={handleKeyDown}
-          placeholder="Enter email and press Enter or comma to seperate"
+          placeholder="Enter email and press Enter or comma"
         />
       </div>
-      <div onClick={handleInvite} className="invite-button">
+
+      <div onClick={handleAddEmail} className="invite-button">
         Add
       </div>
-      {inputFocus && inputValue.length > 2 && searchedEmail && searchedEmail.length > 0 && (
+
+      {isFocused && inputValue.length > 2 && searchResults.length > 0 && (
         <div className="users-list-container">
-          {/* list available users here */}
-          {searchedEmail.map((val: any, i: any) => (
-            <div onClick={(e) => {
-              handleAddEmail(val)
-              setInputFocus(false)
-            }} key={i} >
-              {val?.Email}
+          {searchResults.map(user => (
+            <div
+              key={user._id}
+              onClick={() => {
+                handleAddUser(user);
+                setIsFocused(false);
+              }}
+            >
+              {user.Email}
             </div>
           ))}
         </div>
@@ -134,4 +139,5 @@ const MultiEmailInvite: React.FC<MultiEmailProps> = ({ users, getData }) => {
   );
 };
 
-export default MultiEmailInvite;
+
+export default MultiEmailInvite;