diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js index da9c65e38..19d8bcc49 100644 --- a/app/assets/javascripts/activityChart.js +++ b/app/assets/javascripts/activityChart.js @@ -64,7 +64,7 @@ .padding(0.1); // Adjust the y-axis domain to add some space above the tallest bar const maxY = d3.max(deliveredData.map((d, i) => d + (failedData[i] || 0))); - const y = d3.scaleLinear() + const y = d3.scaleSqrt() .domain([0, maxY + 2]) // Add 2 units of space at the top .nice() .range([height, 0]); diff --git a/app/assets/javascripts/totalMessagesChart.js b/app/assets/javascripts/totalMessagesChart.js index a3c10d7a3..68c9fd8f9 100644 --- a/app/assets/javascripts/totalMessagesChart.js +++ b/app/assets/javascripts/totalMessagesChart.js @@ -14,7 +14,7 @@ document.getElementById('message').innerText = `${sms_sent.toLocaleString()} sent / ${sms_remaining_messages.toLocaleString()} remaining`; // Calculate minimum width for "Messages Sent" as 1% of the total chart width - var minSentPercentage = 0.02; // Minimum width as a percentage of total messages (1% in this case) + var minSentPercentage = (sms_sent === 0) ? 0 : 0.02; var minSentValue = totalMessages * minSentPercentage; var displaySent = Math.max(sms_sent, minSentValue); var displayRemaining = totalMessages - displaySent; diff --git a/app/templates/views/activity/all-activity.html b/app/templates/views/activity/all-activity.html index 8b2dcece4..1067bc07b 100644 --- a/app/templates/views/activity/all-activity.html +++ b/app/templates/views/activity/all-activity.html @@ -114,7 +114,7 @@ {% endfor %} {% else %} - No batched job messages found (messages are kept for {{ service_data_retention_days }} days). + No messages found {% endif %} diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 2254c3c78..3ea625bb3 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -29,9 +29,7 @@
-

- Activity snapshot -

+

Recent activity

diff --git a/tests/app/main/views/test_jobs_activity.py b/tests/app/main/views/test_jobs_activity.py index cfc61b96e..498ff048e 100644 --- a/tests/app/main/views/test_jobs_activity.py +++ b/tests/app/main/views/test_jobs_activity.py @@ -146,7 +146,7 @@ def test_all_activity_no_jobs(client_request, mocker): no_jobs_message_td = page.find("td", class_="table-empty-message") assert no_jobs_message_td is not None, "No jobs message not found in the response" - expected_message = "No batched job messages found (messages are kept for 7 days)." + expected_message = "No messages found" actual_message = no_jobs_message_td.get_text(strip=True) assert (