From c99d4bea7e98387f89cf8f8d7dd4bae295f794d2 Mon Sep 17 00:00:00 2001
From: Birkemosen <Birkemosen@users.noreply.github.com>
Date: Wed, 2 Sep 2020 10:08:03 +0200
Subject: [PATCH] Change hiding of PowerControlPanel to Dashboard.vue. Update
 power buttons state from moonraker response.

---
 src/components/panels/PowerControlPanel.vue | 14 ++++----------
 src/pages/Dashboard.vue                     |  5 +++--
 src/store/actions.js                        | 15 ++++++++++++---
 src/store/getters.js                        |  6 +++++-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/components/panels/PowerControlPanel.vue b/src/components/panels/PowerControlPanel.vue
index 261fdf5e..5d0285d3 100644
--- a/src/components/panels/PowerControlPanel.vue
+++ b/src/components/panels/PowerControlPanel.vue
@@ -2,7 +2,7 @@
 </style>
 
 <template>
-    <div v-if="devices.length > 0">
+    <div>
         <v-card>
             <v-toolbar flat dense>
                 <v-toolbar-title>
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { mapGetters, mapState } from "vuex";
+import { mapState } from "vuex";
 import Vue from "vue";
 
 export default {
@@ -45,21 +45,15 @@ export default {
         ...mapState({
             devices: (state) => state.power.devices,
         }),
-        ...mapGetters(["powerDevices"]),
-        powerDevicesCount() {
-            return this.powerDevices.length;
-        },
     },
     methods: {
         setPower(index, value) {
-            let rpc = value == 1 ? "post_power_on" : "post_power_off";
-            this.devices[index].status = value;
+            let rpc = value === 1 ? "post_power_on" : "post_power_off";
             let deviceId = this.devices[index].id;
-            this.$store.commit("setPowerDevice", this.devices);
             Vue.prototype.$socket.sendObj(
                 rpc,
                 { [deviceId]: "" },
-                "voidMutation"
+                "responsePowerToggle"
             );
         },
     },
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 21d9b2c4..0d109c56 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -12,7 +12,7 @@
             <tools-panel></tools-panel>
             <peripherie-panel class="mt-6" v-if="klippy_state === 'ready'"></peripherie-panel>
             <miniconsole-panel class="mt-6" v-if="klippy_state === 'ready' && showDashboardConsole"></miniconsole-panel>
-            <power-control-panel class="mt-6"></power-control-panel>
+            <power-control-panel class="mt-6" v-if="powerDevicesCount > 0"></power-control-panel>
         </v-col>
     </v-row>
 </template>
@@ -32,7 +32,8 @@
                 klippy_state: state => state.printer.webhooks.state,
             }),
             ...mapGetters([
-                'showDashboardWebcam'
+                'showDashboardWebcam',
+                'powerDevicesCount'
             ])
         },
         /*created() {
diff --git a/src/store/actions.js b/src/store/actions.js
index f2685af8..59be305d 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -10,7 +10,6 @@ export default {
         Vue.prototype.$socket.sendObj('get_directory', { path: '/gcodes' }, 'getDirectoryRoot');
         Vue.prototype.$socket.sendObj('get_printer_info', {}, 'getKlipperInfo');
         Vue.prototype.$socket.sendObj('get_power_devices', {}, 'getPowerDevices');
-        Vue.prototype.$socket.sendObj('get_power_status', {}, 'getPowerDevicesStatus');
     },
 
     socket_on_close ({ commit }, event) {
@@ -203,15 +202,21 @@ export default {
 
     getPowerDevices({ commit }, data) {
         if (data.error) {
-            Vue.$toast.error(data.error.message);
+            if (data.error.code != -32601) {
+                Vue.$toast.error(data.error.message);
+            }
         } else {
             commit('setPowerDevices', data.devices);
+            
+            Vue.prototype.$socket.sendObj('get_power_status', {}, 'getPowerDevicesStatus');
         }
     },
 
     getPowerDevicesStatus({ commit }, data) {
         if (data.error) {
-            Vue.$toast.error(data.error.message);
+            if (data.error.code != -32601) {
+                Vue.$toast.error(data.error.message);
+            }
         } else {
             commit('setPowerDevicesStatus', data);
         }
@@ -332,6 +337,10 @@ export default {
         commit('removeLoading', { name: 'bedMeshRemove' });
     },
 
+    responsePowerToggle({ commit }, data) {
+        commit('setPowerDevicesStatus', data);
+    },
+
     switchToDashboard() {
         router.push("/");
     },
diff --git a/src/store/getters.js b/src/store/getters.js
index e978f414..ed519277 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -280,5 +280,9 @@ export default {
 
     powerDevices: state => {
         return state.power.devices;
-    }
+    },
+
+    powerDevicesCount: (state, getters) => {
+        return getters.powerDevices.length;
+    },
 }
\ No newline at end of file