Merge branch 'dashboard-labels' into 'master'

Dashboard labels

Previously because there were no JSON endpoint for labels or milestones
it was fetching HTML and parsing that. This is wrong.

It now fetches from a JSON endpoint.

This also fixes the dashboard/issues page not loading labels or
milestones as the path used to be only for a single project. So instead
I have created a endpoint for labels & milestones JSON on dashboard.

See merge request !3253

12 files changed, 113 insertions, 94 deletions

diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index e6c1446f14f..4f03c367758 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -39,18 +39,9 @@ class @LabelsSelect
 
       $dropdown.glDropdown(
         data: (term, callback) ->
-          # We have to fetch the JS version of the labels list because there is no
-          # public facing JSON url for labels
           $.ajax(
             url: labelUrl
           ).done (data) ->
-            html = $(data)
-            data = []
-            html.find('.label-row a').each ->
-              data.push(
-                title: $(@).text().trim()
-              )
-
             if showNo
               data.unshift(
                 id: 0
diff --git a/app/assets/javascripts/milestone_select.js.coffee b/app/assets/javascripts/milestone_select.js.coffee
index 0287d98b1ec..5c35107ae6a 100644
--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
@@ -15,15 +15,6 @@ class @MilestoneSelect
           $.ajax(
             url: milestonesUrl
           ).done (data) ->
-            html = $(data)
-            data = []
-            html.find('.milestone strong a').each ->
-              link = $(@).attr('href').split('/')
-              data.push(
-                id: link[link.length - 1]
-                title: $(@).text().trim()
-              )
-
             if showNo
               data.unshift(
                 id: '0'
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 139e40db180..36986d9a18d 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -3,7 +3,7 @@ class DashboardController < Dashboard::ApplicationController
   include MergeRequestsAction
 
   before_action :event_filter, only: :activity
-  before_action :projects, only: [:issues, :merge_requests]
+  before_action :projects, only: [:issues, :merge_requests, :labels, :milestones]
 
   respond_to :html
 
@@ -20,6 +20,22 @@ class DashboardController < Dashboard::ApplicationController
     end
   end
 
+  def labels
+    respond_to do |format|
+      format.json do
+        render json: view_context.projects_labels_options
+      end
+    end
+  end
+
+  def milestones
+    respond_to do |format|
+      format.json do
+        render json: view_context.projects_milestones_options
+      end
+    end
+  end
+
   protected
 
   def load_events
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 40d8098690a..5f471d405f5 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -12,6 +12,13 @@ class Projects::LabelsController < Projects::ApplicationController
 
   def index
     @labels = @project.labels.page(params[:page]).per(PER_PAGE)
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render json: @project.labels
+      end
+    end
   end
 
   def new
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index da46731d945..0998b191c07 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -19,7 +19,15 @@ class Projects::MilestonesController < Projects::ApplicationController
       end
 
     @milestones = @milestones.includes(:project)
-    @milestones = @milestones.page(params[:page]).per(PER_PAGE)
+
+    respond_to do |format|
+      format.html do
+        @milestones = @milestones.page(params[:page]).per(PER_PAGE)
+      end
+      format.json do
+        render json: @milestones
+      end
+    end
   end
 
   def new
diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb
index 74f326e0b83..ceff1fbb161 100644
--- a/app/helpers/dropdowns_helper.rb
+++ b/app/helpers/dropdowns_helper.rb
@@ -24,7 +24,7 @@ module DropdownsHelper
           capture(&block) if block && !options.has_key?(:footer_content)
         end
 
-        if block && options.has_key?(:footer_content)
+        if block && options[:footer_content]
           output << content_tag(:div, class: "dropdown-footer") do
             capture(&block)
           end
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 4455dcd0e20..49f701e9bee 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -110,18 +110,19 @@ module LabelsHelper
   end
 
   def projects_labels_options
-    labels =
-      if @project
-        @project.labels
-      else
-        Label.where(project_id: @projects)
-      end
-
-    grouped_labels = GlobalLabel.build_collection(labels)
-    grouped_labels.unshift(Label::None)
-    grouped_labels.unshift(Label::Any)
+    if @project
+      @project.labels
+    else
+      Label.where(project_id: @projects)
+    end
+  end
 
-    options_from_collection_for_select(grouped_labels, 'name', 'title', params[:label_name])
+  def labels_filter_path
+    if @project
+      namespace_project_labels_path(@project.namespace, @project, :json)
+    else
+      labels_dashboard_path(:json)
+    end
   end
 
   def label_subscription_status(label)
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 92ed0891e92..de60be4eb25 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -56,12 +56,15 @@ module MilestonesHelper
 
     epoch = DateTime.parse('1970-01-01')
     grouped_milestones = GlobalMilestone.build_collection(milestones)
-    grouped_milestones = grouped_milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date }
-    grouped_milestones.unshift(Milestone::None)
-    grouped_milestones.unshift(Milestone::Any)
-    grouped_milestones.unshift(Milestone::Upcoming)
+    grouped_milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date }
+  end
 
-    options_from_collection_for_select(grouped_milestones, 'name', 'title', params[:milestone_title])
+  def milestones_filter_dropdown_path
+    if @project
+      namespace_project_milestones_path(@project.namespace, @project, :json)
+    else
+      milestones_dashboard_path(:json)
+    end
   end
 
   def milestone_remaining_days(milestone)
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index dfdc84ba4cc..cb25d332ffa 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -19,65 +19,10 @@
             placeholder: "Search assignee", data: { any_user: "Any Assignee", first_user: (current_user.username if current_user), null_user: true, current_user: true, project_id: (@project.id if @project), selected: params[:assignee_id], field_name: "assignee_id" } })
 
         .filter-item.inline.milestone-filter
