From 0021d6425332ab81cdcf1e8f73ae6669416c5504 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 30 Jan 2024 15:23:21 -0500 Subject: [PATCH 001/195] 1166 - Adjusting the card width and wrapping styles --- app/assets/javascripts/collapsibleCheckboxes.js | 2 +- .../sass/uswds/_uswds-theme-custom-styles.scss | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/collapsibleCheckboxes.js b/app/assets/javascripts/collapsibleCheckboxes.js index f67cad80a..93645f002 100644 --- a/app/assets/javascripts/collapsibleCheckboxes.js +++ b/app/assets/javascripts/collapsibleCheckboxes.js @@ -65,7 +65,7 @@ return $(`
- {% endif %} -
- + {% if current_user.is_authenticated %} + + {% endif %} + + + From 80135b2ff647567d41773ea1960815be48ac0a23 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Mon, 5 Feb 2024 12:27:40 -0800 Subject: [PATCH 009/195] notify-api-771 fix columns in reports --- app/utils/csv.py | 62 ++++++++++++++++++------------------- tests/app/utils/test_csv.py | 48 +++++++++++++--------------- 2 files changed, 51 insertions(+), 59 deletions(-) diff --git a/app/utils/csv.py b/app/utils/csv.py index 7cfcb8975..9531e0b5d 100644 --- a/app/utils/csv.py +++ b/app/utils/csv.py @@ -78,21 +78,21 @@ def generate_notifications_csv(**kwargs): template=get_sample_template(kwargs["template_type"]), ) original_column_headers = original_upload.column_headers - fieldnames = ( - ["Row number"] - + original_column_headers - + [ - "Template", - "Type", - "Sent by", - "Job", - "Carrier", - "Carrier Response", - "Status", - "Time", - ] - ) + fieldnames = [ + "Template", + "Type", + "Sent by", + "Job", + "Carrier", + "Carrier Response", + "Status", + "Time", + ] + for header in original_column_headers: + fieldnames.append(header) + else: + # TODO This is deprecated because everything should be a job now, is it ever invoked? fieldnames = [ "Recipient", "Template", @@ -104,6 +104,7 @@ def generate_notifications_csv(**kwargs): "Status", "Time", ] + current_app.logger.warning("Invoking deprecated report format") yield ",".join(fieldnames) + "\n" @@ -118,26 +119,23 @@ def generate_notifications_csv(**kwargs): current_app.logger.info(f"\n\n{notification}") if kwargs.get("job_id"): - values = ( - [ - notification["row_number"], - ] - + [ + values = [ + notification["template_name"], + notification["template_type"], + notification["created_by_name"], + notification["job_name"], + notification["carrier"], + notification["provider_response"], + notification["status"], + preferred_tz_created_at, + ] + for header in original_column_headers: + values.append( original_upload[notification["row_number"] - 1].get(header).data - for header in original_column_headers - ] - + [ - notification["template_name"], - notification["template_type"], - notification["created_by_name"], - notification["job_name"], - notification["carrier"], - notification["provider_response"], - notification["status"], - preferred_tz_created_at, - ] - ) + ) + else: + # TODO This is deprecated, should not be invoked. See above values = [ notification["recipient"], notification["template_name"], diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index b237d8ad5..c39414ae5 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -46,9 +46,6 @@ def _get_notifications_csv( "notifications": [ { "row_number": row_number + i, - "to": recipient, - "recipient": recipient, - "client_reference": "ref 1234", "template_name": template_name, "template_type": template_type, "template": {"name": template_name, "template_type": template_type}, @@ -60,6 +57,9 @@ def _get_notifications_csv( "updated_at": None, "created_by_name": created_by_name, "created_by_email_address": created_by_email_address, + "to": recipient, + "recipient": recipient, + "client_reference": "ref 1234", } for i in range(rows) ], @@ -130,8 +130,6 @@ def test_generate_notifications_csv_without_job( 2028675309 """, [ - "Row number", - "phone_number", "Template", "Type", "Sent by", @@ -140,10 +138,9 @@ def test_generate_notifications_csv_without_job( "Carrier Response", "Status", "Time", + "phone_number", ], [ - "1", - "2028675309", "foo", "sms", "Fake Person", @@ -152,6 +149,7 @@ def test_generate_notifications_csv_without_job( "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", + "2028675309", ], ), ( @@ -160,11 +158,6 @@ def test_generate_notifications_csv_without_job( 2028675309, 🐜,🐝,🦀 """, [ - "Row number", - "phone_number", - "a", - "b", - "c", "Template", "Type", "Sent by", @@ -173,13 +166,12 @@ def test_generate_notifications_csv_without_job( "Carrier Response", "Status", "Time", + "phone_number", + "a", + "b", + "c", ], [ - "1", - "2028675309", - "🐜", - "🐝", - "🦀", "foo", "sms", "Fake Person", @@ -188,6 +180,10 @@ def test_generate_notifications_csv_without_job( "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", + "2028675309", + "🐜", + "🐝", + "🦀", ], ), ( @@ -196,11 +192,6 @@ def test_generate_notifications_csv_without_job( "2028675309","🐜,🐜","🐝,🐝","🦀" """, [ - "Row number", - "phone_number", - "a", - "b", - "c", "Template", "Type", "Sent by", @@ -209,13 +200,12 @@ def test_generate_notifications_csv_without_job( "Carrier Response", "Status", "Time", + "phone_number", + "a", + "b", + "c", ], [ - "1", - "2028675309", - "🐜,🐜", - "🐝,🐝", - "🦀", "foo", "sms", "Fake Person", @@ -224,6 +214,10 @@ def test_generate_notifications_csv_without_job( "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", + "2028675309", + "🐜,🐜", + "🐝,🐝", + "🦀", ], ), ], From d6f012ee9e0106df05286d0deeff6c0a12de4af7 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 6 Feb 2024 16:08:14 -0800 Subject: [PATCH 010/195] editing and creating new preview functions and backlinks --- app/assets/sass/uswds/_legacy-styles.scss | 4 +- app/main/views/send.py | 117 +++++++++++------- app/templates/views/check/ok.html | 41 +----- app/templates/views/check/preview.html | 38 ++---- app/templates/views/notifications/check.html | 11 +- .../views/notifications/preview.html | 65 ++++++++++ 6 files changed, 153 insertions(+), 123 deletions(-) create mode 100644 app/templates/views/notifications/preview.html diff --git a/app/assets/sass/uswds/_legacy-styles.scss b/app/assets/sass/uswds/_legacy-styles.scss index 3b09e2218..a4a6e3d2c 100644 --- a/app/assets/sass/uswds/_legacy-styles.scss +++ b/app/assets/sass/uswds/_legacy-styles.scss @@ -54,7 +54,7 @@ .sms-message-recipient { color: color('gray-cool-90'); - margin: 0 0 units(1); + margin: units(1) 0 units(1); } .sms-message-status { @@ -131,7 +131,7 @@ &-label, &-button-label { font-weight: bold; - font-size: 19px; + font-size: 19px; display: block; margin: 0 0 10px 0; } diff --git a/app/main/views/send.py b/app/main/views/send.py index 6c014b102..96389898b 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -527,11 +527,17 @@ def _check_messages(service_id, template_id, upload_id, preview_row): back_link = url_for( "main.send_one_off", service_id=service_id, template_id=template.id ) + back_link_from_preview = url_for( + "main.send_one_off", service_id=service_id, template_id=template.id + ) choose_time_form = None else: back_link = url_for( "main.send_messages", service_id=service_id, template_id=template.id ) + back_link_from_preview = url_for( + "main.check_messages", service_id=service_id, template_id=template.id, upload_id=upload_id + ) choose_time_form = ChooseTimeForm() if preview_row < 2: @@ -559,6 +565,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): remaining_messages=remaining_messages, choose_time_form=choose_time_form, back_link=back_link, + back_link_from_preview=back_link_from_preview, first_recipient_column=recipients.recipient_column_headers[0], preview_row=preview_row, sent_previously=job_api_client.has_sent_previously( @@ -612,6 +619,34 @@ def check_messages(service_id, template_id, upload_id, row_index=2): return render_template("views/check/ok.html", **data) +@main.route( + "/services///check//preview", + methods=["POST"], +) +@user_has_permissions("send_messages", restrict_admin_usage=True) +def preview_job(service_id, template_id, upload_id, row_index=2): + session['scheduled_for'] = request.form.get('scheduled_for', 'Not specified') + data = _check_messages(service_id, template_id, upload_id, row_index) + data["allowed_file_extensions"] = Spreadsheet.ALLOWED_FILE_EXTENSIONS + if ( + data["recipients"].too_many_rows + or not data["count_of_recipients"] + or not data["recipients"].has_recipient_columns + or data["recipients"].duplicate_recipient_column_headers + or data["recipients"].missing_column_headers + or data["sent_previously"] + ): + return render_template("views/check/column-errors.html", **data) + + if data["row_errors"]: + return render_template("views/check/row-errors.html", **data) + + if data["errors"]: + return render_template("views/check/column-errors.html", **data) + + return render_template('views/check/preview.html', scheduled_for=session['scheduled_for'], **data, +) + @main.route("/services//start-job/", methods=["POST"]) @user_has_permissions("send_messages", restrict_admin_usage=True) def start_job(service_id, upload_id): @@ -633,49 +668,6 @@ def start_job(service_id, upload_id): ) -@main.route( - "/services///check//preview", - methods=["POST"], -) -@user_has_permissions("send_messages", restrict_admin_usage=True) -def preview_job(service_id, template_id, upload_id, row_index=2): - # Store form data in session temporarily - session['scheduled_for'] = request.form.get('scheduled_for', 'Not specified') - # session.pop("sender_id", None) - data = _check_messages(service_id, template_id, upload_id, row_index) - data["allowed_file_extensions"] = Spreadsheet.ALLOWED_FILE_EXTENSIONS - - if ( - data["recipients"].too_many_rows - or not data["count_of_recipients"] - or not data["recipients"].has_recipient_columns - or data["recipients"].duplicate_recipient_column_headers - or data["recipients"].missing_column_headers - or data["sent_previously"] - ): - return render_template("views/check/column-errors.html", **data) - - if data["row_errors"]: - return render_template("views/check/row-errors.html", **data) - - if data["errors"]: - return render_template("views/check/column-errors.html", **data) - - metadata_kwargs = { - "notification_count": data["count_of_recipients"], - "template_id": template_id, - "valid": True, - "original_file_name": data.get("original_file_name", ""), - } - - if session.get("sender_id"): - metadata_kwargs["sender_id"] = session["sender_id"] - - set_metadata_on_csv_upload(service_id, upload_id, **metadata_kwargs) - - return render_template('views/check/preview.html', data=session['scheduled_for'], **data, metadata_kwargs=metadata_kwargs) - - def fields_to_fill_in(template, prefill_current_user=False): if not prefill_current_user: return first_column_headings[template.template_type] + list( @@ -721,7 +713,15 @@ def get_send_test_page_title(template_type, entering_recipient, name=None): return "Personalize this message" -def get_back_link(service_id, template, step_index, placeholders=None): +def get_back_link(service_id, template, step_index, placeholders=None, preview=False,): + if preview: + return url_for( + "main.check_notification", + service_id=service_id, + template_id=template.id, + ) + + if step_index == 0: if should_skip_template_page(template._template): return url_for( @@ -826,6 +826,8 @@ def _check_notification(service_id, template_id, exception=None): back_link = get_back_link(service_id, template, len(placeholders), placeholders) + back_link_from_preview = get_back_link(service_id, template, len(placeholders), placeholders, preview=True) + choose_time_form = ChooseTimeForm() if (not session.get("recipient")) or not all_placeholders_in_session( @@ -839,6 +841,7 @@ def _check_notification(service_id, template_id, exception=None): return dict( template=template, back_link=back_link, + back_link_from_preview=back_link_from_preview, choose_time_form=choose_time_form, **(get_template_error_dict(exception) if exception else {}), ) @@ -869,6 +872,29 @@ def get_template_error_dict(exception): "original_file_name": False, } +@main.route( + "/services//template//notification/check/preview", + methods=["POST"], +) +@user_has_permissions("send_messages", restrict_admin_usage=True) +def preview_notification(service_id, template_id): + recipient = get_recipient() + if not recipient: + return redirect( + url_for( + ".send_one_off", + service_id=service_id, + template_id=template_id, + ) + ) + + session['scheduled_for'] = request.form.get('scheduled_for', 'Not specified') + + return render_template( + "views/notifications/preview.html", + **_check_notification(service_id, template_id), data=session['scheduled_for'] + ) + @main.route( "/services//template//notification/check", @@ -876,6 +902,7 @@ def get_template_error_dict(exception): ) @user_has_permissions("send_messages", restrict_admin_usage=True) def send_notification(service_id, template_id): + scheduled_for = session.pop('scheduled_for', None) recipient = get_recipient() if not recipient: return redirect( @@ -910,7 +937,7 @@ def send_notification(service_id, template_id): job_api_client.create_job( upload_id, service_id, - scheduled_for=request.form.get("scheduled_for", ""), + scheduled_for=scheduled_for, template_id=template_id, original_file_name=filename, notification_count=1, diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index 6fc96f73b..f70b6232e 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -41,50 +41,11 @@

{{ original_file_name }}

{% endif %} {% set button_text %} - Preview send - + Preview {% endset %} {{ usaButton({ "text": button_text }) }} - - - {% endblock %} diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index 1c07bffc6..c7b303a8a 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -14,35 +14,23 @@ {% block backLink %} - {{ usaBackLink({ "href": back_link }) }} + {{ usaBackLink({ "href": back_link_from_preview }) }} {% endblock %} {% block maincolumn_content %} - {{ page_header('Send messages') }} + {{ page_header('Preview') }}

Message

- {% if data %} -

Time: {{data | format_datetime_short_america}}

+ {% if scheduled_for %} +

Time: {{scheduled_for}}

{% endif %} -

File: {{metadata_kwargs.original_file_name}}

+

File: {{original_file_name}}

{{ template|string }}
- {% if not request.args.from_test %} -

Preview list

-
  • @@ -53,8 +41,6 @@
- -
{% call(item, row_number) list_table( recipients.displayed_rows, @@ -76,25 +62,15 @@ {% endif %} {% endcall %}
- {% endif %} -

The service be charged 10 message parts for a total of 20 messages when this batch it sent - There are 480 of 500 messages remaining in your service

+

Does everything look good?

{% set button_text %} Send - {% endset %} {{ usaButton({ "text": button_text }) }}
- - - - {% endblock %} diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html index 5bc970f9b..fec77f779 100644 --- a/app/templates/views/notifications/check.html +++ b/app/templates/views/notifications/check.html @@ -40,17 +40,16 @@ {% endcall %} {% else %} - {{ page_header('Preview of ‘{}’'.format(template.name)) }} + {{ page_header('Select delivery time') }} {% endif %} {{ template|string }}
{% if not error %} @@ -64,7 +63,9 @@ } }) }} {% endif %} - {% set button_text %}Send 1 {{ 1|message_count_label(template.template_type, suffix='') }}{% endset %} + {% set button_text %} + Preview + {% endset %} {{ usaButton({ "text": button_text }) }} {% endif %}
diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html new file mode 100644 index 000000000..868caefd3 --- /dev/null +++ b/app/templates/views/notifications/preview.html @@ -0,0 +1,65 @@ +{% extends "withnav_template.html" %} +{% from "components/banner.html" import banner_wrapper %} +{% from "components/page-header.html" import page_header %} +{% from "components/components/back-link/macro.njk" import usaBackLink %} +{% from "components/components/button/macro.njk" import usaButton %} + +{% block service_page_title %} + {{ "Error" if error else "Preview of ‘{}’".format(template.name) }} +{% endblock %} + +{% block backLink %} + {{ usaBackLink({ "href": back_link_from_preview }) }} +{% endblock %} + +{% block maincolumn_content %} + {% if error == 'not-allowed-to-send-to' %} +
+ {% call banner_wrapper(type='dangerous') %} + {% with + count_of_recipients=1, + template_type_label=( + 'phone number' if template.template_type == 'sms' else 'email address' + ) + %} + {% include "partials/check/not-allowed-to-send-to.html" %} + {% endwith %} + {% endcall %} +
+ {% elif error == 'too-many-messages' %} +
+ {% call banner_wrapper(type='dangerous') %} + {% include "partials/check/too-many-messages.html" %} + {% endcall %} +
+ {% elif error == 'message-too-long' %} + {# the only row_errors we can get when sending one off messages is that the message is too long #} +
+ {% call banner_wrapper(type='dangerous') %} + {% include "partials/check/message-too-long.html" %} + {% endcall %} +
+ {% else %} + {{ page_header('Preview of ‘{}’'.format(template.name)) }} + {% endif %} + + {{ template|string }} + +
+
+ + {% if not error %} + {% set button_text %} + Send + {% endset %} + {{ usaButton({ "text": button_text }) }} + {% endif %} +
+
+ +{% endblock %} From 8eb329b444bc01c00171fb4af3829615d46f07c5 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 6 Feb 2024 16:42:11 -0800 Subject: [PATCH 011/195] removing comments --- app/main/views/send.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index a07a9009e..59d3ff386 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -13,7 +13,6 @@ from notifications_utils.recipients import RecipientCSV, first_column_headings from notifications_utils.sanitise_text import SanitiseASCII from xlrd.biffh import XLRDError from xlrd.xldate import XLDateError -from pprint import pprint from app import ( current_service, From 15105bf5061ba46d490f6549e1700dd27be8091f Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 6 Feb 2024 17:06:18 -0800 Subject: [PATCH 012/195] fixed style checks --- app/main/views/send.py | 7 ++++--- app/templates/views/check/preview.html | 3 +-- app/templates/views/notifications/preview.html | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 59d3ff386..bc527ae10 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -614,7 +614,7 @@ def check_messages(service_id, template_id, upload_id, row_index=2): metadata_kwargs["sender_id"] = session["sender_id"] set_metadata_on_csv_upload(service_id, upload_id, **metadata_kwargs) - session['scheduled_for']=request.form.get("scheduled_for", "") + session['scheduled_for'] = request.form.get("scheduled_for", "") return render_template("views/check/ok.html", **data) @@ -644,7 +644,8 @@ def preview_job(service_id, template_id, upload_id, row_index=2): return render_template("views/check/column-errors.html", **data) return render_template('views/check/preview.html', scheduled_for=session['scheduled_for'], **data, -) + ) + @main.route("/services//start-job/", methods=["POST"]) @user_has_permissions("send_messages", restrict_admin_usage=True) @@ -720,7 +721,6 @@ def get_back_link(service_id, template, step_index, placeholders=None, preview=F template_id=template.id, ) - if step_index == 0: if should_skip_template_page(template._template): return url_for( @@ -871,6 +871,7 @@ def get_template_error_dict(exception): "original_file_name": False, } + @main.route( "/services//template//notification/check/preview", methods=["POST"], diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index c7b303a8a..caab43cad 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -63,8 +63,7 @@ {% endcall %}
{% endif %} - +

This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

Does everything look good?

{% set button_text %} Send diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html index 868caefd3..dd009fdcb 100644 --- a/app/templates/views/notifications/preview.html +++ b/app/templates/views/notifications/preview.html @@ -53,6 +53,8 @@ help='3' if help else 0 )}}" class='page-footer'> +

This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

+

Does everything look good?

{% if not error %} {% set button_text %} Send From fbf902e1684c1b645249ff8fd34e4a52740bdbe6 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 6 Feb 2024 17:14:46 -0800 Subject: [PATCH 013/195] fixed style checks --- app/main/views/send.py | 3 +-- app/templates/views/check/preview.html | 2 +- app/templates/views/notifications/preview.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index bc527ae10..d81eca83d 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -643,8 +643,7 @@ def preview_job(service_id, template_id, upload_id, row_index=2): if data["errors"]: return render_template("views/check/column-errors.html", **data) - return render_template('views/check/preview.html', scheduled_for=session['scheduled_for'], **data, - ) + return render_template('views/check/preview.html', scheduled_for=session['scheduled_for'], **data) @main.route("/services//start-job/", methods=["POST"]) diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index caab43cad..8dd40e612 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -63,7 +63,7 @@ {% endcall %} {% endif %} -

This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

+

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

Does everything look good?

{% set button_text %} Send diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html index dd009fdcb..468e91f3b 100644 --- a/app/templates/views/notifications/preview.html +++ b/app/templates/views/notifications/preview.html @@ -53,7 +53,7 @@ help='3' if help else 0 )}}" class='page-footer'> -

This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

+

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

Does everything look good?

{% if not error %} {% set button_text %} From 456091996e33b51e53c52f2a322df7696490dfff Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Wed, 7 Feb 2024 13:57:21 -0500 Subject: [PATCH 014/195] 1190 - bug - URL not wrapping in table --- app/assets/sass/uswds/_uswds-theme-custom-styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index b5f2147cd..8e841d225 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -354,6 +354,7 @@ td.table-empty-message { } .file-list-hint { margin: 0; + word-break: break-word; } .table-field, .table-field-right-aligned { width: 50%; From 330fad469e21ddb1d8b695213e82097ffc6ad759 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 7 Feb 2024 12:14:00 -0800 Subject: [PATCH 015/195] make ChooseTimeForm time zone aware --- app/main/forms.py | 2 +- tests/app/main/forms/test_choose_time_form.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index d9a35b72a..76b695dd8 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -70,7 +70,7 @@ from app.utils.user_permissions import all_ui_permissions, permission_options def get_time_value_and_label(future_time): preferred_tz = pytz.timezone(get_user_preferred_timezone()) return ( - future_time.astimezone(preferred_tz).replace(tzinfo=None).isoformat(), + future_time.astimezone(preferred_tz).isoformat(), "{} at {} {}".format( get_human_day(future_time.astimezone(preferred_tz)), get_human_time(future_time.astimezone(preferred_tz)), diff --git a/tests/app/main/forms/test_choose_time_form.py b/tests/app/main/forms/test_choose_time_form.py index e87c96744..4f8b13aa4 100644 --- a/tests/app/main/forms/test_choose_time_form.py +++ b/tests/app/main/forms/test_choose_time_form.py @@ -10,21 +10,21 @@ def test_form_contains_next_24h(notify_admin): # Friday assert choices[0] == ("", "Now") - assert choices[1] == ("2016-01-01T07:00:00", "Today at 7am US/Eastern") - assert choices[13] == ("2016-01-01T19:00:00", "Today at 7pm US/Eastern") + assert choices[1] == ("2016-01-01T07:00:00-05:00", "Today at 7am US/Eastern") + assert choices[13] == ("2016-01-01T19:00:00-05:00", "Today at 7pm US/Eastern") # Saturday - assert choices[14] == ("2016-01-01T20:00:00", "Today at 8pm US/Eastern") - assert choices[37] == ("2016-01-02T19:00:00", "Tomorrow at 7pm US/Eastern") + assert choices[14] == ("2016-01-01T20:00:00-05:00", "Today at 8pm US/Eastern") + assert choices[37] == ("2016-01-02T19:00:00-05:00", "Tomorrow at 7pm US/Eastern") # Sunday - assert choices[38] == ("2016-01-02T20:00:00", "Tomorrow at 8pm US/Eastern") + assert choices[38] == ("2016-01-02T20:00:00-05:00", "Tomorrow at 8pm US/Eastern") # Monday - assert choices[62] == ("2016-01-03T20:00:00", "Sunday at 8pm US/Eastern") - assert choices[80] == ("2016-01-04T14:00:00", "Monday at 2pm US/Eastern") - assert choices[84] == ("2016-01-04T18:00:00", "Monday at 6pm US/Eastern") - assert choices[85] == ("2016-01-04T19:00:00", "Monday at 7pm US/Eastern") + assert choices[62] == ("2016-01-03T20:00:00-05:00", "Sunday at 8pm US/Eastern") + assert choices[80] == ("2016-01-04T14:00:00-05:00", "Monday at 2pm US/Eastern") + assert choices[84] == ("2016-01-04T18:00:00-05:00", "Monday at 6pm US/Eastern") + assert choices[85] == ("2016-01-04T19:00:00-05:00", "Monday at 7pm US/Eastern") with pytest.raises(IndexError): assert choices[ From fb469545b48cc09c6441fd8ecaaddd645f7bd1e5 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 8 Feb 2024 12:09:01 -0500 Subject: [PATCH 016/195] 1154 - pushing up this change so Ken can take a look --- app/main/forms.py | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index d9a35b72a..6f22734d2 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1239,22 +1239,27 @@ class ChangeNameForm(StripWhitespaceForm): class ChangePreferredTimezoneForm(StripWhitespaceForm): def __init__(self, *args, **kwargs): super(ChangePreferredTimezoneForm, self).__init__(*args, **kwargs) - self.new_preferred_timezone.choices = [ - ("America/Puerto_Rico", "America/Puerto_Rico"), - ("US/Eastern", "US/Eastern"), - ("US/Central", "US/Central"), - ("US/Mountain", "US/Mountain"), - ("US/Pacific", "US/Pacific"), - ("US/Alaska", "US/Alaska"), - ("US/Hawaii", "US/Hawaii"), - ("US/Aleutian", "US/Aleutian"), - ("US/Samoa", "US/Samoa"), - ] - new_preferred_timezone = GovukRadiosField( - "What timezone would you like to use?", - default="US/Eastern", - ) + # Get the current preferred timezone from the form data + current_timezone = kwargs.get('obj', None).new_preferred_timezone if 'obj' in kwargs else "US/Eastern" + + # Set the choices + self.new_preferred_timezone = GovukRadiosField( + label="What timezone would you like to use?", + choices=[ + ("America/Puerto_Rico", "America/Puerto_Rico"), + ("US/Eastern", "US/Eastern"), + ("US/Central", "US/Central"), + ("US/Mountain", "US/Mountain"), + ("US/Pacific", "US/Pacific"), + ("US/Alaska", "US/Alaska"), + ("US/Hawaii", "US/Hawaii"), + ("US/Aleutian", "US/Aleutian"), + ("US/Samoa", "US/Samoa"), + ], + default=current_timezone + ) + class ChangeEmailForm(StripWhitespaceForm): From 7832797628acee9a7e976f6abc892f4d284af469 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 8 Feb 2024 15:10:07 -0500 Subject: [PATCH 017/195] Just removing the default selection --- app/main/forms.py | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 6f22734d2..93ccd8a55 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1239,27 +1239,21 @@ class ChangeNameForm(StripWhitespaceForm): class ChangePreferredTimezoneForm(StripWhitespaceForm): def __init__(self, *args, **kwargs): super(ChangePreferredTimezoneForm, self).__init__(*args, **kwargs) + self.new_preferred_timezone.choices = [ + ("America/Puerto_Rico", "America/Puerto_Rico"), + ("US/Eastern", "US/Eastern"), + ("US/Central", "US/Central"), + ("US/Mountain", "US/Mountain"), + ("US/Pacific", "US/Pacific"), + ("US/Alaska", "US/Alaska"), + ("US/Hawaii", "US/Hawaii"), + ("US/Aleutian", "US/Aleutian"), + ("US/Samoa", "US/Samoa"), + ] - # Get the current preferred timezone from the form data - current_timezone = kwargs.get('obj', None).new_preferred_timezone if 'obj' in kwargs else "US/Eastern" - - # Set the choices - self.new_preferred_timezone = GovukRadiosField( - label="What timezone would you like to use?", - choices=[ - ("America/Puerto_Rico", "America/Puerto_Rico"), - ("US/Eastern", "US/Eastern"), - ("US/Central", "US/Central"), - ("US/Mountain", "US/Mountain"), - ("US/Pacific", "US/Pacific"), - ("US/Alaska", "US/Alaska"), - ("US/Hawaii", "US/Hawaii"), - ("US/Aleutian", "US/Aleutian"), - ("US/Samoa", "US/Samoa"), - ], - default=current_timezone - ) - + new_preferred_timezone = GovukRadiosField( + "What timezone would you like to use?", + ) class ChangeEmailForm(StripWhitespaceForm): From b019dc3fe9cfd4ca944a491b4a94a8956941fb3c Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 8 Feb 2024 18:43:17 -0800 Subject: [PATCH 018/195] updated pytest --- app/assets/sass/uswds/_legacy-styles.scss | 2 +- app/main/views/send.py | 43 ++++++--- app/templates/views/check/ok.html | 6 +- app/templates/views/check/preview.html | 6 +- app/templates/views/notifications/check.html | 5 +- tests/app/main/views/test_conversation.py | 2 +- tests/app/main/views/test_send.py | 97 ++++++++++++-------- tests/app/main/views/test_tour.py | 3 +- tests/app/test_navigation.py | 2 + 9 files changed, 102 insertions(+), 64 deletions(-) diff --git a/app/assets/sass/uswds/_legacy-styles.scss b/app/assets/sass/uswds/_legacy-styles.scss index a4a6e3d2c..242bb0f74 100644 --- a/app/assets/sass/uswds/_legacy-styles.scss +++ b/app/assets/sass/uswds/_legacy-styles.scss @@ -48,7 +48,7 @@ } } -.sms-message-sender { +.sms-message-sender, .sms-message-file-name, .sms-message-scheduler { margin: units(1) 0 0; } diff --git a/app/main/views/send.py b/app/main/views/send.py index d81eca83d..90834d965 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -535,7 +535,10 @@ def _check_messages(service_id, template_id, upload_id, preview_row): "main.send_messages", service_id=service_id, template_id=template.id ) back_link_from_preview = url_for( - "main.check_messages", service_id=service_id, template_id=template.id, upload_id=upload_id + "main.check_messages", + service_id=service_id, + template_id=template.id, + upload_id=upload_id, ) choose_time_form = ChooseTimeForm() @@ -570,7 +573,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): sent_previously=job_api_client.has_sent_previously( service_id, template.id, db_template["version"], original_file_name ), - template_id=template_id + template_id=template_id, ) @@ -614,17 +617,20 @@ def check_messages(service_id, template_id, upload_id, row_index=2): metadata_kwargs["sender_id"] = session["sender_id"] set_metadata_on_csv_upload(service_id, upload_id, **metadata_kwargs) - session['scheduled_for'] = request.form.get("scheduled_for", "") return render_template("views/check/ok.html", **data) @main.route( "/services///check//preview", - methods=["POST"], + methods=["GET"], +) +@main.route( + "/services///check//preview/row-", + methods=["GET"], ) @user_has_permissions("send_messages", restrict_admin_usage=True) def preview_job(service_id, template_id, upload_id, row_index=2): - session['scheduled_for'] = request.form.get('scheduled_for', 'Not specified') + session["scheduled_for"] = request.args.get("scheduled_for", "") data = _check_messages(service_id, template_id, upload_id, row_index) data["allowed_file_extensions"] = Spreadsheet.ALLOWED_FILE_EXTENSIONS if ( @@ -643,13 +649,15 @@ def preview_job(service_id, template_id, upload_id, row_index=2): if data["errors"]: return render_template("views/check/column-errors.html", **data) - return render_template('views/check/preview.html', scheduled_for=session['scheduled_for'], **data) + return render_template( + "views/check/preview.html", scheduled_for=session["scheduled_for"], **data + ) @main.route("/services//start-job/", methods=["POST"]) @user_has_permissions("send_messages", restrict_admin_usage=True) def start_job(service_id, upload_id): - scheduled_for = session.pop('scheduled_for', None) + scheduled_for = session.pop("scheduled_for", None) job_api_client.create_job( upload_id, service_id, @@ -712,7 +720,13 @@ def get_send_test_page_title(template_type, entering_recipient, name=None): return "Personalize this message" -def get_back_link(service_id, template, step_index, placeholders=None, preview=False,): +def get_back_link( + service_id, + template, + step_index, + placeholders=None, + preview=False, +): if preview: return url_for( "main.check_notification", @@ -824,7 +838,9 @@ def _check_notification(service_id, template_id, exception=None): back_link = get_back_link(service_id, template, len(placeholders), placeholders) - back_link_from_preview = get_back_link(service_id, template, len(placeholders), placeholders, preview=True) + back_link_from_preview = get_back_link( + service_id, template, len(placeholders), placeholders, preview=True + ) choose_time_form = ChooseTimeForm() @@ -873,7 +889,7 @@ def get_template_error_dict(exception): @main.route( "/services//template//notification/check/preview", - methods=["POST"], + methods=["GET"], ) @user_has_permissions("send_messages", restrict_admin_usage=True) def preview_notification(service_id, template_id): @@ -887,11 +903,12 @@ def preview_notification(service_id, template_id): ) ) - session['scheduled_for'] = request.form.get('scheduled_for', 'Not specified') + session["scheduled_for"] = request.args.get("scheduled_for", "") return render_template( "views/notifications/preview.html", - **_check_notification(service_id, template_id), data=session['scheduled_for'] + **_check_notification(service_id, template_id), + scheduled_for=session["scheduled_for"], ) @@ -901,7 +918,7 @@ def preview_notification(service_id, template_id): ) @user_has_permissions("send_messages", restrict_admin_usage=True) def send_notification(service_id, template_id): - scheduled_for = session.pop('scheduled_for', None) + scheduled_for = session.pop("scheduled_for", "") recipient = get_recipient() if not recipient: return redirect( diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index f70b6232e..95fd1abea 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -1,6 +1,5 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} -{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} {% from "components/page-header.html" import page_header %} {% from "components/components/button/macro.njk" import usaButton %} {% from "components/components/skip-link/macro.njk" import usaSkipLink %} @@ -9,7 +8,7 @@ {% set file_contents_header_id = 'file-preview' %} {% block service_page_title %} - {{ "Preview of {}".format(template.name) }} + {{ "Select delivery time" }} {% endblock %} @@ -23,8 +22,7 @@ {{ template|string }}
-
- + {% if choose_time_form %} {{ choose_time_form.scheduled_for(param_extensions={ 'formGroup': {'classes': 'bottom-gutter-2-3'}, diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index 8dd40e612..ae8ecea91 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -1,6 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/banner.html" import banner_wrapper %} -{% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %} +{% from "components/table.html" import list_table, field, text_field, hidden_field_heading %} {% from "components/page-header.html" import page_header %} {% from "components/components/button/macro.njk" import usaButton %} {% from "components/components/skip-link/macro.njk" import usaSkipLink %} @@ -22,9 +22,9 @@ {{ page_header('Preview') }}

Message

{% if scheduled_for %} -

Time: {{scheduled_for}}

+

Time: {{scheduled_for}}

{% endif %} -

File: {{original_file_name}}

+

File: {{original_file_name}}

{{ template|string }}
diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html index fec77f779..86f704495 100644 --- a/app/templates/views/notifications/check.html +++ b/app/templates/views/notifications/check.html @@ -5,7 +5,7 @@ {% from "components/components/button/macro.njk" import usaButton %} {% block service_page_title %} - {{ "Error" if error else "Preview of ‘{}’".format(template.name) }} + {{ "Error" if error else "Select delivery time" }} {% endblock %} {% block backLink %} @@ -46,12 +46,11 @@ {{ template|string }}
- - {% if not error %} {% if choose_time_form %} {{ choose_time_form.scheduled_for(param_extensions={ diff --git a/tests/app/main/views/test_conversation.py b/tests/app/main/views/test_conversation.py index 215a8e828..1139cd43f 100644 --- a/tests/app/main/views/test_conversation.py +++ b/tests/app/main/views/test_conversation.py @@ -391,7 +391,7 @@ def test_conversation_reply_redirects_with_phone_number_from_notification( ) for element, expected_text in [ - ("h1", "Preview of ‘Two week reminder’"), + ("h1", "Select delivery time"), (".sms-message-recipient", "To: 2021234567"), ( ".sms-message-wrapper", diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 7448c44cf..f98bf789c 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -963,39 +963,19 @@ def test_upload_valid_csv_shows_preview_and_table( ) page = client_request.get( - "main.check_messages", + "main.preview_job", service_id=SERVICE_ONE_ID, template_id=fake_uuid, upload_id=fake_uuid, **extra_args, ) - mock_s3_set_metadata.assert_called_once_with( - SERVICE_ONE_ID, - fake_uuid, - notification_count=3, - template_id=fake_uuid, - valid=True, - original_file_name="example.csv", - ) - - assert page.h1.text.strip() == "Preview of Two week reminder" + assert page.h1.text.strip() == "Preview" + assert page.select("h2")[1].text.strip() == "Preview list" + assert page.h2.text.strip() == "Message" assert page.select_one(".sms-message-recipient").text.strip() == expected_recipient assert page.select_one(".sms-message-wrapper").text.strip() == expected_message - - assert page.select_one(".table-field-index").text.strip() == "2" - - if expected_link_in_first_row: - assert page.select_one(".table-field-index a")["href"] == url_for( - "main.check_messages", - service_id=SERVICE_ONE_ID, - template_id=fake_uuid, - upload_id=fake_uuid, - row_index=2, - original_file_name="example.csv", - ) - else: - assert not page.select_one(".table-field-index").select_one("a") + assert not page.select_one(".table-field-index") for row_index, row in enumerate( [ @@ -1043,7 +1023,7 @@ def test_upload_valid_csv_shows_preview_and_table( for index, cell in enumerate(row): row = page.select("table tbody tr")[row_index] assert "id" not in row - assert normalize_spaces(str(row.select("td")[index + 1])) == cell + assert normalize_spaces(str(row.select("td")[index])) == cell def test_show_all_columns_if_there_are_duplicate_recipient_columns( @@ -1674,7 +1654,7 @@ def test_send_one_off_email_to_self_without_placeholders_redirects_to_check_page _follow_redirects=True, ) - assert page.select("h1")[0].text.strip() == "Preview of ‘Two week reminder’" + assert page.select("h1")[0].text.strip() == "Select delivery time" @pytest.mark.parametrize( @@ -1901,10 +1881,10 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers( original_file_name="example.csv", ) - assert "202 867 0701" in page.text - assert "202 867 0749" in page.text - assert "202 867 0750" not in page.text - assert "Only showing the first 50 rows" in page.text + assert "Select delivery time" in page.text + # assert "202 867 0749" in page.text + # assert "202 867 0750" not in page.text + # assert "Only showing the first 50 rows" in page.text mock_get_notification_count.assert_called_with(service_one["id"]) @@ -1988,7 +1968,7 @@ def test_test_message_can_only_be_sent_now( assert 'name="scheduled_for"' not in content -def test_send_button_is_correctly_labelled( +def test_preview_button_is_correctly_labelled( client_request, mocker, mock_get_live_service, @@ -2013,9 +1993,7 @@ def test_send_button_is_correctly_labelled( template_id=fake_uuid, ) - assert normalize_spaces(page.select_one("main [type=submit]").text) == ( - "Send 1,000 text messages" - ) + assert normalize_spaces(page.select_one("main [type=submit]").text) == ("Preview") @pytest.mark.parametrize("when", ["", "2016-08-25T13:04:21.767198"]) @@ -2043,6 +2021,8 @@ def test_create_job_should_call_api( "valid": True, } } + with client_request.session_transaction() as session: + session["scheduled_for"] = when page = client_request.post( "main.start_job", @@ -2593,7 +2573,7 @@ def test_check_notification_redirects_if_session_not_populated( ) -def test_check_notification_shows_preview( +def test_check_notification_shows_scheduler( client_request, service_one, fake_uuid, mock_get_service_template ): with client_request.session_transaction() as session: @@ -2604,7 +2584,7 @@ def test_check_notification_shows_preview( "main.check_notification", service_id=service_one["id"], template_id=fake_uuid ) - assert page.h1.text.strip() == "Preview of ‘Two week reminder’" + assert page.h1.text.strip() == "Select delivery time" assert (page.find_all("a", {"class": "usa-back-link"})[0]["href"]) == url_for( "main.send_one_off_step", service_id=service_one["id"], @@ -2615,6 +2595,49 @@ def test_check_notification_shows_preview( # assert tour not visible assert not page.select(".banner-tour") + # post to send_notification with help=0 to ensure no back link is then shown + assert page.form.attrs["action"] == url_for( + "main.preview_notification", + service_id=service_one["id"], + template_id=fake_uuid, + ) + + assert normalize_spaces(page.select_one("main [type=submit]").text) == ("Preview") + + +@pytest.mark.parametrize("when", ["", "2016-08-25T13:04:21.767198"]) +def test_preview_notification_shows_preview( + client_request, + service_one, + fake_uuid, + mock_get_service_template, + when, +): + with client_request.session_transaction() as session: + session["recipient"] = "2028675301" + session["placeholders"] = {} + + # with client_request.session_transaction() as session: + # session["scheduled_for"] = when + + page = client_request.get( + "main.preview_notification", service_id=service_one["id"], template_id=fake_uuid + ) + + # if when: + # assert page.h1.text.strip() == when + # else: + # assert page.h1.text.strip() == "Now" + assert page.h1.text.strip() == "Preview of ‘Two week reminder’" + assert (page.find_all("a", {"class": "usa-back-link"})[0]["href"]) == url_for( + "main.check_notification", + service_id=service_one["id"], + template_id=fake_uuid, + ) + + # assert tour not visible + assert not page.select(".banner-tour") + # post to send_notification with help=0 to ensure no back link is then shown assert page.form.attrs["action"] == url_for( "main.send_notification", diff --git a/tests/app/main/views/test_tour.py b/tests/app/main/views/test_tour.py index 1d34a9999..749a8097f 100644 --- a/tests/app/main/views/test_tour.py +++ b/tests/app/main/views/test_tour.py @@ -544,10 +544,9 @@ def test_should_200_for_check_tour_notification( # post to send_notification keeps help argument assert page.form.attrs["action"] == url_for( - "main.send_notification", + "main.preview_notification", service_id=SERVICE_ONE_ID, template_id=fake_uuid, - help="3", ) diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py index 110bae914..a80455ab7 100644 --- a/tests/app/test_navigation.py +++ b/tests/app/test_navigation.py @@ -140,6 +140,8 @@ EXCLUDED_ENDPOINTS = tuple( "platform_admin_list_complaints", "platform_admin_reports", "platform_admin_splash_page", + "preview_job", + "preview_notification", "pricing", "privacy", "received_text_messages_callback", From 2aa9f2c532fa2880a5eef70754a48efa7d02dcb6 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 9 Feb 2024 07:27:28 -0800 Subject: [PATCH 019/195] remove carrier column --- app/utils/csv.py | 4 ---- tests/app/utils/test_csv.py | 16 ++++------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/app/utils/csv.py b/app/utils/csv.py index 9531e0b5d..679bdb84a 100644 --- a/app/utils/csv.py +++ b/app/utils/csv.py @@ -83,7 +83,6 @@ def generate_notifications_csv(**kwargs): "Type", "Sent by", "Job", - "Carrier", "Carrier Response", "Status", "Time", @@ -99,7 +98,6 @@ def generate_notifications_csv(**kwargs): "Type", "Sent by", "Job", - "Carrier", "Carrier Response", "Status", "Time", @@ -124,7 +122,6 @@ def generate_notifications_csv(**kwargs): notification["template_type"], notification["created_by_name"], notification["job_name"], - notification["carrier"], notification["provider_response"], notification["status"], preferred_tz_created_at, @@ -142,7 +139,6 @@ def generate_notifications_csv(**kwargs): notification["template_type"], notification["created_by_name"] or "", notification["job_name"] or "", - notification["carrier"], notification["provider_response"], notification["status"], preferred_tz_created_at, diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index c39414ae5..a3dc446d2 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -18,7 +18,6 @@ def _get_notifications_csv( template_name="foo", template_type="sms", job_name="bar.csv", - carrier="ATT Mobility", provider_response="Did not like it", status="Delivered", created_at="1943-04-19 12:00:00", @@ -50,7 +49,6 @@ def _get_notifications_csv( "template_type": template_type, "template": {"name": template_name, "template_type": template_type}, "job_name": job_name, - "carrier": carrier, "provider_response": provider_response, "status": status, "created_at": created_at, @@ -90,15 +88,15 @@ def get_notifications_csv_mock( ( None, [ - "Recipient,Template,Type,Sent by,Job,Carrier,Carrier Response,Status,Time\n", - "foo@bar.com,foo,sms,,,ATT Mobility,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", + "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", + "foo@bar.com,foo,sms,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", ], ), ( "Anne Example", [ - "Recipient,Template,Type,Sent by,Job,Carrier,Carrier Response,Status,Time\n", - "foo@bar.com,foo,sms,Anne Example,,ATT Mobility,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa + "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", + "foo@bar.com,foo,sms,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa ], ), ], @@ -134,7 +132,6 @@ def test_generate_notifications_csv_without_job( "Type", "Sent by", "Job", - "Carrier", "Carrier Response", "Status", "Time", @@ -145,7 +142,6 @@ def test_generate_notifications_csv_without_job( "sms", "Fake Person", "bar.csv", - "ATT Mobility", "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", @@ -162,7 +158,6 @@ def test_generate_notifications_csv_without_job( "Type", "Sent by", "Job", - "Carrier", "Carrier Response", "Status", "Time", @@ -176,7 +171,6 @@ def test_generate_notifications_csv_without_job( "sms", "Fake Person", "bar.csv", - "ATT Mobility", "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", @@ -196,7 +190,6 @@ def test_generate_notifications_csv_without_job( "Type", "Sent by", "Job", - "Carrier", "Carrier Response", "Status", "Time", @@ -210,7 +203,6 @@ def test_generate_notifications_csv_without_job( "sms", "Fake Person", "bar.csv", - "ATT Mobility", "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", From 48f1c7c8647227bdefe66f6f2de49cb4a7d3d7e7 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 9 Feb 2024 17:43:01 -0500 Subject: [PATCH 020/195] Admin: Add a pull request template This changeset adds a template to the repository for our pull requests. The intention is two-fold: - To make it easier to know what information and details to include in our pull requests - To improve the quality and usefulness of our pull requests This is a start and we will be adjusting this over time as we learn more and refine our process. Signed-off-by: Carlo Costino --- .github/pull_request_template.md | 79 ++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..cb6b2c84b --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,79 @@ + + +*A note to PR reviewers: it may be helpful to review our +[code review documentation](https://github.com/GSA/notifications-api/blob/main/docs/all.md#code-reviews) +to know what to keep in mind while reviewing pull requests.* + +## Description + +Please enter a clear description about your proposed changes and what the +expected outcome(s) is/are from there. If there are complex implementation +details within the changes, this is a great place to explain those details using +plain language. + +This should include: + +- Links to issues that this PR addresses +- Screenshots or screen captures of any visible changes, especially for UI work +- Dependency changes + +If there are any caveats, known issues, follow-up items, etc., make a quick note +of them here as well, though more details are probably warranted in the issue +itself in this case. + +## TODO (optional) + +If you're opening a draft PR, it might be helpful to list any outstanding work, +especially if you're asking folks to take a look before it's ready for full +review. In this case, create a small checklist with the outstanding items: + +- [ ] TODO item 1 +- [ ] TODO item 2 +- [ ] TODO item ... + +## Security Considerations + +Please think about the security compliance aspect of your changes and what the +potential impacts might be. + +**NOTE: Please be mindful of sharing sensitive information here! If you're not +sure of what to write, please ask the team first before writing anything here.** + +Relevant details could include (and are not limited to) the following: + +- Handling secrets/credential management (or specifically calling out that there + is nothing to handle) +- Any adjustments to the flow of data in and out the system, or even within it +- Connecting or disconnecting any external services to the application +- Handling of any sensitive information, such as PII +- Handling of information within log statements or other application monitoring + services/hooks +- The inclusion of a new external dependency or the removal of an existing one +- ... (anything else relevant from a security compliance perspective) + +There are some cases where there are no security considerations to be had, e.g., +updating our documentation with publicly available information. In those cases +it is fine to simply put something like this: + +- None; this is a documentation update with publicly available information. From 72aa14fd3b97e901d9415f1da0fdcd505f654e95 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 9 Feb 2024 17:09:48 -0800 Subject: [PATCH 021/195] fixed duplicates to notification by adding aggregate --- app/main/views/dashboard.py | 21 +++++-- app/templates/views/dashboard/dashboard.html | 63 ++++++++++---------- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index a88203ae7..7356f586b 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -29,6 +29,7 @@ from app.utils.csv import Spreadsheet from app.utils.pagination import generate_next_dict, generate_previous_dict from app.utils.time import get_current_financial_year from app.utils.user import user_has_permissions +from collections import defaultdict @main.route("/services//dashboard") @@ -47,22 +48,31 @@ def service_dashboard(service_id): if not current_user.has_permissions("view_activity"): return redirect(url_for("main.choose_template", service_id=service_id)) - notifications = notification_api_client.get_notifications_for_service( + notifications_response = notification_api_client.get_notifications_for_service( service_id=service_id, )["notifications"] - job_response = job_api_client.get_jobs(service_id) - service_data_retention_days = 7 - jobs = [ + + aggregate_notifications_by_job = defaultdict(list) + for notification in notifications_response: + job_id = notification.get("job", {}).get("id") + if job_id: + aggregate_notifications_by_job[job_id].append(notification) + + job_and_notifications = [ { "job_id": job["id"], "time_left": get_time_left(job["created_at"]), "download_link": url_for( ".view_job_csv", service_id=current_service.id, job_id=job["id"] ), + "view_job_link": url_for( + ".view_job", service_id=current_service.id, job_id=job["id"] + ), "notification_count": job["notification_count"], "created_by": job["created_by"], + "notifications": aggregate_notifications_by_job.get(job["id"], []), } for job in job_response["data"] ] @@ -70,8 +80,7 @@ def service_dashboard(service_id): "views/dashboard/dashboard.html", updates_url=url_for(".service_dashboard_updates", service_id=service_id), partials=get_dashboard_partials(service_id), - notifications=notifications, - jobs=jobs, + job_and_notifications=job_and_notifications, service_data_retention_days=service_data_retention_days, ) diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 9c51ea47c..de7f3b372 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -28,7 +28,6 @@ {{ ajax_block(partials, updates_url, 'totals') }} {{ ajax_block(partials, updates_url, 'template-statistics') }} -

Recent Batches

@@ -55,37 +54,37 @@ - {% for notification in notifications[:5] %} - {% if notification %} - - - - - - {% set job_available = jobs|selectattr('job_id', 'equalto', notification.job.id)|first %} - - - + {% for job in job_and_notifications[:5] %} + {% if job.job_id and job.notifications %} + {% for notification in job.notifications %} + + + + + + + + + {% endfor %} {% endif %} {% endfor %} From b7f21a6efd68f16cfff3f5928827e56878af3e60 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 9 Feb 2024 17:15:44 -0800 Subject: [PATCH 022/195] update sort imports --- app/main/views/dashboard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 7356f586b..305c13763 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -1,4 +1,5 @@ import calendar +from collections import defaultdict from datetime import datetime from functools import partial from itertools import groupby @@ -29,7 +30,7 @@ from app.utils.csv import Spreadsheet from app.utils.pagination import generate_next_dict, generate_previous_dict from app.utils.time import get_current_financial_year from app.utils.user import user_has_permissions -from collections import defaultdict + @main.route("/services//dashboard") From 7b8a187db0373c29cc214640f8e784fc1b768856 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 9 Feb 2024 17:19:15 -0800 Subject: [PATCH 023/195] update sort imports --- app/main/views/dashboard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 305c13763..29a3dba08 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -32,7 +32,6 @@ from app.utils.time import get_current_financial_year from app.utils.user import user_has_permissions - @main.route("/services//dashboard") @user_has_permissions("view_activity", "send_messages") def old_service_dashboard(service_id): From b034f1eb799919dba617da111738b45822c83717 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Mon, 12 Feb 2024 10:53:15 -0800 Subject: [PATCH 024/195] clean up login.gov link --- app/templates/views/signin.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index d47b4cc80..a19376d7c 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -29,10 +29,9 @@ {% else %}

Sign in

{% if login_gov_enabled %} -

- Test login.gov authentication: - Login.gov. + Sign in with Login.gov

+

Or:

{% endif %} {% endif %} From ef5ed8ecabe533cce5c7bb881d053d7ceaa1fd71 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 12 Feb 2024 15:29:26 -0800 Subject: [PATCH 025/195] updated pytest --- app/main/views/dashboard.py | 9 ++-- app/templates/views/dashboard/dashboard.html | 47 +++++++++++--------- tests/app/main/views/test_dashboard.py | 29 ++++++++---- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 29a3dba08..b6370a4b2 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -48,10 +48,8 @@ def service_dashboard(service_id): if not current_user.has_permissions("view_activity"): return redirect(url_for("main.choose_template", service_id=service_id)) - notifications_response = notification_api_client.get_notifications_for_service( - service_id=service_id, - )["notifications"] - job_response = job_api_client.get_jobs(service_id) + job_response = job_api_client.get_jobs(service_id)["data"] + notifications_response = notification_api_client.get_notifications_for_service(service_id)["notifications"] service_data_retention_days = 7 aggregate_notifications_by_job = defaultdict(list) @@ -70,11 +68,12 @@ def service_dashboard(service_id): "view_job_link": url_for( ".view_job", service_id=current_service.id, job_id=job["id"] ), + "created_at": job["created_at"], "notification_count": job["notification_count"], "created_by": job["created_by"], "notifications": aggregate_notifications_by_job.get(job["id"], []), } - for job in job_response["data"] + for job in job_response ] return render_template( "views/dashboard/dashboard.html", diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index de7f3b372..b5ca04c42 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -29,8 +29,8 @@ {{ ajax_block(partials, updates_url, 'template-statistics') }}

Recent Batches

-
-
- {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}} -
- View Batch - 		- {{ notification.template.name }} - - {{ notification.created_at | format_datetime_short_america }} - - {{ notification.created_by.name }} - - {{ job_available.notification_count if job_available else ''}} - - {% if job_available and job_available.time_left != "Data no longer available" %} - - {{ "Download" if job_available.job_id else '' }} - {{ job_available.time_left }} - {% elif job_available %} - {{ job_available.time_left }} - {% endif %} -
+ {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}} +
+ View Batch + 		+ {{ notification.template.name }} + + {{ notification.created_at | format_datetime_short_america }} + + {{ notification.created_by.name }} + + {{ job.notification_count}} + + {% if notification and job.time_left != "Data no longer available" %} + Download + {{ job.time_left }} + {% elif job %} + {{ job.time_left }} + {% endif %} +
+
+
- {% for job in job_and_notifications[:5] %} - {% if job.job_id and job.notifications %} - {% for notification in job.notifications %} + {% if job_and_notifications %} + {% for job in job_and_notifications %} + {% if job.job_id and job.notifications %} + {% set notification = job.notifications[0] %} - - + - {% endfor %} - {% endif %} - {% endfor %} + {% endif %} + {% endfor %} + {% else %} + + + + {% endif %}
@@ -54,39 +54,44 @@
+ {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
View Batch - - 		+ + {{ notification.template.name }} - - - {{ notification.created_at | format_datetime_short_america }} - + + + {{ job.created_at | format_datetime_short_america }} + {{ notification.created_by.name }} - - + + {{ job.notification_count}} - - + + {% if notification and job.time_left != "Data no longer available" %} Download {{ job.time_left }} {% elif job %} {{ job.time_left }} {% endif %} - +
No batched job messages found  (messages are kept for {{ service_data_retention_days }} days).
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 8e9ecb531..53a8a7feb 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -40,7 +40,7 @@ FAKE_ONE_OFF_NOTIFICATION = { "created_by": { "email_address": "grsrbsrgsrf@fake.gov", "id": "de059e0a-42e5-48bb-939e-4f76804ab739", - "name": "grsrbsrgsrf", + "name": "mocked_user", }, "document_download_count": None, "id": "a3442b43-0ba1-4854-9e0a-d2fba1cc9b81", @@ -71,7 +71,7 @@ FAKE_ONE_OFF_NOTIFICATION = { "template": { "content": "((day of week)) and ((fave color))", "id": "bd9caa7e-00ee-4c5a-839e-10ae1a7e6f73", - "name": "personalized", + "name": "Template Testing", "redact_personalisation": False, "subject": None, "template_type": "sms", @@ -94,7 +94,7 @@ MOCK_JOBS = { "id": "mocked_user_id", "name": "mocked_user", }, - "id": "mocked_notification_id", + "id": "55b242b5-9f62-4271-aff7-039e9c320578", "job_status": "finished", "notification_count": 1, "original_file_name": "mocked_file.csv", @@ -113,6 +113,19 @@ MOCK_JOBS = { ] } +MOCK_JOBS_AND_NOTIFICATIONS = [ + { + "created_at": MOCK_JOBS["data"][0]["created_at"], + "created_by": MOCK_JOBS["data"][0]["created_by"], + "download_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa.csv", + "job_id": "55b242b5-9f62-4271-aff7-039e9c320578", + "notification_count": MOCK_JOBS["data"][0]["notification_count"], + "notifications": FAKE_ONE_OFF_NOTIFICATION["notifications"], + "time_left": "Data available for 7 days", + "view_job_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa" + }, +] + stub_template_stats = [ { "template_type": "sms", @@ -1855,11 +1868,11 @@ def test_service_dashboard_shows_batched_jobs( page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID) - job_table = page.find("div", class_="job-table") + job_table_body = page.find("table", class_="job-table") - # Check if the "Job" table exists - assert job_table is not None + rows = job_table_body.find_all("tbody")[0].find_all("tr") - table_rows = job_table.find_all("tbody")[0].find_all("tr") + # # Check if the "Job" table exists + assert job_table_body is not None - assert len(table_rows) == 1 + assert len(rows) == 1 From dd902468f27b2f033224a480c1304b1def10fa39 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 12 Feb 2024 16:33:41 -0800 Subject: [PATCH 026/195] updated css table widths --- .../uswds/_uswds-theme-custom-styles.scss | 45 ++++++++++--------- app/templates/views/dashboard/dashboard.html | 24 +++++----- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index b5f2147cd..21d760659 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -378,28 +378,29 @@ td.table-empty-message { } .job-table { - .usa-table { - thead th.file-name { - width: 25%; - } - thead th.template { - width: 20%; - } - thead th.time-sent { - width: 30%; - } - thead th.sender { - width: 15%; - } - thead th.\#-of-recipients { - width: 5%; - } - thead th.report { - width: 5%; - } - th { - padding: 0.5rem 0.5rem; - } + width: 100%; + border-collapse: collapse; + td.file-name { + width: 25%; + overflow-wrap: anywhere; + } + td.template { + width: 20%; + } + td.time-sent { + width: 20%; + } + td.sender { + width: 15%; + } + td.count-of-recipients { + width: 5%; + } + td.report { + width: 5%; + } + th { + padding: 0.5rem 0.5rem; } } diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index b5ca04c42..133b0a720 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -33,22 +33,22 @@ - - - - - - @@ -59,24 +59,24 @@ {% if job.job_id and job.notifications %} {% set notification = job.notifications[0] %} - - - - - - {% if job_and_notifications %} - {% for job in job_and_notifications %} + {% for job in job_and_notifications[:5] %} {% if job.job_id and job.notifications %} {% set notification = job.notifications[0] %} From 49d270521a96324085854d4f7544727de1f337ba Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 13 Feb 2024 13:29:38 -0800 Subject: [PATCH 028/195] revision requestsed changes --- app/assets/sass/uswds/_legacy-styles.scss | 4 ++-- app/templates/views/check/ok.html | 4 ---- app/templates/views/check/preview.html | 18 +++++++++--------- app/templates/views/notifications/preview.html | 10 +++++++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/assets/sass/uswds/_legacy-styles.scss b/app/assets/sass/uswds/_legacy-styles.scss index 242bb0f74..48cd63df8 100644 --- a/app/assets/sass/uswds/_legacy-styles.scss +++ b/app/assets/sass/uswds/_legacy-styles.scss @@ -48,8 +48,8 @@ } } -.sms-message-sender, .sms-message-file-name, .sms-message-scheduler { - margin: units(1) 0 0; +.sms-message-sender, .sms-message-file-name, .sms-message-scheduler, .sms-message-template { + margin: units(1) 0 units(1); } .sms-message-recipient { diff --git a/app/templates/views/check/ok.html b/app/templates/views/check/ok.html index 95fd1abea..6a925c7d1 100644 --- a/app/templates/views/check/ok.html +++ b/app/templates/views/check/ok.html @@ -34,10 +34,6 @@ }) }} {% endif %} - {% if not request.args.from_test %} -

Send list

-

{{ original_file_name }}

- {% endif %} {% set button_text %} Preview {% endset %} diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index ae8ecea91..379db7519 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -21,16 +21,16 @@ {{ page_header('Preview') }}

Message

- {% if scheduled_for %} -

Time: {{scheduled_for}}

- {% endif %} +

Scheduled: + {{ scheduled_for if scheduled_for else 'Now'}}

File: {{original_file_name}}

+

Template: {{template.name}}

{{ template|string }}
{% if not request.args.from_test %} -

Preview list

+

Recipients list

  • @@ -41,11 +41,11 @@
-
+
{% call(item, row_number) list_table( recipients.displayed_rows, - caption=original_file_name, - caption_visible=False, + caption="Note: Only the first 5 rows are dislayed here.", + caption_visible=True, field_headings=recipients.column_headers ) %} {% for column in recipients.column_headers %} @@ -63,10 +63,10 @@ {% endcall %}
{% endif %} -

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

+

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

Does everything look good?

{% set button_text %} - Send + {{ "Scheduled" if scheduled_for else 'Send'}} {% endset %} {{ usaButton({ "text": button_text }) }} diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html index 468e91f3b..b0b66efe7 100644 --- a/app/templates/views/notifications/preview.html +++ b/app/templates/views/notifications/preview.html @@ -40,9 +40,13 @@ {% endcall %}
{% else %} - {{ page_header('Preview of ‘{}’'.format(template.name)) }} + {{ page_header('Preview') }} {% endif %} +

Message

+

Scheduled: + {{ scheduled_for if scheduled_for else 'Now'}}

+

Template: {{template.name}}

{{ template|string }}
@@ -53,11 +57,11 @@ help='3' if help else 0 )}}" class='page-footer'> -

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

+

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

Does everything look good?

{% if not error %} {% set button_text %} - Send + {{ "Scheduled" if scheduled_for else 'Send'}} {% endset %} {{ usaButton({ "text": button_text }) }} {% endif %} From 01eac988f1d959b86af95503f1d5b256f6c8fd67 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 13 Feb 2024 14:02:05 -0800 Subject: [PATCH 029/195] fixed testing --- app/templates/views/check/preview.html | 2 +- tests/app/main/views/test_send.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index 379db7519..fda9bc5f6 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -44,7 +44,7 @@
{% call(item, row_number) list_table( recipients.displayed_rows, - caption="Note: Only the first 5 rows are dislayed here.", + caption="Note: Only the first 5 rows are displayed here.", caption_visible=True, field_headings=recipients.column_headers ) %} diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index f98bf789c..c25dfc2cf 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -971,7 +971,7 @@ def test_upload_valid_csv_shows_preview_and_table( ) assert page.h1.text.strip() == "Preview" - assert page.select("h2")[1].text.strip() == "Preview list" + assert page.select("h2")[1].text.strip() == "Recipients list" assert page.h2.text.strip() == "Message" assert page.select_one(".sms-message-recipient").text.strip() == expected_recipient assert page.select_one(".sms-message-wrapper").text.strip() == expected_message @@ -2628,7 +2628,7 @@ def test_preview_notification_shows_preview( # assert page.h1.text.strip() == when # else: # assert page.h1.text.strip() == "Now" - assert page.h1.text.strip() == "Preview of ‘Two week reminder’" + assert page.h1.text.strip() == "Preview" assert (page.find_all("a", {"class": "usa-back-link"})[0]["href"]) == url_for( "main.check_notification", service_id=service_one["id"], From 843e4bb2faa3e4a848bb77df3b1cda893fb54158 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 13 Feb 2024 16:18:50 -0800 Subject: [PATCH 030/195] fixed testing and removed recipient --- app/main/views/send.py | 2 +- tests/app/main/views/test_send.py | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 90834d965..df53ef3c6 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -502,7 +502,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): template = get_template( db_template, current_service, - show_recipient=True, + show_recipient=False, email_reply_to=email_reply_to, sms_sender=sms_sender, ) diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index c25dfc2cf..0586d74e1 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -908,26 +908,22 @@ def test_upload_valid_csv_redirects_to_check_page( ( "extra_args", "expected_link_in_first_row", - "expected_recipient", "expected_message", ), [ ( {}, None, - "To: 2028675301", "Test Service: A, Template content with & entity", ), ( {"row_index": 2}, None, - "To: 2028675301", "Test Service: A, Template content with & entity", ), ( {"row_index": 4}, True, - "To: 2028675303", "Test Service: C, Template content with & entity", ), ], @@ -946,7 +942,6 @@ def test_upload_valid_csv_shows_preview_and_table( fake_uuid, extra_args, expected_link_in_first_row, - expected_recipient, expected_message, ): with client_request.session_transaction() as session: @@ -973,7 +968,6 @@ def test_upload_valid_csv_shows_preview_and_table( assert page.h1.text.strip() == "Preview" assert page.select("h2")[1].text.strip() == "Recipients list" assert page.h2.text.strip() == "Message" - assert page.select_one(".sms-message-recipient").text.strip() == expected_recipient assert page.select_one(".sms-message-wrapper").text.strip() == expected_message assert not page.select_one(".table-field-index") @@ -2895,7 +2889,6 @@ def test_send_notification_shows_email_error_in_trial_mode( @pytest.mark.parametrize( ("endpoint", "extra_args"), [ - ("main.check_messages", {"template_id": uuid4(), "upload_id": uuid4()}), ("main.send_one_off_step", {"template_id": uuid4(), "step_index": 0}), ], ) From 53549495ea8777e0b51e708bb4b7ea952c4bfe39 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 14 Feb 2024 10:39:52 -0800 Subject: [PATCH 031/195] remove Type and change Job to Batch File --- app/utils/csv.py | 8 ++------ tests/app/utils/test_csv.py | 20 +++++++------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/app/utils/csv.py b/app/utils/csv.py index 679bdb84a..ff3c43335 100644 --- a/app/utils/csv.py +++ b/app/utils/csv.py @@ -80,9 +80,8 @@ def generate_notifications_csv(**kwargs): original_column_headers = original_upload.column_headers fieldnames = [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -95,9 +94,8 @@ def generate_notifications_csv(**kwargs): fieldnames = [ "Recipient", "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -119,7 +117,6 @@ def generate_notifications_csv(**kwargs): if kwargs.get("job_id"): values = [ notification["template_name"], - notification["template_type"], notification["created_by_name"], notification["job_name"], notification["provider_response"], @@ -136,7 +133,6 @@ def generate_notifications_csv(**kwargs): values = [ notification["recipient"], notification["template_name"], - notification["template_type"], notification["created_by_name"] or "", notification["job_name"] or "", notification["provider_response"], diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index a3dc446d2..6963aedfe 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -88,15 +88,15 @@ def get_notifications_csv_mock( ( None, [ - "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", - "foo@bar.com,foo,sms,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", + "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", + "foo@bar.com,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", ], ), ( "Anne Example", [ - "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", - "foo@bar.com,foo,sms,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa + "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", + "foo@bar.com,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa ], ), ], @@ -129,9 +129,8 @@ def test_generate_notifications_csv_without_job( """, [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -139,7 +138,6 @@ def test_generate_notifications_csv_without_job( ], [ "foo", - "sms", "Fake Person", "bar.csv", "Did not like it", @@ -155,9 +153,8 @@ def test_generate_notifications_csv_without_job( """, [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -168,7 +165,6 @@ def test_generate_notifications_csv_without_job( ], [ "foo", - "sms", "Fake Person", "bar.csv", "Did not like it", @@ -187,9 +183,8 @@ def test_generate_notifications_csv_without_job( """, [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -200,7 +195,6 @@ def test_generate_notifications_csv_without_job( ], [ "foo", - "sms", "Fake Person", "bar.csv", "Did not like it", From d7606b2986b9820a7e8e6423081d1f2f98dd5350 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 15 Feb 2024 10:40:15 -0800 Subject: [PATCH 032/195] added PR requested changes --- app/main/views/dashboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index b6370a4b2..c2a11eccf 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -54,7 +54,7 @@ def service_dashboard(service_id): aggregate_notifications_by_job = defaultdict(list) for notification in notifications_response: - job_id = notification.get("job", {}).get("id") + job_id = notification.get("job", {}).get("id", None) if job_id: aggregate_notifications_by_job[job_id].append(notification) From eccf8cb3e7b669eb7ec4af031cb93461f91b6d8c Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 16 Feb 2024 11:44:25 -0800 Subject: [PATCH 033/195] added new change from ux meeting as requested --- app/assets/sass/uswds/_legacy-styles.scss | 4 ++-- app/main/views/send.py | 24 ++++++++++++++++--- app/templates/views/check/preview.html | 17 +++++++------ .../views/notifications/preview.html | 17 +++++++------ 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/app/assets/sass/uswds/_legacy-styles.scss b/app/assets/sass/uswds/_legacy-styles.scss index 48cd63df8..b96a24844 100644 --- a/app/assets/sass/uswds/_legacy-styles.scss +++ b/app/assets/sass/uswds/_legacy-styles.scss @@ -48,8 +48,8 @@ } } -.sms-message-sender, .sms-message-file-name, .sms-message-scheduler, .sms-message-template { - margin: units(1) 0 units(1); +.sms-message-sender, .sms-message-file-name, .sms-message-scheduler, .sms-message-template, .sms-message-sender { + margin:0.25rem 0 0; } .sms-message-recipient { diff --git a/app/main/views/send.py b/app/main/views/send.py index df53ef3c6..a8367f7da 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -39,7 +39,7 @@ from app.utils import PermanentRedirect, should_skip_template_page, unicode_trun from app.utils.csv import Spreadsheet, get_errors_for_csv from app.utils.templates import get_template from app.utils.user import user_has_permissions - +from pprint import pprint def get_example_csv_fields(column_headers, use_example_as_example, submitted_fields): if use_example_as_example: @@ -574,6 +574,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): service_id, template.id, db_template["version"], original_file_name ), template_id=template_id, + db_template=db_template ) @@ -617,6 +618,7 @@ def check_messages(service_id, template_id, upload_id, row_index=2): metadata_kwargs["sender_id"] = session["sender_id"] set_metadata_on_csv_upload(service_id, upload_id, **metadata_kwargs) + return render_template("views/check/ok.html", **data) @@ -649,8 +651,14 @@ def preview_job(service_id, template_id, upload_id, row_index=2): if data["errors"]: return render_template("views/check/column-errors.html", **data) + simplifed_template = get_template( + data.get('db_template', {}), + current_service, + ) + return render_template( - "views/check/preview.html", scheduled_for=session["scheduled_for"], **data + "views/check/preview.html", scheduled_for=session["scheduled_for"], **data, + simplifed_template=simplifed_template ) @@ -857,6 +865,7 @@ def _check_notification(service_id, template_id, exception=None): back_link=back_link, back_link_from_preview=back_link_from_preview, choose_time_form=choose_time_form, + db_template=db_template, **(get_template_error_dict(exception) if exception else {}), ) @@ -904,11 +913,20 @@ def preview_notification(service_id, template_id): ) session["scheduled_for"] = request.args.get("scheduled_for", "") + data = _check_notification(service_id, template_id) + db_template = data.get('db_template', None) + + simplifed_template = get_template( + db_template, + current_service, + ) return render_template( "views/notifications/preview.html", - **_check_notification(service_id, template_id), + **data, scheduled_for=session["scheduled_for"], + simplifed_template=simplifed_template, + recipient=recipient, ) diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index fda9bc5f6..f6fe2cb04 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -20,12 +20,15 @@ {% block maincolumn_content %} {{ page_header('Preview') }} +
+

Scheduled: {{ scheduled_for if scheduled_for else 'Now'}}

+

File: {{original_file_name}}

+

Template: {{template.name}}

+

From: {{ template.sender }}

+
+

Message

-

Scheduled: - {{ scheduled_for if scheduled_for else 'Now'}}

-

File: {{original_file_name}}

-

Template: {{template.name}}

- {{ template|string }} +
{{ simplifed_template|string }}
@@ -63,10 +66,10 @@ {% endcall %}
{% endif %} -

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

+

Does everything look good?

{% set button_text %} - {{ "Scheduled" if scheduled_for else 'Send'}} + {{ "Schedule" if scheduled_for else 'Send'}} {% endset %} {{ usaButton({ "text": button_text }) }} diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html index b0b66efe7..13ef103b0 100644 --- a/app/templates/views/notifications/preview.html +++ b/app/templates/views/notifications/preview.html @@ -5,7 +5,7 @@ {% from "components/components/button/macro.njk" import usaButton %} {% block service_page_title %} - {{ "Error" if error else "Preview of ‘{}’".format(template.name) }} + {{ "Error" if error else "Preview" }} {% endblock %} {% block backLink %} @@ -42,12 +42,15 @@ {% else %} {{ page_header('Preview') }} {% endif %} -

Message

+
+

Scheduled: {{ scheduled_for if scheduled_for else 'Now'}}

+

Template: {{template.name}}

+

From: {{ template.sender }}

+

To: {{ recipient }}

+
-

Scheduled: - {{ scheduled_for if scheduled_for else 'Now'}}

-

Template: {{template.name}}

- {{ template|string }} +

Message

+
{{ simplifed_template|string }}
Date: Fri, 16 Feb 2024 11:54:59 -0800 Subject: [PATCH 034/195] merge main --- app/main/views/send.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index a8367f7da..b53d763b0 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -39,7 +39,7 @@ from app.utils import PermanentRedirect, should_skip_template_page, unicode_trun from app.utils.csv import Spreadsheet, get_errors_for_csv from app.utils.templates import get_template from app.utils.user import user_has_permissions -from pprint import pprint + def get_example_csv_fields(column_headers, use_example_as_example, submitted_fields): if use_example_as_example: @@ -915,7 +915,6 @@ def preview_notification(service_id, template_id): session["scheduled_for"] = request.args.get("scheduled_for", "") data = _check_notification(service_id, template_id) db_template = data.get('db_template', None) - simplifed_template = get_template( db_template, current_service, From c38388401736566c772424eb36b2ad34a8cd21d5 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 16 Feb 2024 17:19:03 -0800 Subject: [PATCH 035/195] fixed test --- app/main/views/send.py | 35 ++++---- app/templates/views/check/preview.html | 89 +++++++++---------- .../views/notifications/preview.html | 2 +- 3 files changed, 62 insertions(+), 64 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index b53d763b0..9f98c9a71 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -506,9 +506,14 @@ def _check_messages(service_id, template_id, upload_id, preview_row): email_reply_to=email_reply_to, sms_sender=sms_sender, ) + simplifed_template = get_template( + db_template, + current_service, + show_recipient=False, + ) recipients = RecipientCSV( contents, - template=template, + template=template or simplifed_template, max_initial_rows_shown=50, max_errors_shown=50, guestlist=itertools.chain.from_iterable( @@ -547,6 +552,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): if preview_row < len(recipients) + 2: template.values = recipients[preview_row - 2].recipient_and_personalisation + simplifed_template.values = recipients[preview_row - 2].recipient_and_personalisation elif preview_row > 2: abort(404) @@ -574,7 +580,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): service_id, template.id, db_template["version"], original_file_name ), template_id=template_id, - db_template=db_template + simplifed_template=simplifed_template, ) @@ -651,14 +657,10 @@ def preview_job(service_id, template_id, upload_id, row_index=2): if data["errors"]: return render_template("views/check/column-errors.html", **data) - simplifed_template = get_template( - data.get('db_template', {}), - current_service, - ) - return render_template( - "views/check/preview.html", scheduled_for=session["scheduled_for"], **data, - simplifed_template=simplifed_template + "views/check/preview.html", + scheduled_for=session["scheduled_for"], + **data, ) @@ -841,7 +843,10 @@ def _check_notification(service_id, template_id, exception=None): email_reply_to=email_reply_to, sms_sender=sms_sender, ) - + simplifed_template = get_template( + db_template, + current_service, + ) placeholders = fields_to_fill_in(template) back_link = get_back_link(service_id, template, len(placeholders), placeholders) @@ -867,6 +872,7 @@ def _check_notification(service_id, template_id, exception=None): choose_time_form=choose_time_form, db_template=db_template, **(get_template_error_dict(exception) if exception else {}), + simplifed_template=simplifed_template ) @@ -913,18 +919,11 @@ def preview_notification(service_id, template_id): ) session["scheduled_for"] = request.args.get("scheduled_for", "") - data = _check_notification(service_id, template_id) - db_template = data.get('db_template', None) - simplifed_template = get_template( - db_template, - current_service, - ) return render_template( "views/notifications/preview.html", - **data, + **_check_notification(service_id, template_id), scheduled_for=session["scheduled_for"], - simplifed_template=simplifed_template, recipient=recipient, ) diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index f6fe2cb04..d47e9e779 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -29,50 +29,49 @@

Message

{{ simplifed_template|string }}
-
- - - {% if not request.args.from_test %} -

Recipients list

-
    -
  • -
    - Description Icon -
    -
    -

    {{ original_file_name }}

    -
    -
    • -
-
- {% call(item, row_number) list_table( - recipients.displayed_rows, - caption="Note: Only the first 5 rows are displayed here.", - caption_visible=True, - field_headings=recipients.column_headers - ) %} - {% for column in recipients.column_headers %} - {% if 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 %} - -

Does everything look good?

- {% set button_text %} - {{ "Schedule" if scheduled_for else 'Send'}} - {% endset %} - {{ usaButton({ "text": button_text }) }} - - + {% if not request.args.from_test %} +

Recipients list

+
+
    +
  • + Description Icon +
    +

    {{ original_file_name }}

    +
    +
    • +
+
+ {% call(item, row_number) list_table( + recipients.displayed_rows, + caption="Note: Only the first 5 rows are displayed here.", + caption_visible=True, + field_headings=recipients.column_headers + ) %} + {% for column in recipients.column_headers %} + {% if 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 %} + +
+ +

Does everything look good?

+ {% set button_text %} + {{ "Schedule" if scheduled_for else 'Send'}} + {% endset %} + {{ usaButton({ "text": button_text }) }} + {% endblock %} diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html index 13ef103b0..a22fda5bb 100644 --- a/app/templates/views/notifications/preview.html +++ b/app/templates/views/notifications/preview.html @@ -60,7 +60,7 @@ help='3' if help else 0 )}}" class='page-footer'> -

Placeholder: This message will be delivered to 400 phone numbers and will use a total of 800 message parts, leaving Washington DSHS with 249,200 message parts remaining.

+

Does everything look good?

{% if not error %} {% set button_text %} From 02d1c2b26eaa21eadec3eb52a293954fd30da075 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 16 Feb 2024 18:01:36 -0800 Subject: [PATCH 036/195] fixed test --- app/main/views/send.py | 1 - tests/app/main/views/test_send.py | 12 ++---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 9f98c9a71..4460c20ad 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -870,7 +870,6 @@ def _check_notification(service_id, template_id, exception=None): back_link=back_link, back_link_from_preview=back_link_from_preview, choose_time_form=choose_time_form, - db_template=db_template, **(get_template_error_dict(exception) if exception else {}), simplifed_template=simplifed_template ) diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 0586d74e1..019331d64 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -1876,9 +1876,8 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers( ) assert "Select delivery time" in page.text - # assert "202 867 0749" in page.text - # assert "202 867 0750" not in page.text - # assert "Only showing the first 50 rows" in page.text + assert "202 867 0749" not in page.text + assert "202 867 0750" not in page.text mock_get_notification_count.assert_called_with(service_one["id"]) @@ -2611,24 +2610,17 @@ def test_preview_notification_shows_preview( session["recipient"] = "2028675301" session["placeholders"] = {} - # with client_request.session_transaction() as session: - # session["scheduled_for"] = when page = client_request.get( "main.preview_notification", service_id=service_one["id"], template_id=fake_uuid ) - # if when: - # assert page.h1.text.strip() == when - # else: - # assert page.h1.text.strip() == "Now" assert page.h1.text.strip() == "Preview" assert (page.find_all("a", {"class": "usa-back-link"})[0]["href"]) == url_for( "main.check_notification", service_id=service_one["id"], template_id=fake_uuid, ) - # assert tour not visible assert not page.select(".banner-tour") From 2e7aeb1dbf83141e449acdf3eb373f0a26807060 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 16 Feb 2024 18:05:13 -0800 Subject: [PATCH 037/195] fixed test --- tests/app/main/views/test_send.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 019331d64..5fcf1fc14 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -2610,11 +2610,9 @@ def test_preview_notification_shows_preview( session["recipient"] = "2028675301" session["placeholders"] = {} - page = client_request.get( "main.preview_notification", service_id=service_one["id"], template_id=fake_uuid ) - assert page.h1.text.strip() == "Preview" assert (page.find_all("a", {"class": "usa-back-link"})[0]["href"]) == url_for( "main.check_notification", From e3ff679b5ed15099b32e9f40c3330ba48acdf38b Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 20 Feb 2024 11:32:05 -0800 Subject: [PATCH 038/195] added padding to td --- app/assets/sass/uswds/_uswds-theme-custom-styles.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index addf9cc7a..1236eaf5b 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -405,6 +405,9 @@ td.table-empty-message { th { padding: 0.5rem 0.5rem; } + td { + padding: 0.8rem; + } } #template-list { From 60bcd9ddbd7c228efe8a04732ac06f3eb9f2ca8b Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 20 Feb 2024 11:56:26 -0800 Subject: [PATCH 039/195] added padding to td --- app/assets/sass/uswds/_uswds-theme-custom-styles.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index 1236eaf5b..1d55791df 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -403,10 +403,10 @@ td.table-empty-message { width: 5%; } th { - padding: 0.5rem 0.5rem; + padding: 0.5rem 1rem } td { - padding: 0.8rem; + padding: 0.5rem 1rem } } From 4742cc77b5bd94fafd77566dcd35681e5b7761ca Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Feb 2024 07:45:21 -0800 Subject: [PATCH 040/195] change batch file report to look like full csv report --- app/main/views/dashboard.py | 4 +++- app/utils/csv.py | 16 ++++++++++------ tests/app/main/views/test_dashboard.py | 2 +- tests/app/utils/test_csv.py | 24 ++++++++++++------------ 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index c2a11eccf..24b3e0490 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -49,7 +49,9 @@ def service_dashboard(service_id): return redirect(url_for("main.choose_template", service_id=service_id)) job_response = job_api_client.get_jobs(service_id)["data"] - notifications_response = notification_api_client.get_notifications_for_service(service_id)["notifications"] + notifications_response = notification_api_client.get_notifications_for_service( + service_id + )["notifications"] service_data_retention_days = 7 aggregate_notifications_by_job = defaultdict(list) diff --git a/app/utils/csv.py b/app/utils/csv.py index ff3c43335..e923b2eb2 100644 --- a/app/utils/csv.py +++ b/app/utils/csv.py @@ -79,6 +79,7 @@ def generate_notifications_csv(**kwargs): ) original_column_headers = original_upload.column_headers fieldnames = [ + "Recipient", "Template", "Sent by", "Batch File", @@ -87,7 +88,8 @@ def generate_notifications_csv(**kwargs): "Time", ] for header in original_column_headers: - fieldnames.append(header) + if header.lower() != "phone number": + fieldnames.append(header) else: # TODO This is deprecated because everything should be a job now, is it ever invoked? @@ -113,9 +115,9 @@ def generate_notifications_csv(**kwargs): notification["created_at"] ) - current_app.logger.info(f"\n\n{notification}") if kwargs.get("job_id"): values = [ + notification["recipient"], notification["template_name"], notification["created_by_name"], notification["job_name"], @@ -124,12 +126,14 @@ def generate_notifications_csv(**kwargs): preferred_tz_created_at, ] for header in original_column_headers: - values.append( - original_upload[notification["row_number"] - 1].get(header).data - ) + if header.lower() != "phone number": + values.append( + original_upload[notification["row_number"] - 1] + .get(header) + .data + ) else: - # TODO This is deprecated, should not be invoked. See above values = [ notification["recipient"], notification["template_name"], diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 53a8a7feb..37674e797 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -122,7 +122,7 @@ MOCK_JOBS_AND_NOTIFICATIONS = [ "notification_count": MOCK_JOBS["data"][0]["notification_count"], "notifications": FAKE_ONE_OFF_NOTIFICATION["notifications"], "time_left": "Data available for 7 days", - "view_job_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa" + "view_job_link": "/services/21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3/jobs/463b5ecb-4e32-43e5-aa90-0234d19fceaa", }, ] diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index 6963aedfe..4a43b81c3 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -14,7 +14,7 @@ from tests.conftest import fake_uuid def _get_notifications_csv( row_number=1, - recipient="foo@bar.com", + recipient="2028675309", template_name="foo", template_type="sms", job_name="bar.csv", @@ -89,14 +89,14 @@ def get_notifications_csv_mock( None, [ "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", - "foo@bar.com,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", + "2028675309,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", ], ), ( "Anne Example", [ "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", - "foo@bar.com,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa + "2028675309,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa ], ), ], @@ -124,53 +124,53 @@ def test_generate_notifications_csv_without_job( [ ( """ - phone_number + phone number 2028675309 """, [ + "Recipient", "Template", "Sent by", "Batch File", "Carrier Response", "Status", "Time", - "phone_number", ], [ + "2028675309", "foo", "Fake Person", "bar.csv", "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", - "2028675309", ], ), ( """ - phone_number, a, b, c + phone number, a, b, c 2028675309, 🐜,🐝,🦀 """, [ + "Recipient", "Template", "Sent by", "Batch File", "Carrier Response", "Status", "Time", - "phone_number", "a", "b", "c", ], [ + "2028675309", "foo", "Fake Person", "bar.csv", "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", - "2028675309", "🐜", "🐝", "🦀", @@ -178,29 +178,29 @@ def test_generate_notifications_csv_without_job( ), ( """ - "phone_number", "a", "b", "c" + "phone number", "a", "b", "c" "2028675309","🐜,🐜","🐝,🐝","🦀" """, [ + "Recipient", "Template", "Sent by", "Batch File", "Carrier Response", "Status", "Time", - "phone_number", "a", "b", "c", ], [ + "2028675309", "foo", "Fake Person", "bar.csv", "Did not like it", "Delivered", "1943-04-19 08:00:00 AM US/Eastern", - "2028675309", "🐜,🐜", "🐝,🐝", "🦀", From 3363cc6979fc659e2148bea12d5118e34dfd58bc Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Feb 2024 09:09:45 -0800 Subject: [PATCH 041/195] change test phone number --- tests/app/utils/test_csv.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index 4a43b81c3..78a1da42b 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -14,7 +14,7 @@ from tests.conftest import fake_uuid def _get_notifications_csv( row_number=1, - recipient="2028675309", + recipient="8005555555", template_name="foo", template_type="sms", job_name="bar.csv", @@ -89,14 +89,14 @@ def get_notifications_csv_mock( None, [ "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", - "2028675309,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", + "8005555555,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", ], ), ( "Anne Example", [ "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", - "2028675309,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa + "8005555555,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa ], ), ], @@ -125,7 +125,7 @@ def test_generate_notifications_csv_without_job( ( """ phone number - 2028675309 + 8005555555 """, [ "Recipient", @@ -137,7 +137,7 @@ def test_generate_notifications_csv_without_job( "Time", ], [ - "2028675309", + "8005555555", "foo", "Fake Person", "bar.csv", @@ -149,7 +149,7 @@ def test_generate_notifications_csv_without_job( ( """ phone number, a, b, c - 2028675309, 🐜,🐝,🦀 + 8005555555, 🐜,🐝,🦀 """, [ "Recipient", @@ -164,7 +164,7 @@ def test_generate_notifications_csv_without_job( "c", ], [ - "2028675309", + "8005555555", "foo", "Fake Person", "bar.csv", @@ -179,7 +179,7 @@ def test_generate_notifications_csv_without_job( ( """ "phone number", "a", "b", "c" - "2028675309","🐜,🐜","🐝,🐝","🦀" + "8005555555","🐜,🐜","🐝,🐝","🦀" """, [ "Recipient", @@ -194,7 +194,7 @@ def test_generate_notifications_csv_without_job( "c", ], [ - "2028675309", + "8005555555", "foo", "Fake Person", "bar.csv", From 96d5e7251452e9af586d89ccde5ff9170d4bacdf Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Feb 2024 10:30:24 -0800 Subject: [PATCH 042/195] change Recipient to Phone Number --- app/utils/csv.py | 8 ++++---- tests/app/utils/test_csv.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/utils/csv.py b/app/utils/csv.py index e923b2eb2..04d5d19ed 100644 --- a/app/utils/csv.py +++ b/app/utils/csv.py @@ -71,6 +71,7 @@ def generate_notifications_csv(**kwargs): if "page" not in kwargs: kwargs["page"] = 1 + # This generates the "batch" csv report if kwargs.get("job_id"): original_file_contents = s3download(kwargs["service_id"], kwargs["job_id"]) original_upload = RecipientCSV( @@ -79,7 +80,7 @@ def generate_notifications_csv(**kwargs): ) original_column_headers = original_upload.column_headers fieldnames = [ - "Recipient", + "Phone Number", "Template", "Sent by", "Batch File", @@ -92,9 +93,9 @@ def generate_notifications_csv(**kwargs): fieldnames.append(header) else: - # TODO This is deprecated because everything should be a job now, is it ever invoked? + # This generates the "full" csv report fieldnames = [ - "Recipient", + "Phone Number", "Template", "Sent by", "Batch File", @@ -102,7 +103,6 @@ def generate_notifications_csv(**kwargs): "Status", "Time", ] - current_app.logger.warning("Invoking deprecated report format") yield ",".join(fieldnames) + "\n" diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index 78a1da42b..a7e77055b 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -88,14 +88,14 @@ def get_notifications_csv_mock( ( None, [ - "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", + "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n", "8005555555,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", ], ), ( "Anne Example", [ - "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", + "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n", "8005555555,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa ], ), @@ -128,7 +128,7 @@ def test_generate_notifications_csv_without_job( 8005555555 """, [ - "Recipient", + "Phone Number", "Template", "Sent by", "Batch File", @@ -152,7 +152,7 @@ def test_generate_notifications_csv_without_job( 8005555555, 🐜,🐝,🦀 """, [ - "Recipient", + "Phone Number", "Template", "Sent by", "Batch File", @@ -182,7 +182,7 @@ def test_generate_notifications_csv_without_job( "8005555555","🐜,🐜","🐝,🐝","🦀" """, [ - "Recipient", + "Phone Number", "Template", "Sent by", "Batch File", From c20ec8075331981ac285a9520f25ef28de63a800 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Feb 2024 11:46:26 -0800 Subject: [PATCH 043/195] update notifications-utils? --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 86b3d047b..d74786a75 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1729,7 +1729,7 @@ werkzeug = "^3.0.1" type = "git" url = "https://github.com/GSA/notifications-utils.git" reference = "HEAD" -resolved_reference = "a48171e865eb83cf29c75751be7369f396cbe3e2" +resolved_reference = "70ee61cd0f87113d2bd838b197dbe38cc09678f3" [[package]] name = "numpy" From 393dddea61d12b9f21f8e701febc82fd756eeeb9 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 21 Feb 2024 12:49:26 -0800 Subject: [PATCH 044/195] update notifications-utils again --- poetry.lock | 72 ++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/poetry.lock b/poetry.lock index d74786a75..2123e9dd4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -529,43 +529,43 @@ toml = ["tomli"] [[package]] name = "cryptography" -version = "42.0.2" +version = "42.0.4" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." optional = false python-versions = ">=3.7" files = [ - {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:701171f825dcab90969596ce2af253143b93b08f1a716d4b2a9d2db5084ef7be"}, - {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:61321672b3ac7aade25c40449ccedbc6db72c7f5f0fdf34def5e2f8b51ca530d"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea2c3ffb662fec8bbbfce5602e2c159ff097a4631d96235fcf0fb00e59e3ece4"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b15c678f27d66d247132cbf13df2f75255627bcc9b6a570f7d2fd08e8c081d2"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8e88bb9eafbf6a4014d55fb222e7360eef53e613215085e65a13290577394529"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a047682d324ba56e61b7ea7c7299d51e61fd3bca7dad2ccc39b72bd0118d60a1"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:36d4b7c4be6411f58f60d9ce555a73df8406d484ba12a63549c88bd64f7967f1"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:a00aee5d1b6c20620161984f8ab2ab69134466c51f58c052c11b076715e72929"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b97fe7d7991c25e6a31e5d5e795986b18fbbb3107b873d5f3ae6dc9a103278e9"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:5fa82a26f92871eca593b53359c12ad7949772462f887c35edaf36f87953c0e2"}, - {file = "cryptography-42.0.2-cp37-abi3-win32.whl", hash = "sha256:4b063d3413f853e056161eb0c7724822a9740ad3caa24b8424d776cebf98e7ee"}, - {file = "cryptography-42.0.2-cp37-abi3-win_amd64.whl", hash = "sha256:841ec8af7a8491ac76ec5a9522226e287187a3107e12b7d686ad354bb78facee"}, - {file = "cryptography-42.0.2-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:55d1580e2d7e17f45d19d3b12098e352f3a37fe86d380bf45846ef257054b242"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cb2c41f131a5758d6ba6a0504150d644054fd9f3203a1e8e8d7ac3aea7f73a"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9097a208875fc7bbeb1286d0125d90bdfed961f61f214d3f5be62cd4ed8a446"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:44c95c0e96b3cb628e8452ec060413a49002a247b2b9938989e23a2c8291fc90"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2f9f14185962e6a04ab32d1abe34eae8a9001569ee4edb64d2304bf0d65c53f3"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:09a77e5b2e8ca732a19a90c5bca2d124621a1edb5438c5daa2d2738bfeb02589"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad28cff53f60d99a928dfcf1e861e0b2ceb2bc1f08a074fdd601b314e1cc9e0a"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:130c0f77022b2b9c99d8cebcdd834d81705f61c68e91ddd614ce74c657f8b3ea"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:fa3dec4ba8fb6e662770b74f62f1a0c7d4e37e25b58b2bf2c1be4c95372b4a33"}, - {file = "cryptography-42.0.2-cp39-abi3-win32.whl", hash = "sha256:3dbd37e14ce795b4af61b89b037d4bc157f2cb23e676fa16932185a04dfbf635"}, - {file = "cryptography-42.0.2-cp39-abi3-win_amd64.whl", hash = "sha256:8a06641fb07d4e8f6c7dda4fc3f8871d327803ab6542e33831c7ccfdcb4d0ad6"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:087887e55e0b9c8724cf05361357875adb5c20dec27e5816b653492980d20380"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:a7ef8dd0bf2e1d0a27042b231a3baac6883cdd5557036f5e8df7139255feaac6"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4383b47f45b14459cab66048d384614019965ba6c1a1a141f11b5a551cace1b2"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:fbeb725c9dc799a574518109336acccaf1303c30d45c075c665c0793c2f79a7f"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:320948ab49883557a256eab46149df79435a22d2fefd6a66fe6946f1b9d9d008"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5ef9bc3d046ce83c4bbf4c25e1e0547b9c441c01d30922d812e887dc5f125c12"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:52ed9ebf8ac602385126c9a2fe951db36f2cb0c2538d22971487f89d0de4065a"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:141e2aa5ba100d3788c0ad7919b288f89d1fe015878b9659b307c9ef867d3a65"}, - {file = "cryptography-42.0.2.tar.gz", hash = "sha256:e0ec52ba3c7f1b7d813cd52649a5b3ef1fc0d433219dc8c93827c57eab6cf888"}, + {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:ffc73996c4fca3d2b6c1c8c12bfd3ad00def8621da24f547626bf06441400449"}, + {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:db4b65b02f59035037fde0998974d84244a64c3265bdef32a827ab9b63d61b18"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dad9c385ba8ee025bb0d856714f71d7840020fe176ae0229de618f14dae7a6e2"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:69b22ab6506a3fe483d67d1ed878e1602bdd5912a134e6202c1ec672233241c1"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:e09469a2cec88fb7b078e16d4adec594414397e8879a4341c6ace96013463d5b"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3e970a2119507d0b104f0a8e281521ad28fc26f2820687b3436b8c9a5fcf20d1"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:e53dc41cda40b248ebc40b83b31516487f7db95ab8ceac1f042626bc43a2f992"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:c3a5cbc620e1e17009f30dd34cb0d85c987afd21c41a74352d1719be33380885"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:6bfadd884e7280df24d26f2186e4e07556a05d37393b0f220a840b083dc6a824"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:01911714117642a3f1792c7f376db572aadadbafcd8d75bb527166009c9f1d1b"}, + {file = "cryptography-42.0.4-cp37-abi3-win32.whl", hash = "sha256:fb0cef872d8193e487fc6bdb08559c3aa41b659a7d9be48b2e10747f47863925"}, + {file = "cryptography-42.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c1f25b252d2c87088abc8bbc4f1ecbf7c919e05508a7e8628e6875c40bc70923"}, + {file = "cryptography-42.0.4-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:15a1fb843c48b4a604663fa30af60818cd28f895572386e5f9b8a665874c26e7"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1327f280c824ff7885bdeef8578f74690e9079267c1c8bd7dc5cc5aa065ae52"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ffb03d419edcab93b4b19c22ee80c007fb2d708429cecebf1dd3258956a563a"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:1df6fcbf60560d2113b5ed90f072dc0b108d64750d4cbd46a21ec882c7aefce9"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:44a64043f743485925d3bcac548d05df0f9bb445c5fcca6681889c7c3ab12764"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c6048f217533d89f2f8f4f0fe3044bf0b2090453b7b73d0b77db47b80af8dff"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6d0fbe73728c44ca3a241eff9aefe6496ab2656d6e7a4ea2459865f2e8613257"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:887623fe0d70f48ab3f5e4dbf234986b1329a64c066d719432d0698522749929"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:ce8613beaffc7c14f091497346ef117c1798c202b01153a8cc7b8e2ebaaf41c0"}, + {file = "cryptography-42.0.4-cp39-abi3-win32.whl", hash = "sha256:810bcf151caefc03e51a3d61e53335cd5c7316c0a105cc695f0959f2c638b129"}, + {file = "cryptography-42.0.4-cp39-abi3-win_amd64.whl", hash = "sha256:a0298bdc6e98ca21382afe914c642620370ce0470a01e1bef6dd9b5354c36854"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5f8907fcf57392cd917892ae83708761c6ff3c37a8e835d7246ff0ad251d9298"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:12d341bd42cdb7d4937b0cabbdf2a94f949413ac4504904d0cdbdce4a22cbf88"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1cdcdbd117681c88d717437ada72bdd5be9de117f96e3f4d50dab3f59fd9ab20"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:0e89f7b84f421c56e7ff69f11c441ebda73b8a8e6488d322ef71746224c20fce"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f1e85a178384bf19e36779d91ff35c7617c885da487d689b05c1366f9933ad74"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d2a27aca5597c8a71abbe10209184e1a8e91c1fd470b5070a2ea60cafec35bcd"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4e36685cb634af55e0677d435d425043967ac2f3790ec652b2b88ad03b85c27b"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f47be41843200f7faec0683ad751e5ef11b9a56a220d57f300376cd8aba81660"}, + {file = "cryptography-42.0.4.tar.gz", hash = "sha256:831a4b37accef30cccd34fcb916a5d7b5be3cbbe27268a02832c3e450aea39cb"}, ] [package.dependencies] @@ -1677,7 +1677,7 @@ requests = ">=2.0.0" [[package]] name = "notifications-utils" -version = "0.2.8" +version = "0.2.9" description = "" optional = false python-versions = ">=3.9,<3.12" @@ -1695,7 +1695,7 @@ certifi = "^2023.7.22" cffi = "^1.16.0" charset-normalizer = "^3.1.0" click = "^8.1.3" -cryptography = "^42.0.0" +cryptography = "^42.0.4" flask = "^2.3.2" flask-redis = "^0.4.0" geojson = "^3.0.1" @@ -1729,7 +1729,7 @@ werkzeug = "^3.0.1" type = "git" url = "https://github.com/GSA/notifications-utils.git" reference = "HEAD" -resolved_reference = "70ee61cd0f87113d2bd838b197dbe38cc09678f3" +resolved_reference = "df8ece836cad303c5d161edf485cf9bbdc666688" [[package]] name = "numpy" From 14b68c044fa82ee96f56571fb8bd0e03d7a8cb0b Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Wed, 21 Feb 2024 15:51:05 -0500 Subject: [PATCH 045/195] Update utils to 0.2.9 quote> quote> This changeset updates notifications-utils to 0.2.9 to account for a recent cryptography update. Signed-off-by: Carlo Costino --- poetry.lock | 72 ++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/poetry.lock b/poetry.lock index 86b3d047b..2123e9dd4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -529,43 +529,43 @@ toml = ["tomli"] [[package]] name = "cryptography" -version = "42.0.2" +version = "42.0.4" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." optional = false python-versions = ">=3.7" files = [ - {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:701171f825dcab90969596ce2af253143b93b08f1a716d4b2a9d2db5084ef7be"}, - {file = "cryptography-42.0.2-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:61321672b3ac7aade25c40449ccedbc6db72c7f5f0fdf34def5e2f8b51ca530d"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea2c3ffb662fec8bbbfce5602e2c159ff097a4631d96235fcf0fb00e59e3ece4"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b15c678f27d66d247132cbf13df2f75255627bcc9b6a570f7d2fd08e8c081d2"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8e88bb9eafbf6a4014d55fb222e7360eef53e613215085e65a13290577394529"}, - {file = "cryptography-42.0.2-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:a047682d324ba56e61b7ea7c7299d51e61fd3bca7dad2ccc39b72bd0118d60a1"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:36d4b7c4be6411f58f60d9ce555a73df8406d484ba12a63549c88bd64f7967f1"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:a00aee5d1b6c20620161984f8ab2ab69134466c51f58c052c11b076715e72929"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b97fe7d7991c25e6a31e5d5e795986b18fbbb3107b873d5f3ae6dc9a103278e9"}, - {file = "cryptography-42.0.2-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:5fa82a26f92871eca593b53359c12ad7949772462f887c35edaf36f87953c0e2"}, - {file = "cryptography-42.0.2-cp37-abi3-win32.whl", hash = "sha256:4b063d3413f853e056161eb0c7724822a9740ad3caa24b8424d776cebf98e7ee"}, - {file = "cryptography-42.0.2-cp37-abi3-win_amd64.whl", hash = "sha256:841ec8af7a8491ac76ec5a9522226e287187a3107e12b7d686ad354bb78facee"}, - {file = "cryptography-42.0.2-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:55d1580e2d7e17f45d19d3b12098e352f3a37fe86d380bf45846ef257054b242"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cb2c41f131a5758d6ba6a0504150d644054fd9f3203a1e8e8d7ac3aea7f73a"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9097a208875fc7bbeb1286d0125d90bdfed961f61f214d3f5be62cd4ed8a446"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:44c95c0e96b3cb628e8452ec060413a49002a247b2b9938989e23a2c8291fc90"}, - {file = "cryptography-42.0.2-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2f9f14185962e6a04ab32d1abe34eae8a9001569ee4edb64d2304bf0d65c53f3"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:09a77e5b2e8ca732a19a90c5bca2d124621a1edb5438c5daa2d2738bfeb02589"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad28cff53f60d99a928dfcf1e861e0b2ceb2bc1f08a074fdd601b314e1cc9e0a"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:130c0f77022b2b9c99d8cebcdd834d81705f61c68e91ddd614ce74c657f8b3ea"}, - {file = "cryptography-42.0.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:fa3dec4ba8fb6e662770b74f62f1a0c7d4e37e25b58b2bf2c1be4c95372b4a33"}, - {file = "cryptography-42.0.2-cp39-abi3-win32.whl", hash = "sha256:3dbd37e14ce795b4af61b89b037d4bc157f2cb23e676fa16932185a04dfbf635"}, - {file = "cryptography-42.0.2-cp39-abi3-win_amd64.whl", hash = "sha256:8a06641fb07d4e8f6c7dda4fc3f8871d327803ab6542e33831c7ccfdcb4d0ad6"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:087887e55e0b9c8724cf05361357875adb5c20dec27e5816b653492980d20380"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:a7ef8dd0bf2e1d0a27042b231a3baac6883cdd5557036f5e8df7139255feaac6"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4383b47f45b14459cab66048d384614019965ba6c1a1a141f11b5a551cace1b2"}, - {file = "cryptography-42.0.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:fbeb725c9dc799a574518109336acccaf1303c30d45c075c665c0793c2f79a7f"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:320948ab49883557a256eab46149df79435a22d2fefd6a66fe6946f1b9d9d008"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5ef9bc3d046ce83c4bbf4c25e1e0547b9c441c01d30922d812e887dc5f125c12"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:52ed9ebf8ac602385126c9a2fe951db36f2cb0c2538d22971487f89d0de4065a"}, - {file = "cryptography-42.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:141e2aa5ba100d3788c0ad7919b288f89d1fe015878b9659b307c9ef867d3a65"}, - {file = "cryptography-42.0.2.tar.gz", hash = "sha256:e0ec52ba3c7f1b7d813cd52649a5b3ef1fc0d433219dc8c93827c57eab6cf888"}, + {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:ffc73996c4fca3d2b6c1c8c12bfd3ad00def8621da24f547626bf06441400449"}, + {file = "cryptography-42.0.4-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:db4b65b02f59035037fde0998974d84244a64c3265bdef32a827ab9b63d61b18"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dad9c385ba8ee025bb0d856714f71d7840020fe176ae0229de618f14dae7a6e2"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:69b22ab6506a3fe483d67d1ed878e1602bdd5912a134e6202c1ec672233241c1"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:e09469a2cec88fb7b078e16d4adec594414397e8879a4341c6ace96013463d5b"}, + {file = "cryptography-42.0.4-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3e970a2119507d0b104f0a8e281521ad28fc26f2820687b3436b8c9a5fcf20d1"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:e53dc41cda40b248ebc40b83b31516487f7db95ab8ceac1f042626bc43a2f992"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:c3a5cbc620e1e17009f30dd34cb0d85c987afd21c41a74352d1719be33380885"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:6bfadd884e7280df24d26f2186e4e07556a05d37393b0f220a840b083dc6a824"}, + {file = "cryptography-42.0.4-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:01911714117642a3f1792c7f376db572aadadbafcd8d75bb527166009c9f1d1b"}, + {file = "cryptography-42.0.4-cp37-abi3-win32.whl", hash = "sha256:fb0cef872d8193e487fc6bdb08559c3aa41b659a7d9be48b2e10747f47863925"}, + {file = "cryptography-42.0.4-cp37-abi3-win_amd64.whl", hash = "sha256:c1f25b252d2c87088abc8bbc4f1ecbf7c919e05508a7e8628e6875c40bc70923"}, + {file = "cryptography-42.0.4-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:15a1fb843c48b4a604663fa30af60818cd28f895572386e5f9b8a665874c26e7"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1327f280c824ff7885bdeef8578f74690e9079267c1c8bd7dc5cc5aa065ae52"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ffb03d419edcab93b4b19c22ee80c007fb2d708429cecebf1dd3258956a563a"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:1df6fcbf60560d2113b5ed90f072dc0b108d64750d4cbd46a21ec882c7aefce9"}, + {file = "cryptography-42.0.4-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:44a64043f743485925d3bcac548d05df0f9bb445c5fcca6681889c7c3ab12764"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c6048f217533d89f2f8f4f0fe3044bf0b2090453b7b73d0b77db47b80af8dff"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6d0fbe73728c44ca3a241eff9aefe6496ab2656d6e7a4ea2459865f2e8613257"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:887623fe0d70f48ab3f5e4dbf234986b1329a64c066d719432d0698522749929"}, + {file = "cryptography-42.0.4-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:ce8613beaffc7c14f091497346ef117c1798c202b01153a8cc7b8e2ebaaf41c0"}, + {file = "cryptography-42.0.4-cp39-abi3-win32.whl", hash = "sha256:810bcf151caefc03e51a3d61e53335cd5c7316c0a105cc695f0959f2c638b129"}, + {file = "cryptography-42.0.4-cp39-abi3-win_amd64.whl", hash = "sha256:a0298bdc6e98ca21382afe914c642620370ce0470a01e1bef6dd9b5354c36854"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5f8907fcf57392cd917892ae83708761c6ff3c37a8e835d7246ff0ad251d9298"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:12d341bd42cdb7d4937b0cabbdf2a94f949413ac4504904d0cdbdce4a22cbf88"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1cdcdbd117681c88d717437ada72bdd5be9de117f96e3f4d50dab3f59fd9ab20"}, + {file = "cryptography-42.0.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:0e89f7b84f421c56e7ff69f11c441ebda73b8a8e6488d322ef71746224c20fce"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f1e85a178384bf19e36779d91ff35c7617c885da487d689b05c1366f9933ad74"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d2a27aca5597c8a71abbe10209184e1a8e91c1fd470b5070a2ea60cafec35bcd"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4e36685cb634af55e0677d435d425043967ac2f3790ec652b2b88ad03b85c27b"}, + {file = "cryptography-42.0.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:f47be41843200f7faec0683ad751e5ef11b9a56a220d57f300376cd8aba81660"}, + {file = "cryptography-42.0.4.tar.gz", hash = "sha256:831a4b37accef30cccd34fcb916a5d7b5be3cbbe27268a02832c3e450aea39cb"}, ] [package.dependencies] @@ -1677,7 +1677,7 @@ requests = ">=2.0.0" [[package]] name = "notifications-utils" -version = "0.2.8" +version = "0.2.9" description = "" optional = false python-versions = ">=3.9,<3.12" @@ -1695,7 +1695,7 @@ certifi = "^2023.7.22" cffi = "^1.16.0" charset-normalizer = "^3.1.0" click = "^8.1.3" -cryptography = "^42.0.0" +cryptography = "^42.0.4" flask = "^2.3.2" flask-redis = "^0.4.0" geojson = "^3.0.1" @@ -1729,7 +1729,7 @@ werkzeug = "^3.0.1" type = "git" url = "https://github.com/GSA/notifications-utils.git" reference = "HEAD" -resolved_reference = "a48171e865eb83cf29c75751be7369f396cbe3e2" +resolved_reference = "df8ece836cad303c5d161edf485cf9bbdc666688" [[package]] name = "numpy" From 4b39d5ffe927e157de7a09fcd04f8bb17f1efef7 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 15 Sep 2023 10:12:01 -0400 Subject: [PATCH 046/195] Re-enable E2E GitHub action jobs This changeset re-enables the GitHub action jobs we had to disable to make it possible to deploy recent changes. Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 99ef30c3b..880427912 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -44,29 +44,29 @@ jobs: run: npm test - name: Run py tests with coverage run: poetry run coverage run --omit=*/notifications_utils/* -m pytest --maxfail=10 --ignore=tests/end_to_end tests/ - # - name: Run E2E tests - # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end - # env: - # NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} + - name: Run E2E tests + run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + env: + NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} - name: Check coverage threshold run: poetry run coverage report --fail-under=90 - # - name: Health check - # run: | - # response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status) - # if grep -q "ok" <<< "$response"; then - # echo "Health check passed" - # else - # echo "Health check failed" - # exit 1 - # fi - # env: - # NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} + - name: Health check + run: | + response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status) + if grep -q "ok" <<< "$response"; then + echo "Health check passed" + else + echo "Health check failed" + exit 1 + fi + env: + NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} validate-new-relic-config: runs-on: ubuntu-latest From d25f0869e017733e75bd0f3e805e79ca492fcf90 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 14:14:06 -0500 Subject: [PATCH 047/195] First attempt at getting the API to run for E2E tests Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 71 +++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 14 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 880427912..a29937511 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -44,6 +44,62 @@ jobs: run: npm test - name: Run py tests with coverage run: poetry run coverage run --omit=*/notifications_utils/* -m pytest --maxfail=10 --ignore=tests/end_to_end tests/ + - name: Check coverage threshold + run: poetry run coverage report --fail-under=90 + + end-to-end-tests: + permissions: + checks: write + pull-requests: write + contents: write + runs-on: ubuntu-latest + services: + postgres: + image: postgres + env: + POSTGRES_USER: user + POSTGRES_PASSWORD: password + POSTGRES_DB: test_notification_api + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + # Maps tcp port 5432 on service container to the host + - 5432:5432 + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup-project + - uses: jwalton/gh-find-current-pr@v1 + id: findPr + - uses: ArtiomTr/jest-coverage-report-action@v2 + with: + test-script: npm test + output: report-markdown + annotations: failed-tests + prnumber: ${{ steps.findPr.outputs.number }} + - name: Clone API + uses: actions/checkout@v3 + with: + repository: GSA/notifications-api + path: './notifications-api' + - name: Install API dependencies + with: + path: './notifications-api' + run: make bootstrap + env: + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + - name: Run API server + with: + path: './notifications-api' + run: make run-procfile & + env: + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run E2E tests run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end env: @@ -51,22 +107,9 @@ jobs: NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} + API_HOST_NAME: http://localhost:6011 - name: Check coverage threshold run: poetry run coverage report --fail-under=90 - - name: Health check - run: | - response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status) - if grep -q "ok" <<< "$response"; then - echo "Health check passed" - else - echo "Health check failed" - exit 1 - fi - env: - NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} validate-new-relic-config: runs-on: ubuntu-latest From 89b6e13afb25cf826e068060accd64b272caedcf Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 14:34:12 -0500 Subject: [PATCH 048/195] Just trying to get the workflow to run Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 126 +++++++++++++++++------------------ 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index a29937511..736323589 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -47,69 +47,69 @@ jobs: - name: Check coverage threshold run: poetry run coverage report --fail-under=90 - end-to-end-tests: - permissions: - checks: write - pull-requests: write - contents: write - runs-on: ubuntu-latest - services: - postgres: - image: postgres - env: - POSTGRES_USER: user - POSTGRES_PASSWORD: password - POSTGRES_DB: test_notification_api - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - # Maps tcp port 5432 on service container to the host - - 5432:5432 - steps: - - uses: actions/checkout@v3 - - uses: ./.github/actions/setup-project - - uses: jwalton/gh-find-current-pr@v1 - id: findPr - - uses: ArtiomTr/jest-coverage-report-action@v2 - with: - test-script: npm test - output: report-markdown - annotations: failed-tests - prnumber: ${{ steps.findPr.outputs.number }} - - name: Clone API - uses: actions/checkout@v3 - with: - repository: GSA/notifications-api - path: './notifications-api' - - name: Install API dependencies - with: - path: './notifications-api' - run: make bootstrap - env: - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - - name: Run API server - with: - path: './notifications-api' - run: make run-procfile & - env: - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - - name: Run E2E tests - run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end - env: - NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} - API_HOST_NAME: http://localhost:6011 - - name: Check coverage threshold - run: poetry run coverage report --fail-under=90 + # end-to-end-tests: + # permissions: + # checks: write + # pull-requests: write + # contents: write + # runs-on: ubuntu-latest + # services: + # postgres: + # image: postgres + # env: + # POSTGRES_USER: user + # POSTGRES_PASSWORD: password + # POSTGRES_DB: test_notification_api + # options: >- + # --health-cmd pg_isready + # --health-interval 10s + # --health-timeout 5s + # --health-retries 5 + # ports: + # # Maps tcp port 5432 on service container to the host + # - 5432:5432 + # steps: + # - uses: actions/checkout@v3 + # - uses: ./.github/actions/setup-project + # - uses: jwalton/gh-find-current-pr@v1 + # id: findPr + # - uses: ArtiomTr/jest-coverage-report-action@v2 + # with: + # test-script: npm test + # output: report-markdown + # annotations: failed-tests + # prnumber: ${{ steps.findPr.outputs.number }} + # - name: Clone API + # uses: actions/checkout@v3 + # with: + # repository: GSA/notifications-api + # path: './notifications-api' + # - name: Install API dependencies + # with: + # path: './notifications-api' + # run: make bootstrap + # env: + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # - name: Run API server + # with: + # path: './notifications-api' + # run: make run-procfile & + # env: + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # - name: Run E2E tests + # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + # env: + # NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} + # API_HOST_NAME: http://localhost:6011 + # - name: Check coverage threshold + # run: poetry run coverage report --fail-under=90 validate-new-relic-config: runs-on: ubuntu-latest From 891cec530035f135920aea0a1c8d23e7a2b5feb1 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 14:42:55 -0500 Subject: [PATCH 049/195] Uncommenting E2E test job Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 126 +++++++++++++++++------------------ 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 736323589..a29937511 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -47,69 +47,69 @@ jobs: - name: Check coverage threshold run: poetry run coverage report --fail-under=90 - # end-to-end-tests: - # permissions: - # checks: write - # pull-requests: write - # contents: write - # runs-on: ubuntu-latest - # services: - # postgres: - # image: postgres - # env: - # POSTGRES_USER: user - # POSTGRES_PASSWORD: password - # POSTGRES_DB: test_notification_api - # options: >- - # --health-cmd pg_isready - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - # ports: - # # Maps tcp port 5432 on service container to the host - # - 5432:5432 - # steps: - # - uses: actions/checkout@v3 - # - uses: ./.github/actions/setup-project - # - uses: jwalton/gh-find-current-pr@v1 - # id: findPr - # - uses: ArtiomTr/jest-coverage-report-action@v2 - # with: - # test-script: npm test - # output: report-markdown - # annotations: failed-tests - # prnumber: ${{ steps.findPr.outputs.number }} - # - name: Clone API - # uses: actions/checkout@v3 - # with: - # repository: GSA/notifications-api - # path: './notifications-api' - # - name: Install API dependencies - # with: - # path: './notifications-api' - # run: make bootstrap - # env: - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # - name: Run API server - # with: - # path: './notifications-api' - # run: make run-procfile & - # env: - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # - name: Run E2E tests - # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end - # env: - # NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} - # API_HOST_NAME: http://localhost:6011 - # - name: Check coverage threshold - # run: poetry run coverage report --fail-under=90 + end-to-end-tests: + permissions: + checks: write + pull-requests: write + contents: write + runs-on: ubuntu-latest + services: + postgres: + image: postgres + env: + POSTGRES_USER: user + POSTGRES_PASSWORD: password + POSTGRES_DB: test_notification_api + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + # Maps tcp port 5432 on service container to the host + - 5432:5432 + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup-project + - uses: jwalton/gh-find-current-pr@v1 + id: findPr + - uses: ArtiomTr/jest-coverage-report-action@v2 + with: + test-script: npm test + output: report-markdown + annotations: failed-tests + prnumber: ${{ steps.findPr.outputs.number }} + - name: Clone API + uses: actions/checkout@v3 + with: + repository: GSA/notifications-api + path: './notifications-api' + - name: Install API dependencies + with: + path: './notifications-api' + run: make bootstrap + env: + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + - name: Run API server + with: + path: './notifications-api' + run: make run-procfile & + env: + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + - name: Run E2E tests + run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + env: + NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} + API_HOST_NAME: http://localhost:6011 + - name: Check coverage threshold + run: poetry run coverage report --fail-under=90 validate-new-relic-config: runs-on: ubuntu-latest From 5a39165644795358bcd16a8798122d9fd79e342a Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 14:45:19 -0500 Subject: [PATCH 050/195] Just trying to get the new job to run Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 50 ++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index a29937511..a57d3615c 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -73,33 +73,27 @@ jobs: - uses: ./.github/actions/setup-project - uses: jwalton/gh-find-current-pr@v1 id: findPr - - uses: ArtiomTr/jest-coverage-report-action@v2 - with: - test-script: npm test - output: report-markdown - annotations: failed-tests - prnumber: ${{ steps.findPr.outputs.number }} - - name: Clone API - uses: actions/checkout@v3 - with: - repository: GSA/notifications-api - path: './notifications-api' - - name: Install API dependencies - with: - path: './notifications-api' - run: make bootstrap - env: - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - - name: Run API server - with: - path: './notifications-api' - run: make run-procfile & - env: - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # - name: Clone API + # uses: actions/checkout@v3 + # with: + # repository: GSA/notifications-api + # path: './notifications-api' + # - name: Install API dependencies + # with: + # path: './notifications-api' + # run: make bootstrap + # env: + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # - name: Run API server + # with: + # path: './notifications-api' + # run: make run-procfile & + # env: + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run E2E tests run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end env: @@ -107,7 +101,7 @@ jobs: NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} - API_HOST_NAME: http://localhost:6011 + # API_HOST_NAME: http://localhost:6011 - name: Check coverage threshold run: poetry run coverage report --fail-under=90 From 3003f822235f9e7496d54dded9a6e4c3360c3314 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 14:56:38 -0500 Subject: [PATCH 051/195] Attempting to get the API cloned at least Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index a57d3615c..f638f5e65 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -73,11 +73,11 @@ jobs: - uses: ./.github/actions/setup-project - uses: jwalton/gh-find-current-pr@v1 id: findPr - # - name: Clone API - # uses: actions/checkout@v3 - # with: - # repository: GSA/notifications-api - # path: './notifications-api' + - name: Clone API + uses: actions/checkout@v3 + with: + repository: GSA/notifications-api + path: './notifications-api' # - name: Install API dependencies # with: # path: './notifications-api' @@ -102,8 +102,6 @@ jobs: NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} # API_HOST_NAME: http://localhost:6011 - - name: Check coverage threshold - run: poetry run coverage report --fail-under=90 validate-new-relic-config: runs-on: ubuntu-latest From f8c48f77119be8083524dd81cd8d4cebf77d85ed Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 15:11:02 -0500 Subject: [PATCH 052/195] Now trying to install API dependencies... Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f638f5e65..dde423fd9 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -78,14 +78,14 @@ jobs: with: repository: GSA/notifications-api path: './notifications-api' - # - name: Install API dependencies - # with: - # path: './notifications-api' - # run: make bootstrap - # env: - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + - name: Install API dependencies + with: + path: './notifications-api' + run: make bootstrap + env: + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} # - name: Run API server # with: # path: './notifications-api' From bb242dc7d71cb124fb1022ce896f6f7f70b7b374 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 15:29:03 -0500 Subject: [PATCH 053/195] Adjusted API clone and working directory Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index dde423fd9..5cfc170d5 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -77,10 +77,9 @@ jobs: uses: actions/checkout@v3 with: repository: GSA/notifications-api - path: './notifications-api' + path: 'notifications-api' - name: Install API dependencies - with: - path: './notifications-api' + working-directory: 'notifications-api' run: make bootstrap env: SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api From b8b330f55be27eac1adb03cd3d82af5c429cb84c Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 15:52:55 -0500 Subject: [PATCH 054/195] Attempting to get API up and running Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 5cfc170d5..61b2c0696 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -13,6 +13,9 @@ env: WERKZEUG_DEBUG_PIN: off REDIS_ENABLED: 0 NODE_VERSION: 16.15.1 + AWS_US_TOLL_FREE_NUMBER: "+18556438890" + ADMIN_BASE_URL: http://localhost:6012 + API_HOST_NAME: http://localhost:6011 jobs: build: @@ -85,14 +88,13 @@ jobs: SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # - name: Run API server - # with: - # path: './notifications-api' - # run: make run-procfile & - # env: - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + - name: Run API server + working-directory: 'notifications-api' + run: make run-flask & + env: + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run E2E tests run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end env: @@ -100,7 +102,6 @@ jobs: NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} - # API_HOST_NAME: http://localhost:6011 validate-new-relic-config: runs-on: ubuntu-latest From d544d7c8f854409dbd03b3840321affb0216818a Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 16:00:37 -0500 Subject: [PATCH 055/195] Now trying to run the Admin server with PR code... Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 61b2c0696..f547d367b 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -95,13 +95,16 @@ jobs: SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + - name: Run Admin server + run: make run-flask & - name: Run E2E tests run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end env: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }} + # Run the E2E tests against the code found in this PR. + NOTIFY_E2E_TEST_URI: http://localhost:6012 validate-new-relic-config: runs-on: ubuntu-latest From 5e7319cbac434e53b54a3df155bee2310ad7be0a Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 16:17:01 -0500 Subject: [PATCH 056/195] Testing to see if we can connect to the local server. Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f547d367b..dd0b6baaa 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -98,7 +98,10 @@ jobs: - name: Run Admin server run: make run-flask & - name: Run E2E tests - run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + run: | + curl --request GET --url "http://localhost:6012" + curl --request GET --url "http://127.0.0.1:6012" env: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From 92b33834e86b715775583585c5bade2dc8840a8c Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 16:38:26 -0500 Subject: [PATCH 057/195] Trying to discern if there is a difference in local URLs Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index dd0b6baaa..0e8876e17 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -97,10 +97,19 @@ jobs: NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run Admin server run: make run-flask & - - name: Run E2E tests + - name: Run E2E tests 1 # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end - run: | + run: curl --request GET --url "http://localhost:6012" + env: + NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # Run the E2E tests against the code found in this PR. + NOTIFY_E2E_TEST_URI: http://localhost:6012 + - name: Run E2E tests 2 + # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + run: curl --request GET --url "http://127.0.0.1:6012" env: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} From b60dc00f0e435ced7db44d10389e6ee34cb1b51a Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 22 Dec 2023 16:42:53 -0500 Subject: [PATCH 058/195] A bit of cleanup and debugging comment to resume after holidays! Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 0e8876e17..c7e7cb9e5 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -97,20 +97,10 @@ jobs: NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run Admin server run: make run-flask & - - name: Run E2E tests 1 + - name: Run E2E tests # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end - run: - curl --request GET --url "http://localhost:6012" - env: - NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # Run the E2E tests against the code found in this PR. - NOTIFY_E2E_TEST_URI: http://localhost:6012 - - name: Run E2E tests 2 - # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end - run: - curl --request GET --url "http://127.0.0.1:6012" + # Debugging for now to troubleshoot a connectivity issue to the local servers + run: curl --request GET --url "http://localhost:6012" env: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From 9c32fa2d4e7d085ff330409cd32094e23d9ddefa Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 11:47:20 -0500 Subject: [PATCH 059/195] Adding in missing DATABASE_URL environment variable Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c7e7cb9e5..ab1ee085e 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -85,6 +85,7 @@ jobs: working-directory: 'notifications-api' run: make bootstrap env: + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} @@ -92,6 +93,7 @@ jobs: working-directory: 'notifications-api' run: make run-flask & env: + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} From 91527f32f29ced3de2a7e4fc6c5fedb25df76285 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 11:54:46 -0500 Subject: [PATCH 060/195] Changing DB name to match Makefile bootstrap command Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ab1ee085e..943e11efc 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -62,7 +62,7 @@ jobs: env: POSTGRES_USER: user POSTGRES_PASSWORD: password - POSTGRES_DB: test_notification_api + POSTGRES_DB: notification_api options: >- --health-cmd pg_isready --health-interval 10s @@ -85,16 +85,16 @@ jobs: working-directory: 'notifications-api' run: make bootstrap env: - DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + DATABASE_URL: postgresql://user:password@localhost:5432/notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run API server working-directory: 'notifications-api' run: make run-flask & env: - DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + DATABASE_URL: postgresql://user:password@localhost:5432/notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run Admin server From 6b98cf7c35f115df636f697aced454d240211869 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 12:01:20 -0500 Subject: [PATCH 061/195] Reverting previous change of the DB name Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 943e11efc..ab1ee085e 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -62,7 +62,7 @@ jobs: env: POSTGRES_USER: user POSTGRES_PASSWORD: password - POSTGRES_DB: notification_api + POSTGRES_DB: test_notification_api options: >- --health-cmd pg_isready --health-interval 10s @@ -85,16 +85,16 @@ jobs: working-directory: 'notifications-api' run: make bootstrap env: - DATABASE_URL: postgresql://user:password@localhost:5432/notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run API server working-directory: 'notifications-api' run: make run-flask & env: - DATABASE_URL: postgresql://user:password@localhost:5432/notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/notification_api + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run Admin server From 57cd123f4e5ef3793422350ecb08651745e4a08b Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 12:37:34 -0500 Subject: [PATCH 062/195] Adding Redis for running the API Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index ab1ee085e..8d981cb27 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -71,6 +71,16 @@ jobs: ports: # Maps tcp port 5432 on service container to the host - 5432:5432 + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + # Maps tcp port 6379 on service container to the host + - 6379:6379 steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-project @@ -87,14 +97,16 @@ jobs: env: DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + REDIS_URL: redis://localhost:6379 NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run API server working-directory: 'notifications-api' - run: make run-flask & + run: make run-procfile & env: DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + REDIS_URL: redis://localhost:6379 NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run Admin server From 3ba9a858457e4ed4f4ea9ac4036b4457da00407e Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 13:17:49 -0500 Subject: [PATCH 063/195] Adjusting API environment to development Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 8d981cb27..e6c123a2f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -100,6 +100,7 @@ jobs: REDIS_URL: redis://localhost:6379 NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_ENVIRONMENT: development - name: Run API server working-directory: 'notifications-api' run: make run-procfile & @@ -109,6 +110,7 @@ jobs: REDIS_URL: redis://localhost:6379 NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_ENVIRONMENT: development - name: Run Admin server run: make run-flask & - name: Run E2E tests From 558296684c84dc79f980fcfa09eacaeb96f971c5 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 15:43:26 -0500 Subject: [PATCH 064/195] Attempting to run actual E2E tests again to see real errors Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index e6c123a2f..1ec912f6a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -114,9 +114,9 @@ jobs: - name: Run Admin server run: make run-flask & - name: Run E2E tests - # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers - run: curl --request GET --url "http://localhost:6012" + # run: curl --request GET --url "http://localhost:6012" env: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From b9a7e48e780a2b43ed83423a5c6a0f12a8aecf0d Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 16:29:10 -0500 Subject: [PATCH 065/195] Attempting to work against staging API Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 107 ++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 1ec912f6a..30b492a7a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -15,7 +15,8 @@ env: NODE_VERSION: 16.15.1 AWS_US_TOLL_FREE_NUMBER: "+18556438890" ADMIN_BASE_URL: http://localhost:6012 - API_HOST_NAME: http://localhost:6011 + #API_HOST_NAME: http://localhost:6011 + API_HOST_NAME: https://notify-api-staging.app.cloud.gov jobs: build: @@ -56,67 +57,67 @@ jobs: pull-requests: write contents: write runs-on: ubuntu-latest - services: - postgres: - image: postgres - env: - POSTGRES_USER: user - POSTGRES_PASSWORD: password - POSTGRES_DB: test_notification_api - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - # Maps tcp port 5432 on service container to the host - - 5432:5432 - redis: - image: redis - options: >- - --health-cmd "redis-cli ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - # Maps tcp port 6379 on service container to the host - - 6379:6379 + # services: + # postgres: + # image: postgres + # env: + # POSTGRES_USER: user + # POSTGRES_PASSWORD: password + # POSTGRES_DB: test_notification_api + # options: >- + # --health-cmd pg_isready + # --health-interval 10s + # --health-timeout 5s + # --health-retries 5 + # ports: + # # Maps tcp port 5432 on service container to the host + # - 5432:5432 + # redis: + # image: redis + # options: >- + # --health-cmd "redis-cli ping" + # --health-interval 10s + # --health-timeout 5s + # --health-retries 5 + # ports: + # # Maps tcp port 6379 on service container to the host + # - 6379:6379 steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-project - uses: jwalton/gh-find-current-pr@v1 id: findPr - - name: Clone API - uses: actions/checkout@v3 - with: - repository: GSA/notifications-api - path: 'notifications-api' - - name: Install API dependencies - working-directory: 'notifications-api' - run: make bootstrap - env: - DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - REDIS_URL: redis://localhost:6379 - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_ENVIRONMENT: development - - name: Run API server - working-directory: 'notifications-api' - run: make run-procfile & - env: - DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - REDIS_URL: redis://localhost:6379 - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_ENVIRONMENT: development + # - name: Clone API + # uses: actions/checkout@v3 + # with: + # repository: GSA/notifications-api + # path: 'notifications-api' + # - name: Install API dependencies + # working-directory: 'notifications-api' + # run: make bootstrap + # env: + # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # REDIS_URL: redis://localhost:6379 + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # NOTIFY_ENVIRONMENT: development + # - name: Run API server + # working-directory: 'notifications-api' + # run: make run-procfile & + # env: + # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # REDIS_URL: redis://localhost:6379 + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # NOTIFY_ENVIRONMENT: development - name: Run Admin server run: make run-flask & - name: Run E2E tests - run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers - # run: curl --request GET --url "http://localhost:6012" + run: curl --request GET --url "http://localhost:6012" env: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From 84559e05741ff0ac88ebddfe413f535a85c41ad5 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 16:34:46 -0500 Subject: [PATCH 066/195] Switch Admin site environment to development Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 30b492a7a..4a5be3670 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -114,6 +114,8 @@ jobs: # NOTIFY_ENVIRONMENT: development - name: Run Admin server run: make run-flask & + env: + NOTIFY_ENVIRONMENT: development - name: Run E2E tests # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers From 2201c16a2b89b3c3cf7739972b3d82dda2682756 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 16:39:12 -0500 Subject: [PATCH 067/195] Now try to run the E2E tests! Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 4a5be3670..9dfd779d4 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -117,9 +117,9 @@ jobs: env: NOTIFY_ENVIRONMENT: development - name: Run E2E tests - # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers - run: curl --request GET --url "http://localhost:6012" + # run: curl --request GET --url "http://localhost:6012" env: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From 46be3cd7b3b6e8bbc18281adc5ffcff0a59898e8 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 16:44:49 -0500 Subject: [PATCH 068/195] Add a missing slash in the test URI Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 9dfd779d4..fd9372e17 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -125,7 +125,7 @@ jobs: NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} # Run the E2E tests against the code found in this PR. - NOTIFY_E2E_TEST_URI: http://localhost:6012 + NOTIFY_E2E_TEST_URI: http://localhost:6012/ validate-new-relic-config: runs-on: ubuntu-latest From c652c176177cf1eccb0e38fd6303c61b6bb722b4 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 17:30:47 -0500 Subject: [PATCH 069/195] Clean up and fix the E2E tests so that they run Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 +- tests/conftest.py | 14 ++++++----- tests/end_to_end/test_accounts_page.py | 23 +++++-------------- .../test_landing_and_sign_in_pages.py | 9 +++++--- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index fd9372e17..9dfd779d4 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -125,7 +125,7 @@ jobs: NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} # Run the E2E tests against the code found in this PR. - NOTIFY_E2E_TEST_URI: http://localhost:6012/ + NOTIFY_E2E_TEST_URI: http://localhost:6012 validate-new-relic-config: runs-on: ubuntu-latest diff --git a/tests/conftest.py b/tests/conftest.py index 122b76826..48ea3c5fa 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -36,6 +36,8 @@ from . import ( load_dotenv() +E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") + class ElementNotFound(Exception): pass @@ -529,7 +531,7 @@ def mock_update_service(mocker): "sms_sender", "permissions", ] - } + }, ) return {"data": service} @@ -2353,7 +2355,7 @@ def client_request(logged_in_client, mocker, service_one): # noqa (C901 too com _test_page_title=True, _test_for_elements_without_class=True, _optional_args="", - **endpoint_kwargs + **endpoint_kwargs, ): return ClientRequest.get_url( url_for(endpoint, **(endpoint_kwargs or {})) + _optional_args, @@ -2372,7 +2374,7 @@ def client_request(logged_in_client, mocker, service_one): # noqa (C901 too com _expected_redirect=None, _test_page_title=True, _test_for_elements_without_class=True, - **endpoint_kwargs + **endpoint_kwargs, ): resp = logged_in_client.get( url, @@ -2414,7 +2416,7 @@ def client_request(logged_in_client, mocker, service_one): # noqa (C901 too com _follow_redirects=False, _expected_redirect=None, _content_type=None, - **endpoint_kwargs + **endpoint_kwargs, ): return ClientRequest.post_url( url_for(endpoint, **(endpoint_kwargs or {})), @@ -2473,7 +2475,7 @@ def client_request(logged_in_client, mocker, service_one): # noqa (C901 too com _expected_status=302, _optional_args="", _content_type=None, - **endpoint_kwargs + **endpoint_kwargs, ): return ClientRequest.post_response_from_url( url_for(endpoint, **(endpoint_kwargs or {})) + _optional_args, @@ -3523,7 +3525,7 @@ def login_for_end_to_end_testing(browser): # Open a new page and go to the staging site. context = browser.new_context() page = context.new_page() - page.goto(os.getenv("NOTIFY_E2E_TEST_URI")) + page.goto(f"{E2E_TEST_URI}/") sign_in_button = page.get_by_role("link", name="Sign in") diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index c8c8d5a6a..070e5d08d 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -4,12 +4,14 @@ import re from playwright.sync_api import expect +E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") + def _bypass_sign_in(end_to_end_context): # Open a new page and go to the staging site. page = end_to_end_context.new_page() - page.goto(os.getenv("NOTIFY_E2E_TEST_URI")) + page.goto(f"{E2E_TEST_URI}/") sign_in_button = page.get_by_role("link", name="Sign in") @@ -24,7 +26,7 @@ def _bypass_sign_in(end_to_end_context): def test_add_new_service_workflow(end_to_end_context): # page = end_to_end_context.new_page() page = _bypass_sign_in(end_to_end_context) - page.goto(os.getenv("NOTIFY_E2E_TEST_URI")) + page.goto(f"{E2E_TEST_URI}/") # sign_in_button = page.get_by_role("link", name="Sign in") # @@ -41,9 +43,7 @@ def test_add_new_service_workflow(end_to_end_context): browser_type=end_to_end_context.browser.browser_type.name, ) - accounts_uri = "{}accounts".format(os.getenv("NOTIFY_E2E_TEST_URI")) - - page.goto(accounts_uri) + page.goto(f"{E2E_TEST_URI}/accounts") # Check to make sure that we've arrived at the next page. page.wait_for_load_state("domcontentloaded") @@ -82,24 +82,13 @@ def test_add_new_service_workflow(end_to_end_context): # Retrieve some prominent elements on the page for testing. service_name_input = page.locator('xpath=//input[@name="name"]') - federal_radio_button = page.locator('xpath=//input[@value="federal"]') - state_radio_button = page.locator('xpath=//input[@value="state"]') - other_radio_button = page.locator('xpath=//input[@value="other"]') add_service_button = page.get_by_role("button", name=re.compile("Add service")) expect(service_name_input).to_be_visible() - expect(federal_radio_button).to_be_visible() - expect(state_radio_button).to_be_visible() - expect(other_radio_button).to_be_visible() expect(add_service_button).to_be_visible() # Fill in the form. service_name_input.fill(new_service_name) - expect(federal_radio_button).to_be_enabled() - # Trying to click directly on the radio button resulted in a "not in viewport error" and this is the - # suggested workaround. Googling, the reason seems to be that there might be some (invisible?) css positioned - # above the radio button itself. - page.click("text='Federal government'") # Click on add service. add_service_button.click() @@ -108,7 +97,7 @@ def test_add_new_service_workflow(end_to_end_context): page.wait_for_load_state("domcontentloaded") # Check for the service name title and heading. - service_heading = page.get_by_text(new_service_name) + service_heading = page.get_by_text(new_service_name, exact=True) expect(service_heading).to_be_visible() expect(page).to_have_title(re.compile(new_service_name)) diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py index 895b3851f..dd6a70beb 100644 --- a/tests/end_to_end/test_landing_and_sign_in_pages.py +++ b/tests/end_to_end/test_landing_and_sign_in_pages.py @@ -3,11 +3,13 @@ import re from playwright.sync_api import expect +E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") + def test_landing_page(end_to_end_context): # Open a new page and go to the staging site. page = end_to_end_context.browser.new_page() - page.goto(os.getenv("NOTIFY_E2E_TEST_URI")) + page.goto(f"{E2E_TEST_URI}/") # Check to make sure that we've arrived at the next page. page.wait_for_load_state("domcontentloaded") @@ -17,7 +19,8 @@ def test_landing_page(end_to_end_context): # Retrieve some prominent elements on the page for testing. main_header = page.get_by_role( - "heading", name="Send text messages to your participants" + "heading", + name="Reach people where they are with government-powered text messages", ) sign_in_button = page.get_by_role("link", name="Sign in") benefits_studio_email = page.get_by_role("link", name="tts-benefits-studio@gsa.gov") @@ -51,7 +54,7 @@ def test_landing_page(end_to_end_context): # def test_sign_in_and_mfa_pages(end_to_end_context): # # Open a new page and go to the staging site. # page = end_to_end_context.new_page() -# page.goto(os.getenv("NOTIFY_E2E_TEST_URI")) +# page.goto(f"{E2E_TEST_URI}/") # print(f"test_sign_in_and_mfa_pages initial {page}") # # sign_in_button = page.get_by_role("link", name="Sign in") From 997aa8e72f0d93f7a0c81c4241f9d8e3a04928df Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 17:42:54 -0500 Subject: [PATCH 070/195] Added missing environment variables for the server process Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 3 +++ tests/conftest.py | 11 +++++------ tests/end_to_end/test_accounts_page.py | 5 ----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 9dfd779d4..498a9f273 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -116,6 +116,9 @@ jobs: run: make run-flask & env: NOTIFY_ENVIRONMENT: development + NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - name: Run E2E tests run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers diff --git a/tests/conftest.py b/tests/conftest.py index 48ea3c5fa..269bf5282 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3576,12 +3576,11 @@ def login_for_end_to_end_testing(browser): # page.wait_for_load_state('domcontentloaded') - # # Save storage state into the file. - # auth_state_path = os.path.join( - # os.getenv('NOTIFY_E2E_AUTH_STATE_PATH'), - # 'state.json' - # ) - # context.storage_state(path=auth_state_path) + # Save storage state into the file. + auth_state_path = os.path.join( + os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" + ) + context.storage_state(path=auth_state_path) @pytest.fixture(scope="session") diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index 070e5d08d..498242743 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -28,11 +28,6 @@ def test_add_new_service_workflow(end_to_end_context): page = _bypass_sign_in(end_to_end_context) page.goto(f"{E2E_TEST_URI}/") - # sign_in_button = page.get_by_role("link", name="Sign in") - # - # Test trying to sign in. Because we are loading the email and password - # sign_in_button.click() - # # Wait for the next page to fully load. page.wait_for_load_state("domcontentloaded") From e8e23e3ac0de177f74f9f22b9886f5f0d9a89957 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 17:55:19 -0500 Subject: [PATCH 071/195] A little more cleanup Signed-off-by: Carlo Costino --- tests/end_to_end/test_accounts_page.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index 498242743..6df6ec5be 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -24,7 +24,6 @@ def _bypass_sign_in(end_to_end_context): def test_add_new_service_workflow(end_to_end_context): - # page = end_to_end_context.new_page() page = _bypass_sign_in(end_to_end_context) page.goto(f"{E2E_TEST_URI}/") From 9987946f9296672e86c99c68385ddd3be5a18d5b Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 4 Jan 2024 17:58:56 -0500 Subject: [PATCH 072/195] Trying one more environment variable for auth Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 498a9f273..389e373b3 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -119,6 +119,7 @@ jobs: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_E2E_TEST_URI: http://localhost:6012 - name: Run E2E tests run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers From 87ca03f6d8e84055b769b12d593173ce933c321f Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 5 Jan 2024 09:36:06 -0500 Subject: [PATCH 073/195] Switch back to using the API locally in the CI/CD job Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 103 +++++++++++++++++------------------ 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 389e373b3..d9ad358fe 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -15,8 +15,7 @@ env: NODE_VERSION: 16.15.1 AWS_US_TOLL_FREE_NUMBER: "+18556438890" ADMIN_BASE_URL: http://localhost:6012 - #API_HOST_NAME: http://localhost:6011 - API_HOST_NAME: https://notify-api-staging.app.cloud.gov + API_HOST_NAME: http://localhost:6011 jobs: build: @@ -57,61 +56,61 @@ jobs: pull-requests: write contents: write runs-on: ubuntu-latest - # services: - # postgres: - # image: postgres - # env: - # POSTGRES_USER: user - # POSTGRES_PASSWORD: password - # POSTGRES_DB: test_notification_api - # options: >- - # --health-cmd pg_isready - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - # ports: - # # Maps tcp port 5432 on service container to the host - # - 5432:5432 - # redis: - # image: redis - # options: >- - # --health-cmd "redis-cli ping" - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - # ports: - # # Maps tcp port 6379 on service container to the host - # - 6379:6379 + services: + postgres: + image: postgres + env: + POSTGRES_USER: user + POSTGRES_PASSWORD: password + POSTGRES_DB: test_notification_api + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + # Maps tcp port 5432 on service container to the host + - 5432:5432 + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + # Maps tcp port 6379 on service container to the host + - 6379:6379 steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-project - uses: jwalton/gh-find-current-pr@v1 id: findPr - # - name: Clone API - # uses: actions/checkout@v3 - # with: - # repository: GSA/notifications-api - # path: 'notifications-api' - # - name: Install API dependencies - # working-directory: 'notifications-api' - # run: make bootstrap - # env: - # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # REDIS_URL: redis://localhost:6379 - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # NOTIFY_ENVIRONMENT: development - # - name: Run API server - # working-directory: 'notifications-api' - # run: make run-procfile & - # env: - # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # REDIS_URL: redis://localhost:6379 - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # NOTIFY_ENVIRONMENT: development + - name: Clone API + uses: actions/checkout@v3 + with: + repository: GSA/notifications-api + path: 'notifications-api' + - name: Install API dependencies + working-directory: 'notifications-api' + run: make bootstrap + env: + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + REDIS_URL: redis://localhost:6379 + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_ENVIRONMENT: development + - name: Run API server + working-directory: 'notifications-api' + run: make run-procfile & + env: + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + REDIS_URL: redis://localhost:6379 + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_ENVIRONMENT: development - name: Run Admin server run: make run-flask & env: From 95bdd335ebb0552dcdfe35d7329291ab1ebd4837 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 5 Jan 2024 10:29:02 -0500 Subject: [PATCH 074/195] Changing back to staging API; trying to get E2E auth working Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 104 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d9ad358fe..d99e54b9c 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -15,7 +15,7 @@ env: NODE_VERSION: 16.15.1 AWS_US_TOLL_FREE_NUMBER: "+18556438890" ADMIN_BASE_URL: http://localhost:6012 - API_HOST_NAME: http://localhost:6011 + API_HOST_NAME: https://notify-api-staging.app.cloud.gov jobs: build: @@ -56,61 +56,61 @@ jobs: pull-requests: write contents: write runs-on: ubuntu-latest - services: - postgres: - image: postgres - env: - POSTGRES_USER: user - POSTGRES_PASSWORD: password - POSTGRES_DB: test_notification_api - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - # Maps tcp port 5432 on service container to the host - - 5432:5432 - redis: - image: redis - options: >- - --health-cmd "redis-cli ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - ports: - # Maps tcp port 6379 on service container to the host - - 6379:6379 + # services: + # postgres: + # image: postgres + # env: + # POSTGRES_USER: user + # POSTGRES_PASSWORD: password + # POSTGRES_DB: test_notification_api + # options: >- + # --health-cmd pg_isready + # --health-interval 10s + # --health-timeout 5s + # --health-retries 5 + # ports: + # # Maps tcp port 5432 on service container to the host + # - 5432:5432 + # redis: + # image: redis + # options: >- + # --health-cmd "redis-cli ping" + # --health-interval 10s + # --health-timeout 5s + # --health-retries 5 + # ports: + # # Maps tcp port 6379 on service container to the host + # - 6379:6379 steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-project - uses: jwalton/gh-find-current-pr@v1 id: findPr - - name: Clone API - uses: actions/checkout@v3 - with: - repository: GSA/notifications-api - path: 'notifications-api' - - name: Install API dependencies - working-directory: 'notifications-api' - run: make bootstrap - env: - DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - REDIS_URL: redis://localhost:6379 - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_ENVIRONMENT: development - - name: Run API server - working-directory: 'notifications-api' - run: make run-procfile & - env: - DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - REDIS_URL: redis://localhost:6379 - NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_ENVIRONMENT: development + # - name: Clone API + # uses: actions/checkout@v3 + # with: + # repository: GSA/notifications-api + # path: 'notifications-api' + # - name: Install API dependencies + # working-directory: 'notifications-api' + # run: make bootstrap + # env: + # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # REDIS_URL: redis://localhost:6379 + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # NOTIFY_ENVIRONMENT: development + # - name: Run API server + # working-directory: 'notifications-api' + # run: make run-procfile & + # env: + # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + # REDIS_URL: redis://localhost:6379 + # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + # NOTIFY_ENVIRONMENT: development - name: Run Admin server run: make run-flask & env: @@ -120,6 +120,7 @@ jobs: NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} NOTIFY_E2E_TEST_URI: http://localhost:6012 - name: Run E2E tests + # Run the E2E tests against the code found in this PR. run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers # run: curl --request GET --url "http://localhost:6012" @@ -127,7 +128,6 @@ jobs: NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # Run the E2E tests against the code found in this PR. NOTIFY_E2E_TEST_URI: http://localhost:6012 validate-new-relic-config: From aec20b5e731a18ab659858694010760a65aa7f4b Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 5 Jan 2024 17:17:40 -0500 Subject: [PATCH 075/195] Add API access to Admin server Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d99e54b9c..15c820b8d 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -114,6 +114,8 @@ jobs: - name: Run Admin server run: make run-flask & env: + ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} + ADMIN_CLIENT_USERNAME: ${{ secrets.ADMIN_CLIENT_USERNAME }} NOTIFY_ENVIRONMENT: development NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From 136403a263ef504a4a73f48aa5a59578e976abf1 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 5 Jan 2024 17:22:21 -0500 Subject: [PATCH 076/195] Adding a couple more missing env vars for the admin server Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 15c820b8d..3c1845c63 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -116,6 +116,8 @@ jobs: env: ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} ADMIN_CLIENT_USERNAME: ${{ secrets.ADMIN_CLIENT_USERNAME }} + DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} + SECRET_KEY: ${{ secrets.SECRET_KEY }} NOTIFY_ENVIRONMENT: development NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From c2e7b4897de34a31b408ce3534fc8e0c10fa9a05 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 5 Jan 2024 17:28:00 -0500 Subject: [PATCH 077/195] Adjusting a couple of other environment variables Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3c1845c63..3a1e41728 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -115,10 +115,10 @@ jobs: run: make run-flask & env: ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} - ADMIN_CLIENT_USERNAME: ${{ secrets.ADMIN_CLIENT_USERNAME }} + ADMIN_CLIENT_USERNAME: notify-admin DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} - NOTIFY_ENVIRONMENT: development + NOTIFY_ENVIRONMENT: staging NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} From 5aacdcbc356c785c0262bde7272d603c2f044096 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Tue, 9 Jan 2024 10:55:37 -0500 Subject: [PATCH 078/195] Slight adjustments to make sure no typos are present Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 3a1e41728..befe91c71 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -15,7 +15,6 @@ env: NODE_VERSION: 16.15.1 AWS_US_TOLL_FREE_NUMBER: "+18556438890" ADMIN_BASE_URL: http://localhost:6012 - API_HOST_NAME: https://notify-api-staging.app.cloud.gov jobs: build: @@ -114,10 +113,11 @@ jobs: - name: Run Admin server run: make run-flask & env: - ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} - ADMIN_CLIENT_USERNAME: notify-admin + API_HOST_NAME: https://notify-api-staging.app.cloud.gov DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} + ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} + ADMIN_CLIENT_USERNAME: notify-admin NOTIFY_ENVIRONMENT: staging NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} From 29c20a0ee9d03aec676b2770e3932c966984c29c Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Tue, 9 Jan 2024 11:57:58 -0500 Subject: [PATCH 079/195] Trying to see if New Relic needs to be in place Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index befe91c71..b57a516e4 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -119,6 +119,8 @@ jobs: ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} ADMIN_CLIENT_USERNAME: notify-admin NOTIFY_ENVIRONMENT: staging + NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} + NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} From 1b6446e213c95be211bcd3f9c34cf6fe98d67ee4 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 13:00:39 -0500 Subject: [PATCH 080/195] Added a new E2ETest config and adjusted a couple of things Signed-off-by: Carlo Costino --- app/config.py | 23 +++++++++++++++++++++-- tests/conftest.py | 2 +- tests/end_to_end/test_accounts_page.py | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/config.py b/app/config.py index f424076fa..c46ddf725 100644 --- a/app/config.py +++ b/app/config.py @@ -81,8 +81,7 @@ class Config(object): "IBAN": "GB33BUKB20201555555555", "swift": "ABCDEF12", "notify_billing_email_addresses": [ - "generic@digital.cabinet-office.gov.uk", - "first.last@digital.cabinet-office.gov.uk", + "tts-benefits-studio@gsa.gov", ], } @@ -152,6 +151,25 @@ class Staging(Production): HEADER_COLOUR = "#00ff00" # $green +class E2ETest(Staging): + """ + An environment config that is intended to operate as if it were in the + staging environment but with the configuration of the development and test + environments so the E2E tests work. + """ + + # Borrowed from development environment + SESSION_COOKIE_SECURE = False + SESSION_PROTECTION = None + HTTP_PROTOCOL = "http" + ASSET_DOMAIN = "" + ASSET_PATH = "/static/" + + # Borrowed from test environment + TESTING = True + WTF_CSRF_ENABLED = False + + class Demo(Staging): HEADER_COLOUR = "#6F72AF" # $mauve @@ -173,6 +191,7 @@ class Scanning(Production): configs = { "development": Development, "test": Test, + "e2etest": E2ETest, "scanning": Scanning, "staging": Staging, "demo": Demo, diff --git a/tests/conftest.py b/tests/conftest.py index 269bf5282..4a397b7ec 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3593,7 +3593,7 @@ def end_to_end_context(browser): def end_to_end_authenticated_context(browser): # Create and load a previously authenticated context for Playwright E2E # tests. - login_for_end_to_end_testing(browser) + # login_for_end_to_end_testing(browser) auth_state_path = os.path.join( os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index 6df6ec5be..8484e58b0 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -15,7 +15,7 @@ def _bypass_sign_in(end_to_end_context): sign_in_button = page.get_by_role("link", name="Sign in") - # Test trying to sign in. Because we are loading the email and password + # Sign in to the site - E2E test accounts are set to flow through. sign_in_button.click() # Wait for the next page to fully load. From 719ecfe8f6de1b3128bc861d3eec0616db293106 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 13:06:21 -0500 Subject: [PATCH 081/195] Modified E2E test job environment Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index b57a516e4..12d39def8 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -118,7 +118,7 @@ jobs: SECRET_KEY: ${{ secrets.SECRET_KEY }} ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} ADMIN_CLIENT_USERNAME: notify-admin - NOTIFY_ENVIRONMENT: staging + NOTIFY_ENVIRONMENT: e2etest NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} From c790d8b84439c8a578738d16f727b92127b00939 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 13:23:19 -0500 Subject: [PATCH 082/195] Added some additional environment variables to E2E command Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 12d39def8..fb67bfd5a 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -131,6 +131,11 @@ jobs: # Debugging for now to troubleshoot a connectivity issue to the local servers # run: curl --request GET --url "http://localhost:6012" env: + DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} + SECRET_KEY: ${{ secrets.SECRET_KEY }} + ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} + ADMIN_CLIENT_USERNAME: notify-admin + NOTIFY_ENVIRONMENT: e2etest NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} From 534daa2d82e4ed29f51efe46f9d54eed181462f8 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 17:22:19 -0500 Subject: [PATCH 083/195] Attempting to match local E2E config with CI/CD Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 9 +-------- app/config.py | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index fb67bfd5a..22b3b8ae7 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -7,8 +7,6 @@ permissions: env: NOTIFY_ENVIRONMENT: test - NEW_RELIC_CONFIG_FILE: newrelic.ini - NEW_RELIC_ENVIRONMENT: test FLASK_APP: application.py WERKZEUG_DEBUG_PIN: off REDIS_ENABLED: 0 @@ -119,8 +117,6 @@ jobs: ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} ADMIN_CLIENT_USERNAME: notify-admin NOTIFY_ENVIRONMENT: e2etest - NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} - NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} @@ -131,10 +127,6 @@ jobs: # Debugging for now to troubleshoot a connectivity issue to the local servers # run: curl --request GET --url "http://localhost:6012" env: - DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} - SECRET_KEY: ${{ secrets.SECRET_KEY }} - ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} - ADMIN_CLIENT_USERNAME: notify-admin NOTIFY_ENVIRONMENT: e2etest NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} @@ -149,6 +141,7 @@ jobs: - uses: ./.github/actions/setup-project - name: Validate NewRelic config env: + NEW_RELIC_CONFIG_FILE: newrelic.ini NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} # Need to set a NEW_RELIC_ENVIRONMENT with monitor_mode: true NEW_RELIC_ENVIRONMENT: staging diff --git a/app/config.py b/app/config.py index c46ddf725..091dd35fd 100644 --- a/app/config.py +++ b/app/config.py @@ -169,6 +169,14 @@ class E2ETest(Staging): TESTING = True WTF_CSRF_ENABLED = False + # buckets - mirror staging + CSV_UPLOAD_BUCKET = cloud_config.s3_credentials( + "notify-api-csv-upload-bucket-staging" + ) + LOGO_UPLOAD_BUCKET = cloud_config.s3_credentials( + "notify-admin-logo-upload-bucket-staging" + ) + class Demo(Staging): HEADER_COLOUR = "#6F72AF" # $mauve From bd41dfc1c2bcb48e90397f18b471ac5369abf411 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 17:31:59 -0500 Subject: [PATCH 084/195] Attempting to get E2E work with local API Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 103 ++++++++++++++++++----------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 22b3b8ae7..d68df41ad 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -53,65 +53,66 @@ jobs: pull-requests: write contents: write runs-on: ubuntu-latest - # services: - # postgres: - # image: postgres - # env: - # POSTGRES_USER: user - # POSTGRES_PASSWORD: password - # POSTGRES_DB: test_notification_api - # options: >- - # --health-cmd pg_isready - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - # ports: - # # Maps tcp port 5432 on service container to the host - # - 5432:5432 - # redis: - # image: redis - # options: >- - # --health-cmd "redis-cli ping" - # --health-interval 10s - # --health-timeout 5s - # --health-retries 5 - # ports: - # # Maps tcp port 6379 on service container to the host - # - 6379:6379 + services: + postgres: + image: postgres + env: + POSTGRES_USER: user + POSTGRES_PASSWORD: password + POSTGRES_DB: test_notification_api + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + # Maps tcp port 5432 on service container to the host + - 5432:5432 + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 10s + --health-timeout 5s + --health-retries 5 + ports: + # Maps tcp port 6379 on service container to the host + - 6379:6379 steps: - uses: actions/checkout@v3 - uses: ./.github/actions/setup-project - uses: jwalton/gh-find-current-pr@v1 id: findPr - # - name: Clone API - # uses: actions/checkout@v3 - # with: - # repository: GSA/notifications-api - # path: 'notifications-api' - # - name: Install API dependencies - # working-directory: 'notifications-api' - # run: make bootstrap - # env: - # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # REDIS_URL: redis://localhost:6379 - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # NOTIFY_ENVIRONMENT: development - # - name: Run API server - # working-directory: 'notifications-api' - # run: make run-procfile & - # env: - # DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api - # SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api - # REDIS_URL: redis://localhost:6379 - # NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} - # NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - # NOTIFY_ENVIRONMENT: development + - name: Clone API + uses: actions/checkout@v3 + with: + repository: GSA/notifications-api + path: 'notifications-api' + - name: Install API dependencies + working-directory: 'notifications-api' + run: make bootstrap + env: + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + REDIS_URL: redis://localhost:6379 + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_ENVIRONMENT: staging + - name: Run API server + working-directory: 'notifications-api' + run: make run-procfile & + env: + DATABASE_URL: postgresql://user:password@localhost:5432/test_notification_api + SQLALCHEMY_DATABASE_TEST_URI: postgresql://user:password@localhost:5432/test_notification_api + REDIS_URL: redis://localhost:6379 + NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} + NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} + NOTIFY_ENVIRONMENT: staging - name: Run Admin server run: make run-flask & env: - API_HOST_NAME: https://notify-api-staging.app.cloud.gov + # API_HOST_NAME: https://notify-api-staging.app.cloud.gov + API_HOST_NAME: http://localhost:6011 DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} From 3a6eeb229277a10c096d8664c3330e4a6f2e330e Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 17:37:22 -0500 Subject: [PATCH 085/195] Swapping API back to development environment Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index d68df41ad..f5d614280 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -97,7 +97,7 @@ jobs: REDIS_URL: redis://localhost:6379 NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_ENVIRONMENT: staging + NOTIFY_ENVIRONMENT: development - name: Run API server working-directory: 'notifications-api' run: make run-procfile & @@ -107,7 +107,7 @@ jobs: REDIS_URL: redis://localhost:6379 NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} - NOTIFY_ENVIRONMENT: staging + NOTIFY_ENVIRONMENT: development - name: Run Admin server run: make run-flask & env: From fd5cd36959e59d324c240c7b7521ec5fcef9199a Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 17:52:32 -0500 Subject: [PATCH 086/195] Remove webkit testing for now Signed-off-by: Carlo Costino --- Makefile | 4 ++-- app/config.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8f950dbf6..aa9b404af 100644 --- a/Makefile +++ b/Makefile @@ -80,8 +80,8 @@ dead-code: .PHONY: e2e-test e2e-test: export NEW_RELIC_ENVIRONMENT=test -e2e-test: ## Run end-to-end integration tests - poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end +e2e-test: ## Run end-to-end integration tests; note that --browser webkit isn't currently working + poetry run pytest -v --browser chromium --browser firefox tests/end_to_end .PHONY: js-lint js-lint: ## Run javascript linting scanners diff --git a/app/config.py b/app/config.py index 091dd35fd..58623f426 100644 --- a/app/config.py +++ b/app/config.py @@ -159,6 +159,7 @@ class E2ETest(Staging): """ # Borrowed from development environment + DEBUG = True SESSION_COOKIE_SECURE = False SESSION_PROTECTION = None HTTP_PROTOCOL = "http" From 7259d617eebedfafcbc8c8523709b3382867ac66 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Thu, 25 Jan 2024 18:04:07 -0500 Subject: [PATCH 087/195] Actually disable webkit in CI/CD E2E tests Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index f5d614280..179615e89 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -124,7 +124,9 @@ jobs: NOTIFY_E2E_TEST_URI: http://localhost:6012 - name: Run E2E tests # Run the E2E tests against the code found in this PR. - run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end + # --browser webkit doesn't work at this time. + run: poetry run pytest -v --browser chromium --browser firefox tests/end_to_end # Debugging for now to troubleshoot a connectivity issue to the local servers # run: curl --request GET --url "http://localhost:6012" env: From 9c392bca78cfda193694a0dab0bd4d7c4cb3225b Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 26 Jan 2024 09:26:23 -0500 Subject: [PATCH 088/195] Switch E2E test command to use Makefile Signed-off-by: Carlo Costino --- .github/workflows/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 179615e89..53af0de2d 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -126,7 +126,7 @@ jobs: # Run the E2E tests against the code found in this PR. # run: poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end # --browser webkit doesn't work at this time. - run: poetry run pytest -v --browser chromium --browser firefox tests/end_to_end + run: make e2e-test # Debugging for now to troubleshoot a connectivity issue to the local servers # run: curl --request GET --url "http://localhost:6012" env: From b50fe24c5221e4bafb6e0214b90d2855ebdd7610 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:14:06 +0000 Subject: [PATCH 089/195] Bump coverage from 7.4.0 to 7.4.2 Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.4.0 to 7.4.2. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.4.0...7.4.2) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- poetry.lock | 117 ++++++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 53 deletions(-) diff --git a/poetry.lock b/poetry.lock index 2123e9dd4..6940ef336 100644 --- a/poetry.lock +++ b/poetry.lock @@ -465,63 +465,63 @@ files = [ [[package]] name = "coverage" -version = "7.4.0" +version = "7.4.2" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.8" files = [ - {file = "coverage-7.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36b0ea8ab20d6a7564e89cb6135920bc9188fb5f1f7152e94e8300b7b189441a"}, - {file = "coverage-7.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0676cd0ba581e514b7f726495ea75aba3eb20899d824636c6f59b0ed2f88c471"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0ca5c71a5a1765a0f8f88022c52b6b8be740e512980362f7fdbb03725a0d6b9"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a7c97726520f784239f6c62506bc70e48d01ae71e9da128259d61ca5e9788516"}, - {file = "coverage-7.4.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:815ac2d0f3398a14286dc2cea223a6f338109f9ecf39a71160cd1628786bc6f5"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:80b5ee39b7f0131ebec7968baa9b2309eddb35b8403d1869e08f024efd883566"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5b2ccb7548a0b65974860a78c9ffe1173cfb5877460e5a229238d985565574ae"}, - {file = "coverage-7.4.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:995ea5c48c4ebfd898eacb098164b3cc826ba273b3049e4a889658548e321b43"}, - {file = "coverage-7.4.0-cp310-cp310-win32.whl", hash = "sha256:79287fd95585ed36e83182794a57a46aeae0b64ca53929d1176db56aacc83451"}, - {file = "coverage-7.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:5b14b4f8760006bfdb6e08667af7bc2d8d9bfdb648351915315ea17645347137"}, - {file = "coverage-7.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:04387a4a6ecb330c1878907ce0dc04078ea72a869263e53c72a1ba5bbdf380ca"}, - {file = "coverage-7.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ea81d8f9691bb53f4fb4db603203029643caffc82bf998ab5b59ca05560f4c06"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74775198b702868ec2d058cb92720a3c5a9177296f75bd97317c787daf711505"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76f03940f9973bfaee8cfba70ac991825611b9aac047e5c80d499a44079ec0bc"}, - {file = "coverage-7.4.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:485e9f897cf4856a65a57c7f6ea3dc0d4e6c076c87311d4bc003f82cfe199d25"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6ae8c9d301207e6856865867d762a4b6fd379c714fcc0607a84b92ee63feff70"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bf477c355274a72435ceb140dc42de0dc1e1e0bf6e97195be30487d8eaaf1a09"}, - {file = "coverage-7.4.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:83c2dda2666fe32332f8e87481eed056c8b4d163fe18ecc690b02802d36a4d26"}, - {file = "coverage-7.4.0-cp311-cp311-win32.whl", hash = "sha256:697d1317e5290a313ef0d369650cfee1a114abb6021fa239ca12b4849ebbd614"}, - {file = "coverage-7.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:26776ff6c711d9d835557ee453082025d871e30b3fd6c27fcef14733f67f0590"}, - {file = "coverage-7.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:13eaf476ec3e883fe3e5fe3707caeb88268a06284484a3daf8250259ef1ba143"}, - {file = "coverage-7.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846f52f46e212affb5bcf131c952fb4075b55aae6b61adc9856222df89cbe3e2"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26f66da8695719ccf90e794ed567a1549bb2644a706b41e9f6eae6816b398c4a"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:164fdcc3246c69a6526a59b744b62e303039a81e42cfbbdc171c91a8cc2f9446"}, - {file = "coverage-7.4.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:316543f71025a6565677d84bc4df2114e9b6a615aa39fb165d697dba06a54af9"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bb1de682da0b824411e00a0d4da5a784ec6496b6850fdf8c865c1d68c0e318dd"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:0e8d06778e8fbffccfe96331a3946237f87b1e1d359d7fbe8b06b96c95a5407a"}, - {file = "coverage-7.4.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a56de34db7b7ff77056a37aedded01b2b98b508227d2d0979d373a9b5d353daa"}, - {file = "coverage-7.4.0-cp312-cp312-win32.whl", hash = "sha256:51456e6fa099a8d9d91497202d9563a320513fcf59f33991b0661a4a6f2ad450"}, - {file = "coverage-7.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:cd3c1e4cb2ff0083758f09be0f77402e1bdf704adb7f89108007300a6da587d0"}, - {file = "coverage-7.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e9d1bf53c4c8de58d22e0e956a79a5b37f754ed1ffdbf1a260d9dcfa2d8a325e"}, - {file = "coverage-7.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:109f5985182b6b81fe33323ab4707011875198c41964f014579cf82cebf2bb85"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cc9d4bc55de8003663ec94c2f215d12d42ceea128da8f0f4036235a119c88ac"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cc6d65b21c219ec2072c1293c505cf36e4e913a3f936d80028993dd73c7906b1"}, - {file = "coverage-7.4.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a10a4920def78bbfff4eff8a05c51be03e42f1c3735be42d851f199144897ba"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b8e99f06160602bc64da35158bb76c73522a4010f0649be44a4e167ff8555952"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7d360587e64d006402b7116623cebf9d48893329ef035278969fa3bbf75b697e"}, - {file = "coverage-7.4.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:29f3abe810930311c0b5d1a7140f6395369c3db1be68345638c33eec07535105"}, - {file = "coverage-7.4.0-cp38-cp38-win32.whl", hash = "sha256:5040148f4ec43644702e7b16ca864c5314ccb8ee0751ef617d49aa0e2d6bf4f2"}, - {file = "coverage-7.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:9864463c1c2f9cb3b5db2cf1ff475eed2f0b4285c2aaf4d357b69959941aa555"}, - {file = "coverage-7.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:936d38794044b26c99d3dd004d8af0035ac535b92090f7f2bb5aa9c8e2f5cd42"}, - {file = "coverage-7.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:799c8f873794a08cdf216aa5d0531c6a3747793b70c53f70e98259720a6fe2d7"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7defbb9737274023e2d7af02cac77043c86ce88a907c58f42b580a97d5bcca9"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a1526d265743fb49363974b7aa8d5899ff64ee07df47dd8d3e37dcc0818f09ed"}, - {file = "coverage-7.4.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf635a52fc1ea401baf88843ae8708591aa4adff875e5c23220de43b1ccf575c"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:756ded44f47f330666843b5781be126ab57bb57c22adbb07d83f6b519783b870"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0eb3c2f32dabe3a4aaf6441dde94f35687224dfd7eb2a7f47f3fd9428e421058"}, - {file = "coverage-7.4.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bfd5db349d15c08311702611f3dccbef4b4e2ec148fcc636cf8739519b4a5c0f"}, - {file = "coverage-7.4.0-cp39-cp39-win32.whl", hash = "sha256:53d7d9158ee03956e0eadac38dfa1ec8068431ef8058fe6447043db1fb40d932"}, - {file = "coverage-7.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:cfd2a8b6b0d8e66e944d47cdec2f47c48fef2ba2f2dff5a9a75757f64172857e"}, - {file = "coverage-7.4.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:c530833afc4707fe48524a44844493f36d8727f04dcce91fb978c414a8556cc6"}, - {file = "coverage-7.4.0.tar.gz", hash = "sha256:707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e"}, + {file = "coverage-7.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:bf54c3e089179d9d23900e3efc86d46e4431188d9a657f345410eecdd0151f50"}, + {file = "coverage-7.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fe6e43c8b510719b48af7db9631b5fbac910ade4bd90e6378c85ac5ac706382c"}, + {file = "coverage-7.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b98c89db1b150d851a7840142d60d01d07677a18f0f46836e691c38134ed18b"}, + {file = "coverage-7.4.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5f9683be6a5b19cd776ee4e2f2ffb411424819c69afab6b2db3a0a364ec6642"}, + {file = "coverage-7.4.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78cdcbf7b9cb83fe047ee09298e25b1cd1636824067166dc97ad0543b079d22f"}, + {file = "coverage-7.4.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2599972b21911111114100d362aea9e70a88b258400672626efa2b9e2179609c"}, + {file = "coverage-7.4.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ef00d31b7569ed3cb2036f26565f1984b9fc08541731ce01012b02a4c238bf03"}, + {file = "coverage-7.4.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:20a875bfd8c282985c4720c32aa05056f77a68e6d8bbc5fe8632c5860ee0b49b"}, + {file = "coverage-7.4.2-cp310-cp310-win32.whl", hash = "sha256:b3f2b1eb229f23c82898eedfc3296137cf1f16bb145ceab3edfd17cbde273fb7"}, + {file = "coverage-7.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:7df95fdd1432a5d2675ce630fef5f239939e2b3610fe2f2b5bf21fa505256fa3"}, + {file = "coverage-7.4.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8ddbd158e069dded57738ea69b9744525181e99974c899b39f75b2b29a624e2"}, + {file = "coverage-7.4.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81a5fb41b0d24447a47543b749adc34d45a2cf77b48ca74e5bf3de60a7bd9edc"}, + {file = "coverage-7.4.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2412e98e70f16243be41d20836abd5f3f32edef07cbf8f407f1b6e1ceae783ac"}, + {file = "coverage-7.4.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ddb79414c15c6f03f56cc68fa06994f047cf20207c31b5dad3f6bab54a0f66ef"}, + {file = "coverage-7.4.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf89ab85027427d351f1de918aff4b43f4eb5f33aff6835ed30322a86ac29c9e"}, + {file = "coverage-7.4.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a178b7b1ac0f1530bb28d2e51f88c0bab3e5949835851a60dda80bff6052510c"}, + {file = "coverage-7.4.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:06fe398145a2e91edaf1ab4eee66149c6776c6b25b136f4a86fcbbb09512fd10"}, + {file = "coverage-7.4.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:18cac867950943fe93d6cd56a67eb7dcd2d4a781a40f4c1e25d6f1ed98721a55"}, + {file = "coverage-7.4.2-cp311-cp311-win32.whl", hash = "sha256:f72cdd2586f9a769570d4b5714a3837b3a59a53b096bb954f1811f6a0afad305"}, + {file = "coverage-7.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:d779a48fac416387dd5673fc5b2d6bd903ed903faaa3247dc1865c65eaa5a93e"}, + {file = "coverage-7.4.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:adbdfcda2469d188d79771d5696dc54fab98a16d2ef7e0875013b5f56a251047"}, + {file = "coverage-7.4.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ac4bab32f396b03ebecfcf2971668da9275b3bb5f81b3b6ba96622f4ef3f6e17"}, + {file = "coverage-7.4.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:006d220ba2e1a45f1de083d5022d4955abb0aedd78904cd5a779b955b019ec73"}, + {file = "coverage-7.4.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3733545eb294e5ad274abe131d1e7e7de4ba17a144505c12feca48803fea5f64"}, + {file = "coverage-7.4.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42a9e754aa250fe61f0f99986399cec086d7e7a01dd82fd863a20af34cbce962"}, + {file = "coverage-7.4.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:2ed37e16cf35c8d6e0b430254574b8edd242a367a1b1531bd1adc99c6a5e00fe"}, + {file = "coverage-7.4.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:b953275d4edfab6cc0ed7139fa773dfb89e81fee1569a932f6020ce7c6da0e8f"}, + {file = "coverage-7.4.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:32b4ab7e6c924f945cbae5392832e93e4ceb81483fd6dc4aa8fb1a97b9d3e0e1"}, + {file = "coverage-7.4.2-cp312-cp312-win32.whl", hash = "sha256:f5df76c58977bc35a49515b2fbba84a1d952ff0ec784a4070334dfbec28a2def"}, + {file = "coverage-7.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:34423abbaad70fea9d0164add189eabaea679068ebdf693baa5c02d03e7db244"}, + {file = "coverage-7.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5b11f9c6587668e495cc7365f85c93bed34c3a81f9f08b0920b87a89acc13469"}, + {file = "coverage-7.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:51593a1f05c39332f623d64d910445fdec3d2ac2d96b37ce7f331882d5678ddf"}, + {file = "coverage-7.4.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69f1665165ba2fe7614e2f0c1aed71e14d83510bf67e2ee13df467d1c08bf1e8"}, + {file = "coverage-7.4.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b3c8bbb95a699c80a167478478efe5e09ad31680931ec280bf2087905e3b95ec"}, + {file = "coverage-7.4.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:175f56572f25e1e1201d2b3e07b71ca4d201bf0b9cb8fad3f1dfae6a4188de86"}, + {file = "coverage-7.4.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8562ca91e8c40864942615b1d0b12289d3e745e6b2da901d133f52f2d510a1e3"}, + {file = "coverage-7.4.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d9a1ef0f173e1a19738f154fb3644f90d0ada56fe6c9b422f992b04266c55d5a"}, + {file = "coverage-7.4.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f40ac873045db4fd98a6f40387d242bde2708a3f8167bd967ccd43ad46394ba2"}, + {file = "coverage-7.4.2-cp38-cp38-win32.whl", hash = "sha256:d1b750a8409bec61caa7824bfd64a8074b6d2d420433f64c161a8335796c7c6b"}, + {file = "coverage-7.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:b4ae777bebaed89e3a7e80c4a03fac434a98a8abb5251b2a957d38fe3fd30088"}, + {file = "coverage-7.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3ff7f92ae5a456101ca8f48387fd3c56eb96353588e686286f50633a611afc95"}, + {file = "coverage-7.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:861d75402269ffda0b33af94694b8e0703563116b04c681b1832903fac8fd647"}, + {file = "coverage-7.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3507427d83fa961cbd73f11140f4a5ce84208d31756f7238d6257b2d3d868405"}, + {file = "coverage-7.4.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bf711d517e21fb5bc429f5c4308fbc430a8585ff2a43e88540264ae87871e36a"}, + {file = "coverage-7.4.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c00e54f0bd258ab25e7f731ca1d5144b0bf7bec0051abccd2bdcff65fa3262c9"}, + {file = "coverage-7.4.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f8e845d894e39fb53834da826078f6dc1a933b32b1478cf437007367efaf6f6a"}, + {file = "coverage-7.4.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:840456cb1067dc350af9080298c7c2cfdddcedc1cb1e0b30dceecdaf7be1a2d3"}, + {file = "coverage-7.4.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c11ca2df2206a4e3e4c4567f52594637392ed05d7c7fb73b4ea1c658ba560265"}, + {file = "coverage-7.4.2-cp39-cp39-win32.whl", hash = "sha256:3ff5bdb08d8938d336ce4088ca1a1e4b6c8cd3bef8bb3a4c0eb2f37406e49643"}, + {file = "coverage-7.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:ac9e95cefcf044c98d4e2c829cd0669918585755dd9a92e28a1a7012322d0a95"}, + {file = "coverage-7.4.2-pp38.pp39.pp310-none-any.whl", hash = "sha256:f593a4a90118d99014517c2679e04a4ef5aee2d81aa05c26c734d271065efcb6"}, + {file = "coverage-7.4.2.tar.gz", hash = "sha256:1a5ee18e3a8d766075ce9314ed1cb695414bae67df6a4b0805f5137d93d6f1cb"}, ] [package.extras] @@ -1415,6 +1415,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -2453,6 +2463,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, From 4180dca164540c7ec5653e2bed7c56c3b1fbc5ac Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 23 Feb 2024 11:24:03 -0500 Subject: [PATCH 090/195] Last bits of cleanup with pytest configuration for E2E tests Signed-off-by: Carlo Costino --- tests/conftest.py | 85 -------------------- tests/end_to_end/__init__.py | 0 tests/end_to_end/conftest.py | 105 +++++++++++++++++++++++++ tests/end_to_end/test_accounts_page.py | 20 +---- 4 files changed, 107 insertions(+), 103 deletions(-) create mode 100644 tests/end_to_end/__init__.py create mode 100644 tests/end_to_end/conftest.py diff --git a/tests/conftest.py b/tests/conftest.py index 4a397b7ec..6c4f94b4f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,7 +1,6 @@ import copy import json import os -import re from contextlib import contextmanager from datetime import date, datetime, timedelta from unittest.mock import Mock, PropertyMock @@ -36,8 +35,6 @@ from . import ( load_dotenv() -E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") - class ElementNotFound(Exception): pass @@ -3521,88 +3518,6 @@ def mock_get_invited_org_user_by_id(mocker, sample_org_invite): ) -def login_for_end_to_end_testing(browser): - # Open a new page and go to the staging site. - context = browser.new_context() - page = context.new_page() - page.goto(f"{E2E_TEST_URI}/") - - sign_in_button = page.get_by_role("link", name="Sign in") - - # Test trying to sign in. - sign_in_button.click() - - # Wait for the next page to fully load. - page.wait_for_load_state("domcontentloaded") - - # Check for the sign in form elements. - # NOTE: Playwright cannot find input elements by role and recommends using - # get_by_label() instead; however, hidden form elements do not have - # labels associated with them, hence the XPath! - # See https://playwright.dev/python/docs/api/class-page#page-get-by-label - # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath - # for more information. - email_address_input = page.get_by_label("Email address") - password_input = page.get_by_label("Password") - continue_button = page.get_by_role("button", name=re.compile("Continue")) - - # Sign in to the site. - email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL")) - password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD")) - continue_button.click() - - # Wait for the next page to fully load. - page.wait_for_load_state("domcontentloaded") - - # Check for the sign in form elements. - # NOTE: Playwright cannot find input elements by role and recommends using - # get_by_label() instead; however, hidden form elements do not have - # labels associated with them, hence the XPath! - # See https://playwright.dev/python/docs/api/class-page#page-get-by-label - # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath - # for more information. - # mfa_input = page.get_by_label('Text message code') - # continue_button = page.get_by_role('button', name=re.compile('Continue')) - - # # Enter MFA code and continue. - # TODO: Revisit this at a later point in time. - # totp = pyotp.TOTP( - # os.getenv('MFA_TOTP_SECRET'), - # digits=int(os.getenv('MFA_TOTP_LENGTH')) - # ) - - # mfa_input.fill(totp.now()) - # continue_button.click() - - # page.wait_for_load_state('domcontentloaded') - - # Save storage state into the file. - auth_state_path = os.path.join( - os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" - ) - context.storage_state(path=auth_state_path) - - -@pytest.fixture(scope="session") -def end_to_end_context(browser): - context = browser.new_context() - return context - - -@pytest.fixture(scope="session") -def end_to_end_authenticated_context(browser): - # Create and load a previously authenticated context for Playwright E2E - # tests. - # login_for_end_to_end_testing(browser) - - auth_state_path = os.path.join( - os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" - ) - context = browser.new_context(storage_state=auth_state_path) - - return context - - @pytest.fixture() def fake_markdown_file(): input = "#Test" diff --git a/tests/end_to_end/__init__.py b/tests/end_to_end/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py new file mode 100644 index 000000000..6abd2e231 --- /dev/null +++ b/tests/end_to_end/conftest.py @@ -0,0 +1,105 @@ +import os +import re + +import pytest + +E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") + + +def login_for_end_to_end_testing(browser): + # Open a new page and go to the staging site. + context = browser.new_context() + page = context.new_page() + page.goto(f"{E2E_TEST_URI}/") + + sign_in_button = page.get_by_role("link", name="Sign in") + + # Test trying to sign in. + sign_in_button.click() + + # Wait for the next page to fully load. + page.wait_for_load_state("domcontentloaded") + + # Check for the sign in form elements. + # NOTE: Playwright cannot find input elements by role and recommends using + # get_by_label() instead; however, hidden form elements do not have + # labels associated with them, hence the XPath! + # See https://playwright.dev/python/docs/api/class-page#page-get-by-label + # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath + # for more information. + email_address_input = page.get_by_label("Email address") + password_input = page.get_by_label("Password") + continue_button = page.get_by_role("button", name=re.compile("Continue")) + + # Sign in to the site. + email_address_input.fill(os.getenv("NOTIFY_E2E_TEST_EMAIL")) + password_input.fill(os.getenv("NOTIFY_E2E_TEST_PASSWORD")) + continue_button.click() + + # Wait for the next page to fully load. + page.wait_for_load_state("domcontentloaded") + + # Check for the sign in form elements. + # NOTE: Playwright cannot find input elements by role and recommends using + # get_by_label() instead; however, hidden form elements do not have + # labels associated with them, hence the XPath! + # See https://playwright.dev/python/docs/api/class-page#page-get-by-label + # and https://playwright.dev/python/docs/locators#locate-by-css-or-xpath + # for more information. + # mfa_input = page.get_by_label('Text message code') + # continue_button = page.get_by_role('button', name=re.compile('Continue')) + + # # Enter MFA code and continue. + # TODO: Revisit this at a later point in time. + # totp = pyotp.TOTP( + # os.getenv('MFA_TOTP_SECRET'), + # digits=int(os.getenv('MFA_TOTP_LENGTH')) + # ) + + # mfa_input.fill(totp.now()) + # continue_button.click() + + # page.wait_for_load_state('domcontentloaded') + + # Save storage state into the file. + auth_state_path = os.path.join( + os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" + ) + context.storage_state(path=auth_state_path) + + +@pytest.fixture(scope="session") +def end_to_end_context(browser): + context = browser.new_context() + return context + + +@pytest.fixture(scope="session") +def end_to_end_authenticated_context(browser): + # Create and load a previously authenticated context for Playwright E2E + # tests. + # login_for_end_to_end_testing(browser) + + auth_state_path = os.path.join( + os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" + ) + context = browser.new_context(storage_state=auth_state_path) + + return context + + +@pytest.fixture(scope="session") +def bypass_sign_in(end_to_end_context): + # Open a new page and go to the staging site. + page = end_to_end_context.new_page() + + page.goto(f"{E2E_TEST_URI}/") + + sign_in_button = page.get_by_role("link", name="Sign in") + + # Sign in to the site - E2E test accounts are set to flow through. + sign_in_button.click() + + # Wait for the next page to fully load. + page.wait_for_load_state("domcontentloaded") + return page diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index 8484e58b0..89357c7ed 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -7,24 +7,8 @@ from playwright.sync_api import expect E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") -def _bypass_sign_in(end_to_end_context): - # Open a new page and go to the staging site. - page = end_to_end_context.new_page() - - page.goto(f"{E2E_TEST_URI}/") - - sign_in_button = page.get_by_role("link", name="Sign in") - - # Sign in to the site - E2E test accounts are set to flow through. - sign_in_button.click() - - # Wait for the next page to fully load. - page.wait_for_load_state("domcontentloaded") - return page - - -def test_add_new_service_workflow(end_to_end_context): - page = _bypass_sign_in(end_to_end_context) +def test_add_new_service_workflow(bypass_sign_in, end_to_end_context): + page = bypass_sign_in(end_to_end_context) page.goto(f"{E2E_TEST_URI}/") # Wait for the next page to fully load. From d0c4b505b9d45565a032a566934cee1df8690393 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:35:56 +0000 Subject: [PATCH 091/195] Bump black from 23.12.1 to 24.2.0 Bumps [black](https://github.com/psf/black) from 23.12.1 to 24.2.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/compare/23.12.1...24.2.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 48 ++++++++++++++++++++++++------------------------ pyproject.toml | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/poetry.lock b/poetry.lock index 6940ef336..d59ea1c83 100644 --- a/poetry.lock +++ b/poetry.lock @@ -85,33 +85,33 @@ lxml = ["lxml"] [[package]] name = "black" -version = "23.12.1" +version = "24.2.0" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-23.12.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e0aaf6041986767a5e0ce663c7a2f0e9eaf21e6ff87a5f95cbf3675bfd4c41d2"}, - {file = "black-23.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c88b3711d12905b74206227109272673edce0cb29f27e1385f33b0163c414bba"}, - {file = "black-23.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a920b569dc6b3472513ba6ddea21f440d4b4c699494d2e972a1753cdc25df7b0"}, - {file = "black-23.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:3fa4be75ef2a6b96ea8d92b1587dd8cb3a35c7e3d51f0738ced0781c3aa3a5a3"}, - {file = "black-23.12.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8d4df77958a622f9b5a4c96edb4b8c0034f8434032ab11077ec6c56ae9f384ba"}, - {file = "black-23.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:602cfb1196dc692424c70b6507593a2b29aac0547c1be9a1d1365f0d964c353b"}, - {file = "black-23.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c4352800f14be5b4864016882cdba10755bd50805c95f728011bcb47a4afd59"}, - {file = "black-23.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:0808494f2b2df923ffc5723ed3c7b096bd76341f6213989759287611e9837d50"}, - {file = "black-23.12.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:25e57fd232a6d6ff3f4478a6fd0580838e47c93c83eaf1ccc92d4faf27112c4e"}, - {file = "black-23.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2d9e13db441c509a3763a7a3d9a49ccc1b4e974a47be4e08ade2a228876500ec"}, - {file = "black-23.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d1bd9c210f8b109b1762ec9fd36592fdd528485aadb3f5849b2740ef17e674e"}, - {file = "black-23.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:ae76c22bde5cbb6bfd211ec343ded2163bba7883c7bc77f6b756a1049436fbb9"}, - {file = "black-23.12.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1fa88a0f74e50e4487477bc0bb900c6781dbddfdfa32691e780bf854c3b4a47f"}, - {file = "black-23.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a4d6a9668e45ad99d2f8ec70d5c8c04ef4f32f648ef39048d010b0689832ec6d"}, - {file = "black-23.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b18fb2ae6c4bb63eebe5be6bd869ba2f14fd0259bda7d18a46b764d8fb86298a"}, - {file = "black-23.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:c04b6d9d20e9c13f43eee8ea87d44156b8505ca8a3c878773f68b4e4812a421e"}, - {file = "black-23.12.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3e1b38b3135fd4c025c28c55ddfc236b05af657828a8a6abe5deec419a0b7055"}, - {file = "black-23.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4f0031eaa7b921db76decd73636ef3a12c942ed367d8c3841a0739412b260a54"}, - {file = "black-23.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97e56155c6b737854e60a9ab1c598ff2533d57e7506d97af5481141671abf3ea"}, - {file = "black-23.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:dd15245c8b68fe2b6bd0f32c1556509d11bb33aec9b5d0866dd8e2ed3dba09c2"}, - {file = "black-23.12.1-py3-none-any.whl", hash = "sha256:78baad24af0f033958cad29731e27363183e140962595def56423e626f4bee3e"}, - {file = "black-23.12.1.tar.gz", hash = "sha256:4ce3ef14ebe8d9509188014d96af1c456a910d5b5cbf434a09fef7e024b3d0d5"}, + {file = "black-24.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6981eae48b3b33399c8757036c7f5d48a535b962a7c2310d19361edeef64ce29"}, + {file = "black-24.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d533d5e3259720fdbc1b37444491b024003e012c5173f7d06825a77508085430"}, + {file = "black-24.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61a0391772490ddfb8a693c067df1ef5227257e72b0e4108482b8d41b5aee13f"}, + {file = "black-24.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:992e451b04667116680cb88f63449267c13e1ad134f30087dec8527242e9862a"}, + {file = "black-24.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:163baf4ef40e6897a2a9b83890e59141cc8c2a98f2dda5080dc15c00ee1e62cd"}, + {file = "black-24.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e37c99f89929af50ffaf912454b3e3b47fd64109659026b678c091a4cd450fb2"}, + {file = "black-24.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f9de21bafcba9683853f6c96c2d515e364aee631b178eaa5145fc1c61a3cc92"}, + {file = "black-24.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:9db528bccb9e8e20c08e716b3b09c6bdd64da0dd129b11e160bf082d4642ac23"}, + {file = "black-24.2.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d84f29eb3ee44859052073b7636533ec995bd0f64e2fb43aeceefc70090e752b"}, + {file = "black-24.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e08fb9a15c914b81dd734ddd7fb10513016e5ce7e6704bdd5e1251ceee51ac9"}, + {file = "black-24.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:810d445ae6069ce64030c78ff6127cd9cd178a9ac3361435708b907d8a04c693"}, + {file = "black-24.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:ba15742a13de85e9b8f3239c8f807723991fbfae24bad92d34a2b12e81904982"}, + {file = "black-24.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7e53a8c630f71db01b28cd9602a1ada68c937cbf2c333e6ed041390d6968faf4"}, + {file = "black-24.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:93601c2deb321b4bad8f95df408e3fb3943d85012dddb6121336b8e24a0d1218"}, + {file = "black-24.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0057f800de6acc4407fe75bb147b0c2b5cbb7c3ed110d3e5999cd01184d53b0"}, + {file = "black-24.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:faf2ee02e6612577ba0181f4347bcbcf591eb122f7841ae5ba233d12c39dcb4d"}, + {file = "black-24.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:057c3dc602eaa6fdc451069bd027a1b2635028b575a6c3acfd63193ced20d9c8"}, + {file = "black-24.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:08654d0797e65f2423f850fc8e16a0ce50925f9337fb4a4a176a7aa4026e63f8"}, + {file = "black-24.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca610d29415ee1a30a3f30fab7a8f4144e9d34c89a235d81292a1edb2b55f540"}, + {file = "black-24.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:4dd76e9468d5536abd40ffbc7a247f83b2324f0c050556d9c371c2b9a9a95e31"}, + {file = "black-24.2.0-py3-none-any.whl", hash = "sha256:e8a6ae970537e67830776488bca52000eaa37fa63b9988e8c487458d9cd5ace6"}, + {file = "black-24.2.0.tar.gz", hash = "sha256:bce4f25c27c3435e4dace4815bcb2008b87e167e3bf4ee47ccdc5ce906eb4894"}, ] [package.dependencies] @@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "be46f8e90d6213db5c54d62c3a364c0a2a7e50f5c8e5007ad662067a6191c51f" +content-hash = "8e278df4a6ff892ffe61cd197988c1282eb0c7b228685e7c4df6c35b9bd4e4fc" diff --git a/pyproject.toml b/pyproject.toml index 49ea4dbe3..f073a7b41 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ markdown = "^3.5.2" [tool.poetry.group.dev.dependencies] bandit = "*" -black = "^23.12.1" +black = "^24.2.0" coverage = "*" freezegun = "^1.4.0" flake8 = "^6.1.0" From 4741b381c2545bff5857ff1cd835c8bf1fd23e2e Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 23 Feb 2024 11:39:14 -0500 Subject: [PATCH 092/195] Adjusting authenticated page fixture Signed-off-by: Carlo Costino --- tests/end_to_end/conftest.py | 2 +- tests/end_to_end/test_accounts_page.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py index 6abd2e231..48d1bcd35 100644 --- a/tests/end_to_end/conftest.py +++ b/tests/end_to_end/conftest.py @@ -89,7 +89,7 @@ def end_to_end_authenticated_context(browser): @pytest.fixture(scope="session") -def bypass_sign_in(end_to_end_context): +def authenticated_page(end_to_end_context): # Open a new page and go to the staging site. page = end_to_end_context.new_page() diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index 89357c7ed..411728e33 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -7,8 +7,8 @@ from playwright.sync_api import expect E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") -def test_add_new_service_workflow(bypass_sign_in, end_to_end_context): - page = bypass_sign_in(end_to_end_context) +def test_add_new_service_workflow(authenticated_page, end_to_end_context): + page = authenticated_page page.goto(f"{E2E_TEST_URI}/") # Wait for the next page to fully load. From 673df7da3dc42bfe5cb5745a0c3f0e211a857a5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:50:02 +0000 Subject: [PATCH 093/195] Bump vulture from 2.10 to 2.11 Bumps [vulture](https://github.com/jendrikseipp/vulture) from 2.10 to 2.11. - [Release notes](https://github.com/jendrikseipp/vulture/releases) - [Changelog](https://github.com/jendrikseipp/vulture/blob/main/CHANGELOG.md) - [Commits](https://github.com/jendrikseipp/vulture/compare/v2.10...v2.11) --- updated-dependencies: - dependency-name: vulture dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 10 +++++----- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index d59ea1c83..7683c5f41 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2962,17 +2962,17 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [[package]] name = "vulture" -version = "2.10" +version = "2.11" description = "Find dead code" optional = false python-versions = ">=3.8" files = [ - {file = "vulture-2.10-py2.py3-none-any.whl", hash = "sha256:568a4176db7468d0157817ae3bb1847a19f1ddc629849af487f9d3b279bff77d"}, - {file = "vulture-2.10.tar.gz", hash = "sha256:2a5c3160bffba77595b6e6dfcc412016bd2a09cd4b66cdf7fbba913684899f6f"}, + {file = "vulture-2.11-py2.py3-none-any.whl", hash = "sha256:12d745f7710ffbf6aeb8279ba9068a24d4e52e8ed333b8b044035c9d6b823aba"}, + {file = "vulture-2.11.tar.gz", hash = "sha256:f0fbb60bce6511aad87ee0736c502456737490a82d919a44e6d92262cb35f1c2"}, ] [package.dependencies] -toml = "*" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [[package]] name = "webencodings" @@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "8e278df4a6ff892ffe61cd197988c1282eb0c7b228685e7c4df6c35b9bd4e4fc" +content-hash = "4be613fced755d73cade0c71aded7e23729844421c40cf28a78e40d6b81f828d" diff --git a/pyproject.toml b/pyproject.toml index f073a7b41..58183668c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ pytest-playwright = "^0.4.3" pytest-xdist = "^3.5.0" radon = "^6.0.1" requests-mock = "^1.11.0" -vulture = "^2.10" +vulture = "^2.11" [build-system] From c71a7edcfeac058657266c6db81cd981056c4836 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:01:47 +0000 Subject: [PATCH 094/195] Bump flake8 from 6.1.0 to 7.0.0 Bumps [flake8](https://github.com/pycqa/flake8) from 6.1.0 to 7.0.0. - [Commits](https://github.com/pycqa/flake8/compare/6.1.0...7.0.0) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 16 ++++++++-------- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index 7683c5f41..a7e09cf85 100644 --- a/poetry.lock +++ b/poetry.lock @@ -727,19 +727,19 @@ typing = ["typing-extensions (>=4.8)"] [[package]] name = "flake8" -version = "6.1.0" +version = "7.0.0" description = "the modular source code checker: pep8 pyflakes and co" optional = false python-versions = ">=3.8.1" files = [ - {file = "flake8-6.1.0-py2.py3-none-any.whl", hash = "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"}, - {file = "flake8-6.1.0.tar.gz", hash = "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23"}, + {file = "flake8-7.0.0-py2.py3-none-any.whl", hash = "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"}, + {file = "flake8-7.0.0.tar.gz", hash = "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132"}, ] [package.dependencies] mccabe = ">=0.7.0,<0.8.0" pycodestyle = ">=2.11.0,<2.12.0" -pyflakes = ">=3.1.0,<3.2.0" +pyflakes = ">=3.2.0,<3.3.0" [[package]] name = "flake8-bugbear" @@ -2168,13 +2168,13 @@ pyexcel-io = ">=0.6.2" [[package]] name = "pyflakes" -version = "3.1.0" +version = "3.2.0" description = "passive checker of Python programs" optional = false python-versions = ">=3.8" files = [ - {file = "pyflakes-3.1.0-py2.py3-none-any.whl", hash = "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774"}, - {file = "pyflakes-3.1.0.tar.gz", hash = "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"}, + {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"}, + {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"}, ] [[package]] @@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "4be613fced755d73cade0c71aded7e23729844421c40cf28a78e40d6b81f828d" +content-hash = "1021999aefa9b1f83453706c25c87226b61da5d07b58bf2593dbd97eb5db844c" diff --git a/pyproject.toml b/pyproject.toml index 58183668c..e1f2ae143 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ bandit = "*" black = "^24.2.0" coverage = "*" freezegun = "^1.4.0" -flake8 = "^6.1.0" +flake8 = "^7.0.0" flake8-bugbear = "^24.1.17" flake8-print = "^5.0.0" flake8-pytest-style = "^1.7.2" From 25646c2e2f26e8b92f78320e7ec4d4ab4f42f78b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 17:18:04 +0000 Subject: [PATCH 095/195] Bump notifications-python-client from 8.2.0 to 9.0.0 Bumps [notifications-python-client](https://github.com/alphagov/notifications-python-client) from 8.2.0 to 9.0.0. - [Changelog](https://github.com/alphagov/notifications-python-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/notifications-python-client/compare/8.2.0...9.0.0) --- updated-dependencies: - dependency-name: notifications-python-client dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- poetry.lock | 6 +++--- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index a7e09cf85..74a0b0ac6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1672,12 +1672,12 @@ setuptools = "*" [[package]] name = "notifications-python-client" -version = "8.2.0" +version = "9.0.0" description = "Python API client for GOV.UK Notify." optional = false python-versions = ">=3.7" files = [ - {file = "notifications_python_client-8.2.0-py3-none-any.whl", hash = "sha256:8cd8bd01ae603a972a5413c430ca42b16f6481f37d98406c3e9b68c1c192f59e"}, + {file = "notifications_python_client-9.0.0-py3-none-any.whl", hash = "sha256:664a5b5da2aa1a00efa8106bfa4855db04da95d79586e5edfb0411637d20d2d9"}, ] [package.dependencies] @@ -3075,4 +3075,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.12" -content-hash = "1021999aefa9b1f83453706c25c87226b61da5d07b58bf2593dbd97eb5db844c" +content-hash = "30e3f9f8e1a094e67cc780b496641dfbe33e639cefccf35ee3b1553c9a683b71" diff --git a/pyproject.toml b/pyproject.toml index e1f2ae143..5aed7711a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ humanize = "~=4.9" itsdangerous = "~=2.1" jinja2 = "~=3.1" newrelic = "*" -notifications-python-client = "==8.2.0" +notifications-python-client = "==9.0.0" notifications-utils = {git = "https://github.com/GSA/notifications-utils.git"} pyexcel = "==0.7.0" pyexcel-io = "==0.6.6" From e71351d94938779145a1478c6683e3eafcc5a327 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 23 Feb 2024 16:02:16 -0500 Subject: [PATCH 096/195] Add E2E documentation and clean E2E tests This changeset adds additional documentation for how to write new E2E tests and cleans up the two existing tests slightly to make better use of the fixtures that are defined. Signed-off-by: Carlo Costino --- docs/end_to_end_tests.md | 99 +++++++++++++++++++ tests/end_to_end/conftest.py | 21 +++- tests/end_to_end/test_accounts_page.py | 4 - .../test_landing_and_sign_in_pages.py | 9 +- 4 files changed, 118 insertions(+), 15 deletions(-) diff --git a/docs/end_to_end_tests.md b/docs/end_to_end_tests.md index 02eec2e8b..557bdf327 100644 --- a/docs/end_to_end_tests.md +++ b/docs/end_to_end_tests.md @@ -106,6 +106,105 @@ All of the E2E tests are found in the `tests/end_to_end` folder and are written as `pytest` scripts using [Playwright's Python Framework](https://playwright.dev/python/docs/writing-tests). +Inside the `tests/end_to_end` folder you'll see a `conftest.py` file, +which is similar to the one found in the root `tests` folder but is +specific to the E2E tests. + +There a few fixtures defined in here, but the three most important at +this time are these: + +- `end_to_end_context`: A Playwright context object needed to interact + with a browser instance. +- `authenticated_page`: A Playwright page object that has gone through + the sign in process the E2E user is authenticated. +- `unauthenticated_page`: A Playwright page object that has only loaded + the home page; no authentication done. + +In short, if you're starting a test from scratch and testing pages that +do not require authentication, you'll start with the +`unauthenticated_page` fixture and work from there. + +Any test that requires you to be authenticated, you'll start with the +`authenticated_page` object as that'll have taken care of getting +everything set for you and logged into the site with the E2E test user. + +The `end_to_end_context` fixture is there more for the two page than for +direct use, but there may be instances where it's easier to get data +or manipulate tests in ways that are better done with the context object +instead of working back from the page object. + + +### Creating a new test file + +If you want to create a new test file to help organize tests (a great +idea!), it will be handy to import the Playwright `expect` and set the +base URL/URI for yourself, like this: + +```python +from playwright.sync_api import expect + +E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") +``` + +By importing Playwright's `expect` object for tests and setting +something like `E2E_TEST_URI` for yourself, it will make writing tests +much easier. + + +### Using the fixtures + +To use the `authenticated_page` or `unauthenticated_page` fixtures, you +start by defining a test function and then passing in the fixture you +need as a positional argument. This works the same as the other +functions defined to create a test for pytest. + +For example, the test for the landing page starts with this: + +```python +def test_landing_page(unauthenticated_page): + page = unauthenticated_page + ... +``` + +Note the passing in of the `unauthenticated_page` fixture - there is no +need to import this or anything, just pass it into the function. pytest +takes care of everything else for you. + +The second line that defines a `page` variable is a convenience, since +you'll be referencing the page object a lot. This is recommended to +help keep tests readable while keeping fixture names descriptive. + +If you need to test an authenticate page, such as the accounts page, +use the `authenticated_page` fixture instead, like so: + +```python +def test_add_new_service_workflow(authenticated_page): + page = authenticated_page + ... +``` + +Again, it's helpful to assign the fixture to a `page` variable for easy +reference throughout the test. + +Lastly, if you need want access to the Playwright context object that is +used behind the page fixtures, you can reference it directly as well: + +```python +def test_add_new_service_workflow(authenticated_page, end_to_end_context): + page = authenticated_page + + # Prepare for adding a new service later in the test. + current_date_time = datetime.datetime.now() + new_service_name = "E2E Federal Test Service {now} - {browser_type}".format( + now=current_date_time.strftime("%m/%d/%Y %H:%M:%S"), + browser_type=end_to_end_context.browser.browser_type.name, + ) + ... +``` + +In this example, I've used the context to get to the browser object +itself to get the name of the browser for test data. + ## Maintaining E2E Tests with GitHub diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py index 48d1bcd35..4819ec007 100644 --- a/tests/end_to_end/conftest.py +++ b/tests/end_to_end/conftest.py @@ -89,17 +89,30 @@ def end_to_end_authenticated_context(browser): @pytest.fixture(scope="session") -def authenticated_page(end_to_end_context): - # Open a new page and go to the staging site. +def unauthenticated_page(end_to_end_context): page = end_to_end_context.new_page() - page.goto(f"{E2E_TEST_URI}/") - sign_in_button = page.get_by_role("link", name="Sign in") + # Wait for the next page to fully load. + page.wait_for_load_state("domcontentloaded") + + return page + + +@pytest.fixture(scope="session") +def authenticated_page(end_to_end_context): + # Open a new page and go to the site. + page = end_to_end_context.new_page() + page.goto(f"{E2E_TEST_URI}/") + + # Wait for the next page to fully load. + page.wait_for_load_state("domcontentloaded") # Sign in to the site - E2E test accounts are set to flow through. + sign_in_button = page.get_by_role("link", name="Sign in") sign_in_button.click() # Wait for the next page to fully load. page.wait_for_load_state("domcontentloaded") + return page diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index 411728e33..b6fe8c5ac 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -9,10 +9,6 @@ E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") def test_add_new_service_workflow(authenticated_page, end_to_end_context): page = authenticated_page - page.goto(f"{E2E_TEST_URI}/") - - # Wait for the next page to fully load. - page.wait_for_load_state("domcontentloaded") # Prepare for adding a new service later in the test. current_date_time = datetime.datetime.now() diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py index dd6a70beb..8b0f04f86 100644 --- a/tests/end_to_end/test_landing_and_sign_in_pages.py +++ b/tests/end_to_end/test_landing_and_sign_in_pages.py @@ -6,13 +6,8 @@ from playwright.sync_api import expect E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") -def test_landing_page(end_to_end_context): - # Open a new page and go to the staging site. - page = end_to_end_context.browser.new_page() - page.goto(f"{E2E_TEST_URI}/") - - # Check to make sure that we've arrived at the next page. - page.wait_for_load_state("domcontentloaded") +def test_landing_page(unauthenticated_page): + page = unauthenticated_page # Check the page title exists and matches what we expect. expect(page).to_have_title(re.compile("Notify.gov")) From 34d20c4d65cb6a23d10b7bf5df02adb3122e8ff0 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 23 Feb 2024 16:53:39 -0500 Subject: [PATCH 097/195] Trying to get landing page test working again Signed-off-by: Carlo Costino --- tests/end_to_end/test_landing_and_sign_in_pages.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py index 8b0f04f86..ab1f885b1 100644 --- a/tests/end_to_end/test_landing_and_sign_in_pages.py +++ b/tests/end_to_end/test_landing_and_sign_in_pages.py @@ -7,7 +7,12 @@ E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") def test_landing_page(unauthenticated_page): + # Open a new page and go to the staging site. page = unauthenticated_page + page.goto(f"{E2E_TEST_URI}/") + + # Check to make sure that we've arrived at the next page. + page.wait_for_load_state("domcontentloaded") # Check the page title exists and matches what we expect. expect(page).to_have_title(re.compile("Notify.gov")) From c891bc1b3f800c60dc5bef7b9392dbdf394e256d Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 23 Feb 2024 17:02:18 -0500 Subject: [PATCH 098/195] Another attempt at fixing the landing page test Signed-off-by: Carlo Costino --- tests/end_to_end/conftest.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py index 4819ec007..91e52ac40 100644 --- a/tests/end_to_end/conftest.py +++ b/tests/end_to_end/conftest.py @@ -91,11 +91,6 @@ def end_to_end_authenticated_context(browser): @pytest.fixture(scope="session") def unauthenticated_page(end_to_end_context): page = end_to_end_context.new_page() - page.goto(f"{E2E_TEST_URI}/") - - # Wait for the next page to fully load. - page.wait_for_load_state("domcontentloaded") - return page From 5c6a23c87342f5ea50b4c438a92db9bdb2d2ae34 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 23 Feb 2024 17:10:41 -0500 Subject: [PATCH 099/195] Undo changes to the landing page test Signed-off-by: Carlo Costino --- tests/end_to_end/conftest.py | 11 +++-------- tests/end_to_end/test_landing_and_sign_in_pages.py | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py index 91e52ac40..f21fbe0fc 100644 --- a/tests/end_to_end/conftest.py +++ b/tests/end_to_end/conftest.py @@ -68,11 +68,6 @@ def login_for_end_to_end_testing(browser): context.storage_state(path=auth_state_path) -@pytest.fixture(scope="session") -def end_to_end_context(browser): - context = browser.new_context() - return context - @pytest.fixture(scope="session") def end_to_end_authenticated_context(browser): @@ -89,9 +84,9 @@ def end_to_end_authenticated_context(browser): @pytest.fixture(scope="session") -def unauthenticated_page(end_to_end_context): - page = end_to_end_context.new_page() - return page +def end_to_end_context(browser): + context = browser.new_context() + return context @pytest.fixture(scope="session") diff --git a/tests/end_to_end/test_landing_and_sign_in_pages.py b/tests/end_to_end/test_landing_and_sign_in_pages.py index ab1f885b1..a9148cb31 100644 --- a/tests/end_to_end/test_landing_and_sign_in_pages.py +++ b/tests/end_to_end/test_landing_and_sign_in_pages.py @@ -6,9 +6,9 @@ from playwright.sync_api import expect E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI") -def test_landing_page(unauthenticated_page): - # Open a new page and go to the staging site. - page = unauthenticated_page +def test_landing_page(end_to_end_context): + # Open a new page and go to the site. + page = end_to_end_context.browser.new_page() page.goto(f"{E2E_TEST_URI}/") # Check to make sure that we've arrived at the next page. From 564fc7352120829ad28320eb9897736efaaa3f3e Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Fri, 23 Feb 2024 17:38:47 -0500 Subject: [PATCH 100/195] Fixed up documentation to match current state; blackened formatting Signed-off-by: Carlo Costino --- docs/end_to_end_tests.md | 29 +++++++++---------- tests/app/main/views/test_manage_users.py | 6 ++-- tests/app/main/views/test_template_folders.py | 8 +++-- tests/conftest.py | 14 +++++---- tests/end_to_end/conftest.py | 1 - 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/docs/end_to_end_tests.md b/docs/end_to_end_tests.md index 557bdf327..11758a16e 100644 --- a/docs/end_to_end_tests.md +++ b/docs/end_to_end_tests.md @@ -110,29 +110,22 @@ Inside the `tests/end_to_end` folder you'll see a `conftest.py` file, which is similar to the one found in the root `tests` folder but is specific to the E2E tests. -There a few fixtures defined in here, but the three most important at -this time are these: +There a few fixtures defined in here, but the two most important at this +time are these: - `end_to_end_context`: A Playwright context object needed to interact with a browser instance. - `authenticated_page`: A Playwright page object that has gone through the sign in process the E2E user is authenticated. -- `unauthenticated_page`: A Playwright page object that has only loaded - the home page; no authentication done. In short, if you're starting a test from scratch and testing pages that do not require authentication, you'll start with the -`unauthenticated_page` fixture and work from there. +`end_to_end_context` fixture and work from there. Any test that requires you to be authenticated, you'll start with the `authenticated_page` object as that'll have taken care of getting everything set for you and logged into the site with the E2E test user. -The `end_to_end_context` fixture is there more for the two page than for -direct use, but there may be instances where it's easier to get data -or manipulate tests in ways that are better done with the context object -instead of working back from the page object. - ### Creating a new test file @@ -153,7 +146,7 @@ much easier. ### Using the fixtures -To use the `authenticated_page` or `unauthenticated_page` fixtures, you +To use the `authenticated_page` or `end_to_end_context` fixtures, you start by defining a test function and then passing in the fixture you need as a positional argument. This works the same as the other functions defined to create a test for pytest. @@ -161,12 +154,17 @@ functions defined to create a test for pytest. For example, the test for the landing page starts with this: ```python -def test_landing_page(unauthenticated_page): - page = unauthenticated_page +def test_landing_page(end_to_end_context): + # Open a new page and go to the site. + page = end_to_end_context.browser.new_page() + page.goto(f"{E2E_TEST_URI}/") + + # Check to make sure that we've arrived at the next page. + page.wait_for_load_state("domcontentloaded") ... ``` -Note the passing in of the `unauthenticated_page` fixture - there is no +Note the passing in of the `end_to_end_context` fixture - there is no need to import this or anything, just pass it into the function. pytest takes care of everything else for you. @@ -187,7 +185,8 @@ Again, it's helpful to assign the fixture to a `page` variable for easy reference throughout the test. Lastly, if you need want access to the Playwright context object that is -used behind the page fixtures, you can reference it directly as well: +used behind the page fixtures, you can reference it directly as well +using the `end_to_end_context` fixture: ```python def test_add_new_service_workflow(authenticated_page, end_to_end_context): diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 9bdabf925..c3d128155 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -862,9 +862,9 @@ def test_should_show_page_if_prefilled_user_is_already_invited( mock_get_invites_for_service, platform_admin_user, ): - active_user_with_permission_to_other_service[ - "email_address" - ] = "user_1@testnotify.gsa.gov" + active_user_with_permission_to_other_service["email_address"] = ( + "user_1@testnotify.gsa.gov" + ) client_request.login(platform_admin_user) mocker.patch( "app.models.user.user_api_client.get_user", diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index fae020e58..0bf2fcb08 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -31,9 +31,11 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "name": name, "id": folder_id or str(uuid.uuid4()), "parent_id": parent, - "users_with_permission": users_with_permission - if users_with_permission is not None - else [sample_uuid()], + "users_with_permission": ( + users_with_permission + if users_with_permission is not None + else [sample_uuid()] + ), } diff --git a/tests/conftest.py b/tests/conftest.py index 6c4f94b4f..4c2ceeea9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -904,9 +904,11 @@ def create_service_templates(service_id, number_of_templates=4): "{}_template_{}".format(template_type, template_number), template_type, "{} template {} content".format(template_type, template_number), - subject="{} template {} subject".format(template_type, template_number) - if template_type == "email" - else None, + subject=( + "{} template {} subject".format(template_type, template_number) + if template_type == "email" + else None + ), ) ) @@ -1101,9 +1103,9 @@ def active_user_with_permission_to_other_service( active_user_with_permission_to_two_services["permissions"].pop(SERVICE_ONE_ID) active_user_with_permission_to_two_services["services"].pop(0) active_user_with_permission_to_two_services["name"] = "Service Two User" - active_user_with_permission_to_two_services[ - "email_address" - ] = "service-two-user@test.gsa.gov" + active_user_with_permission_to_two_services["email_address"] = ( + "service-two-user@test.gsa.gov" + ) return active_user_with_permission_to_two_services diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py index f21fbe0fc..16940d4e0 100644 --- a/tests/end_to_end/conftest.py +++ b/tests/end_to_end/conftest.py @@ -68,7 +68,6 @@ def login_for_end_to_end_testing(browser): context.storage_state(path=auth_state_path) - @pytest.fixture(scope="session") def end_to_end_authenticated_context(browser): # Create and load a previously authenticated context for Playwright E2E From 66909e96249a56385b8454c25505a31a731a7762 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 23 Feb 2024 17:50:25 -0800 Subject: [PATCH 101/195] added conditional --- app/main/views/dashboard.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 24b3e0490..4d5aca14d 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -76,6 +76,7 @@ def service_dashboard(service_id): "notifications": aggregate_notifications_by_job.get(job["id"], []), } for job in job_response + if aggregate_notifications_by_job.get(job["id"], []) ] return render_template( "views/dashboard/dashboard.html", From fff440a6ff92615aab0f9dc51080a8a5850d8d74 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Mon, 26 Feb 2024 11:10:50 -0500 Subject: [PATCH 102/195] 1216 - sign-in page redesign with login.gov --- app/templates/views/signin.html | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index a19376d7c..4ee655127 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -13,7 +13,7 @@ {% block maincolumn_content %}
-
+
{% if again %}

