Update dependency @mui/x-charts to ^8.22.0

Merge pull request 'Update egui to 0.33.3' (#386 ) from renovate/egui into master
Update egui to 0.33.3
2025-12-13 00:35:26 +00:00 · 2025-12-13 00:35:07 +00:00 · 2025-12-12 00:37:13 +00:00 · 2025-12-12 00:37:06 +00:00 · 2025-12-10 00:36:45 +00:00 · 2025-12-09 18:22:50 +01:00
7 changed files with 82 additions and 59 deletions
--- a/central_backend/Cargo.lock
+++ b/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",
--- a/central_backend/Cargo.toml
+++ b/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"
--- a/central_backend/src/server/unsecure_server/unsecure_relay_controller.rs
+++ b/central_backend/src/server/unsecure_server/unsecure_relay_controller.rs
@@ -79,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)]
@@ -117,6 +117,8 @@ pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
                    .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 && device.enabled,
                    online: device_state.map(|d| d.online).unwrap_or(false),
@@ -124,9 +126,9 @@ pub async fn relays_full_state(energy_actor: WebEnergyActor) -> HttpResult {
                    name: r.name,
                    priority: r.priority,
                    r#for: relay_state.map(|s| s.r#for).unwrap_or(0),
-                    total_uptime: 0,
+                    total_uptime,
                    daily_requirement: r.daily_runtime.map(|r| r.min_runtime),
-                    relay_forced_state: relay_state
+                    forced_state: relay_state
                        .map(|s| s.forced_state.clone())
                        .unwrap_or_default(),
                }
--- a/central_frontend/package-lock.json
+++ b/central_frontend/package-lock.json
@@ -15,7 +15,7 @@
        "@mdi/react": "^1.6.1",
        "@mui/icons-material": "^7.3.6",
        "@mui/material": "^7.3.6",
-        "@mui/x-charts": "^8.21.0",
+        "@mui/x-charts": "^8.22.0",
        "@mui/x-date-pickers": "^8.21.0",
        "date-and-time": "^4.1.1",
        "dayjs": "^1.11.19",
@@ -71,6 +71,7 @@
      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.27.1",
        "@babel/generator": "^7.28.5",
@@ -407,6 +408,7 @@
      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
      "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.18.3",
        "@emotion/babel-plugin": "^11.13.5",
@@ -450,6 +452,7 @@
      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
      "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.18.3",
        "@emotion/babel-plugin": "^11.13.5",
@@ -1302,6 +1305,7 @@
      "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.6.tgz",
      "integrity": "sha512-R4DaYF3dgCQCUAkr4wW1w26GHXcf5rCmBRHVBuuvJvaGLmZdD8EjatP80Nz5JCw0KxORAzwftnHzXVnjR8HnFw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.28.4",
        "@mui/core-downloads-tracker": "^7.3.6",
@@ -1412,6 +1416,7 @@
      "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.6.tgz",
      "integrity": "sha512-8fehAazkHNP1imMrdD2m2hbA9sl7Ur6jfuNweh5o4l9YPty4iaZzRXqYvBCWQNwFaSHmMEj2KPbyXGp7Bt73Rg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.28.4",
        "@mui/private-theming": "^7.3.6",
@@ -1495,19 +1500,18 @@
      }
    },
    "node_modules/@mui/x-charts": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-8.21.0.tgz",
-      "integrity": "sha512-uYoeqkrXnkH43lcUGoY7l96FWVZGrWBxPY6ZJSpLo+lCGt6z0SgfB29kdsaOXJnS6RHrVnfPtm4ifjO+JIIG9Q==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-8.22.0.tgz",
+      "integrity": "sha512-VwIbrACkz/Nh99ghNMBJmve62obLX0lFaXJ+yq3ino3LCjvBHBkTeB6VhQl2EAbl5YTkN28UMAzdQSqREz5grw==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.28.4",
        "@mui/utils": "^7.3.5",
-        "@mui/x-charts-vendor": "8.21.0",
+        "@mui/x-charts-vendor": "8.22.0",
        "@mui/x-internal-gestures": "0.3.6",
-        "@mui/x-internals": "8.21.0",
+        "@mui/x-internals": "8.22.0",
        "bezier-easing": "^2.1.0",
        "clsx": "^2.1.1",
-        "flatqueue": "^3.0.0",
        "prop-types": "^15.8.1",
        "reselect": "^5.1.1",
        "use-sync-external-store": "^1.6.0"
@@ -1533,9 +1537,9 @@
      }
    },
    "node_modules/@mui/x-charts-vendor": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@mui/x-charts-vendor/-/x-charts-vendor-8.21.0.tgz",
