Merge branch 'issue_928_group_boards' of gitlab.com:gitlab-org/gitlab-ee into...

Merge branch 'issue_928_group_boards' of gitlab.com:gitlab-org/gitlab-ee into issue_928_group_boards

app/assets/javascripts/boards/components/board_new_issue.js

 /* global ListIssue */
 import eventHub from '../eventhub';
-import ProjectSelect from './project_select';
+import ProjectSelect from './project_select.vue';
 
 const Store = gl.issueBoards.BoardsStore;
 

app/assets/javascripts/boards/components/project_select.js → app/assets/javascripts/boards/components/project_select.vue

+<template>
+  <div>
+    <label class="label-light prepend-top-10">
+      Project
+    </label>
+    <div ref="projectsDropdown" class="dropdown">
+      <button
+        class="dropdown-menu-toggle wide"
+        type="button"
+        data-toggle="dropdown"
+        aria-expanded="false">
+        {{ selectedProjectName }}
+        <i class="fa fa-chevron-down" aria-hidden="true"></i>
+      </button>
+      <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-full-width">
+        <div class="dropdown-title">
+          <span>Projects</span>
+          <button aria-label="Close" type="button" class="dropdown-title-button dropdown-menu-close">
+            <i aria-hidden="true" data-hidden="true" class="fa fa-times dropdown-menu-close-icon"></i>
+          </button>
+        </div>
+        <div class="dropdown-input">
+          <input
+            class="dropdown-input-field"
+            type="search"
+            placeholder="Search projects">
+          <i aria-hidden="true" data-hidden="true" class="fa fa-search dropdown-input-search"></i>
+        </div>
+        <div class="dropdown-content"></div>
+        <div class="dropdown-loading">
+          <loading-icon />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
 /* global ListIssue */
 import eventHub from '../eventhub';
 import loadingIcon from '../../vue_shared/components/loading_icon.vue';
@@ -65,37 +103,6 @@ export default {
       },
       text: project => project.name,
     });
-  },
-  template: `
-    <div>
-      <label class="label-light prepend-top-10">
-        Project
-      </label>
-      <div ref="projectsDropdown" class="dropdown">
-        <button
-          class="dropdown-menu-toggle wide"
-          type="button"
-          data-toggle="dropdown"
-          aria-expanded="false">
-          {{ selectedProjectName }}
-          <i class="fa fa-chevron-down" aria-hidden="true"></i>
-        </button>
-        <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-full-width">
-          <div class="dropdown-title">
-            <span>Projects</span>
-            <button aria-label="Close" type="button" class="dropdown-title-button dropdown-menu-close">
-              <i aria-hidden="true" data-hidden="true" class="fa fa-times dropdown-menu-close-icon"></i>
-            </button>
-          </div>
-          <div class="dropdown-input">
-            <input class="dropdown-input-field">
-          </div>
-          <div class="dropdown-content"></div>
-          <div class="dropdown-loading">
-            <loading-icon />
-          </div>
-        </div>
-      </div>
-    </div>
-  `,
+  }
 };
+</script>

app/assets/javascripts/boards/components/sidebar/remove_issue.js

