Show only group milestones and labels for group boards

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

@@ -46,7 +46,7 @@ class FilteredSearchDropdownManager {
       milestone: {
         reference: null,
         gl: 'DropdownNonUser',
-        extraArguments: [`${this.baseEndpoint}/milestones.json`, '%'],
+        extraArguments: [`${this.baseEndpoint}/milestones.json?only_group_milestones=true`, '%'],
         element: this.container.querySelector('#js-dropdown-milestone'),
       },
       label: {

app/controllers/boards/issues_controller.rb

@@ -47,17 +47,21 @@ module Boards
     end
 
     def issue
-      @issue ||=
-        IssuesFinder.new(current_user, project_id: board_parent.id)
-                    .execute
-                    .where(iid: params[:id])
-                    .first!
+      @issue ||= issues_finder.execute.where(iid: params[:id]).first!
     end
 
     def filter_params
       params.merge(board_id: params[:board_id], id: params[:list_id]).compact
     end
 
+    def issues_finder
+      if board.is_group_board?
+        IssuesFinder.new(current_user, group_id: board_parent.id)
+      else
+        IssuesFinder.new(current_user, project_id: board_parent.id)
+      end
+    end
+
     def move_params
       params.permit(:board_id, :id, :from_list_id, :to_list_id, :move_before_iid, :move_after_iid)
     end

app/controllers/groups/milestones_controller.rb

@@ -12,7 +12,7 @@ class Groups::MilestonesController < Groups::ApplicationController
         @milestones = Kaminari.paginate_array(milestones).page(params[:page])
       end
       format.json do
-        render json: milestones.map { |m| m.for_display.slice(:title, :name) }
+        render json: milestones.map { |m| m.for_display.slice(:title, :name, :id) }
       end
     end
   end
@@ -78,7 +78,9 @@ class Groups::MilestonesController < Groups::ApplicationController
     search_params = params.merge(group_ids: group.id)
 
     milestones = MilestonesFinder.new(search_params).execute
-    legacy_milestones = GroupMilestone.build_collection(group, group_projects, params)
+
+    legacy_milestones = []
+    legacy_milestones = GroupMilestone.build_collection(group, group_projects, params) unless params[:only_group_milestones]
 
     milestones + legacy_milestones
   end

app/helpers/search_helper.rb

@@ -137,11 +137,8 @@ module SearchHelper
   end
 
   def search_filter_input_options(type)
-    if @group
-      base_endpoint = group_path(@group)
-    elsif @project
-      base_endpoint = project_path(@project)
-    end
+    base_endpoint = @group&.web_url || project_path(@project)
+
     {
       id: "filtered-search-#{type}",
       placeholder: 'Search or filter results...',

app/views/shared/boards/_switcher.html.haml

 - parent = board.parent
+- milestone_filter_opts = { format: :json }
+- milestone_filter_opts = milestone_filter_opts.merge(only_group_milestones: true) if board.is_group_board?
 
 %boards-selector{ "inline-template" => true,
   ":current-board" => current_board_json,
-  "milestone-path" => milestones_filter_path(:json) }
+  "milestone-path" => milestones_filter_path(milestone_filter_opts) }
   .dropdown
     %button.dropdown-menu-toggle{ "@click" => "loadBoards",
       data: { toggle: "dropdown" } }