You need to sign in again

@@ -29,9 +29,9 @@ {% else %}

Sign in

{% if login_gov_enabled %} - Sign in with Login.gov -

-

Or:

+

You can access your account by signing in with one of the options below:

+ Sign in with Login.gov +

Or:

{% endif %} {% endif %} @@ -41,6 +41,19 @@ {{ page_footer("Continue", secondary_link=password_reset_url, secondary_link_text="Forgot your password?") }} {% endcall %}
+
+

Notify.gov is changing the Sign in experience to Login.gov on March x, 2024

+

Why are we doing this?

+
    +
  • One single source for signing in: You can use login.gov for other sign in forms within the government
    • +
  • Security: It's really secure and trustworthy
    • +
  • Fast and easy: It's fast and easy
    • +
+
+

Don't have a login.gov account?

+

If you don't have an account already, sign up here:

+ Create Login.gov account +
{% endblock %} From 141c24e37146ff4bc80f94165715e8ce73461f4c Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Mon, 26 Feb 2024 11:07:16 -0800 Subject: [PATCH 103/195] add latest version commit hash to footer (notify-admin-204) --- .github/workflows/deploy-demo.yml | 1 + .github/workflows/deploy-prod.yml | 1 + .github/workflows/deploy.yml | 2 ++ app/config.py | 1 + app/main/forms.py | 16 +++++++---- app/main/views/api_keys.py | 22 +++++++++------ app/main/views/manage_users.py | 22 ++++++++------- app/main/views/performance.py | 6 ++-- app/main/views/send.py | 28 +++++++++++-------- app/main/views/service_settings.py | 24 ++++++++++------ app/templates/admin_template.html | 6 ++-- manifest.yml | 2 ++ tests/app/main/views/test_manage_users.py | 6 ++-- tests/app/main/views/test_template_folders.py | 8 ++++-- tests/conftest.py | 14 ++++++---- 15 files changed, 96 insertions(+), 63 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index e1d76775a..38947c4b3 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -54,6 +54,7 @@ jobs: ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} + COMMIT_HASH: $(git rev-parse --short "$GITHUB_SHA") LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" LOGIN_DOT_GOV_USER_INFO_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/userinfo" diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index a0aaa81c5..de0c5714d 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -54,6 +54,7 @@ jobs: ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} + COMMIT_HASH: $(git rev-parse --short "$GITHUB_SHA") LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 767acae72..ac6aac9d0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -60,6 +60,7 @@ jobs: ADMIN_CLIENT_SECRET: ${{ secrets.ADMIN_CLIENT_SECRET }} NEW_RELIC_LICENSE_KEY: ${{ secrets.NEW_RELIC_LICENSE_KEY }} NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} + COMMIT_HASH: $(git rev-parse --short "$GITHUB_SHA") LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" LOGIN_DOT_GOV_USER_INFO_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/userinfo" @@ -81,6 +82,7 @@ jobs: --var ADMIN_CLIENT_SECRET="$ADMIN_CLIENT_SECRET" --var NEW_RELIC_LICENSE_KEY="$NEW_RELIC_LICENSE_KEY" --var NR_BROWSER_KEY="$NR_BROWSER_KEY" + --var COMMIT_HASH="$COMMIT_HASH" --var LOGIN_PEM="$LOGIN_PEM" --var LOGIN_DOT_GOV_CLIENT_ID="$LOGIN_DOT_GOV_CLIENT_ID" --var LOGIN_DOT_GOV_USER_INFO_URL="$LOGIN_DOT_GOV_USER_INFO_URL" diff --git a/app/config.py b/app/config.py index f424076fa..91c514509 100644 --- a/app/config.py +++ b/app/config.py @@ -36,6 +36,7 @@ class Config(object): NR_BROWSER_KEY = getenv("NR_BROWSER_KEY") settings = newrelic.agent.global_settings() NR_MONITOR_ON = settings and settings.monitor_mode + COMMIT_HASH = getenv("COMMIT_HASH") TEMPLATE_PREVIEW_API_HOST = getenv( "TEMPLATE_PREVIEW_API_HOST", "http://localhost:9999" diff --git a/app/main/forms.py b/app/main/forms.py index c01ce8fcc..2e6655cc5 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1781,12 +1781,16 @@ class TemplateAndFoldersSelectionForm(Form): None, [ # ('email', 'Email') if 'email' in available_template_types else None, - ("sms", "Start with a blank template") - if "sms" in available_template_types - else None, - ("copy-existing", "Copy an existing template") - if allow_adding_copy_of_template - else None, + ( + ("sms", "Start with a blank template") + if "sms" in available_template_types + else None + ), + ( + ("copy-existing", "Copy an existing template") + if allow_adding_copy_of_template + else None + ), ], ) ) diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index 4f8c3b29e..8cb28ba59 100644 --- a/app/main/views/api_keys.py +++ b/app/main/views/api_keys.py @@ -168,12 +168,14 @@ def api_callbacks(service_id): return render_template( "views/api/callbacks.html", - received_text_messages_callback=received_text_messages_callback["url"] - if received_text_messages_callback - else None, - delivery_status_callback=delivery_status_callback["url"] - if delivery_status_callback - else None, + received_text_messages_callback=( + received_text_messages_callback["url"] + if received_text_messages_callback + else None + ), + delivery_status_callback=( + delivery_status_callback["url"] if delivery_status_callback else None + ), ) @@ -262,9 +264,11 @@ def received_text_messages_callback(service_id): received_text_messages_callback = get_received_text_messages_callback() form = CallbackForm( - url=received_text_messages_callback.get("url") - if received_text_messages_callback - else "", + url=( + received_text_messages_callback.get("url") + if received_text_messages_callback + else "" + ), bearer_token=dummy_bearer_token if received_text_messages_callback else "", ) diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 4ab20f363..1b80c659e 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -122,16 +122,18 @@ def edit_user_permissions(service_id, user_id): form = form_class.from_user( user, service_id, - folder_permissions=None - if user.platform_admin - else [ - f["id"] - for f in current_service.all_template_folders - if user.has_template_folder_permission(f) - ], - all_template_folders=None - if user.platform_admin - else current_service.all_template_folders, + folder_permissions=( + None + if user.platform_admin + else [ + f["id"] + for f in current_service.all_template_folders + if user.has_template_folder_permission(f) + ] + ), + all_template_folders=( + None if user.platform_admin else current_service.all_template_folders + ), ) if form.validate_on_submit(): diff --git a/app/main/views/performance.py b/app/main/views/performance.py index 13445967b..1d2a4d1bc 100644 --- a/app/main/views/performance.py +++ b/app/main/views/performance.py @@ -34,8 +34,8 @@ def performance(): stats["average_percentage_under_10_seconds"] = mean( [row["percentage_under_10_seconds"] for row in stats["processing_time"]] or [0] ) - stats[ - "count_of_live_services_and_organizations" - ] = status_api_client.get_count_of_live_services_and_organizations() + stats["count_of_live_services_and_organizations"] = ( + status_api_client.get_count_of_live_services_and_organizations() + ) return render_template("views/performance.html", **stats) diff --git a/app/main/views/send.py b/app/main/views/send.py index 4332c7ddb..6c786e3ac 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -52,12 +52,14 @@ def get_example_csv_fields(column_headers, use_example_as_example, submitted_fie def get_example_csv_rows(template, use_example_as_example=True, submitted_fields=False): return { - "email": ["test@example.com"] - if use_example_as_example - else [current_user.email_address], - "sms": ["12223334444"] - if use_example_as_example - else [current_user.mobile_number], + "email": ( + ["test@example.com"] + if use_example_as_example + else [current_user.email_address] + ), + "sms": ( + ["12223334444"] if use_example_as_example else [current_user.mobile_number] + ), }[template.template_type] + get_example_csv_fields( ( placeholder @@ -511,12 +513,14 @@ def _check_messages(service_id, template_id, upload_id, preview_row): template=template, max_initial_rows_shown=50, max_errors_shown=50, - guestlist=itertools.chain.from_iterable( - [user.name, user.mobile_number, user.email_address] - for user in Users(service_id) - ) - if current_service.trial_mode - else None, + guestlist=( + itertools.chain.from_iterable( + [user.name, user.mobile_number, user.email_address] + for user in Users(service_id) + ) + if current_service.trial_mode + else None + ), remaining_messages=remaining_messages, allow_international_sms=current_service.has_permission("international_sms"), ) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 1cac1410c..628ac59e5 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -477,9 +477,11 @@ def service_edit_email_reply_to(service_id, reply_to_email_id): current_service.id, reply_to_email_id=reply_to_email_id, email_address=form.email_address.data, - is_default=True - if reply_to_email_address["is_default"] - else form.is_default.data, + is_default=( + True + if reply_to_email_address["is_default"] + else form.is_default.data + ), ) return redirect(url_for(".service_email_reply_to", service_id=service_id)) try: @@ -499,9 +501,11 @@ def service_edit_email_reply_to(service_id, reply_to_email_id): ".service_verify_reply_to_address", service_id=service_id, notification_id=notification_id, - is_default=True - if reply_to_email_address["is_default"] - else form.is_default.data, + is_default=( + True + if reply_to_email_address["is_default"] + else form.is_default.data + ), replace=reply_to_email_id, ) ) @@ -702,9 +706,11 @@ def service_edit_sms_sender(service_id, sms_sender_id): service_api_client.update_sms_sender( current_service.id, sms_sender_id=sms_sender_id, - sms_sender=sms_sender["sms_sender"] - if is_inbound_number - else form.sms_sender.data.replace("\r", ""), + sms_sender=( + sms_sender["sms_sender"] + if is_inbound_number + else form.sms_sender.data.replace("\r", "") + ), is_default=True if sms_sender["is_default"] else form.is_default.data, ) return redirect(url_for(".service_sms_senders", service_id=service_id)) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index c48f768ce..df70151ce 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -179,7 +179,9 @@ {% if current_service and current_service.research_mode %} {% set meta_suffix = 'Built by the Technology Transformation Servicesresearch mode' %} {% else %} - {% set meta_suffix = 'Built by the Technology Transformation Services' %} + {% set commit_hash = ", Latest version: " + config['COMMIT_HASH'] %} + {% set long_link = 'Technology Transformation Services' %} + {% set meta_suffix = "Built by the " + long_link + commit_hash %} {% endif %} {{ usaFooter({ @@ -244,7 +246,7 @@ { "href": url_for('main.support'), "text": "Contact us" - }, + } ] }, ], diff --git a/manifest.yml b/manifest.yml index 1c25fdf4a..6b6c98672 100644 --- a/manifest.yml +++ b/manifest.yml @@ -47,6 +47,8 @@ applications: REQUESTS_CA_BUNDLE: "/etc/ssl/certs/ca-certificates.crt" NEW_RELIC_CA_BUNDLE_PATH: "/etc/ssl/certs/ca-certificates.crt" + COMMIT_HASH: ((COMMIT_HASH)) + # login.gov variables LOGIN_PEM: ((LOGIN_PEM)) diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 9bdabf925..c3d128155 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -862,9 +862,9 @@ def test_should_show_page_if_prefilled_user_is_already_invited( mock_get_invites_for_service, platform_admin_user, ): - active_user_with_permission_to_other_service[ - "email_address" - ] = "user_1@testnotify.gsa.gov" + active_user_with_permission_to_other_service["email_address"] = ( + "user_1@testnotify.gsa.gov" + ) client_request.login(platform_admin_user) mocker.patch( "app.models.user.user_api_client.get_user", diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index fae020e58..0bf2fcb08 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -31,9 +31,11 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "name": name, "id": folder_id or str(uuid.uuid4()), "parent_id": parent, - "users_with_permission": users_with_permission - if users_with_permission is not None - else [sample_uuid()], + "users_with_permission": ( + users_with_permission + if users_with_permission is not None + else [sample_uuid()] + ), } diff --git a/tests/conftest.py b/tests/conftest.py index 122b76826..9019c2293 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -905,9 +905,11 @@ def create_service_templates(service_id, number_of_templates=4): "{}_template_{}".format(template_type, template_number), template_type, "{} template {} content".format(template_type, template_number), - subject="{} template {} subject".format(template_type, template_number) - if template_type == "email" - else None, + subject=( + "{} template {} subject".format(template_type, template_number) + if template_type == "email" + else None + ), ) ) @@ -1102,9 +1104,9 @@ def active_user_with_permission_to_other_service( active_user_with_permission_to_two_services["permissions"].pop(SERVICE_ONE_ID) active_user_with_permission_to_two_services["services"].pop(0) active_user_with_permission_to_two_services["name"] = "Service Two User" - active_user_with_permission_to_two_services[ - "email_address" - ] = "service-two-user@test.gsa.gov" + active_user_with_permission_to_two_services["email_address"] = ( + "service-two-user@test.gsa.gov" + ) return active_user_with_permission_to_two_services From f332587b377788ba00e4358a0159c40b52fd4bc1 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Mon, 26 Feb 2024 11:48:06 -0800 Subject: [PATCH 104/195] handle case where we are trying to build on github and haven't deployed yet --- app/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config.py b/app/config.py index 02394aa84..b1bdeafd8 100644 --- a/app/config.py +++ b/app/config.py @@ -36,7 +36,7 @@ class Config(object): NR_BROWSER_KEY = getenv("NR_BROWSER_KEY") settings = newrelic.agent.global_settings() NR_MONITOR_ON = settings and settings.monitor_mode - COMMIT_HASH = getenv("COMMIT_HASH") + COMMIT_HASH = getenv("COMMIT_HASH", "Unknown") TEMPLATE_PREVIEW_API_HOST = getenv( "TEMPLATE_PREVIEW_API_HOST", "http://localhost:9999" From 470574e1971b47fe4e6329c8f701323c2116569e Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 20 Feb 2024 08:28:26 -0800 Subject: [PATCH 105/195] enable login.gov link on demo and production and adjust test --- app/main/views/sign_in.py | 2 +- tests/app/main/views/test_sign_in.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index be313c59b..853b33648 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -198,7 +198,7 @@ def sign_in(): form=form, again=bool(redirect_url), other_device=other_device, - login_gov_enabled=bool(notify_env in ["development", "staging"]), + login_gov_enabled=True, password_reset_url=password_reset_url, initial_signin_url=initial_signin_url, ) diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py index 7970afa08..453790536 100644 --- a/tests/app/main/views/test_sign_in.py +++ b/tests/app/main/views/test_sign_in.py @@ -21,8 +21,8 @@ def test_render_sign_in_template_for_new_user(client_request): # Removing for the pilot # assert page.select('main a')[0].text == 'create one now' # assert page.select('main a')[0]['href'] == url_for('main.register') - assert page.select("main a")[0].text == "Forgot your password?" - assert page.select("main a")[0]["href"] == url_for("main.forgot_password") + assert page.select("main a")[1].text == "Forgot your password?" + assert page.select("main a")[1]["href"] == url_for("main.forgot_password") assert "Sign in again" not in normalize_spaces(page.text) From 4e32ef37b6515e04d3215e0ed8b39d6f8e93954b Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Tue, 20 Feb 2024 12:43:31 -0500 Subject: [PATCH 106/195] Adjust connectivity to Login.gov - Adds Login.gov to remaining egress proxies (both prototype and production URLs) - Swaps links to Login.gov to production environment Signed-off-by: Carlo Costino --- .github/workflows/deploy-demo.yml | 10 +++++----- .github/workflows/deploy.yml | 10 +++++----- deploy-config/egress_proxy/notify-admin-demo.allow.acl | 2 ++ .../egress_proxy/notify-admin-production.allow.acl | 2 ++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index e1d76775a..bf9757493 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -56,12 +56,12 @@ jobs: NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" - LOGIN_DOT_GOV_USER_INFO_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/userinfo" - LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/token" - LOGIN_DOT_GOV_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-demo.app.cloud.gov/sign-out" - LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?" + LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo" + LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://secure.login.gov/api/openid_connect/token" + LOGIN_DOT_GOV_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-demo.app.cloud.gov/sign-out" + LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?" LOGIN_DOT_GOV_SIGNOUT_REDIRECT: "https://notify-demo.app.cloud.gov/sign-out" - LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://idp.int.identitysandbox.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-demo.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop" + LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://secure.login.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-demo.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop" with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 767acae72..915994d58 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -62,12 +62,12 @@ jobs: NR_BROWSER_KEY: ${{ secrets.NR_BROWSER_KEY }} LOGIN_PEM: ${{ secrets.LOGIN_PEM }} LOGIN_DOT_GOV_CLIENT_ID: "urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov" - LOGIN_DOT_GOV_USER_INFO_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/userinfo" - LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://idp.int.identitysandbox.gov/api/openid_connect/token" - LOGIN_DOT_GOV_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-staging.app.cloud.gov/sign-out" - LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://idp.int.identitysandbox.gov/openid_connect/logout?" + LOGIN_DOT_GOV_USER_INFO_URL: "https://secure.login.gov/api/openid_connect/userinfo" + LOGIN_DOT_GOV_ACCESS_TOKEN_URL: "https://secure.login.gov/api/openid_connect/token" + LOGIN_DOT_GOV_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&post_logout_redirect_uri=https://notify-staging.app.cloud.gov/sign-out" + LOGIN_DOT_GOV_BASE_LOGOUT_URL: "https://secure.login.gov/openid_connect/logout?" LOGIN_DOT_GOV_SIGNOUT_REDIRECT: "https://notify-staging.app.cloud.gov/sign-out" - LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://idp.int.identitysandbox.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-staging.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop" + LOGIN_DOT_GOV_INITIAL_SIGNIN_URL: "https://secure.login.gov/openid_connect/authorize?acr_values=http%3A%2F%2Fidmanagement.gov%2Fns%2Fassurance%2Fial%2F1&client_id=urn:gov:gsa:openidconnect.profiles:sp:sso:gsa:notify-gov&nonce=01234567890123456789012345&prompt=select_account&redirect_uri=https://notify-staging.app.cloud.gov/sign-in&response_type=code&scope=openid+email&state=abcdefghijklmnopabcdefghijklmnop" with: cf_username: ${{ secrets.CLOUDGOV_USERNAME }} cf_password: ${{ secrets.CLOUDGOV_PASSWORD }} diff --git a/deploy-config/egress_proxy/notify-admin-demo.allow.acl b/deploy-config/egress_proxy/notify-admin-demo.allow.acl index 4718f99e7..41bf3a365 100644 --- a/deploy-config/egress_proxy/notify-admin-demo.allow.acl +++ b/deploy-config/egress_proxy/notify-admin-demo.allow.acl @@ -1,2 +1,4 @@ gov-collector.newrelic.com egress-proxy-notify-admin-demo.apps.internal +idp.int.identitysandbox.gov +secure.login.gov diff --git a/deploy-config/egress_proxy/notify-admin-production.allow.acl b/deploy-config/egress_proxy/notify-admin-production.allow.acl index 2173a6b4b..8103b0915 100644 --- a/deploy-config/egress_proxy/notify-admin-production.allow.acl +++ b/deploy-config/egress_proxy/notify-admin-production.allow.acl @@ -1,2 +1,4 @@ gov-collector.newrelic.com egress-proxy-notify-admin-production.apps.internal +idp.int.identitysandbox.gov +secure.login.gov From 92fc35b6f60b2349f7a83f47d84c6f3d85022ba2 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Mon, 26 Feb 2024 17:39:33 -0500 Subject: [PATCH 107/195] Only enable Login.gov link for demo right now We are holding off on production until we have a chance to share more information with pilot partners. Signed-off-by: Carlo Costino --- app/main/views/sign_in.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index 853b33648..c6eaee87e 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -198,7 +198,7 @@ def sign_in(): form=form, again=bool(redirect_url), other_device=other_device, - login_gov_enabled=True, + login_gov_enabled=bool(notify_env in ["development", "staging", "demo"]), password_reset_url=password_reset_url, initial_signin_url=initial_signin_url, ) From f8b8dd5fb3018f428c57563d08d1b9e187347c5b Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Mon, 26 Feb 2024 17:59:18 -0500 Subject: [PATCH 108/195] Fix broken test and include note about why Signed-off-by: Carlo Costino --- tests/app/main/views/test_sign_in.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py index 453790536..5675946dc 100644 --- a/tests/app/main/views/test_sign_in.py +++ b/tests/app/main/views/test_sign_in.py @@ -21,8 +21,10 @@ def test_render_sign_in_template_for_new_user(client_request): # Removing for the pilot # assert page.select('main a')[0].text == 'create one now' # assert page.select('main a')[0]['href'] == url_for('main.register') - assert page.select("main a")[1].text == "Forgot your password?" - assert page.select("main a")[1]["href"] == url_for("main.forgot_password") + # TODO: Fix this test to be less brittle! If the Login.gov link is enabled, + # then these indices need to be 1 instead of 0. + assert page.select("main a")[0].text == "Forgot your password?" + assert page.select("main a")[0]["href"] == url_for("main.forgot_password") assert "Sign in again" not in normalize_spaces(page.text) From 6ec0de4b63abc456c0f491f942094005c85f26cd Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Mon, 26 Feb 2024 18:07:26 -0500 Subject: [PATCH 109/195] One final note about why the test is brittle Signed-off-by: Carlo Costino --- tests/app/main/views/test_sign_in.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py index 5675946dc..f85c756ea 100644 --- a/tests/app/main/views/test_sign_in.py +++ b/tests/app/main/views/test_sign_in.py @@ -23,6 +23,7 @@ def test_render_sign_in_template_for_new_user(client_request): # assert page.select('main a')[0]['href'] == url_for('main.register') # TODO: Fix this test to be less brittle! If the Login.gov link is enabled, # then these indices need to be 1 instead of 0. + # Currently it's not enabled for the test or production environments. assert page.select("main a")[0].text == "Forgot your password?" assert page.select("main a")[0]["href"] == url_for("main.forgot_password") assert "Sign in again" not in normalize_spaces(page.text) From 2c6e02137bbdcdf1ccceeee49877c743dc518fce Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 1 Feb 2024 12:09:43 -0500 Subject: [PATCH 110/195] Updates per Meghan --- app/templates/views/guidance/index.html | 4 +-- app/templates/views/roadmap.html | 4 +-- app/templates/views/security.html | 37 ++----------------------- app/templates/views/support/index.html | 6 ++-- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/app/templates/views/guidance/index.html b/app/templates/views/guidance/index.html index e754ef245..b7d6ffa1a 100644 --- a/app/templates/views/guidance/index.html +++ b/app/templates/views/guidance/index.html @@ -41,7 +41,7 @@

To create and format your message

  1. All messages start from a template
    2. -
  2. Click “Send Messages”. You’ll see existing templates.
    3. +
  3. Click “Send Messages”. You’ll see existing templates.
  4. Add a new template or choose an existing template and select Edit.
@@ -120,7 +120,7 @@ {# Identify your program #} -

Identify your program

+

Identify your program

You can help your recipients identify your texts as legitimate by customizing your messages to clearly state who they are from. Consider using the program or benefit name that is most familiar to your recipients.

diff --git a/app/templates/views/roadmap.html b/app/templates/views/roadmap.html index 6ea2e7cfb..58c9ad4d1 100644 --- a/app/templates/views/roadmap.html +++ b/app/templates/views/roadmap.html @@ -50,9 +50,9 @@
  • Message send/failure analytics
    • - Next +

    Next

    -

    If the pilot is successful, we hope to recruit additional high-impact partners to improve outcomes for low-income individuals and families.

    +

    If the pilot is successful, we hope to recruit additional partners to improve outcomes for low-income individuals and families.

    Goals during this stage:

    diff --git a/app/templates/views/security.html b/app/templates/views/security.html index d676b37bf..35abece07 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -65,9 +65,9 @@

    Protect sensitive information

    Some messages include sensitive information like security codes or password reset links.

    If you’re sending a message with sensitive information, you can choose to hide those details on the Notify dashboard once the message has been sent. This means that only the message recipient will be able to see that information.

    + Screenshot of a teat message in review with the link to 'hide personalization after sending' circled. -

    User permissions and signing in

    -

    You can set different user permissions in Notify. This lets you control who in your team has access to certain parts of the service.

    Two-factor authentication

    To sign in to Notify, you’ll need to enter:

      @@ -76,11 +76,6 @@

    If signing in with a text message is a problem for your team, contact us to find out about using an email link instead.

    - Screenshot of a teat message in review with the link to 'hide personalization after sending' circled. - -

    How to hide PII after sending a message

    -

    User permissions and signing in

    You can set different user permissions in Notify. This lets you control who in your team has access to certain parts of the service.

    @@ -93,32 +88,4 @@

    If signing in with a text message is a problem for your team, contact us to find out about using an email link instead.

    - - - - - - {% endblock %} diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html index d9d6abd53..dd5ad9c10 100644 --- a/app/templates/views/support/index.html +++ b/app/templates/views/support/index.html @@ -13,9 +13,9 @@

    Contact us

    Notify is designed to be easy to use.

      -
    • For information on personalization and data preparation, see Guidance.
      • -
    • For help interpreting delivery reports, see Delivery Status.
      • -
    • For details on pricing and what counts as a message part, see Pricing.
      • +
    • For information on personalization and data preparation, see Guidance.
      • +
    • For help interpreting delivery reports, see Delivery Status.
      • +
    • For details on pricing and what counts as a message part, see Pricing.

    If you have other questions, we are available at notify-support@gsa.gov.

    From e9f96332870e9e0f59769dbbcf1cce9c5386938a Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Tue, 27 Feb 2024 11:01:37 -0500 Subject: [PATCH 111/195] Fix typo --- app/templates/views/security.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/security.html b/app/templates/views/security.html index 35abece07..6d0b3e67d 100644 --- a/app/templates/views/security.html +++ b/app/templates/views/security.html @@ -66,7 +66,7 @@

    Some messages include sensitive information like security codes or password reset links.

    If you’re sending a message with sensitive information, you can choose to hide those details on the Notify dashboard once the message has been sent. This means that only the message recipient will be able to see that information.

    Screenshot of a teat message in review with the link to 'hide personalization after sending' circled. + alt="Screenshot of a test message in review with the link to 'hide personalization after sending' circled.">

    Two-factor authentication

    To sign in to Notify, you’ll need to enter:

    From d5f40dffe1ef3bd31a05aafe943d97add4272a17 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 27 Feb 2024 11:53:51 -0500 Subject: [PATCH 112/195] Commit before merge --- app/assets/javascripts/loginAlert.js | 35 ++++++++++++++ .../uswds/_uswds-theme-custom-styles.scss | 6 +++ app/main/forms.py | 16 ++++--- app/main/views/api_keys.py | 22 +++++---- app/main/views/manage_users.py | 22 +++++---- app/main/views/performance.py | 6 +-- app/main/views/send.py | 28 ++++++----- app/main/views/service_settings.py | 24 ++++++---- app/templates/views/signin.html | 10 +++- gulpfile.js | 1 + tests/app/main/views/test_accept_invite.py | 6 +-- tests/app/main/views/test_manage_users.py | 6 +-- tests/app/main/views/test_template_folders.py | 8 ++-- tests/conftest.py | 14 +++--- tests/javascripts/loginAlert.test.js | 48 +++++++++++++++++++ 15 files changed, 187 insertions(+), 65 deletions(-) create mode 100644 app/assets/javascripts/loginAlert.js create mode 100644 tests/javascripts/loginAlert.test.js diff --git a/app/assets/javascripts/loginAlert.js b/app/assets/javascripts/loginAlert.js new file mode 100644 index 000000000..67ed439ae --- /dev/null +++ b/app/assets/javascripts/loginAlert.js @@ -0,0 +1,35 @@ +(function (window) { + +// Set the target date (10 days before March 15th, 2024) + const targetDate = new Date("April 9, 2024 00:00:00").getTime(); + + // Function to update the countdown display + function updateCountdown() { + const now = new Date().getTime(); + const difference = targetDate - now; + + // Time calculations for days only + const days = Math.floor(difference / (1000 * 60 * 60 * 24)); + + // Visibility logic + if (days < 0) { + // Hide if more than 10 days away OR if already past the date + document.getElementById("countdown-container").style.display = "none"; + } else { + // Show if 10 days or less remaining + document.getElementById("countdown-container").style.display = "block"; + document.getElementById("countdown").innerHTML = days + " days "; + } + + } + + // Expose the updateCountdown function to the outside world + window.updateCountdown = updateCountdown; + + // Initial display update + updateCountdown(); + + // Update the countdown every second (inside the IIFE) + setInterval(updateCountdown, 1000); + +})(window); diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index addf9cc7a..05cfab466 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -552,3 +552,9 @@ details form { .edit-textbox-error-mt { margin-top: 1.5rem; } + +// Login page + +#countdown-container { + display: none; // Hide the countdown timer +} diff --git a/app/main/forms.py b/app/main/forms.py index c01ce8fcc..2e6655cc5 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1781,12 +1781,16 @@ class TemplateAndFoldersSelectionForm(Form): None, [ # ('email', 'Email') if 'email' in available_template_types else None, - ("sms", "Start with a blank template") - if "sms" in available_template_types - else None, - ("copy-existing", "Copy an existing template") - if allow_adding_copy_of_template - else None, + ( + ("sms", "Start with a blank template") + if "sms" in available_template_types + else None + ), + ( + ("copy-existing", "Copy an existing template") + if allow_adding_copy_of_template + else None + ), ], ) ) diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index 4f8c3b29e..8cb28ba59 100644 --- a/app/main/views/api_keys.py +++ b/app/main/views/api_keys.py @@ -168,12 +168,14 @@ def api_callbacks(service_id): return render_template( "views/api/callbacks.html", - received_text_messages_callback=received_text_messages_callback["url"] - if received_text_messages_callback - else None, - delivery_status_callback=delivery_status_callback["url"] - if delivery_status_callback - else None, + received_text_messages_callback=( + received_text_messages_callback["url"] + if received_text_messages_callback + else None + ), + delivery_status_callback=( + delivery_status_callback["url"] if delivery_status_callback else None + ), ) @@ -262,9 +264,11 @@ def received_text_messages_callback(service_id): received_text_messages_callback = get_received_text_messages_callback() form = CallbackForm( - url=received_text_messages_callback.get("url") - if received_text_messages_callback - else "", + url=( + received_text_messages_callback.get("url") + if received_text_messages_callback + else "" + ), bearer_token=dummy_bearer_token if received_text_messages_callback else "", ) diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 4ab20f363..1b80c659e 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -122,16 +122,18 @@ def edit_user_permissions(service_id, user_id): form = form_class.from_user( user, service_id, - folder_permissions=None - if user.platform_admin - else [ - f["id"] - for f in current_service.all_template_folders - if user.has_template_folder_permission(f) - ], - all_template_folders=None - if user.platform_admin - else current_service.all_template_folders, + folder_permissions=( + None + if user.platform_admin + else [ + f["id"] + for f in current_service.all_template_folders + if user.has_template_folder_permission(f) + ] + ), + all_template_folders=( + None if user.platform_admin else current_service.all_template_folders + ), ) if form.validate_on_submit(): diff --git a/app/main/views/performance.py b/app/main/views/performance.py index 13445967b..1d2a4d1bc 100644 --- a/app/main/views/performance.py +++ b/app/main/views/performance.py @@ -34,8 +34,8 @@ def performance(): stats["average_percentage_under_10_seconds"] = mean( [row["percentage_under_10_seconds"] for row in stats["processing_time"]] or [0] ) - stats[ - "count_of_live_services_and_organizations" - ] = status_api_client.get_count_of_live_services_and_organizations() + stats["count_of_live_services_and_organizations"] = ( + status_api_client.get_count_of_live_services_and_organizations() + ) return render_template("views/performance.html", **stats) diff --git a/app/main/views/send.py b/app/main/views/send.py index 4332c7ddb..6c786e3ac 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -52,12 +52,14 @@ def get_example_csv_fields(column_headers, use_example_as_example, submitted_fie def get_example_csv_rows(template, use_example_as_example=True, submitted_fields=False): return { - "email": ["test@example.com"] - if use_example_as_example - else [current_user.email_address], - "sms": ["12223334444"] - if use_example_as_example - else [current_user.mobile_number], + "email": ( + ["test@example.com"] + if use_example_as_example + else [current_user.email_address] + ), + "sms": ( + ["12223334444"] if use_example_as_example else [current_user.mobile_number] + ), }[template.template_type] + get_example_csv_fields( ( placeholder @@ -511,12 +513,14 @@ def _check_messages(service_id, template_id, upload_id, preview_row): template=template, max_initial_rows_shown=50, max_errors_shown=50, - guestlist=itertools.chain.from_iterable( - [user.name, user.mobile_number, user.email_address] - for user in Users(service_id) - ) - if current_service.trial_mode - else None, + guestlist=( + itertools.chain.from_iterable( + [user.name, user.mobile_number, user.email_address] + for user in Users(service_id) + ) + if current_service.trial_mode + else None + ), remaining_messages=remaining_messages, allow_international_sms=current_service.has_permission("international_sms"), ) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 1cac1410c..628ac59e5 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -477,9 +477,11 @@ def service_edit_email_reply_to(service_id, reply_to_email_id): current_service.id, reply_to_email_id=reply_to_email_id, email_address=form.email_address.data, - is_default=True - if reply_to_email_address["is_default"] - else form.is_default.data, + is_default=( + True + if reply_to_email_address["is_default"] + else form.is_default.data + ), ) return redirect(url_for(".service_email_reply_to", service_id=service_id)) try: @@ -499,9 +501,11 @@ def service_edit_email_reply_to(service_id, reply_to_email_id): ".service_verify_reply_to_address", service_id=service_id, notification_id=notification_id, - is_default=True - if reply_to_email_address["is_default"] - else form.is_default.data, + is_default=( + True + if reply_to_email_address["is_default"] + else form.is_default.data + ), replace=reply_to_email_id, ) ) @@ -702,9 +706,11 @@ def service_edit_sms_sender(service_id, sms_sender_id): service_api_client.update_sms_sender( current_service.id, sms_sender_id=sms_sender_id, - sms_sender=sms_sender["sms_sender"] - if is_inbound_number - else form.sms_sender.data.replace("\r", ""), + sms_sender=( + sms_sender["sms_sender"] + if is_inbound_number + else form.sms_sender.data.replace("\r", "") + ), is_default=True if sms_sender["is_default"] else form.is_default.data, ) return redirect(url_for(".service_sms_senders", service_id=service_id)) diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index 4ee655127..398a39274 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -13,8 +13,16 @@ {% block maincolumn_content %}
    +
    +
    +

    + You have left to use login.gov to sign in +

    +
    +
    +
    +
    - {% if again %}

    You need to sign in again

    {% if other_device %} diff --git a/gulpfile.js b/gulpfile.js index 6828bcaf1..79f976035 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -123,6 +123,7 @@ const javascripts = () => { paths.src + 'javascripts/homepage.js', paths.src + 'javascripts/timeoutPopup.js', paths.src + 'javascripts/date.js', + paths.src + 'javascripts/loginAlert.js', paths.src + 'javascripts/main.js', ]) .pipe(plugins.prettyerror()) diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py index 1deeca299..900ff4bf5 100644 --- a/tests/app/main/views/test_accept_invite.py +++ b/tests/app/main/views/test_accept_invite.py @@ -218,7 +218,7 @@ def test_if_existing_user_accepts_twice_they_redirect_to_sign_in( assert ( page.h1.string, - page.select("main p")[0].text.strip(), + page.select("main p")[1].text.strip(), ) == ( "You need to sign in again", "We signed you out because you have not used Notify for a while.", @@ -332,7 +332,7 @@ def test_existing_user_of_service_get_redirected_to_signin( assert ( page.h1.string, - page.select("main p")[0].text.strip(), + page.select("main p")[1].text.strip(), ) == ( "You need to sign in again", "We signed you out because you have not used Notify for a while.", @@ -421,7 +421,7 @@ def test_existing_signed_out_user_accept_invite_redirects_to_sign_in( assert mock_accept_invite.call_count == 1 assert ( page.h1.string, - page.select("main p")[0].text.strip(), + page.select("main p")[1].text.strip(), ) == ( "You need to sign in again", "We signed you out because you have not used Notify for a while.", diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 9bdabf925..c3d128155 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -862,9 +862,9 @@ def test_should_show_page_if_prefilled_user_is_already_invited( mock_get_invites_for_service, platform_admin_user, ): - active_user_with_permission_to_other_service[ - "email_address" - ] = "user_1@testnotify.gsa.gov" + active_user_with_permission_to_other_service["email_address"] = ( + "user_1@testnotify.gsa.gov" + ) client_request.login(platform_admin_user) mocker.patch( "app.models.user.user_api_client.get_user", diff --git a/tests/app/main/views/test_template_folders.py b/tests/app/main/views/test_template_folders.py index fae020e58..0bf2fcb08 100644 --- a/tests/app/main/views/test_template_folders.py +++ b/tests/app/main/views/test_template_folders.py @@ -31,9 +31,11 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None): "name": name, "id": folder_id or str(uuid.uuid4()), "parent_id": parent, - "users_with_permission": users_with_permission - if users_with_permission is not None - else [sample_uuid()], + "users_with_permission": ( + users_with_permission + if users_with_permission is not None + else [sample_uuid()] + ), } diff --git a/tests/conftest.py b/tests/conftest.py index 6c4f94b4f..4c2ceeea9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -904,9 +904,11 @@ def create_service_templates(service_id, number_of_templates=4): "{}_template_{}".format(template_type, template_number), template_type, "{} template {} content".format(template_type, template_number), - subject="{} template {} subject".format(template_type, template_number) - if template_type == "email" - else None, + subject=( + "{} template {} subject".format(template_type, template_number) + if template_type == "email" + else None + ), ) ) @@ -1101,9 +1103,9 @@ def active_user_with_permission_to_other_service( active_user_with_permission_to_two_services["permissions"].pop(SERVICE_ONE_ID) active_user_with_permission_to_two_services["services"].pop(0) active_user_with_permission_to_two_services["name"] = "Service Two User" - active_user_with_permission_to_two_services[ - "email_address" - ] = "service-two-user@test.gsa.gov" + active_user_with_permission_to_two_services["email_address"] = ( + "service-two-user@test.gsa.gov" + ) return active_user_with_permission_to_two_services diff --git a/tests/javascripts/loginAlert.test.js b/tests/javascripts/loginAlert.test.js new file mode 100644 index 000000000..4bb0d3eaa --- /dev/null +++ b/tests/javascripts/loginAlert.test.js @@ -0,0 +1,48 @@ +beforeAll(() => { + jest.spyOn(global, 'setTimeout'); + const sessionTimerModule = require('../../app/assets/javascripts/loginAlert.js'); + window.GOVUK.modules.start(); +}); + +jest.useFakeTimers(); +const targetDate = new Date("March 5, 2024 00:00:00"); // Reference point + +test('Hides the countdown if more than 10 days away', () => { + jest.setSystemTime(targetDate.getTime() - 12 * 24 * 60 * 60 * 1000); // 12 days before + + window.updateCountdown(); // Update the countdown display + + expect(document.getElementById("countdown-container").style.display).toBe("none"); +}); + +test('Shows the countdown if 10 days or less away', () => { + jest.setSystemTime(targetDate.getTime() - 8 * 24 * 60 * 60 * 1000); + + window.updateCountdown(); + + expect(document.getElementById("countdown-container").style.display).toBe("block"); +}); + +test('Displays the correct number of days', () => { + jest.setSystemTime(targetDate.getTime() - 5 * 24 * 60 * 60 * 1000); + + window.updateCountdown(); + + expect(document.getElementById("countdown").textContent).toBe("5 days "); +}); + +test('Hides the countdown if the target date has passed', () => { + jest.setSystemTime(targetDate.getTime() + 2 * 24 * 60 * 60 * 1000); + + window.updateCountdown(); + + expect(document.getElementById("countdown-container").style.display).toBe("none"); +}); + +test('Displays "Countdown Complete!" when the countdown finishes', () => { + jest.setSystemTime(targetDate.getTime()); + + window.updateCountdown(); + + expect(document.getElementById("countdown").textContent).toBe("Countdown Complete!"); +}); From 116953b33f0e24627f7ca4f14ce2f412c66a6aa3 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 27 Feb 2024 12:42:47 -0500 Subject: [PATCH 113/195] Adjusting conditional logic to hide responsive menu button if navigation isn't present --- app/templates/components/components/header/template.njk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/templates/components/components/header/template.njk b/app/templates/components/components/header/template.njk index 7719ac2c8..2c690329a 100644 --- a/app/templates/components/components/header/template.njk +++ b/app/templates/components/components/header/template.njk @@ -55,12 +55,11 @@ notify.gov - + {% if params.navigation %} + + {% endif %}
    - {% if current_user.is_authenticated %} - - {% endif %} -
    +
    - - -
    -
    -
    -
    -
    -

    beta.notify.gov

    -

    An official website of the General - Services Administration

    -
    -
    -
    - -
    -
    -
    - Looking for U.S. government information and services? -
    - Visit USA.gov -
    -
    -
    diff --git a/app/templates/new/components/header/README.md b/app/templates/new/components/header/README.md deleted file mode 100644 index a3ea34967..000000000 --- a/app/templates/new/components/header/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Header - -## Installation - -See the [main README quick start guide](https://github.com/alphagov/govuk-frontend#quick-start) for how to install this component. - -## Guidance and Examples - -Find out when to use the header component in your service in the [GOV.UK Design System](https://design-system.service.gov.uk/components/header). - -## Component options - -Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. - -See [options table](https://design-system.service.gov.uk/components/header/#options-example-default) for details. diff --git a/app/templates/new/components/header/macro-options.json b/app/templates/new/components/header/macro-options.json deleted file mode 100644 index 4411e8100..000000000 --- a/app/templates/new/components/header/macro-options.json +++ /dev/null @@ -1,88 +0,0 @@ -[ - { - "name": "homepageUrl", - "type": "string", - "required": false, - "description": "The url of the homepage. Defaults to /" - }, - { - "name": "assetsPath", - "type": "string", - "required": false, - "description": "The public path for the assets folder. If not provided it defaults to /assets/images" - }, - { - "name": "productName", - "type": "string", - "required": false, - "description": "Header title that is placed next to GOV.UK. Used for product names (i.e. Pay, Verify)" - }, - { - "name": "serviceName", - "type": "string", - "required": false, - "description": "Header title that is placed next to GOV.UK. Used for product names (i.e. Pay, Verify)" - }, - { - "name": "serviceUrl", - "type": "string", - "required": false, - "description": "Url for the service name anchor." - }, - { - "name": "navigation", - "type": "array", - "required": false, - "description": "An array of navigation item objects.", - "params": [ - { - "name": "text", - "type": "string", - "required": false, - "description": "Text of the navigation item." - }, - { - "name": "href", - "type": "string", - "required": false, - "description": "Url of the navigation item anchor. Both `href` and `text` attributes for navigation items need to be provided to create an item." - }, - { - "name": "active", - "type": "boolean", - "required": false, - "description": "Flag to mark the navigation item as active or not." - }, - { - "name": "attributes", - "type": "object", - "required": false, - "description": "HTML attributes (for example data attributes) to add to the navigation item anchor." - } - ] - }, - { - "name": "navigationClasses", - "type": "string", - "required": false, - "description": "Classes for the navigation section of the header." - }, - { - "name": "containerClasses", - "type": "string", - "required": false, - "description": "Classes for the container, useful if you want to make the header fixed width." - }, - { - "name": "classes", - "type": "string", - "required": false, - "description": "Classes to add to the header container." - }, - { - "name": "attributes", - "type": "object", - "required": false, - "description": "HTML attributes (for example data attributes) to add to the header container." - } -] diff --git a/app/templates/new/components/header/macro.njk b/app/templates/new/components/header/macro.njk deleted file mode 100644 index 3f0101fc2..000000000 --- a/app/templates/new/components/header/macro.njk +++ /dev/null @@ -1,3 +0,0 @@ -{% macro usaHeader(params) %} - {%- include "./template.njk" -%} -{% endmacro %} diff --git a/app/templates/new/components/header/template.njk b/app/templates/new/components/header/template.njk deleted file mode 100644 index 6cc8cabd8..000000000 --- a/app/templates/new/components/header/template.njk +++ /dev/null @@ -1,104 +0,0 @@ - -
    -
    -
    -
    -
    - -
    - - -
    -
    - -
    -
    - - -
    -
    - - {% if current_user.is_authenticated %} - - {% endif %} -
    - -
    diff --git a/app/templates/new/components/skip-link/README.md b/app/templates/new/components/skip-link/README.md deleted file mode 100644 index feb7c6614..000000000 --- a/app/templates/new/components/skip-link/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Skip link - -## Installation - -See the [main README quick start guide](https://github.com/alphagov/govuk-frontend#quick-start) for how to install this component. - -## Guidance and Examples - -Find out when to use the skip link component in your service in the [GOV.UK Design System](https://design-system.service.gov.uk/components/skip-link). - -## Component options - -Use options to customize the appearance, content and behavior of a component when using a macro, for example, changing the text. - -See [options table](https://design-system.service.gov.uk/components/skip-link/#options-example-default) for details. diff --git a/app/templates/new/components/skip-link/macro-options.json b/app/templates/new/components/skip-link/macro-options.json deleted file mode 100644 index 9a36a1267..000000000 --- a/app/templates/new/components/skip-link/macro-options.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - { - "name": "text", - "type": "string", - "required": true, - "description": "If `html` is set, this is not required. Text to use within the skip link component. If `html` is provided, the `text` argument will be ignored." - }, - { - "name": "html", - "type": "string", - "required": true, - "description": "If `text` is set, this is not required. HTML to use within the skip link component. If `html` is provided, the `text` argument will be ignored." - }, - { - "name": "href", - "type": "string", - "required": true, - "description": "The value of the skip link href attribute. Defaults to" - }, - { - "name": "classes", - "type": "string", - "required": false, - "description": "Classes to add to the skip link." - }, - { - "name": "attributes", - "type": "object", - "required": false, - "description": "HTML attributes (for example data attributes) to add to the skip link." - } -] diff --git a/app/templates/new/components/skip-link/macro.njk b/app/templates/new/components/skip-link/macro.njk deleted file mode 100644 index 4b1d7ff9a..000000000 --- a/app/templates/new/components/skip-link/macro.njk +++ /dev/null @@ -1,3 +0,0 @@ -{% macro usaSkipLink(params) %} - {%- include "./template.njk" -%} -{% endmacro %} diff --git a/app/templates/new/components/skip-link/template.njk b/app/templates/new/components/skip-link/template.njk deleted file mode 100644 index e0dad15a8..000000000 --- a/app/templates/new/components/skip-link/template.njk +++ /dev/null @@ -1,7 +0,0 @@ - - {{- params.html | safe if params.html else params.text -}} - - - - Skip to main content - From 98297515d8ff71ac059ca0fbdae29a36c8accf20 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 29 Feb 2024 16:36:11 -0800 Subject: [PATCH 122/195] updated base.html template to also include admin-template --- app/templates/new/base.html | 368 ++++++++++++++++-- .../new/layouts/withnav_template.html | 41 ++ app/templates/new/templates_glossary.md | 20 +- 3 files changed, 394 insertions(+), 35 deletions(-) create mode 100644 app/templates/new/layouts/withnav_template.html diff --git a/app/templates/new/base.html b/app/templates/new/base.html index 2db02b21a..7f806b660 100644 --- a/app/templates/new/base.html +++ b/app/templates/new/base.html @@ -1,65 +1,373 @@ -{% from "../components/components/skip-link/macro.njk" import usaSkipLink -%} -{% from "../components/components/header/macro.njk" import usaHeader -%} -{% from "../components/components/footer/macro.njk" import usaFooter -%} -{# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #} -{%- set assetUrl = assetUrl | default(assetPath) -%} +{% from "components/banner.html" import banner %} +{% from "./components/components/skip-link/macro.njk" import usaSkipLink -%} +{% from "./components/components/header/macro.njk" import usaHeader -%} +{% from "./components/components/footer/macro.njk" import usaFooter -%} + + - {% block pageTitle %}Notify.gov{% endblock %} + + {% block pageTitle %} + {% block per_page_title %} {% endblock %}Notify.gov + <!-- on templates that were using content_template.html, we might need to use the {{ content_page_title }} variable for the per_page_title --> + {% endblock %} + {% if config['NR_MONITOR_ON'] %} {% include "partials/newrelic.html" -%} {% endif %} - {# Ensure that older IE versions always render with the correct rendering engine #} - {% block headIcons %} - - - - + + + + {% endblock %} - {% block head %}{% endblock %} - {# The default og:image is added below head so that scrapers see any custom metatags first, and this is just a fallback #} - {% block meta %} - - + {% block head %} + + {% block extra_stylesheets %} + {% endblock %} + {% if g.hide_from_search_engines %} + + {% endif %} + + {# The default og:image is added below head so that scrapers see any custom metatags first, and this is just a fallback #} + {% block meta_format_detection %} + + {% endblock %} + {% block meta %} + + + {% endblock %} + {% endblock %} + - {% block bodyStart %}{% endblock %} - + {% block bodyStart %} + {% block extra_javascripts_before_body %} + + + + {% endblock %} + {% endblock %} +
    block skipLink {% block skipLink %} {{ usaSkipLink({ "href": '#main-content', "text": 'Skip to main content' }) }} {% endblock %} +
    +
    block header {% block header %} - {{ usaHeader({}) }} - {% endblock %} + {% if current_user.is_authenticated %} + {% if current_user.platform_admin %} + {% set navigation = [ + { + "href": url_for("main.show_accounts_or_dashboard"), + "text": "Current service", + "active": header_navigation.is_selected('accounts-or-dashboard') + }, + { + "href": url_for('main.get_started'), + "text": "Using Notify", + "active": header_navigation.is_selected('using_notify') + }, + { + "href": url_for('main.features'), + "text": "Features", + "active": header_navigation.is_selected('features') + }, + { + "href": url_for('main.platform_admin_splash_page'), + "text": "Platform admin", + "active": header_navigation.is_selected('platform-admin') + }, + { + "href": url_for('main.support'), + "text": "Contact us", + "active": header_navigation.is_selected('support') + } + ] %} + {% if current_service %} + {% set secondaryNavigation = [ + { + "href": url_for('main.service_settings', service_id=current_service.id), + "text": "Settings", + "active": secondary_navigation.is_selected('settings') + }, + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% else %} + {% set secondaryNavigation = [ + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% endif %} + {% else %} + {% set navigation = [ + { + "href": url_for("main.show_accounts_or_dashboard"), + "text": "Current service", + "active": header_navigation.is_selected('accounts-or-dashboard') + }, + { + "href": url_for('main.get_started'), + "text": "Using Notify", + "active": header_navigation.is_selected('using_notify') + }, + { + "href": url_for('main.features'), + "text": "Features", + "active": header_navigation.is_selected('features') + }, + { + "href": url_for('main.support'), + "text": "Contact us", + "active": header_navigation.is_selected('support') + }, + { + "href": url_for('main.user_profile'), + "text": "User profile", + "active": header_navigation.is_selected('user-profile') + } + ] %} + {% if current_service %} + {% set secondaryNavigation = [ + { + "href": url_for('main.service_settings', service_id=current_service.id), + "text": "Settings", + "active": secondary_navigation.is_selected('settings') + }, + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% else %} + {% set secondaryNavigation = [ + { + "href": url_for('main.sign_out'), + "text": "Sign out" + } + ] %} + {% endif %} + {% endif %} + {% else %} + + {# {% set navigation = [ + { + "href": url_for('main.get_started'), + "text": "Using Notify", + "active": header_navigation.is_selected('using_notify') + }, + { + "href": url_for('main.features'), + "text": "Features", + "active": header_navigation.is_selected('features') + }, + { + "href": url_for('main.support'), + "text": "Contact us", + "active": header_navigation.is_selected('support') + }, + { + "href": url_for('main.sign_in'), + "text": "Sign in", + "active": header_navigation.is_selected('sign-in') + } + ] %} #} + {% endif %} + {{ usaHeader({ + "homepageUrl": url_for('main.show_accounts_or_dashboard'), + "productName": "Notify", + "navigation": navigation, + "navigationClasses": "govuk-header__navigation--end", + "secondaryNavigation": secondaryNavigation, + "assetsPath": asset_path + "images" + }) }} + {% endblock %} +
    + +
    block main {% block main %} -
    - {% block beforeContent %}{% endblock %} -
    - {% block content %}{% endblock %} -
    -
    +
    + {% block beforeContent %} + {% block backLink %}{% endblock %} + {% endblock %} + {% block mainClasses %} + +
    + {% endblock %} + {% block content %} + {% block flash_messages %} + + {% endblock %} + {% block maincolumn_content %} + {% block fromContentTemplatetwoColumnGrid %} +
    + {% if navigation_links %} +
    + {{ sub_navigation(navigation_links) }} +
    +
    + {% else %} +
    + {% endif %} + {% block content_column_content %}{% endblock %} +
    +
    + + {% endblock %} + {% endblock %} + {% endblock %} +
    +
    {% endblock %} +
    +
    block footer {% block footer %} - {{ usaFooter({}) }} - {% endblock %} - {% block bodyEnd %}{% endblock %} + {% if current_service and current_service.research_mode %} + {% set meta_suffix = 'Built by the Technology Transformation Servicesresearch mode' %} + {% else %} + {% set meta_suffix = 'Built by the Technology Transformation Services' %} + {% endif %} + + {{ usaFooter({ + "classes": "js-footer", + "navigation": [ + { + "title": "About Notify", + "columns": 1, + "items": [ + { + "href": url_for("main.features"), + "text": "Features" + }, + { + "href": url_for("main.roadmap"), + "text": "Roadmap" + }, + { + "href": url_for("main.security"), + "text": "Security" + }, + { + "href": url_for("main.terms"), + "text": "Terms of use" + }, + ] + }, + { + "title": "Using Notify", + "columns": 1, + "items": [ + { + "href": url_for("main.get_started"), + "text": "Get started" + }, + { + "href": url_for("main.pricing"), + "text": "Pricing" + }, + { + "href": url_for("main.trial_mode_new"), + "text": "Trial mode" + }, + { + "href": url_for("main.message_status"), + "text": "Delivery status" + }, + { + "href": url_for("main.guidance_index"), + "text": "Guidance" + }, + { + "href": url_for("main.documentation"), + "text": "API documentation" + } + ] + }, + { + "title": "Support", + "columns": 1, + "items": [ + { + "href": url_for('main.support'), + "text": "Contact us" + }, + ] + }, + ], + "meta": { + "items": meta_items, + "html": meta_suffix + } + }) }} + + {% if current_user.is_authenticated %} + {% block sessionUserWarning %} + +
    +
    +

    + Your session will end soon. + Please choose to extend your session or sign out. Your session will expire in 5 minutes or less. +

    +
    +

    You have been inactive for too long. + Your session will expire in . +

    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    +
    +
    +
    +     + {% endblock %} + {% endif %} + + {% endblock %} +
    + + {% block bodyEnd %} + {% block extra_javascripts %} + {% endblock %} + + + + + {% endblock %} diff --git a/app/templates/new/layouts/withnav_template.html b/app/templates/new/layouts/withnav_template.html new file mode 100644 index 000000000..78cd85e6a --- /dev/null +++ b/app/templates/new/layouts/withnav_template.html @@ -0,0 +1,41 @@ +{% extends "base.html" %} + +{% block per_page_title %} + {% block service_page_title %}{% endblock %} – {{ current_service.name }} +{% endblock %} + +{% block main %} +
    + {% block serviceNavigation %} + {% include "service_navigation.html" %} + {% endblock %} + +
    + {% if help %} +
    + {% else %} +
    + {% endif %} + {% block sideNavigation %} + {% include "main_nav.html" %} + + {% endblock %} +
    + {% if help %} +
    + {% else %} +
    + {% endif %} + {% block beforeContent %} + {% block backLink %}{% endblock %} + {% endblock %} +
    + {% block content %} + {% include 'flash_messages.html' %} + {% block maincolumn_content %}{% endblock %} + {% endblock %} +
    +
    +
    +
    +{% endblock %} diff --git a/app/templates/new/templates_glossary.md b/app/templates/new/templates_glossary.md index cdf824871..a34d06b01 100644 --- a/app/templates/new/templates_glossary.md +++ b/app/templates/new/templates_glossary.md @@ -6,16 +6,13 @@ This document serves as a glossary for the templates directory structure of the ## Directory Structure - `/templates` + - `base.html`: The main base template from which all other templates inherit. This template is a combination of the old admin_template and main_template.html - **/layouts**: Contains base templates and shared layouts used across the site. Simply put, it defines the overall structure or skeleton of the application (less frequently revised). - - `base.html`: The main base template from which all other templates inherit. - - `/admin` - - `admin-base.html`: A specialized layout for admin pages. It extends `base.html` but can include additional styling, scripts, or components specific to admin interfaces to enhance security and organization. - - `withnav.html`: A variation of the base layout that includes a sidebar. + - `withnav_template.html`: A variation of the base layout that includes a sidebar. - `/error`: Templates for handling HTTP errors - **/components**: Houses reusable UI components that can be included in multiple templates and can be tailored with different content or links depending on the context.(more frequently revised or customized) - `header.html`: Template for the site's header, included in `base.html`. - `footer.html`: Template for the site's footer, included in `base.html`. - - **/partials**: For smaller, reusable pieces of templates, like navigation breadcrumbs or pagination controls we could put this folder into components but if it's more specific to layouts, we can move it into that folder as a sub directory - **/views** (or **/pages**): Individual page templates that use the base layouts, components, and partials to present content. ### Best Practices @@ -25,3 +22,16 @@ This document serves as a glossary for the templates directory structure of the ### Notes - Macro json files are just guides on how to structure a dict. It's not actually being used as data being passed to components + + + +### Old Layout Templates We Don't Need +- withoutnav_template.html Delete +- main_template.html Delete +- settings_templates.html Delete +- settings_nav.html (move to /new/navigation directory) +- main_nav.html (move to /new/navigation directory) +- service_navigation.html (move to /new/navigation directory) +- org_template, could be under it's own directory called /organization +- org_nav.html (move to /new/navigation directory) +- -content_template.html Delete and consolidate to base template From ebd04e44c2ed61e00bc18995aba25e434498eaed Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Thu, 29 Feb 2024 16:38:41 -0800 Subject: [PATCH 123/195] revert main_Template --- app/templates/admin_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index bd4383579..c48f768ce 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -1,4 +1,4 @@ -{% extends "new/base.html" %} +{% extends "main_template.html" %} {% from "components/banner.html" import banner %} {% block headIcons %} From 507973f9ae52514353adeffbc81a9e6c1451be82 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Fri, 1 Mar 2024 09:34:25 -0500 Subject: [PATCH 124/195] Edited the test, updated content --- app/assets/javascripts/loginAlert.js | 2 +- app/templates/views/signin.html | 22 +++++++++++++--------- tests/javascripts/loginAlert.test.js | 22 +++++++++++++--------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/loginAlert.js b/app/assets/javascripts/loginAlert.js index 67ed439ae..1f3281788 100644 --- a/app/assets/javascripts/loginAlert.js +++ b/app/assets/javascripts/loginAlert.js @@ -12,7 +12,7 @@ const days = Math.floor(difference / (1000 * 60 * 60 * 24)); // Visibility logic - if (days < 0) { + if (days < 0 || days > 10) { // Hide if more than 10 days away OR if already past the date document.getElementById("countdown-container").style.display = "none"; } else { diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index 398a39274..8773fba24 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -13,10 +13,11 @@ {% block maincolumn_content %}
    -
    +
    +

    Login.gov is required by April 9, 2024

    - You have left to use login.gov to sign in + You have left to use Login.gov to sign in

    @@ -50,17 +51,20 @@ {% endcall %}
    -

    Notify.gov is changing the Sign in experience to Login.gov on March x, 2024

    +

    Notify.gov is changing the sign-in experience to Login.gov effective
    April 9, 2024

    Why are we doing this?

      -
    • One single source for signing in: You can use login.gov for other sign in forms within the government
      • -
    • Security: It's really secure and trustworthy
      • -
    • Fast and easy: It's fast and easy
      • +
    • Enhanced security: Login.gov is really secure and trustworthy
      • +
    • One single source for signing in: You can use Login.gov for other services within the federal government
      • +
    • 2FA flexibility: Login.gov supports multiple methods for users to verify their identity.
      • +
    +

    What do I need to do?

    +
      +
    • If you have a Login.gov account, start using it to sign in to Notify today.
      • +
    • If you don’t have a Login.gov account, you must create one by April 9, 2024 to continue to access Notify.
    -

    Don't have a login.gov account?

    -

    If you don't have an account already, sign up here:

    - Create Login.gov account + Create Login.gov account
    diff --git a/tests/javascripts/loginAlert.test.js b/tests/javascripts/loginAlert.test.js index 4bb0d3eaa..895aa3647 100644 --- a/tests/javascripts/loginAlert.test.js +++ b/tests/javascripts/loginAlert.test.js @@ -1,11 +1,23 @@ beforeAll(() => { jest.spyOn(global, 'setTimeout'); + + document.body.innerHTML = ` +
    +
    +

    Login.gov is required by April 9, 2024

    +

    + You have left to use Login.gov to sign in +

    +
    +
    + ` + const sessionTimerModule = require('../../app/assets/javascripts/loginAlert.js'); window.GOVUK.modules.start(); }); jest.useFakeTimers(); -const targetDate = new Date("March 5, 2024 00:00:00"); // Reference point +const targetDate = new Date("April 9, 2024 00:00:00"); // Reference point test('Hides the countdown if more than 10 days away', () => { jest.setSystemTime(targetDate.getTime() - 12 * 24 * 60 * 60 * 1000); // 12 days before @@ -38,11 +50,3 @@ test('Hides the countdown if the target date has passed', () => { expect(document.getElementById("countdown-container").style.display).toBe("none"); }); - -test('Displays "Countdown Complete!" when the countdown finishes', () => { - jest.setSystemTime(targetDate.getTime()); - - window.updateCountdown(); - - expect(document.getElementById("countdown").textContent).toBe("Countdown Complete!"); -}); From 996db0d60bd7765bbffb79f3bf862daf1027f8ae Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 1 Mar 2024 10:38:07 -0800 Subject: [PATCH 125/195] relative path update --- app/templates/new/base.html | 23 +++++++++++------------ app/templates/new/templates_glossary.md | 6 +++--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/templates/new/base.html b/app/templates/new/base.html index 7f806b660..b175cff51 100644 --- a/app/templates/new/base.html +++ b/app/templates/new/base.html @@ -1,7 +1,7 @@ -{% from "components/banner.html" import banner %} -{% from "./components/components/skip-link/macro.njk" import usaSkipLink -%} -{% from "./components/components/header/macro.njk" import usaHeader -%} -{% from "./components/components/footer/macro.njk" import usaFooter -%} +{% from "../components/banner.html" import banner %} +{% from "../components/components/skip-link/macro.njk" import usaSkipLink -%} +{% from "../components/components/header/macro.njk" import usaHeader -%} +{% from "../components/components/footer/macro.njk" import usaFooter -%} @@ -59,16 +59,15 @@ {% endblock %} {% endblock %} -
    block skipLink + {% block skipLink %} {{ usaSkipLink({ "href": '#main-content', "text": 'Skip to main content' }) }} {% endblock %} -
    -
    block header + {% block header %} {% if current_user.is_authenticated %} {% if current_user.platform_admin %} @@ -203,9 +202,9 @@ "assetsPath": asset_path + "images" }) }} {% endblock %} -
    + -
    block main + {% block main %}
    {% block beforeContent %} @@ -240,9 +239,9 @@
    {% endblock %} -
    + -
    block footer + {% block footer %} {% if current_service and current_service.research_mode %} @@ -359,7 +358,7 @@ {% endif %} {% endblock %} -
    + {% block bodyEnd %} {% block extra_javascripts %} diff --git a/app/templates/new/templates_glossary.md b/app/templates/new/templates_glossary.md index a34d06b01..894628d89 100644 --- a/app/templates/new/templates_glossary.md +++ b/app/templates/new/templates_glossary.md @@ -6,7 +6,7 @@ This document serves as a glossary for the templates directory structure of the ## Directory Structure - `/templates` - - `base.html`: The main base template from which all other templates inherit. This template is a combination of the old admin_template and main_template.html + - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `settings_template`, and `content_template`. - **/layouts**: Contains base templates and shared layouts used across the site. Simply put, it defines the overall structure or skeleton of the application (less frequently revised). - `withnav_template.html`: A variation of the base layout that includes a sidebar. - `/error`: Templates for handling HTTP errors @@ -20,8 +20,8 @@ This document serves as a glossary for the templates directory structure of the - Use **inheritance** (`{% extends %}`) to build on base layouts. - Employ **components** (`{% include %}`) for reusable UI elements to keep the code DRY and facilitate easier updates. -### Notes -- Macro json files are just guides on how to structure a dict. It's not actually being used as data being passed to components +### Observation Notes +- The macro-options.json files in the header and footer component act as structural guides. They aren't directly used as data passed to the usaFooter function/macro. Instead, these files outline the expected properties and provide a description of their purpose. The `usaFooter` macro component is currently only invoked in the `admin_template`, which will eventually serve as the `base.html` template. This will simplify the approach when we change the footer macros to componenets by eliminating the need to dynamically pass this data from the base.html template. From 81d89f464a9468baff0d6be69e3744e330dec4b1 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Mon, 4 Mar 2024 09:51:13 -0500 Subject: [PATCH 126/195] small responsive styling change --- app/templates/views/signin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html index 8773fba24..1b8201275 100644 --- a/app/templates/views/signin.html +++ b/app/templates/views/signin.html @@ -50,7 +50,7 @@ {{ page_footer("Continue", secondary_link=password_reset_url, secondary_link_text="Forgot your password?") }} {% endcall %}
    -
    +

    Notify.gov is changing the sign-in experience to Login.gov effective
    April 9, 2024

    Why are we doing this?

      From cea10446f7f8abaeb5c7efc642cea584c8f7ee9d Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 4 Mar 2024 11:03:22 -0800 Subject: [PATCH 127/195] added notes and org_template --- app/templates/new/layouts/org_template.html | 35 +++++++++++++++++++ .../new/layouts/withnav_template.html | 2 +- app/templates/new/templates_glossary.md | 10 +++--- 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 app/templates/new/layouts/org_template.html diff --git a/app/templates/new/layouts/org_template.html b/app/templates/new/layouts/org_template.html new file mode 100644 index 000000000..5e04003fd --- /dev/null +++ b/app/templates/new/layouts/org_template.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} + +{% block per_page_title %} + {% block org_page_title %}{% endblock %} – {{ current_org.name }} +{% endblock %} + +{% block main %} +
      +
      + {% if current_user.platform_admin %} + Organizations + {% endif %} +
      + {{ current_org.name }} +
      + Switch service +
      +
      +
      + {% include "org_nav.html" %} +
      +
      + {% block beforeContent %} + {% block backLink %}{% endblock %} + {% endblock %} +
      + {% block content %} + {% include 'flash_messages.html' %} + {% block maincolumn_content %}{% endblock %} + {% endblock %} +
      +
      +
      +
      +{% endblock %} diff --git a/app/templates/new/layouts/withnav_template.html b/app/templates/new/layouts/withnav_template.html index 78cd85e6a..412a004d0 100644 --- a/app/templates/new/layouts/withnav_template.html +++ b/app/templates/new/layouts/withnav_template.html @@ -9,7 +9,7 @@ {% block serviceNavigation %} {% include "service_navigation.html" %} {% endblock %} - +
      {% if help %}
      diff --git a/app/templates/new/templates_glossary.md b/app/templates/new/templates_glossary.md index 894628d89..81325e26c 100644 --- a/app/templates/new/templates_glossary.md +++ b/app/templates/new/templates_glossary.md @@ -6,10 +6,10 @@ This document serves as a glossary for the templates directory structure of the ## Directory Structure - `/templates` - - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `settings_template`, and `content_template`. + - `base.html`: The main base template from which all other templates inherit. This template is a combination of `main_template`, `admin_template`, `withoutnav_template` and `content_template`. - **/layouts**: Contains base templates and shared layouts used across the site. Simply put, it defines the overall structure or skeleton of the application (less frequently revised). - `withnav_template.html`: A variation of the base layout that includes a sidebar. - - `/error`: Templates for handling HTTP errors + - `org_template.html`: A variaton of the withnav_template - **/components**: Houses reusable UI components that can be included in multiple templates and can be tailored with different content or links depending on the context.(more frequently revised or customized) - `header.html`: Template for the site's header, included in `base.html`. - `footer.html`: Template for the site's footer, included in `base.html`. @@ -28,10 +28,10 @@ This document serves as a glossary for the templates directory structure of the ### Old Layout Templates We Don't Need - withoutnav_template.html Delete - main_template.html Delete -- settings_templates.html Delete +- settings_templates.html `withnav_template` can be used to replace `settings_template`. - settings_nav.html (move to /new/navigation directory) - main_nav.html (move to /new/navigation directory) - service_navigation.html (move to /new/navigation directory) -- org_template, could be under it's own directory called /organization +- org_template, could be under it's own directory called /layout/organization - org_nav.html (move to /new/navigation directory) -- -content_template.html Delete and consolidate to base template +- content_template.html Delete From 026ed52ce53620fce2b8864f2836ed7a10e7adb6 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 5 Mar 2024 09:51:25 -0500 Subject: [PATCH 128/195] When resizing the viewport for the header, I noticed other responsive issues and addressed them here --- .../uswds/_uswds-theme-custom-styles.scss | 2 +- app/templates/content_template.html | 4 +- app/templates/main_nav.html | 2 +- .../partials/notifications/notifications.html | 2 +- app/templates/settings_template.html | 8 +- .../views/activity/notifications.html | 2 + app/templates/views/api/callbacks.html | 38 ++-- app/templates/views/dashboard/_jobs.html | 206 +++++++++--------- app/templates/views/dashboard/dashboard.html | 2 +- app/templates/views/performance.html | 124 ++++++----- app/templates/views/usage.html | 2 + app/templates/withnav_template.html | 6 +- 12 files changed, 206 insertions(+), 192 deletions(-) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index e65bf2350..55f17a795 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -355,7 +355,7 @@ td.table-empty-message { background-image: url(../img/material-icons/description.svg); } } - .job-table, .dashboard-table { + .table-wrapper { overflow-x: scroll; } } diff --git a/app/templates/content_template.html b/app/templates/content_template.html index abca0be7e..34b488bb5 100644 --- a/app/templates/content_template.html +++ b/app/templates/content_template.html @@ -11,10 +11,10 @@
      {% if navigation_links %} -
      +
      {{ sub_navigation(navigation_links) }}
      -
      +
      {% else %}
      {% endif %} diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index 65c875d7a..2f7306f09 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -1,7 +1,7 @@ {% if help %} {% include 'partials/tour.html' %} {% else %} -
    + File name + Template + Time sent + Sender + # of Recipients + Report
    + {{ notification.job.original_file_name if notification.job.original_file_name else 'Manually entered number'}}
    View Batch     		+ {{ notification.template.name }} + {{ job.created_at | format_datetime_short_america }} + {{ notification.created_by.name }} + {{ job.notification_count}} + {% if notification and job.time_left != "Data no longer available" %} Download {{ job.time_left }} From 49c5f57d8185f5b181ba4c6bfdb9cd553b5262f0 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 12 Feb 2024 16:34:54 -0800 Subject: [PATCH 027/195] limit 5 in table --- app/templates/views/dashboard/dashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 133b0a720..3ea62a273 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -55,7 +55,7 @@
    diff --git a/app/templates/views/performance.html b/app/templates/views/performance.html index b7533044a..0385524f6 100644 --- a/app/templates/views/performance.html +++ b/app/templates/views/performance.html @@ -44,31 +44,33 @@ -
    - {% call(item, row_number) list_table( - notifications_by_type|reverse, - caption='Messages sent since May 2023', - caption_visible=False, - field_headings=[ - 'Date', - 99|message_count_noun('email')|capitalize, - 99|message_count_noun('sms')|capitalize, - ], - empty_message='No data to show' - ) %} - {% call field() %} - {{ item.date | format_date_normal }} +
    +
    + {% call(item, row_number) list_table( + notifications_by_type|reverse, + caption='Messages sent since May 2023', + caption_visible=False, + field_headings=[ + 'Date', + 99|message_count_noun('email')|capitalize, + 99|message_count_noun('sms')|capitalize, + ], + empty_message='No data to show' + ) %} + {% call field() %} + {{ item.date | format_date_normal }} + {% endcall %} + {% call field() %} + {{ item.emails|format_thousands }} + {% endcall %} + {% call field() %} + {{ item.sms|format_thousands }} + {% endcall %} {% endcall %} - {% call field() %} - {{ item.emails|format_thousands }} - {% endcall %} - {% call field() %} - {{ item.sms|format_thousands }} - {% endcall %} - {% endcall %} -

    - Only showing the last {{ notifications_by_type|length }} days -

    +

    + Only showing the last {{ notifications_by_type|length }} days +

    +

    @@ -82,26 +84,28 @@ ) }}

    -
    - {% call(item, row_number) list_table( - processing_time | reverse, - caption='Messages sent within 10 seconds', - caption_visible=False, - field_headings=[ - 'Date', 'Percentage' - ], - empty_message='No data to show' - ) %} - {% call field() %} - {{ item.date | format_date_normal }} +
    +
    + {% call(item, row_number) list_table( + processing_time | reverse, + caption='Messages sent within 10 seconds', + caption_visible=False, + field_headings=[ + 'Date', 'Percentage' + ], + empty_message='No data to show' + ) %} + {% call field() %} + {{ item.date | format_date_normal }} + {% endcall %} + {% call field() %} + {{ '{:.2f}%'.format(item.percentage_under_10_seconds) }} + {% endcall %} {% endcall %} - {% call field() %} - {{ '{:.2f}%'.format(item.percentage_under_10_seconds) }} - {% endcall %} - {% endcall %} -

    - Only showing the last {{ processing_time|length }} days -

    +

    + Only showing the last {{ processing_time|length }} days +

    +

    @@ -120,23 +124,25 @@ using Notify.

    -
    - {% call(item, row_number) list_table( - organizations_using_notify, - caption='Organizations using Notify', - caption_visible=False, - field_headings=[ - 'Organization', 'Number of live services' - ], - empty_message='No data to show' - ) %} - {% call field() %} - {{ item.organization_name }} +
    +
    + {% call(item, row_number) list_table( + organizations_using_notify, + caption='Organizations using Notify', + caption_visible=False, + field_headings=[ + 'Organization', 'Number of live services' + ], + empty_message='No data to show' + ) %} + {% call field() %} + {{ item.organization_name }} + {% endcall %} + {% call field() %} + {{ item.count_of_live_services }} + {% endcall %} {% endcall %} - {% call field() %} - {{ item.count_of_live_services }} - {% endcall %} - {% endcall %} +
    {% endblock %} diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 5636536d5..1376163e1 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -73,6 +73,7 @@
    #} {% if months %} +
    {% call(item, row_index) list_table( months, @@ -129,6 +130,7 @@ {% endcall %}
    +
    {% endif %} diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index 45a81df58..40d2e10f1 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -9,16 +9,16 @@ {% include "service_navigation.html" %}
    {% if help %} -
    +
    {% else %} -
    +
    {% endif %} {% include "main_nav.html" %}
    {% if help %}
    {% else %} -
    +
    {% endif %} {% block beforeContent %} {% block backLink %}{% endblock %} From 844f37bd6e1cd3821a40f9592c09160d702fb915 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Tue, 5 Mar 2024 10:13:37 -0500 Subject: [PATCH 129/195] Capitalized the N in Notify --- app/templates/components/components/header/template.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/components/header/template.njk b/app/templates/components/components/header/template.njk index 2c690329a..a38a4b36b 100644 --- a/app/templates/components/components/header/template.njk +++ b/app/templates/components/components/header/template.njk @@ -53,7 +53,7 @@ class="usa-flag-logo margin-right-1" width="40" height="35">
    #} - notify.gov + Notify.gov {% if params.navigation %} From ffd911b76474ea255a0668dcd9aeff2f711f7d13 Mon Sep 17 00:00:00 2001 From: Carlo Costino Date: Tue, 5 Mar 2024 12:08:59 -0500 Subject: [PATCH 130/195] Capitalize tooltip to match text --- app/templates/components/components/header/template.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/components/header/template.njk b/app/templates/components/components/header/template.njk index a38a4b36b..a4cd0d9e2 100644 --- a/app/templates/components/components/header/template.njk +++ b/app/templates/components/components/header/template.njk @@ -53,7 +53,7 @@ class="usa-flag-logo margin-right-1" width="40" height="35">
    #} - Notify.gov + Notify.gov {% if params.navigation %} From 5b8377faaee6e91046fb3f2ea725daa99a6739d1 Mon Sep 17 00:00:00 2001 From: Steven Reilly Date: Wed, 6 Mar 2024 14:15:37 -0500 Subject: [PATCH 131/195] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e98fe4535..0d080c9d8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![notify-logo](https://github.com/GSA/notifications-admin/assets/4156602/31b74039-4d87-4f89-a35e-71e9f3152342) + # Notify.gov Admin UI This is the Notify front-end for government users and admins. To see it in From 0bf289e23ddcd8285199ce0d025b0858938f719f Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 6 Mar 2024 11:49:04 -0800 Subject: [PATCH 132/195] removed macro and added footer.html --- app/templates/admin_template.html | 4 +- .../new/components/footer/footer.html | 107 ++++++++++++++++++ 2 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 app/templates/new/components/footer/footer.html diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 6b33fed05..1352d8a75 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -175,7 +175,7 @@ {% endblock %} {% block footer %} - + {% if current_service and current_service.research_mode %} {% set meta_suffix = 'Built by the Technology Transformation Servicesresearch mode' %} {% else %} @@ -249,7 +249,7 @@ "html": meta_suffix } }) }} - + {% if current_user.is_authenticated %} {% block sessionUserWarning %} diff --git a/app/templates/new/components/footer/footer.html b/app/templates/new/components/footer/footer.html new file mode 100644 index 000000000..936078250 --- /dev/null +++ b/app/templates/new/components/footer/footer.html @@ -0,0 +1,107 @@ +
    + {#
    + Return to top +
    #} +
    +
    +
    +
    + {# {% if params.navigation %} + + {% endif %} #} +
    +
    +
    +

    {{ params.meta.visuallyHiddenTitle | default("Support links") }}

    +
    + {% if current_service and current_service.research_mode %} + Built by the Technology Transformation Servicesresearch mode + {% else %} + Built by the Technology Transformation Services + {% endif %} +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +

    beta.notify.gov

    +

    An official website of the General Services Administration

    +
    +
    +
    + +
    +
    +
    + Looking for U.S. government information and services? +
    + Visit USA.gov +
    +
    +
    From 68163aa6d7a5bf9e3bdbf3fe568c63dbbabe11a1 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Wed, 6 Mar 2024 11:49:19 -0800 Subject: [PATCH 133/195] Use USWDS error formatting for file too big error (notify-admin-1237) --- app/main/forms.py | 6 +++++- app/main/views/send.py | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 2e6655cc5..70dbfa37f 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1226,7 +1226,11 @@ class CsvUploadForm(StripWhitespaceForm): validators=[ DataRequired(message="Please pick a file"), CsvFileValidator(), - FileSize(max_size=10e6, message="File must be smaller than 10Mb"), # 10Mb + FileSize( + max_size=10e6, + message="File must be smaller than 10Mb. If you are trying to upload an Excel file, \ + please export the contents in the CSV format and then try again.", + ), # 10Mb ], ) diff --git a/app/main/views/send.py b/app/main/views/send.py index 6c786e3ac..5117c8e32 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -6,6 +6,7 @@ from zipfile import BadZipFile from flask import abort, flash, redirect, render_template, request, session, url_for from flask_login import current_user +from markupsafe import Markup from notifications_python_client.errors import HTTPError from notifications_utils import SMS_CHAR_COUNT_LIMIT from notifications_utils.insensitive_dict import InsensitiveDict @@ -151,8 +152,11 @@ def send_messages(service_id, template_id): # just show the first error, as we don't expect the form to have more # than one, since it only has one field first_field_errors = list(form.errors.values())[0] - flash(first_field_errors[0]) - + error_message = '' + error_message = f"{error_message}{first_field_errors[0]}" + error_message = f"{error_message}" + error_message = Markup(error_message) + flash(error_message) column_headings = get_spreadsheet_column_headings_from_template(template) return render_template( From 87b47d94df25431d3970e43fefb35815dceee4df Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 6 Mar 2024 13:04:41 -0800 Subject: [PATCH 134/195] moved usa-identifier to footer tag --- .../new/components/footer/footer.html | 111 +++++++++--------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/app/templates/new/components/footer/footer.html b/app/templates/new/components/footer/footer.html index 936078250..fa22b6a88 100644 --- a/app/templates/new/components/footer/footer.html +++ b/app/templates/new/components/footer/footer.html @@ -48,60 +48,59 @@
    - - -
    -
    -
    -
    -
    -

    beta.notify.gov

    -

    An official website of the General Services Administration

    -
    -
    -
    - -
    -
    -
    - Looking for U.S. government information and services? +
    +
    +
    +
    +
    +

    beta.notify.gov

    +

    An official website of the General Services Administration

    +
    - Visit USA.gov -
    -
    -
    + + +
    +
    +
    + Looking for U.S. government information and services? +
    + Visit USA.gov +
    +
    +
    + From c587bbee7190f4816cc8384122184661493bedd0 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 7 Mar 2024 09:29:51 -0800 Subject: [PATCH 135/195] dashboard bug --- app/main/views/jobs.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index ed8f051a3..0ef267f61 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -269,19 +269,23 @@ def get_notifications(service_id, message_type, status_override=None): # noqa def get_status_filters(service, message_type, statistics): + print(f"incoming statistics {statistics} and message_type {message_type}") if message_type is None: stats = { key: sum(statistics[message_type][key] for message_type in {"email", "sms"}) - for key in {"requested", "delivered", "failed"} + for key in {"requested", "delivered", "failure"} } else: stats = statistics[message_type] - stats["sending"] = stats["requested"] - stats["delivered"] - stats["failed"] + + print(f"STATS = {stats}") + stats["failed"] = stats["failure"] + stats filters = [ # key, label, option ("requested", "total", "sending,delivered,failed"), - ("sending", "pending", "pending"), + ("pending", "pending", "pending"), ("delivered", "delivered", "delivered"), ("failed", "failed", "failed"), ] @@ -296,7 +300,7 @@ def get_status_filters(service, message_type, statistics): message_type=message_type, status=option, ), - stats[key], + stats.get(key), ) for key, label, option in filters ] From 111c6fd93a72677b79f9a83ff0e8f3b607d786fb Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 7 Mar 2024 09:42:06 -0800 Subject: [PATCH 136/195] more fixing --- app/main/views/jobs.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 0ef267f61..6e22a82e2 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -269,23 +269,26 @@ def get_notifications(service_id, message_type, status_override=None): # noqa def get_status_filters(service, message_type, statistics): - print(f"incoming statistics {statistics} and message_type {message_type}") if message_type is None: stats = { key: sum(statistics[message_type][key] for message_type in {"email", "sms"}) - for key in {"requested", "delivered", "failure"} + for key in {"requested", "delivered", "failed"} } else: stats = statistics[message_type] - print(f"STATS = {stats}") - stats["failed"] = stats["failure"] - stats + if stats.get("failure") is not None: + stats["failed"] = stats["failure"] + + if stats.get("pending") is None: + stats["pending"] = 0 + if stats.get("sending") is None: + stats["sending"] = 0 filters = [ # key, label, option ("requested", "total", "sending,delivered,failed"), - ("pending", "pending", "pending"), + ("sending", "pending", "pending"), ("delivered", "delivered", "delivered"), ("failed", "failed", "failed"), ] From de38f38892edcfa21d9da0e7f875302921d8f64c Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 7 Mar 2024 09:45:21 -0800 Subject: [PATCH 137/195] fix test --- app/main/views/jobs.py | 2 +- tests/app/main/views/test_activity.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 6e22a82e2..3f48cb9ec 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -288,7 +288,7 @@ def get_status_filters(service, message_type, statistics): filters = [ # key, label, option ("requested", "total", "sending,delivered,failed"), - ("sending", "pending", "pending"), + ("pending", "pending", "pending"), ("delivered", "delivered", "delivered"), ("failed", "failed", "failed"), ] diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index e224c2e7d..936bfac80 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -531,7 +531,7 @@ def test_time_left(job_created_at, expected_message): assert get_time_left(job_created_at) == expected_message -STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1}} +STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1, "pending": 3}} def test_get_status_filters_calculates_stats(client_request): From f42cf3bd22e9cb23722e7e5306e501a69fb3b4df Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 7 Mar 2024 09:59:58 -0800 Subject: [PATCH 138/195] rebreak the tests to reflect reality --- app/main/views/jobs.py | 2 +- tests/app/main/views/test_activity.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 3f48cb9ec..99506fa51 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -272,7 +272,7 @@ def get_status_filters(service, message_type, statistics): if message_type is None: stats = { key: sum(statistics[message_type][key] for message_type in {"email", "sms"}) - for key in {"requested", "delivered", "failed"} + for key in {"requested", "delivered", "failure"} } else: stats = statistics[message_type] diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index 936bfac80..29a0341de 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -531,12 +531,13 @@ def test_time_left(job_created_at, expected_message): assert get_time_left(job_created_at) == expected_message -STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1, "pending": 3}} +STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1}} def test_get_status_filters_calculates_stats(client_request): ret = get_status_filters(Service({"id": "foo"}), "sms", STATISTICS) + # TODO WHY DO WE THINK THE PENDING COUNT SHOULD BE 3? HOW DID THIS WORK BEFORE? assert {label: count for label, _option, _link, count in ret} == { "total": 6, "pending": 3, From b3966ae8007d886866181ee7508dd73e2cdcd804 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 7 Mar 2024 10:17:37 -0800 Subject: [PATCH 139/195] revert previous commit --- app/main/views/jobs.py | 2 +- tests/app/main/views/test_activity.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 99506fa51..3f48cb9ec 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -272,7 +272,7 @@ def get_status_filters(service, message_type, statistics): if message_type is None: stats = { key: sum(statistics[message_type][key] for message_type in {"email", "sms"}) - for key in {"requested", "delivered", "failure"} + for key in {"requested", "delivered", "failed"} } else: stats = statistics[message_type] diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index 29a0341de..936bfac80 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -531,13 +531,12 @@ def test_time_left(job_created_at, expected_message): assert get_time_left(job_created_at) == expected_message -STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1}} +STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1, "pending": 3}} def test_get_status_filters_calculates_stats(client_request): ret = get_status_filters(Service({"id": "foo"}), "sms", STATISTICS) - # TODO WHY DO WE THINK THE PENDING COUNT SHOULD BE 3? HOW DID THIS WORK BEFORE? assert {label: count for label, _option, _link, count in ret} == { "total": 6, "pending": 3, From 2be3db10d98780f9dbc059854e1bf18fbaa47fbc Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Thu, 7 Mar 2024 10:25:11 -0800 Subject: [PATCH 140/195] fix the right way --- app/main/views/jobs.py | 5 +---- tests/app/main/views/test_activity.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 3f48cb9ec..774f2a916 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -280,10 +280,7 @@ def get_status_filters(service, message_type, statistics): if stats.get("failure") is not None: stats["failed"] = stats["failure"] - if stats.get("pending") is None: - stats["pending"] = 0 - if stats.get("sending") is None: - stats["sending"] = 0 + stats["pending"] = stats["requested"] - stats["delivered"] - stats["failed"] filters = [ # key, label, option diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index 936bfac80..e224c2e7d 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -531,7 +531,7 @@ def test_time_left(job_created_at, expected_message): assert get_time_left(job_created_at) == expected_message -STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1, "pending": 3}} +STATISTICS = {"sms": {"requested": 6, "failed": 2, "delivered": 1}} def test_get_status_filters_calculates_stats(client_request): From 6a2f54367c8aef8a7c9720825fd5e8a35013c225 Mon Sep 17 00:00:00 2001 From: Jonathan Bobel Date: Thu, 7 Mar 2024 16:42:57 -0500 Subject: [PATCH 141/195] Updated logo and og:image --- app/assets/error_pages/5xx.html | 4 ++-- app/assets/images/notify-logo-dark.svg | 17 +++++++++++++++++ app/assets/images/notify-logo.svg | 17 +++++++++++++++++ app/assets/images/notify-og-image.png | Bin 0 -> 52879 bytes .../sass/uswds/_uswds-theme-custom-styles.scss | 14 ++++++++++---- app/templates/admin_template.html | 2 +- .../components/components/header/template.njk | 17 ++++++++--------- app/templates/main_template.html | 2 +- 8 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 app/assets/images/notify-logo-dark.svg create mode 100644 app/assets/images/notify-logo.svg create mode 100644 app/assets/images/notify-og-image.png diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html index 48cbe9e61..d9d58530f 100644 --- a/app/assets/error_pages/5xx.html +++ b/app/assets/error_pages/5xx.html @@ -22,7 +22,7 @@ - + @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/app/assets/images/notify-logo-dark.svg b/app/assets/images/notify-logo-dark.svg new file mode 100644 index 000000000..798ce99d9 --- /dev/null +++ b/app/assets/images/notify-logo-dark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/notify-logo.svg b/app/assets/images/notify-logo.svg new file mode 100644 index 000000000..3afb2dd92 --- /dev/null +++ b/app/assets/images/notify-logo.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/notify-og-image.png b/app/assets/images/notify-og-image.png new file mode 100644 index 0000000000000000000000000000000000000000..9ca227562627ec450b92719e584558866457c0a1 GIT binary patch literal 52879 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

    xlI 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ʛy~>@mJ&A}P!*p8KU+dY4R(+@NN< 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 literal 0 HcmV?d00001 diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index 55f17a795..2e2626473 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -22,17 +22,23 @@ i.e. @use "uswds-core" as *; +iframe:focus, [href]:focus, [tabindex]:focus, [contentEditable=true]:focus { + outline: units(1px) dotted color('blue-40v'); + outline: units(1px) auto color('blue-40v'); + outline-offset: 0.3rem; +} + .usa-header--extended { .usa-logo { font-family: family("sans"); - margin: units(4) 0; + margin: units(2) 0 units(1); @include at-media-max('desktop') { margin: units(4) 0 units(4) units(2); } img { - @include at-media($theme-header-min-width) { - width: 80px; - height: 70px; + height: 35px; + @include at-media('desktop') { + height: 60px; } } } diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 6b33fed05..210ac01e5 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -21,7 +21,7 @@ {% endblock %} {% block meta %} - + {% endblock %} {% endblock %} diff --git a/app/templates/components/components/header/template.njk b/app/templates/components/components/header/template.njk index a4cd0d9e2..0681fb3fb 100644 --- a/app/templates/components/components/header/template.njk +++ b/app/templates/components/components/header/template.njk @@ -47,14 +47,13 @@