Merge branch 'master' into migration-0.19

NGRP · Jul 16, 2019 · 8bb4640 · 8bb4640
2 parents f503279 + 3d402ec
commit 8bb4640
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 
 <h3 align="center">- Node-RED open-source nodes -</h3>
 
-
 <h1 align="center">
   <a href="https://github.com/NGRP/node-red-contrib-viseo/wiki/Home">
     <img src="https://raw.githubusercontent.com/wiki/NGRP/node-red-viseo-bot/img/doc/header.png" alt="VISEO Bot Maker" width="100%">

diff --git a/node-red-contrib-bot-message/bot-event.html b/node-red-contrib-bot-message/bot-event.html
@@ -54,7 +54,7 @@ <h4>Events handled</h4>
         <dt>After reply </dt>
         <dd>after the bot replied to the user</dd>
         <dt>Before reply </dt>
-        <dd>juste before the bot to reply to the user</dd>
+        <dd>just before the bot reply to the user</dd>
     </dl>
 
     <h4>Precedence</h4>

diff --git a/node-red-contrib-bot-message/bot-transaction.js b/node-red-contrib-bot-message/bot-transaction.js
@@ -58,7 +58,7 @@ const input = (node, data, config) => {
         helper.emitAsyncEvent('reply', node, beforeData, config, (newData) => {
             helper.emitAsyncEvent('replied', node, newData, config, () => {})
             if (node.prompt) return; 
-            node.send(data)
+            node.send(data);
         });
     });
 };

diff --git a/node-red-contrib-bot-message/package.json b/node-red-contrib-bot-message/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-contrib-viseo-bot-message",
-    "version"       : "0.5.0-alpha.1",
+    "version"       : "0.5.0-alpha.2",
     "description"   : "VISEO Bot Maker - Sends messages to the user",
     "dependencies"  : {
         "mustache"                   : "^2.3.0",

diff --git a/node-red-contrib-file/node-file-xlsx.html b/node-red-contrib-file/node-file-xlsx.html
@@ -30,7 +30,8 @@
 
         },
         inputs:  1,
-        outputs: 1,
+        outputs: 2,
+        outputLabels: ["stdout", "stderr"],
         icon: "xlsx.svg",
         align: "left",
         paletteLabel: 'XLSX file',
@@ -204,6 +205,12 @@
 
     <p>Manipulate a XLSX file. </p>
 
+    <h3>Outputs</h3>
+    <ol class="node-ports">
+        <li>Standard output</li>
+        <li>Standard error</li>
+    </ol>
+
     <h3>Details</h3>
     <p>Properties</p>
     <dl class="message-properties">

diff --git a/node-red-contrib-file/node-file-xlsx.js b/node-red-contrib-file/node-file-xlsx.js
@@ -88,13 +88,12 @@ async function input(RED, node, data, config) {
   }
   catch(ex) {
     node.warn(ex);
-    helper.setContextValue(RED, node, data, config.output || "payload" , { "error": ex}, config.outputType);
+    helper.setContextValue(RED, node, data, config.output || "payload" , ex, config.outputType);
-    return node.send(data);
+    return node.send([undefined,data]);
   }
 
   helper.setContextValue(RED, node, data, config.output || "payload" , res, config.outputType);
-  return node.send(data);
+  return node.send([data, undefined]);
-
 }
 
 

diff --git a/node-red-contrib-file/package.json b/node-red-contrib-file/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-viseo-file",
-    "version": "0.3.0-alpha.4",
+    "version": "0.3.0-alpha.5",
     "description": "VISEO Bot Maker - Manage data with files",
     "dependencies": {
         "node-red-viseo-helper": "~0.1",