SCADA-LTS · Limraj · Feb 2, 2026 · Jan 2, 2026 · Jan 2, 2026 · Jan 2, 2026
@@ -161,7 +161,7 @@
       <param name="include" value="id,xid,name,extendedName,dataSourceId,enabled,dataTypeMessage,pointLocator,engineeringUnits"/>
     </convert>
     <convert converter="xssDataPointBeanConverter" match="com.serotonin.mango.web.dwr.beans.DataPointBean">
-      <param name="include" value="id,xid,name,settable,dataType,dataTypeMessage,chartColour"/>
+      <param name="include" value="id,xid,name,settable,dataType,dataTypeMessage,chartColour,enabled"/>
     </convert>
     <convert converter="bean" match="com.serotonin.mango.vo.User">
       <param name="include" value="id,username,email,phone,admin,disabled,receiveAlarmEmails,receiveOwnAuditEvents,dataSourcePermissions,dataPointPermissions,userProfile,homeUrl,hideMenu,theme,firstName,lastName,enableFullScreen,hideShortcutDisableFullScreen"/>

@@ -34,13 +34,19 @@
         </c:if>
         <c:if test="${!empty flipbookLimit}">getFlipbookChart();</c:if>
         getStatsChart();
-
-        jQuery("#datPointDetailsPointSelect").chosen({
-			allow_single_deselect: true,
-			placeholder_text_single: " ",
-			search_contains: true,
-			width: "400px"
-       	});
+
+        let pointsArray = new Array();
+
+        <c:forEach items="${userPoints}" var="dp">
+            pointsArray[pointsArray.length] = {
+                id : "<c:out value="${dp.id}"/>",
+                name : "<c:out value="${dp.extendedName}"/>",
+                xid : "<c:out value="${dp.xid}"/>",
+                dataType : "<sst:i18n message="${dp.dataTypeMessage}"/>"
+            };
+        </c:forEach>
+
+        let datPointDetailsPointSelect = initPointsSelect("datPointDetailsPointSelect", "<spring:message code='chosen.selector.selectPoint'/>", "400px", [], pointsArray.filter((point) => point.id == <c:out value="${point.id}" />), [], true);
     }
 
     //
@@ -152,24 +158,13 @@
     function swapFlipbookImage(uri) {
         $("flipbookImage").src = uri;
     }
-
-    jQuery(document).ready(function(){
-    	(function($) {
-    		loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css"); 	
-			loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-		})(jQuery);
-    });
   </script>
 
   <table width="100%">
     <tr>
       <td valign="top" align="right">
         <spring:message code="pointDetails.goto"/>:&nbsp;
-        <sst:select id="datPointDetailsPointSelect" value="${point.id}" onchange="window.location='data_point_details.shtm?dpid='+ this.value;">
-          <c:forEach items="${userPoints}" var="point">
-            <sst:option value="${point.id}"><c:out value="${point.extendedName}"/></sst:option>
-          </c:forEach>
-        </sst:select>
+        <select id="datPointDetailsPointSelect" value="${point.id}" onchange="window.location='data_point_details.shtm?dpid='+ this.value;" />
 
         <c:if test="${!empty prevId}">
           <tag:img png="bullet_go_left" title="pagination.previous"

@@ -83,14 +83,9 @@
       <tr>
         <td>
             <script>
-                    function init() {
-                        jQuery("#selected_base_on_existing_point_chooser").chosen({
-                            allow_single_deselect: true,
-                            placeholder_text_single: "<spring:message code='chosen.selector.selectPoint'/>",
-                            search_contains: true,
-                            width: "400px"
-                        });
-                    }
+                   function init() {
+                       let selectedBaseOnExistingPointChooser = initPointsSelect("selected_base_on_existing_point_chooser", "<spring:message code='chosen.selector.selectPoint'/>");
+                   }
 
                    function checkGetAlertError() {
                      return jQuery("#checkGetAlertError").prop('checked');
@@ -892,13 +887,6 @@
                            					        	});
                   }
 
