Merge branch 'je-add-group-deployments-page-fe' into 'master'

Add ability to see project deployments at cluster level (FE)

See merge request gitlab-org/gitlab-ce!31575

app/assets/javascripts/clusters/clusters_bundle.js

@@ -14,6 +14,8 @@ import ClustersStore from './stores/clusters_store';
 import Applications from './components/applications.vue';
 import setupToggleButtons from '../toggle_buttons';
 
+const Environments = () => import('ee_component/clusters/components/environments.vue');
+
 Vue.use(GlToast);
 
 /**
@@ -44,6 +46,9 @@ export default class Clusters {
       helpPath,
       ingressHelpPath,
       ingressDnsHelpPath,
+      environmentsHelpPath,
+      clustersHelpPath,
+      deployBoardsHelpPath,
       clusterId,
     } = document.querySelector('.js-edit-cluster-form').dataset;
 
@@ -52,7 +57,14 @@ export default class Clusters {
     this.clusterBannerDismissedKey = `cluster_${this.clusterId}_banner_dismissed`;
 
     this.store = new ClustersStore();
-    this.store.setHelpPaths(helpPath, ingressHelpPath, ingressDnsHelpPath);
+    this.store.setHelpPaths(
+      helpPath,
+      ingressHelpPath,
+      ingressDnsHelpPath,
+      environmentsHelpPath,
+      clustersHelpPath,
+      deployBoardsHelpPath,
+    );
     this.store.setManagePrometheusPath(managePrometheusPath);
     this.store.updateStatus(clusterStatus);
     this.store.updateStatusReason(clusterStatusReason);
@@ -95,11 +107,12 @@ export default class Clusters {
       setupToggleButtons(toggleButtonsContainer);
     }
     this.initApplications(clusterType);
+    this.initEnvironments();
 
     this.updateContainer(null, this.store.state.status, this.store.state.statusReason);
 
     this.addListeners();
-    if (statusPath) {
+    if (statusPath && !this.environments) {
       this.initPolling();
     }
   }
@@ -131,6 +144,34 @@ export default class Clusters {
     });
   }
 
+  initEnvironments() {
+    const { store } = this;
+    const el = document.querySelector('#js-cluster-environments');
+
+    if (!el) {
+      return;
+    }
+
+    this.environments = new Vue({
+      el,
+      data() {
+        return {
+          state: store.state,
+        };
+      },
+      render(createElement) {
+        return createElement(Environments, {
+          props: {
+            environments: this.state.environments,
+            environmentsHelpPath: this.state.environmentsHelpPath,
+            clustersHelpPath: this.state.clustersHelpPath,
+            deployBoardsHelpPath: this.state.deployBoardsHelpPath,
+          },
+        });
+      },
+    });
+  }
+
   static initDismissableCallout() {
     const callout = document.querySelector('.js-cluster-security-warning');
     PersistentUserCallout.factory(callout);
@@ -390,6 +431,10 @@ export default class Clusters {
       this.poll.stop();
     }
 
+    if (this.environments) {
+      this.environments.$destroy();
+    }
+
     this.applications.$destroy();
   }
 }

app/assets/javascripts/clusters/stores/clusters_store.js

@@ -32,6 +32,9 @@ export default class ClusterStore {
     this.state = {
       helpPath: null,
       ingressHelpPath: null,
+      environmentsHelpPath: null,
+      clustersHelpPath: null,
+      deployBoardsHelpPath: null,
       status: null,
       rbac: false,
       statusReason: null,
@@ -80,13 +83,24 @@ export default class ClusterStore {
           updateFailed: false,
         },
       },
+      environments: [],
     };
   }
 
-  setHelpPaths(helpPath, ingressHelpPath, ingressDnsHelpPath) {
+  setHelpPaths(
+    helpPath,
+    ingressHelpPath,
+    ingressDnsHelpPath,
+    environmentsHelpPath,
+    clustersHelpPath,
+    deployBoardsHelpPath,
+  ) {
     this.state.helpPath = helpPath;
     this.state.ingressHelpPath = ingressHelpPath;
     this.state.ingressDnsHelpPath = ingressDnsHelpPath;
+    this.state.environmentsHelpPath = environmentsHelpPath;
+    this.state.clustersHelpPath = clustersHelpPath;
+    this.state.deployBoardsHelpPath = deployBoardsHelpPath;
   }
 
   setManagePrometheusPath(managePrometheusPath) {
@@ -191,4 +205,17 @@ export default class ClusterStore {
       }
     });
   }
+
+  updateEnvironments(environments = []) {
+    this.state.environments = environments.map(environment => ({
+      name: environment.name,
+      project: environment.project,
+      environmentPath: environment.environment_path,
+      lastDeployment: environment.last_deployment,
+      rolloutStatus: {
+        instances: environment.rollout_status ? environment.rollout_status.instances : [],
+      },
+      updatedAt: environment.updatedAt,
+    }));
+  }
 }

app/assets/stylesheets/pages/clusters.scss

@@ -154,3 +154,12 @@
     }
   }
 }
+
+.cluster-deployments-warning {
+  color: $orange-600;
+}
+
+.badge.pods-badge {
+  color: $black;
+  font-weight: $gl-font-weight-bold;
+}

app/views/clusters/clusters/_configure.html.haml

+%section#cluster-integration
+  - unless @cluster.status_name.in? %i/scheduled creating/
+    = render 'form'
+
+- unless @cluster.status_name.in? %i/scheduled creating/
+  = render_if_exists 'projects/clusters/prometheus_graphs'
+
+  .cluster-applications-table#js-cluster-applications
+
+  %section.settings#js-cluster-details{ class: ('expanded' if expanded) }
+    .settings-header
+      %h4= s_('ClusterIntegration|Kubernetes cluster details')
+      %button.btn.js-settings-toggle{ type: 'button' }
+        = expanded ? _('Collapse') : _('Expand')
+      %p= s_('ClusterIntegration|See and edit the details for your Kubernetes cluster')
+    .settings-content
+      = render 'clusters/platforms/kubernetes/form', cluster: @cluster, platform: @cluster.platform_kubernetes, update_cluster_url_path: clusterable.cluster_path(@cluster)
+
+  %section.settings.no-animate#js-cluster-advanced-settings{ class: ('expanded' if expanded) }
+    .settings-header
+      %h4= _('Advanced settings')
+      %button.btn.js-settings-toggle{ type: 'button' }
+        = expanded ? _('Collapse') : _('Expand')
+      %p= s_("ClusterIntegration|Advanced options on this Kubernetes cluster's integration")
+    .settings-content#advanced-settings-section
+      = render 'advanced_settings'

app/views/clusters/clusters/show.html.haml

@@ -24,38 +24,19 @@
   help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications'),
   ingress_help_path: help_page_path('user/project/clusters/index.md', anchor: 'getting-the-external-endpoint'),
   ingress_dns_help_path: help_page_path('user/project/clusters/index.md', anchor: 'manually-determining-the-external-endpoint'),
+  environments_help_path: help_page_path('ci/environments', anchor: 'defining-environments'),
+  clusters_help_path: help_page_path('user/project/clusters/index.md', anchor: 'deploying-to-a-kubernetes-cluster'),
+  deploy_boards_help_path: help_page_path('user/project/deploy_boards.html', anchor: 'enabling-deploy-boards'),
   manage_prometheus_path: manage_prometheus_path,
   cluster_id: @cluster.id } }
 
   .js-cluster-application-notice
     .flash-container
 
-  %section#cluster-integration
   %h4= @cluster.name
   = render 'banner'
 
-    - unless @cluster.status_name.in? %i/scheduled creating/
-      = render 'form'
+  = render_if_exists 'clusters/clusters/group_cluster_environments', expanded: expanded
 
-  - unless @cluster.status_name.in? %i/scheduled creating/
-    = render_if_exists 'projects/clusters/prometheus_graphs'
-
-    .cluster-applications-table#js-cluster-applications
-
-    %section.settings#js-cluster-details{ class: ('expanded' if expanded) }
-      .settings-header
-        %h4= s_('ClusterIntegration|Kubernetes cluster details')
-        %button.btn.js-settings-toggle{ type: 'button' }
-          = expanded ? _('Collapse') : _('Expand')
-        %p= s_('ClusterIntegration|See and edit the details for your Kubernetes cluster')
-      .settings-content
-        = render 'clusters/platforms/kubernetes/form', cluster: @cluster, platform: @cluster.platform_kubernetes, update_cluster_url_path: clusterable.cluster_path(@cluster)
-
-    %section.settings.no-animate#js-cluster-advanced-settings{ class: ('expanded' if expanded) }
-      .settings-header
-        %h4= _('Advanced settings')
-        %button.btn.js-settings-toggle{ type: 'button' }
-          = expanded ? _('Collapse') : _('Expand')
-        %p= s_("ClusterIntegration|Advanced options on this Kubernetes cluster's integration")
-      .settings-content#advanced-settings-section
-        = render 'advanced_settings'
+  - unless Gitlab.ee?
+    = render 'configure', expanded: expanded

changelogs/unreleased/je-add-group-deployments-page-fe.yml

+---
+title: Add ability to see project deployments at cluster level (FE)
+merge_request: 31575
+author:
+type: added

spec/frontend/clusters/stores/clusters_store_spec.js

@@ -51,6 +51,9 @@ describe('Clusters Store', () => {
       expect(store.state).toEqual({
         helpPath: null,
         ingressHelpPath: null,
+        environmentsHelpPath: null,
+        clustersHelpPath: null,
+        deployBoardsHelpPath: null,
         status: mockResponseData.status,
         statusReason: mockResponseData.status_reason,
         rbac: false,
@@ -148,6 +151,7 @@ describe('Clusters Store', () => {
             uninstallFailed: false,
           },
         },
+        environments: [],
       });
     });