From 3c871cd750517ca741d8b9216c23b7722028e8fb Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 26 Jul 2024 15:52:32 -0500 Subject: [PATCH 1/9] fix: RT-99514 unique state for suspended user (#472) * fix: RT-99514 suspended user needs unique state * fix: RT-99514 more specific error * fix: RT-99514 error should not be polite TACC portal designers often remind me that we should not say please or sorry or thank you. Jsut tell the user what happenned and what to do. * fix: RT-99514 unnecessary new line * fix: RT-99514 be a little nicer * Revert "fix: RT-99514 be a little nicer" This reverts commit 07039b01c6c06bb41a894d620c48df0de0008d8f. * fix: RT-99514 balanced message --- .../src/auth/LoginComponent/LoginComponent.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx index fb8340fa9..8cd02fff0 100644 --- a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx +++ b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx @@ -41,6 +41,21 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({ ); } + if (status === 451) { + return ( +
+ Your account has been suspended. Please{' '} + + request account support + + . +
+ ); + } return (
Sorry. Something went wrong while trying to log in. Please try again From 20b334f34210efee11e3fc0fcdb0fd4301656e71 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:50:28 -0500 Subject: [PATCH 2/9] fix: tup-715 save patch fix of subdomain link ugly URLs (#468) * fix: tup-715 ugly urls for subdomain links * docs: tup-715 explain code * docs: tup-715 more details about code * style: tup-715 better function name * fix: TUP-715 check link not doc Because doc is always tacc. Link is what may not be tacc. --- .../snippets/js-prevent-ugly-urls.html | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.html diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.html new file mode 100644 index 000000000..d7869244f --- /dev/null +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.html @@ -0,0 +1,23 @@ + From 64859a873ad5e1e5d6b9231e97db5b5351011f90 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:52:31 -0500 Subject: [PATCH 3/9] feat: save 2 css snippets (#459) * feat: save css-homepage-2024-02 snippet * fix: save css-banner-tacc bugfix * fix: incorrect location for comments and a11y css * docs: improve tacc banner height edit message * docs: kinder tacc banner height edit message --------- Co-authored-by: Jake Rosenberg --- .../templates/snippets/css-banner-tacc.html | 5 ++++- .../templates/snippets/css-global-a11y.html | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 apps/tup-cms/src/taccsite_cms/templates/snippets/css-global-a11y.html diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html index 6ef15a6d0..c24f48e9b 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html @@ -1,3 +1,6 @@ + From 437dc10a8c127b6c11731ac5a9fe9006c1360afb Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:55:21 -0500 Subject: [PATCH 4/9] chore: delete backup code for snippet I deleted (#456) I deleted this snippet yesterday from production CMS. - CMD lead writer and CMD website admin agreed to always show byline. - Hiding "by:" of byline is alreaedy applied via Core-CMS styles. Co-authored-by: Jake Rosenberg --- .../templates/snippets/css-news-hacks.html | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html deleted file mode 100644 index 74a2c14b2..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html +++ /dev/null @@ -1,15 +0,0 @@ - From 352cdfa4f8c8ff46adff9273cf07ea2aa2df2aff Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:12:47 -0500 Subject: [PATCH 5/9] chore: add missing setting (#455) The setting was inherited from Core-CMS, until: https://github.com/TACC/Core-CMS/commit/a8316ca Co-authored-by: Jake Rosenberg --- apps/tup-cms/src/taccsite_cms/settings_custom.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 04d9ddd6e..ce79a00cd 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -205,6 +205,7 @@ TACC_BLOG_CUSTOM_MEDIA_POST_CATEGORY = 'multimedia' TACC_BLOG_SHOW_ABSTRACT_TAG = 'external' +TACC_BLOG_CATEGORY_ORDER = ['press-release', 'feature-story', 'multimedia', 'podcast'] ######################## # TACC: CORE STYLES From e64429a3c700ec9f787c4ff1446f3c6876e81fbd Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Tue, 13 Aug 2024 08:45:16 -0700 Subject: [PATCH 6/9] Remove stampede2 and add Vista to ticket form (#473) --- .../src/tickets/TicketCreateModal/TicketCreateForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx b/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx index 47275671d..f1a704936 100644 --- a/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx +++ b/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx @@ -107,8 +107,8 @@ export const TicketCreateForm: React.FC = () => { - + From fead6d50c3d05663eda504f22dda4a2aa5c0da43 Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Tue, 13 Aug 2024 09:40:40 -0700 Subject: [PATCH 7/9] Quick: Remove DN management from account page (#474) * remove DN management from account page * linting --- .../src/accounts/ManageAccount.tsx | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/libs/tup-components/src/accounts/ManageAccount.tsx b/libs/tup-components/src/accounts/ManageAccount.tsx index bca12b5bd..adfa48afb 100644 --- a/libs/tup-components/src/accounts/ManageAccount.tsx +++ b/libs/tup-components/src/accounts/ManageAccount.tsx @@ -30,32 +30,6 @@ const ManageUser = () => ( ); -const ManageDNs = () => ( - -); - const ManageUpload = () => (

Identity Management

@@ -87,7 +61,6 @@ const ManageAccount: React.FC = () => {
-
From 4677d71bfd46d8cc0fac5cf2879e5af948a0a11f Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:40:32 -0500 Subject: [PATCH 8/9] fix: use DEFAULT_EMIAL_FROM not hard-coded e-mail (#479) --- apps/tup-cms/src/apps/portal/apps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/src/apps/portal/apps.py b/apps/tup-cms/src/apps/portal/apps.py index c61ae046e..ee5921fba 100644 --- a/apps/tup-cms/src/apps/portal/apps.py +++ b/apps/tup-cms/src/apps/portal/apps.py @@ -64,7 +64,7 @@ def send_confirmation_email(form_name, form_data): send_mail( f"TACC Form Submission Received: {form_name}", email_body, - "no-reply@tacc.utexas.edu", + settings.DEFAULT_FROM_EMAIL, [form_data["email"]], html_message=email_body) From 8d1816d7543b14b3c1fac617668867157b23403c Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Mon, 16 Sep 2024 17:01:48 -0500 Subject: [PATCH 9/9] Update form confirmation email and show requested tour info (#480) --- apps/tup-cms/src/apps/portal/apps.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/apps/portal/apps.py b/apps/tup-cms/src/apps/portal/apps.py index ee5921fba..6ec38d03b 100644 --- a/apps/tup-cms/src/apps/portal/apps.py +++ b/apps/tup-cms/src/apps/portal/apps.py @@ -44,6 +44,13 @@ def submit_ticket(form_data): def send_confirmation_email(form_name, form_data): + + tour_receipt = "" + if form_name == "Tour Request Form": + tour_receipt = "

A copy of your tour request is provided below for your records:

\n" + for key in form_data: + tour_receipt += f"

{key}: {form_data[key]}

\n" + email_body = f"""

Greetings,

@@ -51,11 +58,12 @@ def send_confirmation_email(form_name, form_data):

    -
  • For training registration requests, you will be contacted within one week to confirm registration. For additional help please contact Lauren Bruce (lbruce@tacc.utexas.edu).
    • +
  • For information about training opportunities, please visit the Training page, or contact Tabish Khan (tkhan@tacc.utexas.edu).
  • For tour requests, a tour coordinator will contact you within two business days to complete your reservation. For additional assistance please reach out to info@tacc.utexas.edu.
    • -
  • For all other issues, a TACC support person will be in contact shortly. For additional assistance please reach out to info@tacc.utexas.edu.
    • +
  • For additional assistance please reach out to info@tacc.utexas.edu.

+ {tour_receipt}

Thank you for your time,
TACC Support