Migrate to ibm-watson

Author: chughts

services/discovery/v1-document-loader.html

@@ -38,22 +38,17 @@
     </div>
 
     <div class="form-row credentials">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-default-endpoint" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-default-endpoint" style="width: 70%;"> Use Default Service Endpoint</label>
-    </div>
-    <div class="form-row">
         <label for="node-input-service-endpoint"><i class="fa fa-tag"></i> Service Endpoint</label>
         <input type="text" id="node-input-service-endpoint" placeholder="https://gateway.watsonplatform.net/discovery/api">
     </div>
 
     <div class="form-row">
-        <label for="node-input-environment_id"><i class="fa fa-tag"></i> Environment ID</label>
-        <input type="text" id="node-input-environment_id" placeholder="">
+        <label for="node-input-environmentId"><i class="fa fa-tag"></i> Environment ID</label>
+        <input type="text" id="node-input-environmentId" placeholder="">
     </div>
     <div class="form-row">
-        <label for="node-input-collection_id"><i class="fa fa-tag"></i> Collection ID</label>
-        <input type="text" id="node-input-collection_id" placeholder="">
+        <label for="node-input-collectionId"><i class="fa fa-tag"></i> Collection ID</label>
+        <input type="text" id="node-input-collectionId" placeholder="">
     </div>
     <div class="form-row">
         <label for="node-input-filename"><i class="fa fa-tag"></i> Filename</label>
@@ -69,8 +64,8 @@
     <p>If a filename is not provided then one is automatically generated</p>
     <p>The collection being written to can be overridden by specifying the
     search ids in
-    <code>msg.discoveryparams.environment_id</code>
-    , <code>msg.discoveryparams.collection_id</code>
+    <code>msg.discoveryparams.environmentId</code>
+    , <code>msg.discoveryparams.collectionId</code>
     and <code>msg.discoveryparams.filename</code>
     </p>
     <p>The document to be added should be passed in as a data buffer
@@ -91,14 +86,6 @@
     var disdocV1 = new DiscoveryDocLoaderV1();
 
     disdocV1.UIListeners = function () {
-      $('input#node-input-default-endpoint').change(function () {
-          var checked = $('input#node-input-default-endpoint').prop('checked')
-          if (checked) {
-              $('#node-input-service-endpoint').parent().hide();
-          } else {
-              $('#node-input-service-endpoint').parent().show();
-          }
-      });
     }
 
     disdocV1.checkForPrepare = function () {
@@ -124,11 +111,10 @@
             category: 'IBM Watson',
             defaults: {
                 name: {value: ''},
-                environment_id: {value: ''},
-                collection_id: {value: ''},
+                environmentId: {value: ''},
+                collectionId: {value: ''},
                 filename: {value: ''},
-                'default-endpoint' :{value: true},
-                'service-endpoint' :{value: 'https://gateway.watsonplatform.net/discovery/api'}
+                'service-endpoint' :{value: ''}
             },
             credentials: {
               username: {type:'text'},

services/discovery/v1-document-loader.js

@@ -69,14 +69,18 @@ module.exports = function (RED) {
   function determineSuffix(msg) {
     // Let's assume that if we can't determine the suffix that
     // its a word doc.
-    var ext = '.json',
-      ft = fileType(msg.payload);
+    let ext = '.json';
+    if (! discoveryutils.isJsonObject(msg.payload)) {
+      let ext = '.json',
+        ft = fileType(msg.payload);
 
-    if (ft && ft.ext) {
-      ext = '.' + ft.ext;
-    }
-    if (isDocx(msg.payload)) {
-      ext = '.docx';
+      if (ft && ft.ext) {
+        ext = '.' + ft.ext;
+      }
+
+      if (isDocx(msg.payload)) {
+        ext = '.docx';
+      }
     }
 
     return Promise.resolve(ext);
@@ -131,20 +135,22 @@ module.exports = function (RED) {
       // modify as getting addJsonDocument will be deprecated messages
       if ('.json' === suffix) {
         //method = 'addJsonDocument';
-        params.file = JSON.stringify(params.file);
+        //params.file = JSON.stringify(params.file);
+
+        params.file = Buffer.from(JSON.stringify(params.file));
       //} else {
         //method = 'addDocument';
       }
       method = 'addDocument';
 
-      discovery[method](params, function (err, response) {
-        if (err) {
-          reject(err);
-        } else {
-          msg.document = response.document ? response.document : response;
+      discovery[method](params)
+        .then((response) => {
+          msg.document = response.result ? response.result : response;
           resolve();
-        }
-      });
+        })
+        .catch((err) => {
+          reject(err);
+        });
 
     });
     return p;
@@ -166,7 +172,7 @@ module.exports = function (RED) {
     var node = this;
     RED.nodes.createNode(this, config);
 
-    this.on('input', function (msg) {
+    this.on('input', function(msg, send, done) {
       var message = '',
         fileInfo = '',
         fileSuffix = '',
@@ -177,7 +183,7 @@ module.exports = function (RED) {
       apikey = sApikey || this.credentials.apikey;
 
       endpoint = sEndpoint;
-      if ((!config['default-endpoint']) && config['service-endpoint']) {
+      if (config['service-endpoint']) {
         endpoint = config['service-endpoint'];
       }
 
@@ -223,12 +229,13 @@ module.exports = function (RED) {
         .then(function(){
           temp.cleanup();
           node.status({});
-          node.send(msg);
+          send(msg);
+          done();
         })
         .catch(function(err){
           temp.cleanup();
-          payloadutils.reportError(node,msg,err);
-          node.send(msg);
+          let errMsg = payloadutils.reportError(node, msg, err);
+          done(errMsg);
         });
     });
   }