Conditional partial rendering for EE in application settings

app/views/admin/application_settings/show.html.haml

@@ -337,53 +337,13 @@
     = render partial: 'repository_mirrors_form'
 
 -# EE-only
-- if Gitlab::Geo.license_allows?
-  %section.settings.as-geo.no-animate#js-geo-settings{ class: ('expanded' if expanded) }
-    .settings-header
-      %h4
-        = _('GitLab Geo')
-      %button.btn.js-settings-toggle{ type: 'button' }
-        = expanded ? 'Collapse' : 'Expand'
-      %p
-        = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
-    .settings-content
-      = render 'geo'
+= render_if_exists 'admin/application_settings/geo', expanded: expanded
 
-- if License.feature_available?(:external_authorization_service)
-  %section.settings.as-external-auth.no-animate#js-external-auth-settings{ class: ('expanded' if expanded) }
-    .settings-header
-      %h4
-        = _('External authentication')
-      %button.btn.js-settings-toggle{ type: 'button' }
-        = expanded ? 'Collapse' : 'Expand'
-      %p
-      = _('External Classification Policy Authorization')
-    .settings-content
-      = render 'external_authorization_service_form'
+= render_if_exists 'admin/application_settings/external_authorization_service_form', expanded: expanded
 
-- if License.feature_available?(:elastic_search)
-  %section.settings.as-elasticsearch.no-animate#js-elasticsearch-settings{ class: ('expanded' if expanded) }
-    .settings-header
-      %h4
-        = _('Elasticsearch')
-      %button.btn.js-settings-toggle{ type: 'button' }
-        = expanded ? 'Collapse' : 'Expand'
-      %p
-        = _('Elasticsearch intergration. Elasticsearch AWS IAM.')
-    .settings-content
-      = render partial: 'elasticsearch_form'
+= render_if_exists 'admin/application_settings/elasticsearch_form', expanded: expanded
 
-- if Gitlab.com? || Rails.env.development?
-  %section.settings.as-slack.no-animate#js-slack-settings{ class: ('expanded' if expanded) }
-    .settings-header
-      %h4
-        = _('Slack application')
-      %button.btn.js-settings-toggle{ type: 'button' }
-        = expanded ? 'Collapse' : 'Expand'
-      %p
-        = _('Slack integration allows you to interact with GitLab via shash commands in a chat window.')
-    .settings-content
-      = render partial: 'slack'
+= render_if_exists 'admin/application_settings/slack', expanded: expanded
 
 = render_if_exists 'admin/application_settings/templates', expanded: expanded
 

ee/app/views/admin/application_settings/_elasticsearch_form.html.haml

-= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f|
+- return unless License.feature_available?(:elastic_search)
+
+%section.settings.as-elasticsearch.no-animate#js-elasticsearch-settings{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      = _('Elasticsearch')
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      = _('Elasticsearch intergration. Elasticsearch AWS IAM.')
+  .settings-content
+
+    = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@application_setting)
 
       %fieldset

ee/app/views/admin/application_settings/_external_authorization_service_form.html.haml

-= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-external-auth-settings'), html: { class: 'fieldset-form' } do |f|
+- return unless License.feature_available?(:external_authorization_service)
+
+%section.settings.as-external-auth.no-animate#js-external-auth-settings{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      = _('External authentication')
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+    = _('External Classification Policy Authorization')
+  .settings-content
+
+    = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-external-auth-settings'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@application_setting)
 
       %fieldset

ee/app/views/admin/application_settings/_geo.html.haml

-= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-geo-settings'), html: { class: 'fieldset-form' } do |f|
+- return unless Gitlab::Geo.license_allows?
+
+%section.settings.as-geo.no-animate#js-geo-settings{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      = _('GitLab Geo')
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
+  .settings-content
+
+    = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-geo-settings'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@application_setting)
 
       %fieldset

ee/app/views/admin/application_settings/_slack.html.haml

-= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-slack-settings'), html: { class: 'fieldset-form' } do |f|
+- return unless Gitlab.com? || Rails.env.development?
+
+%section.settings.as-slack.no-animate#js-slack-settings{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      = _('Slack application')
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      = _('Slack integration allows you to interact with GitLab via shash commands in a chat window.')
+  .settings-content
+
+    = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-slack-settings'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@application_setting)
 
       %fieldset
@@ -20,3 +32,4 @@
           = f.text_field :slack_app_verification_token, class: 'form-control'
 
       = f.submit 'Save changes', class: "btn btn-success"
+