Merge branch 'fix-update-code-review-analytics-dispatched-filter-values' into 'master'

Fix legacy filter bar parameters

See merge request gitlab-org/gitlab!42310

ee/app/assets/javascripts/analytics/code_review_analytics/filtered_search_code_review_analytics.js

@@ -25,11 +25,11 @@ export default class FilteredSearchCodeReviewAnalytics extends FilteredSearchMan
    */
   updateObject = path => {
     const filters = urlParamsToObject(path);
-    const { selectedLabels, selectedMilestone } = transformFilters(filters);
+    const { selectedLabels: selectedLabelList, selectedMilestone } = transformFilters(filters);
 
     store.dispatch('filters/setFilters', {
-      labelNames: selectedLabels,
-      milestoneTitle: selectedMilestone,
+      selectedLabelList,
+      selectedMilestone,
     });
   };
 }

ee/spec/features/analytics/code_analytics_spec.rb

@@ -5,8 +5,8 @@ require 'spec_helper'
 RSpec.describe 'CodeReviewAnalytics Filtered Search', :js do
   include FilteredSearchHelpers
 
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
 
   before do
     stub_licensed_features(code_review_analytics: true)
@@ -37,6 +37,24 @@ RSpec.describe 'CodeReviewAnalytics Filtered Search', :js do
         expect(page).to have_content('Milestone')
       end
     end
+
+    context 'with merge_requests' do
+      let(:label) { create(:label, title: 'awesome label', project: project) }
+
+      before do
+        create(:merge_request, title: "Bug fix-1", source_project: project, source_branch: "branch-1")
+        create(:labeled_merge_request, title: "Bug fix with label", source_project: project, source_branch: "branch-with-label", labels: [label])
+        create(:labeled_merge_request, title: "Bug fix with label#2", source_project: project, source_branch: "branch-with-label-2", labels: [label])
+      end
+
+      it 'filters the list of merge requests' do
+        has_merge_requests(3)
+
+        select_label_on_dropdown(label.title)
+
+        has_merge_requests(2)
+      end
+    end
   end
 
   context 'when the "new search" feature is enabled' do
@@ -54,4 +72,8 @@ RSpec.describe 'CodeReviewAnalytics Filtered Search', :js do
       end
     end
   end
+
+  def has_merge_requests(num = 0)
+    expect(page).to have_text("Merge Requests in Review #{num}")
+  end
 end