From 58d82da349a592d638a356dba07c8f2900bb4128 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Sat, 5 Apr 2025 16:15:11 +0530 Subject: [PATCH] refactor: Simplify eventData structure in controls and remove console logs from simulation --- .../scene/IntialLoad/loadInitialFloorItems.ts | 3 --- .../scene/controls/selection/copyPasteControls.tsx | 9 ++++----- .../controls/selection/duplicationControls.tsx | 11 +++++------ .../scene/controls/selection/moveControls.tsx | 12 ++++++------ .../scene/controls/selection/rotateControls.tsx | 13 ++++++------- app/src/modules/simulation/simulation.tsx | 2 +- 6 files changed, 22 insertions(+), 28 deletions(-) diff --git a/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts b/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts index b1d8370..ec6033b 100644 --- a/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts +++ b/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts @@ -245,9 +245,6 @@ function processEventData(item: Types.EventData, setSimulationStates: any) { }, position: item.position }; - - console.log(staticMachine); - setSimulationStates((prevEvents: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema | Types.StaticMachineEventsSchema)[]) => [ ...(prevEvents || []), diff --git a/app/src/modules/scene/controls/selection/copyPasteControls.tsx b/app/src/modules/scene/controls/selection/copyPasteControls.tsx index 8a8c84c..44dc2bf 100644 --- a/app/src/modules/scene/controls/selection/copyPasteControls.tsx +++ b/app/src/modules/scene/controls/selection/copyPasteControls.tsx @@ -224,11 +224,11 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; @@ -277,7 +277,6 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas const backendEventData = { type: 'Vehicle', points: createVehiclePoint(), - speed: (eventData as Types.VehicleEventsSchema)?.points.speed }; // API @@ -305,11 +304,11 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; diff --git a/app/src/modules/scene/controls/selection/duplicationControls.tsx b/app/src/modules/scene/controls/selection/duplicationControls.tsx index 96bd9e2..0c22f60 100644 --- a/app/src/modules/scene/controls/selection/duplicationControls.tsx +++ b/app/src/modules/scene/controls/selection/duplicationControls.tsx @@ -206,11 +206,11 @@ const DuplicationControls = ({ itemsGroupRef, duplicatedObjects, setDuplicatedOb rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; @@ -221,8 +221,7 @@ const DuplicationControls = ({ itemsGroupRef, duplicatedObjects, setDuplicatedOb newEventData as Types.ConveyorEventsSchema ]); - console.log('data: ', data); - // socket.emit("v2:model-asset:add", data); + socket.emit("v2:model-asset:add", data); } else if (eventData.type === 'Vehicle' && eventData) { const createVehiclePoint = () => { @@ -287,11 +286,11 @@ const DuplicationControls = ({ itemsGroupRef, duplicatedObjects, setDuplicatedOb rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; diff --git a/app/src/modules/scene/controls/selection/moveControls.tsx b/app/src/modules/scene/controls/selection/moveControls.tsx index 9871811..2693531 100644 --- a/app/src/modules/scene/controls/selection/moveControls.tsx +++ b/app/src/modules/scene/controls/selection/moveControls.tsx @@ -205,7 +205,7 @@ function MoveControls({ movedObjects, setMovedObjects, itemsGroupRef, copiedObje // obj.userData.modelId, // false, // true, - // backendEventData + // { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed } // ); //SOCKET @@ -219,11 +219,11 @@ function MoveControls({ movedObjects, setMovedObjects, itemsGroupRef, copiedObje rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; @@ -257,7 +257,7 @@ function MoveControls({ movedObjects, setMovedObjects, itemsGroupRef, copiedObje // { "x": obj.rotation.x, "y": obj.rotation.y, "z": obj.rotation.z }, // false, // true, - // backendEventData + // { type: backendEventData.type, points: backendEventData.points } // ); //SOCKET @@ -271,11 +271,11 @@ function MoveControls({ movedObjects, setMovedObjects, itemsGroupRef, copiedObje rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; diff --git a/app/src/modules/scene/controls/selection/rotateControls.tsx b/app/src/modules/scene/controls/selection/rotateControls.tsx index 04a9cd8..bff9fd6 100644 --- a/app/src/modules/scene/controls/selection/rotateControls.tsx +++ b/app/src/modules/scene/controls/selection/rotateControls.tsx @@ -209,7 +209,7 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo // { "x": obj.rotation.x, "y": obj.rotation.y, "z": obj.rotation.z }, // false, // true, - // backendEventData + // { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed } // ); //SOCKET @@ -223,11 +223,11 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points, speed: backendEventData.speed }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; @@ -262,7 +262,7 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo // { "x": obj.rotation.x, "y": obj.rotation.y, "z": obj.rotation.z }, // false, // true, - // backendEventData + // { type: backendEventData.type, points: backendEventData.points } // ); //SOCKET @@ -276,11 +276,11 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z }, isLocked: false, isVisible: true, - eventData: backendEventData, + eventData: { type: backendEventData.type, points: backendEventData.points }, socketId: socket.id, }; - const newEventData: any = backendEventData; + const newEventData: any = { type: backendEventData.type, points: backendEventData.points }; newEventData.modeluuid = newFloorItem.modeluuid; newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; @@ -298,7 +298,6 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo } } else { -console.log('hii'); //REST diff --git a/app/src/modules/simulation/simulation.tsx b/app/src/modules/simulation/simulation.tsx index fad837a..98fd3dd 100644 --- a/app/src/modules/simulation/simulation.tsx +++ b/app/src/modules/simulation/simulation.tsx @@ -19,7 +19,7 @@ function Simulation() { const [processes, setProcesses] = useState([]); useEffect(() => { - console.log('simulationStates: ', simulationStates); + // console.log('simulationStates: ', simulationStates); }, [simulationStates]); // useEffect(() => {