added rest based on socket call

app/src/modules/scene/controls/selectionControls/selection3D/copyPasteControls3D.tsx

@@ -39,7 +39,7 @@ const CopyPasteControls3D = () => {
         rotatedObjects,
         setRotatedObjects,
     } = assetStore();
-    const { updateAssetInScene } = useAssetResponseHandler();
+    const { updateAssetInScene, removeAssetFromScene } = useAssetResponseHandler();
     const { selectedVersion } = versionStore();
     const { userId, organization } = getUserData();
 
@@ -502,6 +502,7 @@ const CopyPasteControls3D = () => {
                         projectId,
                     };
 
+                    removeAssetFromScene(data.modelUuid, () => {
                         if (!builderSocket?.connected) {
                             // REST
 
@@ -552,6 +553,7 @@ const CopyPasteControls3D = () => {
 
                             builderSocket.emit("v1:model-asset:copy", data);
                         }
+                    });
                 } else {
                     const data = {
                         organization,
@@ -568,6 +570,7 @@ const CopyPasteControls3D = () => {
                         userId,
                     };
 
+                    removeAssetFromScene(data.modelUuid, () => {
                         if (!builderSocket?.connected) {
                             // REST
 
@@ -616,6 +619,7 @@ const CopyPasteControls3D = () => {
 
                             builderSocket.emit("v1:model-asset:copy", data);
                         }
+                    });
                 }
 
                 assetsToCopy.push({

app/src/modules/scene/controls/selectionControls/selection3D/duplicationControls3D.tsx

@@ -38,7 +38,7 @@ const DuplicationControls3D = () => {
         rotatedObjects,
         setRotatedObjects,
     } = assetStore();
-    const { updateAssetInScene } = useAssetResponseHandler();
+    const { updateAssetInScene, removeAssetFromScene } = useAssetResponseHandler();
     const { selectedVersion } = versionStore();
     const { userId, organization } = getUserData();
 
@@ -93,9 +93,7 @@ const DuplicationControls3D = () => {
             if (!isPointerMoving && duplicatedObjects.length > 0 && event.button === 2) {
                 event.preventDefault();
                 clearSelection();
-                duplicatedObjects.forEach((obj: THREE.Object3D) => {
+                clearDuplication();
-                    removeAsset(obj.userData.modelUuid);
-                });
             }
             setKeyEvent("");
         };
@@ -130,9 +128,7 @@ const DuplicationControls3D = () => {
             if (keyCombination === "ESCAPE" && duplicatedObjects.length > 0) {
                 event.preventDefault();
                 clearSelection();
-                duplicatedObjects.forEach((obj: THREE.Object3D) => {
+                clearDuplication();
-                    removeAsset(obj.userData.modelUuid);
-                });
             }
         };
 
@@ -233,6 +229,12 @@ const DuplicationControls3D = () => {
         }
     }, [axisConstraint, camera, duplicatedObjects]);
 
+    const clearDuplication = useCallback(() => {
+        duplicatedObjects.forEach((obj: THREE.Object3D) => {
+            removeAsset(obj.userData.modelUuid);
+        });
+    }, [duplicatedObjects, removeAsset]);
+
     const duplicateSelection = useCallback(() => {
         if (selectedAssets.length > 0 && duplicatedObjects.length === 0) {
             const positions: Record<string, THREE.Vector3> = {};
@@ -564,6 +566,7 @@ const DuplicationControls3D = () => {
                         projectId,
                     };
 
+                    removeAssetFromScene(data.modelUuid, () => {
                         if (!builderSocket?.connected) {
                             // REST
 
@@ -614,6 +617,7 @@ const DuplicationControls3D = () => {
 
                             builderSocket.emit("v1:model-asset:duplicate", data);
                         }
+                    });
                 } else {
                     const data = {
                         organization,
@@ -630,6 +634,7 @@ const DuplicationControls3D = () => {
                         userId,
                     };
 
+                    removeAssetFromScene(data.modelUuid, () => {
                         if (!builderSocket?.connected) {
                             // REST
 
@@ -678,6 +683,7 @@ const DuplicationControls3D = () => {
 
                             builderSocket.emit("v1:model-asset:duplicate", data);
                         }
+                    });
                 }
 
                 assetsToDuplicate.push({

app/src/modules/scene/controls/selectionControls/selection3D/moveControls3D.tsx

@@ -221,6 +221,36 @@ function MoveControls3D({ boundingBoxRef }: any) {
         }, 50);
     }, [movedObjects, initialStates, updateAsset]);
 
+    const resetToInitialPosition = useCallback(
+        (modelUuid: string, callBack?: () => void) => {
+            setTimeout(() => {
+                const movedObject = movedObjects.find((obj: THREE.Object3D) => obj.userData.modelUuid === modelUuid);
+
+                if (!movedObject) return;
+
+                const initialState = initialStates[movedObject.uuid];
+                if (!initialState) return;
+
+                const positionArray: [number, number, number] = [initialState.position.x, initialState.position.y, initialState.position.z];
+
+                updateAsset(modelUuid, {
+                    position: positionArray,
+                    rotation: [initialState.rotation?.x || 0, initialState.rotation?.y || 0, initialState.rotation?.z || 0],
+                });
+
+                movedObject.position.copy(initialState.position);
+                if (initialState.rotation) {
+                    movedObject.rotation.copy(initialState.rotation);
+                }
+
+                setAxisConstraint(null);
+
+                if (callBack) callBack();
+            }, 50);
+        },
+        [movedObjects, initialStates, updateAsset]
+    );
+
     useEffect(() => {
         if (movedObjects.length > 0) {
             const intersectionPoint = new THREE.Vector3();
@@ -413,7 +443,7 @@ function MoveControls3D({ boundingBoxRef }: any) {
                         .then((data) => {
                             if (!data.message || !data.data) {
                                 echo.error(`Error moving asset: ${newFloorItem.modelUuid}`);
-                                resetToInitialPositions();
+                                resetToInitialPosition(newFloorItem.modelUuid);
                                 clearSelection();
                                 return;
                             }
@@ -437,13 +467,13 @@ function MoveControls3D({ boundingBoxRef }: any) {
                                 });
                             } else {
                                 echo.error(`Error moving asset: ${newFloorItem.modelUuid}`);
-                                resetToInitialPositions();
+                                resetToInitialPosition(newFloorItem.modelUuid);
                                 clearSelection();
                             }
                         })
                         .catch(() => {
                             echo.error(`Error moving asset: ${newFloorItem.modelUuid}`);
-                            resetToInitialPositions();
+                            resetToInitialPosition(newFloorItem.modelUuid);
                             clearSelection();
                         });
                 } else {

app/src/modules/scene/controls/selectionControls/selection3D/rotateControls3D.tsx

@@ -202,6 +202,34 @@ function RotateControls3D() {
         }, 50);
     }, [rotatedObjects, initialRotations, initialPositions, updateAsset]);
 
+    const resetToInitialRotation = useCallback(
+        (modelUuid: string) => {
+            setTimeout(() => {
+                const obj = rotatedObjects.find((o: THREE.Object3D) => o.userData.modelUuid === modelUuid);
+
+                if (!obj) return;
+
+                const uuid = obj.uuid;
+                const initialRotation = initialRotations[uuid];
+                const initialPosition = initialPositions[uuid];
+
+                if (initialRotation && initialPosition) {
+                    const rotationArray: [number, number, number] = [initialRotation.x, initialRotation.y, initialRotation.z];
+                    const positionArray: [number, number, number] = [initialPosition.x, initialPosition.y, initialPosition.z];
+
+                    updateAsset(modelUuid, {
+                        rotation: rotationArray,
+                        position: positionArray,
+                    });
+
+                    obj.rotation.copy(initialRotation);
+                    obj.position.copy(initialPosition);
+                }
+            }, 50);
+        },
+        [rotatedObjects, initialRotations, initialPositions, updateAsset]
+    );
+
     useFrame(() => {
         if (!isRotating || rotatedObjects.length === 0) return;