From bae6bfc32d66bcafff10f8381a92882f52ea2f69 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 20 May 2021 21:12:32 +0100
Subject: [PATCH 1/9] Add inject values without deploy feature

---
 .../@node-red/editor-client/src/js/ui/tray.js |   8 +-
 .../nodes/core/common/20-inject.html          | 358 ++++++++++++------
 .../@node-red/nodes/core/common/20-inject.js  |  14 +-
 3 files changed, 264 insertions(+), 116 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
index 2e7cd8f03..b7e2325c5 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-RED.tray = (function() {
+ RED.tray = (function() {
 
     var stack = [];
     var editorStack;
@@ -288,9 +288,9 @@ RED.tray = (function() {
                     right: -(tray.tray.width()+10)+"px"
                 });
                 setTimeout(function() {
-                    if (tray.options.close) {
-                        tray.options.close();
-                    }
+                    try {
+                        if (tray.options.close) { tray.options.close(); }
+                    } catch (ex) { }
                     tray.tray.remove();
                     if (stack.length > 0) {
                         var oldTray = stack[stack.length-1];
diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index 9bf91ad1e..c3136ef61 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -149,6 +149,101 @@
 
 <script type="text/javascript">
 (function() {
+    /** Retrieve editableList items (refactored for re-use in the custom inject)*/
+    function getProps(el, legacy) {
+        var result = {
+            props: []
+        }
+        el.each(function(i) {
+            var prop = $(this);
+            var p = {
+                p:prop.find(".node-input-prop-property-name").typedInput('value')
+            };
+            if (p.p) {
+                p.v = prop.find(".node-input-prop-property-value").typedInput('value');
+                p.vt = prop.find(".node-input-prop-property-value").typedInput('type');
+                if(legacy) {
+                    if (p.p === "payload") { // save payload to old "legacy" property
+                        result.payloadType = p.vt;
+                        result.payload = p.v;
+                        delete p.v;
+                        delete p.vt;
+                    } else if (p.p === "topic" && p.vt === "str") {
+                        result.topic = p.v;
+                        delete p.v;
+                    }
+                }
+                result.props.push(p);
+            }
+        });
+        return result;
+    }
+    /** Build the editableList items (refactored for re-use in the custom inject)*/
+    function buildEditableList(el, props, legacyProps) {
+        legacyProps = legacyProps || {};
+        var list = $(el);
+        list.editableList({
+            addItem: function(container,i,opt) {
+                var prop = opt;
+                if (!prop.hasOwnProperty('p')) {
+                    prop = {p:"",v:"",vt:"str"};
+                }
+                container.css({
+                    overflow: 'hidden',
+                    whiteSpace: 'nowrap'
+                });
+                var row = $('<div/>').appendTo(container);
+
+                var propertyName = $('<input/>',{class:"node-input-prop-property-name",type:"text"})
+                    .css("width","30%")
+                    .appendTo(row)
+                    .typedInput({types:['msg']});
+
+                $('<div/>',{style: 'display:inline-block; padding:0px 6px;'})
+                    .text('=')
+                    .appendTo(row);
+
+                var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
+                    .css("width","calc(70% - 30px)")
+                    .appendTo(row)
+                    .typedInput({default:'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
+
+                propertyName.typedInput('value',prop.p);
+                propertyValue.typedInput('value',prop.v);
+                propertyValue.typedInput('type',prop.vt);
+            },
+            removable: true,
+            sortable: true
+        });
+        if (!props) {
+            var payload = {
+                p:'payload',
+                v: legacyProps.payload ? legacyProps.payload : '',
+                vt:legacyProps.payloadType ? legacyProps.payloadType : 'date'
+            };
+            var topic = {
+                p:'topic',
+                v: legacyProps.topic ? legacyProps.topic : '',
+                vt:'string'
+            }
+            props = [payload,topic];
+        }
+
+        for (var i=0; i<props.length; i++) {
+            var prop = props[i];
+            var newProp = { p: prop.p, v: prop.v, vt: prop.vt };
+            if (newProp.v === undefined) {
+                if (prop.p === 'payload') {
+                    newProp.v = legacyProps.payload ? legacyProps.payload : '';
+                    newProp.vt = legacyProps.payloadType ? legacyProps.payloadType : 'date';
+                } else if (prop.p === 'topic' && prop.vt === "str") {
+                    newProp.v =  legacyProps.topic ? legacyProps.topic : '';
+                }
+            }
+            list.editableList('addItem',newProp);
+        }
+        return list;
+    }
 
     function resizeDialog(size) {
         size = size || { height: $(".red-ui-tray-content form").height() }
@@ -430,75 +525,21 @@
             $("#inject-time-row-"+repeattype).show();
 
             /* */
-
-            $('#node-input-property-container').css('min-height','120px').css('min-width','450px').editableList({
-                addItem: function(container,i,opt) {
-                    var prop = opt;
-                    if (!prop.hasOwnProperty('p')) {
-                        prop = {p:"",v:"",vt:"str"};
-                    }
-                    container.css({
-                        overflow: 'hidden',
-                        whiteSpace: 'nowrap'
-                    });
-                    var row = $('<div/>').appendTo(container);
-
-                    var propertyName = $('<input/>',{class:"node-input-prop-property-name",type:"text"})
-                        .css("width","30%")
-                        .appendTo(row)
-                        .typedInput({types:['msg']});
-
-                    $('<div/>',{style: 'display:inline-block; padding:0px 6px;'})
-                        .text('=')
-                        .appendTo(row);
-
-                    var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
-                        .css("width","calc(70% - 30px)")
-                        .appendTo(row)
-                        .typedInput({default:'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
-
-                    propertyName.typedInput('value',prop.p);
-
-                    propertyValue.typedInput('value',prop.v);
-                    propertyValue.typedInput('type',prop.vt);
-                },
-                removable: true,
-                sortable: true
-            });
-
-            if (!this.props) {
-                var payload = {
-                    p:'payload',
-                    v: this.payload ? this.payload : '',
-                    vt:this.payloadType ? this.payloadType : 'date'
-                };
-                var topic = {
-                    p:'topic',
-                    v: this.topic ? this.topic : '',
-                    vt:'string'
-                }
-                this.props = [payload,topic];
-            }
-
-            for (var i=0; i<this.props.length; i++) {
-                var prop = this.props[i];
-                var newProp = { p: prop.p, v: prop.v, vt: prop.vt };
-                if (newProp.v === undefined) {
-                    if (prop.p === 'payload') {
-                        newProp.v = this.payload ? this.payload : '';
-                        newProp.vt = this.payloadType ? this.payloadType : 'date';
-                    } else if (prop.p === 'topic' && prop.vt === "str") {
-                        newProp.v =  this.topic ? this.topic : '';
-                    }
-                }
-                $("#node-input-property-container").editableList('addItem',newProp);
+            var list = $('#node-input-property-container');
+            list.css('min-height','120px').css('min-width','450px');
+            var legacyOptions = {
+                topic: this.topic,
+                payload: this.payload,
+                payloadType: this.payloadType,
             }
+            buildEditableList(list, this.props, legacyOptions);
 
             $("#inject-time-type-select").trigger("change");
             $("#inject-time-interval-time-start").trigger("change");
 
         },
         oneditsave: function() {
+            var node = this;
             var repeat = "";
             var crontab = "";
             var type = $("#inject-time-type-select").val();
@@ -590,66 +631,165 @@
             $("#node-input-crontab").val(crontab);
 
             /* Gather the injected properties of the msg object */
-            var props = $("#node-input-property-container").editableList('items');
-            var node = this;
-            node.props= [];
+            var items = $("#node-input-property-container").editableList('items');
             delete node.payloadType;
             delete node.payload;
             node.topic = "";
-            props.each(function(i) {
-                var prop = $(this);
-                var p = {
-                    p:prop.find(".node-input-prop-property-name").typedInput('value')
-                };
-                if (p.p) {
-                    p.v = prop.find(".node-input-prop-property-value").typedInput('value');
-                    p.vt = prop.find(".node-input-prop-property-value").typedInput('type');
-                    if (p.p === "payload") { // save payload to old "legacy" property
-                        node.payloadType = p.vt;
-                        node.payload = p.v;
-                        delete p.v;
-                        delete p.vt;
-                    } else if (p.p === "topic" && p.vt === "str") {
-                        node.topic = p.v;
-                        delete p.v;
-                    }
-                    node.props.push(p);
-                }
-            });
+            var result = getProps(items, true);
+            node.props = result.props;
+            if(result.payloadType) { node.payloadType = result.payloadType; };
+            if(result.payload) { node.payload = result.payload; };
+            if(result.topic) { node.topic = result.topic; };
         },
         button: {
             enabled: function() {
                 return !this.changed
             },
-            onclick: function() {
-                if (this.changed) {
-                    return RED.notify(RED._("notification.warning", {message:RED._("notification.warnings.undeployedChanges")}),"warning");
+            onclick: function () {
+                console.log("inject inject click")
+                var node = this;
+                if (node.changed) {
+                    return RED.notify(RED._("notification.warning", { message: RED._("notification.warnings.undeployedChanges") }), "warning");
                 }
 
-                var label = this._def.label.call(this);
-                if (label.length > 30) {
-                    label = label.substring(0,50)+"...";
+                var doInject = function (customMsg) {
+                    var label = node._def.label.call(node);
+                    if (label.length > 30) {
+                        label = label.substring(0, 50) + "...";
+                    }
+                    label = label.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+                    $.ajax({
+                        url: "inject/" + node.id,
+                        type: "POST",
+                        data: customMsg,
+                        success: function (resp) {
+                            RED.notify(node._("inject.success", { label: label }), { type: "success", id: "inject", timeout: 2000 });
+                        },
+                        error: function (jqXHR, textStatus, errorThrown) {
+                            if (jqXHR.status == 404) {
+                                RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.not-deployed") }), "error");
+                            } else if (jqXHR.status == 500) {
+                                RED.notify(node._("common.notification.error", { message: node._("inject.errors.failed") }), "error");
+                            } else if (jqXHR.status == 0) {
+                                RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.no-response") }), "error");
+                            } else {
+                                RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.unexpected", { status: jqXHR.status, message: textStatus }) }), "error");
+                            }
+                        }
+                    });
                 }
-                label = label.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                var node = this;
-                $.ajax({
-                    url: "inject/"+this.id,
-                    type:"POST",
-                    success: function(resp) {
-                        RED.notify(node._("inject.success",{label:label}),{type:"success",id:"inject", timeout: 2000});
-                    },
-                    error: function(jqXHR,textStatus,errorThrown) {
-                        if (jqXHR.status == 404) {
-                            RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.not-deployed")}),"error");
-                        } else if (jqXHR.status == 500) {
-                            RED.notify(node._("common.notification.error",{message:node._("inject.errors.failed")}),"error");
-                        } else if (jqXHR.status == 0) {
-                            RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.no-response")}),"error");
-                        } else {
-                            RED.notify(node._("common.notification.error",{message:node._("common.notification.errors.unexpected",{status:jqXHR.status,message:textStatus})}),"error");
+                
+                if (window.event.ctrlKey) {
+                    var wasDirty = node.dirty;
+                    // var wasDirty = RED.nodes.dirty();
+                    var originalProps = {
+                        props: node.props,
+                        payloadType: node.payloadType,
+                        payload: node.payload,
+                        topic: node.topic
+                    };
+                    var originalPropsJSON = JSON.stringify(originalProps);
+                    var trayOptions = {
+                        title: node.name || (node._def.label && node._def.label.call(node)) || node._('inject.inject'),
+                        width: 'inherit',
+                        buttons: [
+                            {
+                                id: 'node-dialog-cancel',
+                                class: 'primary',
+                                text: 'Close' || RED._('common.label.cancel'),
+                                click: function () {
+                                    RED.tray.close();
+                                }
+                            },
+                            {
+                                id: 'node-dialog-apply',
+                                text: 'Apply', //RED._('common.label.apply'),
+                                click: function () {
+                                    debugger
+                                    delete node.payload;
+                                    node.topic = "";
+                                    var items = $('#node-inject-custom-list').editableList('items');
+                                    var result = getProps(items, true);
+                                    node.props = result.props;
+                                    if(result.payloadType) { node.payloadType = result.payloadType; };
+                                    if(result.payload) { node.payload = result.payload; };
+                                    if(result.topic) { node.topic = result.topic; };
+                                    var newProps = {
+                                        props: node.props,
+                                        payloadType: node.payloadType,
+                                        payload: node.payload,
+                                        topic: node.topic
+                                    };
+                                    var newPropsJSON = JSON.stringify(newProps);
+                                    var changed = newPropsJSON != originalPropsJSON;
+                                    if (changed) {
+                                        var changes = JSON.parse(originalPropsJSON);
+                                        node.changed = true;
+                                        RED.nodes.dirty(true);
+                                        var historyEvent = {
+                                            t:'edit',
+                                            node:node,
+                                            changes:changes,
+                                            dirty:wasDirty,
+                                            changed:changed
+                                        };
+                                        RED.history.push(historyEvent);
+                                    }
+                                    node.dirty = true;
+                                    RED.editor.validateNode(node);
+                                    RED.events.emit("editor:save",node);
+                                    RED.events.emit("nodes:change",node);
+                                    RED.tray.close();//should apply close the dialog?
+                                    RED.view.redraw();
+                                }
+                            },
+                            {
+                                id: 'node-dialog-ok',
+                                text: 'Inject', //RED._('inject.inject'),
+                                click: function () {
+                                    var items = $('#node-inject-custom-list').editableList('items');
+                                    var result = getProps(items);
+                                    if (result && result.props && result.props.length) {
+                                        m = { __customProps: result.props };
+                                    }
+                                    doInject(m);
+                                    //RED.tray.close();
+                                }
+                            }
+                        ],
+                        resize: function (dimensions) {
+                            $('#node-dialog-inject-custom .red-ui-editableList-container').css('height', '');//allow editable list to self size
+                        },
+                        open: function (tray) {
+                            var trayBody = tray.find('.red-ui-tray-body');
+                            var dialog = $('<div id="node-dialog-inject-custom"></div>');
+                            var list = $('<ol id="node-inject-custom-list"></ol>');
+                            dialog.append(list);
+                            trayBody.append(dialog);
+                            list.css('min-height', '120px').css('min-width', '400px');
+                            var legacyOptions = {
+                                topic: node.topic,
+                                payload: node.payload,
+                                payloadType: node.payloadType,
+                            }
+                            buildEditableList(list, node.props, legacyOptions);
+                        },
+                        close: function () {
+                            setTimeout(function () {
+                                $('#node-dialog-inject-custom').dialog('destroy').remove();
+                            }, 5);
+                        },
+                        show: function (tray) {
+                            //primary button is the cancel button but, for aestetics, colour the inject button. 
+                            $('#node-dialog-cancel').removeClass('primary');
+                            $('#node-dialog-ok').addClass('primary');
+                            $('#node-dialog-inject-custom .red-ui-editableList-container').css('height', '');//allow editable list to self size
                         }
                     }
-                });
+                    RED.tray.show(trayOptions);
+                } else {
+                    doInject();
+                }
             }
         },
         oneditresize: resizeDialog
diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.js b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
index 772e238a3..732fbd856 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.js
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
@@ -100,8 +100,12 @@ module.exports = function(RED) {
 
         this.on("input", function(msg, send, done) {
             var errors = [];
-
-            this.props.forEach(p => {
+            var props = this.props;
+            if(msg.__customProps && Array.isArray(msg.__customProps)) {
+                props = msg.__customProps;
+            }
+            delete msg.__customProps;
+            props.forEach(p => {
                 var property = p.p;
                 var value = p.v ? p.v : '';
                 var valueType = p.vt ? p.vt : 'str';
@@ -156,7 +160,11 @@ module.exports = function(RED) {
         var node = RED.nodes.getNode(req.params.id);
         if (node != null) {
             try {
-                node.receive();
+                if (req.body && req.body.__customProps) {
+                    node.receive(req.body);
+                } else {
+                    node.receive();
+                }
                 res.sendStatus(200);
             } catch(err) {
                 res.sendStatus(500);

From 9d7b8f1f2f38cc09c50d1b266aced9117df8ab23 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 20 May 2021 22:35:42 +0100
Subject: [PATCH 2/9] change user prop name for injected values - less chance
 for collision

---
 .../@node-red/nodes/core/common/20-inject.html            | 2 +-
 .../node_modules/@node-red/nodes/core/common/20-inject.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index c3136ef61..a7957874a 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -750,7 +750,7 @@
                                     var items = $('#node-inject-custom-list').editableList('items');
                                     var result = getProps(items);
                                     if (result && result.props && result.props.length) {
-                                        m = { __customProps: result.props };
+                                        m = { __user_inject_props__: result.props };
                                     }
                                     doInject(m);
                                     //RED.tray.close();
diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.js b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
index 732fbd856..26be74bfa 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.js
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
@@ -101,10 +101,10 @@ module.exports = function(RED) {
         this.on("input", function(msg, send, done) {
             var errors = [];
             var props = this.props;
-            if(msg.__customProps && Array.isArray(msg.__customProps)) {
-                props = msg.__customProps;
+            if(msg.__user_inject_props__ && Array.isArray(msg.__user_inject_props__)) {
+                props = msg.__user_inject_props__;
             }
-            delete msg.__customProps;
+            delete msg.__user_inject_props__;
             props.forEach(p => {
                 var property = p.p;
                 var value = p.v ? p.v : '';
@@ -160,7 +160,7 @@ module.exports = function(RED) {
         var node = RED.nodes.getNode(req.params.id);
         if (node != null) {
             try {
-                if (req.body && req.body.__customProps) {
+                if (req.body && req.body.__user_inject_props__) {
                     node.receive(req.body);
                 } else {
                     node.receive();

From f570447000b100b6d424a4897c0118d10fd5abca Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 20 May 2021 22:53:10 +0100
Subject: [PATCH 3/9] i18n for buttons on user inject values

---
 .../@node-red/nodes/core/common/20-inject.html            | 8 +++-----
 .../@node-red/nodes/locales/en-US/messages.json           | 5 +++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index a7957874a..ce537d0fa 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -646,7 +646,6 @@
                 return !this.changed
             },
             onclick: function () {
-                console.log("inject inject click")
                 var node = this;
                 if (node.changed) {
                     return RED.notify(RED._("notification.warning", { message: RED._("notification.warnings.undeployedChanges") }), "warning");
@@ -696,16 +695,15 @@
                             {
                                 id: 'node-dialog-cancel',
                                 class: 'primary',
-                                text: 'Close' || RED._('common.label.cancel'),
+                                text: node._('inject.userValueButtons.close'),
                                 click: function () {
                                     RED.tray.close();
                                 }
                             },
                             {
                                 id: 'node-dialog-apply',
-                                text: 'Apply', //RED._('common.label.apply'),
+                                text: node._('inject.userValueButtons.apply'),
                                 click: function () {
-                                    debugger
                                     delete node.payload;
                                     node.topic = "";
                                     var items = $('#node-inject-custom-list').editableList('items');
@@ -745,7 +743,7 @@
                             },
                             {
                                 id: 'node-dialog-ok',
-                                text: 'Inject', //RED._('inject.inject'),
+                                text: node._('inject.userValueButtons.inject'),
                                 click: function () {
                                     var items = $('#node-inject-custom-list').editableList('items');
                                     var result = getProps(items);
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 6945ee8ae..856674cac 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -85,6 +85,11 @@
             "failed": "inject failed, see log for details",
             "toolong": "Interval too large",
             "invalid-expr": "Invalid JSONata expression: __error__"
+        },
+        "userValueButtons": {
+            "close": "Close",
+            "apply": "Apply",
+            "inject": "Inject"
         }
     },
     "catch": {

From 845567d1ba031dece0e6a174f823d96e660696ad Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Thu, 20 May 2021 22:53:32 +0100
Subject: [PATCH 4/9] add 2 tests for user inject values

---
 test/nodes/core/common/20-inject_spec.js | 70 ++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/test/nodes/core/common/20-inject_spec.js b/test/nodes/core/common/20-inject_spec.js
index ff5eb7f73..f760bb646 100644
--- a/test/nodes/core/common/20-inject_spec.js
+++ b/test/nodes/core/common/20-inject_spec.js
@@ -510,6 +510,36 @@ describe('inject node', function() {
         });
     });
 
+    
+    it('should inject custom properties in message', function (done) {
+        //n1: inject node with  { topic:"static", payload:"static", bool1:true, str1:"1" }
+        var flow = [{id: "n1", type: "inject", props: [{p:"payload", v:"static", vt:"str"}, {p:"topic", v:"static", vt:"str"}, {p:"bool1", v:"true", vt:"bool"}, {p:"str1", v:"1", vt:"str"}], wires: [["n2"]], z: "flow"},
+                    {id: "n2", type: "helper"}];
+        helper.load(injectNode, flow, function () {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n2.on("input", function (msg) {
+                try {
+                    msg.should.not.have.property("payload"); //payload removed
+                    msg.should.have.property("topic", "t_override"); //changed value to t_override
+                    msg.should.have.property("str1", 1);//changed type from str to num
+                    msg.should.have.property("num1", 1);//new prop
+                    msg.should.have.property("bool1", false);//changed value to false
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+            n1.receive({ __user_inject_props__: [
+                {p:"topic", v:"t_override", vt:"str"}, //change value to t_override
+                {p:"str1", v:"1", vt:"num"}, //change type
+                {p:"num1", v:"1", vt:"num"}, //new prop
+                {p:"bool1", v:"false", vt:"bool"}, //change value to false
+            ]});
+        });
+    });
+
+
     it('should inject multiple properties using legacy props if needed', function (done) {
         var flow = [{id: "n1", type: "inject", payload:"123", payloadType:"num", topic:"foo", props: [{p:"topic", vt:"str"}, {p:"payload"}], wires: [["n2"]], z: "flow"},
                     {id: "n2", type: "helper"}];
@@ -592,6 +622,46 @@ describe('inject node', function() {
                          });
         });
 
+        it('should inject custom properties in posted message', function(done) {
+            var flow = [{id:"n1", type:"inject", payloadType:"str", topic: "t4",payload:"hello", wires:[["n4"]] },
+                        { id:"n4", type:"helper"}];
+            helper.load(injectNode, flow, function() {
+                var n4 = helper.getNode("n4");
+                n4.on("input", function(msg) {
+                    msg.should.not.have.property("payload"); //payload removed
+                    msg.should.have.property("topic", "t_override"); //changed value to t_override
+                    msg.should.have.property("str1", "1"); //injected prop
+                    msg.should.have.property("num1", 1); //injected prop
+                    msg.should.have.property("bool1", true); //injected prop
+
+                    helper.clearFlows().then(function() {
+                        done();
+                    });
+                });
+                try {
+                    helper.request()
+                    .post('/inject/n1')
+                    .send({ __user_inject_props__: [
+                        {p:"topic", v:"t_override", vt:"str"}, //change value to t_override
+                        {p:"str1", v:"1", vt:"str"}, //new prop
+                        {p:"num1", v:"1", vt:"num"}, //new prop
+                        {p:"bool1", v:"true", vt:"bool"}, //new prop
+                    ]})
+                    .expect(200).end(function(err) {
+                        if (err) {
+                            console.log(err);
+                            return helper.clearFlows()
+                            .then(function () {
+                                done(err);
+                            });
+                        }
+                    });
+                } catch(err) {
+                    done(err);
+                }
+            });
+        });
+
         it('should fail for invalid node', function(done) {
             helper.request().post('/inject/invalid').expect(404).end(done);
         });

From 70f975e4f0594e6c8083c75eb6e4238fa347a1c1 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Fri, 21 May 2021 13:26:50 +0100
Subject: [PATCH 5/9] move inject button off dialog and onto form

---
 .../nodes/core/common/20-inject.html          | 52 ++++++++++---------
 .../nodes/locales/en-US/messages.json         |  2 +-
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index ce537d0fa..2052a10b8 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -692,14 +692,6 @@
                         title: node.name || (node._def.label && node._def.label.call(node)) || node._('inject.inject'),
                         width: 'inherit',
                         buttons: [
-                            {
-                                id: 'node-dialog-cancel',
-                                class: 'primary',
-                                text: node._('inject.userValueButtons.close'),
-                                click: function () {
-                                    RED.tray.close();
-                                }
-                            },
                             {
                                 id: 'node-dialog-apply',
                                 text: node._('inject.userValueButtons.apply'),
@@ -742,29 +734,44 @@
                                 }
                             },
                             {
-                                id: 'node-dialog-ok',
-                                text: node._('inject.userValueButtons.inject'),
+                                id: 'node-dialog-cancel',
+                                class: 'primary',
+                                text: node._('inject.userValueButtons.close'),
                                 click: function () {
-                                    var items = $('#node-inject-custom-list').editableList('items');
-                                    var result = getProps(items);
-                                    if (result && result.props && result.props.length) {
-                                        m = { __user_inject_props__: result.props };
-                                    }
-                                    doInject(m);
-                                    //RED.tray.close();
+                                    RED.tray.close();
                                 }
-                            }
+                            },
                         ],
                         resize: function (dimensions) {
                             $('#node-dialog-inject-custom .red-ui-editableList-container').css('height', '');//allow editable list to self size
                         },
                         open: function (tray) {
                             var trayBody = tray.find('.red-ui-tray-body');
-                            var dialog = $('<div id="node-dialog-inject-custom"></div>');
+                            // var dialog = $('<div id="node-dialog-inject-custom"></div>');
+                            var dialog = $('<div id="dialog-form" class="form-horizontal"></div>');
+                            
+                            var row1 = $('<div class="form-row" style="text-align: right;"></div>');
+                            var button = $('<button class="ui-button ui-corner-all ui-widget" id="node-inject-inject"></button>');
+                            button.text(node._('inject.userValueButtons.inject'));
+                            row1.append(button);
+
+                            var row2 = $('<div class="form-row"></div>');
                             var list = $('<ol id="node-inject-custom-list"></ol>');
-                            dialog.append(list);
-                            trayBody.append(dialog);
                             list.css('min-height', '120px').css('min-width', '400px');
+                            row2.append(list);
+                            
+                            dialog.append(row1);
+                            dialog.append(row2);
+                            trayBody.append(dialog);
+
+                            button.on("click", function() {
+                                var items = $('#node-inject-custom-list').editableList('items');
+                                var result = getProps(items);
+                                if (result && result.props && result.props.length) {
+                                    m = { __user_inject_props__: result.props };
+                                }
+                                doInject(m);
+                            });                            
                             var legacyOptions = {
                                 topic: node.topic,
                                 payload: node.payload,
@@ -778,9 +785,6 @@
                             }, 5);
                         },
                         show: function (tray) {
-                            //primary button is the cancel button but, for aestetics, colour the inject button. 
-                            $('#node-dialog-cancel').removeClass('primary');
-                            $('#node-dialog-ok').addClass('primary');
                             $('#node-dialog-inject-custom .red-ui-editableList-container').css('height', '');//allow editable list to self size
                         }
                     }
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 856674cac..87d004e19 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -88,7 +88,7 @@
         },
         "userValueButtons": {
             "close": "Close",
-            "apply": "Apply",
+            "apply": "Keep Changes",
             "inject": "Inject"
         }
     },

From e1c5764fbfd414c2870923f0a6240963bbdd7bc5 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Sat, 22 May 2021 10:52:44 +0100
Subject: [PATCH 6/9] move new inject button to existing edit form - revert
 refactoring of building editableList (not needed now) - remove node button
 modifier click & tray.show feature - add inject button to editableList
 [buttons] array - add `id` option to editableList to permit DOM access after
 creation - get the new inject button via its `id` and float it to the right -
 removed the popup tray buttons i18n entries

---
 .../src/js/ui/common/editableList.js          |   5 +-
 .../nodes/core/common/20-inject.html          | 389 +++++++-----------
 2 files changed, 144 insertions(+), 250 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
index 00666e5b4..ab35f811e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -18,7 +18,7 @@
 /**
  * options:
  *   - addButton : boolean|string - text for add label, default 'add'
- *   - buttons : array - list of custom buttons (objects with fields 'label', 'icon', 'title', 'click')
+ *   - buttons : array - list of custom buttons (objects with fields 'id', 'label', 'icon', 'title', 'click')
  *   - height : number|'auto'
  *   - resize : function - called when list as a whole is resized
  *   - resizeItem : function(item) - called to resize individual item
@@ -103,6 +103,9 @@
                         }
                     });
 
+                if (button.id) {
+                    element.attr("id", button.id);
+                }
                 if (button.title) {
                     element.attr("title", button.title);
                 }
diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index 2052a10b8..aecb20347 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -149,7 +149,20 @@
 
 <script type="text/javascript">
 (function() {
-    /** Retrieve editableList items (refactored for re-use in the custom inject)*/
+
+    function resizeDialog(size) {
+        size = size || { height: $(".red-ui-tray-content form").height() }
+        var rows = $("#dialog-form>div:not(.node-input-property-container-row):visible");
+        var height = size.height;
+        for (var i=0; i<rows.length; i++) {
+            height -= $(rows[i]).outerHeight(true);
+        }
+        var editorRow = $("#dialog-form>div.node-input-property-container-row");
+        height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+        height += 16;
+        $("#node-input-property-container").editableList('height',height);
+    }
+    /** Retrieve editableList items (refactored for re-use in the form inject button)*/
     function getProps(el, legacy) {
         var result = {
             props: []
@@ -178,86 +191,33 @@
         });
         return result;
     }
-    /** Build the editableList items (refactored for re-use in the custom inject)*/
-    function buildEditableList(el, props, legacyProps) {
-        legacyProps = legacyProps || {};
-        var list = $(el);
-        list.editableList({
-            addItem: function(container,i,opt) {
-                var prop = opt;
-                if (!prop.hasOwnProperty('p')) {
-                    prop = {p:"",v:"",vt:"str"};
-                }
-                container.css({
-                    overflow: 'hidden',
-                    whiteSpace: 'nowrap'
-                });
-                var row = $('<div/>').appendTo(container);
-
-                var propertyName = $('<input/>',{class:"node-input-prop-property-name",type:"text"})
-                    .css("width","30%")
-                    .appendTo(row)
-                    .typedInput({types:['msg']});
-
-                $('<div/>',{style: 'display:inline-block; padding:0px 6px;'})
-                    .text('=')
-                    .appendTo(row);
-
-                var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
-                    .css("width","calc(70% - 30px)")
-                    .appendTo(row)
-                    .typedInput({default:'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
-
-                propertyName.typedInput('value',prop.p);
-                propertyValue.typedInput('value',prop.v);
-                propertyValue.typedInput('type',prop.vt);
+    /** Perform inject, optionally sending a custom msg (refactored for re-use in the form inject button)*/
+    function doInject(node, customMsg) {
+        var label = node._def.label.call(node);
+        if (label.length > 30) {
+            label = label.substring(0, 50) + "...";
+        }
+        label = label.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+        $.ajax({
+            url: "inject/" + node.id,
+            type: "POST",
+            data: customMsg,
+            success: function (resp) {
+                RED.notify(node._("inject.success", { label: label }), { type: "success", id: "inject", timeout: 2000 });
             },
-            removable: true,
-            sortable: true
-        });
-        if (!props) {
-            var payload = {
-                p:'payload',
-                v: legacyProps.payload ? legacyProps.payload : '',
-                vt:legacyProps.payloadType ? legacyProps.payloadType : 'date'
-            };
-            var topic = {
-                p:'topic',
-                v: legacyProps.topic ? legacyProps.topic : '',
-                vt:'string'
-            }
-            props = [payload,topic];
-        }
-
-        for (var i=0; i<props.length; i++) {
-            var prop = props[i];
-            var newProp = { p: prop.p, v: prop.v, vt: prop.vt };
-            if (newProp.v === undefined) {
-                if (prop.p === 'payload') {
-                    newProp.v = legacyProps.payload ? legacyProps.payload : '';
-                    newProp.vt = legacyProps.payloadType ? legacyProps.payloadType : 'date';
-                } else if (prop.p === 'topic' && prop.vt === "str") {
-                    newProp.v =  legacyProps.topic ? legacyProps.topic : '';
+            error: function (jqXHR, textStatus, errorThrown) {
+                if (jqXHR.status == 404) {
+                    RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.not-deployed") }), "error");
+                } else if (jqXHR.status == 500) {
+                    RED.notify(node._("common.notification.error", { message: node._("inject.errors.failed") }), "error");
+                } else if (jqXHR.status == 0) {
+                    RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.no-response") }), "error");
+                } else {
+                    RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.unexpected", { status: jqXHR.status, message: textStatus }) }), "error");
                 }
             }
-            list.editableList('addItem',newProp);
-        }
-        return list;
+        });
     }
-
-    function resizeDialog(size) {
-        size = size || { height: $(".red-ui-tray-content form").height() }
-        var rows = $("#dialog-form>div:not(.node-input-property-container-row):visible");
-        var height = size.height;
-        for (var i=0; i<rows.length; i++) {
-            height -= $(rows[i]).outerHeight(true);
-        }
-        var editorRow = $("#dialog-form>div.node-input-property-container-row");
-        height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-        height += 16;
-        $("#node-input-property-container").editableList('height',height);
-    }
-
     RED.nodes.registerType('inject',{  
         category: 'common',
         color:"#a6bbcf",
@@ -378,14 +338,15 @@
             return this.name?"node_label_italic":"";
         },
         oneditprepare: function() {
-            if (this.payloadType == null) {
-                if (this.payload == "") {
-                    this.payloadType = "date";
+            var node = this;
+            if (node.payloadType == null) {
+                if (node.payload == "") {
+                    node.payloadType = "date";
                 } else {
-                    this.payloadType = "str";
+                    node.payloadType = "str";
                 }
-            } else if (this.payloadType === 'string' || this.payloadType === 'none') {
-                this.payloadType = "str";
+            } else if (node.payloadType === 'string' || node.payloadType === 'none') {
+                node.payloadType = "str";
             }
 
             $("#inject-time-type-select").on("change", function() {
@@ -440,17 +401,17 @@
             });
 
             var repeattype = "none";
-            if (this.repeat != "" && this.repeat != 0) {
+            if (node.repeat != "" && node.repeat != 0) {
                 repeattype = "interval";
                 var r = "s";
-                var c = this.repeat;
-                if (this.repeat % 60 === 0) { r = "m"; c = c/60; }
-                if (this.repeat % 1440 === 0) { r = "h"; c = c/60; }
+                var c = node.repeat;
+                if (node.repeat % 60 === 0) { r = "m"; c = c/60; }
+                if (node.repeat % 1440 === 0) { r = "h"; c = c/60; }
                 $("#inject-time-interval-count").val(c);
                 $("#inject-time-interval-units").val(r);
                 $("#inject-time-interval-days").prop("disabled","disabled");
-            } else if (this.crontab) {
-                var cronparts = this.crontab.split(" ");
+            } else if (node.crontab) {
+                var cronparts = node.crontab.split(" ");
                 var days = cronparts[4];
                 if (!isNaN(cronparts[0]) && !isNaN(cronparts[1])) {
                     repeattype = "time";
@@ -525,21 +486,93 @@
             $("#inject-time-row-"+repeattype).show();
 
             /* */
-            var list = $('#node-input-property-container');
-            list.css('min-height','120px').css('min-width','450px');
-            var legacyOptions = {
-                topic: this.topic,
-                payload: this.payload,
-                payloadType: this.payloadType,
+
+            var eList = $('#node-input-property-container').css('min-height','120px').css('min-width','450px');
+            eList.editableList({
+                buttons: [
+                    {
+                        id: "node-inject-test-inject-button",
+                        label: node._("inject.inject"),
+                        icon: "fa fa-bolt",
+                        click: function(e) {
+                            var items = eList.editableList('items');
+                            var result = getProps(items);
+                            var m = {__user_inject_props__: []};
+                            if (result && result.props && result.props.length) {
+                                m.__user_inject_props__ = result.props;
+                            }
+                            doInject(node, m);
+                        }
+                    }
+                ],
+                addItem: function(container,i,opt) {
+                    var prop = opt;
+                    if (!prop.hasOwnProperty('p')) {
+                        prop = {p:"",v:"",vt:"str"};
+                    }
+                    container.css({
+                        overflow: 'hidden',
+                        whiteSpace: 'nowrap'
+                    });
+                    var row = $('<div/>').appendTo(container);
+
+                    var propertyName = $('<input/>',{class:"node-input-prop-property-name",type:"text"})
+                        .css("width","30%")
+                        .appendTo(row)
+                        .typedInput({types:['msg']});
+
+                    $('<div/>',{style: 'display:inline-block; padding:0px 6px;'})
+                        .text('=')
+                        .appendTo(row);
+
+                    var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
+                        .css("width","calc(70% - 30px)")
+                        .appendTo(row)
+                        .typedInput({default:'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
+
+                    propertyName.typedInput('value',prop.p);
+
+                    propertyValue.typedInput('value',prop.v);
+                    propertyValue.typedInput('type',prop.vt);
+                },
+                removable: true,
+                sortable: true
+            });
+            $('#node-inject-test-inject-button').addClass('primary').css("float", "right").css("margin-right", "unset");
+
+            if (!node.props) {
+                var payload = {
+                    p:'payload',
+                    v: node.payload ? node.payload : '',
+                    vt:node.payloadType ? node.payloadType : 'date'
+                };
+                var topic = {
+                    p:'topic',
+                    v: node.topic ? node.topic : '',
+                    vt:'string'
+                }
+                node.props = [payload,topic];
+            }
+
+            for (var i=0; i<node.props.length; i++) {
+                var prop = node.props[i];
+                var newProp = { p: prop.p, v: prop.v, vt: prop.vt };
+                if (newProp.v === undefined) {
+                    if (prop.p === 'payload') {
+                        newProp.v = node.payload ? node.payload : '';
+                        newProp.vt = node.payloadType ? node.payloadType : 'date';
+                    } else if (prop.p === 'topic' && prop.vt === "str") {
+                        newProp.v =  node.topic ? node.topic : '';
+                    }
+                }
+                eList.editableList('addItem',newProp);
             }
-            buildEditableList(list, this.props, legacyOptions);
 
             $("#inject-time-type-select").trigger("change");
             $("#inject-time-interval-time-start").trigger("change");
 
         },
         oneditsave: function() {
-            var node = this;
             var repeat = "";
             var crontab = "";
             var type = $("#inject-time-type-select").val();
@@ -630,168 +663,26 @@
             $("#node-input-repeat").val(repeat);
             $("#node-input-crontab").val(crontab);
 
-            /* Gather the injected properties of the msg object */
+            /* Gather the properties */
             var items = $("#node-input-property-container").editableList('items');
-            delete node.payloadType;
-            delete node.payload;
-            node.topic = "";
+            delete this.payloadType;
+            delete this.payload;
+            this.topic = "";
             var result = getProps(items, true);
-            node.props = result.props;
-            if(result.payloadType) { node.payloadType = result.payloadType; };
-            if(result.payload) { node.payload = result.payload; };
-            if(result.topic) { node.topic = result.topic; };
+            this.props = result.props;
+            if(result.payloadType) { this.payloadType = result.payloadType; };
+            if(result.payload) { this.payload = result.payload; };
+            if(result.topic) { this.topic = result.topic; };
         },
         button: {
             enabled: function() {
                 return !this.changed
             },
             onclick: function () {
-                var node = this;
-                if (node.changed) {
+                if (this.changed) {
                     return RED.notify(RED._("notification.warning", { message: RED._("notification.warnings.undeployedChanges") }), "warning");
                 }
-
-                var doInject = function (customMsg) {
-                    var label = node._def.label.call(node);
-                    if (label.length > 30) {
-                        label = label.substring(0, 50) + "...";
-                    }
-                    label = label.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-                    $.ajax({
-                        url: "inject/" + node.id,
-                        type: "POST",
-                        data: customMsg,
-                        success: function (resp) {
-                            RED.notify(node._("inject.success", { label: label }), { type: "success", id: "inject", timeout: 2000 });
-                        },
-                        error: function (jqXHR, textStatus, errorThrown) {
-                            if (jqXHR.status == 404) {
-                                RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.not-deployed") }), "error");
-                            } else if (jqXHR.status == 500) {
-                                RED.notify(node._("common.notification.error", { message: node._("inject.errors.failed") }), "error");
-                            } else if (jqXHR.status == 0) {
-                                RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.no-response") }), "error");
-                            } else {
-                                RED.notify(node._("common.notification.error", { message: node._("common.notification.errors.unexpected", { status: jqXHR.status, message: textStatus }) }), "error");
-                            }
-                        }
-                    });
-                }
-                
-                if (window.event.ctrlKey) {
-                    var wasDirty = node.dirty;
-                    // var wasDirty = RED.nodes.dirty();
-                    var originalProps = {
-                        props: node.props,
-                        payloadType: node.payloadType,
-                        payload: node.payload,
-                        topic: node.topic
-                    };
-                    var originalPropsJSON = JSON.stringify(originalProps);
-                    var trayOptions = {
-                        title: node.name || (node._def.label && node._def.label.call(node)) || node._('inject.inject'),
-                        width: 'inherit',
-                        buttons: [
-                            {
-                                id: 'node-dialog-apply',
-                                text: node._('inject.userValueButtons.apply'),
-                                click: function () {
-                                    delete node.payload;
-                                    node.topic = "";
-                                    var items = $('#node-inject-custom-list').editableList('items');
-                                    var result = getProps(items, true);
-                                    node.props = result.props;
-                                    if(result.payloadType) { node.payloadType = result.payloadType; };
-                                    if(result.payload) { node.payload = result.payload; };
-                                    if(result.topic) { node.topic = result.topic; };
-                                    var newProps = {
-                                        props: node.props,
-                                        payloadType: node.payloadType,
-                                        payload: node.payload,
-                                        topic: node.topic
-                                    };
-                                    var newPropsJSON = JSON.stringify(newProps);
-                                    var changed = newPropsJSON != originalPropsJSON;
-                                    if (changed) {
-                                        var changes = JSON.parse(originalPropsJSON);
-                                        node.changed = true;
-                                        RED.nodes.dirty(true);
-                                        var historyEvent = {
-                                            t:'edit',
-                                            node:node,
-                                            changes:changes,
-                                            dirty:wasDirty,
-                                            changed:changed
-                                        };
-                                        RED.history.push(historyEvent);
-                                    }
-                                    node.dirty = true;
-                                    RED.editor.validateNode(node);
-                                    RED.events.emit("editor:save",node);
-                                    RED.events.emit("nodes:change",node);
-                                    RED.tray.close();//should apply close the dialog?
-                                    RED.view.redraw();
-                                }
-                            },
-                            {
-                                id: 'node-dialog-cancel',
-                                class: 'primary',
-                                text: node._('inject.userValueButtons.close'),
-                                click: function () {
-                                    RED.tray.close();
-                                }
-                            },
-                        ],
-                        resize: function (dimensions) {
-                            $('#node-dialog-inject-custom .red-ui-editableList-container').css('height', '');//allow editable list to self size
-                        },
-                        open: function (tray) {
-                            var trayBody = tray.find('.red-ui-tray-body');
-                            // var dialog = $('<div id="node-dialog-inject-custom"></div>');
-                            var dialog = $('<div id="dialog-form" class="form-horizontal"></div>');
-                            
-                            var row1 = $('<div class="form-row" style="text-align: right;"></div>');
-                            var button = $('<button class="ui-button ui-corner-all ui-widget" id="node-inject-inject"></button>');
-                            button.text(node._('inject.userValueButtons.inject'));
-                            row1.append(button);
-
-                            var row2 = $('<div class="form-row"></div>');
-                            var list = $('<ol id="node-inject-custom-list"></ol>');
-                            list.css('min-height', '120px').css('min-width', '400px');
-                            row2.append(list);
-                            
-                            dialog.append(row1);
-                            dialog.append(row2);
-                            trayBody.append(dialog);
-
-                            button.on("click", function() {
-                                var items = $('#node-inject-custom-list').editableList('items');
-                                var result = getProps(items);
-                                if (result && result.props && result.props.length) {
-                                    m = { __user_inject_props__: result.props };
-                                }
-                                doInject(m);
-                            });                            
-                            var legacyOptions = {
-                                topic: node.topic,
-                                payload: node.payload,
-                                payloadType: node.payloadType,
-                            }
-                            buildEditableList(list, node.props, legacyOptions);
-                        },
-                        close: function () {
-                            setTimeout(function () {
-                                $('#node-dialog-inject-custom').dialog('destroy').remove();
-                            }, 5);
-                        },
-                        show: function (tray) {
-                            $('#node-dialog-inject-custom .red-ui-editableList-container').css('height', '');//allow editable list to self size
-                        }
-                    }
-                    RED.tray.show(trayOptions);
-                } else {
-                    doInject();
-                }
+                doInject(this);
             }
         },
         oneditresize: resizeDialog

From bfc1f95190b99e212747e7cab0c58bf24f3b84b3 Mon Sep 17 00:00:00 2001
From: Steve-Mcl <sdmclaughlin@gmail.com>
Date: Tue, 25 May 2021 13:53:59 +0100
Subject: [PATCH 7/9] remove redundant i18n entries - no longer needed since
 moving inject onto edit form

---
 .../node_modules/@node-red/nodes/locales/en-US/messages.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 87d004e19..6945ee8ae 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -85,11 +85,6 @@
             "failed": "inject failed, see log for details",
             "toolong": "Interval too large",
             "invalid-expr": "Invalid JSONata expression: __error__"
-        },
-        "userValueButtons": {
-            "close": "Close",
-            "apply": "Keep Changes",
-            "inject": "Inject"
         }
     },
     "catch": {

From 9b46dbaff14b4beeb30fa257a0b5eb50165624c2 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 8 Jun 2021 10:56:04 +0100
Subject: [PATCH 8/9] Switch editableList buttons from <a> to <button> elements

---
 .../@node-red/editor-client/src/js/ui/common/editableList.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
index ab35f811e..ea1938e5c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js
@@ -94,7 +94,7 @@
             }
 
             buttons.forEach(function(button) {
-                var element = $('<a href="#" class="red-ui-button red-ui-button-small red-ui-editableList-addButton" style="margin-top: 4px; margin-right: 5px;"></a>')
+                var element = $('<button type="button" class="red-ui-button red-ui-button-small red-ui-editableList-addButton" style="margin-top: 4px; margin-right: 5px;"></button>')
                     .appendTo(that.topContainer)
                     .on("click", function(evt) {
                         evt.preventDefault();

From c8bcd2818d4dd68bea9a2c55ee14cd2a5b7d66e0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 8 Jun 2021 10:56:34 +0100
Subject: [PATCH 9/9] Disable inject-now button if inside subflow

---
 .../@node-red/nodes/core/common/20-inject.html         | 10 +++++++---
 .../@node-red/nodes/locales/en-US/messages.json        |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index aecb20347..8e40b8cd8 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -488,12 +488,12 @@
             /* */
 
             var eList = $('#node-input-property-container').css('min-height','120px').css('min-width','450px');
+
             eList.editableList({
                 buttons: [
                     {
                         id: "node-inject-test-inject-button",
-                        label: node._("inject.inject"),
-                        icon: "fa fa-bolt",
+                        label: node._("inject.injectNow"),
                         click: function(e) {
                             var items = eList.editableList('items');
                             var result = getProps(items);
@@ -538,7 +538,11 @@
                 removable: true,
                 sortable: true
             });
-            $('#node-inject-test-inject-button').addClass('primary').css("float", "right").css("margin-right", "unset");
+            $('#node-inject-test-inject-button').css("float", "right").css("margin-right", "unset");
+
+            if (RED.nodes.subflow(node.z)) {
+                $('#node-inject-test-inject-button').attr("disabled",true);
+            }
 
             if (!node.props) {
                 var payload = {
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 6945ee8ae..e5108710b 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -32,6 +32,7 @@
     },
     "inject": {
         "inject": "inject",
+        "injectNow": "inject now",
         "repeat": "repeat = __repeat__",
         "crontab": "crontab = __crontab__",
         "stopped": "stopped",