Fix list service and duplicate views

app/controllers/groups/boards_controller.rb

 class Groups::BoardsController < Groups::ApplicationController
   before_action :check_group_issue_boards_available!
+  before_action :assign_endpoint_vars
 
   def index
     @boards = ::Boards::ListService.new(group, current_user).execute
@@ -11,4 +12,8 @@ class Groups::BoardsController < Groups::ApplicationController
       end
     end
   end
+
+  def assign_endpoint_vars
+    @boards_endpoint = group_boards_path(@group)
+  end
 end

app/controllers/projects/boards_controller.rb

@@ -3,6 +3,7 @@ class Projects::BoardsController < Projects::ApplicationController
   include IssuableCollections
 
   before_action :authorize_read_board!, only: [:index, :show]
+  before_action :assign_endpoint_vars
 
   def index
     @boards = ::Boards::ListService.new(project, current_user).execute
@@ -28,6 +29,10 @@ class Projects::BoardsController < Projects::ApplicationController
 
   private
 
+  def assign_endpoint_vars
+    @boards_endpoint = project_boards_path(@project)
+  end
+
   def authorize_read_board!
     return access_denied! unless can?(current_user, :read_board, project)
   end

app/helpers/boards_helper.rb

@@ -5,7 +5,7 @@ module BoardsHelper
     board = @board || @boards.first
 
     {
-      endpoint: project_boards_path(@project),
+      endpoint: @boards_endpoint,
       board_id: board.id,
       board_milestone_title: board&.milestone&.title,
       disabled: "#{!can?(current_user, :admin_list, @project)}",

app/models/group.rb

@@ -22,6 +22,7 @@ class Group < Namespace
 
   has_many :requesters, -> { where.not(requested_at: nil) }, dependent: :destroy, as: :source, class_name: 'GroupMember' # rubocop:disable Cop/ActiveRecordDependent
 
+  has_many :boards
   has_many :milestones
   has_many :project_group_links, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :shared_projects, through: :project_group_links, source: :project

app/models/namespace.rb

@@ -231,6 +231,10 @@ class Namespace < ActiveRecord::Base
     self.deleted_at = Time.now
   end
 
+  def multiple_issue_boards_available?(user = nil)
+    feature_available?(:multiple_issue_boards)
+  end
+
   private
 
   def repository_storage_paths

app/models/project.rb

@@ -1434,6 +1434,10 @@ class Project < ActiveRecord::Base
     end
   end
 
+  def multiple_issue_boards_available?(user)
+    feature_available?(:multiple_issue_boards, user)
+  end
+
   alias_method :name_with_namespace, :full_name
   alias_method :human_name, :full_name
   alias_method :path_with_namespace, :full_path

app/services/boards/base_service.rb

+module Boards
+  class BaseService < ::BaseService
+    # Parent can either a group or a project
+    attr_accessor :parent, :current_user, :params
+
+    def initialize(parent, user, params = {})
+      @parent, @current_user, @params = parent, user, params.dup
+      super
+    end
+  end
+end

app/services/boards/create_service.rb

 module Boards
-  class CreateService < BaseService
+  class CreateService < Boards::BaseService
     prepend EE::Boards::CreateService
 
     def execute
@@ -9,11 +9,11 @@ module Boards
     private
 
     def can_create_board?
-      project.boards.size == 0
+      parent.boards.size == 0
     end
 
     def create_board!
-      board = project.boards.create(params)
+      board = parent.boards.create(params)
 
       if board.persisted?
         board.lists.create(list_type: :backlog)

app/services/boards/list_service.rb

 module Boards
-  class ListService < BaseService
+  class ListService < Boards::BaseService
     prepend EE::Boards::ListService
 
     def execute
-      create_board! if project.boards.empty?
-      project.boards
+      create_board! if parent.boards.empty?
+      parent.boards
     end
 
     private
 
     def create_board!
-      Boards::CreateService.new(project, current_user).execute
+      Boards::CreateService.new(parent, current_user).execute
     end
   end
 end

app/services/ee/boards/create_service.rb

@@ -4,7 +4,7 @@ module EE
       def can_create_board?
         raise NotImplementedError unless defined?(super)
 
-        project.feature_available?(:multiple_issue_boards) || super
+        parent.feature_available?(:multiple_issue_boards) || super
       end
     end
   end

app/services/ee/boards/list_service.rb

@@ -4,7 +4,7 @@ module EE
       def execute
         raise NotImplementedError unless defined?(super)
 
-        if project.feature_available?(:multiple_issue_boards, current_user)
+        if parent.multiple_issue_boards_available?(current_user)
           super
         else
           super.limit(1)

app/views/groups/boards/_show.html.haml

+- board = local_assigns.fetch(:board, nil)
+- @no_container = true
+- @content_class = "issue-boards-content js-focus-mode-board"
+- page_title "Boards"
+
+- if show_new_nav?
+  - content_for :sub_title_before do
+    %li= link_to "Issues", issues_group_path(@group)
+
+- content_for :page_specific_javascripts do
+  = webpack_bundle_tag 'common_vue'
+  = webpack_bundle_tag 'filtered_search'
+  = webpack_bundle_tag 'boards'
+
+  %script#js-board-template{ type: "text/x-template" }= render "projects/boards/components/board"
+  / %script#js-board-modal-filter{ type: "text/x-template" }= render "shared/issuable/search_bar", type: :boards_modal
+
+=# render "projects/issues/head"
+
+.hidden-xs.hidden-sm
+  =# render 'shared/issuable/search_bar', type: :boards, board: board
+
+#board-app.boards-app{ "v-cloak" => true, data: board_data }
+  .boards-list{ ":class" => "{ 'is-compact': detailIssueVisible }" }
+    .boards-app-loading.text-center{ "v-if" => "loading" }
+      = icon("spinner spin")
+    %board{ "v-cloak" => true,
+      "v-for" => "list in state.lists",
+      "ref" => "board",
+      ":list" => "list",
+      ":disabled" => "disabled",
+      ":issue-link-base" => "issueLinkBase",
+      ":root-path" => "rootPath",
+      ":board-id" => "boardId",
+      ":key" => "_uid" }
+  = render "projects/boards/components/sidebar"
+  %board-add-issues-modal{ "blank-state-image" => render('shared/empty_states/icons/issues.svg'),
+    "new-issue-path" => "",
+    "milestone-path" => milestones_filter_dropdown_path,
+    "label-path" => labels_filter_path,
+    ":issue-link-base" => "issueLinkBase",
+    ":root-path" => "rootPath",
+    ":group-id" => @group.try(:id) }

app/views/groups/boards/_switcher.html.haml

+%boards-selector{ "inline-template" => true,
+  ":current-board" => current_board_json,
+  "milestone-path" => project_milestones_path(board.project, :json) }
+  .dropdown
+    %button.dropdown-menu-toggle{ "@click" => "loadBoards",
+      data: { toggle: "dropdown" } }
+      {{ board.name }}
+      = icon("chevron-down")
+    .dropdown-menu{ ":class" => "{ 'is-loading': loading }" }
+      .dropdown-title
+        %button.dropdown-title-button.dropdown-menu-back{ type: "button",
+          aria: { label: "Go back" },
+          "@click.stop.prevent" => "showPage('')",
+          "v-if" => "currentPage !== ''" }
+          = icon("arrow-left")
+        {{ title }}
+        %button.dropdown-title-button.dropdown-menu-close{ type: "button",
+          aria: { label: "Close" } }
+          = icon("times", class: "dropdown-menu-close-icon")
+      .dropdown-content{ "v-if" => "currentPage === ''" }
+        %ul{ "v-if" => "!loading" }
+          %li{ "v-for" => "board in boards" }
+            %a{ ":href" => "'#{project_boards_path(@project)}/' + board.id" }
+              {{ board.name }}
+          - if !@project.feature_available?(:multiple_issue_boards) && @project.boards.size > 1
+            %li.small
+              Some of your boards are hidden, activate a license to see them again.
+      .dropdown-loading{ "v-if" => "loading" }
+        = icon("spin spinner")
+      - if can?(current_user, :admin_board, @project)
+        %board-selector-form{ "inline-template" => true,
+          ":milestone-path" => "milestonePath",
+          "v-if" => "currentPage === 'new' || currentPage === 'edit' || currentPage === 'milestone'" }
+          = render "projects/boards/components/form"
+        .dropdown-content.board-selector-page-two{ "v-if" => "currentPage === 'delete'" }
+          %p
+            Are you sure you want to delete this board?
+          .board-delete-btns.clearfix
+            = link_to project_board_path(@project, board),
+              class: "btn btn-danger pull-left",
+              method: :delete do
+              Delete
+            %button.btn.btn-default.pull-right{ type: "button",
+              "@click.stop.prevent" => "showPage('')" }
+              Cancel
+      - if can?(current_user, :admin_board, @project)
+        .dropdown-footer{ "v-if" => "currentPage === ''" }
+          %ul.dropdown-footer-list
+            - if @project.feature_available?(:multiple_issue_boards)
+              %li
+                %a{ "href" => "#", "@click.stop.prevent" => "showPage('new')" }
+                  Create new board
+            %li
+              %a{ "href" => "#", "@click.stop.prevent" => "showPage('edit')" }
+                Edit board name
+            - if @project.feature_available?(:issue_board_milestone, current_user)
+              %li
+                %a{ "href" => "#", "@click.stop.prevent" => "showPage('milestone')" }
+                  Edit board milestone
+            %li{ "v-if" => "showDelete" }
+              %a.text-danger{ "href" => "#", "@click.stop.prevent" => "showPage('delete')" }
+                Delete board

app/views/groups/boards/components/_board.html.haml

+.board{ ":class" => '{ "is-draggable": !list.preset, "is-expandable": list.isExpandable, "is-collapsed": !list.isExpanded }',
+  ":data-id" => "list.id" }
+  .board-inner
+    %header.board-header{ ":class" => '{ "has-border": list.label && list.label.color }', ":style" => "{ borderTopColor: (list.label && list.label.color ? list.label.color : null) }", "@click" => "toggleExpanded($event)" }
+      %h3.board-title.js-board-handle{ ":class" => '{ "user-can-drag": (!disabled && !list.preset) }' }
+        %i.fa.fa-fw.board-title-expandable-toggle{ "v-if": "list.isExpandable",
+          ":class": "{ \"fa-caret-down\": list.isExpanded, \"fa-caret-right\": !list.isExpanded && list.position === -1, \"fa-caret-left\": !list.isExpanded && list.position !== -1 }",
+          "aria-hidden": "true" }
+        %span.has-tooltip{ ":title" => '(list.label ? list.label.description : "")',
+          data: { container: "body", placement: "bottom" } }
+          {{ list.title }}
+        .issue-count-badge.pull-right.clearfix{ "v-if" => 'list.type !== "blank"' }
+          %span.issue-count-badge-count.pull-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' }
+            {{ list.issuesSize }}
+          - if can?(current_user, :admin_issue, @project)
+            %button.issue-count-badge-add-button.btn.btn-small.btn-default.has-tooltip.js-no-trigger-collapse{ type: "button",
+              "@click" => "showNewIssueForm",
+              "v-if" => 'list.type !== "closed"',
+              "aria-label" => "New issue",
+              "title" => "New issue",
+              data: { placement: "top", container: "body" } }
+              = icon("plus", class: "js-no-trigger-collapse")
+        - if can?(current_user, :admin_list, @project)
+          %board-delete{ "inline-template" => true,
+            ":list" => "list",
+            "v-if" => "!list.preset && list.id" }
+            %button.board-delete.has-tooltip.pull-right{ type: "button", title: "Delete list", "aria-label" => "Delete list", data: { placement: "bottom" }, "@click.stop" => "deleteBoard" }
+              = icon("trash")
+    %board-list{ "v-if" => 'list.type !== "blank"',
+      ":list" => "list",
+      ":issues" => "list.issues",
+      ":loading" => "list.loading",
+      ":disabled" => "disabled",
+      ":issue-link-base" => "issueLinkBase",
+      ":root-path" => "rootPath",
+      "ref" => "board-list" }
+    - if can?(current_user, :admin_list, @project)
+      %board-blank-state{ "v-if" => 'list.id == "blank"' }

app/views/groups/boards/components/_form.html.haml

+.board-selector-page-two
+  %form{ "@submit.prevent" => "submit" }
+    .dropdown-content
+      %input{ type: "hidden",
+        id: "board-milestone",
+        "v-model.number" => "board.milestone_id" }
+      %div{ "v-if" => "currentPage !== 'milestone'" }
+        %label.label-light{ for: "board-new-name" }
+          Board name
+        %input.form-control{ type: "text",
+          id: "board-new-name",
+          "v-model" => "board.name" }
+      - if @project.feature_available?(:issue_board_milestone, current_user)
+        .dropdown.board-inner-milestone-dropdown{ ":class" => "{ open: milestoneDropdownOpen }",
+          "v-if" => "currentPage === 'new'" }
+          %label.label-light{ for: "board-milestone" }
+            Board milestone
+          %button.dropdown-menu-toggle.wide{ type: "button",
+            "@click.stop.prevent" => "loadMilestones($event)" }
+            {{ milestoneToggleText }}
+            = icon("chevron-down")
+          .dropdown-menu.dropdown-menu-selectable{ "v-if" => "milestoneDropdownOpen",
+            ref: "milestoneDropdown" }
+            .dropdown-content
+              %ul
+                %li{ "v-for" => "milestone in extraMilestones" }
+                  %a{ href: "#",
+                    ":class" => "{ 'is-active': milestone.id === board.milestone_id }",
+                    "@click.stop.prevent" => "selectMilestone(milestone)" }
+                    {{ milestone.title }}
+                %li.divider
+                %li{ "v-for" => "milestone in milestones" }
+                  %a{ href: "#",
+                    ":class" => "{ 'is-active': milestone.id === board.milestone_id }",
+                    "@click.stop.prevent" => "selectMilestone(milestone)" }
+                    {{ milestone.title }}
+            = dropdown_loading
+          %span
+            Only show issues scheduled for the selected milestone
+      %board-milestone-select{ "v-if" => "currentPage == 'milestone'",
+        ":milestone-path" => "milestonePath",
+        ":select-milestone" => "selectMilestone",
+        ":board" => "board" }
+    .dropdown-footer
+      %button.btn.btn-primary.pull-left{ type: "submit",
+        ":disabled" => "submitDisabled",
+        "ref" => "'submit-btn'" }
+        {{ buttonText }}
+      %button.btn.btn-default.pull-right{ type: "button",
+        "@click.stop.prevent" => "cancel" }
+        Cancel

app/views/groups/boards/components/_sidebar.html.haml

+%board-sidebar{ "inline-template" => true,
+  ":current-user" => "#{current_user ? current_user.to_json(only: [:username, :id, :name], methods: [:avatar_url]) : {}}" }
+  %transition{ name: "boards-sidebar-slide" }
+    %aside.right-sidebar.right-sidebar-expanded.issue-boards-sidebar{ "v-show" => "showSidebar" }
+      .issuable-sidebar
+        .block.issuable-sidebar-header
+          %span.issuable-header-text.hide-collapsed.pull-left
+            %strong
+              {{ issue.title }}
+            %br/
+            %span
+              = precede "#" do
+                {{ issue.id }}
+          %a.gutter-toggle.pull-right{ role: "button",
+            href: "#",
+            "@click.prevent" => "closeSidebar",
+            "aria-label" => "Toggle sidebar" }
+            = custom_icon("icon_close", size: 15)
+        .js-issuable-update
+          = render "projects/boards/components/sidebar/assignee"
+          = render "projects/boards/components/sidebar/milestone"
+          = render "projects/boards/components/sidebar/due_date"
+          = render "projects/boards/components/sidebar/labels"
+          = render "projects/boards/components/sidebar/notifications"
+          %remove-btn{ ":issue" => "issue",
+            ":list" => "list",
+            "v-if" => "canRemove" }

app/views/groups/boards/components/sidebar/_assignee.html.haml

+.block.assignee{ ref: "assigneeBlock" }
+  %template{ "v-if" => "issue.assignees" }
+    %assignee-title{ ":number-of-assignees" => "issue.assignees.length",
+      ":loading" => "loadingAssignees",
+      ":editable" => can?(current_user, :admin_issue, @project) }
+    %assignees.value{ "root-path" => "#{root_url}",
+      ":users" => "issue.assignees",
+      ":editable" => can?(current_user, :admin_issue, @project),
+      "@assign-self" => "assignSelf" }
+
+  - if can?(current_user, :admin_issue, @project)
+    .selectbox.hide-collapsed
+      %input.js-vue{ type: "hidden",
+        name: "issue[assignee_ids][]",
+        ":value" => "assignee.id",
+        "v-if" => "issue.assignees",
+        "v-for" => "assignee in issue.assignees",
+        ":data-avatar_url" => "assignee.avatar",
+        ":data-name" => "assignee.name",
+        ":data-username" => "assignee.username" }
+      .dropdown
+        - dropdown_options = issue_assignees_dropdown_options
+        %button.dropdown-menu-toggle.js-user-search.js-author-search.js-multiselect.js-save-user-data.js-issue-board-sidebar{ type: 'button', ref: 'assigneeDropdown', data: { toggle: 'dropdown', field_name: 'issue[assignee_ids][]', first_user: current_user&.username, current_user: 'true', project_id: @project.id, null_user: 'true', multi_select: 'true', 'dropdown-header': dropdown_options[:data][:'dropdown-header'], 'max-select': dropdown_options[:data][:'max-select'] },
+          ":data-issuable-id" => "issue.id",
+          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+          = dropdown_options[:title]
+          = icon("chevron-down")
+        .dropdown-menu.dropdown-select.dropdown-menu-user.dropdown-menu-selectable.dropdown-menu-author
+          = dropdown_title("Assign to")
+          = dropdown_filter("Search users")
+          = dropdown_content
+          = dropdown_loading

app/views/groups/boards/components/sidebar/_due_date.html.haml

+.block.due_date
+  .title
+    Due date
+    - if can?(current_user, :admin_issue, @project)
+      = icon("spinner spin", class: "block-loading")
+      = link_to "Edit", "#", class: "edit-link pull-right"
+  .value
+    .value-content
+      %span.no-value{ "v-if" => "!issue.dueDate" }
+        No due date
+      %span.bold{ "v-if" => "issue.dueDate" }
+        {{ issue.dueDate | due-date }}
+      - if can?(current_user, :admin_issue, @project)
+        %span.no-value.js-remove-due-date-holder{ "v-if" => "issue.dueDate" }
+          \-
+          %a.js-remove-due-date{ href: "#", role: "button" }
+            remove due date
+  - if can?(current_user, :admin_issue, @project)
+    .selectbox
+      %input{ type: "hidden",
+        name: "issue[due_date]",
+        ":value" => "issue.dueDate" }
+      .dropdown
+        %button.dropdown-menu-toggle.js-due-date-select.js-issue-boards-due-date{ type: 'button',
+          data: { toggle: 'dropdown', field_name: "issue[due_date]", ability_name: "issue" },
+          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+          %span.dropdown-toggle-text Due date
+          = icon('chevron-down')
+        .dropdown-menu.dropdown-menu-due-date
+          = dropdown_title('Due date')
+          = dropdown_content do
+            .js-due-date-calendar

app/views/groups/boards/components/sidebar/_labels.html.haml

+.block.labels
+  .title
+    Labels
+    - if can?(current_user, :admin_issue, @project)
+      = icon("spinner spin", class: "block-loading")
+      = link_to "Edit", "#", class: "edit-link pull-right"
+  .value.issuable-show-labels
+    %span.no-value{ "v-if" => "issue.labels && issue.labels.length === 0" }
+      None
+    %a{ href: "#",
+      "v-for" => "label in issue.labels" }
+      %span.label.color-label.has-tooltip{ ":style" => "{ backgroundColor: label.color, color: label.textColor }" }
+        {{ label.title }}
+  - if can?(current_user, :admin_issue, @project)
+    .selectbox
+      %input{ type: "hidden",
+        name: "issue[label_names][]",
+        "v-for" => "label in issue.labels",
+        ":value" => "label.id" }
+      .dropdown
+        %button.dropdown-menu-toggle.js-label-select.js-multiselect.js-issue-board-sidebar{ type: "button",
+          data: { toggle: "dropdown", field_name: "issue[label_names][]", show_no: "true", show_any: "true", project_id: @project.id, labels: project_labels_path(@project, :json), namespace_path: @project.try(:namespace).try(:full_path), project_path: @project.try(:path) },
+          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+          %span.dropdown-toggle-text
+            Label
+          = icon('chevron-down')
+        .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
+          = render partial: "shared/issuable/label_page_default"
+          - if can? current_user, :admin_label, @project and @project
+            = render partial: "shared/issuable/label_page_create"

app/views/groups/boards/components/sidebar/_milestone.html.haml

+.block.milestone
+  .title
+    Milestone
+    - if can?(current_user, :admin_issue, @project)
+      = icon("spinner spin", class: "block-loading")
+      = link_to "Edit", "#", class: "edit-link pull-right"
+  .value
+    %span.no-value{ "v-if" => "!issue.milestone" }
+      None
+    %span.bold.has-tooltip{ "v-if" => "issue.milestone" }
+      {{ issue.milestone.title }}
+  - if can?(current_user, :admin_issue, @project)
+    .selectbox
+      %input{ type: "hidden",
+        ":value" => "issue.milestone.id",
+        name: "issue[milestone_id]",
+        "v-if" => "issue.milestone" }
+      .dropdown
+        %button.dropdown-menu-toggle.js-milestone-select.js-issue-board-sidebar{ type: "button", data: { toggle: "dropdown", show_no: "true", field_name: "issue[milestone_id]", project_id: @project.id, milestones: project_milestones_path(@project, :json), ability_name: "issue", use_id: "true", default_no: "true" },
+          ":data-selected" => "milestoneTitle",
+          ":data-issuable-id" => "issue.id",
+          ":data-issue-update" => "'#{project_issues_path(@project)}/' + issue.id + '.json'" }
+          Milestone
+          = icon("chevron-down")
+        .dropdown-menu.dropdown-select.dropdown-menu-selectable
+          = dropdown_title("Assign milestone")
+          = dropdown_filter("Search milestones")
+          = dropdown_content
+          = dropdown_loading

app/views/groups/boards/components/sidebar/_notifications.html.haml

+- if current_user
+  .block.light.subscription{ ":data-url" => "'#{project_issues_path(@project)}/' + issue.id + '/toggle_subscription'" }
+    %span.issuable-header-text.hide-collapsed.pull-left
+      Notifications
+    %button.btn.btn-default.pull-right.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" }
+      %span
+        {{issue.subscribed ? 'Unsubscribe' : 'Subscribe'}}

app/views/groups/boards/index.html.haml

+= render "show", board: @boards.first

app/views/groups/boards/show.html.haml

+= render "show", board: @board