#2779 very slow editing of graphical chart:

- Fixed cases if long delay - added abort ajax request, clear timeout;

Author: Limraj

WebContent/WEB-INF/jsp/eventHandlers.jsp

@@ -294,7 +294,7 @@
                 selectedHandlerNode.activePointIdSelect = new DataPointsSelect({
                     selectHtmlId: "activePointId",
                     placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
-                    excludePointsArray: inactivePoint ? [targetPoint, inactivePoint] : [targetPoint],
+                    excludePointsArray: [targetPoint],
                     pointsArray: activePoint ? [activePoint] : [],
                     dataTypes: [targetPoint.dataType],
                     startAsEmpty: true
@@ -303,7 +303,7 @@
                 selectedHandlerNode.inactivePointIdSelect = new DataPointsSelect({
                     selectHtmlId: "inactivePointId",
                     placeholderTextSingle: "<spring:message code='chosen.selector.selectPoint'/>",
-                    excludePointsArray: activePoint ? [targetPoint, activePoint] : [targetPoint],
+                    excludePointsArray: [targetPoint],
                     pointsArray: inactivePoint ? [inactivePoint] : [],
                     dataTypes: [targetPoint.dataType],
                     startAsEmpty: true
@@ -442,8 +442,7 @@
         }
 
         if(activePointSelect) {
-            activePointSelect.setPointId(undefined);
-            inactivePointSelectChanged();
+            activePointSelect.clearList();
         }
     }
 
@@ -456,8 +455,7 @@
         }
 
         if(inactivePointSelect) {
-            inactivePointSelect.setPointId(undefined);
-            activePointSelectChanged();
+            inactivePointSelect.clearList();
         }
     }
 
@@ -512,78 +510,40 @@
                         function(content) { $("inactiveValueToSetContent").innerHTML = content; });
             }
 
-            activePointSelectChanged();
-            inactivePointSelectChanged();
-            targetPointSelect.setPointId(targetPointId);
-        } else {
-            let activeAction = document.getElementById('activeAction');
-            activeAction.disabled = true;
-            let inactiveAction = document.getElementById('inactiveAction');
-            inactiveAction.disabled = true;
-        }
-        targetPointSelect.loadPointsList();
-    }
+            let targetPointSelect = selectedHandlerNode ? selectedHandlerNode.targetPointIdSelect : targetPointIdSelect;
+            let activePointSelect = selectedHandlerNode ? selectedHandlerNode.activePointIdSelect : activePointIdSelect;
+            let inactivePointSelect = selectedHandlerNode ? selectedHandlerNode.inactivePointIdSelect : inactivePointIdSelect;
 
