Merge pull request #3013 from uw-it-aca/qa

Qa

myuw/data/category_links_import.csv

@@ -7,7 +7,7 @@ PageAcademics,Online Learning,all,,,,,,,https://www.tacoma.uw.edu/uwt/digital-le
 PageAcademics,Online Learning,all,,,,,,,https://www.tacoma.uw.edu/teaching-learning-center/teaching-learning-center,Teaching and Learning Center,no,,,,,,,,,,,,,
 PageAcademics,Online Learning,all,,,,,,,https://www.tacoma.uw.edu/uwt/it/equipment-checkout,Equipment Checkout,no,,,,,,,,,,,,,
 PageAcademics,Registration,all,https://registrar.washington.edu/enrollment-and-degree-verification/,Self-Service Enrollment Verification,,,,,,,no,,,,,,,,,,,,,
-PageAcademics,Registration,all,,,https://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,https://www.uwb.edu/registration/time,UW Bothell Time Schedule,https://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no,,,,,,,,,,,,,
+PageAcademics,Registration,all,,,https://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,https://www.uwb.edu/registrar/time,UW Bothell Time Schedule,https://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no,,,,,,,,,,,,,
 PageAcademics,Registration,pce,https://www.washington.edu/students/timeschd/95index.html,Professional & Continuing Education Time Schedule,,,,,,,no,,,,,,,,,,,,,
 PageAcademics,Registration,all,,,http://www.washington.edu/students/crscat/,Course Catalog,https://www.washington.edu/students/crscatb/,Course Catalog,https://www.washington.edu/students/crscatt/,Course Catalog,no,,,,,,,,,,,,,
 PageAcademics,Registration,all,https://myplan.uw.edu/audit/#/degree,Degree Audit (DARS),,,,,,,yes,,,,,,,,,,,,,
@@ -18,11 +18,11 @@ PageAcademics,Registration,all,https://notify.uw.edu/,Notify.UW,,,,,,,yes,,,,,,,
 PageAcademics,Registration,all,http://dawgpath.uw.edu,DawgPath,,,,,,,yes,,,,,,,,,,,,,
 PageAcademics,Tutoring & Advising,ugrad,,,http://depts.washington.edu/aspuw/clue/home/,Center for Learning and Undergraduate Enrichment (CLUE),,,https://www.tacoma.uw.edu/teaching-learning-center/teaching-learning-center,Teaching and Learning Center,no,,,,,,,,,,,,,
 PageAcademics,Tutoring & Advising,all,,,https://iss.washington.edu/,International Student Services (ISS),https://www.uwb.edu/international-student-services/,International Student Services (ISS),https://www.tacoma.uw.edu/oga/isss,International Student & Scholar Services,no,,,,,,,,,,,,,
-PageAcademics,Tutoring & Advising,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,http://www.uwb.edu/wacc,Writing and Communication Center (WaCC),,,no,,,,,,,,,,,,,
+PageAcademics,Tutoring & Advising,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,https://www.uwb.edu/academic-support-programs/wacc,Writing and Communication Center (WaCC),,,no,,,,,,,,,,,,,
 PageAcademics,Tutoring & Advising,all,,,,,,,https://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources-0,Academic Writing Resources,no,,,,,,,,,,,,,
 PageAcademics,Tutoring & Advising,ugrad,,,http://www.washington.edu/uaa/advising/,Undergraduate Academic Advising (Pre-major),https://www.uwb.edu/premajor/academic-advising,Undergraduate Academic Advising (Pre-major),http://www.tacoma.uw.edu/advising,Undergraduate Academic Advising (Pre-major),no,,,,,,,,,,,,,
 PageAcademics,Tutoring & Advising,all,,,http://studyabroad.washington.edu/,Study Abroad,https://www.uwb.edu/connected-learning/global/abroad,Study Abroad,https://www.tacoma.uw.edu/oga/sa,Study Abroad,no,,,,,,,,,,,,,
