Merge branch 'issue_40654-ee' into 'master'

Fix board filter when milestone is  predefined

Closes gitlab-ce#40654

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

app/models/milestone.rb

@@ -88,6 +88,13 @@ class Milestone < ActiveRecord::Base
       else milestones.active
       end
     end
+
+    def predefined?(milestone)
+      milestone == Any ||
+        milestone == None ||
+        milestone == Upcoming ||
+        milestone == Started
+    end
   end
 
   def self.reference_prefix

app/services/boards/issues/list_service.rb

@@ -55,14 +55,11 @@ module Boards
       def without_board_labels(issues)
         return issues unless board_label_ids.any?
 
-        label_links = LabelLink.where("label_links.target_type = 'Issue' AND label_links.target_id = issues.id")
-                               .where(label_id: board_label_ids)
-
-        if board.milestone.present?
-          label_links = label_links.where("issues.milestone_id = ?", board.milestone_id)
-        end
+        issues.where.not(issues_label_links.limit(1).arel.exists)
+      end
 
-        issues.where.not(label_links.limit(1).arel.exists)
+      def issues_label_links
+        LabelLink.where("label_links.target_type = 'Issue' AND label_links.target_id = issues.id").where(label_id: board_label_ids)
       end
 
       def with_list_label(issues)

changelogs/unreleased-ee/issue_40654-ee.yml

+---
+title: Fix board filter for predefined milestones
+merge_request:
+author:
+type: fixed

ee/app/services/ee/boards/issues/list_service.rb

@@ -9,6 +9,24 @@ module EE
             super
           end
         end
+
+        def issues_label_links
+          if has_valid_milestone?
+            super.where("issues.milestone_id = ?", board.milestone_id)
+          else
+            super
+          end
+        end
+
+        private
+
+        # Prevent filtering by milestone stubs
+        # like Milestone::Upcoming, Milestone::Started etc
+        def has_valid_milestone?
+          return false unless board.milestone
+
+          !::Milestone.predefined?(board.milestone)
+        end
       end
     end
   end

spec/ee/spec/services/boards/issues/list_service_spec.rb

@@ -71,6 +71,34 @@ describe Boards::Issues::ListService, services: true do
 
           expect(issues).to match_array([opened_issue2, list1_issue2, reopened_issue1, opened_issue1])
         end
+
+        context 'when milestone is predefined' do
+          let(:params) { { board_id: board.id, id: backlog.id } }
+
+          context 'as upcoming' do
+            before do
+              board.update(milestone_id: Milestone::Upcoming.id)
+            end
+
+            it 'returns open issue for backlog without board label' do
+              issues = described_class.new(group, user, params).execute
+
+              expect(issues).to match_array([opened_issue2, reopened_issue1, opened_issue1])
+            end
+          end
+
+          context 'as started' do
+            before do
+              board.update(milestone_id: Milestone::Started.id)
+            end
+
+            it 'returns open issue for backlog without board label' do
+              issues = described_class.new(group, user, params).execute
+
+              expect(issues).to match_array([opened_issue2, reopened_issue1, opened_issue1])
+            end
+          end
+        end
       end
     end