feat: O15a -> O16 Add recipients

- When user click I'll do this later, we route to Add recipients page
- Three options are available
- 1) Upload list of email addresses (goes to csv upload page)
- 2) Enter a single email address (goes to Send "x" page)
- 3) Use my email address (does to Personalise page)

Author: joybytes

app/main/forms.py

@@ -8,7 +8,7 @@
 from numbers import Number
 
 import pytz
-from flask import request
+from flask import request, session
 from flask_login import current_user
 from flask_wtf import FlaskForm as Form
 from flask_wtf.file import FileAllowed, FileSize
@@ -2359,20 +2359,32 @@ def get_placeholder_form_instance(
     allow_international_phone_numbers=False,
     allow_sms_to_uk_landline=False,
 ):
-    if InsensitiveDict.make_key(placeholder_name) == "emailaddress" and template_type == "email":
+    placeholder_key = InsensitiveDict.make_key(placeholder_name)
+
+    if placeholder_key == "emailaddress" and template_type == "email":
+        default_value = dict_to_populate_from.get(placeholder_name)
+        if not default_value:
+            if (
+                session.get("source_call") == "add_recipients"
+                and session.get("add_recipients_choice") == "use_my_email"
+            ):
+                default_value = current_user.email_address
         field = make_email_address_field(label=placeholder_name, gov_user=False, thing="an email address")
-    elif InsensitiveDict.make_key(placeholder_name) == "phonenumber" and template_type == "sms":
+
+    elif placeholder_key == "phonenumber" and template_type == "sms":
+        default_value = dict_to_populate_from.get(placeholder_name, "")
         field = valid_phone_number(
             label=placeholder_name,
             international=allow_international_phone_numbers,
             sms_to_uk_landline=allow_sms_to_uk_landline,
         )
+
     else:
+        default_value = dict_to_populate_from.get(placeholder_name, "")
         field = GovukTextInputField(placeholder_name, validators=[DataRequired(message="Cannot be empty")])
 
     PlaceholderForm.placeholder_value = field
-
-    return PlaceholderForm(placeholder_value=dict_to_populate_from.get(placeholder_name, ""))
+    return PlaceholderForm(placeholder_value=default_value)
 
 
 class AddRecipientForm(StripWhitespaceForm):

app/main/views/send.py

@@ -31,6 +31,7 @@
 )
 from app.main import main, no_cookie
 from app.main.forms import (
+    AddRecipientForm,
     ChooseTimeForm,
     CsvUploadForm,
     LetterAddressForm,
@@ -101,6 +102,9 @@ def send_messages(service_id, template_id):
         ),
     )
 
+    if session["source_call"] == "add_recipients":
+        backlink = url_for(".add_recipients", service_id=service_id, template_id=template_id, back="email_reply_to")
+
     if template.template_type == "email":
         template.reply_to = get_email_reply_to_address_from_session()
     elif template.template_type == "sms":
@@ -162,6 +166,7 @@ def send_messages(service_id, template_id):
         form=form,
         allowed_file_extensions=Spreadsheet.ALLOWED_FILE_EXTENSIONS,
         error_summary_enabled=True,
+        alternative_backlink=backlink,
     )
 
 
@@ -408,6 +413,44 @@ def send_one_off_letter_address(service_id, template_id):
     )
 
 
+@main.route("/services/<uuid:service_id>/send/<uuid:template_id>/add-recipients", methods=["GET", "POST"])
+@user_has_permissions("send_messages")
+def add_recipients(service_id, template_id):
+    session["source_call"] = ""
+
+    form = AddRecipientForm()
+    back = request.args.get("back")
+
+    backlink = None
+
+    if back == "email_reply_to" and template_id:
+        backlink = url_for(
+            "main.service_email_reply_to", service_id=service_id, template_id=template_id, back="from_name"
+        )
+
+    if form.validate_on_submit():
+        choice = form.add_recipient_method.data
+        session["source_call"] = "add_recipients"
+        session["add_recipients_choice"] = choice
+
+        if choice == "upload_csv":
+            return redirect(url_for("main.send_messages", service_id=service_id, template_id=template_id))
+        elif choice == "enter_single":
+            return redirect(
+                url_for("main.send_one_off_step", service_id=service_id, template_id=template_id, step_index=0)
+            )
+        elif choice == "use_my_email":
+            return redirect(url_for("main.send_one_off_to_myself", service_id=service_id, template_id=template_id))
+
+    return render_template(
+        "views/add-recipients.html",
+        form=form,
+        template_id=template_id,
+        service_id=service_id,
+        alternative_backlink=backlink,
+    )
+
+
 @main.route(
     "/services/<uuid:service_id>/send/<uuid:template_id>/one-off/step-<int:step_index>",
     methods=["GET", "POST"],
@@ -536,6 +579,7 @@ def send_one_off_step(service_id, template_id, step_index):  # noqa: C901
         back_link=back_link,
         link_to_upload=(request.endpoint == "main.send_one_off_step" and step_index == 0),
         error_summary_enabled=True,
+        hide_upload_links=session.get("source_call") == "add_recipients",
     )
 
 
@@ -873,6 +917,9 @@ def _get_set_sender_back_link(service_id, template):
 
 def get_back_link(service_id, template, step_index, placeholders=None):
     if step_index == 0:
