Merge pull request #206 from alphagov/drop-preview-service-name

Make ‘add service’ flow one page again

app/main/forms.py

@@ -164,13 +164,13 @@ class AddServiceForm(Form):
     name = StringField(
         'Service name',
         validators=[
-            DataRequired(message='Service name can not be empty')
+            DataRequired(message='Service name can’t be empty')
         ]
     )
 
     def validate_name(self, a):
         if a.data in self._names_func():
-            raise ValidationError('Service name already exists')
+            raise ValidationError('This service name is already in use')
 
 
 class ServiceNameForm(Form):

app/main/views/add_service.py

@@ -11,39 +11,15 @@ from app.main.forms import AddServiceForm
 @login_required
 def add_service():
     form = AddServiceForm(services_dao.find_all_service_names)
-    services = services_dao.get_services(current_user.id)
-    if len(services['data']) == 0:
-        heading = 'Which service do you want to set up notifications for?'
-    else:
-        heading = 'Add a new service'
+    heading = 'Which service do you want to set up notifications for?'
     if form.validate_on_submit():
         session['service_name'] = form.name.data
-        return redirect(url_for('main.add_from_address'))
+        user = users_dao.get_user_by_id(session['user_id'])
+        service_id = services_dao.insert_new_service(session['service_name'], user.id)
+        return redirect(url_for('main.service_dashboard', service_id=service_id))
     else:
         return render_template(
             'views/add-service.html',
             form=form,
             heading=heading
         )
-
-
-@main.route("/confirm-add-service", methods=['GET', 'POST'])
-@login_required
-def add_from_address():
-    if request.method == 'POST':
-        user = users_dao.get_user_by_id(session['user_id'])
-        service_id = services_dao.insert_new_service(session['service_name'], user.id)
-        return redirect(url_for('main.service_dashboard', service_id=service_id))
-    else:
-        return render_template(
-            'views/add-from-address.html',
-            service_name=session['service_name'],
-            from_address="{}@notifications.service.gov.uk".format(_email_safe(session['service_name']))
-        )
-
-
-def _email_safe(string):
-    return "".join([
-        character.lower() if character.isalnum() or character == "." else ""
-        for character in re.sub("\s+", ".", string.strip())
-    ])

app/templates/views/add-from-address.html

@@ -1,42 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import page_footer %}
-{% from "components/sms-message.html" import sms_message %}
-{% from "components/email-message.html" import email_message %}
-
-{% block page_title %}
-  Preview your service name – GOV.UK Notify
-{% endblock %}
-
-{% block maincolumn_content %}
-
-  <h1 class="heading-large">
-    Preview your service name
-  </h1>
-
-  <div class="grid-row">
-    <div class="column-two-thirds">
-        {{ sms_message(
-          "{}: we received your payment, thank you".format(service_name),
-          name="Text message",
-          recipient='Sent from 40604'
-        ) }}
-    </div>
-  </div>
-  <div class="grid-row">
-    <div class='column-two-thirds'>
-      {{ email_message(
-        subject="We received your payment, thank you",
-        body="Dear Alice Smith,\n\nThank you for…",
-        from_name=service_name,
-        from_address=from_address,
-        name="Email",
-      ) }}
-    </div>
-  </div>
-
-  <form method="post">
-    {{page_footer('Looks good', back_link=url_for(".add_service"))}}
-  </form>
-
-{% endblock %}

app/templates/views/add-service.html

@@ -16,16 +16,29 @@
     </h1>
 
     <p>
-      Be specific. Remember that there might be other people in your
-      organisation using GOV.UK Notify.
+      Be specific to your service. Remember that there might be
+      other people in your organisation using GOV.UK Notify.
     </p>
 
+    <p>
+      Users will see this:
+    </p>
+
+    <ul class="list-bullet bottom-gutter">
+      <li>
+        at the start of every text message, eg ‘Vehicle tax: we received your
+        payment, thank you’
+      </li>
+      <li>
+        as your email sender name
+      </li>
+    </ul>
+
     <form autocomplete="off" method="post">
 
       {{ textbox(form.name, hint="You can change this later") }}
 
-
-      {{ page_footer('Continue') }}
+      {{ page_footer('Add service') }}
 
     </form>