More context menu 2: add support to show/hide DataResults

crates/re_viewport/src/context_menu/actions.rs

@@ -1,3 +1,4 @@
+use re_entity_db::InstancePath;
 use re_log_types::{EntityPath, EntityPathFilter};
 use re_space_view::{DataQueryBlueprint, SpaceViewBlueprint};
 use re_viewer_context::{ContainerId, Item, SpaceViewClassIdentifier, SpaceViewId};
@@ -18,6 +19,9 @@ impl ContextMenuAction for ShowAction {
                     .is_contents_visible(&Contents::Container(*container_id))
                     && ctx.viewport_blueprint.root_container != Some(*container_id)
             }
+            Item::DataResult(space_view_id, instance_path) => {
+                data_result_visible(ctx, space_view_id, instance_path).is_some_and(|vis| !vis)
+            }
             _ => false,
         })
     }
@@ -45,9 +49,16 @@ impl ContextMenuAction for ShowAction {
             true,
         );
     }
-}
 
-// ---
+    fn process_data_result(
+        &self,
+        ctx: &ContextMenuContext<'_>,
+        space_view_id: &SpaceViewId,
+        instance_path: &InstancePath,
+    ) {
+        set_data_result_visible(ctx, space_view_id, instance_path, true);
+    }
+}
 
 pub(super) struct HideAction;
 
@@ -62,6 +73,9 @@ impl ContextMenuAction for HideAction {
                     .is_contents_visible(&Contents::Container(*container_id))
                     && ctx.viewport_blueprint.root_container != Some(*container_id)
             }
+            Item::DataResult(space_view_id, instance_path) => {
+                data_result_visible(ctx, space_view_id, instance_path).unwrap_or(false)
+            }
             _ => false,
         })
     }
@@ -89,6 +103,66 @@ impl ContextMenuAction for HideAction {
             false,
         );
     }
+
+    fn process_data_result(
+        &self,
+        ctx: &ContextMenuContext<'_>,
+        space_view_id: &SpaceViewId,
+        instance_path: &InstancePath,
+    ) {
+        set_data_result_visible(ctx, space_view_id, instance_path, false);
+    }
+}
+
+fn data_result_visible(
+    ctx: &ContextMenuContext<'_>,
+    space_view_id: &SpaceViewId,
+    instance_path: &InstancePath,
+) -> Option<bool> {
+    if instance_path.is_splat() {
+        if let Some(space_view) = ctx.viewport_blueprint.space_view(space_view_id) {
+            let query_result = ctx
+                .viewer_context
+                .lookup_query_result(space_view.query_id());
+            query_result
+                .tree
+                .lookup_result_by_path(&instance_path.entity_path)
+                .map(|data_result| {
+                    data_result
+                        .recursive_properties()
+                        .map_or(true, |prop| prop.visible)
+                })
+        } else {
+            None
+        }
+    } else {
+        None
+    }
+}
+
+fn set_data_result_visible(
+    ctx: &ContextMenuContext<'_>,
+    space_view_id: &SpaceViewId,
+    instance_path: &InstancePath,
+    visible: bool,
+) {
+    if let Some(space_view) = ctx.viewport_blueprint.space_view(space_view_id) {
+        let query_result = ctx
+            .viewer_context
+            .lookup_query_result(space_view.query_id());
+        if let Some(data_result) = query_result
+            .tree
+            .lookup_result_by_path(&instance_path.entity_path)
+        {
+            let mut recursive_properties = data_result
+                .recursive_properties()
+                .cloned()
+                .unwrap_or_default();
+            recursive_properties.visible = visible;
+
+            data_result.save_recursive_override(ctx.viewer_context, Some(recursive_properties));
+        }
+    }
 }
 
 // ---

crates/re_viewport/src/viewport_blueprint_ui.rs

@@ -290,7 +290,7 @@ impl Viewport<'_, '_> {
                 default_open,
                 |_, ui| {
                     // Always show the origin hierarchy first.
-                    Self::space_view_entity_hierarchy_ui(
+                    self.space_view_entity_hierarchy_ui(
                         ctx,
                         ui,
                         query_result,
@@ -323,7 +323,7 @@ impl Viewport<'_, '_> {
                         ui.label(egui::RichText::new("Projections:").italics());
 
                         for projection in projections {
-                            Self::space_view_entity_hierarchy_ui(
+                            self.space_view_entity_hierarchy_ui(
                                 ctx,
                                 ui,
                                 query_result,
@@ -365,7 +365,9 @@ impl Viewport<'_, '_> {
         );
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn space_view_entity_hierarchy_ui(
+        &self,
         ctx: &ViewerContext<'_>,
         ui: &mut egui::Ui,
         query_result: &DataQueryResult,
@@ -491,7 +493,7 @@ impl Viewport<'_, '_> {
                                 continue;
                             };
 
-                            Self::space_view_entity_hierarchy_ui(
+                            self.space_view_entity_hierarchy_ui(
                                 ctx,
                                 ui,
                                 query_result,
@@ -517,6 +519,14 @@ impl Viewport<'_, '_> {
             let query = ctx.current_query();
             re_data_ui::item_ui::entity_hover_card_ui(ui, ctx, &query, store, entity_path);
         });
+
+        context_menu_ui_for_item(
+            ctx,
+            self.blueprint,
+            &item,
+            &response,
+            SelectionUpdateBehavior::UseSelection,
+        );
         ctx.select_hovered_on_click(&response, item);
     }
 

tests/python/release_checklist/check_context_menu.py

@@ -13,7 +13,7 @@
 
 * Reset the blueprint.
 * Right-click on any space view and check for context menu content:
-    - Hide
+    - Hide (or Show, depending on visibility)
     - Remove
     - Clone
     - Move to new container
@@ -26,19 +26,17 @@
     - Add Space View
 * Add a container via the context menu, check the container appears at then end of the list.
 * Right-click on the container and check for context menu content:
-    - Hide
+    - Hide (or Show, depending on visibility)
     - Remove
     - Add Container
     - Add Space View
     - Move to new container
+* Right-click on a data result and check for the context menu content:
+    - Hide (or Show, depending on visibility)
 * Select a container and, in the Selection Panel, right click on either space view or container children:
     - The context menu action should be the same as before.
     - The selection state is not affected by the right-click.
 
-### Show/Hide
-
-* Hide a space view and check that its context menu shows "Show" instead of "Hide".
-* Select multiple space views with homogeneous or heterogeneous visibility states. Check that either or both of "Show All" and "Hide All" are showed as appropriate.
 
 ### Selection behavior
 
@@ -52,12 +50,18 @@
 ### Multi-selection checks
 
 * Select multiple space views, right-click, and check for context menu content:
-    - Hide
+    - Hide All (if any are visible)
+    - Show All (if any are hidden)
     - Remove
     - Move to new container
 * Same as above, but with only containers selected.
 * Same as above, but with both space views and containers selected.
-* Same as above, but with the viewport selected as well. The context menu should be identical, but none of its actions should apply to the viewport.
+* Same as above, but with the viewport selected as well, and check for context menu content. These should not affect the Viewport.
+    - Hide All (if any are visible)
+    - Show All (if any are hidden)
+* Select a mix of containers, space views, and data results, and check for context menu content:
+    - Hide All (if any are visible)
+    - Show All (if any are hidden)
 
 ### Invalid sub-container kind