From cf4c026d79db84103e200ebb3427e83191b0bdb8 Mon Sep 17 00:00:00 2001 From: Vishnu Date: Fri, 4 Apr 2025 13:42:46 +0530 Subject: [PATCH 1/2] update asset library URL, fix dropdown item comment, and adjust line color based on theme --- app/.env | 2 +- app/src/components/layout/sidebarLeft/Outline.tsx | 2 +- .../modules/scene/controls/selection/boundingBoxHelper.tsx | 4 +++- app/src/modules/scene/controls/selection/moveControls.tsx | 2 +- app/src/modules/scene/controls/selection/rotateControls.tsx | 2 +- .../services/factoryBuilder/assest/assets/getCategoryAsset.ts | 3 +-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/.env b/app/.env index 5740621..c50d174 100644 --- a/app/.env +++ b/app/.env @@ -11,7 +11,7 @@ REACT_APP_SERVER_REST_API_BASE_URL=185.100.212.76:5000 REACT_APP_SERVER_MARKETPLACE_URL=185.100.212.76:50011 # Base URL for the asset library server, used for asset library images and model blob id. -REACT_APP_SERVER_ASSET_LIBRARY_URL=192.168.0.111:3501 +REACT_APP_SERVER_ASSET_LIBRARY_URL=185.100.212.76:50011 # base url for IoT socket server REACT_APP_IOT_SOCKET_SERVER_URL =185.100.212.76:5010 diff --git a/app/src/components/layout/sidebarLeft/Outline.tsx b/app/src/components/layout/sidebarLeft/Outline.tsx index bad3b59..b7d5803 100644 --- a/app/src/components/layout/sidebarLeft/Outline.tsx +++ b/app/src/components/layout/sidebarLeft/Outline.tsx @@ -12,7 +12,7 @@ const Outline: React.FC = () => { const dropdownItems = [ { id: "1", name: "Ground Floor" }, - { id: "2", name: "Floor 1" }, + // { id: "2", name: "Floor 1" }, ]; // Example dropdown items return ( diff --git a/app/src/modules/scene/controls/selection/boundingBoxHelper.tsx b/app/src/modules/scene/controls/selection/boundingBoxHelper.tsx index ebc3761..dd9d251 100644 --- a/app/src/modules/scene/controls/selection/boundingBoxHelper.tsx +++ b/app/src/modules/scene/controls/selection/boundingBoxHelper.tsx @@ -44,11 +44,13 @@ const BoundingBox = ({ boundingBoxRef }: any) => { }; }, [selectedAssets]); + const savedTheme: string | null = localStorage.getItem("theme") || "light"; + return ( <> {points.length > 0 && ( <> - + diff --git a/app/src/modules/scene/controls/selection/moveControls.tsx b/app/src/modules/scene/controls/selection/moveControls.tsx index 350b487..bd55c95 100644 --- a/app/src/modules/scene/controls/selection/moveControls.tsx +++ b/app/src/modules/scene/controls/selection/moveControls.tsx @@ -238,7 +238,7 @@ function MoveControls({ movedObjects, setMovedObjects, itemsGroupRef, copiedObje return updatedEvents; }); - // socket.emit("v2:model-asset:add", data); + socket.emit("v2:model-asset:add", data); } } else { diff --git a/app/src/modules/scene/controls/selection/rotateControls.tsx b/app/src/modules/scene/controls/selection/rotateControls.tsx index 6ad8309..1489651 100644 --- a/app/src/modules/scene/controls/selection/rotateControls.tsx +++ b/app/src/modules/scene/controls/selection/rotateControls.tsx @@ -241,7 +241,7 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo return updatedEvents; }); - // socket.emit("v2:model-asset:add", data); + socket.emit("v2:model-asset:add", data); } } else { diff --git a/app/src/services/factoryBuilder/assest/assets/getCategoryAsset.ts b/app/src/services/factoryBuilder/assest/assets/getCategoryAsset.ts index a1ac727..7c422df 100644 --- a/app/src/services/factoryBuilder/assest/assets/getCategoryAsset.ts +++ b/app/src/services/factoryBuilder/assest/assets/getCategoryAsset.ts @@ -1,8 +1,7 @@ let BackEnd_url = `http://${process.env.REACT_APP_SERVER_ASSET_LIBRARY_URL}`; export const getCategoryAsset = async (categoryName: any) => { try { - const response = await fetch( - `${BackEnd_url}/api/v2/getCatagoryAssets/${categoryName}`, + const response = await fetch(`${BackEnd_url}/api/v2/getCategoryAssets/${categoryName}`, { method: "GET", headers: { From 7060744ee11381dccc3b014aefe871da7f2a0bbc Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Mon, 7 Apr 2025 10:04:44 +0530 Subject: [PATCH 2/2] feat: Add modeluuid assignment to userData in copy and duplication controls; log eventData and newEventData for debugging --- app/src/modules/scene/controls/selection/copyPasteControls.tsx | 1 + .../modules/scene/controls/selection/duplicationControls.tsx | 1 + app/src/modules/scene/controls/selection/rotateControls.tsx | 2 ++ 3 files changed, 4 insertions(+) diff --git a/app/src/modules/scene/controls/selection/copyPasteControls.tsx b/app/src/modules/scene/controls/selection/copyPasteControls.tsx index 44dc2bf..7b494cd 100644 --- a/app/src/modules/scene/controls/selection/copyPasteControls.tsx +++ b/app/src/modules/scene/controls/selection/copyPasteControls.tsx @@ -354,6 +354,7 @@ const CopyPasteControls = ({ itemsGroupRef, copiedObjects, setCopiedObjects, pas } + obj.userData.modeluuid = newFloorItem.modeluuid; itemsGroupRef.current.add(obj); } }); diff --git a/app/src/modules/scene/controls/selection/duplicationControls.tsx b/app/src/modules/scene/controls/selection/duplicationControls.tsx index 0c22f60..852b541 100644 --- a/app/src/modules/scene/controls/selection/duplicationControls.tsx +++ b/app/src/modules/scene/controls/selection/duplicationControls.tsx @@ -336,6 +336,7 @@ const DuplicationControls = ({ itemsGroupRef, duplicatedObjects, setDuplicatedOb } + obj.userData.modeluuid = newFloorItem.modeluuid; itemsGroupRef.current.add(obj); } }); diff --git a/app/src/modules/scene/controls/selection/rotateControls.tsx b/app/src/modules/scene/controls/selection/rotateControls.tsx index bff9fd6..020705d 100644 --- a/app/src/modules/scene/controls/selection/rotateControls.tsx +++ b/app/src/modules/scene/controls/selection/rotateControls.tsx @@ -185,6 +185,7 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo }); let eventData: Types.ConveyorEventsSchema | Types.VehicleEventsSchema | Types.StaticMachineEventsSchema | undefined = simulationStates.find((events) => events.modeluuid === obj.userData.modeluuid); + console.log('eventData: ', eventData); const email = localStorage.getItem("email"); const organization = email ? email.split("@")[1].split(".")[0] : "default"; @@ -232,6 +233,7 @@ function RotateControls({ rotatedObjects, setRotatedObjects, movedObjects, setMo newEventData.modelName = newFloorItem.modelname; newEventData.position = newFloorItem.position; newEventData.rotation = [obj.rotation.x, obj.rotation.y, obj.rotation.z]; + console.log('newEventData: ', newEventData); setSimulationStates((prevEvents: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema | Types.StaticMachineEventsSchema)[]) => { const updatedEvents = (prevEvents || []).map(event =>