Download as
Browse Code »

Commit 073a269831d5bf6d9b9c55d91826d87721746bc9

Authored by Dmitriy Zaporozhets
1 parent 4d7792bc
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Refactor search autocomplete. Use ajax for source 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 7 changed files with 65 additions and 22 deletions   Show diff stats
app/assets/javascripts/dispatcher.js.coffee
  Diff comments   View file @073a269
@@ -47,5 +47,9 @@ class Dispatcher @@ -47,5 +47,9 @@ class Dispatcher
47 47
48 48
49 initSearch: -> 49 initSearch: ->
50 - autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')  
51 - new SearchAutocomplete(autocomplete_json) 50 + opts = $('.search-autocomplete-opts')
  51 + path = opts.data('autocomplete-path')
  52 + project_id = opts.data('autocomplete-project-id')
  53 + project_ref = opts.data('autocomplete-project-ref')
  54 +
  55 + new SearchAutocomplete(path, project_id, project_ref)
app/assets/javascripts/search_autocomplete.js.coffee
  Diff comments   View file @073a269
1 class SearchAutocomplete 1 class SearchAutocomplete
2 - constructor: (json) -> 2 + constructor: (search_autocomplete_path, project_id, project_ref) ->
  3 + project_id = '' unless project_id
  4 + project_ref = '' unless project_ref
  5 + query = "?project_id=" + project_id + "&project_ref=" + project_ref
  6 +
3 $("#search").autocomplete 7 $("#search").autocomplete
4 - source: json 8 + source: search_autocomplete_path + query
  9 + minLength: 1
5 select: (event, ui) -> 10 select: (event, ui) ->
6 location.href = ui.item.url 11 location.href = ui.item.url
7 12
app/controllers/search_controller.rb
  Diff comments   View file @073a269
1 class SearchController < ApplicationController 1 class SearchController < ApplicationController
  2 + include SearchHelper
  3 +
2 def show 4 def show
3 @project = Project.find_by_id(params[:project_id]) if params[:project_id].present? 5 @project = Project.find_by_id(params[:project_id]) if params[:project_id].present?
4 @group = Group.find_by_id(params[:group_id]) if params[:group_id].present? 6 @group = Group.find_by_id(params[:group_id]) if params[:group_id].present?
@@ -10,4 +12,12 @@ class SearchController &lt; ApplicationController @@ -10,4 +12,12 @@ class SearchController &lt; ApplicationController
10 @search_results = Search::GlobalService.new(current_user, params).execute 12 @search_results = Search::GlobalService.new(current_user, params).execute
11 end 13 end
12 end 14 end
  15 +
  16 + def autocomplete
  17 + term = params[:term]
  18 + @project = Project.find(params[:project_id]) if params[:project_id].present?
  19 + @ref = params[:project_ref] if params[:project_ref].present?
  20 +
  21 + render json: search_autocomplete_opts(term).to_json
  22 + end
13 end 23 end
app/helpers/search_helper.rb
  Diff comments   View file @073a269
1 module SearchHelper 1 module SearchHelper
2 - def search_autocomplete_source 2 + def search_autocomplete_opts(term)
3 return unless current_user 3 return unless current_user
  4 +
  5 + resources_results = [
  6 + groups_autocomplete(term),
  7 + projects_autocomplete(term),
  8 + public_projects_autocomplete(term),
  9 + ].flatten
  10 +
  11 + generic_results = project_autocomplete + default_autocomplete + help_autocomplete
  12 + generic_results.select! { |result| result[:label] =~ Regexp.new(term, "i") }
  13 +
4 [ 14 [
5 - groups_autocomplete,  
6 - projects_autocomplete,  
7 - public_projects_autocomplete,  
8 - default_autocomplete,  
9 - project_autocomplete,  
10 - help_autocomplete 15 + resources_results,
  16 + generic_results
11 ].flatten.uniq do |item| 17 ].flatten.uniq do |item|
12 item[:label] 18 item[:label]
13 - end.to_json 19 + end
14 end 20 end
15 21
16 private 22 private
@@ -65,23 +71,36 @@ module SearchHelper @@ -65,23 +71,36 @@ module SearchHelper
65 end 71 end
66 72
67 # Autocomplete results for the current user's groups 73 # Autocomplete results for the current user's groups
68 - def groups_autocomplete  
69 - current_user.authorized_groups.map do |group|  
70 - { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } 74 + def groups_autocomplete(term, limit = 5)
  75 + current_user.authorized_groups.search(term).limit(limit).map do |group|
  76 + {
  77 + label: "group: #{simple_sanitize(group.name)}",
  78 + url: group_path(group)
  79 + }
