Merge branch 'swimlanes-license-check' into 'master'

Add swimlanes license check

See merge request gitlab-org/gitlab!44880

app/assets/javascripts/boards/index.js

@@ -369,6 +369,10 @@ export default () => {
 
   toggleFocusMode(ModalStore, boardsStore);
   toggleLabels();
-  toggleEpicsSwimlanes();
+
+  if (gon.features?.swimlanes) {
+    toggleEpicsSwimlanes();
+  }
+
   mountMultipleBoardsSwitcher();
 };

app/assets/javascripts/boards/stores/getters.js

@@ -5,7 +5,7 @@ export default {
   getLabelToggleState: state => (state.isShowingLabels ? 'on' : 'off'),
   isSidebarOpen: state => state.activeId !== inactiveId,
   isSwimlanesOn: state => {
-    if (!gon?.features?.boardsWithSwimlanes) {
+    if (!gon?.features?.boardsWithSwimlanes && !gon?.features?.swimlanes) {
       return false;
     }
 

ee/changelogs/unreleased/swimlanes-license-check.yml

+---
+title: Add swimlanes license check
+merge_request: 44880
+author:
+type: changed

ee/spec/features/boards/boards_spec.rb

@@ -77,7 +77,8 @@ RSpec.describe 'issue boards', :js do
   context 'swimlanes dropdown' do
     context 'feature flag on' do
       before do
-        stub_feature_flags(boards_with_swimlanes: true)
+        stub_licensed_features(swimlanes: true)
+        stub_feature_flags(boards_with_swimlanes: true, swimlanes: true)
       end
 
       it 'does not show Group by dropdown when user is not logged in' do
@@ -97,7 +98,7 @@ RSpec.describe 'issue boards', :js do
 
     context 'feature flag off' do
       before do
-        stub_feature_flags(boards_with_swimlanes: false)
+        stub_feature_flags(boards_with_swimlanes: false, swimlanes: false)
       end
 
       it 'does not show Group by dropdown when user is not logged in' do

ee/spec/features/boards/swimlanes/epics_swimlanes_drag_issue_spec.rb

@@ -29,7 +29,9 @@ RSpec.describe 'epics swimlanes', :js do
   before do
     project.add_maintainer(user)
     group.add_maintainer(user)
-    stub_licensed_features(epics: true)
+    stub_licensed_features(epics: true, swimlanes: true)
+    stub_feature_flags(epics: true, boards_with_swimlanes: true, swimlanes: true)
+
     sign_in(user)
     visit_board_page
     select_epics

ee/spec/features/boards/swimlanes/epics_swimlanes_filtering_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe 'epics swimlanes filtering', :js do
       project.add_maintainer(user)
       project.add_maintainer(user2)
 
-      stub_licensed_features(epics: true)
+      stub_licensed_features(epics: true, swimlanes: true)
       sign_in(user)
       visit_board_page
 

ee/spec/features/boards/swimlanes/epics_swimlanes_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe 'epics swimlanes', :js do
   let_it_be(:epic_issue2) { create(:epic_issue, epic: epic2, issue: issue2) }
 
   before do
-    stub_licensed_features(epics: true)
+    stub_licensed_features(epics: true, swimlanes: true)
     sign_in(user)
     visit_board_page
     select_epics

ee/spec/requests/api/boards_spec.rb

@@ -10,6 +10,10 @@ RSpec.describe API::Boards do
 
   it_behaves_like 'multiple and scoped issue boards', "/projects/:id/boards"
 
+  before do
+    stub_licensed_features(swimlanes: true)
+  end
+
   describe 'POST /projects/:id/boards/:board_id/lists' do
     let(:url) { "/projects/#{board_parent.id}/boards/#{board.id}/lists" }