From 5a9f817e52c8ec24a358003713b198203d479283 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 20 Jul 2017 09:02:08 +0100
Subject: [PATCH] Remove anything error-related from the OK view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If you’ve uploaded a file and everything is OK, the page that you see
doesn’t need to look at any errors (because there won’t be any).
---
 app/templates/views/check/ok.html | 160 ++----------------------------
 1 file changed, 8 insertions(+), 152 deletions(-)

diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html
index ebb207edd..c09b73756 100644
--- a/app/templates/views/check/ok.html
+++ b/app/templates/views/check/ok.html
@@ -14,141 +14,19 @@
 {% endmacro %}
 
 {% block service_page_title %}
-  {{ "Error" if errors else "Preview of {}".format(template.name) }}
+  {{ "Preview of {}".format(template.name) }}
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  {% if recipients.too_many_rows %}
+  <h1 class="heading-large">
+    Preview of {{ template.name }}
+  </h1>
+  {{ skip_to_file_contents() }}
 
-    <div class="bottom-gutter">
-      {% call banner_wrapper(type='dangerous') %}
-        <h1 class='banner-title'>
-          Your file has too many rows
-        </h1>
-        <p>
-          Notify can process up to
-          {{ "{:,}".format(recipients.max_rows) }} rows at once. Your
-          file has {{ "{:,}".format(recipients|length) }} rows.
-        </p>
-        {{ skip_to_file_contents() }}
-      {% endcall %}
-    </div>
-
-  {% elif not count_of_recipients %}
-
-    <div class="bottom-gutter">
-      {% call banner_wrapper(type='dangerous') %}
-        <h1 class='banner-title'>
-          Your file is missing some rows
-        </h1>
-        <p>
-          It needs at least one row of data, and {{ recipients.missing_column_headers | sort() | formatted_list(
-            prefix='a column called',
-            prefix_plural='columns called'
-          ) }}.
-        </p>
-        {{ skip_to_file_contents() }}
-      {% endcall %}
-    </div>
-
-  {% elif not recipients.has_recipient_columns %}
-
-    <div class="bottom-gutter">
-      {% call banner_wrapper(type='dangerous') %}
-        <h1 class='banner-title'>
-          Your file needs {{ recipients.recipient_column_headers | formatted_list(
-            prefix='a column called',
-            prefix_plural='columns called'
-          ) }}
-        </h1>
-        <p>
-          Right now it has {{ recipients.column_headers | formatted_list(
-            prefix='one column, called ',
-            prefix_plural='columns called '
-          ) }}.
-        </p>
-        {{ skip_to_file_contents() }}
-      {% endcall %}
-    </div>
-
-  {% elif recipients.missing_column_headers %}
-
-    <div class="bottom-gutter">
-      {% call banner_wrapper(type='dangerous') %}
-        <h1 class='banner-title'>
-          The columns in your file need to match the double brackets in
-          your template
-        </h1>
-        <p>
-          Your file is missing {{ recipients.missing_column_headers | formatted_list(
-            conjunction='and',
-            prefix='a column called ',
-            prefix_plural='columns called '
-          ) }}.
-        </p>
-        {{ skip_to_file_contents() }}
-      {% endcall %}
-    </div>
-
-  {% elif row_errors %}
-
-    <div class="bottom-gutter">
-      {% call banner_wrapper(type='dangerous') %}
-        {% if row_errors|length == 1 %}
-          <h1 class='banner-title'>
-            There is a problem with your data
-          </h1>
-          <p>
-            You need to {{ row_errors[0] }}
-          </p>
-        {% else %}
-          <h1 class='banner-title'>
-            There are some problems with your data
-          </h1>
-          <p>
-            You need to:
-          </p>
-          <ul class="list-bullet">
-            {% for error in row_errors %}
-              <li>{{ error }}</li>
-            {% endfor %}
-          </ul>
-        {% endif %}
-        {{ skip_to_file_contents() }}
-      {% endcall %}
-    </div>
-
-  {% elif not recipients.allowed_to_send_to %}
-    {% with
-      count_of_recipients=count_of_recipients,
-      template_type_label=recipients.recipient_column_headers[0]
-    %}
-      {% include "partials/check/not-allowed-to-send-to.html" %}
-    {% endwith %}
-  {% elif recipients.more_rows_than_can_send %}
-    {% include "partials/check/too-many-messages.html" %}
-  {% else %}
-
-    <h1 class="heading-large">
-      Preview of {{ template.name }}
-    </h1>
-    {{ skip_to_file_contents() }}
-
-  {% endif %}
-
-  {% if not errors %}
-    {{ template|string }}
-  {% endif %}
+  {{ template|string }}
 
   <div class="bottom-gutter-3-2">
-  {% if errors %}
-    {% if request.args.from_test %}
-      <a href="{{ back_link }}" class="page-footer-back-link">Back</a>
-    {% else %}
-      {{file_upload(form.file, button_text='Re-upload your file')}}
-    {% endif %}
-  {% else %}
     <form method="post" enctype="multipart/form-data" action="{{url_for('main.start_job', service_id=current_service.id, upload_id=upload_id)}}" class='page-footer'>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
       <input type="hidden" name="help" value="{{ '3' if help else 0 }}" />
@@ -165,7 +43,6 @@
       {% endif %}
       <a href="{{ back_link }}" class="page-footer-back-link">Back</a>
     </form>
-  {% endif %}
   </div>
 
   {% if not request.args.from_test %}
@@ -186,14 +63,7 @@
         </span>
       {% endcall %}
       {% for column in recipients.column_headers %}
-        {% if item['columns'][column].error and not recipients.missing_column_headers %}
-          {% call field() %}
-            <span>
-              <span class="table-field-error-label">{{ item['columns'][column].error }}</span>
-              {{ item['columns'][column].data if item['columns'][column].data != None }}
-            </span>
-          {% endcall %}
-        {% elif item['columns'][column].ignore %}
+        {% if item['columns'][column].ignore %}
           {{ text_field(item['columns'][column].data or '', status='default') }}
         {% else %}
           {{ text_field(item['columns'][column].data or '') }}
@@ -208,12 +78,7 @@
 
   {% endif %}
 
-
-  {% if recipients.too_many_rows %}
-    <p class="table-show-more-link">
-      Can’t show the contents of this file
-    </p>
-  {% elif count_of_displayed_recipients < count_of_recipients %}
+  {% if count_of_displayed_recipients < count_of_recipients %}
     <p class="table-show-more-link">
       {% if row_errors and not recipients.missing_column_headers %}
         Only showing the first {{ count_of_displayed_recipients }} rows with errors
@@ -221,15 +86,6 @@
         Only showing the first {{ count_of_displayed_recipients }} rows
       {% endif %}
     </p>
-  {% elif row_errors and not recipients.missing_column_headers %}
-    <p class="table-show-more-link">
-      Only showing rows with errors
-    </p>
-  {% endif %}
-
-  {% if errors %}
-    <h2 class="heading-medium">Preview of {{ template.name }}</h2>
-    {{ template|string }}
   {% endif %}
 
 {% endblock %}