Move Properties section to re_selection_panel

Author: grtlr

Cargo.lock

@@ -6078,7 +6078,6 @@ dependencies = [
  "nohash-hasher",
  "re_byte_size",
  "re_capabilities",
- "re_case",
  "re_chunk_store",
  "re_entity_db",
  "re_format",
@@ -6630,6 +6629,7 @@ dependencies = [
  "egui_tiles",
  "itertools 0.14.0",
  "nohash-hasher",
+ "re_case",
  "re_chunk",
  "re_chunk_store",
  "re_context_menu",

crates/viewer/re_data_ui/Cargo.toml

@@ -21,7 +21,6 @@ all-features = true
 [dependencies]
 re_byte_size.workspace = true
 re_capabilities = { workspace = true, features = ["egui"] }
-re_case.workspace = true
 re_chunk_store.workspace = true
 re_entity_db.workspace = true
 re_format.workspace = true

crates/viewer/re_data_ui/src/entity_db.rs

@@ -1,7 +1,7 @@
 use re_byte_size::SizeBytes as _;
 use re_chunk_store::ChunkStoreConfig;
 use re_entity_db::EntityDb;
-use re_log_types::{EntityPath, StoreKind};
+use re_log_types::StoreKind;
 use re_ui::UiExt as _;
 use re_viewer_context::{UiLayout, ViewerContext};
 
@@ -13,8 +13,8 @@ impl crate::DataUi for EntityDb {
         ctx: &ViewerContext<'_>,
         ui: &mut egui::Ui,
         ui_layout: UiLayout,
-        query: &re_chunk_store::LatestAtQuery,
-        db: &re_entity_db::EntityDb,
+        _query: &re_chunk_store::LatestAtQuery,
+        _db: &re_entity_db::EntityDb,
     ) {
         if ui_layout.is_single_line() {
             // TODO(emilk): standardize this formatting with that in `entity_db_button_ui`
@@ -213,32 +213,5 @@ impl crate::DataUi for EntityDb {
                 }
             }
         }
-
-        ui.section_collapsing_header("Properties").show(ui, |ui| {
-            let filtered = db
-                .entity_paths()
-                .into_iter()
-                .filter(|entity_path| {
-                    // Only check for properties, but skip the recording properties,
-                    // because we display them already elsewhere in the UI.
-                    entity_path.is_descendant_of(&EntityPath::properties())
-                })
-                .collect::<Vec<_>>();
-
-            if filtered.is_empty() {
-                ui.label("No properties found for this recording.");
-            } else {
-                for entity_path in filtered {
-                    // We strip the property part
-                    let name = entity_path
-                        .to_string()
-                        .strip_prefix(format!("{}/", EntityPath::properties()).as_str())
-                        .map(re_case::to_human_case)
-                        .unwrap_or("<unknown>".to_owned());
-                    ui.label(name);
-                    entity_path.data_ui(ctx, ui, ui_layout, query, db);
-                }
-            }
-        });
     }
 }

crates/viewer/re_selection_panel/Cargo.toml

@@ -19,6 +19,7 @@ workspace = true
 all-features = true
 
 [dependencies]
+re_case.workspace = true
 re_chunk_store.workspace = true
 re_chunk.workspace = true
 re_context_menu.workspace = true

crates/viewer/re_selection_panel/src/selection_panel.rs

@@ -281,17 +281,46 @@ impl SelectionPanel {
             _ => {}
         }
 
+        let (query, db) = if let Some(entity_path) = item.entity_path() {
+            guess_query_and_db_for_selected_entity(ctx, entity_path)
+        } else {
+            (ctx.current_query(), ctx.recording())
+        };
+
         if let Some(data_ui_item) = data_section_ui(item) {
             ui.section_collapsing_header("Data").show(ui, |ui| {
                 // TODO(#6075): Because `list_item_scope` changes it. Temporary until everything is `ListItem`.
                 ui.spacing_mut().item_spacing.y = ui.ctx().style().spacing.item_spacing.y;
+                data_ui_item.data_ui(ctx, ui, ui_layout, &query, db);
+            });
+        }
 
-                let (query, db) = if let Some(entity_path) = item.entity_path() {
-                    guess_query_and_db_for_selected_entity(ctx, entity_path)
+        if let Item::StoreId(_) = item {
+            ui.section_collapsing_header("Properties").show(ui, |ui| {
+                let filtered = db
+                    .entity_paths()
+                    .into_iter()
+                    .filter(|entity_path| {
+                        // Only check for properties, but skip the recording properties,
+                        // because we display them already elsewhere in the UI.
+                        entity_path.is_descendant_of(&EntityPath::properties())
+                    })
+                    .collect::<Vec<_>>();
+
+                if filtered.is_empty() {
+                    ui.label("No properties found for this recording.");
                 } else {
-                    (ctx.current_query(), ctx.recording())
-                };
-                data_ui_item.data_ui(ctx, ui, ui_layout, &query, db);
+                    for entity_path in filtered {
+                        // We strip the property part
+                        let name = entity_path
+                            .to_string()
+                            .strip_prefix(format!("{}/", EntityPath::properties()).as_str())
+                            .map(re_case::to_human_case)
+                            .unwrap_or("<unknown>".to_owned());
+                        ui.label(name);
+                        entity_path.data_ui(ctx, ui, ui_layout, &query, db);
+                    }
+                }
             });
         }