Merge branch 'ee-single-list-multiple-clusters' into 'master'

Ee single list multiple clusters

See merge request gitlab-org/gitlab-ee!3702

app/controllers/projects/clusters_controller.rb

@@ -8,11 +8,8 @@ class Projects::ClustersController < Projects::ApplicationController
   STATUS_POLLING_INTERVAL = 10_000
 
   def index
-    @scope = params[:scope] || 'all'
-    @clusters = ClustersFinder.new(project, current_user, @scope).execute.page(params[:page])
-    @active_count = ClustersFinder.new(project, current_user, :active).execute.count
-    @inactive_count = ClustersFinder.new(project, current_user, :inactive).execute.count
-    @all_count = @active_count + @inactive_count
+    clusters = ClustersFinder.new(project, current_user, :all).execute
+    @clusters = clusters.page(params[:page]).per(20)
   end
 
   def new

app/views/projects/clusters/_tabs.html.haml

-.top-area.scrolling-tabs-container.inner-page-scroll-tabs
-  .fade-left= icon("angle-left")
-  .fade-right= icon("angle-right")
-  %ul.nav-links.scrolling-tabs
-    %li{ class: ('active' if @scope == 'active') }>
-      = link_to project_clusters_path(@project, scope: :active), class: "js-active-tab" do
-        = s_("ClusterIntegration|Active")
-        %span.badge= @active_count
-    %li{ class: ('active' if @scope == 'inactive') }>
-      = link_to project_clusters_path(@project, scope: :inactive), class: "js-inactive-tab" do
-        = s_("ClusterIntegration|Inactive")
-        %span.badge= @inactive_count
-    %li{ class: ('active' if @scope.nil? || @scope == 'all') }>
-      = link_to project_clusters_path(@project), class: "js-all-tab" do
-        = s_("ClusterIntegration|All")
-        %span.badge= @all_count
-  .nav-controls
-    - if @project.feature_available?(:multiple_clusters)
-      = link_to s_("ClusterIntegration|Add cluster"), new_project_cluster_path(@project), class: "btn btn-success btn-add-cluster has-tooltip js-add-cluster"
-    - else
-      = link_to s_("ClusterIntegration|Add cluster"), new_project_cluster_path(@project), class: "btn btn-success btn-add-cluster disabled has-tooltip js-add-cluster", title: s_("ClusterIntegration|Multiple clusters are available in GitLab Entreprise Edition Premium and Ultimate")

app/views/projects/clusters/index.html.haml

@@ -2,9 +2,13 @@
 - page_title "Clusters"
 
 .clusters-container
-  - if !@clusters.empty?
-    = render "tabs"
-    .ci-table.js-clusters-list
+  - if @clusters.empty?
+    = render "empty_state"
+  - else
+    .top-area.adjust
+      .nav-text
+        = s_("ClusterIntegration|Clusters can be used to deploy applications and to provide Review Apps for this project")
+      = render 'projects/ee/clusters/buttons', project: @project
       .gl-responsive-table-row.table-row-header{ role: "row" }
         .table-section.section-30{ role: "rowheader" }
           = s_("ClusterIntegration|Cluster")
@@ -16,9 +20,3 @@
       - @clusters.each do |cluster|
         = render "cluster", cluster: cluster.present(current_user: current_user)
     = paginate @clusters, theme: "gitlab"
-  - elsif @scope == 'all'
-    = render "empty_state"
-  - else
-    = render "tabs"
-    .prepend-top-20.text-center
-      = s_("ClusterIntegration|There are no clusters to show")

changelogs/unreleased/multiple-clusters-single-list.yml

+---
+title: Present multiple clusters in a single list instead of a tabbed view
+merge_request: 15669
+author:
+type: changed

ee/app/views/projects/ee/clusters/_buttons.html.haml

+.nav-controls
+  - if project.feature_available?(:multiple_clusters)
+    = link_to s_("ClusterIntegration|Add cluster"), new_project_cluster_path(project), class: "btn btn-success btn-add-cluster has-tooltip js-add-cluster"
+  - else
+    = link_to s_("ClusterIntegration|Add cluster"), new_project_cluster_path(project), class: "btn btn-success btn-add-cluster disabled has-tooltip js-add-cluster", title: s_("ClusterIntegration|Multiple clusters are available in GitLab Entreprise Edition Premium and Ultimate")

