From 964bd347051974ffe44720500a1b84cc45b2f194 Mon Sep 17 00:00:00 2001 From: Fang Lin Date: Wed, 10 Jul 2024 12:52:45 -0700 Subject: [PATCH] Feat/muwm 5342 (#3124) MUWM-5342: enhance support page --- .github/workflows/cicd.yml | 3 +- docker/settings.py | 12 +- docker/urls.py | 2 +- myuw/data/quicklinks.csv | 6 +- myuw/data/resource_link_import.csv | 2 +- .../restclients/customform/_common/netid.html | 2 +- .../restclients/customform/_common/regid.html | 4 +- .../restclients/customform/book/iacourse.html | 9 - .../grad/services/students/v1/api/id.html | 4 +- .../customform/iasystem/evaluation.html | 4 +- .../restclients/customform/myplan/index.html | 2 +- .../restclients/customform/sws/advisers.html | 11 -- .../restclients/customform/sws/course.html | 43 +++++ .../restclients/customform/sws/degree.html | 13 -- .../restclients/customform/sws/notices.html | 12 -- .../restclients/customform/sws/student.html | 41 +++++ .../supporttools/custom_sidebar_links.html | 91 +++++----- myuw/test/views/test_rest_search.py | 161 +++++++++++++++++- myuw/views/rest_search.py | 108 +++++++++--- package.json | 8 +- setup.py | 4 +- 21 files changed, 393 insertions(+), 149 deletions(-) delete mode 100644 myuw/templates/restclients/customform/sws/advisers.html create mode 100644 myuw/templates/restclients/customform/sws/course.html delete mode 100644 myuw/templates/restclients/customform/sws/degree.html delete mode 100644 myuw/templates/restclients/customform/sws/notices.html create mode 100644 myuw/templates/restclients/customform/sws/student.html diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index eb95dc453b..404ffc650d 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -159,7 +159,7 @@ jobs: runs-on: ubuntu-22.04 container: - image: node:14.6.0-stretch + image: node:20 steps: - name: Checkout Repo @@ -183,6 +183,7 @@ jobs: container: image: cypress/browsers:node14.16.0-chrome90-ff88 + # this image works. later images failed steps: - name: Checkout Repo diff --git a/docker/settings.py b/docker/settings.py index e39df8196e..46cb8208ed 100644 --- a/docker/settings.py +++ b/docker/settings.py @@ -10,15 +10,15 @@ INSTALLED_APPS += [ 'uw_oidc', - 'compressor', - 'django_client_logger', 'django_user_agents', - 'hx_toolkit', - 'persistent_message', - 'rc_django', - 'userservice', 'supporttools', + 'userservice', + 'rc_django', # after supporttools + 'persistent_message', 'blti', + 'hx_toolkit', + 'compressor', + 'django_client_logger', 'myuw.apps.MyUWConfig', 'webpack_loader', ] diff --git a/docker/urls.py b/docker/urls.py index 5054d1808c..8a5e4cf759 100644 --- a/docker/urls.py +++ b/docker/urls.py @@ -6,9 +6,9 @@ urlpatterns += [ + re_path(r'^', include('myuw.urls')), re_path(r'^support', include('userservice.urls')), re_path(r'^restclients/', include('rc_django.urls')), re_path(r'^persistent_message/', include('persistent_message.urls')), re_path(r'^logging/', include('django_client_logger.urls')), - re_path(r'^', include('myuw.urls')), ] diff --git a/myuw/data/quicklinks.csv b/myuw/data/quicklinks.csv index 00537a6c51..6cc5725b3b 100644 --- a/myuw/data/quicklinks.csv +++ b/myuw/data/quicklinks.csv @@ -15,11 +15,11 @@ http://www.washington.edu/students/timeschd/T/,Time Schedule - Tacoma,tacoma,stu http://www.washington.edu/students/timeschd/95index.html,Time Schedule - PCE,,student,yes https://wellbeing.uw.edu/,Husky Health & Well-Being,seattle,student, https://scout.uw.edu,Scout,,student, -https://gsuite.google.com/dashboard,Google Apps,,student, +https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,student, https://www.office.com/,Office 365 Apps,,student, -https://gsuite.google.com/dashboard,Google Apps,,faculty, +https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,faculty, https://www.office.com/,Office 365 Apps,,faculty, -https://gsuite.google.com/dashboard,Google Apps,,employee, +https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,employee, https://www.office.com/,Office 365 Apps,,employee, https://washington.zoom.us/,Zoom,,, https://uwnetid.washington.edu/manage/?forward,Email Forwarding,,alumni, diff --git a/myuw/data/resource_link_import.csv b/myuw/data/resource_link_import.csv index 05319fcb50..cf68dbf2a8 100644 --- a/myuw/data/resource_link_import.csv +++ b/myuw/data/resource_link_import.csv @@ -37,7 +37,7 @@ Academics,Tools and Software,all,https://uw.hosted.panopto.com/,Panopto Lecture Academics,Tools and Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Other Software and Hardware Services,,,,,,,no Academics,Tools and Software,all,https://itconnect.uw.edu/learn/tools/,Help with Teaching and Learning Tools,,,,,,,no Academics,Tools and Software,all,http://www.linkedinlearning.uw.edu/,LinkedIn Learning,,,,,,,no -Academics,Tools and Software,all,https://gsuite.google.com/dashboard,Google Apps,,,,,,,no +Academics,Tools and Software,all,https://itconnect.uw.edu/tools-services-support/software-computers/productivity-platforms/google-productivity-platform/,Google Apps,,,,,,,no Academics,Tools and Software,all,https://www.office.com/,Office 365 Apps,,,,,,,no "Email, and Accounts and Identity",Email,all,https://outlook.office365.com/uw.edu,UW Office 365 Email,,,,,,,no "Email, and Accounts and Identity",Email,all,http://mail.google.com/a/uw.edu,UW Gmail,,,,,,,no diff --git a/myuw/templates/restclients/customform/_common/netid.html b/myuw/templates/restclients/customform/_common/netid.html index c86144e665..0e2909fc3f 100644 --- a/myuw/templates/restclients/customform/_common/netid.html +++ b/myuw/templates/restclients/customform/_common/netid.html @@ -2,7 +2,7 @@ {% csrf_token %}

- +

diff --git a/myuw/templates/restclients/customform/_common/regid.html b/myuw/templates/restclients/customform/_common/regid.html index 267b12a7d0..cdada96d6c 100644 --- a/myuw/templates/restclients/customform/_common/regid.html +++ b/myuw/templates/restclients/customform/_common/regid.html @@ -1,8 +1,8 @@

{% csrf_token %}

- - + +

diff --git a/myuw/templates/restclients/customform/book/iacourse.html b/myuw/templates/restclients/customform/book/iacourse.html index 8bd96f168b..556604658b 100644 --- a/myuw/templates/restclients/customform/book/iacourse.html +++ b/myuw/templates/restclients/customform/book/iacourse.html @@ -1,11 +1,2 @@

University Bookstore Inclusive Access Course Materials

{% include "restclients/customform/_common/regid.html" %} - -

Regids:

- diff --git a/myuw/templates/restclients/customform/grad/services/students/v1/api/id.html b/myuw/templates/restclients/customform/grad/services/students/v1/api/id.html index 490e7f7292..3fcd90ee38 100644 --- a/myuw/templates/restclients/customform/grad/services/students/v1/api/id.html +++ b/myuw/templates/restclients/customform/grad/services/students/v1/api/id.html @@ -1,4 +1,4 @@
- - + +
diff --git a/myuw/templates/restclients/customform/iasystem/evaluation.html b/myuw/templates/restclients/customform/iasystem/evaluation.html index 46113202d9..e196e67078 100644 --- a/myuw/templates/restclients/customform/iasystem/evaluation.html +++ b/myuw/templates/restclients/customform/iasystem/evaluation.html @@ -27,10 +27,10 @@

- +

- +

diff --git a/myuw/templates/restclients/customform/myplan/index.html b/myuw/templates/restclients/customform/myplan/index.html index 22612bea78..1488bea24d 100644 --- a/myuw/templates/restclients/customform/myplan/index.html +++ b/myuw/templates/restclients/customform/myplan/index.html @@ -2,7 +2,7 @@

MyPlan

{% csrf_token %}

- +

diff --git a/myuw/templates/restclients/customform/sws/advisers.html b/myuw/templates/restclients/customform/sws/advisers.html deleted file mode 100644 index 3a39b01f9f..0000000000 --- a/myuw/templates/restclients/customform/sws/advisers.html +++ /dev/null @@ -1,11 +0,0 @@ -

SWS Academic Advisers

-{% include "restclients/customform/_common/regid.html" %} - -

Regids:

- diff --git a/myuw/templates/restclients/customform/sws/course.html b/myuw/templates/restclients/customform/sws/course.html new file mode 100644 index 0000000000..ba5f8d6196 --- /dev/null +++ b/myuw/templates/restclients/customform/sws/course.html @@ -0,0 +1,43 @@ +

SWS Section

+ + + {% csrf_token %} +

+ For + + + and + + +

+

Find using (at least one of the following)

+ +
+

+ +

+
diff --git a/myuw/templates/restclients/customform/sws/degree.html b/myuw/templates/restclients/customform/sws/degree.html deleted file mode 100644 index 4662b92946..0000000000 --- a/myuw/templates/restclients/customform/sws/degree.html +++ /dev/null @@ -1,13 +0,0 @@ -

SWS Degree Status

-{% include "restclients/customform/_common/regid.html" %} - -

Regids:

- diff --git a/myuw/templates/restclients/customform/sws/notices.html b/myuw/templates/restclients/customform/sws/notices.html deleted file mode 100644 index da8e053305..0000000000 --- a/myuw/templates/restclients/customform/sws/notices.html +++ /dev/null @@ -1,12 +0,0 @@ -

SWS Student Notices

-{% include "restclients/customform/_common/regid.html" %} - -

Regids:

- diff --git a/myuw/templates/restclients/customform/sws/student.html b/myuw/templates/restclients/customform/sws/student.html new file mode 100644 index 0000000000..4b8c3f9cf6 --- /dev/null +++ b/myuw/templates/restclients/customform/sws/student.html @@ -0,0 +1,41 @@ +

SWS Student

+ +
+ {% csrf_token %} +

+ For + + +

+

Find any of the following:

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+

+ +

+
diff --git a/myuw/templates/supporttools/custom_sidebar_links.html b/myuw/templates/supporttools/custom_sidebar_links.html index c63ec7fd77..7ff298af14 100644 --- a/myuw/templates/supporttools/custom_sidebar_links.html +++ b/myuw/templates/supporttools/custom_sidebar_links.html @@ -33,21 +33,18 @@

Content Management

Web Services