Merge branch 'openWB:main' into UPower

Author: ndrsnhs

package-lock.json

@@ -41,7 +41,7 @@
     "vue-axios": "^3.5.2",
     "vue-chartjs": "^5.3.2",
     "vue-router": "^4.5.0",
-    "vue3-table-lite": "^1.4.2",
+    "vue3-table-lite": "^1.4.3",
     "vuedraggable": "^4.1.0",
     "vuex": "^4.1.0"
   },
@@ -61,6 +61,6 @@
     "rollup-plugin-node-polyfills": "^0.2.1",
     "vite": "^4.5.9",
     "vite-plugin-node-polyfills": "^0.9.0",
-    "vitest": "^1.6.0"
+    "vitest": "^1.6.1"
   }
 }

package.json

@@ -1,7 +1,7 @@
 <template>
   <openwb-base-heading> Einstellungen für Backup-Cloud Modul "{{ backupCloud.name }}" </openwb-base-heading>
   <component
-    :is="myComponent"
+    :is="getBackupCloudComponent()"
     :backup-cloud="backupCloud"
     @update:configuration="updateConfiguration($event)"
     @send-command="sendCommand($event)"
@@ -18,16 +18,14 @@ export default {
     backupCloud: { type: Object, required: true },
   },
   emits: ["update:configuration", "sendCommand"],
