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

Merge pull request #983 from GSA/Hide-individual-template-display-if-it-is-in-a-folder#828

Browse Source 
Hide individual template display if it is in a folder#828
This commit is contained in:
Steven Reilly
2023-12-13 09:32:51 -05:00
committed by GitHub
parent 42eca53f77 ea5dd442d1
commit 1903b742d7
2 changed files with 31 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/views/templates/_template_list.html
View File

@@ -38,18 +38,12 @@
{% for item in template_list %} {% for item in template_list %}
{% set item_link_content %} {% set item_link_content %}
{% for ancestor in item.ancestors %}
<a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=ancestor.id) }}"
class="usa-link template-list-folder">
{{- format_item_name(ancestor.name) -}}
</a> <span class="message-name-separator"></span>
{% endfor %}
{% if item.is_folder %} {% if item.is_folder %}
<a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=item.id) }}" <a href="{{ url_for('.choose_template', service_id=current_service.id, template_type=template_type, template_folder_id=item.id) }}"
class="usa-link template-list-folder"> class="usa-link template-list-folder">
<span class="live-search-relevant">{{- format_item_name(item.name) -}}</span> <span class="live-search-relevant">{{- format_item_name(item.name) -}}</span>
</a> </a>
{% else %} {% elif not item.ancestors %}
<a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}" <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.id) }}"
class="usa-link template-list-template"> class="usa-link template-list-template">
<span class="live-search-relevant"> <span class="live-search-relevant">
@@ -70,9 +64,11 @@
{% endset %} {% endset %}
{% set item_meta %} {% set item_meta %}
{% if not item.ancestors %}
<span id="{{ item.id }}-item-hint" class="usa-hint usa-checkbox__label-description template-list-item-hint"> <span id="{{ item.id }}-item-hint" class="usa-hint usa-checkbox__label-description template-list-item-hint">
{{ item.hint }} {{ item.hint }}
</span> </span>
{% endif %}
{% endset %} {% endset %}
{# create the item config now to include the label content -#} {# create the item config now to include the label content -#}
@@ -112,4 +108,4 @@
}) }} }) }}
{% endif %} {% endif %}
</nav> </nav>
{% endif %} {% endif %}

147
tests/app/main/views/test_template_folders.py
View File

