Updates sidebar

app/assets/javascripts/clusters.js

@@ -1,11 +0,0 @@
-document.addEventListener('DOMContentLoaded', () => {
-
-  const toggleButton = document.querySelector('.js-toggle-cluster');
-  // disable in case of no permissions
-  toggleButton.addEventListener(() => {
-
-    // update text
-  });
-
-  // poll the status
-});

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

@@ -12,10 +12,12 @@
 
         .form-group
           = field.label :gcp_project_id
+          = link_to(s_('ClusterIntegration|See your projects'), 'https://console.cloud.google.com/home/dashboard', target: '_blank', rel: 'noopener noreferrer')
           = field.text_field :gcp_project_id, class: 'form-control'
 
         .form-group
           = field.label :cluster_zone
+          = link_to(s_('ClusterIntegration|See zones'), 'https://cloud.google.com/compute/docs/regions-zones/regions-zones', target: '_blank', rel: 'noopener noreferrer')
           = field.text_field :cluster_zone, class: 'form-control'
 
         .form-group
@@ -28,6 +30,7 @@
 
         .form-group
           = field.label :machine_type
+          = link_to(s_('ClusterIntegration|Machine type'), 'https://cloud.google.com/compute/docs/machine-types', target: '_blank', rel: 'noopener noreferrer')
           = field.text_field :machine_type, class: 'form-control'
 
         .form-group

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

@@ -5,11 +5,11 @@
     = s_('ClusterIntegration|To create a new cluster on Google Container Engine, please sign in with your Google account:')
   %ul
     %li
-      - link_to_container_engine = link_to(s_('ClusterIntegration|access to Google Container Engine'))
+      - link_to_container_engine = link_to(s_('ClusterIntegration|access to Google Container Engine'), 'https://console.cloud.google.com', target: '_blank', rel: 'noopener noreferrer')
       = s_('ClusterIntegration|Your account must have %{link_to_container_engine}').html_safe % { link_to_container_engine: link_to_container_engine }
       %li
-        - link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'))
+        - link_to_requirements = link_to(s_('ClusterIntegration|meets the requirements'), 'https://cloud.google.com/container-engine/docs/quickstart', target: '_blank', rel: 'noopener noreferrer')
         = s_('ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters').html_safe % { link_to_requirements: link_to_requirements }
       %li
-        - link_to_container_project = link_to(s_('ClusterIntegration|Google Container Engine project'))
+        - link_to_container_project = link_to(s_('ClusterIntegration|Google Container Engine project'), target: '_blank', rel: 'noopener noreferrer')
         = s_('ClusterIntegration|A %{link_to_container_project} must have been created under this account').html_safe % { link_to_container_project: link_to_container_project }

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

@@ -2,7 +2,7 @@
   %h4.prepend-top-0
     = s_('ClusterIntegration|Cluster integration')
   %p
-    = s_('ClusterIntegration|With cluster integration you can take advantage of Kubernetes auto deployment.')
+    = s_('ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way.')
   %p
-    - link = link_to(s_('ClusterIntegration|auto deployment'), help_page_path('TODO'), target: '_blank', rel: 'noopener noreferrer')
-    = s_('ClusterIntegration|Learn more about %{link_to_documentation} in GitLab.').html_safe % { link_to_documentation: link }
+    - link = link_to(s_('ClusterIntegration|cluster'), help_page_path('TODO'), target: '_blank', rel: 'noopener noreferrer')
+    = s_('ClusterIntegration|Learn more about %{link_to_documentation}').html_safe % { link_to_documentation: link }

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

@@ -1,4 +1,4 @@
-.row.prepend-top-default.edit-cluster-form
+.row.prepend-top-default.edit-cluster-form.js-edit-cluster-form{ data: { check_status: status_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster.id), edit_path: namespace_project_cluster_path(@project.namespace, @project, @cluster.id)}}
   = render 'sidebar'
   .col-lg-8
     %h4.prepend-top-0
@@ -15,9 +15,11 @@
       -# else
       = s_('ClusterIntegration|Cluster integration is disabled for this project.')
 
-      %label.toggle-wrapper
+    %label.toggle-wrapper
       %button{ type: 'button', class: 'js-toggle-cluster project-feature-toggle', aria: { label: 'Toggle' }, data: { 'enabled-text': 'Enable', 'disabled-text': 'disabled' } }
 
+    .form-group
+
 
     -# render errors TODO
       #= form_errors(@cluster)
@@ -27,7 +29,7 @@
       %label
         = s_('ClusterIntegration|Google container engine')
       %p
-        - link_gke = link_to(s_('ClusterIntegration|Manage your cluster on GKE'), path: '', target: '_blank', rel: 'noopener noreferrer')
+        - link_gke = link_to(s_('ClusterIntegration|Manage your cluster on GKE'), '', target: '_blank', rel: 'noopener noreferrer')
         = s_('ClusterIntegration|This cluster was not set up on Google Container Engine. %{link_gke}').html_safe % { link_gke: link_gke }
 
     .form_group
@@ -49,7 +51,7 @@
 
 
 %br
-= link_to "Enable", namespace_project_cluster_path(@project.namespace, @project, @cluster.id, cluster: {enabled: 'true'}), method: :put
+= link_to "Enable", namespace_project_cluster_path(@project.namespace, @project, @cluster.id), method: :put
 %br
 = link_to "Disable", namespace_project_cluster_path(@project.namespace, @project, @cluster.id, cluster: {enabled: 'false'}), method: :put
 

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

@@ -6,5 +6,6 @@
     - if @authorize_url
       %a{ href: @authorize_url }
         = image_tag('auth_buttons/signin_with_google.png')
-    -# - else
-    -#   You have not configrued GitLab properly. So we can not proceed authentication. Please check if you have set up omniauth->providers->google_oauth2 in gitlab.yml
+    - else
+      - link = link_to(s_('ClusterIntegration|properly configured'), help_page_path("integration/google"), target: '_blank', rel: 'noopener noreferrer')
+      = s_('Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service.').html_safe % { link_to_documentation: link }