#2824 Fixed event handlers new xid not displaying after saving edit form #2959

Patrykb0802 · 2024-07-18T10:18:45Z

No description provided.

github-actions · 2024-07-18T10:20:57Z

Java Script Mocha Unit Test Results

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

Results for commit dbd759d.

♻️ This comment has been updated with latest results.

github-actions · 2024-07-18T10:21:11Z

Java JUnit Test Results

2 089 tests 2 089 ✅ 27s ⏱️
107 suites 0 💤
107 files 0 ❌

Results for commit dbd759d.

♻️ This comment has been updated with latest results.

Limraj · 2024-07-22T08:01:45Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

@@ -508,6 +508,7 @@

            selectedHandlerNode.object = handler;
        }
+        $set("xid", handler.xid);


Where is the definition of the handler variable?
What is defined in the else block is not available outside this block.
If the xid has not been completed when editing the handler, it should not save the newly generated xid and return the old xid. Otherwise, this is counterintuitive behavior and the user may unknowingly change the xid of the handler.

- Added isNotEmpty() to common.js - Moved validateValue() to common.js - Added restoring previous XID value for Event Handlers when XID field is left empty when saving Event Handler

This reverts commit fa04fe7.

- Added isNotEmpty() to common.js - Moved validateValue() to common.js - Added restoring previous XID value for Event Handlers when XID field is left empty when saving Event Handler

Limraj · 2024-07-22T12:23:33Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

