From 7b2f1881e028fdfe491c84382698d469dce83679 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Thu, 21 Apr 2016 22:05:47 +0100 Subject: [PATCH 01/18] enable category search query in header search --- .../category_search_dropdown.js.coffee | 28 +++++++++++++++++++ app/views/layouts/_search.html.haml | 15 ++++++++++ 2 files changed, 43 insertions(+) create mode 100644 app/assets/javascripts/category_search_dropdown.js.coffee diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee new file mode 100644 index 000000000000..56052f6f8844 --- /dev/null +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -0,0 +1,28 @@ +@categorySearchDropdown = + init: -> + $categorySearchDropdown = $('.category-search-dropdown') + $searchInput = $('#search') + $dropDown = $categorySearchDropdown.closest('.dropdown') + $categorySearchParent = $categorySearchDropdown.parent() + + $categorySearchDropdown.on 'click', 'li', (e) -> e.stopPropagation() + + $searchInput.on 'focusin click', (e) -> + e.stopPropagation() + if $(event.currentTarget).has('#search') and not $dropDown.hasClass('has-value') + $categorySearchParent.removeClass('hidden') + $categorySearchParent.siblings('.dropdown-select').addClass('hidden') + $dropDown.addClass('open') + + $searchInput.on 'keypress', (e) -> + e.stopPropagation() + if $(event.currentTarget).has('#search') + $categorySearchParent.addClass('hidden') + $categorySearchParent.siblings('.dropdown-select').removeClass('hidden') + + $searchInput.on 'focusout', (e) -> + e.stopPropagation() + $categorySearchParent.addClass('hidden') + +$ -> + categorySearchDropdown.init() diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 6b208c3d0bb4..2f4092d1d507 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -21,6 +21,21 @@ %a.is-focused.dropdown-menu-empty-link Loading... = dropdown_loading + - if current_user.id + .dropdown-menu.hidden + .category-search-dropdown.dropdown-page-two + %ul + %li.dropdown-header + %span Go to + %li + = link_to 'Issues Assigned to me', issues_dashboard_url(assignee_id: current_user.id) + %li + = link_to "Issues I've created", issues_dashboard_url(author_id: current_user.id) + %li.divider + %li + = link_to 'Merge Requests Assigned to me', merge_requests_dashboard_url(assignee_id: current_user.id) + %li + = link_to "Merge Requests I've created", merge_requests_dashboard_url(author_id: current_user.id) %i.search-icon %i.clear-icon.js-clear-input -- GitLab From d9b25f7c9843c082118ff48a8d111623b78231c7 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Thu, 21 Apr 2016 23:42:12 +0100 Subject: [PATCH 02/18] move the category search dropdown into another folder --- .../category_search_dropdown.js.coffee | 8 ------- app/views/layouts/_search.html.haml | 13 +----------- .../search/_header_category_search.html.haml | 21 +++++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 app/views/search/_header_category_search.html.haml diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index 56052f6f8844..d44fa7f9c447 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -5,24 +5,16 @@ $dropDown = $categorySearchDropdown.closest('.dropdown') $categorySearchParent = $categorySearchDropdown.parent() - $categorySearchDropdown.on 'click', 'li', (e) -> e.stopPropagation() - $searchInput.on 'focusin click', (e) -> - e.stopPropagation() if $(event.currentTarget).has('#search') and not $dropDown.hasClass('has-value') $categorySearchParent.removeClass('hidden') $categorySearchParent.siblings('.dropdown-select').addClass('hidden') $dropDown.addClass('open') $searchInput.on 'keypress', (e) -> - e.stopPropagation() if $(event.currentTarget).has('#search') $categorySearchParent.addClass('hidden') $categorySearchParent.siblings('.dropdown-select').removeClass('hidden') - $searchInput.on 'focusout', (e) -> - e.stopPropagation() - $categorySearchParent.addClass('hidden') - $ -> categorySearchDropdown.init() diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 2f4092d1d507..4c6a567ed710 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -24,18 +24,7 @@ - if current_user.id .dropdown-menu.hidden .category-search-dropdown.dropdown-page-two - %ul - %li.dropdown-header - %span Go to - %li - = link_to 'Issues Assigned to me', issues_dashboard_url(assignee_id: current_user.id) - %li - = link_to "Issues I've created", issues_dashboard_url(author_id: current_user.id) - %li.divider - %li - = link_to 'Merge Requests Assigned to me', merge_requests_dashboard_url(assignee_id: current_user.id) - %li - = link_to "Merge Requests I've created", merge_requests_dashboard_url(author_id: current_user.id) + = render "search/header_category_search", label: label, project: @project %i.search-icon %i.clear-icon.js-clear-input diff --git a/app/views/search/_header_category_search.html.haml b/app/views/search/_header_category_search.html.haml new file mode 100644 index 000000000000..75f2fd274d28 --- /dev/null +++ b/app/views/search/_header_category_search.html.haml @@ -0,0 +1,21 @@ +- if @project + %ul.project-category-search + %li.dropdown-header + %span Go to + %li + = link_to 'Issues Assigned to me', namespace_project_issues_path(@project.namespace, @project,assignee_id: current_user.id) + %li + = link_to "Issues I've created", namespace_project_issues_path(@project.namespace, @project,author_id: current_user.id) + +%ul.general-category-search{ class: ("hidden" if label.present? && @project) } + %li.dropdown-header + %span Go to + %li + = link_to 'Issues Assigned to me', issues_dashboard_url(assignee_id: current_user.id) + %li + = link_to "Issues I've created", issues_dashboard_url(author_id: current_user.id) + %li.divider + %li + = link_to 'Merge Requests Assigned to me', merge_requests_dashboard_url(assignee_id: current_user.id) + %li + = link_to "Merge Requests I've created", merge_requests_dashboard_url(author_id: current_user.id) \ No newline at end of file -- GitLab From 68bb6247bfe7c54c518df423142cf9ba5d4e4cf5 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Fri, 22 Apr 2016 00:32:59 +0100 Subject: [PATCH 03/18] refactor the code and also add some UI changes --- .../javascripts/category_search_dropdown.js.coffee | 8 ++++++++ app/assets/javascripts/search_autocomplete.js.coffee | 3 ++- app/views/search/_header_category_search.html.haml | 11 +++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index d44fa7f9c447..f0319dd03cd6 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -16,5 +16,13 @@ $categorySearchParent.addClass('hidden') $categorySearchParent.siblings('.dropdown-select').removeClass('hidden') + $searchInput.on 'locationBadgeRemoved locationBadgeAdded', (e) -> + if e.type is 'locationBadgeAdded' + $categorySearchDropdown.find('.project-category-search').removeClass('hidden') + $categorySearchDropdown.find('.general-category-search').addClass('hidden') + else if e.type is 'locationBadgeRemoved' + $categorySearchDropdown.find('.project-category-search').addClass('hidden') + $categorySearchDropdown.find('.general-category-search').removeClass('hidden') + $ -> categorySearchDropdown.init() diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee index 6a7b4ad1db7f..af4e8f30dc81 100644 --- a/app/assets/javascripts/search_autocomplete.js.coffee +++ b/app/assets/javascripts/search_autocomplete.js.coffee @@ -225,6 +225,7 @@ class @SearchAutocomplete #{category}#{value} " @locationBadgeEl.html(html) + @searchInput.trigger('locationBadgeAdded') @wrap.addClass('has-location-badge') restoreOriginalState: -> @@ -261,7 +262,7 @@ class @SearchAutocomplete # Reset state @resetSearchState() - + @searchInput.trigger('locationBadgeRemoved') @wrap.removeClass('has-location-badge') disableAutocomplete: -> diff --git a/app/views/search/_header_category_search.html.haml b/app/views/search/_header_category_search.html.haml index 75f2fd274d28..ebb7f5f19bd8 100644 --- a/app/views/search/_header_category_search.html.haml +++ b/app/views/search/_header_category_search.html.haml @@ -1,15 +1,22 @@ - if @project %ul.project-category-search %li.dropdown-header - %span Go to + %span + Go to in + = @project.name %li = link_to 'Issues Assigned to me', namespace_project_issues_path(@project.namespace, @project,assignee_id: current_user.id) %li = link_to "Issues I've created", namespace_project_issues_path(@project.namespace, @project,author_id: current_user.id) + %li.divider + %li + = link_to 'Merge Requests Assigned to me', namespace_project_merge_requests_path(@project.namespace, @project,assignee_id: current_user.id) + %li + = link_to "Merge Requests I've created", namespace_project_merge_requests_path(@project.namespace, @project,author_id: current_user.id) %ul.general-category-search{ class: ("hidden" if label.present? && @project) } %li.dropdown-header - %span Go to + %span Go to in general %li = link_to 'Issues Assigned to me', issues_dashboard_url(assignee_id: current_user.id) %li -- GitLab From 90a3a3d8a80b5c2c1d8dfb3c44b0e0e10ae63384 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Fri, 22 Apr 2016 14:25:40 +0100 Subject: [PATCH 04/18] add tests for the category header dropdown --- app/views/layouts/_search.html.haml | 4 +- .../search/_header_category_search.html.haml | 56 +++---- spec/features/search_spec.rb | 146 ++++++++++++++---- 3 files changed, 150 insertions(+), 56 deletions(-) diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 4c6a567ed710..9f7aab12b4d9 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -22,9 +22,7 @@ Loading... = dropdown_loading - if current_user.id - .dropdown-menu.hidden - .category-search-dropdown.dropdown-page-two - = render "search/header_category_search", label: label, project: @project + = render "search/header_category_search", label: label, project: @project %i.search-icon %i.clear-icon.js-clear-input diff --git a/app/views/search/_header_category_search.html.haml b/app/views/search/_header_category_search.html.haml index ebb7f5f19bd8..b8682de06346 100644 --- a/app/views/search/_header_category_search.html.haml +++ b/app/views/search/_header_category_search.html.haml @@ -1,28 +1,30 @@ -- if @project - %ul.project-category-search - %li.dropdown-header - %span - Go to in - = @project.name - %li - = link_to 'Issues Assigned to me', namespace_project_issues_path(@project.namespace, @project,assignee_id: current_user.id) - %li - = link_to "Issues I've created", namespace_project_issues_path(@project.namespace, @project,author_id: current_user.id) - %li.divider - %li - = link_to 'Merge Requests Assigned to me', namespace_project_merge_requests_path(@project.namespace, @project,assignee_id: current_user.id) - %li - = link_to "Merge Requests I've created", namespace_project_merge_requests_path(@project.namespace, @project,author_id: current_user.id) +.dropdown-menu.hidden.category-search + .category-search-dropdown + - if @project + %ul.project-category-search + %li.dropdown-header + %span + Go to in + = @project.name + %li + = link_to 'Issues Assigned to me', namespace_project_issues_path(@project.namespace, @project,assignee_id: current_user.id) + %li + = link_to "Issues I've created", namespace_project_issues_path(@project.namespace, @project,author_id: current_user.id) + %li.divider + %li + = link_to 'Merge Requests Assigned to me', namespace_project_merge_requests_path(@project.namespace, @project,assignee_id: current_user.id) + %li + = link_to "Merge Requests I've created", namespace_project_merge_requests_path(@project.namespace, @project,author_id: current_user.id) -%ul.general-category-search{ class: ("hidden" if label.present? && @project) } - %li.dropdown-header - %span Go to in general - %li - = link_to 'Issues Assigned to me', issues_dashboard_url(assignee_id: current_user.id) - %li - = link_to "Issues I've created", issues_dashboard_url(author_id: current_user.id) - %li.divider - %li - = link_to 'Merge Requests Assigned to me', merge_requests_dashboard_url(assignee_id: current_user.id) - %li - = link_to "Merge Requests I've created", merge_requests_dashboard_url(author_id: current_user.id) \ No newline at end of file + %ul.general-category-search{ class: ("hidden" if label.present? && @project) } + %li.dropdown-header + %span Go to in general + %li + = link_to 'Issues Assigned to me', issues_dashboard_url(assignee_id: current_user.id) + %li + = link_to "Issues I've created", issues_dashboard_url(author_id: current_user.id) + %li.divider + %li + = link_to 'Merge Requests Assigned to me', merge_requests_dashboard_url(assignee_id: current_user.id) + %li + = link_to "Merge Requests I've created", merge_requests_dashboard_url(author_id: current_user.id) diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb index 029a11ea43ce..4075c2a200ba 100644 --- a/spec/features/search_spec.rb +++ b/spec/features/search_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "Search", feature: true do +describe 'Search', feature: true do let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace) } @@ -10,41 +10,135 @@ visit search_path end - it 'top right search form is not present' do - expect(page).not_to have_selector('.search') - end + describe 'Search Page', feature: true do + + before do + visit search_path + end + + it 'top right search form is not present' do + expect(page).not_to have_selector('.search') + end - describe 'searching for Projects' do - it 'finds a project' do - page.within '.search-holder' do - fill_in "search", with: project.name[0..3] - click_button "Search" + describe 'searching for Projects' do + it 'finds a project' do + page.within '.search-holder' do + fill_in "search", with: project.name[0..3] + click_button "Search" + end + + expect(page).to have_content project.name end + end + + context 'search for comments' do + it 'finds a snippet' do + snippet = create(:project_snippet, :private, project: project, author: user, title: 'Some title') + note = create(:note, + noteable: snippet, + author: user, + note: 'Supercalifragilisticexpialidocious', + project: project) + # Must visit project dashboard since global search won't search + # everything (e.g. comments, snippets, etc.) + visit namespace_project_path(project.namespace, project) + + page.within '.search' do + fill_in 'search', with: note.note + click_button 'Go' + end - expect(page).to have_content project.name + click_link 'Comments' + + expect(page).to have_link(snippet.title) + end end end - context 'search for comments' do - it 'finds a snippet' do - snippet = create(:project_snippet, :private, project: project, author: user, title: 'Some title') - note = create(:note, - noteable: snippet, - author: user, - note: 'Supercalifragilisticexpialidocious', - project: project) - # Must visit project dashboard since global search won't search - # everything (e.g. comments, snippets, etc.) - visit namespace_project_path(project.namespace, project) + describe 'Right header search field', feature: true do + + describe 'Search in project page' do + before do + visit namespace_project_path(project.namespace, project) + end + + it 'top right search form is present' do + expect(page).to have_selector('#search') + end - page.within '.search' do - fill_in 'search', with: note.note - click_button 'Go' + it 'top right search form contains location badge' do + expect(page).to have_selector('.search-location-badge') end - click_link 'Comments' + context 'cliking the search field', js: true do + it 'should show category search dropdown' do + page.find('#search').click + + expect(page).to have_selector('.category-search-dropdown') + expect(page).not_to have_selector('.general-category-search') + end + + it 'should hide the location search dropdown' do + page.find('#search').click - expect(page).to have_link(snippet.title) + expect(page).not_to have_selector('.dropdown-select') + end + end + + context 'click the links in the catgeory search dropdown' do + + before do + page.find('#search').click + end + + it 'should take user to her issues page when issues assigned is clicked' do + find('.project-category-search').click_link 'Issues Assigned to me' + sleep 2 + + expect(page).to have_selector('.issues-holder') + expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name) + end + + it 'should take user to her issues page when issues authored is clicked' do + find('.project-category-search').click_link "Issues I've created" + sleep 2 + + expect(page).to have_selector('.issues-holder') + expect(find('.js-author-search .dropdown-toggle-text')).to have_content(user.name) + end + + it 'should take user to her MR page when MR assigned is clicked' do + find('.project-category-search').click_link "Merge Requests Assigned to me" + sleep 2 + + expect(page).to have_selector('.merge-requests-holder') + expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name) + end + + it 'should take user to her MR page when MR authored is clicked' do + find('.project-category-search').click_link "Merge Requests I've created" + sleep 2 + + expect(page).to have_selector('.merge-requests-holder') + expect(find('.js-author-search .dropdown-toggle-text')).to have_content(user.name) + end + end + + context 'inputing text into the search field', js: true do + before do + page.within '.search-input-wrap' do + fill_in "search", with: project.name[0..3] + end + end + + it 'should hide the category search dropdown' do + expect(page).not_to have_selector('.category-search-dropdown') + end + + it 'should show the location search dropdown' do + expect(page).to have_selector('.dropdown-select') + end + end end end end -- GitLab From f8debb190e943894e899c29f4a4e4aea33e97510 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Wed, 27 Apr 2016 12:11:58 +0100 Subject: [PATCH 05/18] change the category search dropdown implementation to work with the documented dropdown --- .../category_search_dropdown.js.coffee | 82 +++++++++++++------ .../javascripts/search_autocomplete.js.coffee | 1 + app/views/layouts/_search.html.haml | 6 +- .../search/_header_category_search.html.haml | 30 ------- 4 files changed, 61 insertions(+), 58 deletions(-) delete mode 100644 app/views/search/_header_category_search.html.haml diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index f0319dd03cd6..0165aeeb07cb 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -1,28 +1,58 @@ -@categorySearchDropdown = - init: -> - $categorySearchDropdown = $('.category-search-dropdown') - $searchInput = $('#search') - $dropDown = $categorySearchDropdown.closest('.dropdown') - $categorySearchParent = $categorySearchDropdown.parent() - - $searchInput.on 'focusin click', (e) -> - if $(event.currentTarget).has('#search') and not $dropDown.hasClass('has-value') - $categorySearchParent.removeClass('hidden') - $categorySearchParent.siblings('.dropdown-select').addClass('hidden') - $dropDown.addClass('open') - - $searchInput.on 'keypress', (e) -> - if $(event.currentTarget).has('#search') - $categorySearchParent.addClass('hidden') - $categorySearchParent.siblings('.dropdown-select').removeClass('hidden') - - $searchInput.on 'locationBadgeRemoved locationBadgeAdded', (e) -> - if e.type is 'locationBadgeAdded' - $categorySearchDropdown.find('.project-category-search').removeClass('hidden') - $categorySearchDropdown.find('.general-category-search').addClass('hidden') - else if e.type is 'locationBadgeRemoved' - $categorySearchDropdown.find('.project-category-search').addClass('hidden') - $categorySearchDropdown.find('.general-category-search').removeClass('hidden') +class CategorySearchDropdown + + constructor: -> + @search = $('.search') + @searchInput = @search.find('#search') + @dropDown = @search.find('.dropdown') + @dropdownContent = @dropDown.find('.dropdown-content') + + @searchInput.on 'focusin click', (e) => + if gon.current_user_id + @showCategoryDropDown() + + @searchInput.on 'keypress', (e) => + if $(e.currentTarget).has('#search') and not $(e.currentTarget).val() + @restoreMenu() + + @searchInput.on 'locationBadgeRemoved locationBadgeAdded', (e) => + if e.type is 'locationBadgeRemoved' + @search.removeClass('has-location-badge') + @showCategoryDropDown() + + showCategoryDropDown: -> + $currentProjectOpts = @search.find('.current-project-opts') + $generalOpts = @search.find('.dashboard-opts') + userId = gon.current_user_id + issueUrl = mrUrl = projectName = undefined + + if $currentProjectOpts.length and @search.hasClass('has-location-badge') + issueUrl = $currentProjectOpts.data('user-issues-path') + mrUrl = $currentProjectOpts.data('user-mr-path') + projectName = $currentProjectOpts.data('project-name') + else if $generalOpts.length + issueUrl = $generalOpts.data('user-issues-path') + mrUrl = $generalOpts.data('user-mr-path') + projectName = 'Dashboard' + + html = @categorySearchDropdownTemplate(issueUrl, mrUrl, projectName, userId) + @dropdownContent.html(html) + @dropDown.addClass('open') + + restoreMenu: -> + html = "" + @dropdownContent.html(html) + + categorySearchDropdownTemplate: (issueUrl, mrUrl, name, userId) -> + "" $ -> - categorySearchDropdown.init() + new CategorySearchDropdown() diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee index af4e8f30dc81..b2173cc2beeb 100644 --- a/app/assets/javascripts/search_autocomplete.js.coffee +++ b/app/assets/javascripts/search_autocomplete.js.coffee @@ -263,6 +263,7 @@ class @SearchAutocomplete # Reset state @resetSearchState() @searchInput.trigger('locationBadgeRemoved') + @wrap.removeClass('has-location-badge') disableAutocomplete: -> diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index 9f7aab12b4d9..d26220e3b23b 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -21,8 +21,6 @@ %a.is-focused.dropdown-menu-empty-link Loading... = dropdown_loading - - if current_user.id - = render "search/header_category_search", label: label, project: @project %i.search-icon %i.clear-icon.js-clear-input @@ -41,6 +39,10 @@ - else = hidden_field_tag :search_code, true + .current-project-opts.hide{:'data-user-issues-path' => namespace_project_issues_path(@project.namespace, @project), :'data-user-mr-path' => namespace_project_merge_requests_path(@project.namespace, @project), :'data-project-name' => @project.name} + + .dashboard-opts.hide{:'data-user-issues-path' => issues_dashboard_url, :'data-user-mr-path' => merge_requests_dashboard_url} + - if @snippet || @snippets = hidden_field_tag :snippets, true = hidden_field_tag :repository_ref, @ref diff --git a/app/views/search/_header_category_search.html.haml b/app/views/search/_header_category_search.html.haml deleted file mode 100644 index b8682de06346..000000000000 --- a/app/views/search/_header_category_search.html.haml +++ /dev/null @@ -1,30 +0,0 @@ -.dropdown-menu.hidden.category-search - .category-search-dropdown - - if @project - %ul.project-category-search - %li.dropdown-header - %span - Go to in - = @project.name - %li - = link_to 'Issues Assigned to me', namespace_project_issues_path(@project.namespace, @project,assignee_id: current_user.id) - %li - = link_to "Issues I've created", namespace_project_issues_path(@project.namespace, @project,author_id: current_user.id) - %li.divider - %li - = link_to 'Merge Requests Assigned to me', namespace_project_merge_requests_path(@project.namespace, @project,assignee_id: current_user.id) - %li - = link_to "Merge Requests I've created", namespace_project_merge_requests_path(@project.namespace, @project,author_id: current_user.id) - - %ul.general-category-search{ class: ("hidden" if label.present? && @project) } - %li.dropdown-header - %span Go to in general - %li - = link_to 'Issues Assigned to me', issues_dashboard_url(assignee_id: current_user.id) - %li - = link_to "Issues I've created", issues_dashboard_url(author_id: current_user.id) - %li.divider - %li - = link_to 'Merge Requests Assigned to me', merge_requests_dashboard_url(assignee_id: current_user.id) - %li - = link_to "Merge Requests I've created", merge_requests_dashboard_url(author_id: current_user.id) -- GitLab From 23f1f896909c66e9d3b41a5966ff6bc62172e323 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Wed, 27 Apr 2016 14:05:46 +0100 Subject: [PATCH 06/18] fix failing tests --- .../category_search_dropdown.js.coffee | 2 +- app/assets/javascripts/gl_dropdown.js.coffee | 5 +++- .../javascripts/search_autocomplete.js.coffee | 4 +-- spec/features/search_spec.rb | 27 ++++++------------- 4 files changed, 15 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index 0165aeeb07cb..00fbcf244528 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -45,7 +45,7 @@ class CategorySearchDropdown @dropdownContent.html(html) categorySearchDropdownTemplate: (issueUrl, mrUrl, name, userId) -> - "
    + "
    • Go to in #{name}
    • Issues Assigned to me
    • Issues I've created
      • diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index 1d1bfeb2e774..2e2d6892f48e 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -378,9 +378,12 @@ class GitLabDropdown rowClicked: (el) -> fieldName = @options.fieldName selectedIndex = el.parent().index() + value = undefined if @renderedData selectedObject = @renderedData[selectedIndex] - value = if @options.id then @options.id(selectedObject, el) else selectedObject.id + value = selectedObject.id + + value = @options.id(selectedObject, el) if @options.id field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']") if el.hasClass(ACTIVE_CLASS) el.removeClass(ACTIVE_CLASS) diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee index b2173cc2beeb..c3a2c5ab0f45 100644 --- a/app/assets/javascripts/search_autocomplete.js.coffee +++ b/app/assets/javascripts/search_autocomplete.js.coffee @@ -186,7 +186,7 @@ class @SearchAutocomplete else # Handle the case when deleting the input value other than backspace # e.g. Pressing ctrl + backspace or ctrl + x - if @searchInput.val() is '' + if @searchInput.val() is '' and not @wrap.find('.category-dropdown-search').length @disableAutocomplete() else # We should display the menu only when input is not empty @@ -278,7 +278,7 @@ class @SearchAutocomplete @dropdownContent.html(html) onClick: (item, $el, e) -> - if location.pathname.indexOf(item.url) isnt -1 + if location.pathname.indexOf(item.url if item) isnt -1 e.preventDefault() if not @badgePresent if item.category is 'Projects' diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb index 4075c2a200ba..70f49d56b252 100644 --- a/spec/features/search_spec.rb +++ b/spec/features/search_spec.rb @@ -74,25 +74,18 @@ it 'should show category search dropdown' do page.find('#search').click - expect(page).to have_selector('.category-search-dropdown') - expect(page).not_to have_selector('.general-category-search') - end - - it 'should hide the location search dropdown' do - page.find('#search').click - - expect(page).not_to have_selector('.dropdown-select') + expect(page).to have_selector('.dropdown-header', text: /go to in #{project.name}/i) end end - context 'click the links in the catgeory search dropdown' do + context 'click the links in the catgeory search dropdown', js: true do before do page.find('#search').click end it 'should take user to her issues page when issues assigned is clicked' do - find('.project-category-search').click_link 'Issues Assigned to me' + find('.category-dropdown-search').click_link 'Issues Assigned to me' sleep 2 expect(page).to have_selector('.issues-holder') @@ -100,7 +93,7 @@ end it 'should take user to her issues page when issues authored is clicked' do - find('.project-category-search').click_link "Issues I've created" + find('.category-dropdown-search').click_link "Issues I've created" sleep 2 expect(page).to have_selector('.issues-holder') @@ -108,7 +101,7 @@ end it 'should take user to her MR page when MR assigned is clicked' do - find('.project-category-search').click_link "Merge Requests Assigned to me" + find('.category-dropdown-search').click_link "Merge Requests Assigned to me" sleep 2 expect(page).to have_selector('.merge-requests-holder') @@ -116,7 +109,7 @@ end it 'should take user to her MR page when MR authored is clicked' do - find('.project-category-search').click_link "Merge Requests I've created" + find('.category-dropdown-search').click_link "Merge Requests I've created" sleep 2 expect(page).to have_selector('.merge-requests-holder') @@ -131,12 +124,8 @@ end end - it 'should hide the category search dropdown' do - expect(page).not_to have_selector('.category-search-dropdown') - end - - it 'should show the location search dropdown' do - expect(page).to have_selector('.dropdown-select') + it 'should not display the category search dropdown' do + expect(page).not_to have_selector('.dropdown-header', text: /go to in #{project.name}/i) end end end -- GitLab From cf96789ee0abcd211fdfb7e6f0ed235d563271c0 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Fri, 29 Apr 2016 13:22:12 +0100 Subject: [PATCH 07/18] fix errors in the code implemetation and also add some changes --- .../javascripts/category_search_dropdown.js.coffee | 12 +++++------- app/assets/javascripts/gl_dropdown.js.coffee | 2 +- app/assets/javascripts/search_autocomplete.js.coffee | 6 ++++-- app/views/layouts/_search.html.haml | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index 00fbcf244528..edd9fb15d9b0 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -2,16 +2,16 @@ class CategorySearchDropdown constructor: -> @search = $('.search') - @searchInput = @search.find('#search') - @dropDown = @search.find('.dropdown') - @dropdownContent = @dropDown.find('.dropdown-content') + @searchInput = $('#search') + @dropdown = @search.find('.dropdown') + @dropdownContent = @dropdown.find('.dropdown-content') - @searchInput.on 'focusin click', (e) => + @searchInput.on 'focus click', (e) => if gon.current_user_id @showCategoryDropDown() @searchInput.on 'keypress', (e) => - if $(e.currentTarget).has('#search') and not $(e.currentTarget).val() + if not $(e.currentTarget).val() @restoreMenu() @searchInput.on 'locationBadgeRemoved locationBadgeAdded', (e) => @@ -23,7 +23,6 @@ class CategorySearchDropdown $currentProjectOpts = @search.find('.current-project-opts') $generalOpts = @search.find('.dashboard-opts') userId = gon.current_user_id - issueUrl = mrUrl = projectName = undefined if $currentProjectOpts.length and @search.hasClass('has-location-badge') issueUrl = $currentProjectOpts.data('user-issues-path') @@ -36,7 +35,6 @@ class CategorySearchDropdown html = @categorySearchDropdownTemplate(issueUrl, mrUrl, projectName, userId) @dropdownContent.html(html) - @dropDown.addClass('open') restoreMenu: -> html = "
        diff --git a/app/assets/javascripts/gl_dropdown.js.coffee b/app/assets/javascripts/gl_dropdown.js.coffee index 2e2d6892f48e..4ffe7f3b1c1c 100644 --- a/app/assets/javascripts/gl_dropdown.js.coffee +++ b/app/assets/javascripts/gl_dropdown.js.coffee @@ -378,7 +378,7 @@ class GitLabDropdown rowClicked: (el) -> fieldName = @options.fieldName selectedIndex = el.parent().index() - value = undefined + if @renderedData selectedObject = @renderedData[selectedIndex] value = selectedObject.id diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee index c3a2c5ab0f45..7709f7fb510b 100644 --- a/app/assets/javascripts/search_autocomplete.js.coffee +++ b/app/assets/javascripts/search_autocomplete.js.coffee @@ -186,7 +186,7 @@ class @SearchAutocomplete else # Handle the case when deleting the input value other than backspace # e.g. Pressing ctrl + backspace or ctrl + x - if @searchInput.val() is '' and not @wrap.find('.category-dropdown-search').length + if not @searchInput.val() and not @wrap.find('.category-dropdown-search').length @disableAutocomplete() else # We should display the menu only when input is not empty @@ -204,6 +204,7 @@ class @SearchAutocomplete onSearchInputFocus: => @isFocused = true @wrap.addClass('search-active') + @enableAutocomplete() onClearInputClick: (e) => e.preventDefault() @@ -278,7 +279,8 @@ class @SearchAutocomplete @dropdownContent.html(html) onClick: (item, $el, e) -> - if location.pathname.indexOf(item.url if item) isnt -1 + itemUrl = if item then item.url else null + if location.pathname.indexOf(itemUrl) isnt -1 e.preventDefault() if not @badgePresent if item.category is 'Projects' diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index d26220e3b23b..eb53f3123d56 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -39,9 +39,9 @@ - else = hidden_field_tag :search_code, true - .current-project-opts.hide{:'data-user-issues-path' => namespace_project_issues_path(@project.namespace, @project), :'data-user-mr-path' => namespace_project_merge_requests_path(@project.namespace, @project), :'data-project-name' => @project.name} + .current-project-opts.hide{ data: { user_issues_path: namespace_project_issues_path(@project.namespace, @project), user_mr_path: namespace_project_merge_requests_path(@project.namespace, @project), project_name: @project.name } } - .dashboard-opts.hide{:'data-user-issues-path' => issues_dashboard_url, :'data-user-mr-path' => merge_requests_dashboard_url} + .dashboard-opts.hide{ data: { user_issues_path: issues_dashboard_url, user_mr_path: merge_requests_dashboard_url } } - if @snippet || @snippets = hidden_field_tag :snippets, true -- GitLab From 645857be0ef8c4066c9798626d3bb523b2d6c417 Mon Sep 17 00:00:00 2001 From: Arinde Eniola Date: Tue, 3 May 2016 19:07:15 +0100 Subject: [PATCH 08/18] add entry to the CHANGELOg and also make some captitalization changes --- CHANGELOG | 1 + app/assets/javascripts/category_search_dropdown.js.coffee | 6 +++--- spec/features/search_spec.rb | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b6527780bbf4..96ae87f93bfd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 8.8.0 (unreleased) - Use ActionDispatch Remote IP for Akismet checking - Fix error when visiting commit builds page before build was updated - Add 'l' shortcut to open Label dropdown on issuables and 'i' to create new issue on a project + - Categorize search query in project header - Updated search UI - Display informative message when new milestone is created - Replace Devise Async with Devise ActiveJob integration. !3902 (Connor Shea) diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index edd9fb15d9b0..090627722046 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -45,11 +45,11 @@ class CategorySearchDropdown categorySearchDropdownTemplate: (issueUrl, mrUrl, name, userId) -> "" $ -> diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb index 70f49d56b252..80106bf8a2ae 100644 --- a/spec/features/search_spec.rb +++ b/spec/features/search_spec.rb @@ -85,7 +85,7 @@ end it 'should take user to her issues page when issues assigned is clicked' do - find('.category-dropdown-search').click_link 'Issues Assigned to me' + find('.category-dropdown-search').click_link 'Issues assigned to me' sleep 2 expect(page).to have_selector('.issues-holder') @@ -101,7 +101,7 @@ end it 'should take user to her MR page when MR assigned is clicked' do - find('.category-dropdown-search').click_link "Merge Requests Assigned to me" + find('.category-dropdown-search').click_link "Merge requests assigned to me" sleep 2 expect(page).to have_selector('.merge-requests-holder') @@ -109,7 +109,7 @@ end it 'should take user to her MR page when MR authored is clicked' do - find('.category-dropdown-search').click_link "Merge Requests I've created" + find('.category-dropdown-search').click_link "Merge requests I've created" sleep 2 expect(page).to have_selector('.merge-requests-holder') -- GitLab From 1dcb0d9b2dc9459e218cf4bdfd798e39e71f3c38 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 12 May 2016 22:57:32 +0300 Subject: [PATCH 09/18] Put project options into gl.projectOptions object. Before we were creating unnecessary hidden DOM elements to store project options and we were making DOM queries to get the options when we needed. This commit will remove the DOM elements and put those options to `gl.projectOptions` object. --- app/views/layouts/_search.html.haml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml index eb53f3123d56..7e61af4e0d0f 100644 --- a/app/views/layouts/_search.html.haml +++ b/app/views/layouts/_search.html.haml @@ -39,9 +39,20 @@ - else = hidden_field_tag :search_code, true - .current-project-opts.hide{ data: { user_issues_path: namespace_project_issues_path(@project.namespace, @project), user_mr_path: namespace_project_merge_requests_path(@project.namespace, @project), project_name: @project.name } } + :javascript + gl.projectOptions = gl.projectOptions || {}; + gl.projectOptions["#{@project.path}"] = { + issuesPath: "#{namespace_project_issues_path(@project.namespace, @project)}", + mrPath: "#{namespace_project_merge_requests_path(@project.namespace, @project)}", + projectName: "#{@project.name}" + }; + + :javascript + gl.dashboardOptions = { + issuesPath: "#{issues_dashboard_url}", + mrPath: "#{merge_requests_dashboard_url}" + }; - .dashboard-opts.hide{ data: { user_issues_path: issues_dashboard_url, user_mr_path: merge_requests_dashboard_url } } - if @snippet || @snippets = hidden_field_tag :snippets, true -- GitLab From dbc21d9f850fc341c891571605679316bb02b823 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 12 May 2016 22:58:08 +0300 Subject: [PATCH 10/18] Add data-project attribute to body if there is a project. --- app/views/layouts/application.html.haml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e4d1c773d039..8f88ecc47f67 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,11 +1,15 @@ !!! 5 %html{ lang: "en"} = render "layouts/head" - %body{class: "#{user_application_theme}", 'data-page' => body_data_page} - -# Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body. - = yield :scripts_body_top + - if @project + %body{class: "#{user_application_theme}", 'data-page' => body_data_page, 'data-project' => "#{@project.path}"} + - else + %body{class: "#{user_application_theme}", 'data-page' => body_data_page} - = render "layouts/header/default", title: header_title - = render 'layouts/page', sidebar: sidebar, nav: nav + -# Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body. + = yield :scripts_body_top - = yield :scripts_body + = render "layouts/header/default", title: header_title + = render 'layouts/page', sidebar: sidebar, nav: nav + + = yield :scripts_body -- GitLab From 56c10d854461286581aecccb1974def2aad60ddf Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 12 May 2016 23:00:12 +0300 Subject: [PATCH 11/18] Refactor CategorySearchDropdown. To make it less DOM dependent. Get project options from gl.projectOptions instead querying from hidden DOM elements. --- .../category_search_dropdown.js.coffee | 76 +++++++++++-------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index 090627722046..686d8f436ebe 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -1,55 +1,71 @@ -class CategorySearchDropdown +class @CategorySearchDropdown constructor: -> - @search = $('.search') - @searchInput = $('#search') - @dropdown = @search.find('.dropdown') - @dropdownContent = @dropdown.find('.dropdown-content') - @searchInput.on 'focus click', (e) => + @registerElements() + @bindEvents() + + + registerElements: -> + + @searchWidget = $ '.search' + @searchInput = $ '#search' + @dropdown = @searchWidget.find '.dropdown' + @dropdownContent = @dropdown.find '.dropdown-content' + + + bindEvents: -> + + @searchInput.on 'focus', (e) => if gon.current_user_id @showCategoryDropDown() - @searchInput.on 'keypress', (e) => - if not $(e.currentTarget).val() + @searchInput.on 'keyup', (e) => + unless e.currentTarget.value @restoreMenu() - @searchInput.on 'locationBadgeRemoved locationBadgeAdded', (e) => - if e.type is 'locationBadgeRemoved' - @search.removeClass('has-location-badge') + @searchInput.on 'locationBadgeAdded', => + @showCategoryDropDown() + + @searchInput.on 'locationBadgeRemoved', => + @searchWidget.removeClass 'has-location-badge' @showCategoryDropDown() + showCategoryDropDown: -> - $currentProjectOpts = @search.find('.current-project-opts') - $generalOpts = @search.find('.dashboard-opts') + userId = gon.current_user_id + hasLocationBadge = @searchWidget.hasClass 'has-location-badge' + $body = $('body') + isInProjectsPage = $body.data('page').split(':').first() is 'projects' - if $currentProjectOpts.length and @search.hasClass('has-location-badge') - issueUrl = $currentProjectOpts.data('user-issues-path') - mrUrl = $currentProjectOpts.data('user-mr-path') - projectName = $currentProjectOpts.data('project-name') - else if $generalOpts.length - issueUrl = $generalOpts.data('user-issues-path') - mrUrl = $generalOpts.data('user-mr-path') + if isInProjectsPage and gl.projectOptions and hasLocationBadge + projectSlug = $body.data 'project' + { issuesPath, mrPath, projectName } = gl.projectOptions[projectSlug] + + else if gl.dashboardOptions + { issuesPath, mrPath } = gl.dashboardOptions projectName = 'Dashboard' - html = @categorySearchDropdownTemplate(issueUrl, mrUrl, projectName, userId) - @dropdownContent.html(html) + html = @categorySearchDropdownTemplate issuesPath, mrPath, projectName, userId + @dropdownContent.html html + restoreMenu: -> - html = "" + + html = "" @dropdownContent.html(html) - categorySearchDropdownTemplate: (issueUrl, mrUrl, name, userId) -> + + categorySearchDropdownTemplate: (issuesPath, mrPath, name, userId) -> + "" $ -> -- GitLab From 13955cda7a2f8d6fed6d5afd5f230640b61d6ff0 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 12 May 2016 23:00:43 +0300 Subject: [PATCH 12/18] Instantiate CategorySearchDropdown in application.js. No need to add another `$ ->` --- app/assets/javascripts/application.js.coffee | 4 +++- .../javascripts/category_search_dropdown.js.coffee | 9 +++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index bffce5a0c0fe..4b83758233bb 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -295,4 +295,6 @@ $ -> fitSidebarForSize() checkInitialSidebarSize() - new Aside() + + new Aside + new CategorySearchDropdown diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index 686d8f436ebe..acd40ccf2cd9 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -34,9 +34,9 @@ class @CategorySearchDropdown showCategoryDropDown: -> - userId = gon.current_user_id + $body = $ 'body' + userId = gon.current_user_id hasLocationBadge = @searchWidget.hasClass 'has-location-badge' - $body = $('body') isInProjectsPage = $body.data('page').split(':').first() is 'projects' if isInProjectsPage and gl.projectOptions and hasLocationBadge @@ -54,7 +54,7 @@ class @CategorySearchDropdown restoreMenu: -> html = "" - @dropdownContent.html(html) + @dropdownContent.html html categorySearchDropdownTemplate: (issuesPath, mrPath, name, userId) -> @@ -67,6 +67,3 @@ class @CategorySearchDropdown
      • Merge requests assigned to me
      • Merge requests I've created
      " - -$ -> - new CategorySearchDropdown() -- GitLab From ccbaf7f5cdfa363ded0833bfab1be3e403da36b8 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Fri, 13 May 2016 02:20:57 +0300 Subject: [PATCH 13/18] Added tests for CategorySearchDropdown. --- .../category_search_dropdown.js.coffee | 2 +- .../category_search_dropdown_spec.js.coffee | 127 ++++++++++++++++++ .../category_search_dropdown.html.haml | 12 ++ 3 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 spec/javascripts/category_search_dropdown_spec.js.coffee create mode 100644 spec/javascripts/fixtures/category_search_dropdown.html.haml diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index acd40ccf2cd9..a99011b26844 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -37,7 +37,7 @@ class @CategorySearchDropdown $body = $ 'body' userId = gon.current_user_id hasLocationBadge = @searchWidget.hasClass 'has-location-badge' - isInProjectsPage = $body.data('page').split(':').first() is 'projects' + isInProjectsPage = $body.data('page').split(':')[0] is 'projects' if isInProjectsPage and gl.projectOptions and hasLocationBadge projectSlug = $body.data 'project' diff --git a/spec/javascripts/category_search_dropdown_spec.js.coffee b/spec/javascripts/category_search_dropdown_spec.js.coffee new file mode 100644 index 000000000000..5c2d80249cf3 --- /dev/null +++ b/spec/javascripts/category_search_dropdown_spec.js.coffee @@ -0,0 +1,127 @@ +#= require category_search_dropdown +#= require jquery + +widget = null +userId = 1 +window.gon = current_user_id : userId + +dashboardIssuesPath = '/dashboard/issues' +dashboardMRsPath = '/dashboard/merge_requests' +projectIssuesPath = "/gitlab-org/gitlab-ce/issues" +projectMRsPath = "/gitlab-org/gitlab-ce/merge_requests" +projectName = 'GitLab Community Edition' + +# Add required attributes to body before starting the test. +addBodyAttributes = (page = 'groups') -> + + $('body').removeAttr 'data-page' + $('body').removeAttr 'data-project' + + $('body').data 'page', "#{page}:show" + $('body').data 'project', 'gitlab-ce' + + +# Mock `gl` object in window for dashboard specific page. App code will need it. +mockDashboardOptions = -> + + window.gl = + dashboardOptions: + issuesPath: dashboardIssuesPath + mrPath : dashboardMRsPath + + +# Mock `gl` object in window for project specific page. App code will need it. +mockProjectOptions = -> + + window.gl = + projectOptions : + 'gitlab-ce' : + issuesPath : projectIssuesPath + mrPath : projectMRsPath + projectName : projectName + + +assertLinks = (list, a1, a2, a3, a4) -> + + expect(list.find(a1).length).toBe 1 + expect(list.find(a1).text()).toBe 'Issues assigned to me' + + expect(list.find(a2).length).toBe 1 + expect(list.find(a2).text()).toBe "Issues I've created" + + expect(list.find(a3).length).toBe 1 + expect(list.find(a3).text()).toBe 'Merge requests assigned to me' + + expect(list.find(a4).length).toBe 1 + expect(list.find(a4).text()).toBe "Merge requests I've created" + + + +describe 'CategorySearchDropdown', -> + + fixture.preload 'category_search_dropdown.html' + + beforeEach -> + + fixture.load 'category_search_dropdown.html' + widget = new CategorySearchDropdown + + + it 'should show Dashboard specific dropdown menu', -> + + addBodyAttributes() + mockDashboardOptions() + + # Focus input to show dropdown list. + widget.searchInput.focus() + widget.searchInput.focus() + widget.searchInput.focus() + + w = widget.searchWidget + l = w.find 'ul' + + # Expect dropdown and dropdown header + expect(w.find('.category-dropdown-search').length).toBe 1 + expect(w.find('.dropdown-header span').text()).toBe 'Go to in Dashboard' + + # Create links then assert link urls and inner texts + issuesAssignedToMeLink = "#{dashboardIssuesPath}/?assignee_id=#{userId}" + issuesIHaveCreatedLink = "#{dashboardIssuesPath}/?author_id=#{userId}" + mrsAssignedToMeLink = "#{dashboardMRsPath}/?assignee_id=#{userId}" + mrsIHaveCreatedLink = "#{dashboardMRsPath}/?author_id=#{userId}" + + a1 = "a[href='#{issuesAssignedToMeLink}']" + a2 = "a[href='#{issuesIHaveCreatedLink}']" + a3 = "a[href='#{mrsAssignedToMeLink}']" + a4 = "a[href='#{mrsIHaveCreatedLink}']" + + assertLinks l, a1, a2, a3, a4 + + + it 'should show Project specific dropdown menu', -> + + addBodyAttributes 'projects' + mockProjectOptions() + + # Focus input to show dropdown list. + widget.searchInput.focus() + + w = widget.searchWidget + l = w.find 'ul' + + # Expect dropdown and dropdown header + expect(w.find('.category-dropdown-search').length).toBe 1 + expect(w.find('.dropdown-header span').text()).toBe "Go to in #{projectName}" + + # Create links then verify link urls and inner texts + issuesAssignedToMeLink = "#{projectIssuesPath}/?assignee_id=#{userId}" + issuesIHaveCreatedLink = "#{projectIssuesPath}/?author_id=#{userId}" + mrsAssignedToMeLink = "#{projectMRsPath}/?assignee_id=#{userId}" + mrsIHaveCreatedLink = "#{projectMRsPath}/?author_id=#{userId}" + + a1 = "a[href='#{issuesAssignedToMeLink}']" + a2 = "a[href='#{issuesIHaveCreatedLink}']" + a3 = "a[href='#{mrsAssignedToMeLink}']" + a4 = "a[href='#{mrsIHaveCreatedLink}']" + + assertLinks l, a1, a2, a3, a4 diff --git a/spec/javascripts/fixtures/category_search_dropdown.html.haml b/spec/javascripts/fixtures/category_search_dropdown.html.haml new file mode 100644 index 000000000000..764ce90dbf37 --- /dev/null +++ b/spec/javascripts/fixtures/category_search_dropdown.html.haml @@ -0,0 +1,12 @@ +.search.search-form.has-location-badge + %form.navbar-form + .search-input-container + .search-location-badge + %span.location-badge + %i.location-text + This project + .search-input-wrap + .dropdown + %input#search.search-input.dropdown-menu-toggle + .dropdown-menu.dropdown-select + .dropdown-content -- GitLab From c7afff20c1d2ea7d531e68b826e5a03941df03a2 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Wed, 18 May 2016 12:35:39 -0500 Subject: [PATCH 14/18] Fix unit tests which alters window.gon object. --- spec/javascripts/category_search_dropdown_spec.js.coffee | 3 ++- spec/javascripts/notes_spec.js.coffee | 2 +- spec/javascripts/project_title_spec.js.coffee | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/javascripts/category_search_dropdown_spec.js.coffee b/spec/javascripts/category_search_dropdown_spec.js.coffee index 5c2d80249cf3..8d5c5172cd5b 100644 --- a/spec/javascripts/category_search_dropdown_spec.js.coffee +++ b/spec/javascripts/category_search_dropdown_spec.js.coffee @@ -3,7 +3,8 @@ widget = null userId = 1 -window.gon = current_user_id : userId +window.gon or= {} +window.gon.current_user_id = userId dashboardIssuesPath = '/dashboard/issues' dashboardMRsPath = '/dashboard/merge_requests' diff --git a/spec/javascripts/notes_spec.js.coffee b/spec/javascripts/notes_spec.js.coffee index dd160e821b3d..3a3c8d63e82f 100644 --- a/spec/javascripts/notes_spec.js.coffee +++ b/spec/javascripts/notes_spec.js.coffee @@ -1,7 +1,7 @@ #= require notes #= require gl_form -window.gon = {} +window.gon or= {} window.disableButtonIfEmptyField = -> null describe 'Notes', -> diff --git a/spec/javascripts/project_title_spec.js.coffee b/spec/javascripts/project_title_spec.js.coffee index 3d8de2ff989b..aeeed56bbe6c 100644 --- a/spec/javascripts/project_title_spec.js.coffee +++ b/spec/javascripts/project_title_spec.js.coffee @@ -5,7 +5,7 @@ #= require project_select #= require project -window.gon = {} +window.gon or= {} window.gon.api_version = 'v3' describe 'Project Title', -> -- GitLab From 54525764ded8c646745520be6affc27b4822ead1 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 19 May 2016 12:15:10 -0500 Subject: [PATCH 15/18] Add data-project attribute to better in better way. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3879/diffs#note_11923158 --- app/views/layouts/application.html.haml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 8f88ecc47f67..1c2bcdc4a077 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,10 +1,7 @@ !!! 5 %html{ lang: "en"} = render "layouts/head" - - if @project - %body{class: "#{user_application_theme}", 'data-page' => body_data_page, 'data-project' => "#{@project.path}"} - - else - %body{class: "#{user_application_theme}", 'data-page' => body_data_page} + %body{class: "#{user_application_theme}", 'data-page' => body_data_page, 'data-project' => "#{@project.path if @project}"} -# Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body. = yield :scripts_body_top -- GitLab From 5a408133dce643ad5baf7202fc26423f8171297e Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 19 May 2016 12:15:54 -0500 Subject: [PATCH 16/18] Created a new common utility file. --- .../javascripts/category_search_dropdown.js.coffee | 6 ++---- app/assets/javascripts/lib/common_utils.js.coffee | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 app/assets/javascripts/lib/common_utils.js.coffee diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index a99011b26844..6d8ea89513d7 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -34,13 +34,11 @@ class @CategorySearchDropdown showCategoryDropDown: -> - $body = $ 'body' userId = gon.current_user_id hasLocationBadge = @searchWidget.hasClass 'has-location-badge' - isInProjectsPage = $body.data('page').split(':')[0] is 'projects' - if isInProjectsPage and gl.projectOptions and hasLocationBadge - projectSlug = $body.data 'project' + if gl.isInProjectPage() and gl.projectOptions and hasLocationBadge + projectSlug = $('body').data 'project' { issuesPath, mrPath, projectName } = gl.projectOptions[projectSlug] else if gl.dashboardOptions diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/common_utils.js.coffee new file mode 100644 index 000000000000..769a44411bb0 --- /dev/null +++ b/app/assets/javascripts/lib/common_utils.js.coffee @@ -0,0 +1,11 @@ +((w) -> + + w.gl or= {} + w.gl.utils or= {} + + w.gl.utils.isInProjectPage = -> + + return $('body').data('page').split(':')[0] is 'projects' + + +) window -- GitLab From fe13e0e0009ee74e0002e9864fb8bf3f9fcd2e35 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 19 May 2016 12:39:00 -0500 Subject: [PATCH 17/18] Merge project page util and project slug in an util fn. --- app/assets/javascripts/category_search_dropdown.js.coffee | 4 ++-- app/assets/javascripts/lib/common_utils.js.coffee | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/category_search_dropdown.js.coffee b/app/assets/javascripts/category_search_dropdown.js.coffee index 6d8ea89513d7..08dddd33416e 100644 --- a/app/assets/javascripts/category_search_dropdown.js.coffee +++ b/app/assets/javascripts/category_search_dropdown.js.coffee @@ -35,10 +35,10 @@ class @CategorySearchDropdown showCategoryDropDown: -> userId = gon.current_user_id + projectSlug = gl.utils.getProjectSlug() hasLocationBadge = @searchWidget.hasClass 'has-location-badge' - if gl.isInProjectPage() and gl.projectOptions and hasLocationBadge - projectSlug = $('body').data 'project' + if gl.projectOptions and projectSlug and hasLocationBadge { issuesPath, mrPath, projectName } = gl.projectOptions[projectSlug] else if gl.dashboardOptions diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/common_utils.js.coffee index 769a44411bb0..6b1043716419 100644 --- a/app/assets/javascripts/lib/common_utils.js.coffee +++ b/app/assets/javascripts/lib/common_utils.js.coffee @@ -3,9 +3,12 @@ w.gl or= {} w.gl.utils or= {} - w.gl.utils.isInProjectPage = -> + w.gl.utils.getProjectSlug = -> - return $('body').data('page').split(':')[0] is 'projects' + $body = $ 'body' + isInProjectPage = $body.data('page').split(':')[0] is 'projects' + + return if isInProjectPage then $body.data 'project' else null ) window -- GitLab From 7b4cab69349966043c9162570f7a1a80a49cf123 Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Thu, 19 May 2016 18:15:51 -0500 Subject: [PATCH 18/18] Fix specs for CategoryDropdown. --- .../category_search_dropdown_spec.js.coffee | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/spec/javascripts/category_search_dropdown_spec.js.coffee b/spec/javascripts/category_search_dropdown_spec.js.coffee index 8d5c5172cd5b..a06a7f7448fd 100644 --- a/spec/javascripts/category_search_dropdown_spec.js.coffee +++ b/spec/javascripts/category_search_dropdown_spec.js.coffee @@ -1,5 +1,7 @@ #= require category_search_dropdown #= require jquery +#= require lib/common_utils + widget = null userId = 1 @@ -25,21 +27,21 @@ addBodyAttributes = (page = 'groups') -> # Mock `gl` object in window for dashboard specific page. App code will need it. mockDashboardOptions = -> - window.gl = - dashboardOptions: - issuesPath: dashboardIssuesPath - mrPath : dashboardMRsPath + window.gl or= {} + window.gl.dashboardOptions = + issuesPath: dashboardIssuesPath + mrPath : dashboardMRsPath # Mock `gl` object in window for project specific page. App code will need it. mockProjectOptions = -> - window.gl = - projectOptions : - 'gitlab-ce' : - issuesPath : projectIssuesPath - mrPath : projectMRsPath - projectName : projectName + window.gl or= {} + window.gl.projectOptions = + 'gitlab-ce' : + issuesPath : projectIssuesPath + mrPath : projectMRsPath + projectName : projectName assertLinks = (list, a1, a2, a3, a4) -> -- GitLab