@@ -58,18 +58,10 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
["Email", "Text message"], ["Email", "Text message"],
[ [
"folder_one folder_one 2 folders", "folder_one folder_one 2 folders",
("folder_one folder_one_one " "folder_one folder_one_one " "1 folder"), ("folder_one folder_one_one " "folder_one_one"),
( ("folder_one folder_one_one folder_one_one_one " "folder_one_one_one"),
"folder_one folder_one_one folder_one_one_one " ("folder_one folder_one_one folder_one_one_one sms_template_nested"),
"folder_one folder_one_one folder_one_one_one " ("folder_one folder_one_two " "folder_one_two"),
"1 template"
),
(
"folder_one folder_one_one folder_one_one_one sms_template_nested "
"folder_one folder_one_one folder_one_one_one sms_template_nested "
"Text message template"
),
("folder_one folder_one_two " "folder_one folder_one_two " "Empty"),
"folder_two folder_two Empty", "folder_two folder_two Empty",
("sms_template_one " "sms_template_one " "Text message template"), ("sms_template_one " "sms_template_one " "Text message template"),
("sms_template_two " "sms_template_two " "Text message template"), ("sms_template_two " "sms_template_two " "Text message template"),
@@ -88,7 +80,6 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
"folder_one", "folder_one",
"folder_one_one", "folder_one_one",
"folder_one_one_one", "folder_one_one_one",
"sms_template_nested",
"folder_one_two", "folder_one_two",
"folder_two", "folder_two",
"sms_template_one", "sms_template_one",
@@ -106,18 +97,10 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
["Email", "Text message"], ["Email", "Text message"],
[ [
"folder_one folder_one 2 folders", "folder_one folder_one 2 folders",
("folder_one folder_one_one " "folder_one folder_one_one " "1 folder"), ("folder_one folder_one_one " "folder_one_one"),
( ("folder_one folder_one_one folder_one_one_one " "folder_one_one_one"),
"folder_one folder_one_one folder_one_one_one " ("folder_one folder_one_one folder_one_one_one sms_template_nested"),
"folder_one folder_one_one folder_one_one_one " ("folder_one folder_one_two " "folder_one_two"),
"1 template"
),
(
"folder_one folder_one_one folder_one_one_one sms_template_nested "
"folder_one folder_one_one folder_one_one_one sms_template_nested "
"Text message template"
),
("folder_one folder_one_two " "folder_one folder_one_two " "Empty"),
"folder_two folder_two Empty", "folder_two folder_two Empty",
"sms_template_one sms_template_one Text message template", "sms_template_one sms_template_one Text message template",
"sms_template_two sms_template_two Text message template", "sms_template_two sms_template_two Text message template",
@@ -136,7 +119,6 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
"folder_one", "folder_one",
"folder_one_one", "folder_one_one",
"folder_one_one_one", "folder_one_one_one",
"sms_template_nested",
"folder_one_two", "folder_one_two",
"folder_two", "folder_two",
"sms_template_one", "sms_template_one",
@@ -154,17 +136,9 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
["All", "Email"], ["All", "Email"],
[ [
"folder_one folder_one 1 folder", "folder_one folder_one 1 folder",
("folder_one folder_one_one " "folder_one folder_one_one " "1 folder"), ("folder_one folder_one_one " "folder_one_one"),
( ("folder_one folder_one_one folder_one_one_one " "folder_one_one_one"),
"folder_one folder_one_one folder_one_one_one " ("folder_one folder_one_one folder_one_one_one sms_template_nested"),
"folder_one folder_one_one folder_one_one_one "
"1 template"
),
(
"folder_one folder_one_one folder_one_one_one sms_template_nested "
"folder_one folder_one_one folder_one_one_one sms_template_nested "
"Text message template"
),
"sms_template_one sms_template_one Text message template", "sms_template_one sms_template_one Text message template",
"sms_template_two sms_template_two Text message template", "sms_template_two sms_template_two Text message template",
], ],
@@ -177,7 +151,6 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
"folder_one", "folder_one",
"folder_one_one", "folder_one_one",
"folder_one_one_one", "folder_one_one_one",
"sms_template_nested",
"sms_template_one", "sms_template_one",
"sms_template_two", "sms_template_two",
], ],
@@ -191,16 +164,8 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
["Email", "Text message"], ["Email", "Text message"],
[ [
"folder_one_one folder_one_one 1 folder", "folder_one_one folder_one_one 1 folder",
( ("folder_one_one folder_one_one_one " "folder_one_one_one"),
"folder_one_one folder_one_one_one " ("folder_one_one folder_one_one_one sms_template_nested"),
"folder_one_one folder_one_one_one "
"1 template"
),
(
"folder_one_one folder_one_one_one sms_template_nested "
"folder_one_one folder_one_one_one sms_template_nested "
"Text message template"
),
"folder_one_two folder_one_two Empty", "folder_one_two folder_one_two Empty",
], ],
[ [
@@ -210,7 +175,6 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
[ [
"folder_one_one", "folder_one_one",
"folder_one_one_one", "folder_one_one_one",
"sms_template_nested",
"folder_one_two", "folder_one_two",
], ],
None, None,
@@ -223,25 +187,13 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
["All", "Email"], ["All", "Email"],
[ [
"folder_one_one folder_one_one 1 folder", "folder_one_one folder_one_one 1 folder",
( ("folder_one_one folder_one_one_one " "folder_one_one_one"),
"folder_one_one folder_one_one_one " ("folder_one_one folder_one_one_one sms_template_nested"),
"folder_one_one folder_one_one_one "
"1 template"
),
(
"folder_one_one folder_one_one_one sms_template_nested "
"folder_one_one folder_one_one_one sms_template_nested "
"Text message template"
),
], ],
[ [
"folder_one_one folder_one_one 1 folder", "folder_one_one folder_one_one 1 folder",
], ],
[ ["folder_one_one", "folder_one_one_one"],
"folder_one_one",
"folder_one_one_one",
"sms_template_nested",
],
None, None,
), ),
( (
@@ -266,19 +218,12 @@ def _folder(name, folder_id=None, parent=None, users_with_permission=None):
["Email", "Text message"], ["Email", "Text message"],
[ [
"folder_one_one_one folder_one_one_one 1 template", "folder_one_one_one folder_one_one_one 1 template",
( ("folder_one_one_one sms_template_nested"),
"folder_one_one_one sms_template_nested "
"folder_one_one_one sms_template_nested "
"Text message template"
),
], ],
[ [
"folder_one_one_one folder_one_one_one 1 template", "folder_one_one_one folder_one_one_one 1 template",
], ],
[ ["folder_one_one_one"],
"folder_one_one_one",
"sms_template_nested",
],
None, None,
), ),
( (
@@ -502,7 +447,6 @@ def test_template_id_is_searchable_for_services_with_api_keys(
) )
] == [ ] == [
"folder one", "folder one",
f'{template_2["id"]} template two',
f'{template_1["id"]} template one', f'{template_1["id"]} template one',
] ]
@@ -523,10 +467,7 @@ def test_template_id_is_searchable_for_services_with_api_keys(
# Text which should be hidden from all users # Text which should be hidden from all users
r".template-list-item .display-none" r".template-list-item .display-none"
) )
] == [ ] == [template_1["id"]]
template_2["id"],
template_1["id"],
]
mock_get_api_keys.assert_called_once_with(SERVICE_ONE_ID) mock_get_api_keys.assert_called_once_with(SERVICE_ONE_ID)
@@ -1707,21 +1648,10 @@ def test_show_custom_error_message(
], ],
[ [
["folder_A", "folder_A", "1 template, 2 folders"], ["folder_A", "folder_A", "1 template, 2 folders"],
["folder_A folder_C", "folder_A", "folder_C", "1 template"], ["folder_A folder_C", "folder_C"],
[ ["folder_A folder_C sms_template_C"],
"folder_A folder_C sms_template_C", ["folder_A folder_D", "folder_D"],
"folder_A", ["folder_A sms_template_A"],
"folder_C",
"sms_template_C",
"Text message template",
],
["folder_A folder_D", "folder_A", "folder_D", "Empty"],
[
"folder_A sms_template_A",
"folder_A",
"sms_template_A",
"Text message template",
],
[ [
"folder_E folder_F folder_G", "folder_E folder_F folder_G",
"folder_E", "folder_E",
@@ -1729,14 +1659,7 @@ def test_show_custom_error_message(
"folder_G", "folder_G",
"1 template", "1 template",
], ],
[ ["folder_E folder_F folder_G email_template_G"],
"folder_E folder_F folder_G email_template_G",
"folder_E",
"folder_F",
"folder_G",
"email_template_G",
"Email template",
],
["email_template_root", "email_template_root", "Email template"], ["email_template_root", "email_template_root", "Email template"],
], ],
None, None,
@@ -1763,11 +1686,6 @@ def test_show_custom_error_message(
], ],
[ [
"folder_E folder_F folder_G email_template_G", "folder_E folder_F folder_G email_template_G",
"folder_E",
"folder_F",
"folder_G",
"email_template_G",
"Email template",
], ],
["email_template_root", "email_template_root", "Email template"], ["email_template_root", "email_template_root", "Email template"],
], ],
@@ -1780,20 +1698,9 @@ def test_show_custom_error_message(
], ],
[ [
["folder_A", "folder_A", "1 template, 1 folder"], ["folder_A", "folder_A", "1 template, 1 folder"],
["folder_A folder_C", "folder_A", "folder_C", "1 template"], ["folder_A folder_C", "folder_C"],
[ ["folder_A folder_C sms_template_C"],
"folder_A folder_C sms_template_C", ["folder_A sms_template_A"],
"folder_A",
"folder_C",
"sms_template_C",
"Text message template",
],
[
"folder_A sms_template_A",
"folder_A",
"sms_template_A",
"Text message template",
],
], ],
None, None,
), ),