Refactor asset handling in MainScene and improve zone data processing in Outline; clean up console logs in ZoneProperties and List components

This commit is contained in:
2025-08-13 17:54:04 +05:30
parent 4d97bc1ef7
commit 79b11ad2ca
4 changed files with 18 additions and 14 deletions

View File

@@ -59,7 +59,7 @@ function MainScene() {
const { setFloatingWidget } = useFloatingWidget(); const { setFloatingWidget } = useFloatingWidget();
const { clearComparisonProduct } = useComparisonProduct(); const { clearComparisonProduct } = useComparisonProduct();
const { selectedFloorItem, setSelectedFloorItem } = useSelectedFloorItem(); const { selectedFloorItem, setSelectedFloorItem } = useSelectedFloorItem();
const { selectedAssets } = useSelectedAssets(); const { selectedAssets,setSelectedAssets } = useSelectedAssets();
const { assetStore, productStore } = useSceneContext(); const { assetStore, productStore } = useSceneContext();
const { products } = productStore(); const { products } = productStore();
const { setName } = assetStore(); const { setName } = assetStore();
@@ -100,10 +100,14 @@ function MainScene() {
const handleObjectRename = async (newName: string) => { const handleObjectRename = async (newName: string) => {
if (!projectId) return if (!projectId) return
if (selectedFloorItem) { if (selectedFloorItem) {
console.log('selectedFloorItem.userData.modelUuid: ', selectedFloorItem.userData.modelUuid);
console.log(' newName: ', newName);
console.log('projectId: ', projectId);
setAssetsApi({ setAssetsApi({
modelUuid: selectedFloorItem.userData.modelUuid, modelUuid: selectedFloorItem.userData.modelUuid,
modelName: newName, modelName: newName,
projectId projectId,
versionId: selectedVersion?.versionId || ''
}).then(() => { }).then(() => {
selectedFloorItem.userData = { selectedFloorItem.userData = {
...selectedFloorItem.userData, ...selectedFloorItem.userData,
@@ -117,13 +121,14 @@ function MainScene() {
setAssetsApi({ setAssetsApi({
modelUuid: selectedAssets[0].userData.modelUuid, modelUuid: selectedAssets[0].userData.modelUuid,
modelName: newName, modelName: newName,
projectId projectId,
versionId: selectedVersion?.versionId || ''
}).then(() => { }).then(() => {
selectedAssets[0].userData = { selectedAssets[0].userData = {
...selectedAssets[0].userData, ...selectedAssets[0].userData,
modelName: newName modelName: newName
}; };
setAssetsApi(selectedAssets); setSelectedAssets(selectedAssets);
setIsRenameMode(false); setIsRenameMode(false);
setName(selectedAssets[0].userData.modelUuid, newName); setName(selectedAssets[0].userData.modelUuid, newName);
}) })

View File

@@ -24,8 +24,7 @@ const Outline: React.FC = () => {
useEffect(() => { useEffect(() => {
const updatedZoneList: ZoneData[] = zones?.map((zone: any) => { 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 assetsInZone = assets.filter((item: any) => {
const [x, , z] = item.position; const [x, , z] = item.position;
return isPointInsidePolygon([x, z], polygon2D as [number, number][]); return isPointInsidePolygon([x, z], polygon2D as [number, number][]);
@@ -37,6 +36,7 @@ const Outline: React.FC = () => {
rotation: item.rotation, rotation: item.rotation,
})); }));
return { return {
id: zone.zoneUuid, id: zone.zoneUuid,
name: zone.zoneName, name: zone.zoneName,

View File

@@ -42,11 +42,11 @@ const ZoneProperties: React.FC = () => {
let response = await zoneCameraUpdate(zonesdata, organization, projectId, selectedVersion?.versionId || ""); let response = await zoneCameraUpdate(zonesdata, organization, projectId, selectedVersion?.versionId || "");
// console.log('response: ', response); //
if (response.message === "zone updated") { if (response.message === "zone updated") {
setEdit(false); setEdit(false);
} else { } else {
// console.log(response); //
} }
} catch (error) { } catch (error) {
echo.error("Failed to set zone view"); echo.error("Failed to set zone view");
@@ -75,7 +75,7 @@ const ZoneProperties: React.FC = () => {
// ) // )
// ); // );
} else { } else {
// console.log(response?.message); //
} }
} }
function handleVectorChange( function handleVectorChange(
@@ -85,7 +85,7 @@ const ZoneProperties: React.FC = () => {
setSelectedZone((prev) => ({ ...prev, [key]: newValue })); setSelectedZone((prev) => ({ ...prev, [key]: newValue }));
} }
const checkZoneNameDuplicate = (name: string) => { const checkZoneNameDuplicate = (name: string) => {
console.log('zones: ', zones);
return zones.some( return zones.some(
(zone: any) => (zone: any) =>
zone.zoneName?.trim().toLowerCase() === name?.trim().toLowerCase() && zone.zoneName?.trim().toLowerCase() === name?.trim().toLowerCase() &&

View File

@@ -136,7 +136,6 @@ const List: React.FC<ListProps> = ({ items = [], remove }) => {
} }
async function handleZoneAssetName(newName: string) { async function handleZoneAssetName(newName: string) {
if (zoneAssetId?.id) { if (zoneAssetId?.id) {
let response = await setAssetsApi({ let response = await setAssetsApi({
modelUuid: zoneAssetId.id, modelUuid: zoneAssetId.id,