Dwinzo-Beta
/
Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Update zone update response message and clean up code formatting

This commit is contained in:
Jerald-Golden-B 2025-06-10 15:04:33 +05:30
parent 6c8eb7d2f3
commit de4688f201
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx
View File

@ -37,7 +37,7 @@ const ZoneProperties: React.FC = () => {
let response = await zoneCameraUpdate(zonesdata, organization,projectId); let response = await zoneCameraUpdate(zonesdata, organization,projectId);
console.log('response: ', response); console.log('response: ', response);
if (response.message === "updated successfully") { if (response.message === "zone updated") {
setEdit(false); setEdit(false);
} else { } else {
// console.log(response); // console.log(response);
@ -62,7 +62,7 @@ const ZoneProperties: React.FC = () => {
let response = await zoneCameraUpdate(zonesdata, organization,projectId); let response = await zoneCameraUpdate(zonesdata, organization,projectId);
console.log('response: ', response); console.log('response: ', response);
// console.log("response: ", response); // console.log("response: ", response);
if (response.message === "updated successfully") { if (response.message === "zone updated") {
setZones((prevZones: any[]) => setZones((prevZones: any[]) =>
prevZones.map((zone) => prevZones.map((zone) =>
zone.zoneUuid === selectedZone.zoneUuid zone.zoneUuid === selectedZone.zoneUuid

5
app/src/components/ui/list/List.tsx
View File

@ -125,9 +125,8 @@ const List: React.FC<ListProps> = ({ items = [], remove }) => {
zoneName: newName, zoneName: newName,
}; };
const response = await zoneCameraUpdate(zonesdata, organization,projectId); const response = await zoneCameraUpdate(zonesdata, organization, projectId);
console.log('response: ', response); if (response.message === "zone updated") {
if (response.message === "updated successfully") {
setSelectedZone((prev) => ({ ...prev, zoneName: newName })); setSelectedZone((prev) => ({ ...prev, zoneName: newName }));
setZones((prevZones: any[]) => setZones((prevZones: any[]) =>

2
app/src/modules/builder/asset/assetsGroup.tsx
View File

@ -176,7 +176,7 @@ function AssetsGroup({ floorGroup, plane }: { readonly floorGroup: RefGroup, rea
actionName: "Action 1", actionName: "Action 1",
actionType: "process", actionType: "process",
processTime: 10, processTime: 10,
swapMaterial: "material-id", swapMaterial: "Default Material",
triggers: [] triggers: []
} }
} }

10
app/src/modules/builder/asset/models/model/model.tsx
View File

@ -36,7 +36,7 @@ function Model({ asset }: { readonly asset: Asset }) {
const { renderDistance } = useRenderDistance(); const { renderDistance } = useRenderDistance();
const [isRendered, setIsRendered] = useState(false); const [isRendered, setIsRendered] = useState(false);
const url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`; const url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
const [gltfScene, setGltfScene] = useState<GLTF | null>(null); const [gltfScene, setGltfScene] = useState<GLTF["scene"] | null>(null);
const [boundingBox, setBoundingBox] = useState<THREE.Box3 | null>(null); const [boundingBox, setBoundingBox] = useState<THREE.Box3 | null>(null);
const groupRef = useRef<THREE.Group>(null); const groupRef = useRef<THREE.Group>(null);
const { projectId } = useParams(); const { projectId } = useParams();
@ -53,7 +53,7 @@ function Model({ asset }: { readonly asset: Asset }) {
const assetId = asset.assetId; const assetId = asset.assetId;
const cachedModel = THREE.Cache.get(assetId); const cachedModel = THREE.Cache.get(assetId);
if (cachedModel) { if (cachedModel) {
setGltfScene(cachedModel); setGltfScene(cachedModel.scene.clone());
calculateBoundingBox(cachedModel.scene); calculateBoundingBox(cachedModel.scene);
return; return;
} }
@ -66,7 +66,7 @@ function Model({ asset }: { readonly asset: Asset }) {
URL.revokeObjectURL(blobUrl); URL.revokeObjectURL(blobUrl);
THREE.Cache.remove(blobUrl); THREE.Cache.remove(blobUrl);
THREE.Cache.add(assetId, gltf); THREE.Cache.add(assetId, gltf);
setGltfScene(gltf); setGltfScene(gltf.scene.clone());
calculateBoundingBox(gltf.scene); calculateBoundingBox(gltf.scene);
}, },
undefined, undefined,
@ -86,7 +86,7 @@ function Model({ asset }: { readonly asset: Asset }) {
const modelBlob = await response.blob(); const modelBlob = await response.blob();
await storeGLTF(assetId, modelBlob); await storeGLTF(assetId, modelBlob);
THREE.Cache.add(assetId, gltf); THREE.Cache.add(assetId, gltf);
setGltfScene(gltf); setGltfScene(gltf.scene.clone());
calculateBoundingBox(gltf.scene); calculateBoundingBox(gltf.scene);
} catch (error) { } catch (error) {
console.error(`[Backend] Error storing/loading ${asset.modelName}:`, error); console.error(`[Backend] Error storing/loading ${asset.modelName}:`, error);
@ -285,7 +285,7 @@ function Model({ asset }: { readonly asset: Asset }) {
> >
{gltfScene && ( {gltfScene && (
isRendered ? ( isRendered ? (
<primitive object={gltfScene.scene.clone()} /> <primitive object={gltfScene} />
) : ( ) : (
<AssetBoundingBox boundingBox={boundingBox} /> <AssetBoundingBox boundingBox={boundingBox} />
) )

4
app/src/modules/simulation/vehicle/instances/vehicleInstances.tsx
View File

@ -5,8 +5,8 @@ import { useSceneContext } from "../../../scene/sceneContext";
import { useViewSceneStore } from "../../../../store/builder/store"; import { useViewSceneStore } from "../../../../store/builder/store";
function VehicleInstances() { function VehicleInstances() {
const { vehicleStore } = useSceneContext(); const { vehicleStore } = useSceneContext();
const { vehicles } = vehicleStore(); const { vehicles } = vehicleStore();
const { viewSceneLabels } = useViewSceneStore(); const { viewSceneLabels } = useViewSceneStore();
return ( return (

2
app/src/services/visulization/zone/zoneCameraUpdation.ts
View File

@ -11,7 +11,7 @@ export const zoneCameraUpdate = async (zoneData: {}, organization: string, proje
token: localStorage.getItem("token") || "", token: localStorage.getItem("token") || "",
refresh_token: localStorage.getItem("refreshToken") || "", refresh_token: localStorage.getItem("refreshToken") || "",
}, },
body: JSON.stringify({ zoneData,projectId }), body: JSON.stringify({ zoneData, projectId }),
}); });
if (!response.ok) { if (!response.ok) {