Changes before error encountered

Co-authored-by: GZTimeWalker <[email protected]>

Author: Copilot

crates/wsrx-desktop-gpui/src/views/root.rs

@@ -2,11 +2,11 @@
 use gpui::{Context, Entity, Render, Window, div, prelude::*};
 
 use super::{ConnectionsView, GetStartedView, NetworkLogsView, SettingsView, SidebarView};
-use crate::{components::title_bar::TitleBar, models::app_state::Page, styles::colors};
+use crate::{components::title_bar::TitleBar, models::app_state::PageId, styles::colors};
 
 pub struct RootView {
-    /// Current active page
-    current_page: Page,
+    /// Current active page (string-based: "home", "logs", "settings", "default-scope", or scope.host)
+    current_page: PageId,
 
     /// Title bar
     title_bar: Entity<TitleBar>,
@@ -26,11 +26,11 @@ pub struct RootView {
 
 impl RootView {
     pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let current_page = Page::GetStarted;
+        let current_page = "home".to_string();
         let window_handle = window.window_handle();
 
         let root = Self {
-            current_page,
+            current_page: current_page.clone(),
             show_sidebar: true,
             title_bar: cx.new(|_cx| TitleBar::new(window_handle.clone())),
             sidebar: cx.new(|cx| SidebarView::new(window, cx, current_page)),
@@ -67,7 +67,7 @@ impl RootView {
         root
     }
 
-    pub fn set_page(&mut self, page: Page, cx: &mut Context<Self>) {
+    pub fn set_page(&mut self, page: PageId, cx: &mut Context<Self>) {
         self.current_page = page;
         cx.notify(); // Trigger re-render
     }
@@ -100,15 +100,16 @@ impl RootView {
     }
 
     fn render_page_content(&self) -> impl IntoElement {
+        let page = self.current_page.as_str();
         div()
             .id("page-content")
             .flex_1()
             .overflow_y_scroll() // Allow vertical scrolling when content overflows
-            .child(match self.current_page {
-                Page::GetStarted => div().h_full().child(self.get_started.clone()),
-                Page::Connections => div().h_full().child(self.connections.clone()),
-                Page::NetworkLogs => div().h_full().child(self.network_logs.clone()),
-                Page::Settings => div().h_full().child(self.settings.clone()),
+            .child(match page {
+                "home" => div().h_full().child(self.get_started.clone()),
+                "logs" => div().h_full().child(self.network_logs.clone()),
+                "settings" => div().h_full().child(self.settings.clone()),
+                _ => div().h_full().child(self.connections.clone()), // Scope pages show connections
             })
     }
 }

crates/wsrx-desktop-gpui/src/views/sidebar.rs

@@ -2,19 +2,19 @@
 use gpui::{App, Context, Render, SharedString, Window, div, prelude::*, svg};
 
 use crate::{
-    models::app_state::Page,
+    models::app_state::PageId,
     styles::{border_radius, colors, heights, padding, sizes, spacing},
 };
 
-type PageChangeCallback = Box<dyn Fn(Page, &mut App) + Send + Sync>;
+type PageChangeCallback = Box<dyn Fn(PageId, &mut App) + Send + Sync>;
 
 pub struct SidebarView {
-    active_page: Page,
+    active_page: PageId,
     on_page_change: Option<PageChangeCallback>,
 }
 
 impl SidebarView {
-    pub fn new(_window: &mut Window, _cx: &mut Context<Self>, active_page: Page) -> Self {
+    pub fn new(_window: &mut Window, _cx: &mut Context<Self>, active_page: PageId) -> Self {
         Self {
             active_page,
             on_page_change: None,
@@ -26,22 +26,17 @@ impl SidebarView {
     }
 
     #[allow(dead_code)] // Intended for future use
-    pub fn set_active_page(&mut self, page: Page) {
+    pub fn set_active_page(&mut self, page: PageId) {
         self.active_page = page;
     }
 
     fn render_tab(
-        &self, page: Page, icon_path: &'static str, cx: &mut Context<Self>,
+        &self, page_id: &str, label: &str, icon_path: &'static str, cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let is_active = self.active_page == page;
-        let label_text = match page {
-            Page::GetStarted => t!("get_started"),
-            Page::Connections => t!("connections"),
-            Page::NetworkLogs => t!("network_logs"),
-            Page::Settings => t!("settings"),
-        };
+        let is_active = self.active_page == page_id;
+        let page_id_owned = page_id.to_string();
 
-        let id = SharedString::from(format!("sidebar-tab-{:?}", page));
+        let id = SharedString::from(format!("sidebar-tab-{}", page_id));
 
         div()
             .id(id)
@@ -65,10 +60,10 @@ impl SidebarView {
             })
             .on_click(cx.listener(move |this, _event, _window, cx| {
                 // Update our own state first
-                this.active_page = page;
+                this.active_page = page_id_owned.clone();
                 // Then notify parent
                 if let Some(ref callback) = this.on_page_change {
-                    callback(page, cx);
+                    callback(page_id_owned.clone(), cx);
                 }
             }))
             .child(
@@ -90,7 +85,7 @@ impl SidebarView {
                     } else {
                         gpui::FontWeight::NORMAL
                     })
-                    .child(label_text.to_string()),
+                    .child(label.to_string()),
             )
     }
 }
@@ -114,13 +109,12 @@ impl Render for SidebarView {
             .bg(colors::layer_1())
             .border_r_1()
             .border_color(colors::element_border())
-            .child(self.render_tab(Page::GetStarted, "icons/home.svg", cx))
-            .child(self.render_tab(Page::Connections, "icons/globe-star.svg", cx))
-            .child(self.render_tab(Page::NetworkLogs, "icons/code.svg", cx))
+            .child(self.render_tab("home", t!("get_started"), "icons/home.svg", cx))
+            .child(self.render_tab("logs", t!("network_logs"), "icons/code.svg", cx))
             .child(
                 // Spacer
                 div().flex_1(),
             )
-            .child(self.render_tab(Page::Settings, "icons/settings.svg", cx))
+            .child(self.render_tab("settings", t!("settings"), "icons/settings.svg", cx))
     }
 }