Merge branch 'bvl-license-check-focus-mode' into 'master'

Hide Focus mode button if feature not available in license

Closes #2569

See merge request !2303

app/assets/javascripts/boards/boards_bundle.js

@@ -141,6 +141,7 @@ $(() => {
       modal: ModalStore.store,
       store: Store.state,
       isFullscreen: false,
+      focusModeAvailable: gl.utils.convertPermissionToBoolean($boardApp.dataset.focusModeAvailable),
     },
     watch: {
       disabled() {
@@ -177,6 +178,8 @@ $(() => {
         }
       },
       toggleFocusMode() {
+        if (!this.focusModeAvailable) { return; }
+
         $(this.$refs.toggleFocusModeButton).tooltip('hide');
         issueBoardsContent.classList.toggle('is-focused');
 
@@ -206,6 +209,7 @@ $(() => {
           aria-label="Toggle focus mode"
           title="Toggle focus mode"
           ref="toggleFocusModeButton"
+          v-if="focusModeAvailable"
           @click="toggleFocusMode">
           <span v-show="isFullscreen">
             ${collapseIcon}

app/helpers/boards_helper.rb

 module BoardsHelper
+  prepend EE::BoardsHelper
+
   def board_data
     board = @board || @boards.first
 

app/helpers/ee/boards_helper.rb

+module EE
+  module BoardsHelper
+    def board_data
+      super.merge(focus_mode_available: @project.feature_available?(:issue_board_focus_mode).to_s)
+    end
+  end
+end

app/models/license.rb

@@ -10,6 +10,7 @@ class License < ActiveRecord::Base
   FAST_FORWARD_MERGE_FEATURE = 'GitLab_FastForwardMerge'.freeze
   FILE_LOCK_FEATURE = 'GitLab_FileLocks'.freeze
   GEO_FEATURE = 'GitLab_Geo'.freeze
+  ISSUE_BOARDS_FOCUS_MODE_FEATURE = 'IssueBoardsFocusMode'.freeze
   ISSUE_WEIGHTS_FEATURE = 'GitLab_IssueWeights'.freeze
   MERGE_REQUEST_REBASE_FEATURE = 'GitLab_MergeRequestRebase'.freeze
   MERGE_REQUEST_SQUASH_FEATURE = 'GitLab_MergeRequestSquash'.freeze
@@ -32,6 +33,7 @@ class License < ActiveRecord::Base
     export_issues: EXPORT_ISSUES_FEATURE,
     fast_forward_merge: FAST_FORWARD_MERGE_FEATURE,
     file_lock: FILE_LOCK_FEATURE,
+    issue_board_focus_mode: ISSUE_BOARDS_FOCUS_MODE_FEATURE,
     issue_weights: ISSUE_WEIGHTS_FEATURE,
     merge_request_rebase: MERGE_REQUEST_REBASE_FEATURE,
     merge_request_squash: MERGE_REQUEST_SQUASH_FEATURE
@@ -48,6 +50,7 @@ class License < ActiveRecord::Base
     { ELASTIC_SEARCH_FEATURE => 1 },
     { EXPORT_ISSUES_FEATURE => 1 },
     { FAST_FORWARD_MERGE_FEATURE => 1 },
+    { ISSUE_BOARDS_FOCUS_MODE_FEATURE => 1 },
     { ISSUE_WEIGHTS_FEATURE => 1 },
     { MERGE_REQUEST_REBASE_FEATURE => 1 },
     { MERGE_REQUEST_SQUASH_FEATURE => 1 },
@@ -84,6 +87,7 @@ class License < ActiveRecord::Base
     { FAST_FORWARD_MERGE_FEATURE => 1 },
     { FILE_LOCK_FEATURE => 1 },
     { GEO_FEATURE => 1 },
+    { ISSUE_BOARDS_FOCUS_MODE_FEATURE => 1 },
     { ISSUE_WEIGHTS_FEATURE => 1 },
     { MERGE_REQUEST_REBASE_FEATURE => 1 },
     { MERGE_REQUEST_SQUASH_FEATURE => 1 },

changelogs/unreleased-ee/bvl-license-check-focus-mode.yml

+---
+title: Add license checks for focus mode on the issue board
+merge_request: 2303
+author:

spec/features/boards/ee/boards_spec.rb

+require 'spec_helper'
+
+describe 'issue boards', feature: true, js: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project, :public) }
+  let!(:board) { create(:board, project: project) }
+
+  before do
+    project.add_developer(user)
+    login_as(user)
+  end
+
+  context 'issue board focus mode' do
+    it 'shows the button when the feature is enabled' do
+      stub_licensed_features(issue_board_focus_mode: true)
+
+      visit_board_page
+
+      expect(page).to have_link('Toggle focus mode')
+    end
+
+    it 'hides the button when the feature is enabled' do
+      stub_licensed_features(issue_board_focus_mode: false)
+
+      visit_board_page
+
+      expect(page).not_to have_link('Toggle focus mode')
+    end
+  end
+
+  def visit_board_page
+    visit namespace_project_boards_path(project.namespace, project)
+    wait_for_requests
+  end
+end