darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-08 05:28:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

1219 - Deleting references to the "Terms" page

Browse Source 
I kept the actual HTML in case we want/need to add it back in the future. Can reference this branch to do so.
This commit is contained in:
Jonathan Bobel
2024-02-27 16:38:58 -05:00
parent c514214fb0
commit 602f2fccfd
12 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/main/forms.py
View File

@@ -1781,12 +1781,16 @@ class TemplateAndFoldersSelectionForm(Form):
None, None,
[ [
# ('email', 'Email') if 'email' in available_template_types else None, # ('email', 'Email') if 'email' in available_template_types else None,
("sms", "Start with a blank template") (
if "sms" in available_template_types ("sms", "Start with a blank template")
else None, if "sms" in available_template_types
("copy-existing", "Copy an existing template") else None
if allow_adding_copy_of_template ),
else None, (
("copy-existing", "Copy an existing template")
if allow_adding_copy_of_template
else None
),
], ],
) )
) )

22
app/main/views/api_keys.py
View File

@@ -168,12 +168,14 @@ def api_callbacks(service_id):
return render_template( return render_template(
"views/api/callbacks.html", "views/api/callbacks.html",
received_text_messages_callback=received_text_messages_callback["url"] received_text_messages_callback=(
if received_text_messages_callback received_text_messages_callback["url"]
else None, if received_text_messages_callback
delivery_status_callback=delivery_status_callback["url"] else None
if delivery_status_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() received_text_messages_callback = get_received_text_messages_callback()
form = CallbackForm( form = CallbackForm(
url=received_text_messages_callback.get("url") url=(
if received_text_messages_callback received_text_messages_callback.get("url")
else "", if received_text_messages_callback
else ""
),
bearer_token=dummy_bearer_token if received_text_messages_callback else "", bearer_token=dummy_bearer_token if received_text_messages_callback else "",
) )

11
app/main/views/index.py
View File

@@ -102,15 +102,6 @@ def security():
return render_template("views/security.html", navigation_links=features_nav()) return render_template("views/security.html", navigation_links=features_nav())
@main.route("/features/terms", endpoint="terms")
@user_is_logged_in
def terms():
return render_template(
"views/terms-of-use.html",
navigation_links=features_nav(),
)
@main.route("/features/using_notify") @main.route("/features/using_notify")
@user_is_logged_in @user_is_logged_in
def using_notify(): def using_notify():
@@ -214,7 +205,6 @@ def send_files_by_email():
@main.route("/roadmap", endpoint="old_roadmap") @main.route("/roadmap", endpoint="old_roadmap")
@main.route("/terms", endpoint="old_terms")
@main.route("/information-security", endpoint="information_security") @main.route("/information-security", endpoint="information_security")
@main.route("/using_notify", endpoint="old_using_notify") @main.route("/using_notify", endpoint="old_using_notify")
@main.route("/information-risk-management", endpoint="information_risk_management") @main.route("/information-risk-management", endpoint="information_risk_management")
@@ -222,7 +212,6 @@ def send_files_by_email():
def old_page_redirects(): def old_page_redirects():
redirects = { redirects = {
"main.old_roadmap": "main.roadmap", "main.old_roadmap": "main.roadmap",
"main.old_terms": "main.terms",
"main.information_security": "main.using_notify", "main.information_security": "main.using_notify",
"main.old_using_notify": "main.using_notify", "main.old_using_notify": "main.using_notify",
"main.information_risk_management": "main.security", "main.information_risk_management": "main.security",

22
app/main/views/manage_users.py
View File

@@ -122,16 +122,18 @@ def edit_user_permissions(service_id, user_id):
form = form_class.from_user( form = form_class.from_user(
user, user,
service_id, service_id,
folder_permissions=None folder_permissions=(
if user.platform_admin None
else [ if user.platform_admin
f["id"] else [
for f in current_service.all_template_folders f["id"]
if user.has_template_folder_permission(f) 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, all_template_folders=(
None if user.platform_admin else current_service.all_template_folders
),
) )
if form.validate_on_submit(): if form.validate_on_submit():

6
app/main/views/performance.py
View File

@@ -34,8 +34,8 @@ def performance():
stats["average_percentage_under_10_seconds"] = mean( stats["average_percentage_under_10_seconds"] = mean(
[row["percentage_under_10_seconds"] for row in stats["processing_time"]] or [0] [row["percentage_under_10_seconds"] for row in stats["processing_time"]] or [0]
) )
stats[ stats["count_of_live_services_and_organizations"] = (
"count_of_live_services_and_organizations" status_api_client.get_count_of_live_services_and_organizations()
] = status_api_client.get_count_of_live_services_and_organizations() )
return render_template("views/performance.html", **stats) return render_template("views/performance.html", **stats)

28
app/main/views/send.py
View File

@@ -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): def get_example_csv_rows(template, use_example_as_example=True, submitted_fields=False):
return { return {
"email": ["test@example.com"] "email": (
if use_example_as_example ["test@example.com"]
else [current_user.email_address], if use_example_as_example
"sms": ["12223334444"] else [current_user.email_address]
if use_example_as_example ),
else [current_user.mobile_number], "sms": (
["12223334444"] if use_example_as_example else [current_user.mobile_number]
),
}[template.template_type] + get_example_csv_fields( }[template.template_type] + get_example_csv_fields(
( (
placeholder placeholder
@@ -511,12 +513,14 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
template=template, template=template,
max_initial_rows_shown=50, max_initial_rows_shown=50,
max_errors_shown=50, max_errors_shown=50,
guestlist=itertools.chain.from_iterable( guestlist=(
[user.name, user.mobile_number, user.email_address] itertools.chain.from_iterable(
for user in Users(service_id) [user.name, user.mobile_number, user.email_address]
) for user in Users(service_id)
if current_service.trial_mode )
else None, if current_service.trial_mode
else None
),
remaining_messages=remaining_messages, remaining_messages=remaining_messages,
allow_international_sms=current_service.has_permission("international_sms"), allow_international_sms=current_service.has_permission("international_sms"),
) )

24
app/main/views/service_settings.py
View File

@@ -477,9 +477,11 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
current_service.id, current_service.id,
reply_to_email_id=reply_to_email_id, reply_to_email_id=reply_to_email_id,
email_address=form.email_address.data, email_address=form.email_address.data,
is_default=True is_default=(
if reply_to_email_address["is_default"] True
else form.is_default.data, if reply_to_email_address["is_default"]
else form.is_default.data
),
) )
return redirect(url_for(".service_email_reply_to", service_id=service_id)) return redirect(url_for(".service_email_reply_to", service_id=service_id))
try: try:
@@ -499,9 +501,11 @@ def service_edit_email_reply_to(service_id, reply_to_email_id):
".service_verify_reply_to_address", ".service_verify_reply_to_address",
service_id=service_id, service_id=service_id,
notification_id=notification_id, notification_id=notification_id,
is_default=True is_default=(
if reply_to_email_address["is_default"] True
else form.is_default.data, if reply_to_email_address["is_default"]
else form.is_default.data
),
replace=reply_to_email_id, 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( service_api_client.update_sms_sender(
current_service.id, current_service.id,
sms_sender_id=sms_sender_id, sms_sender_id=sms_sender_id,
sms_sender=sms_sender["sms_sender"] sms_sender=(
if is_inbound_number sms_sender["sms_sender"]
else form.sms_sender.data.replace("\r", ""), if is_inbound_number
else form.sms_sender.data.replace("\r", "")
),
is_default=True if sms_sender["is_default"] else form.is_default.data, is_default=True if sms_sender["is_default"] else form.is_default.data,
) )
return redirect(url_for(".service_sms_senders", service_id=service_id)) return redirect(url_for(".service_sms_senders", service_id=service_id))

4
app/main/views/sub_navigation_dictionaries.py
View File

@@ -18,10 +18,6 @@ def features_nav():
"name": "Security", "name": "Security",
"link": "main.security", "link": "main.security",
}, },
{
"name": "Terms of use",
"link": "main.terms",
},
] ]

1
app/navigation.py
View File

@@ -45,7 +45,6 @@ class HeaderNavigation(Navigation):
"features_sms", "features_sms",
"roadmap", "roadmap",
"security", "security",
"terms",
}, },
"using_notify": { "using_notify": {
"get_started", "get_started",

4
app/templates/admin_template.html
View File

@@ -201,10 +201,6 @@
"href": url_for("main.security"), "href": url_for("main.security"),
"text": "Security" "text": "Security"
}, },
{
"href": url_for("main.terms"),
"text": "Terms of use"
},
] ]
}, },
{ {

14
tests/app/main/views/test_index.py
View File

@@ -90,7 +90,6 @@ def test_hiding_pages_from_search_engines(
[ [
"privacy", "privacy",
"pricing", "pricing",
"terms",
"roadmap", "roadmap",
"features", "features",
"documentation", "documentation",
@@ -167,7 +166,6 @@ def test_guidance_pages_link_to_service_pages_when_signed_in(
("information_risk_management", "security"), ("information_risk_management", "security"),
("old_integration_testing", "integration_testing"), ("old_integration_testing", "integration_testing"),
("old_roadmap", "roadmap"), ("old_roadmap", "roadmap"),
("old_terms", "terms"),
("information_security", "using_notify"), ("information_security", "using_notify"),
("old_using_notify", "using_notify"), ("old_using_notify", "using_notify"),
("delivery_and_failure", "message_status"), ("delivery_and_failure", "message_status"),
@@ -226,12 +224,12 @@ def test_old_using_notify_page(client_request):
# ) # )
def test_terms_page_has_correct_content(client_request): # def test_terms_page_has_correct_content(client_request):
terms_page = client_request.get("main.terms") # terms_page = client_request.get("main.terms")
assert normalize_spaces(terms_page.select("main p")[0].text) == ( # assert normalize_spaces(terms_page.select("main p")[0].text) == (
"These terms apply to your service’s use of Notify.gov. " # "These terms apply to your service’s use of Notify.gov. "
"You must be the service manager to accept them." # "You must be the service manager to accept them."
) # )
def test_css_is_served_from_correct_path(client_request): def test_css_is_served_from_correct_path(client_request):

2
tests/app/test_navigation.py
View File

@@ -128,7 +128,6 @@ EXCLUDED_ENDPOINTS = tuple(
"old_integration_testing", "old_integration_testing",
"old_roadmap", "old_roadmap",
"old_service_dashboard", "old_service_dashboard",
"old_terms",
"old_using_notify", "old_using_notify",
"organization_billing", "organization_billing",
"organization_dashboard", "organization_dashboard",
@@ -205,7 +204,6 @@ EXCLUDED_ENDPOINTS = tuple(
"suspend_service", "suspend_service",
"template_history", "template_history",
"template_usage", "template_usage",
"terms",
"tour_step", "tour_step",
"trial_mode", "trial_mode",
"trial_mode_new", "trial_mode_new",