code review feedback

app/main/views/dashboard.py

@@ -14,7 +14,7 @@ from app import (
     service_api_client,
     template_statistics_client,
 )
-from app.formatters import format_date_numeric, format_datetime_numeric, get_time_left
+from app.formatters import format_date_numeric, format_datetime_numeric
 from app.main import main
 from app.main.views.user_profile import set_timezone
 from app.statistics_utils import get_formatted_percentage
@@ -62,57 +62,38 @@ def service_dashboard(service_id):
     job_response = job_api_client.get_jobs(service_id)["data"]
     service_data_retention_days = 7
 
-    jobs = [
-        {
-            "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"]
-            ),
-            "created_at": job["created_at"],
-            "processing_finished": job.get("processing_finished"),
-            "processing_started": job.get("processing_started"),
-            "notification_count": job["notification_count"],
-            "created_by": job["created_by"],
-            "template_name": job["template_name"],
-            "original_file_name": job["original_file_name"],
-        }
-        for job in job_response
-        if job["job_status"] != "cancelled"
-    ]
+    filtered_jobs = [job for job in job_response if job["job_status"] != "cancelled"]
+    sorted_jobs = sorted(filtered_jobs, key=lambda job: job["created_at"], reverse=True)
+
     return render_template(
         "views/dashboard/dashboard.html",
         updates_url=url_for(".service_dashboard_updates", service_id=service_id),
         partials=get_dashboard_partials(service_id),
-        jobs=jobs,
+        jobs=sorted_jobs,
         service_data_retention_days=service_data_retention_days,
         sms_sent=sms_sent,
         sms_allowance_remaining=sms_allowance_remaining,
     )
 
 
-@main.route("/daily_stats.json")
-def get_daily_stats():
-    service_id = session.get("service_id")
+@main.route("/services/<uuid:service_id>/daily-stats.json")
+@user_has_permissions()
+def get_daily_stats(service_id):
     date_range = get_stats_date_range()
-
     stats = service_api_client.get_service_notification_statistics_by_day(
         service_id, start_date=date_range["start_date"], days=date_range["days"]
     )
     return jsonify(stats)
 
 
-@main.route("/daily_stats_by_user.json")
-def get_daily_stats_by_user():
+@main.route("/services/<uuid:service_id>/daily-stats-by-user.json")
+@user_has_permissions()
+def get_daily_stats_by_user(service_id):
     service_id = session.get("service_id")
     date_range = get_stats_date_range()
-    user_id = current_user.id
     stats = service_api_client.get_user_service_notification_statistics_by_day(
         service_id,
-        user_id,
+        user_id=current_user.id,
         start_date=date_range["start_date"],
         days=date_range["days"],
     )

app/main/views/index.py

@@ -217,11 +217,11 @@ def benchmark_performance():
     )
 
 
-@main.route("/using-notify/guidance")
+@main.route("/using-notify/how-to")
 @user_is_logged_in
-def guidance_index():
+def how_to():
     return render_template(
-        "views/guidance/index.html",
+        "views/how-to/index.html",
         navigation_links=using_notify_nav(),
     )
 
@@ -266,29 +266,29 @@ def join_notify():
     )
 
 
-@main.route("/using-notify/guidance/create-and-send-messages")
+@main.route("/using-notify/how-to/create-and-send-messages")
 @user_is_logged_in
 def create_and_send_messages():
     return render_template(
-        "views/guidance/create-and-send-messages.html",
+        "views/how-to/create-and-send-messages.html",
         navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/using-notify/guidance/edit-and-format-messages")
+@main.route("/using-notify/how-to/edit-and-format-messages")
 @user_is_logged_in
 def edit_and_format_messages():
     return render_template(
-        "views/guidance/edit-and-format-messages.html",
+        "views/how-to/edit-and-format-messages.html",
         navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/using-notify/guidance/send-files-by-email")
+@main.route("/using-notify/how-to/send-files-by-email")
 @user_is_logged_in
 def send_files_by_email():
     return render_template(
-        "views/guidance/send-files-by-email.html",
+        "views/how-to/send-files-by-email.html",
         navigation_links=using_notify_nav(),
     )
 

app/main/views/jobs.py

@@ -57,7 +57,6 @@ def view_job(service_id, job_id):
 
     filter_args = parse_filter_args(request.args)
     filter_args["status"] = set_status_filters(filter_args)
-
     return render_template(
         "views/jobs/job.html",
         job=job,
@@ -402,7 +401,7 @@ def get_job_partials(job):
     )
 
     if request.referrer is not None:
-        session["arrived_from_preview_page"] = "check" in request.referrer
+        session["arrived_from_preview_page"] = ("check" in request.referrer) or ("help=0" in request.referrer)
     else:
         session["arrived_from_preview_page"] = False
 

app/main/views/platform_admin.py

@@ -162,7 +162,6 @@ def get_redis_report():
     writer.writerow(["", "Max Memory", max_memory])
     writer.writerow(["", "Memory Fragmentation Ratio", mem_fragmentation])
     writer.writerow(["", "Memory Fragmentation Quality", frag_quality, frag_note])
-    #writer.writerow(["", "Memory Fragmentation Note", frag_note])
     writer.writerow([])
 
     writer.writerow(["Keys Overview"])

app/main/views/sub_navigation_dictionaries.py

@@ -2,7 +2,7 @@ def using_notify_nav():
     nav_items = [
         {"name": "Get started", "link": "main.get_started"},
         {
-            "name": "Best Practices",
+            "name": "Best practices",
             "link": "main.best_practices",
             "sub_navigation_items": [
                 {
@@ -33,8 +33,8 @@ def using_notify_nav():
         },
         {"name": "Trial mode", "link": "main.trial_mode_new"},
         {"name": "Tracking usage", "link": "main.pricing"},
-        {"name": "Delivery Status", "link": "main.message_status"},
-        {"name": "Guidance", "link": "main.guidance_index"},
+        {"name": "Delivery status", "link": "main.message_status"},
+        {"name": "How to", "link": "main.how_to"},
     ]
 
     return nav_items

app/main/views/templates.py

@@ -645,7 +645,6 @@ def edit_service_template(service_id, template_id):
         return render_template(
             "views/edit-{}-template.html".format(template["template_type"]),
             form=form,
-            errors=form.errors if form.errors else None,
             template=template,
             heading_action="Edit",
         )