gui: stricter validation in add and edit modals

client/src/lib.rs

@@ -9,5 +9,3 @@ pub use imp::*;
 pub use mainloop::*;
 pub use mime_guess;
 pub use reqwest;
-
-pub const VERSION: Option<&str> = option_env!("MUMBLE_WEB2_VERSION");

gui/src/main.rs

@@ -4,7 +4,7 @@ use dioxus::prelude::*;
 use mumble_web2_client::{
     network_entrypoint, reqwest, AudioSettings, ChannelId, Command, ConfigSystem,
     ConfigSystemInterface as _, ConnectTarget, ConnectionState, Platform, PlatformInterface as _,
-    SharedState, State, UserId, UserState, VERSION,
+    SharedState, State, UserId, UserState,
 };
 use mumble_web2_common::{ProxyOverrides, ServerEntry};
 use Command::*;
@@ -501,76 +501,14 @@ pub fn ServerView(overrides: Resource<ProxyOverrides>) -> Element {
     )
 }
 
-#[component]
-fn ServerCard(
-    idx: usize,
-    server: ServerEntry,
-    editing_index: Signal<Option<usize>>,
-    overrides: Resource<ProxyOverrides>,
-) -> Element {
-    let user_config = use_context::<ConfigSystem>();
-    let net: Coroutine<Command> = use_coroutine_handle();
-
-    let address = format!("{}:{}", server.address, server.port);
-    let connect_entry = server.clone();
-
-    rsx!(
-        div {
-            class: "server-card",
-            img {
-                class: "server-card__icon",
-                src: asset!("assets/earth-14-svgrepo-com.svg"),
-                alt: "Server icon",
-            }
-            div {
-                class: "server-card__info",
-                span { class: "server-card__name", "{server.name}" }
-                span { class: "server-card__address", "{address}" }
-            }
-            ServerPingInfo {
-                address: server.address.clone(),
-                port: server.port,
-            }
-            button {
-                class: "server-card__action",
-                onclick: move |_| editing_index.set(Some(idx)),
-                img {
-                    src: asset!("assets/edit-3-svgrepo-com.svg"),
-                    alt: "Edit",
-                }
-            }
-            button {
-                class: "server-card__action server-card__action--connect",
-                onclick: {
-                    let entry = connect_entry.clone();
-                    let user_config = user_config.clone();
-                    move |_| {
-                        user_config.config_set("username", &entry.username);
-                        net.send(Connect {
-                            target: ConnectTarget::Direct {
-                                host: entry.address.clone(),
-                                port: entry.port,
-                            },
-                            username: entry.username.clone(),
-                            config: overrides.read().clone().unwrap_or_default(),
-                        });
-                    }
-                },
-                img {
-                    src: asset!("assets/arrow-right-svgrepo-com.svg"),
-                    alt: "Connect",
-                }
-            }
-        }
-    )
-}
-
 #[component]
 fn OverrideLoginView(overrides: Resource<ProxyOverrides>) -> Element {
     let user_config = use_context::<ConfigSystem>();
     let net: Coroutine<Command> = use_coroutine_handle();
     let state = use_context::<SharedState>();
 
+    let version = option_env!("MUMBLE_WEB2_VERSION");
+
     let proxy_url = overrides
         .read()
         .as_ref()
@@ -585,13 +523,12 @@ fn OverrideLoginView(overrides: Resource<ProxyOverrides>) -> Element {
 
     let is_connecting = matches!(&*state.status.read(), Connecting);
 
-
     rsx!(
         div {
             class: "server-list-page",
             h1 {
                 "Mumble Web"
-                match VERSION {
+                match version {
                     Some(v) => rsx!(div { class: "login_version", "({v})" }),
                     None => rsx!(),
                 }
@@ -670,10 +607,9 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
     let mut show_add_modal = use_signal(|| false);
     let mut editing_index = use_signal(|| None::<usize>);
 
-    let is_override_mode = overrides
-        .read()
-        .as_ref()
-        .is_some_and(|c| !c.any_server);
+    let version = option_env!("MUMBLE_WEB2_VERSION");
+
+    let is_override_mode = overrides.read().as_ref().is_some_and(|c| !c.any_server);
 
     // --- Overrides mode: single preset server, username-only input ---
     if is_override_mode {
@@ -686,7 +622,7 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
             class: "server-list-page",
             h1 {
                 "Mumble Web"
-                match VERSION {
+                match version {
                     Some(v) => rsx!(div { class: "login_version", "({v})" }),
                     None => rsx!(),
                 }
@@ -694,12 +630,59 @@ pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
             div {
                 class: "server-list",
                 for (idx, server) in servers.read().iter().enumerate() {
-                    ServerCard {
-                        key: "{idx}",
-                        idx,
-                        server: server.clone(),
-                        editing_index,
-                        overrides,
+                    {
+                        let address = format!("{}:{}", server.address, server.port);
+                        let connect_entry = server.clone();
+                        rsx!(
+                            div {
+                                key: "{idx}",
+                                class: "server-card",
+                                img {
+                                    class: "server-card__icon",
+                                    src: asset!("assets/earth-14-svgrepo-com.svg"),
+                                    alt: "Server icon",
+                                }
+                                div {
+                                    class: "server-card__info",
+                                    span { class: "server-card__name", "{server.name}" }
+                                    span { class: "server-card__address", "{address}" }
+                                }
+                                ServerPingInfo {
+                                    address: server.address.clone(),
+                                    port: server.port,
+                                }
+                                button {
+                                    class: "server-card__action",
+                                    onclick: move |_| editing_index.set(Some(idx)),
+                                    img {
+                                        src: asset!("assets/edit-3-svgrepo-com.svg"),
+                                        alt: "Edit",
+                                    }
+                                }
+                                button {
+                                    class: "server-card__action server-card__action--connect",
+                                    onclick: {
+                                        let entry = connect_entry.clone();
+                                        let user_config = user_config.clone();
+                                        move |_| {
+                                            user_config.config_set("username", &entry.username);
+                                            net.send(Connect {
+                                                target: ConnectTarget::Direct {
+                                                    host: entry.address.clone(),
+                                                    port: entry.port,
+                                                },
+                                                username: entry.username.clone(),
+                                                config: overrides.read().clone().unwrap_or_default(),
+                                            });
+                                        }
+                                    },
+                                    img {
+                                        src: asset!("assets/arrow-right-svgrepo-com.svg"),
+                                        alt: "Connect",
+                                    }
+                                }
+                            }
+                        )
                     }
                 }
             }