From b67c9e1bdb98dafca9b1264d2edd8773af9ac494 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 12 Apr 2024 11:01:47 +0100
Subject: [PATCH] Update XML node to support Property In/Out

---
 .../@node-red/nodes/core/parsers/70-XML.html  | 20 +++++++++++++++----
 .../@node-red/nodes/core/parsers/70-XML.js    |  5 +++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
index 27f9795ef..9179496f7 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.html
@@ -1,12 +1,16 @@
 
 <script type="text/html" data-template-name="xml">
     <div class="form-row">
-        <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="common.label.property"></span></label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+    </div>
+    <div class="form-row">
+        <label for="node-input-property"><i class="fa fa-sign-in"></i> <span data-i18n="common.label.propertyIn"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
+        <label for="node-input-propertyOut"><i class="fa fa-sign-out"></i> <span data-i18n="common.label.propertyOut"></span></label>
+        <input type="text" id="node-input-propertyOut" style="width:70%;"/>
     </div>
     <hr align="middle"/>
     <div class="form-row">
@@ -27,7 +31,11 @@
         defaults: {
             name: {value:""},
             property: {value:"payload",required:true,
-                       label:RED._("node-red:common.label.property"),
+                       label:RED._("node-red:common.label.propertyIn"),
+                       validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
+            attr: {value:""},
+            propertyOut: {value:"payload",required:true,
+                       label:RED._("node-red:common.label.propertyOut"),
                        validate: RED.validators.typedInput({ type: 'msg', allowUndefined: true })},
             attr: {value:""},
             chr: {value:""}
@@ -45,7 +53,11 @@
             if (this.property === undefined) {
                 $("#node-input-property").val("payload");
             }
+            if (this.propertyOut === undefined) {
+                $("#node-input-propertyOut").val("payload");
+            }
             $("#node-input-property").typedInput({default:'msg',types:['msg']});
+            $("#node-input-propertyOut").typedInput({default:'msg',types:['msg']});
         }
     });
 </script>
diff --git a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.js b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.js
index 66fa42cdc..d55634c89 100644
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-XML.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-XML.js
@@ -9,6 +9,7 @@ module.exports = function(RED) {
         this.attrkey = n.attr;
         this.charkey = n.chr;
         this.property = n.property||"payload";
+        this.propertyOut = n.propertyOut||this.property;
         var node = this;
         this.on("input", function(msg,send,done) {
             var value = RED.util.getMessageProperty(msg,node.property);
@@ -20,7 +21,7 @@ module.exports = function(RED) {
                     options.async = false;
                     var builder = new xml2js.Builder(options);
                     value = builder.buildObject(value, options);
-                    RED.util.setMessageProperty(msg,node.property,value);
+                    RED.util.setMessageProperty(msg,node.propertyOut,value);
                     send(msg);
                     done();
                 }
@@ -33,7 +34,7 @@ module.exports = function(RED) {
                     parseString(value, options, function (err, result) {
                         if (err) { done(err); }
                         else {
-                            RED.util.setMessageProperty(msg,node.property,result);
+                            RED.util.setMessageProperty(msg,node.propertyOut,result);
                             send(msg);
                             done();
                         }