Show all loaded applications in recordings panel

crates/re_data_ui/src/app_id.rs

@@ -0,0 +1,52 @@
+use re_entity_db::EntityDb;
+use re_log_types::ApplicationId;
+use re_viewer_context::{UiVerbosity, ViewerContext};
+
+use crate::item_ui::entity_db_button_ui;
+
+impl crate::DataUi for ApplicationId {
+    fn data_ui(
+        &self,
+        ctx: &ViewerContext<'_>,
+        ui: &mut egui::Ui,
+        verbosity: UiVerbosity,
+        _query: &re_data_store::LatestAtQuery,
+        _store: &re_data_store::DataStore,
+    ) {
+        egui::Grid::new("application_id")
+            .num_columns(2)
+            .show(ui, |ui| {
+                ui.label("Application ID");
+                ui.label(self.to_string());
+                if self == &ctx.store_context.app_id {
+                    ui.label("(active)");
+                }
+                ui.end_row();
+            });
+
+        if verbosity == UiVerbosity::Small {
+            return;
+        }
+
+        // Find all recordings with this app id
+        let recordings: Vec<&EntityDb> = ctx
+            .store_context
+            .bundle
+            .recordings()
+            .filter(|db| db.app_id() == Some(self))
+            .collect();
+
+        if !recordings.is_empty() {
+            ui.scope(|ui| {
+                ui.set_clip_rect(ui.max_rect()); // TODO(#5740): Hack required because `entity_db_button_ui` uses `ListItem`, which fills the full width until the clip rect.
+                ui.spacing_mut().item_spacing.y = 0.0;
+
+                ui.add_space(8.0);
+                ui.strong("Loaded recordings for this app");
+                for entity_db in recordings {
+                    entity_db_button_ui(ctx, ui, entity_db, true);
+                }
+            });
+        }
+    }
+}

crates/re_data_ui/src/data_source.rs

@@ -28,7 +28,8 @@ impl crate::DataUi for re_smart_channel::SmartChannelSource {
         for other in ctx
             .store_context
             .bundle
-            .entity_dbs_from_channel_source(self)
+            .entity_dbs()
+            .filter(|db| db.data_source.as_ref() == Some(self))
         {
             let is_clone = other.cloned_from().is_some();
             if is_clone {
@@ -46,30 +47,25 @@ impl crate::DataUi for re_smart_channel::SmartChannelSource {
             }
         }
 
-        if !recordings.is_empty() {
-            ui.add_space(8.0);
-            ui.strong("Recordings from this data source");
-            let max_rect = ui.max_rect();
-            ui.indent("recordings", |ui| {
-                ui.set_clip_rect(max_rect); // TODO(#5740): Hack required because `entity_db_button_ui` uses `ListItem`, which fills the full width until the clip rect.
-                ui.spacing_mut().item_spacing.y = 0.0;
+        ui.scope(|ui| {
+            ui.set_clip_rect(ui.max_rect()); // TODO(#5740): Hack required because `entity_db_button_ui` uses `ListItem`, which fills the full width until the clip rect.
+            ui.spacing_mut().item_spacing.y = 0.0;
+
+            if !recordings.is_empty() {
+                ui.add_space(8.0);
+                ui.strong("Recordings from this data source");
                 for entity_db in recordings {
                     entity_db_button_ui(ctx, ui, entity_db, true);
                 }
-            });
-        }
+            }
 
-        if !blueprints.is_empty() {
-            ui.add_space(8.0);
-            ui.strong("Blueprints from this data source");
-            let max_rect = ui.max_rect();
-            ui.indent("blueprints", |ui| {
-                ui.set_clip_rect(max_rect); // TODO(#5740): Hack required because `entity_db_button_ui` uses `ListItem`, which fills the full width until the clip rect.
-                ui.spacing_mut().item_spacing.y = 0.0;
+            if !blueprints.is_empty() {
+                ui.add_space(8.0);
+                ui.strong("Blueprints from this data source");
                 for entity_db in blueprints {
                     entity_db_button_ui(ctx, ui, entity_db, true);
                 }
-            });
-        }
+            }
+        });
     }
 }

crates/re_data_ui/src/entity_db.rs

@@ -3,7 +3,7 @@ use re_log_types::StoreKind;
 use re_types::SizeBytes;
 use re_viewer_context::{UiVerbosity, ViewerContext};
 
