From a3b48d12c14fea7da380726aaafdc3c6eb3086dc Mon Sep 17 00:00:00 2001
From: Jerald-Golden-B <jerald@hexrfactory.com>
Date: Fri, 2 May 2025 13:40:00 +0530
Subject: [PATCH] Refactor TriggerConnector to improve event handling: reset
 firstSelectedPoint on invalid intersections, update event model name, and
 ensure proper cleanup of state. Adjust event listener conditions for better
 performance.

---
 .../triggers/connector/triggerConnector.tsx   | 45 ++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/app/src/modules/simulation/triggers/connector/triggerConnector.tsx b/app/src/modules/simulation/triggers/connector/triggerConnector.tsx
index 5f83528..a10580f 100644
--- a/app/src/modules/simulation/triggers/connector/triggerConnector.tsx
+++ b/app/src/modules/simulation/triggers/connector/triggerConnector.tsx
@@ -171,10 +171,16 @@ function TriggerConnector() {
                     (intersect) =>
                         intersect.object.name === ('Event-Sphere')
                 );
-            if (intersects.length === 0) return;
+            if (intersects.length === 0) {
+                setFirstSelectedPoint(null);
+                return;
+            };
 
             const currentObject = intersects[0].object;
-            if (!currentObject || currentObject.name !== 'Event-Sphere') return;
+            if (!currentObject || currentObject.name !== 'Event-Sphere') {
+                setFirstSelectedPoint(null);
+                return;
+            };
 
             const modelUuid = currentObject.userData.modelUuid;
             const pointUuid = currentObject.userData.pointUuid;
@@ -189,7 +195,10 @@ function TriggerConnector() {
 
                 const event = getEventByModelUuid(selectedProduct.productId, modelUuid);
 
-                if (!point || !event) return;
+                if (!point || !event) {
+                    setFirstSelectedPoint(null);
+                    return;
+                };
 
                 let actionUuid: string | undefined;
                 if ('action' in point && point.action) {
@@ -254,7 +263,12 @@ function TriggerConnector() {
                     pointUuid
                 );
 
-                if (!point) return;
+                const event = getEventByModelUuid(selectedProduct.productId, modelUuid);
+
+                if (!point || !event) {
+                    setFirstSelectedPoint(null);
+                    return;
+                };
 
                 let actionUuid: string | undefined;
                 if ('action' in point && point.action) {
@@ -270,12 +284,12 @@ function TriggerConnector() {
                     delay: 0,
                     triggeredAsset: {
                         triggeredModel: {
-                            modelName: currentObject.parent?.parent?.name || 'Unknown',
+                            modelName: event.modelName || 'Unknown',
                             modelUuid: modelUuid
                         },
                         triggeredPoint: {
-                            pointName: currentObject.name,
-                            pointUuid: pointUuid
+                            pointName: 'Point',
+                            pointUuid: point.uuid
                         },
                         triggeredAction: actionUuid ? {
                             actionName: getActionByUuid(selectedProduct.productId, actionUuid)?.actionName || 'Action',
@@ -285,13 +299,24 @@ function TriggerConnector() {
                 };
 
                 if (firstSelectedPoint.actionUuid) {
-                    addTrigger(selectedProduct.productId, firstSelectedPoint.actionUuid, trigger);
+                    const event = addTrigger(selectedProduct.productId, firstSelectedPoint.actionUuid, trigger);
+
+                    if (event) {
+                        updateBackend(
+                            selectedProduct.productName,
+                            selectedProduct.productId,
+                            organization,
+                            event
+                        );
+                    }
                 }
                 setFirstSelectedPoint(null);
+            } else if (firstSelectedPoint) {
+                setFirstSelectedPoint(null);
             }
         };
 
-        if (subModule === 'simulations') {
+        if (subModule === 'simulations' && !deleteTool) {
             canvasElement.addEventListener("mousedown", onMouseDown);
             canvasElement.addEventListener("mouseup", onMouseUp);
             canvasElement.addEventListener("mousemove", onMouseMove);
@@ -305,7 +330,7 @@ function TriggerConnector() {
             canvasElement.removeEventListener('contextmenu', handleRightClick);
         };
 
-    }, [gl, subModule, selectedProduct, firstSelectedPoint]);
+    }, [gl, subModule, selectedProduct, firstSelectedPoint, deleteTool]);
 
 
     useFrame(() => {