-    function activePointSelectChanged() {
-        let targetPointSelect = selectedHandlerNode ? selectedHandlerNode.targetPointIdSelect : targetPointIdSelect;
-        let activePointSelect = selectedHandlerNode ? selectedHandlerNode.activePointIdSelect : activePointIdSelect;
-        let inactivePointSelect = selectedHandlerNode ? selectedHandlerNode.inactivePointIdSelect : inactivePointIdSelect;
-
-        if(targetPointSelect && activePointSelect && inactivePointSelect) {
-            let targetPoint = targetPointSelect.getPoint();
-            let activePoint = activePointSelect.getPoint();
-            let inactiveId = inactivePointSelect.getPointId();
-
-            if(targetPoint) {
-                inactivePointSelect.setDataTypes([targetPoint.dataType]);
-                if(activePoint) {
-                    inactivePointSelect.updatePointsList([targetPoint, activePoint]);
-                } else {
+            if(targetPointSelect && inactivePointSelect) {
+                let targetPoint = targetPointSelect.getPoint();
+
+                if(targetPoint) {
+                    inactivePointSelect.setDataTypes([targetPoint.dataType]);
                     inactivePointSelect.updatePointsList([targetPoint]);
                 }
-            } else {
-                if(activePoint) {
-                    inactivePointSelect.updatePointsList([activePoint]);
-                }
-            }
-            if(inactiveId > 0) {
-                inactivePointSelect.setPointId(inactiveId);
-            } else {
-                inactivePointSelect.setPointId(undefined);
+
+                inactivePointSelect.loadPointsList();
             }
-            inactivePointSelect.loadPointsList();
-        }
-    }
 
-    function inactivePointSelectChanged() {
-        let targetPointSelect = selectedHandlerNode ? selectedHandlerNode.targetPointIdSelect : targetPointIdSelect;
-        let activePointSelect = selectedHandlerNode ? selectedHandlerNode.activePointIdSelect : activePointIdSelect;
-        let inactivePointSelect = selectedHandlerNode ? selectedHandlerNode.inactivePointIdSelect : inactivePointIdSelect;
-
-        if(targetPointSelect && activePointSelect && inactivePointSelect) {
-            let targetPoint = targetPointSelect.getPoint();
-            let inactivePoint = inactivePointSelect.getPoint();
-            let activeId = activePointSelect.getPointId();
-
-            if(targetPoint) {
-                activePointSelect.setDataTypes([targetPoint.dataType]);
-                if(inactivePoint) {
-                    activePointSelect.updatePointsList([targetPoint, inactivePoint]);
-                } else {
+            if(targetPointSelect && activePointSelect) {
+                let targetPoint = targetPointSelect.getPoint();
+
+                if(targetPoint) {
+                    activePointSelect.setDataTypes([targetPoint.dataType]);
                     activePointSelect.updatePointsList([targetPoint]);
                 }
-            } else {
-                if(inactivePoint) {
-                    activePointSelect.updatePointsList([inactivePoint]);
-                }
-            }
-            if(activeId > 0) {
-                activePointSelect.setPointId(activeId);
-            } else {
-                activePointSelect.setPointId(undefined);
+
+                activePointSelect.loadPointsList();
             }
-            activePointSelect.loadPointsList();
+
+            targetPointSelect.setPointId(targetPointId);
+        } else {
+            let activeAction = document.getElementById('activeAction');
+            activeAction.disabled = true;
+            let inactiveAction = document.getElementById('inactiveAction');
+            inactiveAction.disabled = true;
         }
+        targetPointSelect.loadPointsList();
     }
 
     function activeActionChanged() {
@@ -592,6 +552,10 @@
         	show("activePointIdRow");
             hide("activeValueToSetRow");
             resetActiveStatic();
+            let activePointSelect = selectedHandlerNode ? selectedHandlerNode.activePointIdSelect : activePointIdSelect;
+            if(activePointSelect) {
+                activePointSelect.loadPointsList();
+            }
         } else if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>) {
         	hide("activePointIdRow");
         	show("activeValueToSetRow");
@@ -602,7 +566,6 @@
         	resetActivePoint();
         	resetActiveStatic();
         }
-        activePointSelectChanged();
     }
 
     function inactiveActionChanged() {
@@ -611,6 +574,11 @@
         	show("inactivePointIdRow");
             hide("inactiveValueToSetRow");
             resetInactiveStatic();
+            let inactivePointSelect = selectedHandlerNode ? selectedHandlerNode.inactivePointIdSelect : inactivePointIdSelect;
+
+            if(targetPointSelect && inactivePointSelect) {
+                inactivePointSelect.loadPointsList();
+            }
         } else if (action == <c:out value="<%= EventHandlerVO.SET_ACTION_STATIC_VALUE %>"/>) {
         	hide("inactivePointIdRow");
         	show("inactiveValueToSetRow");
@@ -621,7 +589,6 @@
         	resetInactivePoint();
         	resetInactiveStatic();
         }
-        inactivePointSelectChanged();
     }
 
     function sendEscalationChanged() {
@@ -874,7 +841,6 @@
                 <select id="activePointId"
                         class="chzn-select"
                         data-placeholder="<spring:message code='chosen.selector.selectPoint'/>"
-                        onchange="activePointSelectChanged()"
                         style="display:none;">
                 </select>
               </td>
@@ -902,7 +868,6 @@
                 <select id="inactivePointId"
                         class="chzn-select"
                         data-placeholder="<spring:message code='chosen.selector.selectPoint'/>"
-                        onchange="inactivePointSelectChanged()"
                         style="display:none;">
                 </select>
               </td>

WebContent/WEB-INF/jsp/pointLinks.jsp

@@ -69,8 +69,6 @@
             });
 
             setUserMessage();
-            sourcePointSelect.setPointId(pl.sourcePointId);
-            targetPointSelect.setPointId(pl.targetPointId);
         });
         startImageFader($("pl"+ plId +"Img"));
         display("deletePointLinkImg", plId != ${NEW_ID});
@@ -168,7 +166,7 @@
             return;
         }
 
-        targetPointSelect.setPointId(undefined);
+        targetPointSelect.clearList();
         targetPointSelect.updatePointsList([sourcePoint]);
         targetPointSelect.loadPointsList();
     }