71 end 80 end
72 end 81 end
73 82
74 # Autocomplete results for the current user's projects 83 # Autocomplete results for the current user's projects
75 - def projects_autocomplete  
76 - current_user.authorized_projects.non_archived.map do |p|  
77 - { label: "project: #{simple_sanitize(p.name_with_namespace)}", url: project_path(p) } 84 + def projects_autocomplete(term, limit = 5)
  85 + current_user.authorized_projects.search_by_title(term).non_archived.limit(limit).map do |p|
  86 + {
  87 + label: "project: #{simple_sanitize(p.name_with_namespace)}",
  88 + url: project_path(p)
  89 + }
78 end 90 end
79 end 91 end
80 92
81 # Autocomplete results for the current user's projects 93 # Autocomplete results for the current user's projects
82 - def public_projects_autocomplete  
83 - Project.public_or_internal_only(current_user).non_archived.map do |p|  
84 - { label: "project: #{simple_sanitize(p.name_with_namespace)}", url: project_path(p) } 94 + def public_projects_autocomplete(term, limit = 5)
  95 + Project.public_or_internal_only(current_user).search_by_title(term).non_archived.limit(limit).map do |p|
  96 + {
  97 + label: "project: #{simple_sanitize(p.name_with_namespace)}",
  98 + url: project_path(p)
  99 + }
85 end 100 end
86 end 101 end
  102 +
  103 + def simple_sanitize(str)
  104 + Sanitize.clean(str)
  105 + end
87 end 106 end
app/models/project.rb
  Diff comments   View file @073a269
@@ -138,6 +138,10 @@ class Project &lt; ActiveRecord::Base @@ -138,6 +138,10 @@ class Project &lt; ActiveRecord::Base
138 joins(:namespace).where("projects.archived = ?", false).where("projects.name LIKE :query OR projects.path LIKE :query OR namespaces.name LIKE :query OR projects.description LIKE :query", query: "%#{query}%") 138 joins(:namespace).where("projects.archived = ?", false).where("projects.name LIKE :query OR projects.path LIKE :query OR namespaces.name LIKE :query OR projects.description LIKE :query", query: "%#{query}%")
139 end 139 end
140 140
  141 + def search_by_title query
  142 + where("projects.archived = ?", false).where("projects.name LIKE :query", query: "%#{query}%")
  143 + end
  144 +
141 def find_with_namespace(id) 145 def find_with_namespace(id)
142 if id.include?("/") 146 if id.include?("/")
143 id = id.split("/") 147 id = id.split("/")
app/views/layouts/_search.html.haml
  Diff comments   View file @073a269
@@ -7,4 +7,4 @@ @@ -7,4 +7,4 @@
7 = hidden_field_tag :search_code, true 7 = hidden_field_tag :search_code, true
8 = hidden_field_tag :repository_ref, @ref 8 = hidden_field_tag :repository_ref, @ref
9 = submit_tag 'Go' if ENV['RAILS_ENV'] == 'test' 9 = submit_tag 'Go' if ENV['RAILS_ENV'] == 'test'
10 - .search-autocomplete-json.hide{:'data-autocomplete-opts' => search_autocomplete_source } 10 + .search-autocomplete-opts.hide{:'data-autocomplete-path' => search_autocomplete_path, :'data-autocomplete-project-id' => @project.try(:id), :'data-autocomplete-project-ref' => @ref }
config/routes.rb
  Diff comments   View file @073a269
@@ -6,6 +6,7 @@ Gitlab::Application.routes.draw do @@ -6,6 +6,7 @@ Gitlab::Application.routes.draw do
6 # Search 6 # Search
7 # 7 #
8 get 'search' => "search#show" 8 get 'search' => "search#show"
  9 + get 'search/autocomplete' => "search#autocomplete", as: :search_autocomplete
9 10
10 # API 11 # API
11 API::API.logger Rails.logger 12 API::API.logger Rails.logger