Remove templated filters when accessing query page

app/helpers/types_helper.rb

@@ -106,6 +106,9 @@ module ::TypesHelper
   end
 
   def query_to_query_props(query)
+    # Remove the templated filter since we can't yet handle it in the frontend
+    query.filters.delete_if(&:templated?)
+
     ::API::V3::Queries::QueryParamsRepresenter.new(query).to_h
   end
 

app/models/queries/filters/base.rb

@@ -98,6 +98,13 @@ class Queries::Filters::Base
     true
   end
 
+  ##
+  # Return whether this filter is templated
+  # and must be substituted by the frontend.
+  def templated?
+    values == %w[templated]
+  end
+
   def available_operators
     type_strategy.supported_operator_classes
   end

app/views/types/form/_query_group.html.erb

@@ -17,7 +17,7 @@
   <%= content_tag :div,
                   class: 'type-form-query',
                   data: { query: JSON.dump(query) } do %>
-    <span ng-click="editQuery($event)">
+    <span class="type-form-query-group--edit-button" ng-click="editQuery($event)">
       <%= op_icon('button--icon icon-edit') %>
       <%= t('types.edit.edit_query') %>
     </span>

spec/features/types/form_configuration_query_spec.rb

@@ -90,18 +90,31 @@ describe 'form subelements configuration', type: :feature, js: true do
       embedded_table.expect_work_package_not_listed subbug
 
       # Go back to type configuration
-      # visit edit_type_tab_path(id: type.id, tab: "form_configuration")
+      visit edit_type_tab_path(id: type_bug.id, tab: "form_configuration")
 
       # Edit query to remove filters
-      # TODO error due to templated filter
+      form.edit_query_group('Subtasks')
-      # form.edit_query_group('Subtasks')
+
+      # Expect filter still there
+      modal.expect_open
+      filters.expect_filter_count 2
+      filters.expect_filter_by 'Type', 'is', type_task.name
+
+      # Remove the filter again
+      filters.remove_filter 'type'
+      filters.save
 
       # Save changes
-      # form.save_changes
+      form.save_changes
 
       # Visit wp_page again, expect both listed
-      # embedded_table = Pages::EmbeddedWorkPackagesTable.new(find('.work-packages-embedded-view--container'))
+      wp_page.visit!
-      # embedded_table.expect_work_package_listed subtask, subbug
+      wp_page.ensure_page_loaded
+
+      wp_page.expect_group('Subtasks') do
+        embedded_table = Pages::EmbeddedWorkPackagesTable.new(find('.work-packages-embedded-view--container'))
+        embedded_table.expect_work_package_listed subtask, subbug
+      end
     end
   end
 end