Always enable entity path filter editor

crates/re_viewer/src/ui/rerun_menu.rs

@@ -375,14 +375,6 @@ fn experimental_feature_ui(
         ));
     }
 
-    re_ui
-        .checkbox(
-            ui,
-            &mut app_options.experimental_entity_filter_editor,
-            "Entity filter DSL",
-        )
-        .on_hover_text("Show an entity filter DSL when selecting a space-view.");
-
     re_ui
         .checkbox(
             ui,

crates/re_viewer/src/ui/selection_panel.rs

@@ -837,43 +837,33 @@ fn blueprint_ui_for_space_view(
     viewport: &mut Viewport<'_, '_>,
     space_view_id: &SpaceViewId,
 ) {
-    if ctx.app_options.experimental_entity_filter_editor {
-        if let Some(space_view) = viewport.blueprint.space_view(space_view_id) {
-            if let Some(query) = space_view.queries.first() {
-                if let Some(new_entity_path_filter) =
-                    entity_path_filter_ui(ui, viewport, space_view_id, &query.entity_path_filter)
-                {
-                    let timepoint = blueprint_timepoint_for_writes();
-                    let expressions_component = QueryExpressions::from(&new_entity_path_filter);
-
-                    let row = DataRow::from_cells1_sized(
-                        RowId::new(),
-                        query.id.as_entity_path(),
-                        timepoint,
-                        1,
-                        [expressions_component],
-                    )
-                    .unwrap();
-
-                    ctx.command_sender
-                        .send_system(SystemCommand::UpdateBlueprint(
-                            ctx.store_context.blueprint.store_id().clone(),
-                            vec![row],
-                        ));
-
-                    space_view.set_entity_determined_by_user(ctx);
-                }
-
-                ui.add_space(ui.spacing().item_spacing.y);
+    if let Some(space_view) = viewport.blueprint.space_view(space_view_id) {
+        if let Some(query) = space_view.queries.first() {
+            if let Some(new_entity_path_filter) =
+                entity_path_filter_ui(ui, viewport, space_view_id, &query.entity_path_filter)
+            {
+                let timepoint = blueprint_timepoint_for_writes();
+                let expressions_component = QueryExpressions::from(&new_entity_path_filter);
+
+                let row = DataRow::from_cells1_sized(
+                    RowId::new(),
+                    query.id.as_entity_path(),
+                    timepoint,
+                    1,
+                    [expressions_component],
+                )
+                .unwrap();
+
+                ctx.command_sender
+                    .send_system(SystemCommand::UpdateBlueprint(
+                        ctx.store_context.blueprint.store_id().clone(),
+                        vec![row],
+                    ));
+
+                space_view.set_entity_determined_by_user(ctx);
             }
-        }
-    } else {
-        let response = ui.button("Add/remove Entity").on_hover_text(
-            "Adjust the query expressions to add or remove Entities from the Space View",
-        );
 
-        if response.clicked() {
-            viewport.show_add_remove_entities_modal(*space_view_id);
+            ui.add_space(ui.spacing().item_spacing.y);
         }
     }
 

crates/re_viewer_context/src/app_options.rs

@@ -17,8 +17,6 @@ pub struct AppOptions {
     /// Enable experimental dataframe space views.
     pub experimental_dataframe_space_view: bool,
 
-    pub experimental_entity_filter_editor: bool,
-
     /// Toggle query clamping for the plot visualizers.
     pub experimental_plot_query_clamping: bool,
 
@@ -52,8 +50,6 @@ impl Default for AppOptions {
 
             experimental_dataframe_space_view: false,
 
-            experimental_entity_filter_editor: false,
-
             experimental_plot_query_clamping: false,
 
             experimental_visualizer_selection: false,

crates/re_viewport/src/space_view_entity_picker.rs

@@ -31,16 +31,10 @@ impl SpaceViewEntityPicker {
         ctx: &ViewerContext<'_>,
         viewport_blueprint: &ViewportBlueprint,
     ) {
-        let title = if ctx.app_options.experimental_entity_filter_editor {
-            "Edit entity path query"
-        } else {
-            "Add/remove Entities"
-        };
-
         self.modal_handler.ui(
             ctx.re_ui,
             egui_ctx,
-            || re_ui::modal::Modal::new(title).default_height(640.0),
+            || re_ui::modal::Modal::new("Add/remove Entities").default_height(640.0),
             |_, ui, open| {
                 let Some(space_view_id) = &self.space_view_id else {
                     *open = false;