Merge branch 'ee-44012-filter-reactions-none-any' into 'master'

EE port of 44012-filter-reactions-none-any

See merge request gitlab-org/gitlab-ee!8175

app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js

@@ -92,6 +92,16 @@ export const conditions = [
     tokenKey: 'label',
     value: 'none',
   },
+  {
+    url: 'my_reaction_emoji=None',
+    tokenKey: 'my-reaction',
+    value: 'none',
+  },
+  {
+    url: 'my_reaction_emoji=Any',
+    tokenKey: 'my-reaction',
+    value: 'any',
+  },
 ];
 
 const IssuableFilteredSearchTokenKeys = new FilteredSearchTokenKeys(

app/finders/issuable_finder.rb

@@ -244,15 +244,6 @@ class IssuableFinder
     params[:assignee_username].present?
   end
 
-  def filter_by_no_assignee?
-    # Assignee_id takes precedence over assignee_username
-    [NONE, FILTER_NONE].include?(params[:assignee_id].to_s.downcase) || params[:assignee_username].to_s == NONE
-  end
-
-  def filter_by_any_assignee?
-    params[:assignee_id].to_s.downcase == FILTER_ANY
-  end
-
   # rubocop: disable CodeReuse/ActiveRecord
   def assignee
     return @assignee if defined?(@assignee)
@@ -418,6 +409,15 @@ class IssuableFinder
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
+  def filter_by_no_assignee?
+    # Assignee_id takes precedence over assignee_username
+    [NONE, FILTER_NONE].include?(params[:assignee_id].to_s.downcase) || params[:assignee_username].to_s == NONE
+  end
+
+  def filter_by_any_assignee?
+    params[:assignee_id].to_s.downcase == FILTER_ANY
+  end
+
   # rubocop: disable CodeReuse/ActiveRecord
   def by_author(items)
     if author
@@ -480,12 +480,27 @@ class IssuableFinder
 
   def by_my_reaction_emoji(items)
     if params[:my_reaction_emoji].present? && current_user
-      items = items.awarded(current_user, params[:my_reaction_emoji])
+      items =
+        if filter_by_no_reaction?
+          items.not_awarded(current_user)
+        elsif filter_by_any_reaction?
+          items.awarded(current_user)
+        else
+          items.awarded(current_user, params[:my_reaction_emoji])
+        end
     end
 
     items
   end
 
+  def filter_by_no_reaction?
+    params[:my_reaction_emoji].to_s.downcase == FILTER_NONE
+  end
+
+  def filter_by_any_reaction?
+    params[:my_reaction_emoji].to_s.downcase == FILTER_ANY
+  end
+
   def label_names
     if labels?
       params[:label_name].is_a?(String) ? params[:label_name].split(',') : params[:label_name]

app/models/concerns/awardable.rb

@@ -13,13 +13,13 @@ module Awardable
   end
 
   class_methods do
-    def awarded(user, name)
+    def awarded(user, name = nil)
       sql = <<~EOL
         EXISTS (
           SELECT TRUE
           FROM award_emoji
           WHERE user_id = :user_id AND
-                name = :name AND
+                #{"name = :name AND" if name.present?}
                 awardable_type = :awardable_type AND
                 awardable_id = #{self.arel_table.name}.id
         )
@@ -28,6 +28,20 @@ module Awardable
       where(sql, user_id: user.id, name: name, awardable_type: self.name)
     end
 
+    def not_awarded(user)
+      sql = <<~EOL
+        NOT EXISTS (
+          SELECT TRUE
+          FROM award_emoji
+          WHERE user_id = :user_id AND
+                awardable_type = :awardable_type AND
+                awardable_id = #{self.arel_table.name}.id
+        )
+      EOL
+
+      where(sql, user_id: user.id, awardable_type: self.name)
+    end
+
     def order_upvotes_desc
       order_votes_desc(AwardEmoji::UPVOTE_NAME)
     end

app/views/shared/issuable/_search_bar.html.haml

@@ -105,6 +105,14 @@
                     %span.label-title.js-data-value
                       {{title}}
             #js-dropdown-my-reaction.filtered-search-input-dropdown-menu.dropdown-menu
+              %ul{ data: { dropdown: true } }
+                %li.filter-dropdown-item{ data: { value: 'none' } }
+                  %button.btn.btn-link{ type: 'button' }
+                    = _('None')
+                %li.filter-dropdown-item{ data: { value: 'any' } }
+                  %button.btn.btn-link{ type: 'button' }
+                    = _('Any')
+                %li.divider.droplab-item-ignore
               %ul.filter-dropdown{ data: { dynamic: true, dropdown: true } }
                 %li.filter-dropdown-item
                   %button.btn.btn-link{ type: 'button' }

changelogs/unreleased/44012-filter-reactions-none-any.yml

+---
+title: Add None / Any options to reactions filter
+merge_request: 22638
+author: Heinrich Lee Yu
+type: added

doc/api/issues.md

@@ -41,7 +41,7 @@ GET /issues?my_reaction_emoji=star
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`. Defaults to `created_by_me`<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id`. Combine with `scope=all` or `scope=assigned_to_me`. _([Introduced][ce-13004] in GitLab 9.5)_          |
 | `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
-| `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_                                      |
+| `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced][ce-14016] in GitLab 10.0)_ |
 | `weight`            | integer          | no         | Return issues with the specified `weight`. `None` returns issues with no weight assigned. `Any` returns issues with a weight assigned.              |
 | `iids[]`            | Array[integer]   | no         | Return only the issues having the given `iid`                                                                                                       |
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                                               |
@@ -157,7 +157,7 @@ GET /groups/:id/issues?my_reaction_emoji=star
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                         |
 | `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
-| `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_                |
+| `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced][ce-14016] in GitLab 10.0)_ |
 | `weight`            | integer          | no         | Return issues with the specified `weight`. `None` returns issues with no weight assigned. `Any` returns issues with a weight assigned. |
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                         |
 | `sort`              | string           | no         | Return issues sorted in `asc` or `desc` order. Default is `desc`                                                              |
