Merge branch 'mr-filter-by-title' into 'master'

Implement merge requests search

It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues

See merge request !1690

CHANGELOG

@@ -59,6 +59,7 @@ v 7.9.0 (unreleased)
   - Added blue thmeme
   - Remove annoying notice messages when create/update merge request
   - Allow smb:// links in Markdown text.
+  - Filter merge request by title or description at Merge Requests page
   - Block user if he/she was blocked in Active Directory
 
 v 7.8.4

app/assets/javascripts/dispatcher.js.coffee

@@ -52,6 +52,7 @@ class Dispatcher
         new ZenMode()
       when 'projects:merge_requests:index'
         shortcut_handler = new ShortcutsNavigation()
+        MergeRequests.init()
       when 'dashboard:show'
         new Dashboard()
         new Activities()

app/assets/javascripts/issues.js.coffee

@@ -47,7 +47,7 @@
   initSearch: ->
     @timer = null
     $("#issue_search").keyup ->
-      clearTimeout(@timer);
+      clearTimeout(@timer)
       @timer = setTimeout(Issues.filterResults, 500)
 
   filterResults: =>

app/assets/javascripts/merge_requests.js.coffee

 #
 # * Filter merge requests
 #
-@merge_requestsPage = ->
-  $('#assignee_id').select2()
-  $('#milestone_id').select2()
-  $('#milestone_id, #assignee_id').on 'change', ->
-    $(this).closest('form').submit()
+@MergeRequests =
+  init: ->
+    MergeRequests.initSearch()
+
+  # Make sure we trigger ajax request only after user stop typing
+  initSearch: ->
+    @timer = null
+    $("#issue_search").keyup ->
+      clearTimeout(@timer)
+      @timer = setTimeout(MergeRequests.filterResults, 500)
+
+  filterResults: =>
+    form = $("#issue_search_form")
+    search = $("#issue_search").val()
+    $('.merge-requests-holder').css("opacity", '0.5')
+    issues_url = form.attr('action') + '? '+ form.serialize()
+
+    $.ajax
+      type: "GET"
+      url: form.attr('action')
+      data: form.serialize()
+      complete: ->
+        $('.merge-requests-holder').css("opacity", '1.0')
+      success: (data) ->
+        $('.merge-requests-holder').html(data.html)
+        # Change url so if user reload a page - search results are saved
+        History.replaceState {page: issues_url}, document.title, issues_url
+        MergeRequests.reload()
+      dataType: "json"
+
+  reload: ->
+    $('#filter_issue_search').val($('#issue_search').val())

app/controllers/projects/merge_requests_controller.rb

@@ -17,8 +17,19 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   before_filter :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort]
 
   def index
+    terms = params['issue_search']
     @merge_requests = get_merge_requests_collection
+    @merge_requests = @merge_requests.full_search(terms) if terms.present?
     @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render json: {
+          html: view_to_html_string("projects/merge_requests/_merge_requests")
+        }
+      end
+    end
   end
 
   def show

app/views/projects/issues/index.html.haml

@@ -6,14 +6,7 @@
           = link_to namespace_project_issues_path(@project.namespace, @project, :atom, { private_token: current_user.private_token }), class: 'btn append-right-10' do
             %i.fa.fa-rss
 
-      = form_tag namespace_project_issues_path(@project.namespace, @project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form'  do
-        .append-right-10.hidden-xs.hidden-sm
-          = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
-          = hidden_field_tag :state, params['state']
-          = hidden_field_tag :scope, params['scope']
-          = hidden_field_tag :assignee_id, params['assignee_id']
-          = hidden_field_tag :milestone_id, params['milestone_id']
-          = hidden_field_tag :label_id, params['label_id']
+      = render 'shared/issuable_search_form', path: namespace_project_issues_path(@project.namespace, @project)
 
     - if can? current_user, :write_issue, @project
       = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "New Issue", id: "new_issue_link" do

app/views/projects/merge_requests/_merge_requests.html.haml

+.panel.panel-default
+  %ul.well-list.mr-list
+    = render @merge_requests
+    - if @merge_requests.blank?
+      %li
+        .nothing-here-block No merge requests to show
+
+- if @merge_requests.present?
+  .pull-right
+    %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
+
+  = paginate @merge_requests, theme: "gitlab"
+

app/views/projects/merge_requests/index.html.haml

-.merge-requests-holder
-  .append-bottom-10
-    .pull-right
-      - if can? current_user, :write_merge_request, @project
-        = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-new pull-left", title: "New Merge Request" do
-          %i.fa.fa-plus
-          New Merge Request
-    = render 'shared/issuable_filter'
-  .panel.panel-default
-    %ul.well-list.mr-list
-      = render @merge_requests
-      - if @merge_requests.blank?
-        %li
-          .nothing-here-block No merge requests to show
-  - if @merge_requests.present?
-    .pull-right
-      %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
-
-    = paginate @merge_requests, theme: "gitlab"
+.append-bottom-10
+  .pull-right
+    = render 'shared/issuable_search_form', path: namespace_project_merge_requests_path(@project.namespace, @project)
 
-:javascript
-  $(merge_requestsPage);
+    - if can? current_user, :write_merge_request, @project
+      = link_to new_namespace_project_merge_request_path(@project.namespace, @project), class: "btn btn-new pull-left", title: "New Merge Request" do
+        %i.fa.fa-plus
+        New Merge Request
+  = render 'shared/issuable_filter'
+.merge-requests-holder
+  = render 'merge_requests'

app/views/shared/_issuable_search_form.html.haml

+= form_tag(path, method: :get, id: "issue_search_form", class: 'pull-left issue-search-form') do
+  .append-right-10.hidden-xs.hidden-sm
+    = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
+    = hidden_field_tag :state, params['state']
+    = hidden_field_tag :scope, params['scope']
+    = hidden_field_tag :assignee_id, params['assignee_id']
+    = hidden_field_tag :author_id, params['author_id']
+    = hidden_field_tag :milestone_id, params['milestone_id']
+    = hidden_field_tag :label_id, params['label_id']

features/project/merge_requests.feature

@@ -218,3 +218,10 @@ Feature: Project Merge Requests
     And I click link "Edit" for the merge request
     And I preview a description text like "Bug fixed :smile:"
     Then I should see the Markdown write tab
+
+  @javascript
+  Scenario: I search merge request
+    Given I click link "All"
+    When I fill in merge request search with "Fe"
+    Then I should see "Feature NS-03" in merge requests
+    And I should not see "Bug NS-04" in merge requests

features/steps/project/merge_requests.rb

@@ -276,6 +276,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
+  step 'I fill in merge request search with "Fe"' do
+    fill_in 'issue_search', with: "Fe"
+  end
+
   def merge_request
     @merge_request ||= MergeRequest.find_by!(title: "Bug NS-05")
   end