Show loading screen when opening link (#11270)

Author: IsseW

crates/utils/re_smart_channel/src/lib.rs

@@ -142,12 +142,12 @@ impl SmartChannelSource {
     ///
     /// Returns `None` for any source that receives data dynamically through SDK calls or similar.
     /// For a status string that applies to all sources, see [`Self::status_string`].
-    pub fn loading_string(&self) -> Option<String> {
+    pub fn loading_name(&self) -> Option<String> {
         match self {
             // We only show things we know are very-soon-to-be recordings:
-            Self::File(path) => Some(format!("Loading {}…", path.display())),
-            Self::RrdHttpStream { url, .. } => Some(format!("Loading {url}…")),
-            Self::RedapGrpcStream { uri, .. } => Some(format!("Loading {uri}…")),
+            Self::File(path) => Some(path.to_string_lossy().into_owned()),
+            Self::RrdHttpStream { url, .. } => Some(url.clone()),
+            Self::RedapGrpcStream { uri, .. } => Some(uri.partition_id.clone()),
 
             Self::RrdWebEventListener
             | Self::JsChannel { .. }

crates/utils/re_smart_channel/src/receive_set.rs

@@ -31,6 +31,14 @@ impl<T: Send> ReceiveSet<T> {
         rx.push(r);
     }
 
+    /// Are we currently receiving this source?
+    pub fn contains(&self, source: &SmartChannelSource) -> bool {
+        self.receivers
+            .lock()
+            .iter()
+            .any(|src| src.source.is_same_ignoring_uri_fragments(source))
+    }
+
     /// Disconnect from any channel with the given source.
     pub fn remove(&self, source: &SmartChannelSource) {
         self.receivers.lock().retain(|r| r.source() != source);

crates/viewer/re_data_ui/src/item_ui.rs

@@ -280,11 +280,11 @@ fn instance_path_button_to_ex(
         ui.selectable_label_with_icon(
             instance_path_icon(&query.timeline(), db, instance_path),
             text,
-            ctx.selection().contains_item(&item),
+            ctx.is_selected_or_loading(&item),
             re_ui::LabelStyle::Normal,
         )
     } else {
-        ui.selectable_label(ctx.selection().contains_item(&item), text)
+        ui.selectable_label(ctx.is_selected_or_loading(&item), text)
     };
 
     let response = response.on_hover_ui(|ui| {
@@ -472,7 +472,7 @@ pub fn data_blueprint_button_to(
 ) -> egui::Response {
     let item = Item::DataResult(view_id, InstancePath::entity_all(entity_path.clone()));
     let response = ui
-        .selectable_label(ctx.selection().contains_item(&item), text)
+        .selectable_label(ctx.is_selected_or_loading(&item), text)
         .on_hover_ui(|ui| {
             let include_subtree = false;
             entity_hover_card_ui(ui, ctx, query, db, entity_path, include_subtree);
@@ -624,7 +624,7 @@ pub fn app_id_button_ui(
     let response = ui.selectable_label_with_icon(
         &icons::APPLICATION,
         app_id.to_string(),
-        ctx.selection().contains_item(&item),
+        ctx.is_selected_or_loading(&item),
         re_ui::LabelStyle::Normal,
     );
 
@@ -645,7 +645,7 @@ pub fn data_source_button_ui(
     let response = ui.selectable_label_with_icon(
         &icons::DATA_SOURCE,
         data_source.to_string(),
-        ctx.selection().contains_item(&item),
+        ctx.is_selected_or_loading(&item),
         re_ui::LabelStyle::Normal,
     );
 
@@ -756,7 +756,7 @@ pub fn entity_db_button_ui(
     let mut list_item = ui
         .list_item()
         .active(ctx.store_context.is_active(&store_id))
-        .selected(ctx.selection().contains_item(&item));
+        .selected(ctx.is_selected_or_loading(&item));
 
     if ctx.hovered().contains_item(&item) {
         list_item = list_item.force_hovered(true);
@@ -841,7 +841,7 @@ pub fn table_id_button_ui(
 
     let mut list_item = ui
         .list_item()
-        .selected(ctx.selection().contains_item(&item))
+        .selected(ctx.is_selected_or_loading(&item))
         .active(ctx.active_table_id() == Some(table_id));
 
     if ctx.hovered().contains_item(&item) {

crates/viewer/re_dataframe_ui/src/datafusion_table_widget.rs

@@ -201,18 +201,6 @@ impl<'a> DataFusionTableWidget<'a> {
         self
     }
 
-    fn loading_ui(ui: &mut egui::Ui) -> egui::Response {
-        Frame::new()
-            .inner_margin(16.0)
-            .show(ui, |ui| {
-                ui.horizontal(|ui| {
-                    ui.spinner();
-                    ui.label("Loading table…");
-                });
-            })
-            .response
-    }
-
     /// Display the table.
     pub fn show(
         self,
@@ -232,13 +220,17 @@ impl<'a> DataFusionTableWidget<'a> {
         match session_ctx.table_exist(table_ref.clone()) {
             Ok(true) => {}
             Ok(false) => {
-                Self::loading_ui(ui).on_hover_text("Waiting…");
+                ui.loading_screen(
+                    "Loading table:",
+                    url.as_deref().or(title.as_deref()).unwrap_or(""),
+                );
                 return;
             }
             Err(err) => {
-                Self::loading_ui(ui).on_hover_ui(|ui| {
-                    ui.label(err.to_string());
-                });
+                ui.loading_screen(
+                    "Error while loading table:",
+                    RichText::from(err.to_string()).color(ui.style().visuals.error_fg_color),
+                );
                 return;
             }
         }
@@ -291,7 +283,10 @@ impl<'a> DataFusionTableWidget<'a> {
                 // still processing, nothing yet to show
                 //TODO(ab): it can happen that we're stuck in the state. We should detect it and
                 //produce an error
-                Self::loading_ui(ui);
+                ui.loading_screen(
+                    "Loading table:",
+                    url.as_deref().or(title.as_deref()).unwrap_or(""),
+                );
                 return;
             }
         };

crates/viewer/re_global_context/src/lib.rs

@@ -67,6 +67,11 @@ pub enum DisplayMode {
     /// The settings dialog for application-wide configuration.
     Settings,
 
+    // TODO(isse): It would be nice to only switch to newly loaded items if we
+    // are on the loading screen for that specific item.
+    /// A loading screen to some source.
+    Loading(Box<re_smart_channel::SmartChannelSource>),
+
     /// Regular view of the local recordings, including the current recording's viewport.
     LocalRecordings(StoreId),
 

crates/viewer/re_recording_panel/src/data.rs

@@ -194,7 +194,7 @@ impl<'a> AppIdData<'a> {
         });
 
         let is_active = false;
-        let is_selected = ctx.selection().contains_item(&Item::AppId(app_id.clone()));
+        let is_selected = ctx.is_selected_or_loading(&Item::AppId(app_id.clone()));
 
         let loaded_recordings = entity_dbs
             .into_iter()
@@ -252,7 +252,7 @@ impl<'a> ServerData<'a> {
         let origin = server.origin();
         let item = Item::RedapServer(origin.clone());
 
-        let is_selected = ctx.selection().contains_item(&item);
+        let is_selected = ctx.is_selected_or_loading(&item);
         let is_active = matches!(
             ctx.display_mode(),
             DisplayMode::RedapServer(current_origin)
@@ -310,7 +310,7 @@ impl<'a> ServerEntriesData<'a> {
                         entry_id: entry.id(),
                         name: entry.name().to_owned(),
                         icon: entry.icon(),
-                        is_selected: ctx.selection().contains_item(&Item::RedapEntry(
+                        is_selected: ctx.is_selected_or_loading(&Item::RedapEntry(
                             re_uri::EntryUri {
                                 origin: origin.clone(),
                                 entry_id: entry.id(),

crates/viewer/re_recording_panel/src/recording_panel_ui.rs

@@ -167,7 +167,7 @@ fn all_sections_ui(
 
     if recording_panel_data.show_example_section {
         let item = Item::RedapServer(EXAMPLES_ORIGIN.clone());
-        let selected = ctx.selection().contains_item(&item);
+        let selected = ctx.is_selected_or_loading(&item);
         let active = matches!(
             ctx.display_mode(),
             DisplayMode::RedapServer(origin) if origin == &*EXAMPLES_ORIGIN
@@ -569,23 +569,33 @@ fn receiver_ui(
     receiver: &SmartChannelSource,
     show_hierarchal: bool,
 ) {
-    let Some(string) = receiver.loading_string() else {
+    let Some(string) = receiver.loading_name() else {
         return;
     };
 
-    let label_content = re_ui::list_item::LabelContent::new(string).with_buttons(|ui| {
-        let resp = ui
-            .small_icon_button(&re_ui::icons::REMOVE, "Disconnect")
-            .on_hover_text("Disconnect from this source");
+    let selected = ctx.is_selected_or_loading(&Item::DataSource(receiver.clone()));
 
-        if resp.clicked() {
-            ctx.connected_receivers.remove(receiver);
-        }
-    });
+    let label_content = re_ui::list_item::LabelContent::new(string)
+        .with_icon_fn(|ui, rect, _| {
+            ui.put(rect, egui::Spinner::new());
+        })
+        .with_buttons(|ui| {
+            let resp = ui
+                .small_icon_button(&re_ui::icons::REMOVE, "Disconnect")
+                .on_hover_text("Disconnect from this source");
+
+            if resp.clicked() {
+                ctx.connected_receivers.remove(receiver);
+            }
+        });
 
     if show_hierarchal {
-        ui.list_item().show_hierarchical(ui, label_content);
+        ui.list_item()
+            .selected(selected)
+            .show_hierarchical(ui, label_content);
     } else {
-        ui.list_item().show_flat(ui, label_content);
+        ui.list_item()
+            .selected(selected)
+            .show_flat(ui, label_content);
     }
 }

crates/viewer/re_ui/src/ui_ext.rs

@@ -784,6 +784,25 @@ pub trait UiExt {
         response
     }
 
+    fn loading_screen(
+        &mut self,
+        header: impl Into<egui::RichText>,
+        source: impl Into<egui::RichText>,
+    ) {
+        self.ui_mut().center("loading spinner", |ui| {
+            ui.vertical_centered(|ui| {
+                ui.spinner();
+                ui.label(
+                    header
+                        .into()
+                        .heading()
+                        .color(ui.style().visuals.weak_text_color()),
+                );
+                ui.strong(source);
+            });
+        });
+    }
+
     /// Paints a time cursor for indicating the time on a time axis along x.
     fn paint_time_cursor(
         &self,

crates/viewer/re_viewer/src/app.rs

@@ -17,7 +17,7 @@ use re_viewer_context::{
     ComponentUiRegistry, DisplayMode, Item, PlayState, RecordingConfig, RecordingOrTable,
     StorageContext, StoreContext, SystemCommand, SystemCommandSender as _, TableStore, ViewClass,
     ViewClassRegistry, ViewClassRegistryError, command_channel,
-    open_url::{ViewerOpenUrl, combine_with_base_url},
+    open_url::{OpenUrlOptions, ViewerOpenUrl, combine_with_base_url},
     santitize_file_name,
     store_hub::{BlueprintPersistence, StoreHub, StoreHubStats},
 };
@@ -431,14 +431,14 @@ impl App {
 
     /// Open a content URL in the viewer.
     pub fn open_url_or_file(&self, url: &str) {
-        let follow_if_http = false;
-        let select_redap_source_when_loaded = true;
-
         if let Ok(url) = ViewerOpenUrl::from_str(url) {
             url.open(
                 &self.egui_ctx,
-                follow_if_http,
-                select_redap_source_when_loaded,
+                &OpenUrlOptions {
+                    follow_if_http: false,
+                    select_redap_source_when_loaded: true,
+                    show_loader: true,
+                },
                 &self.command_sender,
             );
         } else {
@@ -734,7 +734,14 @@ impl App {
                     return;
                 }
 
-                self.state.navigation.replace(display_mode);
+                if matches!(display_mode, DisplayMode::Loading(_)) {
+                    self.state
+                        .selection_state
+                        .set_selection(re_viewer_context::ItemCollection::default());
+                    self.state.navigation.push(display_mode);
+                } else {
+                    self.state.navigation.replace(display_mode);
+                }
 
                 egui_ctx.request_repaint(); // Make sure we actually see the new mode.
             }
@@ -1393,7 +1400,7 @@ impl App {
                     self.state.navigation.pop();
                 }
 
-                DisplayMode::Settings | DisplayMode::LocalTable(_) => {
+                DisplayMode::Settings | DisplayMode::Loading(_) | DisplayMode::LocalTable(_) => {
                     re_log::debug!(
                         "Cannot toggle chunk store browser from current display mode: {:?}",
                         self.state.navigation.peek()
@@ -2747,7 +2754,11 @@ impl eframe::App for App {
 
         // Make sure some app is active
         // Must be called before `read_context` below.
-        if store_hub.active_app().is_none() {
+        if let DisplayMode::Loading(source) = self.state.navigation.peek() {
+            if !self.msg_receive_set().contains(source) {
+                self.state.navigation.pop();
+            }
+        } else if store_hub.active_app().is_none() {
             let apps: std::collections::BTreeSet<&ApplicationId> = store_hub
                 .store_bundle()
                 .entity_dbs()
@@ -2821,15 +2832,15 @@ impl eframe::App for App {
                         self.command_sender.send_ui(cmd);
                     }
                     re_ui::CommandPaletteAction::OpenUrl(url_desc) => {
-                        let follow_if_http = false;
-                        let select_redap_source_when_loaded = true;
-
                         match url_desc.url.parse::<ViewerOpenUrl>() {
                             Ok(url) => {
                                 url.open(
                                     egui_ctx,
-                                    follow_if_http,
-                                    select_redap_source_when_loaded,
+                                    &OpenUrlOptions {
+                                        follow_if_http: false,
+                                        select_redap_source_when_loaded: true,
+                                        show_loader: true,
+                                    },
                                     &self.command_sender,
                                 );
                             }