Merge remote-tracking branch 'origin/main' into 1210-create-confirmation-status-page-the-last-page-in-the-preview-send-flow

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 "",
     )
 

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",

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():

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)

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"),
     )

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))

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=bool(notify_env in ["development", "staging", "demo"]),
         password_reset_url=password_reset_url,
         initial_signin_url=initial_signin_url,
     )