Skip to content

Remove SMS Total Message Limit from Org Dash #3144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heyitsmebev wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove SMS Total Message Limit from Org Dash #3144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1ffe0
Remove SMS Total Message Limit from Org Dash
heyitsmebev Dec 4, 2025
462e77f
update text
heyitsmebev Dec 4, 2025
705d9fb
pytest
heyitsmebev Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions app/main/views/organizations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,14 @@ def add_organization():
return render_template("views/organizations/add-organization.html", form=form)


def get_organization_message_allowance(org_id):
def get_organization_messages_sent(org_id):
try:
message_usage = organizations_client.get_organization_message_usage(org_id)
except Exception as e:
current_app.logger.error(f"Error fetching organization message usage: {e}")
message_usage = {}

return {
"messages_sent": message_usage.get("messages_sent", 0),
"messages_remaining": message_usage.get("messages_remaining", 0),
"total_message_limit": message_usage.get("total_message_limit", 0),
}
return message_usage.get("messages_sent", 0)


def _handle_create_service(org_id):
Expand Down Expand Up @@ -290,7 +286,7 @@ def organization_dashboard(org_id):
elif action == "delete-service" and service_id:
return _handle_delete_service(org_id, service_id)

message_allowance = get_organization_message_allowance(org_id)
messages_sent = get_organization_messages_sent(org_id)

return render_template(
"views/organizations/organization/index.html",
Expand All @@ -305,7 +301,7 @@ def organization_dashboard(org_id):
edit_service_data=edit_service_data,
new_service_id=session.pop("new_service_id", None),
updated_service_id=session.pop("updated_service_id", None),
**message_allowance,
messages_sent=messages_sent,
)


Expand Down
10 changes: 4 additions & 6 deletions app/templates/views/organizations/organization/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,21 @@

{{ page_header('Organization Dashboard', size='large') }}

<div id="totalMessageChartContainer" data-messages-sent="{{ messages_sent|default(0) }}" data-messages-remaining="{{ messages_remaining|default(0) }}" data-total-message-limit="{{ total_message_limit|default(0) }}">
<div class="margin-bottom-3">
<div class="grid-row flex-align-center">
<h2 id="chartTitle" class="margin-right-1 margin-y-0">Overall {{ selected_year }} Total Message Allowance</h2>
<h2 id="chartTitle" class="margin-right-1 margin-y-0">Overall {{ selected_year }} Messages Sent</h2>
<button
type="button"
class="usa-tooltip usa-tooltip__information margin-right-0"
data-position="top"
title="Combined totals across all services in {{ current_org.name }}: pending, failed, or delivered"
title="Total messages sent across all services in {{ current_org.name }}"
>
<span class="usa-sr-only">More information</span>
<img src="{{ asset_url('img/usa-icons/info.svg') }}" alt="" class="usa-icon" role="presentation" />
</button>
</div>
<svg id="totalMessageChart"></svg>
<div id="message"></div>
<div class="font-sans-xl text-primary-darker margin-top-1">{{ "{:,}".format(messages_sent|default(0)) }} sent</div>
</div>
<div id="totalMessageTable" class="margin-bottom-3"></div>
<div class="grid-row margin-bottom-3 maxw-tablet">
<div class="grid-col-12 tablet:grid-col-6 margin-bottom-2 tablet:margin-bottom-0 tablet:padding-right-1">
<div class="usa-summary-box height-full" role="region">
Expand Down
10 changes: 2 additions & 8 deletions tests/app/main/views/organizations/test_organizations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@ def test_organization_billing_page_not_accessible_if_not_platform_admin(
)


def test_organization_dashboard_shows_message_usage(
def test_organization_dashboard_shows_messages_sent(
client_request,
mock_get_organization,
mocker,
Expand All @@ -1531,8 +1531,6 @@ def test_organization_dashboard_shows_message_usage(
"app.organizations_client.get_organization_message_usage",
return_value={
"messages_sent": 1000,
"messages_remaining": 2000,
"total_message_limit": 3000,
},
)
mocker.patch(
Expand All @@ -1553,11 +1551,7 @@ def test_organization_dashboard_shows_message_usage(
mock_message_usage.assert_called_once_with(ORGANISATION_ID)

assert normalize_spaces(page.select_one("h1").text) == "Organization Dashboard"

chart_container = page.select_one("#totalMessageChartContainer")
assert chart_container["data-messages-sent"] == "1000"
assert chart_container["data-messages-remaining"] == "2000"
assert chart_container["data-total-message-limit"] == "3000"
assert "1,000 sent" in page.text


def test_organization_dashboard_shows_service_counts(
Expand Down
Loading