Merge pull request #642 from openWB/feature-refactor-status

Feature refactor status

Author: benderl

src/components/status/BatteryCard.vue

@@ -88,6 +88,11 @@ export default {
   props: {
     battery: { type: Object, required: true },
   },
+  data() {
+    return {
+      mqttTopicsToSubscribe: [`openWB/bat/${this.battery.id}/get/+`],
+    };
+  },
   computed: {
     baseTopic: {
       get() {

src/components/status/BatterySumCard.vue

@@ -84,6 +84,11 @@ export default {
     FontAwesomeIcon,
   },
   mixins: [ComponentState],
+  data() {
+    return {
+      mqttTopicsToSubscribe: ["openWB/bat/get/+"],
+    };
+  },
   computed: {
     baseTopic: {
       get() {

src/components/status/ChargePointCard.vue

@@ -218,10 +218,20 @@ export default {
     installedChargePointKey: { type: String, required: true },
     installedChargePoint: { type: Object, required: true },
   },
+  data() {
+    return {
+      mqttTopicsToSubscribe: [
+        `openWB/chargepoint/${this.installedChargePoint.id}/get/+`,
+        `"openWB/chargepoint/${this.installedChargePoint.id}/get/connected_vehicle/info`,
+        `"openWB/chargepoint/${this.installedChargePoint.id}/set/+`,
+        `"openWB/internal_chargepoint/${this.installedChargePoint.id}/data/phases_to_use`,
+      ],
+    };
+  },
   computed: {
     chargePointIndex: {
       get() {
-        return parseInt(this.installedChargePointKey.match(/(?:\/)(\d+)(?=\/)/)[1]);
+        return this.installedChargePoint.id;
       },
     },
     baseTopic: {
@@ -231,9 +241,8 @@ export default {
     },
     chargingStatus: {
       get() {
-        let ID = this.chargePointIndex;
-        let plugState = this.$store.state.mqtt["openWB/chargepoint/" + ID + "/get/plug_state"];
-        let chargeState = this.$store.state.mqtt["openWB/chargepoint/" + ID + "/get/charge_state"];
+        let plugState = this.$store.state.mqtt[this.baseTopic + "/get/plug_state"];
+        let chargeState = this.$store.state.mqtt[this.baseTopic + "/get/charge_state"];
 
         if (plugState == 1 && chargeState == 1) {
           return { icon: ["fas", "plug-circle-bolt"], text: "Fahrzeug angesteckt, Ladevorgang aktiv" };

src/components/status/ChargePointSumCard.vue

@@ -76,6 +76,17 @@ export default {
     FontAwesomeIcon,
   },
   mixins: [ComponentState],
+  data() {
+    return {
+      mqttTopicsToSubscribe: [
+        "openWB/chargepoint/get/power",
+        "openWB/chargepoint/get/imported",
+        "openWB/chargepoint/get/exported",
+        "openWB/chargepoint/get/daily_imported",
+        "openWB/chargepoint/get/daily_exported",
+      ],
+    };
+  },
   computed: {
     baseTopic: {
       get() {

src/components/status/CounterCard.vue

@@ -148,6 +148,11 @@ export default {
   props: {
     counter: { type: Object, required: true },
   },
+  data() {
+    return {
+      mqttTopicsToSubscribe: [`openWB/counter/${this.counter.id}/get/+`],
+    };
+  },
   computed: {
     baseTopic: {
       get() {

src/components/status/InverterCard.vue

@@ -80,6 +80,11 @@ export default {
   props: {
     inverter: { type: Object, required: true },
   },
+  data() {
+    return {
+      mqttTopicsToSubscribe: [`openWB/pv/${this.inverter.id}/get/+`],
+    };
+  },
   computed: {
     baseTopic: {
       get() {

src/components/status/InverterSumCard.vue

@@ -76,6 +76,11 @@ export default {
     FontAwesomeIcon,
   },
   mixins: [ComponentState],
+  data() {
+    return {
+      mqttTopicsToSubscribe: ["openWB/pv/get/+"],
+    };
+  },
   computed: {
     baseTopic: {
       get() {

src/components/status/VehicleCard.vue

@@ -57,10 +57,14 @@ export default {
   },
   mixins: [ComponentState],
   props: {
-    vehicle: { type: Object, required: false, default: undefined },
     vehicleKey: { type: String, required: true },
     vehicleName: { type: String, default: "" },
   },
+  data() {
+    return {
+      mqttTopicsToSubscribe: ["openWB/vehicle/+/get/+"],
+    };
+  },
   computed: {
     vehicleIndex: {
       get() {

src/views/Status.vue

@@ -81,30 +81,10 @@ export default {
         "openWB/general/extern",
         // components
         "openWB/system/device/+/component/+/config",
-        // counter
-        "openWB/counter/+/get/+",
-        // pv
-        "openWB/pv/get/+",
-        "openWB/pv/+/get/+",
-        // batteries
-        "openWB/bat/get/+",
-        "openWB/bat/+/get/+",
         // vehicles
         "openWB/vehicle/+/name",
-        "openWB/vehicle/+/get/+",
-        // charge points total
-        "openWB/chargepoint/get/power",
-        "openWB/chargepoint/get/imported",
-        "openWB/chargepoint/get/exported",
-        "openWB/chargepoint/get/daily_imported",
-        "openWB/chargepoint/get/daily_exported",
         // individual charge points
-        // these topics must be subscribed at last to avoid a buffer overflow
         "openWB/chargepoint/+/config",
-        "openWB/chargepoint/+/get/+",
-        "openWB/chargepoint/+/get/connected_vehicle/info",
-        "openWB/chargepoint/+/set/+",
-        "openWB/internal_chargepoint/+/data/phases_to_use",
       ],
     };
   },