Pass the active filter when constructing the additional_attributes for the autocompleters.

Previously the inactive filter was passed to the additional_attributes,
this leading to values not being initialized correctly from the active
filters.

Author: dombesz

Diff for: app/components/filter/filter_component.rb

@@ -43,17 +43,16 @@ def show_filters_section?
     # Returns filters, active and inactive.
     # In case a filter is active, the active one will be preferred over the inactive one.
     def each_filter
-      allowed_filters.each do |filter|
-        active_filter = query.find_active_filter(filter.name)
-        additional_attributes = additional_filter_attributes(filter)
+      allowed_filters.each do |allowed_filter|
+        active_filter = query.find_active_filter(allowed_filter.name)
+        filter = active_filter || allowed_filter
 
-        yield active_filter.presence || filter, active_filter.present?, additional_attributes
+        yield filter, active_filter.present?, additional_filter_attributes(filter)
       end
     end
 
     def allowed_filters
-      query
-        .available_advanced_filters
+      query.available_advanced_filters
     end
 
     def value_hidden_class(selected_operator)
@@ -99,8 +98,7 @@ def custom_field_list_autocomplete_options(filter)
                 else
                   { items: filter.allowed_values.map { |name, id| { name:, id: } } }
                 end
-
-      autocomplete_options.merge(options)
+      autocomplete_options.merge(options).merge(model: filter.values)
     end
 
     def list_autocomplete_options(filter)

Diff for: app/views/filters/_autocomplete.html.erb

@@ -11,7 +11,6 @@
                               multiple: true,
                               multipleAsSeparateInputs: false,
                               inputValue: filter.values,
-                              model: filter.values,
                               appendTo: "body",
                               id: "#{filter.name}_value",
                               hiddenFieldAction: "change->filter--filters-form#autocompleteSendForm"

Diff for: spec/features/projects/persisted_lists_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -- copyright
 # OpenProject is an open source project management software.
 # Copyright (C) the OpenProject GmbH
@@ -450,7 +452,6 @@
 
     it "keep the query active when applying orders, page and column changes" do
       projects_page.visit!
-
       # The user can select the list but cannot see another user's list
       projects_page.set_sidebar_filter(my_projects_list.name)
       projects_page.expect_no_sidebar_filter(another_users_projects_list.name)
@@ -551,6 +552,15 @@
                                                development_project) # Because it is on the second page
     end
 
+    it "shows the saved filter values in the filter section" do
+      my_projects_list.where("project_status_code", "=", Project.status_codes["on_track"])
+      my_projects_list.save!
+
+      projects_page.visit!
+      projects_page.set_sidebar_filter(my_projects_list.name)
+      projects_page.expect_filter_set("project_status_code", value: "On track")
+    end
+
     it "cannot access another user`s list" do
       visit projects_path(query_id: another_users_projects_list.id)
 

Diff for: spec/support/components/common/filters.rb

@@ -39,11 +39,16 @@ def expect_filters_container_hidden
         expect(page).to have_css(".op-filters-form", visible: :hidden)
       end
 
-      def expect_filter_set(filter_name)
+      def expect_filter_set(filter_name, value: nil)
         if filter_name == "name_and_identifier"
           expect(page.find_by_id(filter_name).value).not_to be_empty
+        elsif value
+          within("li[data-filter-name='#{filter_name}']:not(.hidden)", visible: :hidden) do
+            expect(page).to have_css(".advanced-filters--filter-value", text: value, visible: :all)
+          end
         else
-          expect(page).to have_css("li[data-filter-name='#{filter_name}']:not(.hidden)", visible: :hidden)
+          expect(page)
+            .to have_css("li[data-filter-name='#{filter_name}']:not(.hidden)", visible: :hidden)
         end
       end
 

Diff for: spec/support/pages/projects/index.rb

@@ -158,26 +158,6 @@ def expect_page_sizes(model:)
         end
       end
 
-      def expect_filters_container_toggled
-        expect(page).to have_css(".op-filters-form")
-      end
-
-      def expect_filters_container_hidden
-        expect(page).to have_css(".op-filters-form", visible: :hidden)
-      end
-
-      def expect_filter_set(filter_name)
-        if filter_name == "name_and_identifier"
-          expect(page.find_by_id(filter_name).value).not_to be_empty
-        else
-          expect(page).to have_css("li[data-filter-name='#{filter_name}']:not(.hidden)", visible: :hidden)
-        end
-      end
-
-      def expect_filter_count(count)
-        expect(page).to have_css('[data-test-selector="filters-button-counter"]', text: count)
-      end
-
       def expect_filter_available(filter_name)
         expect(page).to have_select("add_filter_select", with_options: [filter_name])
       end
