From 0b6b51ce3432a4e1dbc1968768da8a580ee2e00e Mon Sep 17 00:00:00 2001
From: Pierre CLEMENT <pierre.clement@giroptic.com>
Date: Mon, 8 Jan 2018 20:41:04 +0100
Subject: [PATCH] fix(all): fix filter of "all" node

Close #11
---
 node-red-contrib-xiaomi-all/xiaomi-all.html | 17 +++++++++++++----
 node-red-contrib-xiaomi-all/xiaomi-all.js   |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/node-red-contrib-xiaomi-all/xiaomi-all.html b/node-red-contrib-xiaomi-all/xiaomi-all.html
index f01c579..93046db 100644
--- a/node-red-contrib-xiaomi-all/xiaomi-all.html
+++ b/node-red-contrib-xiaomi-all/xiaomi-all.html
@@ -1,4 +1,12 @@
 <script type="text/javascript">
+    function getOnlyModelsValue(input) {
+        var cleanOnlyModels = [];
+        input.forEach(function(value) {
+            cleanOnlyModels = cleanOnlyModels.concat(value.split(','));
+        });
+        return cleanOnlyModels;
+    }
+
     RED.nodes.registerType('xiaomi-all', {
         category: 'xiaomi',
         color: '#3FADB5',
@@ -24,7 +32,7 @@
                 if (configNodeID) {
                     var configNode = RED.nodes.node(configNodeID);
                     if(configNode) {
-                        onlyModels = onlyModels || $('#node-input-onlyModels').val() || [];
+                        onlyModels = getOnlyModelsValue(onlyModels || $('#node-input-onlyModels').val() || []);
                         excludedSids = excludedSids || $('#node-input-excludedSids').val() || [];
                         $('#node-input-excludedSids').empty();
                         for (key in configNode.deviceList) {
@@ -53,6 +61,7 @@
             if(!$('#node-input-excludedSids').val()) {
                 this.excludedSids = [];
             }
+            this.onlyModels = getOnlyModelsValue(this.onlyModels);
         }
     });
 </script>
@@ -71,10 +80,10 @@
     <div class="form-row">
         <label for="node-input-onlyModels"><i class="icon-tag"></i> Only</label>
         <select multiple id="node-input-onlyModels">
-            <option value="sensor_ht">Temperature/humidty</option>
+            <option value="sensor_ht,weather.v1">Temperature/humidty</option>
             <option value="motion">Motion</option>
-            <option value="switch">Switches</option>
-            <option value="magnet">Contacts</option>
+            <option value="switch,sensor_switch.aq2">Switches</option>
+            <option value="magnet,sensor_magnet.aq2">Contacts</option>
             <option value="plug">Plugs</option>
         </select>
     </div>
diff --git a/node-red-contrib-xiaomi-all/xiaomi-all.js b/node-red-contrib-xiaomi-all/xiaomi-all.js
index 595a650..b6317da 100644
--- a/node-red-contrib-xiaomi-all/xiaomi-all.js
+++ b/node-red-contrib-xiaomi-all/xiaomi-all.js
@@ -6,12 +6,14 @@ module.exports = (RED) => {
         this.gateway = RED.nodes.getNode(config.gateway);
         this.onlyModels = config.onlyModels;
         this.excludedSids = config.excludedSids;
+        console.log(this.onlyModels);
 
 
         this.isDeviceValid = (device) => {
             if((!this.onlyModels || this.onlyModels.length == 0) && (!this.excludedSids || this.excludedSids.length == 0)) {
                 return true;
             }
+            // Is excluded
             if((this.excludedSids && this.excludedSids.length != 0) && this.excludedSids.indexOf(device.sid) >= 0) {
                 return false;
             }