@@ -33,9 +33,12 @@ gl.issueBoards.RemoveIssueBtn = Vue.extend({
       const issue = this.issue;
       const lists = issue.getLists();
       const listLabelIds = lists.map(list => list.label.id);
-      const labelIds = this.issue.labels
+      let labelIds = this.issue.labels
         .map(label => label.id)
         .filter(id => !listLabelIds.includes(id));
+      if (labelIds.length === 0) {
+        labelIds = [''];
+      }
       const data = {
         issue: {
           label_ids: labelIds,

app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js

@@ -2,13 +2,14 @@ import DropLab from '~/droplab/drop_lab';
 import FilteredSearchContainer from './container';
 
 class FilteredSearchDropdownManager {
-  constructor(baseEndpoint = '', tokenizer, page) {
+  constructor(baseEndpoint = '', tokenizer, page, isGroup) {
     this.container = FilteredSearchContainer.container;
     this.baseEndpoint = baseEndpoint.replace(/\/$/, '');
     this.tokenizer = tokenizer;
     this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
     this.filteredSearchInput = this.container.querySelector('.filtered-search');
     this.page = page;
+    this.groupsOnly = page === 'boards' && isGroup;
 
     if (this.page === 'issues' || this.page === 'boards') {
       this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeysIssuesEE;
@@ -47,7 +48,7 @@ class FilteredSearchDropdownManager {
         reference: null,
         gl: 'DropdownNonUser',
         extraArguments: {
-          endpoint: `${this.baseEndpoint}/milestones.json?only_group_milestones=true`,
+          endpoint: `${this.baseEndpoint}/milestones.json${this.groupsOnly ? '?only_group_milestones=true' : ''}`,
           symbol: '%',
         },
         element: this.container.querySelector('#js-dropdown-milestone'),
@@ -56,7 +57,7 @@ class FilteredSearchDropdownManager {
         reference: null,
         gl: 'DropdownNonUser',
         extraArguments: {
-          endpoint: `${this.baseEndpoint}/labels.json?only_group_labels=true`,
+          endpoint: `${this.baseEndpoint}/labels.json${this.groupsOnly ? '?only_group_labels=true' : ''}`,
           symbol: '~',
           preprocessing: gl.DropdownUtils.duplicateLabelPreprocessing,
         },

app/assets/javascripts/filtered_search/filtered_search_manager.js

@@ -63,7 +63,12 @@ class FilteredSearchManager {
 
     if (this.filteredSearchInput) {
       this.tokenizer = gl.FilteredSearchTokenizer;
-      this.dropdownManager = new gl.FilteredSearchDropdownManager(this.filteredSearchInput.getAttribute('data-base-endpoint') || '', this.tokenizer, this.page);
+      this.dropdownManager = new gl.FilteredSearchDropdownManager(
+        this.filteredSearchInput.getAttribute('data-base-endpoint') || '',
+        this.tokenizer,
+        this.page,
+        Boolean(this.filteredSearchInput.getAttribute('data-group-id')),
+      );
 
       this.recentSearchesRoot = new RecentSearchesRoot(
         this.recentSearchesStore,

app/views/layouts/nav/_new_group_sidebar.html.haml

+- issues_sub_menu_items = ['groups#issues', 'labels#index', 'milestones#index']
+- if @group.feature_available?(:group_issue_boards)
+  - issues_sub_menu_items.push('boards#index')
 .nav-sidebar{ class: ("sidebar-icons-only" if collapsed_sidebar?) }
   .nav-sidebar-inner-scroll
     .context-header
@@ -31,7 +34,7 @@
                 %span
                   Contribution Analytics
 
-      = nav_link(path: ['groups#issues', 'boards#index', 'labels#index', 'milestones#index']) do
+      = nav_link(path: issues_sub_menu_items) do
         = link_to issues_group_path(@group), title: 'Issues' do
           .nav-icon-container
             = custom_icon('issues')
@@ -46,10 +49,11 @@
               %span
                 List
 
-          = nav_link(path: 'boards#index') do
-            = link_to group_boards_path(@group), title: 'Boards' do
-              %span
-                Boards
+          - if @group.feature_available?(:group_issue_boards)
+            = nav_link(path: 'boards#index') do
+              = link_to group_boards_path(@group), title: 'Boards' do
+                %span
+                  Boards
 
           = nav_link(path: 'labels#index') do
             = link_to group_labels_path(@group), title: 'Labels' do

spec/ee/spec/views/layouts/nav/_new_group_sidebar.html.haml_spec.rb

+require 'spec_helper'
+
+describe 'layouts/nav/_new_group_sidebar' do
+  before do
+    assign(:group, create(:group))
+  end
+
+  describe 'group issue boards link' do
+    it 'is not visible when there is no valid license' do
+      stub_licensed_features(group_issue_boards: false)
+
+      render
+
+      expect(rendered).not_to have_text 'Boards'
+    end
+
+    it 'is not visible when there is no valid license' do
+      stub_licensed_features(group_issue_boards: true)
+
+      render
+
+      expect(rendered).to have_text 'Boards'
+    end
+  end
+end