diff --git a/app/src/components/layout/scenes/MainScene.tsx b/app/src/components/layout/scenes/MainScene.tsx index d078765..e283986 100644 --- a/app/src/components/layout/scenes/MainScene.tsx +++ b/app/src/components/layout/scenes/MainScene.tsx @@ -59,7 +59,7 @@ function MainScene() { const { setFloatingWidget } = useFloatingWidget(); const { clearComparisonProduct } = useComparisonProduct(); const { selectedFloorItem, setSelectedFloorItem } = useSelectedFloorItem(); - const { selectedAssets } = useSelectedAssets(); + const { selectedAssets,setSelectedAssets } = useSelectedAssets(); const { assetStore, productStore } = useSceneContext(); const { products } = productStore(); const { setName } = assetStore(); @@ -100,10 +100,14 @@ function MainScene() { const handleObjectRename = async (newName: string) => { if (!projectId) return if (selectedFloorItem) { + console.log('selectedFloorItem.userData.modelUuid: ', selectedFloorItem.userData.modelUuid); + console.log(' newName: ', newName); + console.log('projectId: ', projectId); setAssetsApi({ modelUuid: selectedFloorItem.userData.modelUuid, modelName: newName, - projectId + projectId, + versionId: selectedVersion?.versionId || '' }).then(() => { selectedFloorItem.userData = { ...selectedFloorItem.userData, @@ -117,13 +121,14 @@ function MainScene() { setAssetsApi({ modelUuid: selectedAssets[0].userData.modelUuid, modelName: newName, - projectId + projectId, + versionId: selectedVersion?.versionId || '' }).then(() => { selectedAssets[0].userData = { ...selectedAssets[0].userData, modelName: newName }; - setAssetsApi(selectedAssets); + setSelectedAssets(selectedAssets); setIsRenameMode(false); setName(selectedAssets[0].userData.modelUuid, newName); }) diff --git a/app/src/components/layout/sidebarLeft/Outline.tsx b/app/src/components/layout/sidebarLeft/Outline.tsx index c459925..c23e77c 100644 --- a/app/src/components/layout/sidebarLeft/Outline.tsx +++ b/app/src/components/layout/sidebarLeft/Outline.tsx @@ -24,12 +24,11 @@ const Outline: React.FC = () => { useEffect(() => { const updatedZoneList: ZoneData[] = zones?.map((zone: any) => { - const polygon2D = zone.points.map((p: [number, number, number]) => [p[0], p[2],]); - + const polygon2D = zone.points.map((p: any) => [p.position[0], p.position[2]]); const assetsInZone = assets.filter((item: any) => { - const [x, , z] = item.position; - return isPointInsidePolygon([x, z], polygon2D as [number, number][]); - }) + const [x, , z] = item.position; + return isPointInsidePolygon([x, z], polygon2D as [number, number][]); + }) .map((item: any) => ({ id: item.modelUuid, name: item.modelName, @@ -37,6 +36,7 @@ const Outline: React.FC = () => { rotation: item.rotation, })); + return { id: zone.zoneUuid, name: zone.zoneName, diff --git a/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx b/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx index 4247316..32bec03 100644 --- a/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx +++ b/app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx @@ -42,11 +42,11 @@ const ZoneProperties: React.FC = () => { let response = await zoneCameraUpdate(zonesdata, organization, projectId, selectedVersion?.versionId || ""); - // console.log('response: ', response); + // if (response.message === "zone updated") { setEdit(false); } else { - // console.log(response); + // } } catch (error) { echo.error("Failed to set zone view"); @@ -75,7 +75,7 @@ const ZoneProperties: React.FC = () => { // ) // ); } else { - // console.log(response?.message); + // } } function handleVectorChange( @@ -85,7 +85,7 @@ const ZoneProperties: React.FC = () => { setSelectedZone((prev) => ({ ...prev, [key]: newValue })); } const checkZoneNameDuplicate = (name: string) => { - console.log('zones: ', zones); + return zones.some( (zone: any) => zone.zoneName?.trim().toLowerCase() === name?.trim().toLowerCase() && diff --git a/app/src/components/ui/list/List.tsx b/app/src/components/ui/list/List.tsx index fc0f5ec..3831e54 100644 --- a/app/src/components/ui/list/List.tsx +++ b/app/src/components/ui/list/List.tsx @@ -136,7 +136,6 @@ const List: React.FC = ({ items = [], remove }) => { } async function handleZoneAssetName(newName: string) { - if (zoneAssetId?.id) { let response = await setAssetsApi({ modelUuid: zoneAssetId.id,