#2917 Added Point locator test fields validation in Modbus IP #2919

Patrykb0802 · 2024-06-08T12:34:38Z

Added integer/byte validation for fields:

slave ID (int)
offset (int)
bit (byte)
register count (int)

inside point locator test for modbus ip data source.

Added integer/byte validation for fields: - slave ID (int) - offset (int) - bit (byte) - register count (int) inside point locator test for modbus ip data source.

github-actions · 2024-06-08T12:36:41Z

Java Script Mocha Unit Test Results

268 tests ±0 268 ✅ ±0 4s ⏱️ ±0s
70 suites ±0 0 💤 ±0
1 files ±0 0 ❌ ±0

Results for commit d2ee637. ± Comparison against base commit 4c38bf6.

♻️ This comment has been updated with latest results.

github-actions · 2024-06-08T12:37:06Z

Java JUnit Test Results

2 089 tests +39 2 089 ✅ +39 26s ⏱️ ±0s
107 suites + 2 0 💤 ± 0
107 files + 2 0 ❌ ± 0

Results for commit d2ee637. ± Comparison against base commit 4c38bf6.

♻️ This comment has been updated with latest results.

Limraj · 2024-06-12T06:56:54Z

WebContent/resources/common.js

+    let num = Number(value);
+
+    if (!isNaN(num) && Number.isInteger(num)) {
+        if (num >= -128 && num <= 127) {


Can this be a negative value?
You always try to follow what already exists, look at how it works and what the isInt32 function checks. You're not reinventing the wheel.

Limraj · 2024-06-12T07:00:28Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

+      }  else if(!isValid($get("test_bit"))) {
+            let bitMessage = createValidationMessage("test_bit", "<fmt:message key='badIntegerFormat'/>");
+            showDwrMessages([bitMessage]);
+      }  else if(!isByte($get("test_bit"))) {


If the value is a byte, it also meets the isValid condition.
In the function that checks isByte, you can first check whether isValid is present and then add a limit on the value.

- Small tweaks to isByte function

Limraj · 2024-06-12T08:45:15Z

WebContent/resources/common.js

@@ -1123,3 +1123,8 @@ function trim(value) {
    return result;
 }

+function isByte(value) {
+    let num = Number(value);


What happens if an alphanumeric character enters here?

Limraj · 2024-06-12T10:04:23Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

+            let registerCountMessage = createValidationMessage("test_registerCount", "<fmt:message key='badIntegerFormat'/>");
+            showDwrMessages([registerCountMessage]);
+      } else {
+          var locator = {};


- changed how variables are stored inside locatorTest() function - Added createAndDisplayValidationMessage function for showing validation message on chosen node

- Added catching exception for invalid end offset for Modbus IP data source

Limraj · 2024-06-14T19:34:57Z

src/com/serotonin/mango/web/dwr/DataSourceEditDwr.java

@@ -532,7 +532,10 @@ private void testModbusPointLocator(ModbusMaster modbusMaster,
        } catch (IllegalCharsetNameException e) {
            response.addMessage(new LocalizableMessage(
                    "validate.invalidCharset"));
-        } finally {
+        } catch (ModbusIdException e) {


Limraj · 2024-06-14T19:36:36Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

+          let locator = {};
+          locator.slaveId = parseInt(slaveId);
+          locator.range = range
+          locator.modbusDataType = modbusDataType;


Aren't modbusDataType and range numeric types?

- Minor changes

- Added Modbus IP properties fields validation for integers - Changed validation mechanism

- Added validateValue() function for shorter code

Limraj · 2024-06-20T21:37:51Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

-
-      locatorTestImpl(locator);
+
+      let temp =  createTempLocator();


createLocatorConfigTemp

Limraj · 2024-06-20T21:38:28Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

-      locatorTestImpl(locator);
+
+      let temp =  createTempLocator();
+      let tempModbusData = createTempModbusData();


createModbusConfigTemp

Limraj · 2024-06-20T21:41:17Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp

+
+  function createTempModbusData(){
+
+    let dataSourceName = $get("dataSourceName");


There is no point in creating additional variables here, you get and immediately set them in the temp structure, you don't parse here, etc.

Limraj · 2024-06-20T21:41:46Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp

+    let messages = validateModbusProperties(temp);
+
+    if(messages.length > 0) {
+      showDwrMessages(messages);


The formatting needs to be improved

Limraj · 2024-06-20T21:44:53Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

+      hideContextualMessages("locatorTestDiv");
+      hideContextualMessages("dataSourceProperties");
+
+      let messagesModbus = validateModbusProperties(tempModbusData);


modbusMessages, validateModbusConfig

Limraj · 2024-06-20T21:50:57Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

@@ -65,20 +65,80 @@
      setDisabled("scanBtn", scanning);
      setDisabled("scanCancelBtn", !scanning);
  }
+
+  function validateLocatorTest(temp){


temp -> locator

Limraj · 2024-06-20T21:55:13Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp

+    let encapsulated = $get("encapsulated");
+    let createSocketMonitorPoint = $get("createSocketMonitorPoint");
+
+    let temp = {};


temp -> modbus

- Variables names changes

- Fixed formatting

…est_fields_validation_in_Modbus_IP

Limraj · 2024-06-21T15:13:44Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

+  }
+
+  function createLocatorConfigTemp(){
+      let slaveId = $get("test_slaveId");


Similarly to the previously submitted suggestion, this is unnecessary.
You should apply a given note to all changes you make so that you don't have to point out the same things one after the other.

- Optimized createLocatorConfigTemp() code

Limraj · 2024-07-01T08:17:24Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

-      locator.charset = $get("test_charset");
-
-      locatorTestImpl(locator);
+      setDisabled("locatorTestBtn", true);


You need to remove this line:

Limraj · 2024-07-01T13:13:30Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbusIp.jsp

+      let messages = validateModbusConfig(temp);
+
+      if(messages.length > 0) {
+		  showDwrMessages(messages);


stopImageFader("dsSaveImg");

Limraj · 2024-07-01T13:13:48Z

WebContent/WEB-INF/jsp/dataSourceEdit/editModbus.jsp

+      let messages = modbusMessages.concat(messagesLocator);
+
+      if(messages.length > 0) {
+          showDwrMessages(messages);


stopImageFader("dsSaveImg");

- Added stopImageFader("dsSaveImg")

- Added validation for Modbus read data table

#2917 Added Point locator test fields validation in Modbus IP

e063ca3

Added integer/byte validation for fields: - slave ID (int) - offset (int) - bit (byte) - register count (int) inside point locator test for modbus ip data source.

Patrykb0802 requested review from Limraj and SoftQ as code owners June 8, 2024 12:34

Limraj reviewed Jun 12, 2024

View reviewed changes

#2917 Added Point locator test fields validation in Modbus IP

46e07bd

- Small tweaks to isByte function

Limraj reviewed Jun 12, 2024

View reviewed changes

Patrykb0802 added 3 commits June 12, 2024 14:34

#2917 Added Point locator test fields validation in Modbus IP

790358f

- changed how variables are stored inside locatorTest() function - Added createAndDisplayValidationMessage function for showing validation message on chosen node

#2917 Added Point locator test fields validation in Modbus IP

77ae878

#2917 Added Point locator test fields validation in Modbus IP

5184d5f

- Added catching exception for invalid end offset for Modbus IP data source

Patrykb0802 requested a review from Limraj June 14, 2024 15:17

Limraj reviewed Jun 14, 2024

View reviewed changes

Limraj added this to the 2.7.8 milestone Jun 14, 2024

Patrykb0802 added 4 commits June 19, 2024 10:09

#2917 Added Point locator test fields validation in Modbus IP

05d7982

- Minor changes

#2917 Added Point locator test fields validation in Modbus IP

d8bcbd7

- Added Modbus IP properties fields validation for integers - Changed validation mechanism

#2917 Added Point locator test fields validation in Modbus IP

86b9e80

- Added validateValue() function for shorter code

#2917 Added Point locator test fields validation in Modbus IP

363b9c0

Patrykb0802 requested a review from Limraj June 20, 2024 14:18

Limraj reviewed Jun 20, 2024

View reviewed changes

Limraj mentioned this pull request Jun 21, 2024

#2845 Fixed message validation in event search #2899

Merged

#2917 Added Point locator test fields validation in Modbus IP

cbf1a8e

- Variables names changes

Patrykb0802 requested a review from Limraj June 21, 2024 10:13

Patrykb0802 and others added 2 commits June 21, 2024 15:16

#2845 Fixed message validation in event search

fa49be3

- Fixed formatting

Merge branch 'release/2.7.8' into feature/#2917_Added_Point_locator_t…

7fd2396

…est_fields_validation_in_Modbus_IP

Limraj reviewed Jun 21, 2024

View reviewed changes

#2917 Added Point locator test fields validation in Modbus IP

ab16263

- Optimized createLocatorConfigTemp() code

Limraj reviewed Jul 1, 2024

View reviewed changes

#2917 Added Point locator test fields validation in Modbus IP

e8865e7

Limraj reviewed Jul 1, 2024

View reviewed changes

Patrykb0802 added 2 commits July 2, 2024 10:37

#2917 Added Point locator test fields validation in Modbus IP

6805506

- Added stopImageFader("dsSaveImg")

#2917 Added Point locator test fields validation in Modbus IP

d2ee637

- Added validation for Modbus read data table

Limraj approved these changes Jul 2, 2024

View reviewed changes

Limraj merged commit ac392df into release/2.7.8 Jul 2, 2024
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2917 Added Point locator test fields validation in Modbus IP #2919

#2917 Added Point locator test fields validation in Modbus IP #2919

Patrykb0802 commented Jun 8, 2024

github-actions bot commented Jun 8, 2024 •

edited

Loading

github-actions bot commented Jun 8, 2024 •

edited

Loading

Limraj Jun 12, 2024

Limraj Jun 12, 2024

Limraj Jun 12, 2024

Limraj Jun 12, 2024

Limraj Jun 14, 2024

Limraj Jun 14, 2024

Limraj Jun 20, 2024

Limraj Jun 20, 2024

Limraj Jun 20, 2024

Limraj Jun 20, 2024

Limraj Jun 20, 2024

Limraj Jun 20, 2024

Limraj Jun 20, 2024

Limraj Jun 21, 2024

Limraj Jul 1, 2024

Limraj Jul 1, 2024

Limraj Jul 1, 2024


		function createTempModbusData(){

		let dataSourceName = $get("dataSourceName");

#2917 Added Point locator test fields validation in Modbus IP #2919

#2917 Added Point locator test fields validation in Modbus IP #2919

Conversation

Patrykb0802 commented Jun 8, 2024

github-actions bot commented Jun 8, 2024 • edited Loading

Java Script Mocha Unit Test Results

github-actions bot commented Jun 8, 2024 • edited Loading

Java JUnit Test Results

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jun 8, 2024 •

edited

Loading

github-actions bot commented Jun 8, 2024 •

edited

Loading