-PageAcademics,Tutoring & Advising,all,,,http://careers.uw.edu/,Career & Internship Center,https://www.uwb.edu/careers,Career Services,https://www.tacoma.uw.edu/uwt/career,Career Development and Education,no,,,,,,,,,,,,,
+PageAcademics,Tutoring & Advising,all,,,http://careers.uw.edu/,Career & Internship Center,https://www.uwb.edu/career-services/,Career Services,https://www.tacoma.uw.edu/uwt/career,Career Development and Education,no,,,,,,,,,,,,,
 PageAcademics,Grades & Transcripts,all,https://www.washington.edu/uaa/advising/grades-credits/gpa-calculator/,GPA Calculator,,,,,,,no,,,,,,,,,,,,,
 PageAcademics,Grades & Transcripts,all,https://sdb.admin.uw.edu/sisStudents/uwnetid/grades.aspx,Grade Report,,,,,,,yes,,,,,,,,,,,,,
 PageAcademics,Grades & Transcripts,all,https://apps.registrar.washington.edu/credential_solutions_authentication/public/ce.php,Order Official Transcripts,,,,,,,yes,,,,,,,,,,,,,

myuw/data/links.json

@@ -12,7 +12,7 @@
     {
 	"id":11,
         "title":"Campus Map - Bothell",
-        "url":"http://www.uwb.edu/getattachment/visitors/campus-map.pdf",
+        "url":"https://www.uwb.edu/wp-content/uploads/2023/09/uw-bothell-campus-map.pdf",
         "on_for_employees":true,
         "on_for_undergrad":true,
         "on_for_gradstudent":true,
@@ -172,7 +172,7 @@
     {
 	"id":101,
         "title":"Time Schedule - Bothell",
-        "url":"http://www.uwb.edu/registration/time",
+        "url":"https://www.uwb.edu/registrar/time",
         "on_for_employees":false,
         "on_for_undergrad":true,
         "on_for_gradstudent":true,

myuw/data/quicklinks.csv

@@ -9,7 +9,7 @@ https://sdb.admin.uw.edu/sisStudents/uwnetid/grades.aspx,Grade Report,,student,
 https://wd5.myworkday.com/uw/login.htmld,Workday,,employee,
 https://sdb.admin.uw.edu/students/uwnetid/register.asp,Register using SLN codes,,student,
 https://sdb.admin.uw.edu/sisStudents/uwnetid/finaidstatus.aspx,Financial Aid Status,,student,
-https://www.uwb.edu/registration/time,Time Schedule - Bothell,bothell,student,
+https://www.uwb.edu/registrar/time,Time Schedule - Bothell,bothell,student,
 http://www.washington.edu/students/timeschd/,Time Schedule - Seattle,seattle,student,
 http://www.washington.edu/students/timeschd/T/,Time Schedule - Tacoma,tacoma,student,
 http://www.washington.edu/students/timeschd/95index.html,Time Schedule - PCE,,student,yes
@@ -49,5 +49,5 @@ http://www.tacoma.uw.edu/news/news-information,UW Tacoma News,,past_stud,
 http://www.tacoma.uw.edu/news/news-information,UW Tacoma News,,past_stud,
 https://teaching.washington.edu/topics/,Teaching Strategies,,instructor,
 http://webster.uaa.washington.edu/asp/website/online-learning/,Online Learning Resources,seattle,student,
-https://www.uwb.edu/it/student-continuity,Student Help for Learning Online,bothell,student,
+https://www.uwb.edu/it/learning,Learn Anywhere,bothell,student,
 https://www.tacoma.uw.edu/digital-learning/student-online-support,Online Learning Support,tacoma,student,

myuw/data/resource_link_import.csv

@@ -3,7 +3,7 @@ Academics,Advising & Tutoring,all,,,http://careers.uw.edu/,Career & Internship C
 Academics,Advising & Tutoring,all,https://careers.uw.edu/graduate-students/,Career & Internship Center - Graduate Student Resources,,,,,,,no
 Academics,Advising & Tutoring,all,,,https://webster.uaa.washington.edu/asp/website/,Center for Learning and Undergraduate Enrichment (CLUE),https://webster.uaa.washington.edu/asp/website/,Center for Learning and Undergraduate Enrichment (CLUE),http://www.tacoma.uw.edu/teaching-learning-center/teaching-learning-center,Teaching and Learning Center,no
 Academics,Advising & Tutoring,all,,,http://iss.washington.edu/,International Student Services (ISS),https://www.uwb.edu/international-student-services/,International Student Services (ISS),https://www.tacoma.uw.edu/oga/isss,International Student Services (ISS),no
-Academics,Advising & Tutoring,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,http://www.uwb.edu/wacc,Writing and Communication Center (WaCC),https://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources,Writing Center,no
+Academics,Advising & Tutoring,all,,,http://depts.washington.edu/owrc,Odegaard Writing & Research Center,https://www.uwb.edu/academic-support-programs/wacc,Writing and Communication Center (WaCC),https://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources,Writing Center,no
 Academics,Advising & Tutoring,all,,,,,,,http://www.tacoma.uw.edu/teaching-and-learning-center/writing-resources-0,Academic Writing Resources,no
 Academics,Advising & Tutoring,all,,,http://www.washington.edu/uaa/advising/,Undergraduate Academic Advising (Pre-major),https://www.uwb.edu/premajor/academic-advising,Undergraduate Academic Advising (Pre-major),https://www.tacoma.uw.edu/advising,Undergraduate Academic Advising (Pre-major),no
 Academics,Advising & Tutoring,all,,,http://studyabroad.washington.edu/,Study Abroad,https://www.uwb.edu/connected-learning/global/abroad,Study Abroad,https://www.tacoma.uw.edu/oga/sa,Study Abroad,no
@@ -22,7 +22,7 @@ Academics,Registration,all,https://notify.uw.edu/,Notify.UW,,,,,,,no
 Academics,Registration,all,http://dawgpath.uw.edu,DawgPath,,,,,,,no
 Academics,Registration,all,https://sdb.admin.uw.edu/students/uwnetid/register.asp,Registration,,,,,,,no
 Academics,Registration,all,,,https://sdb.admin.uw.edu/timeschd/uwnetid/findschd.asp,Schedule Finder,https://sdb.admin.uw.edu/timeschd/uwnetid/findschd.asp,Schedule Finder,,,no
-Academics,Registration,all,,,http://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,http://www.uwb.edu/registration/time,UW Bothell Time Schedule,http://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no
+Academics,Registration,all,,,http://www.washington.edu/students/timeschd/,UW Seattle Time Schedule,https://www.uwb.edu/registrar/time,UW Bothell Time Schedule,http://www.tacoma.uw.edu/ts-quicksearch/,UW Tacoma Time Schedule,no
 Academics,Registration,all,http://www.washington.edu/students/timeschd/95index.html,Professional & Continuing Education (PCE) Time Schedule,,,,,,,no
 Academics,Registration,all,https://www.degreereg.uw.edu/user-guide,How to Register for PCE Courses,,,,,,,no
 Academics,Tools and Software,all,http://canvas.uw.edu/,Canvas LMS,,,,,,,no
@@ -66,11 +66,11 @@ Campus Life,Campus Safety,all,http://www.washington.edu/safecampus/,SafeCampus,,
 Campus Life,Campus Safety,all,,,https://www.ehs.washington.edu/,Environmental Health & Safety,https://www.uwb.edu/safety/ehs-emergency/environment-health-safety,Environmental Health & Safety,https://www.tacoma.uw.edu/fa/environmental-health-safety,Environmental Health & Safety,no
 Campus Life,Campus Safety,all,https://cspc.admin.uw.edu/mychem,MyChem,,,,,,,no
 Campus Life,Campus Safety,all,,,https://www.washington.edu/uwem/,UW Emergency Management,https://www.uwb.edu/emergency,UW Bothell Emergency Page,https://www.tacoma.uw.edu/fa/safety/emergency-preparedness,UW Tacoma Emergency Response,no
-Campus Life,Getting Around Campus,all,,,http://www.washington.edu/maps/,Campus Map,https://www.uwb.edu/wp-content/uploads/2023/04/uw-bothell-campus-map.pdf,Campus Map,http://www.tacoma.uw.edu/campus-map/campus-map,Campus Map,no
+Campus Life,Getting Around Campus,all,,,http://www.washington.edu/maps/,Campus Map,https://www.uwb.edu/wp-content/uploads/2023/09/uw-bothell-campus-map.pdf,Campus Map,http://www.tacoma.uw.edu/campus-map/campus-map,Campus Map,no
 Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/park-directions,Getting to Seattle Campus,http://www.uwb.edu/visitors/directions,Getting to UW Bothell Campus,https://www.tacoma.uw.edu/fa/facilities/transportation/parking-and-transportation-resources#permalink-19448,Getting to UW Tacoma Campus,no
 Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/student-u-pass,U-PASS for Students,https://www.uwb.edu/commuter-services/transportation/upass,U-PASS,https://www.tacoma.uw.edu/uwt/fa/facilities/transportation/u-pass,U-PASS,no
 Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/employee-u-pass,U-PASS for Employees,,,,,no
-Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/,Transportation Services,https://www.uwb.edu/administration-planning/facilities/transportation,Commuter Services,https://www.tacoma.uw.edu/fa/facilities/transportation,Transportation Services,no
+Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/,Transportation Services,https://www.uwb.edu/commuter-services/,Commuter Services,https://www.tacoma.uw.edu/fa/facilities/transportation,Transportation Services,no
 Campus Life,Getting Around Campus,all,,,http://uwshuttles.com/,UW Shuttles,,,,,no
 Campus Life,Health & Wellness,all,https://wellbeing.uw.edu/,Husky Health & Well-Being,,,,,,,no
 Campus Life,Health & Wellness,all,,,http://www.washington.edu/counseling/,Counseling Center,https://www.uwb.edu/student-affairs/counseling,Counseling Services,https://www.tacoma.uw.edu/uwt/caps,Counseling & Psychological Services,no

myuw/views/notice_admin.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import logging
-import bleach
+import nh3
 import traceback
 import unicodedata
 from django.shortcuts import render, redirect
@@ -17,13 +17,13 @@
 from myuw.views import set_admin_wrapper_template
 
 logger = logging.getLogger(__name__)
-ALLOWED_TAGS = [
+ALLOWED_TAGS = {
     'b', 'br', 'em', 'p', 'span', 'a', 'img', 'i', 'li', 'ol', 'strong', 'ul'
-]
+}
 ALLOWED_ATTS = {
-    '*': ['class'],
-    'a': ['href', 'rel', 'title'],
-    'img': ['alt']
+    '*': {'class', 'style', 'title'},
+    'a': {'href', 'rel'},
+    'img': {'alt'}
 }
 
 
@@ -272,8 +272,9 @@ def _get_integer(str):
 
 def _get_html(value):
     try:
-        content = bleach.clean(
-            value, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTS)
+        content = nh3.clean(
+            value, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTS,
+            link_rel=None)
         return unicodedata.normalize("NFKD", content).strip()
         # MUWM-5092
     except TypeError as ex:

myuw_vue/components/accounts/upass.vue

@@ -123,28 +123,28 @@ export default {
     },
     getPurchaseUrl() {
       return this.bothell
-        ? 'https://www.uwb.edu/facilities/commuter-services/transportation/upass#Purchase/Cancel%20%20U-Pass'
+        ? 'https://www.uwb.edu/commuter-services/transportation/upass'
         : 'https://www.pce.uw.edu/help/registration-costs/costs-and-fees';
     },
     getWhatIsUrl() {
       return this.tacoma
         ? 'https://www.tacoma.uw.edu/fa/facilities/transportation/u-pass-benefits'
         : this.bothell
-          ? 'https://www.uwb.edu/facility/commuter-services/transportation/upass#What%20the%20U-PASS%20covers'
+          ? 'https://www.uwb.edu/commuter-services/transportation/upass'
           : 'https://transportation.uw.edu/getting-here/transit/u-pass';
     },
     getSummerPurchaseUrl() {
       return this.tacoma
         ? 'https://www.tacoma.uw.edu/fa/facilities/transportation/universal-u-pass'
         : this.bothell
-          ? 'https://www.uwb.edu/facilities/commuter-services/transportation/upass#Purchase/Cancel%20%20U-Pass'
+          ? 'https://www.uwb.edu/commuter-services/transportation/upass'
           : 'https://transportation.uw.edu/getting-here/transit/u-pass#u-pass-students';
     },
     getEmployeePurchaseUrl(){
       return this.tacoma
         ? 'https://www.tacoma.uw.edu/fa/facilities/transportation/employee-u-pass-order-form'
         : this.bothell
-          ? 'https://www.uwb.edu/facility/commuter-services/transportation/upass'
+          ? 'https://www.uwb.edu/commuter-services/transportation/upass'
           : 'https://transportation.uw.edu/getting-here/transit/u-pass';
     }
   },

myuw_vue/components/home/applicant/bothell.vue

@@ -39,7 +39,7 @@
         <li>
           You will then register beginning with Registration Period II for your returning quarter.
           Check dates on the
-          <a href="http://www.uwb.edu/calendars">Academic Calendar</a>.
+          <a href="https://www.uwb.edu/academic-calendar/">Academic Calendar</a>.
         </li>
       </ul>
 
@@ -53,7 +53,7 @@
           </a>
         </li>
         <li class="mb-1">
-          <a v-out="'UW Bothell Student Resources'" href="http://www.uwb.edu/studentaffairs">
+          <a v-out="'UW Bothell Student Resources'" href="https://www.uwb.edu/student-affairs/">
             Check out the student resources for student life, career services, and more
           </a>
         </li>

myuw_vue/components/home/former_student/transcripts.vue

@@ -38,8 +38,8 @@
            >Contact the UW Registrar</a>
         </li>
         <li class="mb-1">
-          <a v-out="'UW Bothell Registrar'" href="https://www.uwb.edu/registration"
-           >Contact th UW Bothell Registrar</a>
+          <a v-out="'UW Bothell Registrar'" href="https://www.uwb.edu/registrar/"
+           >Contact the UW Bothell Registrar</a>
         </li>
         <li>
           <a v-out="'UW Tacoma Registrar'"

myuw_vue/components/home/graduation/application-submitted.vue

@@ -91,14 +91,15 @@
               </li>
               <li v-if="bothell">
                 Get all the details on
-                <a href="https://www.uwb.edu/registration/graduation">
+                <a href="https://www.uwb.edu/registrar/graduation">
                   UW Bothell’s Graduation, Diplomas, and Commencement page</a
                 >.
               </li>
               <li v-if="bothell && intlStudent">
-                International students, may find
-                <a href="https://www.uwb.edu/cie/alumni"> additional graduation guidance </a> at the
-                Center for International Education.
+                International students, may find additional graduation guidance about
+                <a href=
+                "https://www.uwb.edu/international-student-services/optional-practical-training-opt">
+                 Optional Practical Training (OPT)</a>.
               </li>
               <li v-if="tacoma">
                 Review the
@@ -216,7 +217,7 @@
             <ul class="list-style myuw-text-md">
               <li v-if="bothell">
                 Find out how to
-                <a href="https://www.uwb.edu/registration/enrollment-verify"
+                <a href="https://www.uwb.edu/registrar/enrollment-verify#degree-certification"
                   >provide degree certification</a
                 >
                 to other parties.
@@ -363,7 +364,7 @@
             - career consulting
           </li>
           <li v-if="bothell">
-            <a href="https://www.uwb.edu/careers">Career and Internship Center</a>
+            <a href="https://www.uwb.edu/career-services/">Career Services</a>
             - career consulting
           </li>
           <li v-if="tacoma">
@@ -388,7 +389,7 @@
             your future or anything else, connect with a counselor.
           </li>
           <li v-if="bothell">
-            <a href="https://www.uwb.edu/studentaffairs/counseling">Counseling Center</a>
+            <a href="https://www.uwb.edu/student-affairs/counseling">Counseling Center</a>
             - If you are anxious about your future or need someone compassionate to talk to about
             your future or anything else, connect with a counselor.
           </li>

myuw_vue/components/home/graduation/pre-application.vue

@@ -56,15 +56,16 @@
         </p>
         <p v-if="bothell" class="myuw-text-md">
           <strong>Get all the details on
-          <a href="https://www.uwb.edu/registration/graduation">
+          <a href="https://www.uwb.edu/registrar/graduation">
             UW Bothell’s Graduation, Diplomas, and Commencement page</a>.
           </strong>
         </p>
         <p v-if="bothell && intlStudent" class="myuw-text-md">
-          International students, may find
-          <a href="https://www.uwb.edu/cie/alumni">
-            additional graduation guidance
-          </a> at the Center for International Education.
+          International students, may find additional graduation guidance about
+          <a href=
+          "https://www.uwb.edu/international-student-services/optional-practical-training-opt">
+            Optional Practical Training (OPT)
+          </a>.
         </p>
         <p v-if="seattle && intlStudent" class="myuw-text-md">
           International students, review the