spec/controllers/projects/clusters_controller_spec.rb

@@ -27,13 +27,6 @@ describe Projects::ClustersController do
           expect(assigns(:clusters)).to match_array([enabled_cluster, disabled_cluster])
         end
 
-        it 'assigns counters to correct values' do
-          go
-
-          expect(assigns(:active_count)).to eq(1)
-          expect(assigns(:inactive_count)).to eq(1)
-        end
-
         context 'when page is specified' do
           let(:last_page) { project.clusters.page.total_pages }
 
@@ -48,20 +41,6 @@ describe Projects::ClustersController do
             expect(assigns(:clusters).current_page).to eq(last_page)
           end
         end
-
-        context 'when only enabled clusters are requested' do
-          it 'returns only enabled clusters' do
-            get :index, namespace_id: project.namespace, project_id: project, scope: 'active'
-            expect(assigns(:clusters)).to all(have_attributes(enabled: true))
-          end
-        end
-
-        context 'when only disabled clusters are requested' do
-          it 'returns only disabled clusters' do
-            get :index, namespace_id: project.namespace, project_id: project, scope: 'inactive'
-            expect(assigns(:clusters)).to all(have_attributes(enabled: false))
-          end
-        end
       end
 
       context 'when project does not have a cluster' do
@@ -74,13 +53,6 @@ describe Projects::ClustersController do
           expect(response).to render_template(:index, partial: :empty_state)
           expect(assigns(:clusters)).to eq([])
         end
-
-        it 'assigns counters to zero' do
-          go
-
-          expect(assigns(:active_count)).to eq(0)
-          expect(assigns(:inactive_count)).to eq(0)
-        end
       end
     end
 

spec/ee/spec/features/projects/clusters_spec.rb

+require 'spec_helper'
+
+feature 'Clusters', :js do
+  include GoogleApi::CloudPlatformHelpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    gitlab_sign_in(user)
+  end
+
+  context 'when user has a cluster and visits cluster index page' do
+    let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+    let(:project) { cluster.project }
+
+    before do
+      visit project_clusters_path(project)
+    end
+
+    context 'when license has multiple clusters feature' do
+      before do
+        allow_any_instance_of(EE::Project).to receive(:feature_available?).with(:multiple_clusters).and_return(true)
+      end
+
+      it 'user sees a add cluster button ' do
+        expect(page).to have_selector('.js-add-cluster')
+      end
+    end
+
+    context 'when license does not have multiple clusters feature' do
+      before do
+        allow_any_instance_of(EE::Project).to receive(:feature_available?).with(:multiple_clusters).and_return(false)
+      end
+
+      it 'user sees a disabled add cluster button ' do
+        expect(page).to have_selector('.js-add-cluster.disabled')
+      end
+    end
+  end
+end

spec/features/projects/clusters_spec.rb

@@ -35,37 +35,6 @@ feature 'Clusters', :js do
       expect(page).to have_selector('.gl-responsive-table-row', count: 2)
     end
 
-    context 'when license has multiple clusters feature' do
-      before do
-        allow_any_instance_of(EE::Project).to receive(:feature_available?).with(:multiple_clusters).and_return(true)
-      end
-
-      it 'user sees a add cluster button ' do
-        expect(page).to have_selector('.js-add-cluster')
-      end
-    end
-
-    context 'when license does not have multiple clusters feature' do
-      before do
-        allow_any_instance_of(EE::Project).to receive(:feature_available?).with(:multiple_clusters).and_return(false)
-      end
-
-      it 'user sees a disabled add cluster button ' do
-        expect(page).to have_selector('.js-add-cluster.disabled')
-      end
-    end
-
-    it 'user sees navigation tabs' do
-      expect(page.find('.js-active-tab').text).to include('Active')
-      expect(page.find('.js-active-tab .badge').text).to include('1')
-
-      expect(page.find('.js-inactive-tab').text).to include('Inactive')
-      expect(page.find('.js-inactive-tab .badge').text).to include('0')
-
-      expect(page.find('.js-all-tab').text).to include('All')
-      expect(page.find('.js-all-tab .badge').text).to include('1')
-    end
-
     context 'inline update of cluster' do
       it 'user can update cluster' do
         expect(page).to have_selector('.js-toggle-cluster-list')