-  computed: {
-    myComponent() {
-      console.debug(`loading backup cloud: ${this.backupCloud.name} (${this.backupCloud.type})`);
+  methods: {
+    getBackupCloudComponent() {
+      console.debug(`loading backup cloud: ${this.backupCloud.type}`);
       return defineAsyncComponent({
         loader: () => import(`./${this.backupCloud.type}/backup_cloud.vue`),
         errorComponent: OpenwbBackupCloudFallback,
       });
     },
-  },
-  methods: {
     // event pass through
     updateConfiguration(event) {
       this.$emit("update:configuration", event);

src/components/backup_clouds/OpenwbBackupCloudProxy.vue

@@ -1,14 +1,14 @@
 <template>
   <openwb-base-heading> Einstellungen für Ladepunkt Typ "{{ chargePoint.type }}" </openwb-base-heading>
   <component
-    :is="myChargePointSettingsComponent"
+    :is="getChargePointSettingsComponent()"
     :charge-point="chargePoint"
     @update:configuration="updateConfiguration($event)"
   />
   <hr />
   <openwb-base-heading> Befehle für Ladepunkt Typ "{{ chargePoint.type }}" </openwb-base-heading>
   <component
-    :is="myChargePointCommandsComponent"
+    :is="getChargePointCommandsComponent()"
     :charge-point="chargePoint"
   />
 </template>
@@ -24,23 +24,21 @@ export default {
     chargePoint: { required: true, type: Object },
   },
   emits: ["update:configuration"],
-  computed: {
-    myChargePointSettingsComponent() {
-      console.debug(`loading charge point settings: ${this.chargePoint.name} (${this.chargePoint.type})`);
+  methods: {
+    getChargePointSettingsComponent() {
+      console.debug(`loading charge point settings: ${this.chargePoint.type}`);
       return defineAsyncComponent({
         loader: () => import(`./${this.chargePoint.type}/chargePoint.vue`),
         errorComponent: OpenwbChargePointConfigFallback,
       });
     },
-    myChargePointCommandsComponent() {
-      console.debug(`loading charge point commands: ${this.chargePoint.name} (${this.chargePoint.type})`);
+    getChargePointCommandsComponent() {
+      console.debug(`loading charge point commands: ${this.chargePoint.type}`);
       return defineAsyncComponent({
         loader: () => import(`./${this.chargePoint.type}/commands.vue`),
         errorComponent: OpenwbChargePointCommandsFallback,
       });
     },
-  },
-  methods: {
     updateConfiguration(event) {
       this.$emit("update:configuration", event);
     },

src/components/charge_points/OpenwbChargePointProxy.vue

@@ -1,6 +1,6 @@
 <template>
   <component
-    :is="myComponent"
+    :is="getComponent()"
     :device="device"
     :component="component"
     :configuration="component ? component.configuration : device.configuration"
@@ -24,11 +24,9 @@ export default {
     component: { type: Object, required: false, default: undefined },
   },
   emits: ["update:configuration"],
-  computed: {
-    myComponent() {
-      console.debug(
-        `loading component: ${this.device.name} (${this.device.type}) / ${this.component?.name} (${this.component?.type})`,
-      );
+  methods: {
+    getComponent() {
+      console.debug(`loading component: ${this.device.type} / ${this.component?.type}`);
       if (this.component !== undefined) {
         return defineAsyncComponent({
           loader: () => import(`./${this.device.vendor}/${this.device.type}/${this.component.type}.vue`),
@@ -41,8 +39,6 @@ export default {
         });
       }
     },
-  },
-  methods: {
     updateConfiguration(event) {
       this.$emit("update:configuration", event);
     },

src/components/devices/OpenwbConfigProxy.vue

@@ -1,6 +1,21 @@
 <template>
   <div class="device-tesla">
     <openwb-base-heading> Einstellungen für Tesla </openwb-base-heading>
+    <openwb-base-alert subtype="danger">
+      <span style="font-weight: bold">
+        Tesla hat in der aktuellen Firmware-Version die lokale API der PowerWall abgeschaltet. </span
+      >Daher ist es mit dieser Firmware nicht mehr möglich, die PowerWall direkt auszulesen. Wir prüfen aktuell den
+      Zugriff über die Tesla-Server. Bis zur Umsetzung dieser Funktion ist es nicht möglich, die PowerWall lokal
+      auszulesen.<br />
+      <span style="font-weight: bold">
+        Wenn die lokale Abfrage bei Dir noch funktioniert, dann solltest Du die Firmware der PowerWall nicht
+        aktualisieren! </span
+      ><br />
+      Wir empfehlen, dass Du Tesla kontaktierst und Kritik an dieser Entscheidung mitteilst. Nur so können wir hoffen,
+      dass Tesla die lokale API wieder aktiviert. Mit der Cloud-API kommt es zwangsläufig zu Verzögerungen (Latenzen),
+      welche eine Regelung durch openWB erschweren. Weiterhin kommt es zu einem totalen Ausfall, wenn die
+      Internetverbindung gestört ist. Aus diesen Gründen ist eine lokale API immer vorzuziehen.
+    </openwb-base-alert>
     <openwb-base-text-input
       title="IP oder Hostname"
       subtype="host"

src/components/devices/tesla/tesla/device.vue

@@ -22,7 +22,7 @@
   </openwb-base-alert>
   <openwb-base-heading> Einstellungen für Display Theme "{{ displayTheme.name }}" </openwb-base-heading>
   <component
-    :is="myComponent"
+    :is="getDisplayThemeComponent()"
     :display-theme="displayTheme"
     @update:configuration="updateConfiguration($event)"
   />
@@ -47,16 +47,14 @@ export default {
     displayTheme: { type: Object, required: true },
   },
   emits: ["update:configuration"],
-  computed: {
-    myComponent() {
-      console.debug(`loading display theme: ${this.displayTheme.name} (${this.displayTheme.type})`);
+  methods: {
+    getDisplayThemeComponent() {
+      console.debug(`loading display theme: ${this.displayTheme.type}`);
       return defineAsyncComponent({
         loader: () => import(`./${this.displayTheme.type}/displayTheme.vue`),
         errorComponent: OpenwbDisplayThemeFallback,
       });
     },
-  },
-  methods: {
     updateConfiguration(event) {
       this.$emit("update:configuration", event);
     },

src/components/display_themes/OpenwbDisplayThemeProxy.vue

@@ -1,7 +1,7 @@
 <template>
   <openwb-base-heading> Einstellungen für Modul "{{ electricityTariff.name }}" </openwb-base-heading>
   <component
-    :is="myComponent"
+    :is="getTariffComponent()"
     :electricity-tariff="electricityTariff"
     @update:configuration="updateConfiguration($event)"
   />
@@ -17,16 +17,14 @@ export default {
     electricityTariff: { type: Object, required: true },
   },
   emits: ["update:configuration"],
-  computed: {
-    myComponent() {
-      console.debug(`loading electricity tariff: ${this.electricityTariff.name} (${this.electricityTariff.type})`);
+  methods: {
+    getTariffComponent() {
+      console.debug(`loading electricity tariff: ${this.electricityTariff.type}`);
       return defineAsyncComponent({
         loader: () => import(`./${this.electricityTariff.type}/electricity_tariff.vue`),
         errorComponent: OpenwbElectricityTariffFallback,
       });
     },
-  },
-  methods: {
     updateConfiguration(event) {
       this.$emit("update:configuration", event);
     },

src/components/electricity_tariffs/OpenwbElectricityTariffProxy.vue

@@ -53,7 +53,7 @@ export default {
       });
     },
     ac_current2dc_power(current) {
-      return parseFloat(((current * 3 * 230) / 1000).toFixed(2));
+      return parseFloat(((current * 3 * 230) / 1000).toFixed(0));
     },
     dc_power2ac_current(power) {
       return parseFloat(((power * 1000) / 230 / 3).toFixed(2));

src/components/mixins/ComponentState.vue

@@ -1,7 +1,7 @@
 <template>
   <openwb-base-heading> Einstellungen für Modul "{{ monitoring.name }}" </openwb-base-heading>
   <component
-    :is="myComponent"
+    :is="getMonitoringComponent()"
     :monitoring="monitoring"
     @update:configuration="updateConfiguration($event)"
   />
@@ -17,16 +17,14 @@ export default {
     monitoring: { type: Object, required: true },
   },
   emits: ["update:configuration"],
-  computed: {
-    myComponent() {
-      console.debug(`loading monitoring: ${this.monitoring.name} (${this.monitoring.type})`);
+  methods: {
+    getMonitoringComponent() {
+      console.debug(`loading monitoring: ${this.monitoring.type}`);
       return defineAsyncComponent({
         loader: () => import(`./${this.monitoring.type}/monitoring.vue`),
         errorComponent: OpenwbMonitoringFallback,
       });
     },
-  },
-  methods: {
     updateConfiguration(event) {
       this.$emit("update:configuration", event);
     },