-          - if params[:milestone_title]
-            = hidden_field_tag(:milestone_title, params[:milestone_title])
-          = dropdown_tag(h(params[:milestone_name] || "Milestone"), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable",
-            placeholder: "Search milestones", footer_content: true, data: { show_no: true, show_any: true, field_name: "milestone_title", selected: params[:milestone_title], project_id: (@project.id if @project), milestones: (namespace_project_milestones_path(@project.namespace, @project, :js) if @project) } }) do
-            - if @project
-              %ul.dropdown-footer-list
-                - if can? current_user, :admin_milestone, @project
-                  %li
-                    = link_to new_namespace_project_milestone_path(@project.namespace, @project), title: "New Milestone" do
-                      Create new
-                %li
-                  = link_to namespace_project_milestones_path(@project.namespace, @project) do
-                    - if can? current_user, :admin_milestone, @project
-                      Manage milestones
-                    - else
-                      View milestones
+          = render "shared/issuable/milestone_dropdown"
 
         .filter-item.inline.labels-filter
-          - if params[:label_name]
-            = hidden_field_tag(:label_name, params[:label_name])
-          .dropdown
-            %button.dropdown-menu-toggle.js-label-select.js-filter-submit{type: "button", data: {toggle: "dropdown", field_name: "label_name", show_no: "true", show_any: "true", selected: params[:label_name], project_id: (@project.id if @project), labels: (namespace_project_labels_path(@project.namespace, @project, :js) if @project)}}
-              %span.dropdown-toggle-text
-                = h(params[:label_name] || "Label")
-              = icon('chevron-down')
-            .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
-              .dropdown-page-one
-                = dropdown_title("Filter by label")
-                = dropdown_filter("Search labels")
-                = dropdown_content
-                - if @project
-                  = dropdown_footer do
-                    %ul.dropdown-footer-list
-                      - if can? current_user, :admin_label, @project
-                        %li
-                          %a.dropdown-toggle-page{href: "#"}
-                            Create new
-                      %li
-                        = link_to namespace_project_labels_path(@project.namespace, @project) do
-                          - if can? current_user, :admin_label, @project
-                            Manage labels
-                          - else
-                            View labels
-              - if can? current_user, :admin_label, @project
-                .dropdown-page-two
-                  = dropdown_title("Create new label", back: true)
-                  = dropdown_content do
-                    %input#new_label_color{type: "hidden"}
-                    %input#new_label_name.dropdown-input-field{type: "text", placeholder: "Name new label"}
-                    .dropdown-label-color-preview.js-dropdown-label-color-preview
-                    .suggest-colors.suggest-colors-dropdown
-                      - suggested_colors.each do |color|
-                        = link_to '#', style: "background-color: #{color}", data: { color: color } do
-                          &nbsp
-                    %button.btn.btn-primary.js-new-label-btn{type: "button"}
-                      Create
-              = dropdown_loading
-              .dropdown-loading
-                = icon('spinner spin')
+          = render "shared/issuable/label_dropdown"
 
         .pull-right
           = render 'shared/sort_dropdown'
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml
new file mode 100644
index 00000000000..8399c8fba13
--- /dev/null
+++ b/app/views/shared/issuable/_label_dropdown.html.haml
@@ -0,0 +1,39 @@
+- if params[:label_name]
+  = hidden_field_tag(:label_name, params[:label_name])
+.dropdown
+  %button.dropdown-menu-toggle.js-label-select.js-filter-submit{type: "button", data: {toggle: "dropdown", field_name: "label_name", show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path}}
+    %span.dropdown-toggle-text
+      = h(params[:label_name] || "Label")
+    = icon('chevron-down')
+  .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
+    .dropdown-page-one
+      = dropdown_title("Filter by label")
+      = dropdown_filter("Search labels")
+      = dropdown_content
+      - if @project
+        = dropdown_footer do
+          %ul.dropdown-footer-list
+            - if can? current_user, :admin_label, @project
+              %li
+                %a.dropdown-toggle-page{href: "#"}
+                  Create new
+            %li
+              = link_to namespace_project_labels_path(@project.namespace, @project) do
+                - if can? current_user, :admin_label, @project
+                  Manage labels
+                - else
+                  View labels
+    - if can? current_user, :admin_label, @project and @project
+      .dropdown-page-two
+        = dropdown_title("Create new label", back: true)
+        = dropdown_content do
+          %input#new_label_color{type: "hidden"}
+          %input#new_label_name.dropdown-input-field{type: "text", placeholder: "Name new label"}
+          .dropdown-label-color-preview.js-dropdown-label-color-preview
+          .suggest-colors.suggest-colors-dropdown
+            - suggested_colors.each do |color|
+              = link_to '#', style: "background-color: #{color}", data: { color: color } do
+                &nbsp
+          %button.btn.btn-primary.js-new-label-btn{type: "button"}
+            Create
+    = dropdown_loading
diff --git a/app/views/shared/issuable/_milestone_dropdown.html.haml b/app/views/shared/issuable/_milestone_dropdown.html.haml
new file mode 100644
index 00000000000..6e5abdeb667
--- /dev/null
+++ b/app/views/shared/issuable/_milestone_dropdown.html.haml
@@ -0,0 +1,16 @@
+- if params[:milestone_title]
+  = hidden_field_tag(:milestone_title, params[:milestone_title])
+= dropdown_tag(h(params[:milestone_name] || "Milestone"), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable",
+  placeholder: "Search milestones", footer_content: @project.present?, data: { show_no: true, show_any: true, field_name: "milestone_title", selected: params[:milestone_title], project_id: @project.try(:id), milestones: milestones_filter_dropdown_path } }) do
+  - if @project
+    %ul.dropdown-footer-list
+      - if can? current_user, :admin_milestone, @project
+        %li
+          = link_to new_namespace_project_milestone_path(@project.namespace, @project), title: "New Milestone" do
+            Create new
+      %li
+        = link_to namespace_project_milestones_path(@project.namespace, @project) do
+          - if can? current_user, :admin_milestone, @project
+            Manage milestones
+          - else
+            View milestones
diff --git a/config/routes.rb b/config/routes.rb
index 2ae282f48a6..ec79522002e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -351,6 +351,8 @@ Rails.application.routes.draw do
     get :issues
     get :merge_requests
     get :activity
+    get :labels
+    get :milestones
 
     scope module: :dashboard do
       resources :milestones, only: [:index, :show]