1 files changed, 10 insertions, 38 deletions
diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml
index 0b5da84e4e3..966587a9210 100644
--- a/app/views/projects/_new_project_fields.html.haml
+++ b/app/views/projects/_new_project_fields.html.haml
@@ -46,6 +46,8 @@
     = s_('ProjectsNew|Project description %{tag_start}(optional)%{tag_end}').html_safe % { tag_start: '<span>'.html_safe, tag_end: '</span>'.html_safe }
   = f.text_area :description, placeholder: s_('ProjectsNew|Description format'), class: "form-control gl-form-input", rows: 3, maxlength: 250, data: { track_label: "#{track_label}", track_action: "activate_form_input", track_property: "project_description", track_value: "" }
 
+.js-deployment-target-select
+
 = f.label :visibility_level, class: 'label-bold' do
   = s_('ProjectsNew|Visibility Level')
   = link_to sprite_icon('question-o'), help_page_path('public_access/public_access'), aria: { label: 'Documentation for Visibility Level' }, target: '_blank', rel: 'noopener noreferrer'
@@ -63,44 +65,14 @@
         = s_('ProjectsNew|Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.')
 
   - experiment(:new_project_sast_enabled, user: current_user) do |e|
-    - e.try(:candidate) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', true, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
-    - e.try(:unchecked_candidate) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', false, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
-    - e.try(:free_indicator) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', true, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-            = gl_badge_tag _('Free'), variant: :info, size: :sm
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
-    - e.try(:unchecked_free_indicator) do
-      .form-group
-        .form-check.gl-mb-3
-          = check_box_tag 'project[initialize_with_sast]', '1', false, class: 'form-check-input', data: { qa_selector: 'initialize_with_sast_checkbox', track_experiment: e.name, track_label: track_label, track_action: 'activate_form_input', track_property: 'init_with_sast' }
-          = label_tag 'project[initialize_with_sast]', class: 'form-check-label' do
-            = s_('ProjectsNew|Enable Static Application Security Testing (SAST)')
-            = gl_badge_tag _('Free'), variant: :info, size: :sm
-          .form-text.text-muted
-            = s_('ProjectsNew|Analyze your source code for known security vulnerabilities.')
-            = link_to _('Learn more.'), help_page_path('user/application_security/sast/index'), target: '_blank', rel: 'noopener noreferrer', data: { track_action: 'followed', track_experiment: e.name }
+    - e.variant(:candidate) do
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: true, with_free_badge: false
+    - e.variant(:unchecked_candidate) do
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: false, with_free_badge: false
+    - e.variant(:free_indicator) do
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: true, with_free_badge: true
+    - e.variant(:unchecked_free_indicator) do
+      = render 'new_project_initialize_with_sast', experiment_name: e.name, track_label: track_label, checked: false, with_free_badge: true
 
 = f.submit _('Create project'), class: "btn gl-button btn-confirm", data: { track_label: "#{track_label}", track_action: "click_button", track_property: "create_project", track_value: "" }
 = link_to _('Cancel'), dashboard_projects_path, class: 'btn gl-button btn-default btn-cancel', data: { track_label: "#{track_label}", track_action: "click_button", track_property: "cancel", track_value: "" }