+        var messages = [];
+        if (!(isNotEmpty(xid)) && handlerId !== ${NEW_ID}){
+          validateValue("xid", "<fmt:message key='validate.valueRestored'/>", isNotEmpty, xid, messages)
+          $set("xid", selectedHandlerNode.object.xid);


added lines:

stopImageFader("saveImg"); showDwrMessages(message); return;

Limraj · 2024-07-22T12:25:40Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

+          validateValue("xid", "<fmt:message key='validate.valueRestored'/>", isNotEmpty, xid, messages)
+          $set("xid", selectedHandlerNode.object.xid);
+        }
+        if(messages.length > 0){


if to delete

Limraj · 2024-07-22T12:28:15Z

webapp-resources/messages_en.properties

@@ -2989,6 +2989,7 @@ validate.required=Required value
 validate.text.incompatible=Text renderer is incompatible with data type
 validate.event.incompatible=Event text renderer is incompatible with data type
 validate.xidUsed=This XID is already in use
+validate.valueRestored=Previous value restored


Ok.
Need to update for each translation files.

Limraj · 2024-07-22T12:29:38Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

@@ -456,36 +456,43 @@
        var xid = $get("xid");
        var alias = $get("alias");
        var disabled = $get("disabled");
-        if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>) {
+        var messages = [];
+        if (!(isNotEmpty(xid)) && handlerId !== ${NEW_ID}){


!(isNotEmpty(xid)) - Instead of so many negations, it is worth creating the isEmpty method.

Limraj · 2024-07-22T12:34:07Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

-        if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>) {
+        var messages = [];
+        if (!(isNotEmpty(xid)) && handlerId !== ${NEW_ID}){
+          validateValue("xid", "<fmt:message key='validate.valueRestored'/>", isNotEmpty, xid, messages)


Remove use validateValue:
let message = createValidationMessage("xid", "<fmt:message key='validate.valueRestored'/>");

Limraj · 2024-07-22T12:34:33Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

@@ -456,36 +456,43 @@
        var xid = $get("xid");
        var alias = $get("alias");
        var disabled = $get("disabled");
-        if (handlerType == <c:out value="<%= EventHandlerVO.TYPE_EMAIL %>"/>) {
+        var messages = [];


messages to delete

Limraj · 2024-07-22T12:36:55Z

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

@@ -325,7 +325,12 @@ private DwrResponseI18n save(int eventSourceId, int eventTypeRef1,
 		EventService eventService = new EventService();

 		vo.setId(handlerId);
-		vo.setXid(StringUtils.isEmpty(xid) ? eventService.generateUniqueXid() : xid);
+		if (StringUtils.isEmpty(xid) && handlerId == Common.NEW_ID) {
+			vo.setXid(StringUtils.isEmpty(xid) ? eventService.generateUniqueXid() : xid);


vo.setXid(eventService.generateUniqueXid());

Limraj · 2024-07-23T18:14:01Z

webapp-resources/messages_es.properties

@@ -2948,6 +2948,7 @@ validate.required=Se requiere un valor
 validate.text.incompatible=El generador de Texto es incompatibles con el tipo de dato
 validate.event.incompatible=Event text renderer is incompatible with data type
 validate.xidUsed=Este XID ya est\u00e1 en uso
+validate.valueRestored=Previous value restored


You need to add this at the end of the file, not in the middle.

Limraj · 2024-07-23T18:14:20Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

+          let message = createValidationMessage("xid", "<fmt:message key='validate.valueRestored'/>");
+          $set("xid", selectedHandlerNode.object.xid);
+          stopImageFader("saveImg");
+          showDwrMessages([message]);


Add line:
return;

Limraj · 2024-07-23T18:15:31Z

WebContent/WEB-INF/jsp/eventHandlers.jsp

+          stopImageFader("saveImg");
+          showDwrMessages([message]);
+        }
+        else {


What comes after ifa needs to be restored.
You only add a new if at the end of return, we do not make any other changes.

- Code formatting adjustments

- Adjusted code formatting

Limraj

If we create a new handler and leave the xid field empty, a new handler is created with the generated xid, if we try to save an existing event handler with an empty xid field, we get the currently saved xid with information 'Previous value restored' -> ok.

#2824 Fixed event handlers new xid not displaying after saving edit form

c4b3c6a

Patrykb0802 requested review from Limraj and SoftQ as code owners July 18, 2024 10:18

Limraj reviewed Jul 22, 2024

View reviewed changes

Patrykb0802 added 3 commits July 22, 2024 14:16

#2926 Fixed icons placement on data point list

fa04fe7

- Added isNotEmpty() to common.js - Moved validateValue() to common.js - Added restoring previous XID value for Event Handlers when XID field is left empty when saving Event Handler

Revert "#2926 Fixed icons placement on data point list"

dad45e3

This reverts commit fa04fe7.

#2824 Fixed event handlers new xid not displaying after saving edit form

302c17e

- Added isNotEmpty() to common.js - Moved validateValue() to common.js - Added restoring previous XID value for Event Handlers when XID field is left empty when saving Event Handler

Limraj reviewed Jul 22, 2024

View reviewed changes

#2824 Fixed event handlers new xid not displaying after saving edit form

25ccc99

Limraj reviewed Jul 23, 2024

View reviewed changes

Limraj added this to the 2.8.0 milestone Jul 23, 2024

Patrykb0802 added 4 commits July 24, 2024 09:59

#2824 Fixed event handlers new xid not displaying after saving edit form

e9247d2

#2824 Fixed event handlers new xid not displaying after saving edit form

2551734

- Code formatting adjustments

#2824 Fixed event handlers new xid not displaying after saving edit form

8052cb6

#2824 Fixed event handlers new xid not displaying after saving edit form

dbd759d

- Adjusted code formatting

Patrykb0802 requested a review from Limraj July 24, 2024 09:41

Limraj approved these changes Jul 24, 2024

View reviewed changes

Limraj merged commit 7b25463 into release/2.8.0 Jul 24, 2024
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2824 Fixed event handlers new xid not displaying after saving edit form #2959

#2824 Fixed event handlers new xid not displaying after saving edit form #2959

Patrykb0802 commented Jul 18, 2024

github-actions bot commented Jul 18, 2024 •

edited

Loading

github-actions bot commented Jul 18, 2024 •

edited

Loading

Limraj Jul 22, 2024

Limraj Jul 22, 2024

Limraj Jul 22, 2024

Limraj Jul 22, 2024

Limraj Jul 22, 2024

Limraj Jul 22, 2024 •

edited

Loading

Limraj Jul 22, 2024

Limraj Jul 22, 2024

Limraj Jul 23, 2024

Limraj Jul 23, 2024

Limraj Jul 23, 2024 •

edited

Loading

Limraj left a comment

#2824 Fixed event handlers new xid not displaying after saving edit form #2959

#2824 Fixed event handlers new xid not displaying after saving edit form #2959

Conversation

Patrykb0802 commented Jul 18, 2024

github-actions bot commented Jul 18, 2024 • edited Loading

Java Script Mocha Unit Test Results

github-actions bot commented Jul 18, 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

Limraj Jul 22, 2024 • edited Loading

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

Limraj Jul 23, 2024 • edited Loading

Choose a reason for hiding this comment

Limraj left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 18, 2024 •

edited

Loading

github-actions bot commented Jul 18, 2024 •

edited

Loading

Limraj Jul 22, 2024 •

edited

Loading

Limraj Jul 23, 2024 •

edited

Loading