uw-it-aca · fanglinfang · Jul 18, 2023 · Jul 12, 2023 · Jul 13, 2023 · Jul 17, 2023
diff --git a/cypress/fixtures/resources/all.json b/cypress/fixtures/resources/all.json
@@ -300,10 +300,6 @@
                     {
                         "title": "Office of Research Information Services (ORIS)",
                         "url": "https://www.washington.edu/research/oris/"
-                    },
-                    {
-                        "title": "MyFinancial.Desktop",
-                        "url": "http://ucs.admin.uw.edu/myfd"
                     }
                 ]
             },

diff --git a/myuw/data/resource_link_import.csv b/myuw/data/resource_link_import.csv
@@ -51,8 +51,10 @@ Services for Faculty and Staff,"HR, Payroll, and Benefits",all,http://isc.uw.edu
 Services for Faculty and Staff,"HR, Payroll, and Benefits",all,,,https://hr.uw.edu/benefits/,Benefits,https://www.uwb.edu/hr/benefits,Benefits,https://hr.uw.edu/benefits/,Benefits,no
 Services for Faculty and Staff,"HR, Payroll, and Benefits",all,http://isc.uw.edu/admin-corner,ISC Administrators' Corner,,,,,,,no
 Services for Faculty and Staff,"HR, Payroll, and Benefits",all,https://www.washington.edu/wholeu/,Whole U (for staff and faculty),,,,,,,no
-Services for Faculty and Staff,Procurement,all,https://finance.uw.edu/ps/how-to-buy/ariba,ARIBA,,,,,,,no
-Services for Faculty and Staff,Procurement,all,,,https://finance.uw.edu/ps/,Procurement Services,https://www.uwb.edu/finance/purchasing,Purchasing,https://www.tacoma.uw.edu/fa/finance/procurement,Procurement Services,no
+Services for Faculty and Staff,Finance and Procurement,all,"https://biportal.uw.edu	",Financial Reports (BI Portal),,,,,,,no
+Services for Faculty and Staff,Finance and Procurement,all,"https://uw.service-now.com/finance	","UW Connect Finance	",,,,,,,no
+Services for Faculty and Staff,Finance and Procurement,all,,,https://finance.uw.edu/ps/,Procurement Services,https://www.uwb.edu/finance/purchasing,Purchasing,https://www.tacoma.uw.edu/fa/finance/procurement,Procurement Services,no
+Services for Faculty and Staff,Finance and Procurement,all,"http://wd5.myworkday.com/uw/login.htmld	",Workday,,,,,,,no
 Services for Faculty and Staff,Others,all,http://registrar.washington.edu/staffandfaculty/electronic-academic-records-system-ears,Electronic Advising Records System (EARS),,,,,,,no
 Services for Faculty and Staff,Others,all,,,https://itconnect.uw.edu/,IT Connect,https://www.uwb.edu/it,Information Technologies,https://www.tacoma.uw.edu/uwt/it,Information Technology,no
 Services for Faculty and Staff,Others,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Software and Hardware,,,,,,,

diff --git a/myuw/templates/500.html b/myuw/templates/500.html
@@ -3,10 +3,14 @@
 {% block body_content %}
 <!-- content container -->
 <h1 class="h3 my-4">Unable to Load Page - Error 500</h1>
-  <p>A server error has occurred. You don't have permission to access this page.</p>
   <p>
-   Contact
-  <a href="mailto:help@uw.edu?subject=MyUW%20Unable%20to%20Load%20Page%20-%20Error%20500&body=Hello,%0A%0A%3CInclude%20your%20comment%20or%20question%20about%20MyUW%20here%3e%0A%0A%0A%0ANetID%3A%20">help@uw.edu</a>
-   with any questions.
+    A server error has occurred.
+    We are aware of the issue and are working on it.
+    Please try again in a few minutes.
+  </p>
+  <p>
+    Contact
+    <a href="mailto:help@uw.edu?subject=MyUW%20Unable%20to%20Load%20Page%20-%20Error%20500&body=Hello,%0A%0A%3CInclude%20your%20comment%20or%20question%20about%20MyUW%20here%3e%0A%0A%0A%0ANetID%3A%20">help@uw.edu</a>
+    with any questions.
   </p>
 {% include "_common/direct-links.html" %} {% endblock body_content %}
diff --git a/myuw/templates/543.html b/myuw/templates/543.html
@@ -3,7 +3,7 @@
 {% block body_content %}
 <!-- content container -->
 <h1 class="h3 my-4">An Error Has Occurred - Error 543</h1>
-  <p>A data error has occurred. Please try again in a few minutes. </p>
+  <p>A data error has occurred. Please try again in a few minutes.</p>
   <p>
   Contact
   <a href="mailto:help@uw.edu?subject=MyUW%20An%20Error%20Has%20Occurred20-%20Error%20543&body=Hello,%0A%0A%3CInclude%20your%20comment%20or%20question%20about%20MyUW%20here%3e%0A%0A%0A%0ANetID%3A%20">help@uw.edu</a>

