47794 Change environment scope text depending on number of project clusters. Update form to only include form-groups47794-environment-scope-cluster-page

2 files changed, 27 insertions, 14 deletions

diff --git a/app/views/projects/clusters/_integration_form.html.haml b/app/views/projects/clusters/_integration_form.html.haml
index db97203a2aa..b46b45fea49 100644
--- a/app/views/projects/clusters/_integration_form.html.haml
+++ b/app/views/projects/clusters/_integration_form.html.haml
@@ -1,6 +1,6 @@
 = form_for @cluster, url: namespace_project_cluster_path(@project.namespace, @project, @cluster), as: :cluster do |field|
   = form_errors(@cluster)
-  .form-group.append-bottom-20
+  .form-group
     %h5= s_('ClusterIntegration|Integration status')
     %p
       - if @cluster.enabled?
@@ -10,7 +10,7 @@
           = s_('ClusterIntegration|Kubernetes cluster integration is enabled for this project.')
       - else
         = s_('ClusterIntegration|Kubernetes cluster integration is disabled for this project.')
-    %label.append-bottom-10.js-cluster-enable-toggle-area
+    %label.append-bottom-0.js-cluster-enable-toggle-area
       %button{ type: 'button',
         class: "js-project-feature-toggle project-feature-toggle #{'is-checked' if @cluster.enabled?} #{'is-disabled' unless can?(current_user, :update_cluster, @cluster)}",
         "aria-label": s_("ClusterIntegration|Toggle Kubernetes cluster"),
@@ -20,19 +20,26 @@
           = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
           = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
 
-  .form-group
-    %h5= s_('ClusterIntegration|Security')
-    %p
-      = s_("ClusterIntegration|The default cluster configuration grants access to a wide set of functionalities needed to successfully build and deploy a containerised application.")
-      = link_to s_("ClusterIntegration|Learn more about security configuration"),  help_page_path('user/project/clusters/index.md', anchor: 'security-implications')
-
-  .form-group
-    %h5= s_('ClusterIntegration|Environment scope')
-    %p
-      = s_("ClusterIntegration|Choose which of your project's environments will use this Kubernetes cluster.")
-      = link_to s_("ClusterIntegration|Learn more about environments"), help_page_path('ci/environments')
-    = field.text_field :environment_scope, class: 'form-control js-select-on-focus', readonly: !has_multiple_clusters?(@project), placeholder: s_('ClusterIntegration|Environment scope')
+  - if has_multiple_clusters?(@project)
+    .form-group
+      %h5= s_('ClusterIntegration|Environment scope')
+      %p
+        = s_("ClusterIntegration|Choose which of your project's environments will use this Kubernetes cluster.")
+        = link_to s_("ClusterIntegration|Learn more about environments"), help_page_path('ci/environments')
+      = field.text_field :environment_scope, class: 'form-control js-select-on-focus', placeholder: s_('ClusterIntegration|Environment scope')
 
   - if can?(current_user, :update_cluster, @cluster)
     .form-group
       = field.submit _('Save changes'), class: 'btn btn-success'
+
+  - unless has_multiple_clusters?(@project)
+    %h5= s_('ClusterIntegration|Environment scope')
+    %p
+      %code *
+      is the default environment scope for this cluster. This means that all jobs, regardless of their environment, will use this cluster.
+      = link_to 'More information', ('https://docs.gitlab.com/ee/user/project/clusters/#setting-the-environment-scope')
+
+  %h5= s_('ClusterIntegration|Security')
+  %p
+    = s_("ClusterIntegration|The default cluster configuration grants access to a wide set of functionalities needed to successfully build and deploy a containerised application.")
+    = link_to s_("ClusterIntegration|Learn more about security configuration"),  help_page_path('user/project/clusters/index.md', anchor: 'security-implications')
diff --git a/changelogs/unreleased/47794-environment-scope-cluster-page.yml b/changelogs/unreleased/47794-environment-scope-cluster-page.yml
new file mode 100644
index 00000000000..75eb7ec209c
--- /dev/null
+++ b/changelogs/unreleased/47794-environment-scope-cluster-page.yml
@@ -0,0 +1,6 @@
+---
+title: Change environment scope text depending on number of project clusters. Update
+  form to only include form-groups
+merge_request:
+author:
+type: changed