pushing new working version

Author: tuliopascoal

78-cloudant-cf.html renamed to 77-cloudant-cf.html

@@ -88,8 +88,17 @@
 </script>
 
 <script type="text/x-red" data-template-name="cloudant out">
+
     <div class="form-row">
-        <label for="node-input-cloudant"><i class="fa fa-tag"></i> Account</label>
+        <label for="node-input-service"><i class="fa fa-folder-close"></i> Service</label>
+        <select id="node-input-service">
+            <option value="" disabled></option>
+            <option value="_ext_"> External service</option>
+        </select>
+    </div>
+
+    <div class="form-row hide" id="node-input-external-details">
+        <label for="node-input-cloudant"><i class=" fa fa-bookmark"></i> Server</label>
         <input type="text" id="node-input-cloudant">
     </div>
 
@@ -127,6 +136,7 @@
             else $(".node-input-payonly").show();
         });
     </script>
+
 </script>
 
 <script type="text/x-red" data-help-name="cloudant out">
@@ -150,26 +160,72 @@
     </p>
 </script>
 
-<script type="text/javascript">
-    RED.nodes.registerType("cloudant out", {
-        category: "storage-output",
-        color: "rgb(114, 199, 231)",
-        defaults: {
-            cloudant: { type: "cloudant", required: true },
-            name: { value: "" },
-            db: { value: "", required: true },
-            payonly: { value: false },
-            operation: { value: "insert" }
-        },
-        inputs: 1,
-        outputs: 0,
-        icon: "cloudant.png",
-        align: "right",
-        label: function() {
-            return this.name || "cloudant";
-        },
-        labelStyle: function() {
-            return this.name ? "node_label_italic" : "";
+<script type="text/javascript"> //js functions
+    (function() {
+
+        function oneditprepare() {
+            var select = $('#node-input-service');
+            var node = this;
+            $.getJSON('cloudantnode/vcap/',function(data) {
+                var last = select.children().last();
+                var opts = [];
+                for (var i =0;i<data.length;i++) {
+                    opts.push('<option value="'+data[i].name+'"'+(node.service==data[i].name?" selected":"")+'>'+data[i].name+'</option>');
+                }
+                if (opts.length == 0) {
+                    node.service = "_ext_";
+                    select.find("option").filter(function() {return $(this).val() == node.service;}).attr('selected',true);
+                } else {
+                    last.before(opts.join(""));
+                }
+                select.change();
+            });
+            select.change(function() {
+                var service = select.val();
+                if (service == "_ext_") {
+                    $("#node-input-external-details").show();
+                } else {
+                    $("#node-input-external-details").hide();
+                }
+            });
         }
-    });
+
+        function label() {
+            var cloudantNode = RED.nodes.node(this.cloudant);
+            if (this.name) {
+                return this.name;
+            }
+            if (this.service == "_ext_") {
+                return (cloudantNode?cloudantNode.label()+" "+this.collection:"cloudant");
+            }
+            return this.service||"cloudant";
+        }
+
+        function validateServer(v) {
+            return this.service != "_ext_" || v!="_ADD_";
+        }
+
+        RED.nodes.registerType("cloudant out", {
+            category: "storage-output",
+            color: "rgb(114, 199, 231)",
+            defaults: {
+                service: { value: "", required: true },
+                cloudant: { type:"cloudant",validate:validateServer}, //validate server
+                name: { value: "" },
+                db: { value: "", required: true },
+                payonly: { value: false },
+                operation: { value: "insert" }
+            },
+            inputs: 1,
+            outputs: 0,
+            icon: "cloudant.png",
+            align: "right",
+            label: label, //called
+            labelStyle: function() {
+                return this.name?"node_label_italic":"";
+            },
+            oneditprepare: oneditprepare //called
+        });
+    })();
+
 </script>

78-cloudant-cf.js renamed to 77-cloudant-cf.js

@@ -14,8 +14,27 @@
  * limitations under the License.
  **/
 
-module.exports = function(RED) {
-    "use strict";
+
+    var when = require("when");
+
+    var cfEnv = require("cf-env"); 
+    var cfCore = cfEnv.getCore();
+
+    var services = [];
+
+    for (var i in cfCore.services) {
+
+        console.log(cfCore.services[i]);
+
+        services = services.concat(cfCore.services[i].map(function(v) {
+            return {name:v.name,label:v.label};
+        }));
+    }
+
+    console.log(services);
+ 
+    var RED = require(process.env.NODE_RED_HOME+"/red/red");
+
     var url         = require('url');
     var querystring = require('querystring');
 
@@ -44,6 +63,7 @@ module.exports = function(RED) {
 
     RED.nodes.registerType("cloudant", CloudantNode);
 
+
     RED.httpAdmin.get('/cloudant/:id', function(req,res) {
         var credentials = RED.nodes.getCredentials(req.params.id);
 
@@ -64,6 +84,10 @@ module.exports = function(RED) {
         res.send(200);
     });
 
+    RED.httpAdmin.get('/cloudantnode/vcap', function(req,res) {
+        res.send(JSON.stringify(services));
+    });
+
     RED.httpAdmin.post('/cloudant/:id', function(req,res) {
         var body = "";
 
@@ -92,32 +116,47 @@ module.exports = function(RED) {
         });
     });
 
+
     function CloudantOutNode(n) {
         RED.nodes.createNode(this,n);
 
         this.operation      = n.operation;
         this.payonly        = n.payonly || false;
         this.database       = n.db;
         this.cloudant       = n.cloudant;
-        this.cloudantConfig = RED.nodes.getNode(this.cloudant);
+        //this.cloudantConfig = RED.nodes.getNode(this.cloudant);
+
+        if (n.service == "_ext_") {
+        var cloudantConfig = RED.nodes.getNode(this.cloudant);
+        if (cloudantConfig) {
+            this.url = cloudantConfig.url;
+        }   
+    } 
+        else if (n.service != "") {
+        var cloudantConfig = cfEnv.getService(n.service);
+        if (cloudantConfig) {
+            this.url = cloudantConfig.credentials.url||cloudantConfig.credentials.uri||Config.credentials.json_url;
+            //this.url = cloudantConfig.credentials.url;
+        }
+    }
 
-        if (this.cloudantConfig) {
+        if (this.url) { //this.url //this.cloudantConfig
             var node = this;
 
-            var nano = require('nano')(node.cloudantConfig.url);
+            var nano = require('nano')(this.url);
             var db   = nano.use(node.database);
 
             // check if the database exists and create it if it doesn't
-            nano.db.list(function(err, body) {
-                if (err) { node.error(err); }
-                else {
-                    if (body && body.indexOf(node.database) < 0) {
-                        nano.db.create(node.database, function(err, body) {
-                            if (err) { node.error(err); }
-                        });
-                    }
-                }
-            });
+             nano.db.list(function(err, body) {
+                 if (err) { node.error(err); }
+                  else {
+                     if (body && body.indexOf(node.database) < 0) {
+                         nano.db.create(node.database, function(err, body) {
+                             if (err) { node.error(err); }
+                         });
+                     }
+                 }
+             });
 
             node.on("input", function(msg) {
                 if (node.operation === "insert") {
@@ -130,7 +169,7 @@ module.exports = function(RED) {
                     });
                 }
                 else if (node.operation === "delete") {
-                    var doc = msg.payload;
+                    var doc = parseMessage(msg.payload, "");
 
                     if ("_rev" in doc && "_id" in doc) {
                         db.destroy(doc._id, doc._rev, function(err, body) {
@@ -166,4 +205,3 @@ module.exports = function(RED) {
     };
 
     RED.nodes.registerType("cloudant out", CloudantOutNode);
-}