Reorder email action fields after feature-flagging state level actions

Author: esoterik

app/views/admin/action_pages/_email_fields.html.erb

@@ -1,4 +1,15 @@
 <%= f.fields_for(:email_campaign) do |sf| %>
+  <% if Rails.application.config.state_actions_enabled %>
+    <%= render partial: "state_level_fields", locals: { sf: sf } %>
+  <% else %>
+    <div class="form-item">
+      <%= sf.label :email_addresses do %>
+        Target email(s)
+        <span class="hint">(Separate multiple addresses with commas, e.g. "[email protected],[email protected]")</span>
+      <% end %>
+      <%= sf.text_field :email_addresses %>
+    </div>
+  <% end %>
 
   <div class="form-item">
     <%= sf.label :subject %>
@@ -9,38 +20,4 @@
     <%= sf.label :message %>
     <%= sf.text_area :message %>
   </div>
-
-  <% if Rails.application.config.state_actions_enabled %>
-    <fieldset class="form-item">
-      <legend>Select State-Level Legislators</legend>
-
-      <%= sf.label :state, class: "fancy" do %>
-        <%= sf.select :state, options_for_select(EmailCampaign::STATES, @actionPage.email_campaign.state), include_blank: "- none -" %><span class="ui"></span>
-      <% end %>
-
-      <div id="state-level-target-selection">
-        <p>For now, please choose only one.</p>
-        <%= sf.label :target_state_lower_chamber do %>
-          <%= sf.check_box :target_state_lower_chamber, class: "fancy" %><span class="ui"></span>
-          Lower Chamber
-        <% end %>
-
-        <%= sf.label :target_state_upper_chamber do %>
-          <%= sf.check_box :target_state_upper_chamber, class: "fancy" %><span class="ui"></span>
-          Upper Chamber
-        <% end %>
-
-        <%= sf.label :target_governor do %>
-          <%= sf.check_box :target_governor, class: "fancy" %><span class="ui"></span>
-          Governor
-        <% end %>
-      </div>
-    <% end %>
-
-    <br></br>
-
-    <%= sf.label :email_addresses, "Or enter custom email addresses below:" %>
-    <%= sf.text_field :email_addresses %>
-  </fieldset>
-
 <% end %>

app/views/admin/action_pages/_state_level_fields.html.erb

@@ -0,0 +1,30 @@
+<fieldset class="form-item">
+  <legend>Select State-Level Legislators</legend>
+
+  <%= sf.label :state, class: "fancy" do %>
+    <%= sf.select :state, options_for_select(EmailCampaign::STATES, @actionPage.email_campaign.state), include_blank: "- none -" %><span class="ui"></span>
+  <% end %>
+
+  <div id="state-level-target-selection">
+    <p>For now, please choose only one.</p>
+    <%= sf.label :target_state_lower_chamber do %>
+      <%= sf.check_box :target_state_lower_chamber, class: "fancy" %><span class="ui"></span>
+      Lower Chamber
+    <% end %>
+
+    <%= sf.label :target_state_upper_chamber do %>
+      <%= sf.check_box :target_state_upper_chamber, class: "fancy" %><span class="ui"></span>
+      Upper Chamber
+    <% end %>
+
+    <%= sf.label :target_governor do %>
+      <%= sf.check_box :target_governor, class: "fancy" %><span class="ui"></span>
+      Governor
+    <% end %>
+  </div>
+
+<br></br>
+
+<%= sf.label :email_addresses, "Or enter custom email addresses below:" %>
+<%= sf.text_field :email_addresses %>
+</fieldset>

spec/system/admin/action_creation_spec.rb

@@ -51,7 +51,7 @@
     select_action_type("email")
     fill_in "Subject", with: "Subject"
     fill_in "Message", with: "An email"
-    fill_in "Or enter custom email addresses below:", with: "[email protected]"
+    fill_in "Target email(s)", with: "[email protected]"
     next_section
 
     skip_banner_selection