From 2397de99b4da3517cd2a70978ba5e7aaac082176 Mon Sep 17 00:00:00 2001 From: Gomathi9520 Date: Fri, 6 Jun 2025 11:51:41 +0530 Subject: [PATCH] Update zoneCameraUpdate function to include projectId and enhance logging --- .../sidebarRight/properties/ZoneProperties.tsx | 8 ++++++-- app/src/components/ui/list/List.tsx | 3 ++- .../modules/builder/asset/functions/addAssetModel.ts | 2 +- .../builder/geomentries/points/deletePoint.ts | 2 +- app/src/modules/builder/groups/zoneGroup.tsx | 2 +- app/src/modules/collaboration/camera/collabCams.tsx | 2 +- .../collaboration/socket/socketResponses.dev.tsx | 12 ++++++------ .../controls/selectionControls/copyPasteControls.tsx | 4 ++-- .../selectionControls/duplicationControls.tsx | 4 ++-- .../controls/selectionControls/moveControls.tsx | 2 +- .../controls/selectionControls/rotateControls.tsx | 2 +- .../controls/transformControls/transformControls.tsx | 2 +- .../services/visulization/zone/zoneCameraUpdation.ts | 9 ++++++--- 13 files changed, 31 insertions(+), 23 deletions(-) diff --git a/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx b/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx index 35f3bb5..2cad712 100644 --- a/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx +++ b/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx @@ -9,6 +9,7 @@ import { usezoneTarget, } from "../../../../store/builder/store"; import { zoneCameraUpdate } from "../../../../services/visulization/zone/zoneCameraUpdation"; +import { useParams } from "react-router-dom"; const ZoneProperties: React.FC = () => { const { Edit, setEdit } = useEditPosition(); @@ -16,6 +17,7 @@ const ZoneProperties: React.FC = () => { const { zonePosition, setZonePosition } = usezonePosition(); const { zoneTarget, setZoneTarget } = usezoneTarget(); const { zones, setZones } = useZones(); + const { projectId } = useParams() useEffect(() => { setZonePosition(selectedZone.zoneViewPortPosition); @@ -33,7 +35,8 @@ const ZoneProperties: React.FC = () => { viewPortCenter: zoneTarget, }; - let response = await zoneCameraUpdate(zonesdata, organization); + let response = await zoneCameraUpdate(zonesdata, organization,projectId); + console.log('response: ', response); if (response.message === "updated successfully") { setEdit(false); } else { @@ -56,7 +59,8 @@ const ZoneProperties: React.FC = () => { zoneName: newName, }; // Call your API to update the zone - let response = await zoneCameraUpdate(zonesdata, organization); + let response = await zoneCameraUpdate(zonesdata, organization,projectId); + console.log('response: ', response); // console.log("response: ", response); if (response.message === "updated successfully") { setZones((prevZones: any[]) => diff --git a/app/src/components/ui/list/List.tsx b/app/src/components/ui/list/List.tsx index a6aaa10..8136a18 100644 --- a/app/src/components/ui/list/List.tsx +++ b/app/src/components/ui/list/List.tsx @@ -125,7 +125,8 @@ const List: React.FC = ({ items = [], remove }) => { zoneName: newName, }; - const response = await zoneCameraUpdate(zonesdata, organization); + const response = await zoneCameraUpdate(zonesdata, organization,projectId); + console.log('response: ', response); if (response.message === "updated successfully") { setSelectedZone((prev) => ({ ...prev, zoneName: newName })); diff --git a/app/src/modules/builder/asset/functions/addAssetModel.ts b/app/src/modules/builder/asset/functions/addAssetModel.ts index c4812a0..1e57e07 100644 --- a/app/src/modules/builder/asset/functions/addAssetModel.ts +++ b/app/src/modules/builder/asset/functions/addAssetModel.ts @@ -467,7 +467,7 @@ async function handleModelLoad( userId: userId, }; - console.log('data: ', data); + // console.log('data: ', data); socket.emit("v1:model-asset:add", data); const asset = { diff --git a/app/src/modules/builder/geomentries/points/deletePoint.ts b/app/src/modules/builder/geomentries/points/deletePoint.ts index 5e51e7f..57916d4 100644 --- a/app/src/modules/builder/geomentries/points/deletePoint.ts +++ b/app/src/modules/builder/geomentries/points/deletePoint.ts @@ -45,7 +45,7 @@ function deletePoint( userId } - console.log('data: ', data); + // console.log('data: ', data); socket.emit('v1:Line:delete:point', data); ////////// Update onlyFloorlines.current to remove references to the deleted point ////////// diff --git a/app/src/modules/builder/groups/zoneGroup.tsx b/app/src/modules/builder/groups/zoneGroup.tsx index 34a8506..8ce7499 100644 --- a/app/src/modules/builder/groups/zoneGroup.tsx +++ b/app/src/modules/builder/groups/zoneGroup.tsx @@ -82,7 +82,7 @@ const ZoneGroup: React.FC = () => { const organization = email.split("@")[1].split(".")[0]; const data = await getZonesApi(organization, projectId); - console.log('data: ', data); + // console.log('data: ', data); if (data.length > 0) { const fetchedZones = data.map((zone: any) => ({ diff --git a/app/src/modules/collaboration/camera/collabCams.tsx b/app/src/modules/collaboration/camera/collabCams.tsx index 4987363..e1c6442 100644 --- a/app/src/modules/collaboration/camera/collabCams.tsx +++ b/app/src/modules/collaboration/camera/collabCams.tsx @@ -144,7 +144,7 @@ const CamModelsGroup = () => { }); socket.on("v1:camera:Response:update", (data: any) => { - console.log('data: ', data); + // console.log('data: ', data); if ( !groupRef.current || socket.id === data.socketId || diff --git a/app/src/modules/collaboration/socket/socketResponses.dev.tsx b/app/src/modules/collaboration/socket/socketResponses.dev.tsx index c59917c..79b9a56 100644 --- a/app/src/modules/collaboration/socket/socketResponses.dev.tsx +++ b/app/src/modules/collaboration/socket/socketResponses.dev.tsx @@ -173,7 +173,7 @@ export default function SocketResponses({ }); socket.on("v1:Line:response:update", (data: any) => { - console.log('data: ', data); + // console.log('data: ', data); if (socket.id === data.socketId) { return; } @@ -215,7 +215,7 @@ export default function SocketResponses({ }); socket.on("v1:Line:response:delete", (data: any) => { - console.log('data: ', data); + // console.log('data: ', data); if (socket.id === data.socketId) { return; } @@ -338,7 +338,7 @@ export default function SocketResponses({ }); socket.on("v1:Line:response:delete:layer", async (data: any) => { - console.log('data: ', data); + // console.log('data: ', data); if (socket.id === data.socketId) { return; } @@ -670,7 +670,7 @@ export default function SocketResponses({ const organization = email!.split("@")[1].split(".")[0]; socket.on("v1:Line:response:create", async (data: any) => { - console.log('data: ', data); + // console.log('data: ', data); // if (socket.id === data.socketId) { return; @@ -789,7 +789,7 @@ export default function SocketResponses({ const organization = email!.split("@")[1].split(".")[0]; socket.on("v1:zone:response:updates", (data: any) => { - console.log('data: ', data); + // console.log('data: ', data); if (socket.id === data.socketId) { return; } @@ -835,7 +835,7 @@ export default function SocketResponses({ }); socket.on("v1:zone:response:delete", (data: any) => { - console.log('data: ', data); + // console.log('data: ', data); if (socket.id === data.socketId) { return; } diff --git a/app/src/modules/scene/controls/selectionControls/copyPasteControls.tsx b/app/src/modules/scene/controls/selectionControls/copyPasteControls.tsx index 055acb4..1e30d10 100644 --- a/app/src/modules/scene/controls/selectionControls/copyPasteControls.tsx +++ b/app/src/modules/scene/controls/selectionControls/copyPasteControls.tsx @@ -363,7 +363,7 @@ const CopyPasteControls = ({ projectId }; - console.log('data: ', data); + // console.log('data: ', data); socket.emit("v1:model-asset:add", data); obj.userData = { @@ -419,7 +419,7 @@ const CopyPasteControls = ({ userId }; - console.log('data: ', data); + // console.log('data: ', data); socket.emit("v1:model-asset:add", data); const asset: Asset = { diff --git a/app/src/modules/scene/controls/selectionControls/duplicationControls.tsx b/app/src/modules/scene/controls/selectionControls/duplicationControls.tsx index 6009375..8ef9e24 100644 --- a/app/src/modules/scene/controls/selectionControls/duplicationControls.tsx +++ b/app/src/modules/scene/controls/selectionControls/duplicationControls.tsx @@ -338,7 +338,7 @@ const DuplicationControls = ({ userId }; - console.log('data: ', data); + // console.log('data: ', data); socket.emit("v1:model-asset:add", data); const asset: Asset = { @@ -388,7 +388,7 @@ const DuplicationControls = ({ projectId }; - console.log('data: ', data); + // console.log('data: ', data);/ socket.emit("v1:model-asset:add", data); const asset: Asset = { diff --git a/app/src/modules/scene/controls/selectionControls/moveControls.tsx b/app/src/modules/scene/controls/selectionControls/moveControls.tsx index 6df433a..208512d 100644 --- a/app/src/modules/scene/controls/selectionControls/moveControls.tsx +++ b/app/src/modules/scene/controls/selectionControls/moveControls.tsx @@ -318,7 +318,7 @@ function MoveControls({ userId }; - console.log('data: ', data); + // console.log('data: ', data); socket.emit("v1:model-asset:add", data); AssetGroup.current.add(obj); diff --git a/app/src/modules/scene/controls/selectionControls/rotateControls.tsx b/app/src/modules/scene/controls/selectionControls/rotateControls.tsx index 16adc1a..a13ea4f 100644 --- a/app/src/modules/scene/controls/selectionControls/rotateControls.tsx +++ b/app/src/modules/scene/controls/selectionControls/rotateControls.tsx @@ -273,7 +273,7 @@ function RotateControls({ userId }; - console.log('data: ', data); + // console.log('data: ', data); socket.emit("v1:model-asset:add", data); AssetGroup.current.add(obj); diff --git a/app/src/modules/scene/controls/transformControls/transformControls.tsx b/app/src/modules/scene/controls/transformControls/transformControls.tsx index d988433..52b942a 100644 --- a/app/src/modules/scene/controls/transformControls/transformControls.tsx +++ b/app/src/modules/scene/controls/transformControls/transformControls.tsx @@ -135,7 +135,7 @@ export default function TransformControl() { projectId }; - console.log('data: ', data); + // console.log('data: ', data); socket.emit("v1:model-asset:add", data); } } diff --git a/app/src/services/visulization/zone/zoneCameraUpdation.ts b/app/src/services/visulization/zone/zoneCameraUpdation.ts index 9307e42..df79c74 100644 --- a/app/src/services/visulization/zone/zoneCameraUpdation.ts +++ b/app/src/services/visulization/zone/zoneCameraUpdation.ts @@ -1,17 +1,20 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`; // let url_Backend_dwinzo = `http://192.168.0.102:5000`; -export const zoneCameraUpdate = async (zonesdata: {}, organization: string) => { +export const zoneCameraUpdate = async (zoneData: {}, organization: string, projectId?: string) => { + console.log('projectId: ', projectId); + console.log('organization: ', organization); + console.log('zonesdata: ', zoneData); try { const response = await fetch(`${url_Backend_dwinzo}/api/V1/zones`, { method: "POST", - headers: { + headers: { Authorization: "Bearer ", // Replace with actual token "Content-Type": "application/json", token: localStorage.getItem("token") || "", // Coerce null to empty string refresh_token: localStorage.getItem("refreshToken") || "", }, - body: JSON.stringify({ zonesdata, organization }), + body: JSON.stringify({ zoneData,projectId }), }); if (!response.ok) {