-      "integrity": "sha512-luKEt+OHb7QPwGGqLPTVJojGN/QFwpqv7vWMrXJfwpQvx+pCdYvyMHpg2I7CpkstF84H0sk8QwD/7cfI/vT10A==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-charts-vendor/-/x-charts-vendor-8.22.0.tgz",
+      "integrity": "sha512-lRG79nqZMeYfrXftcb+6Jd/A+GUNevv5AyCu2yi+YJJvjjPpBSy6rpEAS5/u3YcJpO08cL7Px1x6BY24w/x9jA==",
      "license": "MIT AND ISC",
      "dependencies": {
        "@babel/runtime": "^7.28.4",
@@ -1553,7 +1557,30 @@
        "d3-scale": "^4.0.2",
        "d3-shape": "^3.2.0",
        "d3-time": "^3.1.0",
-        "d3-timer": "^3.0.1"
+        "d3-timer": "^3.0.1",
+        "flatqueue": "^3.0.0"
+      }
+    },
+    "node_modules/@mui/x-charts/node_modules/@mui/x-internals": {
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-8.22.0.tgz",
+      "integrity": "sha512-PA7jCKRLbS6aYvTSbGr3Id4CPUdTrUejHm31l8Vje7dw138gBBHrHeGsqWJh/S5foorpK8loiRejKrLlTZokyQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.28.4",
+        "@mui/utils": "^7.3.5",
+        "reselect": "^5.1.1",
+        "use-sync-external-store": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui-org"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
      }
    },
    "node_modules/@mui/x-date-pickers": {
@@ -2129,6 +2156,7 @@
      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
      "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "csstype": "^3.2.2"
      }
@@ -2194,6 +2222,7 @@
      "integrity": "sha512-N9lBGA9o9aqb1hVMc9hzySbhKibHmB+N3IpoShyV6HyQYRGIhlrO5rQgttypi+yEeKsKI4idxC8Jw6gXKD4THA==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.49.0",
        "@typescript-eslint/types": "8.49.0",
@@ -2419,6 +2448,7 @@
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -2544,6 +2574,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "baseline-browser-mapping": "^2.9.0",
        "caniuse-lite": "^1.0.30001759",
@@ -2831,7 +2862,8 @@
      "version": "1.11.19",
      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
    },
    "node_modules/debug": {
      "version": "4.4.3",
@@ -2953,6 +2985,7 @@
      "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.8.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -3849,6 +3882,7 @@
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -3927,6 +3961,7 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz",
      "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -3936,6 +3971,7 @@
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz",
      "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "scheduler": "^0.27.0"
      },
@@ -4249,6 +4285,7 @@
      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
      "dev": true,
      "license": "Apache-2.0",
+      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -4337,6 +4374,7 @@
      "integrity": "sha512-ITcnkFeR3+fI8P1wMgItjGrR10170d8auB4EpMLPqmx6uxElH3a/hHGQabSHKdqd4FXWO1nFIp9rRn7JQ34ACQ==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.5.0",
@@ -4439,24 +4477,6 @@
      "dev": true,
      "license": "ISC"
    },
-    "node_modules/yaml": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
-      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
    "node_modules/yocto-queue": {
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -4476,6 +4496,7 @@
      "integrity": "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
--- a/central_frontend/package.json
+++ b/central_frontend/package.json
@@ -17,7 +17,7 @@
    "@mdi/react": "^1.6.1",
    "@mui/icons-material": "^7.3.6",
    "@mui/material": "^7.3.6",
-    "@mui/x-charts": "^8.21.0",
+    "@mui/x-charts": "^8.22.0",
    "@mui/x-date-pickers": "^8.21.0",
    "date-and-time": "^4.1.1",
    "dayjs": "^1.11.19",
--- a/custom_consumption/Cargo.lock
+++ b/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"
--- a/custom_consumption/Cargo.toml
+++ b/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"
Author	SHA1	Message	Date
Renovate Bot	03cf9cd921	Update dependency @mui/x-charts to ^8.22.0 All checks were successful continuous-integration/drone/push Build is passing Details	2025-12-13 00:35:26 +00:00
Renovate Bot	3b9fd41905	Merge pull request 'Update egui to 0.33.3' (#386 ) from renovate/egui into master All checks were successful continuous-integration/drone/push Build is passing Details	2025-12-13 00:35:07 +00:00
Renovate Bot	ad03f72f51	Update egui to 0.33.3 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2025-12-12 00:37:13 +00:00
Renovate Bot	b43b27a17e	Merge pull request 'Update Rust crate reqwest to 0.12.25' (#385 ) from renovate/reqwest-0.x into master All checks were successful continuous-integration/drone/push Build is passing Details	2025-12-12 00:37:06 +00:00
Renovate Bot	9a7cabe4a7	Update Rust crate reqwest to 0.12.25 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2025-12-10 00:36:45 +00:00
Pierre HUBERT	0d1baac2b7	Merge branch 'master' of ssh://gitea.communiquons.org:52001/pierre/SolarEnergy All checks were successful continuous-integration/drone/push Build is passing Details	2025-12-09 18:22:50 +01:00
Pierre HUBERT	eae781a613	Fix bad default value	2025-12-09 19:22:25 +01:00