make sure blank msg from ui_tempate gets caught

Author: Dave Conway-Jones

CHANGELOG.md

@@ -15,6 +15,7 @@
  - Fix navigation history, so back/formward browser buttons work. PR #587
  - Force socket.io to use secure link when using https.
  - Allow dropdowns to take up more space on screen for longer lists.
+ - Make sure we don't fail on a null msg from a template.
 
 ### 2.21.0: Milestone Release
 

dist/dashboard.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Tue May 05 2020 12:16:30 GMT+0100 (British Summer Time)
+# Time: Thu May 07 2020 14:01:13 GMT+0100 (British Summer Time)
 
 CACHE:
 i18n.js

nodes/ui_template.js

@@ -75,7 +75,7 @@ module.exports = function(RED) {
                 return { msg:clonedMsg };
             },
             beforeSend: function (msg, original) {
-                if (original) {
+                if (original && original.hasOwnProperty("msg") && original.msg !== null) {
                     var om = original.msg;
                     om.socketid = original.socketid;
                     return om;

ui.js

@@ -285,10 +285,12 @@ function add(opt) {
             }
             var toSend = {payload:converted};
             toSend = opt.beforeSend(toSend, msg) || toSend;
-            toSend.socketid = toSend.socketid || msg.socketid;
-            if (toSend.hasOwnProperty("topic") && (toSend.topic === undefined)) { delete toSend.topic; }
-            if (!msg.hasOwnProperty("_dontSend") && !msg.hasOwnProperty("_fromInput")) {   // TODO: deprecate _fromInput
-                opt.node.send(toSend);      // send to following nodes
+            if (toSend !== undefined) {
+                toSend.socketid = toSend.socketid || msg.socketid;
+                if (toSend.hasOwnProperty("topic") && (toSend.topic === undefined)) { delete toSend.topic; }
+                if (!msg.hasOwnProperty("_dontSend") && !msg.hasOwnProperty("_fromInput")) {   // TODO: deprecate _fromInput
+                    opt.node.send(toSend);      // send to following nodes
+                }
             }
         }
         if (opt.storeFrontEndInputAsState === true) {