gui: stricter validation in add and edit modals

gui/src/main.rs

@@ -502,13 +502,25 @@ pub fn ServerView(overrides: Resource<ProxyOverrides>) -> Element {
 }
 
 #[component]
-fn OverrideLoginView(overrides: Resource<ProxyOverrides>) -> Element {
+pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
     let user_config = use_context::<ConfigSystem>();
     let net: Coroutine<Command> = use_coroutine_handle();
     let state = use_context::<SharedState>();
 
+    let mut servers = use_signal(|| {
+        user_config
+            .config_get::<Vec<ServerEntry>>("servers")
+            .unwrap_or_default()
+    });
+    let mut show_add_modal = use_signal(|| false);
+    let mut editing_index = use_signal(|| None::<usize>);
+
     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 {
         let proxy_url = overrides
             .read()
             .as_ref()
@@ -521,9 +533,10 @@ fn OverrideLoginView(overrides: Resource<ProxyOverrides>) -> Element {
                 .unwrap_or_default()
         });
 
-    let is_connecting = matches!(&*state.status.read(), Connecting);
+        let status = &state.status;
+        let is_connecting = matches!(&*status.read(), Connecting);
 
-    rsx!(
+        return rsx!(
             div {
                 class: "server-list-page",
                 h1 {
@@ -590,30 +603,7 @@ fn OverrideLoginView(overrides: Resource<ProxyOverrides>) -> Element {
                     }
                 }
             }
-    )
+        );
-}
-
-#[component]
-pub fn LoginView(overrides: Resource<ProxyOverrides>) -> Element {
-    let user_config = use_context::<ConfigSystem>();
-    let net: Coroutine<Command> = use_coroutine_handle();
-    let state = use_context::<SharedState>();
-
-    let mut servers = use_signal(|| {
-        user_config
-            .config_get::<Vec<ServerEntry>>("servers")
-            .unwrap_or_default()
-    });
-    let mut show_add_modal = use_signal(|| false);
-    let mut editing_index = use_signal(|| None::<usize>);
-
-    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 {
-        return rsx!(OverrideLoginView { overrides });
     }
 
     // --- Normal mode: editable server list ---