@@ -273,7 +273,7 @@ GET /projects/:id/issues?my_reaction_emoji=star
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                         |
 | `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
-| `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_                |
+| `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced][ce-14016] in GitLab 10.0)_ |
 | `weight`            | integer          | no         | Return issues with the specified `weight`. `None` returns issues with no weight assigned. `Any` returns issues with a weight assigned. |
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                         |
 | `sort`              | string           | no         | Return issues sorted in `asc` or `desc` order. Default is `desc`                                                              |

spec/features/issues/filtered_search/dropdown_emoji_spec.rb

@@ -92,7 +92,7 @@ describe 'Dropdown emoji', :js do
       it 'shows the most populated emoji at top of dropdown' do
         send_keys_to_filtered_search('my-reaction:')
 
-        expect(first('#js-dropdown-my-reaction li')).to have_content(award_emoji_star.name)
+        expect(first('#js-dropdown-my-reaction .filter-dropdown li')).to have_content(award_emoji_star.name)
       end
     end
 
@@ -121,13 +121,29 @@ describe 'Dropdown emoji', :js do
         send_keys_to_filtered_search(':')
       end
 
+      it 'selects `None`' do
+        find('#js-dropdown-my-reaction .filter-dropdown-item', text: 'None').click
+
+        expect(page).to have_css(js_dropdown_emoji, visible: false)
+        expect_tokens([reaction_token('none', false)])
+        expect_filtered_search_input_empty
+      end
+
+      it 'selects `Any`' do
+        find('#js-dropdown-my-reaction .filter-dropdown-item', text: 'Any').click
+
+        expect(page).to have_css(js_dropdown_emoji, visible: false)
+        expect_tokens([reaction_token('any', false)])
+        expect_filtered_search_input_empty
+      end
+
       it 'fills in the my-reaction name' do
         click_emoji('thumbsup')
 
         wait_for_requests
 
         expect(page).to have_css(js_dropdown_emoji, visible: false)
-        expect_tokens([emoji_token('thumbsup')])
+        expect_tokens([reaction_token('thumbsup')])
         expect_filtered_search_input_empty
       end
     end

spec/finders/issues_finder_spec.rb

@@ -406,6 +406,22 @@ describe IssuesFinder do
       end
 
       context 'filtering by reaction name' do
+        context 'user searches by no reaction' do
+          let(:params) { { my_reaction_emoji: 'None' } }
+
+          it 'returns issues that the user did not react to' do
+            expect(issues).to contain_exactly(issue2, issue4)
+          end
+        end
+
+        context 'user searches by any reaction' do
+          let(:params) { { my_reaction_emoji: 'Any' } }
+
+          it 'returns issues that the user reacted to' do
+            expect(issues).to contain_exactly(issue1, issue3)
+          end
+        end
+
         context 'user searches by "thumbsup" reaction' do
           let(:params) { { my_reaction_emoji: 'thumbsup' } }
 

spec/models/concerns/awardable_spec.rb

@@ -24,13 +24,29 @@ describe Awardable do
       end
     end
 
-    describe ".awarded" do
+    describe "#awarded" do
       it "filters by user and emoji name" do
         expect(Issue.awarded(award_emoji.user, "thumbsup")).to be_empty
         expect(Issue.awarded(award_emoji.user, "thumbsdown")).to eq [issue]
         expect(Issue.awarded(award_emoji2.user, "thumbsup")).to eq [issue2]
         expect(Issue.awarded(award_emoji2.user, "thumbsdown")).to be_empty
       end
+
+      it "filters by user and any emoji" do
+        issue3 = create(:issue)
+        create(:award_emoji, awardable: issue3, name: "star", user: award_emoji.user)
+        create(:award_emoji, awardable: issue3, name: "star", user: award_emoji2.user)
+
+        expect(Issue.awarded(award_emoji.user)).to eq [issue, issue3]
+        expect(Issue.awarded(award_emoji2.user)).to eq [issue2, issue3]
+      end
+    end
+
+    describe "#not_awarded" do
+      it "returns issues not awarded by user" do
+        expect(Issue.not_awarded(award_emoji.user)).to eq [issue2]
+        expect(Issue.not_awarded(award_emoji2.user)).to eq [issue]
+      end
     end
   end
 

spec/requests/api/issues_spec.rb

@@ -200,14 +200,24 @@ describe API::Issues do
         expect_paginated_array_response(size: 3)
       end
 
-      it 'returns issues reacted by the authenticated user by the given emoji' do
+      it 'returns issues reacted by the authenticated user' do
         issue2 = create(:issue, project: project, author: user, assignees: [user])
-        award_emoji = create(:award_emoji, awardable: issue2, user: user2, name: 'star')
+        create(:award_emoji, awardable: issue2, user: user2, name: 'star')
 
-        get api('/issues', user2), my_reaction_emoji: award_emoji.name, scope: 'all'
+        create(:award_emoji, awardable: issue, user: user2, name: 'thumbsup')
 
-        expect_paginated_array_response(size: 1)
-        expect(first_issue['id']).to eq(issue2.id)
+        get api('/issues', user2), my_reaction_emoji: 'Any', scope: 'all'
+
+        expect_paginated_array_response(size: 2)
+      end
+
+      it 'returns issues not reacted by the authenticated user' do
+        issue2 = create(:issue, project: project, author: user, assignees: [user])
+        create(:award_emoji, awardable: issue2, user: user2, name: 'star')
+
+        get api('/issues', user2), my_reaction_emoji: 'None', scope: 'all'
+
+        expect_paginated_array_response(size: 2)
       end
 
       it 'returns issues matching given search string for title' do

spec/support/helpers/filtered_search_helpers.rb

@@ -120,8 +120,12 @@ module FilteredSearchHelpers
     create_token('Label', label_name, symbol)
   end
 
-  def emoji_token(emoji_name = nil)
-    { name: 'My-Reaction', emoji_name: emoji_name }
+  def reaction_token(reaction_name = nil, is_emoji = true)
+    if is_emoji
+      { name: 'My-Reaction', emoji_name: reaction_name }
+    else
+      create_token('My-Reaction', reaction_name)
+    end
   end
 
   def default_placeholder