Merge pull request 'Update egui to 0.33.3' (#386) from renovate/egui into master

central_backend/Cargo.lock

@@ -2615,9 +2615,9 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "reqwest"
-version = "0.12.24"
+version = "0.12.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -3335,9 +3335,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456"
+checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
  "bitflags",
  "bytes",

central_backend/Cargo.toml

@@ -19,7 +19,7 @@ asn1 = "0.23.0"
 actix-web = { version = "4.12.1", features = ["openssl"] }
 futures = "0.3.31"
 serde = { version = "1.0.228", features = ["derive"] }
-reqwest = { version = "0.12.24", features = ["json"] }
+reqwest = { version = "0.12.25", features = ["json"] }
 serde_json = "1.0.145"
 rand = "0.10.0-rc.5"
 actix = "0.13.5"

central_backend/src/energy/energy_actor.rs

@@ -389,7 +389,7 @@ impl Handler<SynchronizeDevice> for EnergyActor {
 pub struct ResDevState {
     pub id: DeviceId,
     last_ping: u64,
-    online: bool,
+    pub online: bool,
 }
 
 /// Get the state of devices

central_backend/src/server/unsecure_server/unsecure_relay_controller.rs

@@ -64,6 +64,8 @@ pub async fn legacy_state(
 pub struct FullRelayState {
     /// Indicates if the relay (or its parent device) is enabled or not
     enabled: bool,
+    /// Indicate if the device is online or not
+    online: bool,
     /// Indicates if relay is on or off
     is_on: bool,
     /// Relay name
@@ -77,7 +79,7 @@ pub struct FullRelayState {
     /// Required uptime during a day (in seconds)
     daily_requirement: Option<usize>,
     /// Forced relay state
-    relay_forced_state: RelayForcedState,
+    forced_state: RelayForcedState,
 }
 
 #[derive(serde::Serialize)]
@@ -96,6 +98,8 @@ pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
     let cached_consumption = energy_actor.send(energy_actor::GetCurrConsumption).await?;
     let relays_consumption = energy_actor.send(energy_actor::RelaysConsumption).await?;
     let curr_consumption = consumption::get_curr_consumption().await.ok();
+    let devices = energy_actor.send(energy_actor::GetDeviceLists).await?;
+    let devices_state = energy_actor.send(energy_actor::GetDevicesState).await?;
     let mut relays = energy_actor.send(energy_actor::GetRelaysList).await?;
     relays.sort_by_key(|r| -(r.priority as i64));
     let relays_state = energy_actor.send(energy_actor::GetAllRelaysState).await?;
@@ -107,16 +111,26 @@ pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
         relays: relays
             .into_iter()
             .map(|r| {
-                let state = relays_state.iter().find(|s| s.id == r.id);
+                let device = devices
+                    .iter()
+                    .find(|d| d.relays.iter().any(|sr| sr.id == r.id))
+                    .expect("All relay shall have an associated device!");
+                let device_state = devices_state.iter().find(|s| s.id == device.id);
+                let relay_state = relays_state.iter().find(|s| s.id == r.id);
+                let total_uptime = relay_state_history::relay_total_runtime_adjusted(&r);
+
                 FullRelayState {
-                    enabled: r.enabled,
-                    is_on: state.map(|s| s.on).unwrap_or(false),
+                    enabled: r.enabled && device.enabled,
+                    online: device_state.map(|d| d.online).unwrap_or(false),
+                    is_on: relay_state.map(|s| s.on).unwrap_or(false),
                     name: r.name,
                     priority: r.priority,
-                    r#for: state.map(|s| s.r#for).unwrap_or(0),
-                    total_uptime: 0,
+                    r#for: relay_state.map(|s| s.r#for).unwrap_or(0),
+                    total_uptime,
                     daily_requirement: r.daily_runtime.map(|r| r.min_runtime),
-                    relay_forced_state: state.map(|s| s.forced_state.clone()).unwrap_or_default(),
+                    forced_state: relay_state
+                        .map(|s| s.forced_state.clone())
+                        .unwrap_or_default(),
                 }
             })
             .collect(),

central_frontend/package.json

@@ -31,15 +31,15 @@
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@types/semver": "^7.7.1",
-    "@typescript-eslint/eslint-plugin": "^8.48.1",
-    "@typescript-eslint/parser": "^8.48.1",
+    "@typescript-eslint/eslint-plugin": "^8.49.0",
+    "@typescript-eslint/parser": "^8.49.0",
     "@vitejs/plugin-react": "^5.1.2",
     "eslint": "^9.39.1",
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-refresh": "^0.4.24",
     "globals": "^16.5.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.48.1",
+    "typescript-eslint": "^8.49.0",
     "vite": "^7.2.7"
   }
 }

custom_consumption/Cargo.lock

@@ -889,9 +889,9 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
 [[package]]
 name = "ecolor"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084980ebede2fb1ad6c4f54285b3e489052ef2b6aa4016e4c19349417adc75c5"
+checksum = "71ddb8ac7643d1dba1bb02110e804406dd459a838efcb14011ced10556711a8e"
 dependencies = [
  "bytemuck",
  "emath",
@@ -899,9 +899,9 @@ dependencies = [
 
 [[package]]
 name = "eframe"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f60ee3c69cd01d5725b4ef476ed6a3a6009968c57843a2f1beb96f021e4a54b"
+checksum = "457481173e6db5ca9fa2be93a58df8f4c7be639587aeb4853b526c6cf87db4e6"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -934,9 +934,9 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75645894de4ca1695ab3ab7201c7953bb95c1725aafeefa6822dc901ad2a81b"
+checksum = "6a9b567d356674e9a5121ed3fedfb0a7c31e059fe71f6972b691bcd0bfc284e3"
 dependencies = [
  "accesskit",
  "ahash",
@@ -952,9 +952,9 @@ dependencies = [
 
 [[package]]
 name = "egui-wgpu"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdaac35a6e0ff458aaa5776b2bda578e38334a9d1258f7795042a70372745b7"
+checksum = "5e4d209971c84b2352a06174abdba701af1e552ce56b144d96f2bd50a3c91236"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -972,9 +972,9 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4772ed5f16fa8ec2ba295e58f62b58ee83fcf49e67ec13d2b7ddf4e9a2dea34e"
+checksum = "ec6687e5bb551702f4ad10ac428bab12acf9d53047ebb1082d4a0ed8c6251a29"
 dependencies = [
  "accesskit_winit",
  "arboard",
@@ -994,9 +994,9 @@ dependencies = [
 
 [[package]]
 name = "egui_glow"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b94ff67a1d18933fff2519f5f57c388f932c093036c381fb9ae2853b3e1e09"
+checksum = "6420863ea1d90e750f75075231a260030ad8a9f30a7cef82cdc966492dc4c4eb"
 dependencies = [
  "bytemuck",
  "egui",
@@ -1011,9 +1011,9 @@ dependencies = [
 
 [[package]]
 name = "emath"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e561352ae95c22ad179fb56c38d6e6eecd86cf4925cf5c70e738dd01df9b620"
+checksum = "491bdf728bf25ddd9ad60d4cf1c48588fa82c013a2440b91aa7fc43e34a07c32"
 dependencies = [
  "bytemuck",
 ]
@@ -1070,9 +1070,9 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a909ce8cee63e8350fb0c251ad39277a5b24f19add60787e84a3b3ab3f2bd83a"
+checksum = "009d0dd3c2163823a0abdb899451ecbc78798dec545ee91b43aff1fa790bab62"
 dependencies = [
  "ab_glyph",
  "ahash",
@@ -1088,9 +1088,9 @@ dependencies = [
 
 [[package]]
 name = "epaint_default_fonts"
-version = "0.33.2"
+version = "0.33.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad9649446c23368ae138716910e3e28143995691b598fbb9de16b42b0722cbcc"
+checksum = "5c4fbe202b6578d3d56428fa185cdf114a05e49da05f477b3c7f0fbb221f1862"
 
 [[package]]
 name = "equivalent"

custom_consumption/Cargo.toml

@@ -7,6 +7,6 @@ edition = "2024"
 env_logger = "0.11.8"
 log = "0.4.29"
 clap = { version = "4.5.53", features = ["derive", "env"] }
-egui = "0.33.2"
-eframe = "0.33.2"
+egui = "0.33.3"
+eframe = "0.33.3"
 lazy_static = "1.5.0"