From d4e0358f4bcbb194ad9846ef482671b37ee22c09 Mon Sep 17 00:00:00 2001
From: Jerald-Golden-B <jerald@hexrfactory.com>
Date: Wed, 9 Apr 2025 10:59:43 +0530
Subject: [PATCH] fix: Update ZoneData interface and streamline loader function
 calls in loadInitialFloorItems

---
 app/src/components/ui/list/DropDownList.tsx   |  8 ++--
 .../scene/IntialLoad/loadInitialFloorItems.ts | 44 +++++++++----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/app/src/components/ui/list/DropDownList.tsx b/app/src/components/ui/list/DropDownList.tsx
index faa5f4e..4aa124a 100644
--- a/app/src/components/ui/list/DropDownList.tsx
+++ b/app/src/components/ui/list/DropDownList.tsx
@@ -52,7 +52,7 @@ const DropDownList: React.FC<DropDownListProps> = ({
   interface ZoneData {
     id: string;
     name: string;
-    assets: { id: string; name: string; position?: [] ;rotation?:{}}[];
+    assets: { id: string; name: string; position?: []; rotation?: {} }[];
   }
   const [zoneDataList, setZoneDataList] = useState<ZoneData[]>([]);
   const { floorItems, setFloorItems } = useFloorItems();
@@ -70,6 +70,7 @@ const DropDownList: React.FC<DropDownListProps> = ({
     }
     return inside;
   };
+
   useEffect(() => {
 
     const updatedZoneList: ZoneData[] = zones.map((zone: Zone) => {
@@ -84,7 +85,7 @@ const DropDownList: React.FC<DropDownListProps> = ({
           id: item.modeluuid,
           name: item.modelname,
           position: item.position,
-          rotation:item.rotation
+          rotation: item.rotation
         }));
 
       return {
@@ -96,9 +97,6 @@ const DropDownList: React.FC<DropDownListProps> = ({
     setZoneDataList(updatedZoneList);
   }, [zones, floorItems]);
 
-
-
-
   return (
     <div className="dropdown-list-container">
       <div className="head">
diff --git a/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts b/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts
index c90fe3b..f491710 100644
--- a/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts
+++ b/app/src/modules/scene/IntialLoad/loadInitialFloorItems.ts
@@ -12,7 +12,7 @@ import { getFloorAssets } from '../../../services/factoryBuilder/assest/floorAss
 async function loadInitialFloorItems(
     itemsGroup: Types.RefGroup,
     setFloorItems: Types.setFloorItemSetState,
-    setSimulationStates: (paths: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema | Types.StaticMachineEventsSchema)[]) => void
+    setSimulationStates: (paths: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema | Types.StaticMachineEventsSchema | Types.ArmBotEventsSchema)[]) => void
 ): Promise<void> {
     if (!itemsGroup.current) return;
     let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
@@ -82,16 +82,14 @@ async function loadInitialFloorItems(
                     if (indexedDBModel) {
                         // console.log(`[IndexedDB] Fetching ${item.modelname}`);
                         const blobUrl = URL.createObjectURL(indexedDBModel);
-                        loader.load(
-                            blobUrl,
-                            (gltf) => {
-                                URL.revokeObjectURL(blobUrl);
-                                THREE.Cache.remove(blobUrl);
-                                THREE.Cache.add(item.modelfileID!, gltf);
-                                processLoadedModel(gltf.scene.clone(), item, itemsGroup, setFloorItems, setSimulationStates);
-                                modelsLoaded++;
-                                checkLoadingCompletion(modelsLoaded, modelsToLoad, dracoLoader, resolve);
-                            },
+                        loader.load(blobUrl, (gltf) => {
+                            URL.revokeObjectURL(blobUrl);
+                            THREE.Cache.remove(blobUrl);
+                            THREE.Cache.add(item.modelfileID!, gltf);
+                            processLoadedModel(gltf.scene.clone(), item, itemsGroup, setFloorItems, setSimulationStates);
+                            modelsLoaded++;
+                            checkLoadingCompletion(modelsLoaded, modelsToLoad, dracoLoader, resolve);
+                        },
                             undefined,
                             (error) => {
                                 toast.error(`[IndexedDB] Error loading ${item.modelname}:`);
@@ -105,16 +103,14 @@ async function loadInitialFloorItems(
                     // Fetch from Backend
                     // console.log(`[Backend] Fetching ${item.modelname}`);
                     const modelUrl = `${url_Backend_dwinzo}/api/v1/AssetFile/${item.modelfileID!}`;
-                    loader.load(
-                        modelUrl,
-                        async (gltf) => {
-                            const modelBlob = await fetch(modelUrl).then((res) => res.blob());
-                            await storeGLTF(item.modelfileID!, modelBlob);
-                            THREE.Cache.add(item.modelfileID!, gltf);
-                            processLoadedModel(gltf.scene.clone(), item, itemsGroup, setFloorItems, setSimulationStates);
-                            modelsLoaded++;
-                            checkLoadingCompletion(modelsLoaded, modelsToLoad, dracoLoader, resolve);
-                        },
+                    loader.load(modelUrl, async (gltf) => {
+                        const modelBlob = await fetch(modelUrl).then((res) => res.blob());
+                        await storeGLTF(item.modelfileID!, modelBlob);
+                        THREE.Cache.add(item.modelfileID!, gltf);
+                        processLoadedModel(gltf.scene.clone(), item, itemsGroup, setFloorItems, setSimulationStates);
+                        modelsLoaded++;
+                        checkLoadingCompletion(modelsLoaded, modelsToLoad, dracoLoader, resolve);
+                    },
                         undefined,
                         (error) => {
                             toast.error(`[Backend] Error loading ${item.modelname}:`);
@@ -137,7 +133,7 @@ async function loadInitialFloorItems(
                     },
                 ]);
 
-                if (item.eventData || item.modelfileID === '67e3db95c2e8f37134526fb2') {
+                if (item.eventData) {
                     processEventData(item, setSimulationStates);
                 }
 
@@ -157,7 +153,7 @@ function processLoadedModel(
     item: Types.EventData,
     itemsGroup: Types.RefGroup,
     setFloorItems: Types.setFloorItemSetState,
-    setSimulationStates: (paths: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema | Types.StaticMachineEventsSchema)[]) => void
+    setSimulationStates: (paths: (Types.ConveyorEventsSchema | Types.VehicleEventsSchema | Types.StaticMachineEventsSchema | Types.ArmBotEventsSchema)[]) => void
 ) {
     const model = gltf;
     model.uuid = item.modeluuid;
@@ -192,7 +188,7 @@ function processLoadedModel(
         },
     ]);
 
-    if (item.eventData || item.modelfileID === '67e3db5ac2e8f37134526f40') {
+    if (item.eventData) {
         processEventData(item, setSimulationStates);
     }