feat: show associations of multi-instance devices #637 (#640)

zwave-js · Jul 24, 2020 · 305ff61 · 305ff61
1 parent 5c15a4f
commit 305ff61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -63,7 +63,7 @@
       </v-tooltip>
     </v-app-bar>
     <main>
-      <v-content>
+      <v-main>
         <router-view
           @import="importFile"
           @export="exportConfiguration"
@@ -72,7 +72,7 @@
           :socketEvents="socketEvents"
           :socketActions="socketActions"
         />
-      </v-content>
+      </v-main>
     </main>
 
     <v-snackbar

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
@@ -1272,7 +1272,7 @@ export default {
     getAssociations () {
       var g = this.group
       if (g && g.node) {
-        this.apiRequest('getAssociations', [g.node.node_id, g.group])
+        this.apiRequest('getAssociationsInstances', [g.node.node_id, g.group])
       }
     },
     addAssociation () {
@@ -1436,8 +1436,13 @@ export default {
     this.socket.on(this.socketEvents.api, async data => {
       if (data.success) {
         switch (data.api) {
-          case 'getAssociations':
-            data.result = data.result.map(a => self.nodes[a]._name || a)
+          case 'getAssociationsInstances':
+            data.result = data.result.map(
+              a =>
+                `- Node: ${self.nodes[a.nodeid]._name || a} Instance: ${
+                  a.instance
+                }`
+            )
             self.$set(self.group, 'associations', data.result.join('\n'))
             break
           case '_getScenes':