fix: minor fixes for hot water

brianmay · Nov 14, 2024 · 311b1ed · 311b1ed
1 parent afab8f0
commit 311b1ed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/robotica-common/src/config.rs b/robotica-common/src/config.rs
@@ -125,7 +125,7 @@ pub struct Config {
     pub cars: Vec<CarConfig>,
 
     /// The hotwater config for this UI
-    pub hot_water: Vec<HotWaterConfig>,
+    pub hot_waters: Vec<HotWaterConfig>,
 
     /// The name of the server in MQTT topics
     pub instance: String,

diff --git a/robotica-frontend/src/components/hot_water.rs b/robotica-frontend/src/components/hot_water.rs
@@ -100,7 +100,11 @@ impl Component for HotWaterComponent {
         let id = Id::new(&props.id);
 
         let hot_water = if let Some(config) = &self.config {
-            config.cars.iter().find(|car| car.id == id).cloned()
+            config
+                .hot_waters
+                .iter()
+                .find(|hot_water| hot_water.id == id)
+                .cloned()
         } else {
             None
         };

diff --git a/robotica-frontend/src/lib.rs b/robotica-frontend/src/lib.rs
@@ -19,7 +19,6 @@ mod robotica_wasm;
 mod services;
 
 use paste::paste;
-use tracing::debug;
 
 use std::collections::HashMap;
 use std::rc::Rc;
@@ -141,7 +140,6 @@ impl Component for App {
     fn update(&mut self, _ctx: &Context<Self>, msg: Self::Message) -> bool {
         match msg {
             AppMsg::Config(config) => {
-                debug!("!!!Got config: {:?}", config.cars);
                 self.config = Some(config);
                 true
             }
@@ -196,7 +194,7 @@ fn nav_bar() -> Html {
     };
 
     let hot_water = match &config {
-        Some(config) => config.hot_water.clone(),
+        Some(config) => config.hot_waters.clone(),
         None => vec![],
     };
 
@@ -281,7 +279,7 @@ fn nav_bar() -> Html {
                         </li>
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            { "Hot Water" }
+                            { "Hot Waters" }
                             </a>
                             <ul class="dropdown-menu">
                                 { hot_water.iter().map(|hot_water| html! {

diff --git a/robotica-tokio/src/services/http/api/config.rs b/robotica-tokio/src/services/http/api/config.rs
@@ -25,7 +25,7 @@ pub async fn config_handler(
             title: "My Tesla".to_string(),
         }],
         // FIXME: This should not be hardcoded.
-        hot_water: vec![config::HotWaterConfig {
+        hot_waters: vec![config::HotWaterConfig {
             id: Id::new("hot_water"),
             title: "Hot Water Bathroom".to_string(),
         }],