@@ -256,20 +236,6 @@ def filter_by_name_and_identifier(value, send_keys: false)
         wait_for_reload
       end
 
-      def set_filter(name, human_name, human_operator = nil, values = [], send_keys: false)
-        if name == "name_and_identifier"
-          set_simple_filter(name, values, send_keys:)
-        else
-          set_advanced_filter(name, human_name, human_operator, values, send_keys:)
-        end
-      end
-
-      def set_simple_filter(_name, values, send_keys: false)
-        return unless values.any?
-
-        set_name_and_identifier_filter(values, send_keys:) # This is the only one simple filter at the moment.
-      end
-
       def set_advanced_filter(name, human_name, human_operator = nil, values = [], send_keys: false)
         selected_filter = select_filter(name, human_name)
         apply_operator(name, human_operator)
@@ -290,69 +256,6 @@ def set_advanced_filter(name, human_name, human_operator = nil, values = [], sen
         end
       end
 
-      def expect_autocomplete_options_for(custom_field, options, grouping: nil, results_selector: "body")
-        selected_filter = select_filter(custom_field.column_name, custom_field.name)
-
-        within(selected_filter) do
-          find('[data-filter-autocomplete="true"]').click
-        end
-
-        Array(options).each do |option|
-          expect_ng_option(selected_filter, option, grouping:, results_selector:)
-        end
-      end
-
-      def expect_user_autocomplete_options_for(custom_field, expected_options)
-        selected_filter = select_filter(custom_field.column_name, custom_field.name)
-
-        within(selected_filter) do
-          find('[data-filter-autocomplete="true"]').click
-        end
-        options = visible_user_auto_completer_options
-
-        expect(options).to eq(expected_options)
-      end
-
-      def apply_operator(name, human_operator)
-        select(human_operator, from: "operator") unless boolean_filter?(name)
-      end
-
-      def select_filter(name, human_name)
-        select human_name, from: "add_filter_select"
-        page.find("li[data-filter-name='#{name}']")
-      end
-
-      def remove_filter(name)
-        if name == "name_and_identifier"
-          page.find_by_id("name_and_identifier").find(:xpath, "following-sibling::button").click
-        else
-          page.find("li[data-filter-name='#{name}'] .filter_rem").click
-        end
-      end
-
-      def set_toggle_filter(values)
-        should_active = values.first == "yes"
-        is_active = page.has_selector? '[data-test-selector="spot-switch-handle"][data-qa-active]'
-
-        if should_active != is_active
-          page.find('[data-test-selector="spot-switch-handle"]').click
-        end
-
-        if should_active
-          expect(page).to have_css('[data-test-selector="spot-switch-handle"][data-qa-active]')
-        else
-          expect(page).to have_css('[data-test-selector="spot-switch-handle"]:not([data-qa-active])')
-        end
-      end
-
-      def set_name_and_identifier_filter(values, send_keys: false)
-        if send_keys
-          find_field("name_and_identifier").send_keys values.first
-        else
-          fill_in "name_and_identifier", with: values.first
-        end
-      end
-
       def set_date_filter(human_operator, values, send_keys: false)
         case human_operator
         when "on", "less than days ago", "more than days ago", "days ago"
@@ -372,39 +275,6 @@ def set_date_filter(human_operator, values, send_keys: false)
         end
       end
 
-      def set_autocomplete_filter(values, clear: true)
-        element = find('[data-filter-autocomplete="true"]')
-
-        ng_select_clear(element, raise_on_missing: false) if clear
-
-        Array(values).each do |query|
-          select_autocomplete element,
-                              query:,
-                              results_selector: "body"
-        end
-      end
-
-      def set_list_filter(values)
-        value_select = find('.single-select select[name="value"]')
-        value_select.select values.first
-      end
-
-      def open_filters
-        retry_block do
-          toggle_filters_section
-          expect(page).to have_css(".op-filters-form.-expanded")
-          page.find_field("Add filter", visible: true)
-        end
-      end
-
-      def filters_toggle
-        page.find('[data-test-selector="filter-component-toggle"]')
-      end
-
-      def toggle_filters_section
-        filters_toggle.click
-      end
-
       def set_columns(*columns)
         open_configure_view
 
@@ -671,14 +541,6 @@ def boolean_filter?(filter)
         %w[active member_of favored public templated].include?(filter.to_s)
       end
 
-      def autocomplete_filter?(filter)
-        filter.has_css?('[data-filter-autocomplete="true"]', wait: 0)
-      end
-
-      def date_filter?(filter)
-        filter[:"data-filter-type"] == "date"
-      end
-
       def date_time_filter?(filter)
         filter[:"data-filter-type"] == "datetime_past"
       end