+        if session.get("source_call") == "add_recipients":
+            return url_for(".add_recipients", service_id=service_id, template_id=template.id, back="email_reply_to")
+
         if _should_show_set_sender_page(service_id, template):
             return url_for("main.set_sender", service_id=service_id, template_id=template.id, from_back_link="yes")
         else:
@@ -978,7 +1025,10 @@ def _check_notification(service_id, template_id, exception=None):
 
     placeholders = fields_to_fill_in(template)
 
-    back_link = get_back_link(service_id, template, len(placeholders), placeholders)
+    if request.args.get("back") == "add_recipients":
+        back_link = url_for(".add_recipients", service_id=service_id, template_id=template.id, back="email_reply_to")
+    else:
+        back_link = get_back_link(service_id, template, len(placeholders), placeholders)
 
     if (not session.get("recipient") and template.template_type != "letter") or not all_placeholders_in_session(
         template.placeholders

app/templates/views/add-recipients.html

@@ -0,0 +1,59 @@
+{% extends "withnav_template.html" %}
+{% from "components/page-header.html" import page_header %}
+{% from "components/form.html" import form_wrapper %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "govuk_frontend_jinja/components/back-link/macro.html" import govukBackLink %}
+
+{% set heading = 'Add recipients' %}
+
+{% block service_page_title %}
+    {{ heading }}
+{% endblock %}
+
+{% block backLink %}
+    {{ govukBackLink({ "href": alternative_backlink or url_for('main.view_template', service_id=service_id, template_id=template_id) }) }}
+{% endblock %}
+
+{% block maincolumn_content %}
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-five-sixths">
+            {{ page_header(heading) }}
+
+            <p class="govuk-body">Choose how you want to add recipients:</p>
+
+            {% call form_wrapper() %}
+                {{ form.add_recipient_method(param_extensions={
+          "fieldset": {
+            "legend": {
+              "classes": "",
+            }
+          },
+          "items": [
+            {"value": "upload_csv"},
+            {"value": "enter_single"},
+            {"value": "use_my_email"}
+          ]
+        }) }}
+
+                {% if current_service.trial_mode %}
+                    <div class="govuk-inset-text">
+                        <p>Your service is in test mode. You can only:</p>
+
+                        <ul class="govuk-list govuk-list--bullet">
+                            <li>send 50 emails per day</li>
+                            <li>send test emails to yourself and your team members</li>
+                        </ul>
+                        <p>
+                            To lift these restrictions,
+                            <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.request_to_go_live', service_id=service_id) }}">
+                                make your service live
+                            </a>
+                        </p>
+                    </div>
+                {% endif %}
+
+                {{ page_footer('Continue') }}
+            {% endcall %}
+        </div>
+    </div>
+{% endblock %}

app/templates/views/request-to-go-live.html

@@ -3,11 +3,19 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "govuk_frontend_jinja/components/task-list/macro.html" import govukTaskList %}
+{% from "govuk_frontend_jinja/components/back-link/macro.html" import govukBackLink %}
+
 
 {% block service_page_title %}
   Make your service live
 {% endblock %}
 
+{% block backLink %}
+    {% if alternative_backlink %}
+        {{ govukBackLink({ "href": alternative_backlink }) }}
+    {% endif %}
+{% endblock %}
+
 {% block maincolumn_content %}
   {# as options objects are different for completed vs not completed #}
   {# we set them here to reuse them later #}

app/templates/views/send-test.html

@@ -25,7 +25,7 @@
       <div class="govuk-grid-column-full {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
         {{ form.placeholder_value(param_extensions={"classes": "govuk-!-width-full"}) }}
       </div>
-      {% if skip_link or link_to_upload %}
+        {% if not hide_upload_links and (skip_link or link_to_upload) %}
         <div class="govuk-grid-column-full">
           {% if link_to_upload %}
             <a class="govuk-link govuk-link--no-visited-state govuk-!-margin-right-3" href="{{ url_for('main.send_messages', service_id=current_service.id, template_id=template.id) }}">Upload a list of {{ 999|recipient_count_label(template.template_type) }}</a>

app/templates/views/send.html

@@ -10,7 +10,7 @@
 
 
 {% block backLink %}
-  {{ govukBackLink({ "href": url_for('main.send_one_off', service_id=current_service.id, template_id=template.id) }) }}
+  {{ govukBackLink({ "href": alternative_backlink or url_for('main.send_one_off', service_id=current_service.id, template_id=template.id) }) }}
 {% endblock %}
 
 {% block maincolumn_content %}

tests/route-list.json

@@ -287,6 +287,7 @@
     "/services/<uuid:service_id>/template-usage",
     "/services/<uuid:service_id>/template/<uuid:template_id>/notification/check",
     "/services/<uuid:service_id>/template/<uuid:template_id>/one-off/send-to-myself",
+    "/services/<uuid:service_id>/send/<uuid:template_id>/add-recipients",
     "/services/<uuid:service_id>/templates",
     "/services/<uuid:service_id>/templates/<template_type:template_type>",
     "/services/<uuid:service_id>/templates/<template_type:template_type>/folders/<uuid:template_folder_id>",