fix: Use correct entity type when removing node from integration

fixes #217
zachowj · Mar 9, 2020 · f842578 · f842578
1 parent 66345c9
commit f842578
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/lib/events-ha-node.js b/lib/events-ha-node.js
@@ -229,7 +229,9 @@ class EventsHaNode extends EventsNode {
     removeFromHomeAssistant(nodeRemoved = false) {
         if (
             this.websocketClient.integrationVersion === 0 ||
-            (!this.removeFromHA && !nodeRemoved)
+            (!this.removeFromHA && !nodeRemoved) ||
+            (this.nodeConfig.entityType &&
+                this.nodeConfig.entityType !== 'switch')
         ) {
             return;
         }

diff --git a/nodes/entity/entity.js b/nodes/entity/entity.js
@@ -48,15 +48,6 @@ module.exports = function(RED) {
 
         async init() {
             await this.loadPersistedData();
-
-            this.addEventClientListener(
-                `ha_events:config_update`,
-                this.onConfigUpdate.bind(this)
-            );
-
-            if (this.isConnected) {
-                this.registerEntity();
-            }
         }
 
         setConnectionStatus(additionalText) {
@@ -153,7 +144,12 @@ module.exports = function(RED) {
         onClose(removed) {
             super.onClose(removed);
 
-            if (this.registered && this.isConnected && removed) {
+            if (
+                this.nodeConfig.entityType !== 'switch' &&
+                this.registered &&
+                this.isConnected &&
+                removed
+            ) {
                 const payload = {
                     type: 'nodered/discovery',
                     server_id: this.nodeConfig.server.id,