Merge remote-tracking branch 'origin/main-demo' into main-dev

app/src/modules/builder/asset/models/model/eventHandlers/useEventHandlers.ts

@@ -3,7 +3,7 @@ import { CameraControls } from '@react-three/drei';
 import { ThreeEvent, useThree } from '@react-three/fiber';
 import { useCallback, useEffect, useRef } from 'react';
 
-import { useActiveTool, useDeletableFloorItem, useSelectedFloorItem, useToggleView, useZoneAssetId } from '../../../../../../store/builder/store';
+import { useActiveTool, useDeletableFloorItem, useResourceManagementId, useSelectedFloorItem, useToggleView, useZoneAssetId } from '../../../../../../store/builder/store';
 import useModuleStore, { useSubModuleStore } from '../../../../../../store/useModuleStore';
 import { useSocketStore } from '../../../../../../store/builder/store';
 import { useSceneContext } from '../../../../../scene/sceneContext';
@@ -36,6 +36,7 @@ export function useModelEventHandlers({
     const { push3D } = undoRedo3DStore();
     const { getAssetById, removeAsset } = assetStore();
     const { zoneAssetId, setZoneAssetId } = useZoneAssetId();
+    const { resourceManagementId, setResourceManagementId } = useResourceManagementId();
     const { removeEvent, getEventByModelUuid } = eventStore();
     const { getIsEventInProduct, addPoint, deleteEvent } = productStore();
     const { setSelectedAsset, clearSelectedAsset } = useSelectedAsset();
@@ -74,7 +75,17 @@ export function useModelEventHandlers({
         if (zoneAssetId.id === asset.modelUuid) {
             handleDblClick(asset);
         }
+
     }, [zoneAssetId])
+    useEffect(() => {
+        if (!resourceManagementId) return
+        if (resourceManagementId === asset.modelUuid) {
+            
+            
+            handleDblClick(asset);
+        }
+
+    }, [resourceManagementId])
 
     useEffect(() => {
         if (!selectedFloorItem) {
@@ -83,10 +94,8 @@ export function useModelEventHandlers({
     }, [selectedFloorItem])
 
     const handleDblClick = (asset: Asset) => {
-        if (asset && activeTool === "cursor" && boundingBox && groupRef.current && activeModule === 'builder') {
-
+        if (asset && activeTool === "cursor" && boundingBox && groupRef.current && (activeModule === 'builder' || (activeModule === 'simulation' && resourceManagementId))) {
             const frontView = false;
-
             if (frontView) {
                 const size = boundingBox.getSize(new THREE.Vector3());
                 const center = boundingBox.getCenter(new THREE.Vector3());
@@ -107,6 +116,7 @@ export function useModelEventHandlers({
                     paddingBottom: 5,
                     paddingRight: 5,
                 });
+
             } else {
 
                 const collisionPos = new THREE.Vector3();
@@ -127,6 +137,7 @@ export function useModelEventHandlers({
             }
 
             setSelectedFloorItem(groupRef.current);
+            setResourceManagementId("");
         }
     };
 

app/src/modules/builder/builder.tsx

@@ -57,6 +57,7 @@ export default function Builder() {
     const { setHoveredPoint, setHoveredLine } = useBuilderStore();
     const { userId, organization } = getUserData();
 
+
     useEffect(() => {
         if (!toggleView) {
             setHoveredLine(null);