From acdd2806fc8553e08565f6ef42366de3dbda5b12 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Mon, 1 Apr 2024 18:03:38 -0700 Subject: [PATCH 1/4] added force_hide_sender --- app/main/views/send.py | 29 +++++-------------- app/templates/views/check/preview.html | 2 +- .../views/notifications/preview.html | 2 +- app/utils/templates.py | 3 +- 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 3aa5bd830..78395d243 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -470,7 +470,7 @@ def send_one_off_step(service_id, template_id, step_index): ) -def _check_messages(service_id, template_id, upload_id, preview_row): +def _check_messages(service_id, template_id, upload_id, preview_row, **kwargs): try: # The happy path is that the job doesn’t already exist, so the # API will return a 404 and the client will raise HTTPError. @@ -510,11 +510,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): show_recipient=False, email_reply_to=email_reply_to, sms_sender=sms_sender, - ) - simplifed_template = get_template( - db_template, - current_service, - show_recipient=False, + **kwargs, ) allow_list = [] @@ -535,7 +531,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row): allow_list = None recipients = RecipientCSV( contents, - template=template or simplifed_template, + template=template, max_initial_rows_shown=50, max_errors_shown=50, guestlist=allow_list, @@ -569,9 +565,6 @@ 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) @@ -599,7 +592,6 @@ 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, - simplifed_template=simplifed_template, ) @@ -658,7 +650,7 @@ def check_messages(service_id, template_id, upload_id, row_index=2): @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", "") - data = _check_messages(service_id, template_id, upload_id, row_index) + data = _check_messages(service_id, template_id, upload_id, row_index, force_hide_sender=True) return render_template( "views/check/preview.html", @@ -825,11 +817,11 @@ def send_one_off_to_myself(service_id, template_id): def check_notification(service_id, template_id): return render_template( "views/notifications/check.html", - **_check_notification(service_id, template_id), + **_check_notification(service_id, template_id, show_recipient=True), ) -def _check_notification(service_id, template_id, exception=None): +def _check_notification(service_id, template_id, exception=None, **kwargs): db_template = current_service.get_template_with_user_permission_or_403( template_id, current_user ) @@ -842,13 +834,9 @@ def _check_notification(service_id, template_id, exception=None): template = get_template( db_template, current_service, - show_recipient=True, email_reply_to=email_reply_to, sms_sender=sms_sender, - ) - simplifed_template = get_template( - db_template, - current_service, + **kwargs, ) placeholders = fields_to_fill_in(template) @@ -874,7 +862,6 @@ def _check_notification(service_id, template_id, exception=None): back_link_from_preview=back_link_from_preview, choose_time_form=choose_time_form, **(get_template_error_dict(exception) if exception else {}), - simplifed_template=simplifed_template, ) @@ -924,7 +911,7 @@ def preview_notification(service_id, template_id): return render_template( "views/notifications/preview.html", - **_check_notification(service_id, template_id), + **_check_notification(service_id, template_id, show_recipient=False, force_hide_sender=True), scheduled_for=session["scheduled_for"], recipient=recipient, ) diff --git a/app/templates/views/check/preview.html b/app/templates/views/check/preview.html index 7398a7fd9..0aa17a3a9 100644 --- a/app/templates/views/check/preview.html +++ b/app/templates/views/check/preview.html @@ -28,7 +28,7 @@

Message

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

Recipients list

diff --git a/app/templates/views/notifications/preview.html b/app/templates/views/notifications/preview.html index a22fda5bb..bd518dc18 100644 --- a/app/templates/views/notifications/preview.html +++ b/app/templates/views/notifications/preview.html @@ -50,7 +50,7 @@

Message

-
{{ simplifed_template|string }}
+
{{ template|string }}
Date: Tue, 2 Apr 2024 14:11:44 -0700 Subject: [PATCH 2/4] updated css to placeholder --- app/assets/sass/uswds/_uswds-theme-custom-styles.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss index 74441f092..ce21de941 100644 --- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss +++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss @@ -595,3 +595,9 @@ details form { #countdown-container { display: none; // Hide the countdown timer } + +.placeholder, .placeholder-conditional { + background-color: #face00; + border: 1px solid #face00; + border-radius: 7px; +} From 745532e6570ea5d289325133d14812129b96c8ab Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 2 Apr 2024 16:30:40 -0700 Subject: [PATCH 3/4] added template for personalisation --- app/main/views/jobs.py | 16 ++++++++++++++++ app/templates/partials/jobs/status.html | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 0c0848e46..0c222972f 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -34,6 +34,7 @@ from app.utils.pagination import ( generate_previous_dict, get_page_from_request, ) +from app.utils.templates import get_template from app.utils.user import user_has_permissions @@ -381,6 +382,20 @@ def get_job_partials(job): arrived_from_preview_page_url = session.get("arrived_from_preview_page", False) + template_id = job.template.get('id') + + db_template = current_service.get_template_with_user_permission_or_403( + template_id, current_user + ) + if db_template["template_type"] not in ("sms", "email"): + abort(404) + + template = get_template( + db_template, + current_service, + redact_missing_personalisation=True, + ) + return { "counts": counts, "notifications": render_template( @@ -405,6 +420,7 @@ def get_job_partials(job): "partials/jobs/status.html", job=job, arrived_from_preview_page_url=arrived_from_preview_page_url, + template=template, ), } diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index 99b5768e8..4d681c338 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -1,8 +1,8 @@ {% set display_message_status %} {% if job.template.content %}

Message

-
{{ current_service.name }}: {{job.template.content}}
-{% endif %} + {{template|string}} + {% endif %} {% if job.original_file_name %}

Recipient list

From 6acbce085846a3909fb00923ec47df4302279442 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Fri, 5 Apr 2024 12:14:56 -0700 Subject: [PATCH 4/4] removed jobs template --- app/main/views/jobs.py | 16 ---------------- app/templates/partials/jobs/status.html | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py index 0c222972f..0c0848e46 100644 --- a/app/main/views/jobs.py +++ b/app/main/views/jobs.py @@ -34,7 +34,6 @@ from app.utils.pagination import ( generate_previous_dict, get_page_from_request, ) -from app.utils.templates import get_template from app.utils.user import user_has_permissions @@ -382,20 +381,6 @@ def get_job_partials(job): arrived_from_preview_page_url = session.get("arrived_from_preview_page", False) - template_id = job.template.get('id') - - db_template = current_service.get_template_with_user_permission_or_403( - template_id, current_user - ) - if db_template["template_type"] not in ("sms", "email"): - abort(404) - - template = get_template( - db_template, - current_service, - redact_missing_personalisation=True, - ) - return { "counts": counts, "notifications": render_template( @@ -420,7 +405,6 @@ def get_job_partials(job): "partials/jobs/status.html", job=job, arrived_from_preview_page_url=arrived_from_preview_page_url, - template=template, ), } diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html index 4d681c338..99b5768e8 100644 --- a/app/templates/partials/jobs/status.html +++ b/app/templates/partials/jobs/status.html @@ -1,8 +1,8 @@ {% set display_message_status %} {% if job.template.content %}

Message

- {{template|string}} - {% endif %} +
{{ current_service.name }}: {{job.template.content}}
+{% endif %} {% if job.original_file_name %}

Recipient list