Merge pull request #1688 from openWB/revert-1621-remove_obsolet

Revert "remove obsolet topic"
openWB · Jun 24, 2024 · 823829f · 823829f
2 parents 2839e8f + 8ffae04
commit 823829f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 2 deletions.
diff --git a/data/config/mosquitto/openwb_local.conf b/data/config/mosquitto/openwb_local.conf
@@ -1,4 +1,4 @@
-# openwb-version:14
+# openwb-version:13
 listener 1886 localhost
 allow_anonymous true
 
@@ -25,6 +25,7 @@ topic openWB/chargepoint/+/set/phases_to_use out 2
 topic openWB/chargepoint/+/set/manual_lock out 2
 topic openWB/chargepoint/+/set/autolock_state out 2
 topic openWB/chargepoint/+/set/rfid out 2
+topic openWB/chargepoint/+/set/change_ev_permitted out 2
 topic openWB/chargepoint/+/get/# out 2
 topic openWB/chargepoint/+/config/# out 2
 topic openWB/chargepoint/template/# out 2

diff --git a/packages/control/chargepoint/chargepoint_data.py b/packages/control/chargepoint/chargepoint_data.py
@@ -118,6 +118,7 @@ def log_factory() -> Log:
 
 @dataclass
 class Set:
+    change_ev_permitted: bool = False
     charging_ev: int = -1
     charging_ev_prev: int = -1
     current: float = 0

diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py
@@ -168,6 +168,7 @@ def addChargepoint(self, connection_id: str, payload: dict) -> None:
         def setup_added_chargepoint():
             Pub().pub(f'openWB/chargepoint/{new_id}/config', chargepoint_config)
             Pub().pub(f'openWB/chargepoint/{new_id}/set/manual_lock', False)
+            Pub().pub(f'openWB/chargepoint/{new_id}/set/change_ev_permitted', False)
             {Pub().pub(f"openWB/chargepoint/{new_id}/get/"+k, v) for (k, v) in asdict(chargepoint.Get()).items()}
             self.max_id_hierarchy = self.max_id_hierarchy + 1
             Pub().pub("openWB/set/command/max_id/hierarchy", self.max_id_hierarchy)

diff --git a/packages/helpermodules/setdata.py b/packages/helpermodules/setdata.py
@@ -540,6 +540,8 @@ def process_chargepoint_topic(self, msg: mqtt.MQTTMessage):
                     self._validate_value(msg, float)
                 elif "/set/log" in msg.topic:
                     self._validate_value(msg, "json")
+                elif "/set/change_ev_permitted" in msg.topic:
+                    self._validate_value(msg, "json")
                 elif "/config/ev" in msg.topic:
                     self._validate_value(
                         msg, int, [(0, float("inf"))], pub_json=True)

diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py
@@ -112,6 +112,7 @@ class UpdateConfig:
         "^openWB/chargepoint/[0-9]+/set/plug_state_prev$",
         "^openWB/chargepoint/[0-9]+/set/plug_time$",
         "^openWB/chargepoint/[0-9]+/set/rfid$",
+        "^openWB/chargepoint/[0-9]+/set/change_ev_permitted$",
         "^openWB/chargepoint/[0-9]+/set/log$",
         "^openWB/chargepoint/[0-9]+/set/phases_to_use$",
         "^openWB/chargepoint/[0-9]+/set/charging_ev_prev$",

diff --git a/packages/modules/display_themes/cards/source/src/App.vue b/packages/modules/display_themes/cards/source/src/App.vue
@@ -41,6 +41,7 @@ export default {
         "openWB/chargepoint/+/get/plug_state",
         "openWB/chargepoint/+/get/power",
         "openWB/chargepoint/+/get/rfid",
+        "openWB/chargepoint/+/set/change_ev_permitted",
         "openWB/chargepoint/+/set/current",
         "openWB/chargepoint/+/set/manual_lock",
         "openWB/chargepoint/+/set/log",

diff --git a/packages/modules/display_themes/cards/source/src/stores/mqtt.js b/packages/modules/display_themes/cards/source/src/stores/mqtt.js
@@ -450,6 +450,23 @@ export const useMqttStore = defineStore("mqtt", {
         return 0;
       };
     },
+    getChargePointVehicleChangePermitted(state) {
+      return (chargePointId) => {
+        if (
+          Array.isArray(
+            state.topics[
+              `openWB/chargepoint/${chargePointId}/set/change_ev_permitted`
+            ],
+          )
+        ) {
+          // topic payload is an array [bool, String]!
+          return state.topics[
+            `openWB/chargepoint/${chargePointId}/set/change_ev_permitted`
+          ][0];
+        }
+        return true;
+      };
+    },
     getChargePointConnectedVehicleConfig(state) {
       return (chargePointId) => {
         return state.topics[

diff --git a/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue b/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue
@@ -137,7 +137,8 @@ export default {
     },
     handleVehicleClick(chargePointId) {
       if (
-        !this.changesLocked
+        !this.changesLocked &&
+        this.mqttStore.getChargePointVehicleChangePermitted(chargePointId)
       ) {
         this.modalChargePointId = chargePointId;
         this.modalVehicleSelectVisible = true;
@@ -395,6 +396,11 @@ export default {
                   size="lg"
                   class="full-width"
                   :class="!changesLocked ? 'clickable' : ''"
+                  :disabled="
+                    !mqttStore.getChargePointVehicleChangePermitted(
+                      modalChargePointId,
+                    )
+                  "
                   @click="handleVehicleClick(id)"
                 >
                   <font-awesome-icon fixed-width :icon="['fas', 'fa-car']" />