light: hide extra toggle in webui

amend b5a03da
xoseperez · Jan 12, 2023 · 909949b · 909949b
1 parent faeedee
commit 909949b
Show file tree

Hide file tree

Showing 22 changed files with 9,829 additions and 9,798 deletions.
diff --git a/code/espurna/data/index.all.html.gz b/code/espurna/data/index.all.html.gz
diff --git a/code/espurna/data/index.curtain.html.gz b/code/espurna/data/index.curtain.html.gz
diff --git a/code/espurna/data/index.garland.html.gz b/code/espurna/data/index.garland.html.gz
diff --git a/code/espurna/data/index.light.html.gz b/code/espurna/data/index.light.html.gz
diff --git a/code/espurna/data/index.lightfox.html.gz b/code/espurna/data/index.lightfox.html.gz
diff --git a/code/espurna/data/index.rfbridge.html.gz b/code/espurna/data/index.rfbridge.html.gz
diff --git a/code/espurna/data/index.rfm69.html.gz b/code/espurna/data/index.rfm69.html.gz
diff --git a/code/espurna/data/index.sensor.html.gz b/code/espurna/data/index.sensor.html.gz
diff --git a/code/espurna/data/index.small.html.gz b/code/espurna/data/index.small.html.gz
diff --git a/code/espurna/data/index.thermostat.html.gz b/code/espurna/data/index.thermostat.html.gz
diff --git a/code/espurna/light.cpp b/code/espurna/light.cpp
@@ -807,6 +807,10 @@ struct LightTemperature {
 
 LightTemperature _light_temperature;
 
+#if RELAY_SUPPORT
+auto _light_state_relay_id = RelaysMax;
+#endif
+
 bool _light_state_changed = false;
 LightStateListener _light_state_listener = nullptr;
 
@@ -2568,9 +2572,9 @@ void _lightApiSetup() {
 namespace {
 
 bool _lightWebSocketOnKeyCheck(espurna::StringView key, const JsonVariant&) {
-    return espurna::settings::query::samePrefix(key, STRING_VIEW("light"))
-        || espurna::settings::query::samePrefix(key, STRING_VIEW("use"))
-        || espurna::settings::query::samePrefix(key, STRING_VIEW("lt"));
+    return key.startsWith(STRING_VIEW("light"))
+        || key.startsWith(STRING_VIEW("use"))
+        || key.startsWith(STRING_VIEW("lt"));
 }
 
 void _lightWebSocketStatus(JsonObject& root) {
@@ -2604,6 +2608,9 @@ void _lightWebSocketOnVisible(JsonObject& root) {
     wsPayloadModule(root, PSTR("light"));
 
     JsonObject& light = root.createNestedObject("light");
+#if RELAY_SUPPORT
+    light["state_relay_id"] = _light_state_relay_id;
+#endif
 
     JsonArray& channels = light.createNestedArray("channels");
 
@@ -3589,6 +3596,7 @@ void _lightSettingsMigrate(int version) {
 RelayProviderBasePtr lightMakeStateRelayProvider(size_t id) {
 #if RELAY_SUPPORT
     if (!_light_state_listener) {
+        _light_state_relay_id = id;
         _light_state_listener = [id](bool state) {
             relayStatus(id, state);
         };

diff --git a/code/espurna/static/index.all.html.gz.h b/code/espurna/static/index.all.html.gz.h
diff --git a/code/espurna/static/index.curtain.html.gz.h b/code/espurna/static/index.curtain.html.gz.h
diff --git a/code/espurna/static/index.garland.html.gz.h b/code/espurna/static/index.garland.html.gz.h
diff --git a/code/espurna/static/index.light.html.gz.h b/code/espurna/static/index.light.html.gz.h
diff --git a/code/espurna/static/index.lightfox.html.gz.h b/code/espurna/static/index.lightfox.html.gz.h
diff --git a/code/espurna/static/index.rfbridge.html.gz.h b/code/espurna/static/index.rfbridge.html.gz.h
diff --git a/code/espurna/static/index.rfm69.html.gz.h b/code/espurna/static/index.rfm69.html.gz.h
diff --git a/code/espurna/static/index.sensor.html.gz.h b/code/espurna/static/index.sensor.html.gz.h
diff --git a/code/espurna/static/index.small.html.gz.h b/code/espurna/static/index.small.html.gz.h
diff --git a/code/espurna/static/index.thermostat.html.gz.h b/code/espurna/static/index.thermostat.html.gz.h
diff --git a/code/html/custom.js b/code/html/custom.js
@@ -1681,6 +1681,9 @@ function relayToggle(event) {
 function initRelayToggle(id, cfg) {
     let line = loadConfigTemplate("relay-control");
 
+    let root = line.querySelector("div");
+    root.classList.add(`relay-control-${id}`);
+
     let name = line.querySelector("span[data-key='relayName']");
     name.textContent = cfg.relayName;
     name.dataset["id"] = id;
@@ -2170,6 +2173,12 @@ function colorUpdate(mode, value) {
     }
 }
 
+function lightStateHideRelay(id) {
+    styleInject([
+        styleVisible(`.relay-control-${id}`, false)
+    ]);
+}
+
 function initLightState() {
     const toggle = document.getElementById("light-state-value");
     toggle.addEventListener("change", (event) => {
@@ -2290,6 +2299,10 @@ function updateLight(data) {
             updateLightState(value);
             break;
 
+        case "state_relay_id":
+            lightStateHideRelay(value);
+            break;
+
         case "channels":
             initLightState();
             initBrightness();