From 7766f74c9d55eb3d3ae3db2f4ba7e69de9060d26 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 29 Aug 2024 08:33:19 -0700 Subject: [PATCH 1/8] Remove CISA region filter for portfolio and try to add sticky bar for portfolio --- src/registrar/assets/sass/_theme/_admin.scss | 50 +++++++++++++++++++ .../admin/includes/detail_table_fieldset.html | 2 +- .../django/admin/portfolio_change_form.html | 21 +++++++- src/registrar/templatetags/custom_filters.py | 5 ++ 4 files changed, 76 insertions(+), 2 deletions(-) diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index f7d1e5788..505c6800d 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -556,6 +556,43 @@ button .usa-icon, } } +/* Sticky submit bar for Portfolio page on desktop */ +@media screen and (min-width:768px) { + .portfolio-submit-row-wrapper { + position: fixed; + bottom: 0; + right: 0; + left: 338px; /* Adjust this value according to your layout */ + background: var(--darkened-bg); /* Use a suitable background color */ + border-top-left-radius: 6px; + transition: transform .2s ease-out; + } + .portfolio-submit-row-wrapper--collapsed { + transform: translate3d(0, 88px, 0); + } + .portfolio-submit-row { + clear: both; + } + .portfolio-submit-row-toggle { + display: inline-block; + position: absolute; + top: -30px; + right: 0; + background: var(--darkened-bg); + } + #portfolioSubmitRowToggle { + color: var(--body-fg); + } + .portfolio-requested-domain-sticky { + max-width: 325px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: medium; + padding-top: 3px !important; + } +} + .visible-768 { display: none; } @@ -580,6 +617,19 @@ button .usa-icon, } } +@media screen and (min-width:935px) { + /* Analyst-only class for Portfolio page */ + .portfolio-submit-row-wrapper--analyst-view { + @include portfolio-submit-row-wrapper--collapsed-one-line(); + } +} + +@media screen and (min-width:1256px) { + .portfolio-submit-row-wrapper { + @include portfolio-submit-row-wrapper--collapsed-one-line(); + } +} + // Collapse button styles for fieldsets .module.collapse--dgfieldset { margin-top: -35px; diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html index 3b4047d39..65591dc03 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -330,7 +330,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% endif %} {% endwith %} - {% elif field.field.name == "state_territory" %} + {% elif field.field.name == "state_territory" and original_object|model_name != 'portfolio' %}
CISA region: diff --git a/src/registrar/templates/django/admin/portfolio_change_form.html b/src/registrar/templates/django/admin/portfolio_change_form.html index 9d59aae42..4a1627907 100644 --- a/src/registrar/templates/django/admin/portfolio_change_form.html +++ b/src/registrar/templates/django/admin/portfolio_change_form.html @@ -1,11 +1,12 @@ {% extends 'django/admin/email_clipboard_change_form.html' %} +{% load custom_filters %} {% load i18n static %} {% block content %} {% comment %} Stores the json endpoint in a url for easier access {% endcomment %} {% url 'get-senior-official-from-federal-agency-json' as url %} - {{ block.super }} + {{ block.super }} {% endblock content %} {% block field_sets %} @@ -21,3 +22,21 @@ {% include "django/admin/includes/detail_table_fieldset.html" with original_object=original %} {% endfor %} {% endblock %} + +{% block submit_buttons_bottom %} +
+ + + +

+ HELLO WORLD: {{ original.requested_domain.name }} +

+ {{ block.super }} +
+ +{% endblock %} diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py index 728478a51..b59363589 100644 --- a/src/registrar/templatetags/custom_filters.py +++ b/src/registrar/templatetags/custom_filters.py @@ -169,3 +169,8 @@ def has_contact_info(user): return False else: return bool(user.title or user.email or user.phone) + + +@register.filter +def model_name(instance): + return instance.__class__.__name__.lower() From 72316d312942fea2b2bad07874166f6d3922248d Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 29 Aug 2024 13:32:49 -0700 Subject: [PATCH 2/8] Remove extraneous CSS --- src/registrar/assets/sass/_theme/_admin.scss | 50 ------------------- .../django/admin/portfolio_change_form.html | 29 +++++------ 2 files changed, 15 insertions(+), 64 deletions(-) diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index 505c6800d..f7d1e5788 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -556,43 +556,6 @@ button .usa-icon, } } -/* Sticky submit bar for Portfolio page on desktop */ -@media screen and (min-width:768px) { - .portfolio-submit-row-wrapper { - position: fixed; - bottom: 0; - right: 0; - left: 338px; /* Adjust this value according to your layout */ - background: var(--darkened-bg); /* Use a suitable background color */ - border-top-left-radius: 6px; - transition: transform .2s ease-out; - } - .portfolio-submit-row-wrapper--collapsed { - transform: translate3d(0, 88px, 0); - } - .portfolio-submit-row { - clear: both; - } - .portfolio-submit-row-toggle { - display: inline-block; - position: absolute; - top: -30px; - right: 0; - background: var(--darkened-bg); - } - #portfolioSubmitRowToggle { - color: var(--body-fg); - } - .portfolio-requested-domain-sticky { - max-width: 325px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - font-size: medium; - padding-top: 3px !important; - } -} - .visible-768 { display: none; } @@ -617,19 +580,6 @@ button .usa-icon, } } -@media screen and (min-width:935px) { - /* Analyst-only class for Portfolio page */ - .portfolio-submit-row-wrapper--analyst-view { - @include portfolio-submit-row-wrapper--collapsed-one-line(); - } -} - -@media screen and (min-width:1256px) { - .portfolio-submit-row-wrapper { - @include portfolio-submit-row-wrapper--collapsed-one-line(); - } -} - // Collapse button styles for fieldsets .module.collapse--dgfieldset { margin-top: -35px; diff --git a/src/registrar/templates/django/admin/portfolio_change_form.html b/src/registrar/templates/django/admin/portfolio_change_form.html index 4a1627907..fa69b4d46 100644 --- a/src/registrar/templates/django/admin/portfolio_change_form.html +++ b/src/registrar/templates/django/admin/portfolio_change_form.html @@ -24,19 +24,20 @@ {% endblock %} {% block submit_buttons_bottom %} -
- - - -

- HELLO WORLD: {{ original.requested_domain.name }} -

- {{ block.super }} -
+
+ + + + +

+ HELLO: {{ original.requested_domain.name }} +

+ {{ block.super }} +
{% endblock %} From 2e053936e7b595d600347815938cce6a2693de3e Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Thu, 29 Aug 2024 14:03:40 -0700 Subject: [PATCH 3/8] Update SCSS naming and fix sticky row --- src/registrar/assets/sass/_theme/_admin.scss | 2 +- .../templates/django/admin/domain_request_change_form.html | 2 +- .../templates/django/admin/portfolio_change_form.html | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index f7d1e5788..e2377e07c 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -546,7 +546,7 @@ button .usa-icon, #submitRowToggle { color: var(--body-fg); } - .requested-domain-sticky { + .submit-row-sticky { max-width: 325px; overflow: hidden; white-space: nowrap; diff --git a/src/registrar/templates/django/admin/domain_request_change_form.html b/src/registrar/templates/django/admin/domain_request_change_form.html index a7d59d22c..0396326d9 100644 --- a/src/registrar/templates/django/admin/domain_request_change_form.html +++ b/src/registrar/templates/django/admin/domain_request_change_form.html @@ -120,7 +120,7 @@ -

+

Requested domain: {{ original.requested_domain.name }}

{{ block.super }} diff --git a/src/registrar/templates/django/admin/portfolio_change_form.html b/src/registrar/templates/django/admin/portfolio_change_form.html index 12d39bb64..6c7aca0ea 100644 --- a/src/registrar/templates/django/admin/portfolio_change_form.html +++ b/src/registrar/templates/django/admin/portfolio_change_form.html @@ -6,6 +6,8 @@ {% comment %} Stores the json endpoint in a url for easier access {% endcomment %} {% url 'get-senior-official-from-federal-agency-json' as url %} + {% url 'get-federal-and-portfolio-types-from-federal-agency-json' as url %} + {{ block.super }} {% endblock content %} @@ -34,8 +36,8 @@ -

- HELLO: {{ original.requested_domain.name }} +

+ Organization Name: {{ original.organization_name }}

{{ block.super }}
From e59cb9ae7d11d927f3e1a024fc1be0030c220a8b Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Fri, 30 Aug 2024 12:05:56 -0400 Subject: [PATCH 4/8] Hotfix JS for edit email button not found --- src/registrar/assets/js/get-gov-admin.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js index 24f020b75..20a085f83 100644 --- a/src/registrar/assets/js/get-gov-admin.js +++ b/src/registrar/assets/js/get-gov-admin.js @@ -530,6 +530,8 @@ function initializeWidgetOnList(list, parentId) { let emailWasSent = document.getElementById("action-needed-email-sent"); let lastSentEmailText = document.getElementById("action-needed-email-last-sent-text"); + var editEmailButton = document.getElementById('email-already-sent-modal_continue-editing-button'); + // Get the list of e-mails associated with each action-needed dropdown value let emailData = document.getElementById('action-needed-emails-data'); if (!emailData) { From 29a6a53fbeeeddb64a1b94be6b4c9a53b571bf46 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Fri, 30 Aug 2024 12:32:09 -0400 Subject: [PATCH 5/8] Remove redundant code --- src/registrar/assets/js/get-gov-admin.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/registrar/assets/js/get-gov-admin.js b/src/registrar/assets/js/get-gov-admin.js index 20a085f83..b24e946dc 100644 --- a/src/registrar/assets/js/get-gov-admin.js +++ b/src/registrar/assets/js/get-gov-admin.js @@ -519,7 +519,6 @@ function initializeWidgetOnList(list, parentId) { var actionNeededEmailReadonlyTextarea = document.querySelector("#action-needed-reason-email-readonly-textarea") // Edit e-mail modal (and its confirmation button) - var actionNeededEmailAlreadySentModal = document.querySelector("#email-already-sent-modal") var confirmEditEmailButton = document.querySelector("#email-already-sent-modal_continue-editing-button") // Headers and footers (which change depending on if the e-mail was sent or not) @@ -530,8 +529,6 @@ function initializeWidgetOnList(list, parentId) { let emailWasSent = document.getElementById("action-needed-email-sent"); let lastSentEmailText = document.getElementById("action-needed-email-last-sent-text"); - var editEmailButton = document.getElementById('email-already-sent-modal_continue-editing-button'); - // Get the list of e-mails associated with each action-needed dropdown value let emailData = document.getElementById('action-needed-emails-data'); if (!emailData) { @@ -563,11 +560,11 @@ function initializeWidgetOnList(list, parentId) { updateActionNeededEmailDisplay(reason) }); - editEmailButton.addEventListener("click", function() { - if (!checkEmailAlreadySent()) { - showEmail(canEdit=true) - } - }); + // editEmailButton.addEventListener("click", function() { + // if (!checkEmailAlreadySent()) { + // showEmail(canEdit=true) + // } + // }); confirmEditEmailButton.addEventListener("click", function() { // Show editable view From 2eef22f8956634e390156ce28bc393fd3ab28dd4 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Fri, 30 Aug 2024 11:18:45 -0700 Subject: [PATCH 6/8] Update function name --- .../templates/django/admin/includes/detail_table_fieldset.html | 2 +- src/registrar/templatetags/custom_filters.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html index 65591dc03..1c1a7c2a9 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -330,7 +330,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% endif %} {% endwith %} - {% elif field.field.name == "state_territory" and original_object|model_name != 'portfolio' %} + {% elif field.field.name == "state_territory" and original_object|model_name_lowercase != 'portfolio' %}
CISA region: diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py index b59363589..3926f1108 100644 --- a/src/registrar/templatetags/custom_filters.py +++ b/src/registrar/templatetags/custom_filters.py @@ -172,5 +172,5 @@ def has_contact_info(user): @register.filter -def model_name(instance): +def model_name_lowercase(instance): return instance.__class__.__name__.lower() From 1792e3c0d8ad10b49f67fe8cfc7e9242db21186d Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:39:48 -0600 Subject: [PATCH 7/8] fix bug --- src/registrar/fixtures_users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/fixtures_users.py b/src/registrar/fixtures_users.py index 8be3e13a2..1b8eda9ab 100644 --- a/src/registrar/fixtures_users.py +++ b/src/registrar/fixtures_users.py @@ -295,7 +295,7 @@ class UserFixture: logger.warning(f"Could not add email to whitelist for {first_name} {last_name}.") # Load additional emails - allowed_emails.extend(additional_emails) + allowed_emails.extend([AllowedEmail(email=email) for email in additional_emails]) if allowed_emails: AllowedEmail.objects.bulk_create(allowed_emails) From ff00d564de86b4cbd7b95530930934eb9b23b4f2 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 3 Sep 2024 14:01:30 -0600 Subject: [PATCH 8/8] Update allowed_email_description.html --- .../admin/includes/descriptions/allowed_email_description.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html b/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html index 5ec5a4906..602935ab7 100644 --- a/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html +++ b/src/registrar/templates/django/admin/includes/descriptions/allowed_email_description.html @@ -1,4 +1,4 @@ -

This table is an email whitelist for non-production environments.

+

This table is an email allow list for non-production environments.

If an email is sent out and the email does not exist within this table (or is not a subset of it), then no email will be sent.