-                    jQuery(document).ready(function(){
-                        (function($) {
-                            loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css");
-                            loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-                        })(jQuery);
-                    });
-
                    jQuery(document).ready(function() {
                        function updateSuffixForEngineeringUnits() {
                            let value = jQuery("select[name='engineeringUnits']").val();

@@ -87,8 +87,8 @@
         hide(dsStatus);
 
         if (typeof initImpl == 'function') initImpl();
-
-        DataSourceEditDwr.editInit(initCB);
+        let dataSourceId = '${dataSource.id}' ? '${dataSource.id}': '-1';
+        DataSourceEditDwr.editInit(dataSourceId, initCB);
         showMessage("dataSourceMessage");
         showMessage("pointMessage");
     }
@@ -209,23 +209,24 @@
             var childs = document.getElementById("editImg" + currentPoint.id).parentNode.parentNode.childNodes;
             if (currentPoint.id!=-1) markRow(childs, false);
         }
-        DataSourceEditDwr.getPoint(pointId, editPointCB);
+        DataSourceEditDwr.getDataPoint(pointId, editPointCB);
         hideContextualMessages("pointProperties");
     }
 
-    function editPointCB(point) {
-        currentPoint = point;
-        display("pointDeleteImg", point.id != <c:out value="<%=Common.NEW_ID%>"/>);
-        var locator = currentPoint.pointLocator;
+    function editPointCB(response) {
+        currentPoint = response.data.point;
+        display("pointDeleteImg", currentPoint.id != <c:out value="<%=Common.NEW_ID%>"/>);
+        let locator = currentPoint.pointLocator;
+        let contextPoints = response.data.contextPoints;
 
         $set("name", unescapeHtml(currentPoint.name));
         $set("xid", unescapeHtml(currentPoint.xid));
         var cancel;
-        if (typeof editPointCBImpl == 'function') cancel = editPointCBImpl(locator);
+        if (typeof editPointCBImpl == 'function') cancel = editPointCBImpl(locator, contextPoints);
         if (!cancel) {
-            startImageFader("editImg"+ point.id);
-            if(point.id!=-1) {
-            	var childs = document.getElementById("editImg" + point.id).parentNode.parentNode.childNodes;
+            startImageFader("editImg"+ currentPoint.id);
+            if(currentPoint.id!=-1) {
+            	var childs = document.getElementById("editImg" + currentPoint.id).parentNode.parentNode.childNodes;
 				markRow(childs, true);
             }
             show("pointDetails");

@@ -139,8 +139,8 @@
   }
 
   function addPointImpl() {
-      DataSourceEditDwr.getPoint(-1, function(point) {
-          editPointCB(point);
+      DataSourceEditDwr.getDataPoint(-1, function(response) {
+          editPointCB(response.data.point);
           $set("objectName", addPointData.objectName);
           $set("attributeName", addPointData.attrName);
           $set("compositeItemName", addPointData.compositeName);

@@ -21,28 +21,11 @@
 <%@page import="com.serotonin.mango.Common"%>
 
 <script type="text/javascript">
-  var pointsArray = new Array();
-  var scriptPointsContext;
+
+  var pointsContext;
 
   function initImpl() {
-      <c:forEach items="${userPoints}" var="dp">
-        pointsArray[pointsArray.length] = {
-            id : ${dp.id}, 
-            name : "<c:out value="${dp.extendedName}"/>",
-            xid : "<c:out value="${dp.xid}"/>",
-            type : "<sst:i18n message="${dp.dataTypeMessage}"/>"
-        };
-      </c:forEach>
-
       createContextualMessageNode("contextContainer", "context");
-
-	  jQuery("#allPointsList").chosen({
-      	allow_single_deselect: true,
-		placeholder_text_single: " ",
-		search_contains: true,
-		width: "400px"
-	  });       
-
   }
 
   function appendPointListColumnFunctions(pointListColumnHeaders, pointListColumnFunctions) {
@@ -67,15 +50,20 @@
       DataSourceEditDwr.saveMetaDataSource($get("dataSourceName"), $get("dataSourceXid"), saveDataSourceCB);
   }
 
-  function editPointCBImpl(locator) {
-      if (this.scriptPointsContext) {
-         for (var i = 0; i < locator.context.length; i++) {
-             this.scriptPointsContext.addToContextArray(locator.context[i].key, locator.context[i].value);
-         }
-         this.scriptPointsContext.writeContextArray();
-      } else {
-         this.scriptPointsContext = new ScriptPointsContext(locator.context, pointsArray);
-      }
+  function editPointCBImpl(locator, contextPoints) {
+
+      let ref = {}
+      ref.excludePointsArray = locator.context;
+      ref.limit = 500;
+      ref.selectHtmlId = "allPointsList";
+      ref.placeholderTextSingle = "<spring:message code='chosen.selector.selectPoint'/>";
+      ref.pointsArray = contextPoints;
+      ref.dataTypes = [];
+      ref.altKey = "id";
+      ref.altValue = "name";
+      ref.widthPx = "400px";
+
+      this.pointsContext = new ScriptPointsContext(ref);
       $set("script", locator.script);
       $set("dataTypeId", locator.dataTypeId);
       $set("settable", locator.settable);
@@ -89,7 +77,7 @@
   }
 
   function savePointImpl(locator) {
-      locator.context = this.scriptPointsContext.convertToSave();
+      locator.context = this.pointsContext.convertToSave();
       locator.script = $get("script");
       locator.dataTypeId = $get("dataTypeId");
       locator.settable = $get("settable");
@@ -103,7 +91,7 @@
 
   function validateScript() {
       hideContextualMessages("pointProperties");
-      DataSourceEditDwr.validateScript($get("script"), this.scriptPointsContext.convertToSave(), $get("dataTypeId"), validateScriptCB);
+      DataSourceEditDwr.validateScript($get("script"), this.pointsContext.convertToSave(), $get("dataTypeId"), validateScriptCB);
   }
 
   function validateScriptCB(response) {
@@ -113,13 +101,6 @@
   function updateEventChanged() {
       display("updateCronPatternRow", $get("updateEvent") == <%= MetaPointLocatorVO.UPDATE_EVENT_CRON %>);
   }
-
-  jQuery(document).ready(function(){    
-  	(function($) {
-		loadjscssfile("resources/jQuery/plugins/chosen/chosen.min.css","css"); 	
-		loadjscssfile("resources/jQuery/plugins/chosen/chosen.jquery.min.js","js");
-  	})(jQuery);
-  });
 </script>
 
 <c:set var="dsDesc"><spring:message code="dsEdit.meta.desc"/></c:set>
@@ -146,7 +127,7 @@
     <td class="formLabelRequired"><spring:message code="dsEdit.meta.scriptContext"/></td>
     <td class="formField">
       <select id="allPointsList"></select>
-      <tag:img png="add" onclick="scriptPointsContext.addPointToContext();" title="common.add"/>
+      <tag:img png="add" onclick="pointsContext.addPointToContext(this.value);" title="common.add"/>
 
       <table cellspacing="1" id="contextContainer">
         <tbody id="contextTableEmpty" style="display:none;">

@@ -217,8 +217,8 @@
   }
 
   function addPointImpl() {
-	  DataSourceEditDwr.getPoint(-1, function(point) {
-		  editPointCB(point);
+	  DataSourceEditDwr.getDataPoint(-1, function(response) {
+		  editPointCB(response.data.point);
 	      $set("slaveId", $get("test_slaveId"));
 	      $set("range", $get("test_range"));
 	      $set("modbusDataType", $get("test_modbusDataType"));

@@ -93,7 +93,9 @@
   }
 
   function addTags() {
-	  DataSourceEditDwr.getPoint(-1, addTagsImpl);
+	  DataSourceEditDwr.getDataPoint(-1, function(response) {
+          addTagsImpl(response.data.point);
+      });
   }
 
   function addTagsImpl(point) {
@@ -142,7 +144,9 @@
   }
 
   function btnAddTag() {
-	  DataSourceEditDwr.getPoint(-1, addTagsImplOPC);
+	  DataSourceEditDwr.getDataPoint(-1, function(response) {
+         addTagsImplOPC(response.data.point);
+      });
   }
 
   function addTagsImplOPC(point) {

@@ -147,7 +147,9 @@
   }
 
   function btnAddNode() {
-	  DataSourceEditDwr.getPoint(-1, addNodesImplOpcUa);
+	  DataSourceEditDwr.getDataPoint(-1, function(response) {
+         addNodesImplOpcUa(response.data.point);
+      });
   }
 
   function addNodesImplOpcUa(point) {