feat: disable discovery #405 (#476)

zwave-js · May 13, 2020 · c72f250 · c72f250
1 parent c87c8d2
commit c72f250
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/app.js b/app.js
@@ -85,6 +85,9 @@ app.startSocket = function (server) {
         case 'rediscoverNode':
           gw.rediscoverNode(data.node_id)
           break;
+        case 'disableDiscovery':
+          gw.disableDiscovery(data.node_id)
+          break;
         case 'update':
           gw.zwave.updateDevice(data.device, data.node_id)
           break;

diff --git a/lib/Gateway.js b/lib/Gateway.js
@@ -666,8 +666,25 @@ Gateway.prototype.rediscoverNode = function (nodeID) {
   }
 }
 
+Gateway.prototype.disableDiscovery = function (nodeID) {
+  var node = this.zwave.nodes[nodeID]
+  if (node && node.hassDevices) {
+    for (const id in node.hassDevices) {
+      node.hassDevices[id].ignoreDiscovery = true
+    }
+
+    this.zwave.emitEvent('NODE_UPDATED', node)
+  }
+}
+
 Gateway.prototype.publishDiscovery = function (hassDevice, nodeId, deleteDevice, update) {
   try {
+    if (hassDevice.ignoreDiscovery) {
+      return
+    } else {
+      hassDevice.ignoreDiscovery = false
+    }
+
     // set values as discovered
     for (let k = 0; k < hassDevice.values.length; k++) {
       this.discovered[nodeId + '-' + hassDevice.values[k]] = hassDevice

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
@@ -92,7 +92,7 @@
           <v-tabs-items v-model="currentTab">
             <!-- TAB NODE INFO -->
             <v-tab-item key="node">
-              <v-container v-if="selectedNode" grid-list-md>
+              <v-container v-if="selectedNode" style="min-width:90%" grid-list-md>
                 <v-layout row>
                   <v-flex xs3>
                     <v-select
@@ -234,6 +234,7 @@
                       <v-btn color="blue darken-1" text @click.native="storeDevices(false)">Store</v-btn>
                       <v-btn color="red darken-1" text @click.native="storeDevices(true)">Remove Store</v-btn>
                       <v-btn color="green darken-1" text @click.native="rediscoverNode">Rediscover Node</v-btn>
+                      <v-btn color="yellow darken-1" text @click.native="disableDiscovery">Disable Discovery</v-btn>
 
                       <v-data-table :headers="headers_hass" :items="hassDevices" class="elevation-1">
                         <template v-slot:item="{ item }">
@@ -246,6 +247,7 @@
                             <td class="text-xs">{{ item.type }}</td>
                             <td class="text-xs">{{ item.object_id }}</td>
                             <td class="text-xs">{{ item.persistent ? 'Yes' : 'No' }}</td>
+                            <td class="text-xs">{{ item.ignoreDiscovery ? 'Disabled' : 'Enabled' }}</td>
                           </tr>
                         </template>
                       </v-data-table>
@@ -608,7 +610,8 @@ export default {
         { text: 'Id', value: 'id' },
         { text: 'Type', value: 'type' },
         { text: 'Object id', value: 'object_id' },
-        { text: 'Persistent', value: 'persistent' }
+        { text: 'Persistent', value: 'persistent' },
+        { text: 'Discovery', value: 'ignoreDiscovery' }
       ],
       selectedDevice: null,
       errorDevice: false,
@@ -927,6 +930,15 @@ export default {
         })
       }
     },
+    async disableDiscovery () {
+      var node = this.selectedNode
+      if (node && await this.confirm('Rediscover node', 'Are you sure you want to disable discovery of all values? In order to make this persistent remember to click on Store')) {
+        this.socket.emit(this.socketActions.hass, {
+          apiName: 'disableDiscovery',
+          node_id: this.selectedNode.node_id
+        })
+      }
+    },
     async rediscoverDevice () {
       var device = this.selectedDevice
       if (device && await this.confirm('Are you sure you want to re-discover selected device?')) {