Fix build

Author: moubctez

new-ui/package.json

@@ -23,6 +23,7 @@
     "@tauri-apps/plugin-http": "^2.5.9",
     "@tauri-apps/plugin-log": "^2.8.0",
     "@uidotdev/usehooks": "^2.4.1",
+    "byte-size": "^9.0.1",
     "chart.js": "^4.5.1",
     "clsx": "^2.1.1",
     "dayjs": "^1.11.20",
@@ -39,6 +40,7 @@
   },
   "devDependencies": {
     "@tanstack/devtools-vite": "^0.7.0",
+    "@types/byte-size": "^8.1.2",
     "@types/node": "^25.8.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",

new-ui/pnpm-lock.yaml

@@ -33,7 +33,7 @@ use defguard_client::{
     LOG_FILENAME, VERSION,
 };
 use log::{Level, LevelFilter};
-use tauri::{AppHandle, Builder, Manager, RunEvent, WebviewUrl, WebviewWindowBuilder, WindowEvent};
+use tauri::{AppHandle, Builder, Manager, RunEvent, WebviewWindowBuilder, WindowEvent};
 use tauri_plugin_log::{Target, TargetKind};
 
 #[macro_use]
@@ -348,24 +348,14 @@ fn main() {
             app.manage(state);
 
             // Open new UI window.
-            let new_url = if cfg!(defguard_client_dev) {
-                WebviewUrl::External("http://localhost:5072".parse().unwrap())
-            } else {
-                WebviewUrl::App("new-ui/".into())
-            };
-            WebviewWindowBuilder::new(app, NEW_UI_WINDOW_ID, new_url)
+            WebviewWindowBuilder::new(app, NEW_UI_WINDOW_ID, new_ui_url())
                 .title("New UI")
                 .inner_size(NEW_UI_WIDTH, NEW_UI_HEIGHT)
                 .visible(false)
                 .build()?;
 
             // Open old UI window.
-            let old_url = if cfg!(defguard_client_dev) {
-                WebviewUrl::External("http://localhost:5071".parse().unwrap())
-            } else {
-                WebviewUrl::App("old-ui/index.html/".into())
-            };
-            WebviewWindowBuilder::new(app, OLD_UI_WINDOW_ID, old_url)
+            WebviewWindowBuilder::new(app, OLD_UI_WINDOW_ID, old_ui_url())
                 .title("Old UI")
                 .inner_size(OLD_UI_WIDTH, OLD_UI_HEIGHT)
                 .build()?;

src-tauri/src/bin/defguard-client.rs

@@ -12,15 +12,15 @@ pub const NEW_UI_HEIGHT: f64 = 675.0;
 pub const OLD_UI_WIDTH: f64 = 920.0;
 pub const OLD_UI_HEIGHT: f64 = 720.0;
 
-fn new_ui_url() -> WebviewUrl {
+pub fn new_ui_url() -> WebviewUrl {
     if cfg!(defguard_client_dev) {
         WebviewUrl::External("http://localhost:5072".parse().unwrap())
     } else {
         WebviewUrl::App("new-ui/".into())
     }
 }
 
-fn old_ui_url() -> WebviewUrl {
+pub fn old_ui_url() -> WebviewUrl {
     if cfg!(defguard_client_dev) {
         WebviewUrl::External("http://localhost:5071".parse().unwrap())
     } else {