-use crate::item_ui::data_source_button_ui;
+use crate::item_ui::{app_id_button_ui, data_source_button_ui};
 
 impl crate::DataUi for EntityDb {
     fn data_ui(
@@ -54,7 +54,7 @@ impl crate::DataUi for EntityDb {
                 }
 
                 re_ui.grid_left_hand_label(ui, "Application ID");
-                ui.label(application_id.to_string());
+                app_id_button_ui(ctx, ui, application_id);
                 ui.end_row();
 
                 re_ui.grid_left_hand_label(ui, "Source");

crates/re_data_ui/src/item_ui.rs

@@ -3,7 +3,7 @@
 //! TODO(andreas): This is not a `data_ui`, can this go somewhere else, shouldn't be in `re_data_ui`.
 
 use re_entity_db::{EntityTree, InstancePath};
-use re_log_types::{ComponentPath, EntityPath, TimeInt, Timeline};
+use re_log_types::{ApplicationId, ComponentPath, EntityPath, TimeInt, Timeline};
 use re_ui::{icons, SyntaxHighlighting};
 use re_viewer_context::{HoverHighlight, Item, SpaceViewId, UiVerbosity, ViewerContext};
 
@@ -551,6 +551,34 @@ pub fn entity_hover_card_ui(
     instance_hover_card_ui(ui, ctx, query, store, &instance_path);
 }
 
+pub fn app_id_button_ui(
+    ctx: &ViewerContext<'_>,
+    ui: &mut egui::Ui,
+    app_id: &ApplicationId,
+) -> egui::Response {
+    let item = Item::AppId(app_id.clone());
+
+    let response = ctx.re_ui.selectable_label_with_icon(
+        ui,
+        &icons::APPLICATION,
+        app_id.to_string(),
+        ctx.selection().contains_item(&item),
+        re_ui::LabelStyle::Normal,
+    );
+
+    let response = response.on_hover_ui(|ui| {
+        app_id.data_ui(
+            ctx,
+            ui,
+            re_viewer_context::UiVerbosity::Reduced,
+            &ctx.current_query(),  // unused
+            ctx.recording_store(), // unused
+        );
+    });
+
+    cursor_interact_with_selectable(ctx, response, item)
+}
+
 pub fn data_source_button_ui(
     ctx: &ViewerContext<'_>,
     ui: &mut egui::Ui,
@@ -579,6 +607,7 @@ pub fn data_source_button_ui(
     cursor_interact_with_selectable(ctx, response, item)
 }
 
+/// This uses [`ListItem::show_hierarchical`], meaning it comes with built-in indentation.
 pub fn store_id_button_ui(
     ctx: &ViewerContext<'_>,
     ui: &mut egui::Ui,
@@ -594,6 +623,8 @@ pub fn store_id_button_ui(
 /// Show button for a store (recording or blueprint).
 ///
 /// You can set `include_app_id` to hide the App Id, but usually you want to show it.
+///
+/// This uses [`ListItem::show_hierarchical`], meaning it comes with built-in indentation.
 pub fn entity_db_button_ui(
     ctx: &ViewerContext<'_>,
     ui: &mut egui::Ui,
@@ -666,17 +697,15 @@ pub fn entity_db_button_ui(
         list_item = list_item.force_hovered(true);
     }
 
-    let response = list_item
-        .show_flat(ui) // never more than one level deep
-        .on_hover_ui(|ui| {
-            entity_db.data_ui(
-                ctx,
-                ui,
-                re_viewer_context::UiVerbosity::Reduced,
-                &ctx.current_query(),
-                entity_db.store(),
-            );
-        });
+    let response = list_item.show_hierarchical(ui).on_hover_ui(|ui| {
+        entity_db.data_ui(
+            ctx,
+            ui,
+            re_viewer_context::UiVerbosity::Reduced,
+            &ctx.current_query(),
+            entity_db.store(),
+        );
+    });
 
     if response.hovered() {
         ctx.selection_state().set_hovered(item.clone());

crates/re_data_ui/src/lib.rs

@@ -9,6 +9,7 @@ use re_types::ComponentName;
 use re_viewer_context::{UiVerbosity, ViewerContext};
 
 mod annotation_context;
+mod app_id;
 mod blueprint_data;
 mod component;
 mod component_path;

crates/re_entity_db/src/store_bundle.rs

@@ -56,8 +56,8 @@ impl StoreBundle {
         }
     }
 
-    pub fn remove(&mut self, id: &StoreId) {
-        self.entity_dbs.remove(id);
+    pub fn remove(&mut self, id: &StoreId) -> Option<EntityDb> {
+        self.entity_dbs.remove(id)
     }
 
     // --
@@ -134,16 +134,6 @@ impl StoreBundle {
             .filter(|log| log.store_kind() == StoreKind::Blueprint)
     }
 
-    /// All stores that came from the given source
-    pub fn entity_dbs_from_channel_source<'a>(
-        &'a self,
-        source: &'a re_smart_channel::SmartChannelSource,
-    ) -> impl Iterator<Item = &EntityDb> + 'a {
-        self.entity_dbs
-            .values()
-            .filter(move |db| db.data_source.as_ref() == Some(source))
-    }
-
     // --
 
     pub fn retain(&mut self, mut f: impl FnMut(&EntityDb) -> bool) {

crates/re_space_view_spatial/src/ui_3d.rs

@@ -552,7 +552,7 @@ pub fn view_3d(
     // Track focused entity if any.
     if let Some(focused_item) = ctx.focused_item {
         let focused_entity = match focused_item {
-            Item::DataSource(_) | Item::StoreId(_) | Item::Container(_) => None,
+            Item::AppId(_) | Item::DataSource(_) | Item::StoreId(_) | Item::Container(_) => None,
 
             Item::SpaceView(space_view_id) => {
                 if space_view_id == &query.space_view_id {

crates/re_ui/src/icons.rs

@@ -143,6 +143,10 @@ pub const ENTITY_EMPTY: Icon = Icon::new(
 pub const LINK: Icon = Icon::new("link", include_bytes!("../data/icons/link.png"));
 pub const COMPONENT: Icon = Icon::new("component", include_bytes!("../data/icons/component.png"));
 
+pub const APPLICATION: Icon = Icon::new(
+    "application",
+    include_bytes!("../data/icons/application.png"),
+);
 pub const DATA_SOURCE: Icon = Icon::new(
     "data_source",
     include_bytes!("../data/icons/data_source.png"),

crates/re_ui/src/lib.rs

@@ -931,6 +931,8 @@ impl ReUi {
     }
 
     /// Workaround for putting a label into a grid at the top left of its row.
+    ///
+    /// You only need to use this if you expect the right side to have multi-line entries.
     #[allow(clippy::unused_self)]
     pub fn grid_left_hand_label(&self, ui: &mut egui::Ui, label: &str) -> egui::Response {
         ui.with_layout(egui::Layout::left_to_right(egui::Align::TOP), |ui| {

crates/re_viewer/src/app.rs

@@ -336,6 +336,14 @@ impl App {
         egui_ctx: &egui::Context,
     ) {
         match cmd {
+            SystemCommand::ActivateApp(app_id) => {
+                store_hub.set_active_app(app_id);
+            }
+
+            SystemCommand::CloseApp(app_id) => {
+                store_hub.close_app(&app_id);
+            }
+
             SystemCommand::ActivateRecording(store_id) => {
                 store_hub.set_activate_recording(store_id);
             }
@@ -971,6 +979,11 @@ impl App {
                         StoreKind::Recording => {
                             re_log::debug!("Opening a new recording: {store_id}");
                             store_hub.set_active_recording_id(store_id.clone());
+
+                            // Also select the new recording:
+                            self.command_sender.send_system(SystemCommand::SetSelection(
+                                re_viewer_context::Item::StoreId(store_id.clone()),
+                            ));
                         }
                         StoreKind::Blueprint => {
                             // We wait with activating blueprints until they are fully loaded,
@@ -983,7 +996,7 @@ impl App {
                 }
 
                 LogMsg::ArrowMsg(_, _) => {
-                    // Andled by EntityDb::add
+                    // Handled by `EntityDb::add`
                 }
 
                 LogMsg::BlueprintActivationCommand(cmd) => match store_id.kind {
@@ -1007,6 +1020,7 @@ impl App {
                                     .unwrap_or_else(|err| {
                                         re_log::warn!("Failed to make blueprint active: {err}");
                                     });
+                                store_hub.set_active_app(app_id); // Switch to this app, e.g. on drag-and-drop of a blueprint file
                             }
                         } else {
                             re_log::warn!(

crates/re_viewer/src/app_state.rs

@@ -172,7 +172,7 @@ impl AppState {
                     }
                 }
 
-                viewport.is_item_valid(item)
+                viewport.is_item_valid(store_context, item)
             },
             re_viewer_context::Item::StoreId(store_context.recording.store_id().clone()),
         );
@@ -354,9 +354,11 @@ impl AppState {
                         // before drawing the blueprint panel.
                         ui.spacing_mut().item_spacing.y = 0.0;
 
-                        let recording_shown = recordings_panel_ui(&ctx, rx, ui);
+                        let pre_cursor = ui.cursor();
+                        recordings_panel_ui(&ctx, rx, ui);
+                        let any_recording_shows = pre_cursor == ui.cursor();
 
-                        if recording_shown {
+                        if any_recording_shows {
                             ui.add_space(4.0);
                         }