mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-04-13 13:51:22 -04:00
Because we now[1] store info about each file upload separately in the session the session isn’t overridden every time you upload a file. This is good because you can do multiple file uploads idempotently. Generally we are cleaning up after ourselves because we pop anything to do with that upload from the session. However there is an edge case: if you never send the file then the info about the file stays in the session in perpetuity[2]. This is generally happening when people are uploading files that are impossible to send, ie ones that have errors. So this commit makes two changes: 1. remove info about a file upload from the session as soon as we know that it contains errors 2. `POST` reuploads to the same endpoint as initial uploads because otherwise we need to keep info about bad uploads in the session, which would prevent us from doing 1. 1. https://github.com/alphagov/notifications-admin/pull/1968 2. or at least until the session is cleared by the user logging out
213 lines
7.4 KiB
HTML
213 lines
7.4 KiB
HTML
{% extends "withnav_template.html" %}
|
||
{% from "components/banner.html" import banner_wrapper %}
|
||
{% from "components/radios.html" import radio_select %}
|
||
{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %}
|
||
{% from "components/file-upload.html" import file_upload %}
|
||
{% from "components/page-footer.html" import page_footer %}
|
||
{% from "components/message-count-label.html" import message_count_label %}
|
||
|
||
{% set file_contents_header_id = 'file-preview' %}
|
||
{% macro skip_to_file_contents() %}
|
||
<p class="visually-hidden">
|
||
<a href="#{{ file_contents_header_id }}">Skip to file contents</a>
|
||
</p>
|
||
{% endmacro %}
|
||
|
||
{% block service_page_title %}
|
||
Error
|
||
{% endblock %}
|
||
|
||
{% block maincolumn_content %}
|
||
|
||
<div class="bottom-gutter">
|
||
{% call banner_wrapper(type='dangerous') %}
|
||
|
||
{% if recipients.too_many_rows %}
|
||
|
||
<h1 class='banner-title' data-module="track-error" data-error-type="Too many rows" data-error-label="{{ upload_id }}">
|
||
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>
|
||
|
||
{% elif not count_of_recipients %}
|
||
|
||
<h1 class='banner-title' data-module="track-error" data-error-type="No rows" data-error-label="{{ upload_id }}">
|
||
Your file is missing some rows
|
||
</h1>
|
||
{% if recipients.missing_column_headers %}
|
||
<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>
|
||
{% else %}
|
||
<p>
|
||
It needs at least one row of data.
|
||
</p>
|
||
{% endif %}
|
||
|
||
{% elif not recipients.has_recipient_columns %}
|
||
|
||
<h1 class='banner-title' data-module="track-error" data-error-type="Missing recipient columns" data-error-label="{{ upload_id }}">
|
||
Your file needs {{ (
|
||
recipients.missing_column_headers
|
||
if template.template_type == 'letter' else required_recipient_columns
|
||
) | 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>
|
||
|
||
{% elif recipients.duplicate_recipient_column_headers %}
|
||
|
||
<h1 class='banner-title' data-module="track-error" data-error-type="Duplicate recipient columns" data-error-label="{{ upload_id }}">
|
||
Your file has more than one column called {{ (
|
||
recipients.duplicate_recipient_column_headers
|
||
) | formatted_list(
|
||
conjunction='or',
|
||
prefix='',
|
||
prefix_plural=''
|
||
) }}
|
||
</h1>
|
||
<p>
|
||
Delete or rename one of these columns and try again.
|
||
</p>
|
||
|
||
{% elif recipients.missing_column_headers %}
|
||
|
||
<h1 class='banner-title' data-module="track-error" data-error-type="Missing placeholder columns" data-error-label="{{ upload_id }}">
|
||
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>
|
||
|
||
{% 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 trying_to_send_letters_in_trial_mode %}
|
||
|
||
<h1 class='banner-title' data-module="track-error" data-error-type="Trying to send letters in trial mode" data-error-label="{{ upload_id }}">
|
||
You can’t send
|
||
{{ 'this letter' if count_of_recipients == 1 else 'these letters' }}
|
||
</h1>
|
||
<p>
|
||
In <a href="{{ url_for('.using_notify') }}#trial-mode">trial mode</a> you
|
||
can only preview how your letters will look
|
||
</p>
|
||
|
||
{% elif recipients.more_rows_than_can_send %}
|
||
|
||
{% include "partials/check/too-many-messages.html" %}
|
||
|
||
{% endif %}
|
||
|
||
{{ skip_to_file_contents() }}
|
||
|
||
{% endcall %}
|
||
</div>
|
||
|
||
|
||
<div class="js-stick-at-top-when-scrolling">
|
||
<div class="form-group">
|
||
{% if request.args.from_test %}
|
||
<a href="{{ back_link }}" class="page-footer-back-link">Back</a>
|
||
{% else %}
|
||
{{ file_upload(
|
||
form.file,
|
||
action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
|
||
button_text='Re-upload your file'
|
||
) }}
|
||
{% endif %}
|
||
</div>
|
||
<a href="#content" class="back-to-top-link">Back to top</a>
|
||
</div>
|
||
|
||
{% if not request.args.from_test %}
|
||
|
||
{% set column_headers = recipients._raw_column_headers if recipients.duplicate_recipient_column_headers else recipients.column_headers %}
|
||
|
||
<h2 class="heading-medium" id="{{ file_contents_header_id }}">{{ original_file_name }}</h2>
|
||
|
||
<div class="fullscreen-content" data-module="fullscreen-table">
|
||
{% call(item, row_number) list_table(
|
||
recipients.displayed_rows,
|
||
caption=original_file_name,
|
||
caption_visible=False,
|
||
field_headings=[
|
||
'<span class="visually-hidden">Row in file</span><span aria-hidden="true">1</span>'|safe
|
||
] + column_headers
|
||
) %}
|
||
{% call index_field() %}
|
||
<span>
|
||
{{ item.index + 2 }}
|
||
</span>
|
||
{% endcall %}
|
||
{% for column in column_headers %}
|
||
{% if item[column].error and not recipients.missing_column_headers %}
|
||
{% call field() %}
|
||
<span>
|
||
<span class="table-field-error-label">{{ item[column].error }}</span>
|
||
{{ item[column].data if item[column].data != None }}
|
||
</span>
|
||
{% endcall %}
|
||
{% elif item[column].ignore %}
|
||
{{ text_field(item[column].data or '', status='default') }}
|
||
{% else %}
|
||
{{ text_field(item[column].data or '') }}
|
||
{% endif %}
|
||
{% endfor %}
|
||
{% if item[None].data %}
|
||
{% for column in item[None].data %}
|
||
{{ text_field(column, status='default') }}
|
||
{% endfor %}
|
||
{% endif %}
|
||
{% endcall %}
|
||
{% endif %}
|
||
</div>
|
||
|
||
{% 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 %}
|
||
<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
|
||
{% else %}
|
||
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 %}
|
||
|
||
<h2 class="heading-medium">Preview of {{ template.name }}</h2>
|
||
{{ template|string }}
|
||
|
||
{% endblock %}
|