diff --git a/myuw/templates/_common/direct-links.html b/myuw/templates/_common/direct-links.html
@@ -76,7 +76,6 @@
       >Husky Card Account</a
     >
   </li>
-  <li><a href="http://ucs.admin.uw.edu/myfd/" target="_blank">MyFinancial.desktop</a></li>
   <li>
     <a href="http://www.washington.edu/home/peopledir/" target="_blank"
       >Faculty/Staff/Student Directory</a

diff --git a/myuw_vue/components/_common/outage.vue b/myuw_vue/components/_common/outage.vue
@@ -70,10 +70,6 @@
           <a href="https://wd5.myworkday.com/uw/d/home.htmld"
           >Workday</a>
         </li>
-        <li v-if="isEmployee && !isAcademicsPage" class="mb-1">
-          <a href="http://ucs.admin.uw.edu/myfd/"
-          >MyFinancial.desktop</a>
-        </li>
       </ul>
     </template>
   </uw-card>

diff --git a/myuw_vue/components/home/graduation/pre-application.vue b/myuw_vue/components/home/graduation/pre-application.vue
@@ -127,15 +127,21 @@ export default {
     }),
     ...mapState('profile', {
       degreeStatus: (state) => state.value.degree_status,
+      termMajors: (state) => state.value.term_majors,
     }),
     curSenior() {
       return (this.classLevel === 'SENIOR');
     },
