updated

app/src/modules/builder/groups/wallItemsGroup.tsx

@@ -19,6 +19,8 @@ import loadInitialWallItems from "../IntialLoad/loadInitialWallItems";
 import AddWallItems from "../geomentries/walls/addWallItems";
 import useModuleStore from "../../../store/useModuleStore";
 import { useParams } from "react-router-dom";
+import { getUserData } from "../../../functions/getUserData";
+import { useVersionContext } from "../version/versionContext";
 
 const WallItemsGroup = ({
     currentWallItem,
@@ -37,12 +39,16 @@ const WallItemsGroup = ({
     const { setSelectedWallItem } = useSelectedWallItem();
     const { activeModule } = useModuleStore();
     const { selectedItem } = useSelectedItem();
+    const { selectedVersionStore } = useVersionContext();
+    const { selectedVersion } = selectedVersionStore();
     const { projectId } = useParams();
+    const { userId, organization } = getUserData();
 
     useEffect(() => {
         // Load Wall Items from the backend
-        loadInitialWallItems(setWallItems, projectId);
-    }, []);
+        if (!projectId || !selectedVersion) return;
+        loadInitialWallItems(setWallItems, projectId, selectedVersion?.versionId);
+    }, [selectedVersion?.versionId]);
 
     //////////  Update the Position value changes  in the selected item  //////////
 
@@ -120,9 +126,6 @@ const WallItemsGroup = ({
                     });
 
                     setTimeout(async () => {
-                        const email = localStorage.getItem("email");
-                        const organization = email!.split("@")[1].split(".")[0];
-                        const userId = localStorage.getItem("userId");
 
                         //REST
 
@@ -142,7 +145,7 @@ const WallItemsGroup = ({
                         //SOCKET
 
                         const data = {
-                            organization: organization,
+                            organization,
                             modelUuid: currentItem.model?.uuid!,
                             assetId: currentItem.assetId,
                             modelName: currentItem.modelName!,
@@ -153,6 +156,7 @@ const WallItemsGroup = ({
                             quaternion: currentItem.quaternion,
                             scale: currentItem.scale!,
                             socketId: socket.id,
+                            versionId: selectedVersion?.versionId || '',
                             projectId,
                             userId
                         };
@@ -172,7 +176,7 @@ const WallItemsGroup = ({
             canvasElement.removeEventListener("pointermove", handlePointerMove);
             canvasElement.removeEventListener("pointerup", handlePointerUp);
         };
-    }, [selectedItemsIndex]);
+    }, [selectedItemsIndex, selectedVersion?.versionId]);
 
     useEffect(() => {
         const canvasElement = state.gl.domElement;
@@ -194,7 +198,9 @@ const WallItemsGroup = ({
                         hoveredDeletableWallItem,
                         setWallItems,
                         wallItems,
-                        socket, projectId
+                        socket,
+                        projectId,
+                        selectedVersion?.versionId || '',
                     );
                 }
             }
@@ -214,7 +220,7 @@ const WallItemsGroup = ({
 
             raycaster.setFromCamera(pointer, camera);
 
-            if (selectedItem.id) {
+            if (selectedItem.id && selectedVersion && projectId) {
                 if (selectedItem.subCategory) {
                     AddWallItems(
                         selectedItem,
@@ -222,7 +228,8 @@ const WallItemsGroup = ({
                         CSGGroup,
                         setWallItems,
                         socket,
-                        projectId
+                        projectId,
+                        selectedVersion?.versionId || '',
                     );
                 }
                 event.preventDefault();
@@ -246,7 +253,7 @@ const WallItemsGroup = ({
             canvasElement.removeEventListener("drop", onDrop);
             canvasElement.removeEventListener("dragover", onDragOver);
         };
-    }, [toolMode, wallItems, selectedItem, camera]);
+    }, [toolMode, wallItems, selectedItem, camera, selectedVersion?.versionId]);
 
     useEffect(() => {
         if (toolMode && activeModule === "builder") {