From cb72d5100eeff889985be6f28f5fe9638d4299b5 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Mon, 22 Mar 2021 20:24:12 +0900
Subject: [PATCH] Remove type for typedInput in exec node

---
 .../node_modules/@node-red/nodes/core/function/90-exec.html    | 3 ---
 packages/node_modules/@node-red/nodes/core/function/90-exec.js | 3 +--
 test/nodes/core/function/90-exec_spec.js                       | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.html b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
index 7602866f7..7106a89b5 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.html
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.html
@@ -24,7 +24,6 @@
         <input type="checkbox" id="node-input-addpay" style="display:inline-block; width:auto;">
         &nbsp;
         <input type="text" id="node-input-addpayValue" style="width:160px;">
-        <input type="hidden" id="node-input-addpayValueType">
     </div>
     <div class="form-row">
         <label for="node-input-append"> </label>
@@ -56,7 +55,6 @@
             command: {value:""},
             addpay: {value:false},
             addpayValue: {value:"payload"},
-            addpayValueType: {value:"msg"},
             append: {value:""},
             useSpawn: {value:"false"},
             timer: {value:""},
@@ -88,7 +86,6 @@
             }
             $("#node-input-addpayValue").typedInput({
                 default: "msg",
-                typeField: $("#node-input-addpayValueType"),
                 types: ["msg"]
             });
         }
diff --git a/packages/node_modules/@node-red/nodes/core/function/90-exec.js b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
index 5b94d9258..47ab02eca 100644
--- a/packages/node_modules/@node-red/nodes/core/function/90-exec.js
+++ b/packages/node_modules/@node-red/nodes/core/function/90-exec.js
@@ -27,7 +27,6 @@ module.exports = function(RED) {
         if (n.addpay === undefined) { n.addpay = true; }
         this.addpay = n.addpay;
         this.addpayValue = n.addpayValue || "payload";
-        this.addpayValueType = n.addpayValueType || "msg";
         this.append = (n.append || "").trim();
         this.useSpawn = (n.useSpawn == "true");
         this.timer = Number(n.timer || 0)*1000;
@@ -67,7 +66,7 @@ module.exports = function(RED) {
                 // then prepend with the msg.payload
                 var arg = node.cmd;
                 if (node.addpay) {
-                    if (node.addpayValueType === "msg" && msg.hasOwnProperty(node.addpayValue)) {
+                    if (msg.hasOwnProperty(node.addpayValue)) {
                          arg += " " + RED.util.getMessageProperty(msg, node.addpayValue);
                     }
                 }
diff --git a/test/nodes/core/function/90-exec_spec.js b/test/nodes/core/function/90-exec_spec.js
index c74c716c6..c57225de8 100644
--- a/test/nodes/core/function/90-exec_spec.js
+++ b/test/nodes/core/function/90-exec_spec.js
@@ -115,7 +115,7 @@ describe('exec node', function() {
         });
 
         it('should exec a simple command with appended value from message', function (done) {
-            var flow = [{id:"n1", type:"exec", wires:[["n2"]], command:"echo", addpay:true, addpayValue:"topic", addpayValueType:"msg", append:"more", oldrc:"false"},
+            var flow = [{id:"n1", type:"exec", wires:[["n2"]], command:"echo", addpay:true, addpayValue:"topic", append:"more", oldrc:"false"},
                         {id:"n2", type:"helper"}];
             helper.load(execNode, flow, function () {
                 var n1 = helper.getNode("n1");