+    declaredMajor() {
+      // MUWM-5278
+      return !this.noDeclaredMajor(this.termMajors);
+    },
     showCard() {
       return (this.curSenior && (this.isFetching || this.showContent));
     },
     showContent() {
-      return (this.isReady && this.degreeStatus && this.degreeStatus.error_code === 404);
+      return (this.isReady && this.declaredMajor &&
+        this.degreeStatus && this.degreeStatus.error_code === 404);
     },
     term() {
       return this.year + ',' + this.quarter;

diff --git a/myuw_vue/mixins/utils.js b/myuw_vue/mixins/utils.js
@@ -92,13 +92,11 @@ export default {
     },
     noDeclaredMajor(termMajors) {
       if (termMajors) {
-        for (let i = 0; i < termMajors.length; i++) {
-          const majors = termMajors[i].majors;
-          for (let j = 0; j < majors.length; j++) {
-            const majorName = majors[j].name;
-            if (!this.isPreMajor(majorName)) {
-              return false;
-            }
+        const majors = termMajors[termMajors.length - 1].majors;
+        for (let j = 0; j < majors.length; j++) {
+          const majorName = majors[j].name;
+          if (!this.isPreMajor(majorName)) {
+            return false;
           }
         }
       }

diff --git a/myuw_vue/tests/degree-pre-appl.test.js b/myuw_vue/tests/degree-pre-appl.test.js
@@ -8,6 +8,7 @@ import profile from '../vuex/store/profile';
 
 import GraduationPreApplication from '../components/home/graduation/pre-application.vue';
 import javg001Profile from './mock_data/profile/javg001.json';
+import noMajorProfile from './mock_data/profile/javg001-nomajor.json';
 import javerageProfile from './mock_data/profile/javerage.json';
 import jbothllProfile from './mock_data/profile/jbothell.json';
 
@@ -41,6 +42,17 @@ describe('Graduation PreApplication Card', () => {
     });
   });
 
+  it('Verify hide card when not declared major', async () => {
+    // MUWM-5278
+    axios.get.mockResolvedValue({ data: noMajorProfile, status: 200 });
+    const wrapper = shallowMount(GraduationPreApplication, { store, localVue });
+    await new Promise(setImmediate);
+    expect(wrapper.vm.curSenior).toBeTruthy();
+    expect(wrapper.vm.isReady).toBe(true);
+    expect(wrapper.vm.declaredMajor).toBe(false);
+    expect(wrapper.vm.showContent).toBe(false);
+    expect(wrapper.vm.showCard).toBe(false);
+  });
   it('Verify show card', async () => {
     axios.get.mockResolvedValue({data: javg001Profile, status: 200});
     const wrapper = shallowMount(GraduationPreApplication, {store, localVue});

diff --git a/myuw_vue/tests/mixins.test.js b/myuw_vue/tests/mixins.test.js
@@ -199,13 +199,24 @@ describe('mixins', () => {
     expect(utils.methods.noDeclaredMajor(null)).toBe(true);
     let TermMajors = [
       {
-        "quarter": "spring",
+        "quarter": "summer",
+        "year": 2023,
+        "majors": [
+          {
+            "name": "BIOLOGY",
+            "full_name": "Biology",
+            "short_name": "BIOL"
+          }
+        ]
+      },
+      {
+        "quarter": "autumn",
         "year": 2023,
         "majors": [
           {
-            "name": "PRE SCIENCE",
-            "full_name": "Pre Sciences",
-            "short_name": "PRE SCI"
+            "name": "EXTENDED PRE MAJOR",
+            "full_name": "Extended Pre Major",
+            "short_name": "EXT PRE MAJ"
           }
         ]
       }

diff --git a/myuw_vue/tests/mock_data/profile/javg001-nomajor.json b/myuw_vue/tests/mock_data/profile/javg001-nomajor.json
@@ -0,0 +1,154 @@
+{
+    "uwnetid": "javg001",
+    "uwregid": "9136CCB8F66711D5BE060004AC494001",
+    "birth_date": "1961-10-26",
+    "email": "javg001@u.washington.edu",
+    "first_name": "Jake",
+    "last_name": "Student1",
+    "pronouns": "he/him/his",
+    "student_name": "Average,Jake Joseph",
+    "student_number": "1033001",
+    "employee_id": "123456789",
+    "directory_release": true,
+    "local_address": {
+        "city": "Seattle",
+        "country": "United States",
+        "street_line1": "4634 26th Ave NE",
+        "street_line2": "APT 102",
+        "postal_code": "",
+        "state": "WA",
+        "zip_code": "98105-4566"
+    },
+    "local_phone": null,
+    "permanent_address": {
+        "city": "Bellevue",
+        "country": "United States",
+        "street_line1": "1645 140th Ave NE",
+        "street_line2": "APT 980",
+        "postal_code": "",
+        "state": "WA",
+        "zip_code": "98005-1234"
+    },
+    "permanent_phone": "4255556789",
+    "visa_type": null,
+    "veteran_code": "0",
+    "is_student": true,
+    "is_grad_student": false,
+    "degree_status": {
+        "degrees": null,
+        "error_code": 404
+    },
+    "campus": "Seattle",
+    "class_level": "SENIOR",
+    "term_majors": [
+        {
+            "quarter": "spring",
+            "year": 2013,
+            "majors": [
+               {
+                "degree_abbr": "PRESCI",
+                "college_abbr": "A & S",
+                "college_full_name": "A & S",
+                "degree_level": 0,
+                "degree_name": null,
+                "campus": "Seattle",
+                "name": "PRE SCIENCE",
+                "full_name": "Pre Sciences"
+                }
+            ],
+            "degrees_modified": false,
+            "has_only_dropped": false
+        },
+        {
+            "quarter": "summer",
+            "year": 2013,
+            "majors": [
+                {
+                    "degree_abbr": "PRESCI",
+                    "college_abbr": "A & S",
+                    "college_full_name": "A & S",
+                    "degree_level": 0,
+                    "degree_name": null,
+                    "campus": "Seattle",
+                    "name": "PRE SCIENCE",
+                    "full_name": "Pre Sciences"
+                }
+            ],
+            "degrees_modified": true,
+            "has_only_dropped": false
+        },
+        {
+            "quarter": "autumn",
+            "year": 2013,
+            "majors": [
+                {
+                    "degree_abbr": "PRESCI",
+                    "college_abbr": "A & S",
+                    "college_full_name": "A & S",
+                    "degree_level": 0,
+                    "degree_name": null,
+                    "campus": "Seattle",
+                    "name": "PRE SCIENCE",
+                    "full_name": "Pre Sciences"
+                }
+            ],
+            "degrees_modified": false,
+            "has_only_dropped": false
+        },
+        {
+            "quarter": "winter",
+            "year": 2014,
+            "majors": [
+                {
+                    "degree_abbr": "PRESCI",
+                    "college_abbr": "A & S",
+                    "college_full_name": "A & S",
+                    "degree_level": 0,
+                    "degree_name": null,
+                    "campus": "Seattle",
+                    "name": "PRE SCIENCE",
+                    "full_name": "Pre Sciences"
+                }
+            ],
+            "degrees_modified": false,
+            "has_only_dropped": false
+        }
+    ],
+    "has_pending_major": true,
+    "term_minors": [
+        {
+            "quarter": "spring",
+            "year": 2013,
+            "minors": [
+            ],
+            "degrees_modified": false,
+            "has_only_dropped": false
+        },
+        {
+            "quarter": "summer",
+            "year": 2013,
+            "minors": [
+            ],
+            "degrees_modified": false,
+            "has_only_dropped": false
+        },
+        {
+            "quarter": "autumn",
+            "year": 2013,
+            "minors": [
+            ],
+            "degrees_modified": false,
+            "has_only_dropped": false
+        },
+        {
+            "quarter": "winter",
+            "year": 2014,
+            "minors": [],
+            "degrees_modified": false,
+            "has_only_dropped": false
+        }
+    ],
+    "has_minors": true,
+    "has_pending_minor": false,
+    "display_name": "Jake Average Student"
+}
diff --git a/myuw_vue/tests/mock_data/resources/all.json b/myuw_vue/tests/mock_data/resources/all.json
@@ -300,10 +300,6 @@
                     {
                         "title": "Office of Research Information Services (ORIS)",
                         "url": "https://www.washington.edu/research/oris/"
-                    },
-                    {
-                        "title": "MyFinancial.Desktop",
-                        "url": "http://ucs.admin.uw.edu/myfd"
                     }
                 ]
             },