Merge branch 'ph/vueMergeRequestListAuthorNegated' into 'master'

Added negated author filter to Vue merge request list

See merge request !171248



Merged-by: Phil Hughes <me@iamphill.com>
Approved-by: mo khan <mo@mokhan.ca>
Approved-by: Marina Mosti <mmosti@gitlab.com>
Approved-by: Natalia Tepluhina <ntepluhina@gitlab.com>
Reviewed-by: Marina Mosti <mmosti@gitlab.com>

app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue

@@ -285,7 +285,6 @@ export default {
           token: UserToken,
           dataType: 'user',
           defaultUsers: [],
-          operators: OPERATORS_IS,
           fullPath: this.fullPath,
           isProject: true,
           recentSuggestionsStorageKey: `${this.fullPath}-merge-requests-recent-tokens-author`,

app/graphql/resolvers/merge_requests_resolver.rb

@@ -160,6 +160,9 @@ def self.accept_reviewer
         as: :assignee_username,
         required: false,
         description: 'Filters merge requests to exclude any that are assigned to the usernames in the given array.'
+      argument :author_username, GraphQL::Types::String,
+        required: false,
+        description: 'Filters merge requests to exclude any that are authored by the given user.'
       argument :labels, [GraphQL::Types::String],
         required: false,
         as: :label_name,

doc/api/graphql/reference/index.md

@@ -43232,6 +43232,7 @@ Defines which user roles, users, or groups can merge into a protected branch.
 | ---- | ---- | ----------- |
 | <a id="mergerequestsresolvernegatedparamsapprovedby"></a>`approvedBy` | [`[String!]`](#string) | Filters merge requests to exclude any that are approved by usernames in the given array. |
 | <a id="mergerequestsresolvernegatedparamsassigneeusernames"></a>`assigneeUsernames` | [`[String!]`](#string) | Filters merge requests to exclude any that are assigned to the usernames in the given array. |
+| <a id="mergerequestsresolvernegatedparamsauthorusername"></a>`authorUsername` | [`String`](#string) | Filters merge requests to exclude any that are authored by the given user. |
 | <a id="mergerequestsresolvernegatedparamslabels"></a>`labels` | [`[String!]`](#string) | Filters merge requests to exclude any that have the labels provided in the given array. |
 | <a id="mergerequestsresolvernegatedparamsmilestonetitle"></a>`milestoneTitle` | [`String`](#string) | Filters merge requests to those not in the given milestone. |
 | <a id="mergerequestsresolvernegatedparamsmyreactionemoji"></a>`myReactionEmoji` | [`String`](#string) | Filters merge requests to those without the given reaction from the authenticated user. |

spec/features/merge_requests/user_filters_by_author_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Merge Requests > User filters by author', :js, feature_category: :code_review_workflow do
+  include FilteredSearchHelpers
+
+  let_it_be(:project) { create(:project, :public, :repository) }
+
+  let(:user) { project.creator }
+
+  before do
+    create(:merge_request, author: user, title: 'Bugfix1', source_project: project, source_branch: 'bugfix1')
+    create(:merge_request, author: create(:user), title: 'Bugfix2', source_project: project, source_branch: 'bugfix2')
+
+    sign_in(user)
+    visit project_merge_requests_path(project)
+  end
+
+  context 'when filtering by author=@username' do
+    it 'applies the filter' do
+      select_tokens 'Author', '=', user.username, submit: true
+
+      expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
+      expect(page).to have_content 'Bugfix1'
+      expect(page).not_to have_content 'Bugfix2'
+    end
+  end
+
+  context 'when filtering by author!=@username' do
+    it 'applies the filter' do
+      select_tokens 'Author', '!=', user.username, submit: true
+
+      expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
+      expect(page).to have_content 'Bugfix2'
+      expect(page).not_to have_content 'Bugfix1'
+    end
+  end
+end

spec/features/merge_requests/user_filters_by_multiple_criteria_spec.rb

@@ -30,7 +30,7 @@
 
   describe 'filtering by text, author, assignee, milestone, and label' do
     it 'filters by text, author, assignee, milestone, and label' do
-      select_tokens 'Author', user.username, 'Assignee', '=', user.username, 'Milestone', milestone.title, 'Label', '=', wontfix.title
+      select_tokens 'Author', '=', user.username, 'Assignee', '=', user.username, 'Milestone', milestone.title, 'Label', '=', wontfix.title
       send_keys 'Bug', :enter, :enter
 
       expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)

spec/graphql/resolvers/merge_requests_resolver_spec.rb

@@ -133,6 +133,17 @@
       end
     end
 
+    context 'with negated author argument' do
+      let_it_be(:author) { current_user }
+      let_it_be(:different_author_mr) { create(:merge_request, **common_attrs, author: create(:user)) }
+
+      it 'excludes merge requests with given author from selection' do
+        result = resolve_mr(project, not: { author_username: author.username })
+
+        expect(result).to contain_exactly(different_author_mr)
+      end
+    end
+
     context 'with source branches argument' do
       it 'takes one argument' do
         result = resolve_mr(project, source_branches: [merge_request_3.source_branch])