Skip to content

Commit 9f12f3f

Browse files
fanglinfangfanglinfang
authored
Merge pull request #2969 from uw-it-aca/qa
Qa
2 parents 7e1a5fc + 7a78015 commit 9f12f3f

File tree

12 files changed

+206
-32
lines changed

12 files changed

+206
-32
lines changed

‎cypress/fixtures/resources/all.json

-4
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,6 @@
300300
{
301301
"title": "Office of Research Information Services (ORIS)",
302302
"url": "https://www.washington.edu/research/oris/"
303-
},
304-
{
305-
"title": "MyFinancial.Desktop",
306-
"url": "http://ucs.admin.uw.edu/myfd"
307303
}
308304
]
309305
},

‎myuw/data/resource_link_import.csv

+4-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ Services for Faculty and Staff,"HR, Payroll, and Benefits",all,http://isc.uw.edu
5151
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
5252
Services for Faculty and Staff,"HR, Payroll, and Benefits",all,http://isc.uw.edu/admin-corner,ISC Administrators' Corner,,,,,,,no
5353
Services for Faculty and Staff,"HR, Payroll, and Benefits",all,https://www.washington.edu/wholeu/,Whole U (for staff and faculty),,,,,,,no
54-
Services for Faculty and Staff,Procurement,all,https://finance.uw.edu/ps/how-to-buy/ariba,ARIBA,,,,,,,no
55-
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
54+
Services for Faculty and Staff,Finance and Procurement,all,"https://biportal.uw.edu ",Financial Reports (BI Portal),,,,,,,no
55+
Services for Faculty and Staff,Finance and Procurement,all,"https://uw.service-now.com/finance ","UW Connect Finance ",,,,,,,no
56+
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
57+
Services for Faculty and Staff,Finance and Procurement,all,"http://wd5.myworkday.com/uw/login.htmld ",Workday,,,,,,,no
5658
Services for Faculty and Staff,Others,all,http://registrar.washington.edu/staffandfaculty/electronic-academic-records-system-ears,Electronic Advising Records System (EARS),,,,,,,no
5759
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
5860
Services for Faculty and Staff,Others,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Software and Hardware,,,,,,,

‎myuw/templates/500.html

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33
{% block body_content %}
44
<!-- content container -->
55
<h1 class="h3 my-4">Unable to Load Page - Error 500</h1>
6-
<p>A server error has occurred. You don't have permission to access this page.</p>
76
<p>
8-
Contact
9-
<a href="mailto:[email protected]?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">[email protected]</a>
10-
with any questions.
7+
A server error has occurred.
8+
We are aware of the issue and are working on it.
9+
Please try again in a few minutes.
10+
</p>
11+
<p>
12+
Contact
13+
<a href="mailto:[email protected]?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">[email protected]</a>
14+
with any questions.
1115
</p>
1216
{% include "_common/direct-links.html" %} {% endblock body_content %}

‎myuw/templates/543.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% block body_content %}
44
<!-- content container -->
55
<h1 class="h3 my-4">An Error Has Occurred - Error 543</h1>
6-
<p>A data error has occurred. Please try again in a few minutes. </p>
6+
<p>A data error has occurred. Please try again in a few minutes.</p>
77
<p>
88
Contact
99
<a href="mailto:[email protected]?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">[email protected]</a>

‎myuw/templates/_common/direct-links.html

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
>Husky Card Account</a
7777
>
7878
</li>
79-
<li><a href="http://ucs.admin.uw.edu/myfd/" target="_blank">MyFinancial.desktop</a></li>
8079
<li>
8180
<a href="http://www.washington.edu/home/peopledir/" target="_blank"
8281
>Faculty/Staff/Student Directory</a

‎myuw_vue/components/_common/outage.vue

-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@
7070
<a href="https://wd5.myworkday.com/uw/d/home.htmld"
7171
>Workday</a>
7272
</li>
73-
<li v-if="isEmployee && !isAcademicsPage" class="mb-1">
74-
<a href="http://ucs.admin.uw.edu/myfd/"
75-
>MyFinancial.desktop</a>
76-
</li>
7773
</ul>
7874
</template>
7975
</uw-card>

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,21 @@ export default {
127127
}),
128128
...mapState('profile', {
129129
degreeStatus: (state) => state.value.degree_status,
130+
termMajors: (state) => state.value.term_majors,
130131
}),
131132
curSenior() {
132133
return (this.classLevel === 'SENIOR');
133134
},
135+
declaredMajor() {
136+
// MUWM-5278
137+
return !this.noDeclaredMajor(this.termMajors);
138+
},
134139
showCard() {
135140
return (this.curSenior && (this.isFetching || this.showContent));
136141
},
137142
showContent() {
138-
return (this.isReady && this.degreeStatus && this.degreeStatus.error_code === 404);
143+
return (this.isReady && this.declaredMajor &&
144+
this.degreeStatus && this.degreeStatus.error_code === 404);
139145
},
140146
term() {
141147
return this.year + ',' + this.quarter;

‎myuw_vue/mixins/utils.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,11 @@ export default {
9292
},
9393
noDeclaredMajor(termMajors) {
9494
if (termMajors) {
95-
for (let i = 0; i < termMajors.length; i++) {
96-
const majors = termMajors[i].majors;
97-
for (let j = 0; j < majors.length; j++) {
98-
const majorName = majors[j].name;
99-
if (!this.isPreMajor(majorName)) {
100-
return false;
101-
}
95+
const majors = termMajors[termMajors.length - 1].majors;
96+
for (let j = 0; j < majors.length; j++) {
97+
const majorName = majors[j].name;
98+
if (!this.isPreMajor(majorName)) {
99+
return false;
102100
}
103101
}
104102
}

‎myuw_vue/tests/degree-pre-appl.test.js

+12
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import profile from '../vuex/store/profile';
88

99
import GraduationPreApplication from '../components/home/graduation/pre-application.vue';
1010
import javg001Profile from './mock_data/profile/javg001.json';
11+
import noMajorProfile from './mock_data/profile/javg001-nomajor.json';
1112
import javerageProfile from './mock_data/profile/javerage.json';
1213
import jbothllProfile from './mock_data/profile/jbothell.json';
1314

@@ -41,6 +42,17 @@ describe('Graduation PreApplication Card', () => {
4142
});
4243
});
4344

45+
it('Verify hide card when not declared major', async () => {
46+
// MUWM-5278
47+
axios.get.mockResolvedValue({ data: noMajorProfile, status: 200 });
48+
const wrapper = shallowMount(GraduationPreApplication, { store, localVue });
49+
await new Promise(setImmediate);
50+
expect(wrapper.vm.curSenior).toBeTruthy();
51+
expect(wrapper.vm.isReady).toBe(true);
52+
expect(wrapper.vm.declaredMajor).toBe(false);
53+
expect(wrapper.vm.showContent).toBe(false);
54+
expect(wrapper.vm.showCard).toBe(false);
55+
});
4456
it('Verify show card', async () => {
4557
axios.get.mockResolvedValue({data: javg001Profile, status: 200});
4658
const wrapper = shallowMount(GraduationPreApplication, {store, localVue});

‎myuw_vue/tests/mixins.test.js

+15-4
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,24 @@ describe('mixins', () => {
199199
expect(utils.methods.noDeclaredMajor(null)).toBe(true);
200200
let TermMajors = [
201201
{
202-
"quarter": "spring",
202+
"quarter": "summer",
203+
"year": 2023,
204+
"majors": [
205+
{
206+
"name": "BIOLOGY",
207+
"full_name": "Biology",
208+
"short_name": "BIOL"
209+
}
210+
]
211+
},
212+
{
213+
"quarter": "autumn",
203214
"year": 2023,
204215
"majors": [
205216
{
206-
"name": "PRE SCIENCE",
207-
"full_name": "Pre Sciences",
208-
"short_name": "PRE SCI"
217+
"name": "EXTENDED PRE MAJOR",
218+
"full_name": "Extended Pre Major",
219+
"short_name": "EXT PRE MAJ"
209220
}
210221
]
211222
}

‎myuw_vue/tests/mock_data/profile/javg001-nomajor.json

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
{
2+
"uwnetid": "javg001",
3+
"uwregid": "9136CCB8F66711D5BE060004AC494001",
4+
"birth_date": "1961-10-26",
5+
"email": "[email protected]",
6+
"first_name": "Jake",
7+
"last_name": "Student1",
8+
"pronouns": "he/him/his",
9+
"student_name": "Average,Jake Joseph",
10+
"student_number": "1033001",
11+
"employee_id": "123456789",
12+
"directory_release": true,
13+
"local_address": {
14+
"city": "Seattle",
15+
"country": "United States",
16+
"street_line1": "4634 26th Ave NE",
17+
"street_line2": "APT 102",
18+
"postal_code": "",
19+
"state": "WA",
20+
"zip_code": "98105-4566"
21+
},
22+
"local_phone": null,
23+
"permanent_address": {
24+
"city": "Bellevue",
25+
"country": "United States",
26+
"street_line1": "1645 140th Ave NE",
27+
"street_line2": "APT 980",
28+
"postal_code": "",
29+
"state": "WA",
30+
"zip_code": "98005-1234"
31+
},
32+
"permanent_phone": "4255556789",
33+
"visa_type": null,
34+
"veteran_code": "0",
35+
"is_student": true,
36+
"is_grad_student": false,
37+
"degree_status": {
38+
"degrees": null,
39+
"error_code": 404
40+
},
41+
"campus": "Seattle",
42+
"class_level": "SENIOR",
43+
"term_majors": [
44+
{
45+
"quarter": "spring",
46+
"year": 2013,
47+
"majors": [
48+
{
49+
"degree_abbr": "PRESCI",
50+
"college_abbr": "A & S",
51+
"college_full_name": "A & S",
52+
"degree_level": 0,
53+
"degree_name": null,
54+
"campus": "Seattle",
55+
"name": "PRE SCIENCE",
56+
"full_name": "Pre Sciences"
57+
}
58+
],
59+
"degrees_modified": false,
60+
"has_only_dropped": false
61+
},
62+
{
63+
"quarter": "summer",
64+
"year": 2013,
65+
"majors": [
66+
{
67+
"degree_abbr": "PRESCI",
68+
"college_abbr": "A & S",
69+
"college_full_name": "A & S",
70+
"degree_level": 0,
71+
"degree_name": null,
72+
"campus": "Seattle",
73+
"name": "PRE SCIENCE",
74+
"full_name": "Pre Sciences"
75+
}
76+
],
77+
"degrees_modified": true,
78+
"has_only_dropped": false
79+
},
80+
{
81+
"quarter": "autumn",
82+
"year": 2013,
83+
"majors": [
84+
{
85+
"degree_abbr": "PRESCI",
86+
"college_abbr": "A & S",
87+
"college_full_name": "A & S",
88+
"degree_level": 0,
89+
"degree_name": null,
90+
"campus": "Seattle",
91+
"name": "PRE SCIENCE",
92+
"full_name": "Pre Sciences"
93+
}
94+
],
95+
"degrees_modified": false,
96+
"has_only_dropped": false
97+
},
98+
{
99+
"quarter": "winter",
100+
"year": 2014,
101+
"majors": [
102+
{
103+
"degree_abbr": "PRESCI",
104+
"college_abbr": "A & S",
105+
"college_full_name": "A & S",
106+
"degree_level": 0,
107+
"degree_name": null,
108+
"campus": "Seattle",
109+
"name": "PRE SCIENCE",
110+
"full_name": "Pre Sciences"
111+
}
112+
],
113+
"degrees_modified": false,
114+
"has_only_dropped": false
115+
}
116+
],
117+
"has_pending_major": true,
118+
"term_minors": [
119+
{
120+
"quarter": "spring",
121+
"year": 2013,
122+
"minors": [
123+
],
124+
"degrees_modified": false,
125+
"has_only_dropped": false
126+
},
127+
{
128+
"quarter": "summer",
129+
"year": 2013,
130+
"minors": [
131+
],
132+
"degrees_modified": false,
133+
"has_only_dropped": false
134+
},
135+
{
136+
"quarter": "autumn",
137+
"year": 2013,
138+
"minors": [
139+
],
140+
"degrees_modified": false,
141+
"has_only_dropped": false
142+
},
143+
{
144+
"quarter": "winter",
145+
"year": 2014,
146+
"minors": [],
147+
"degrees_modified": false,
148+
"has_only_dropped": false
149+
}
150+
],
151+
"has_minors": true,
152+
"has_pending_minor": false,
153+
"display_name": "Jake Average Student"
154+
}

‎myuw_vue/tests/mock_data/resources/all.json

-4
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,6 @@
300300
{
301301
"title": "Office of Research Information Services (ORIS)",
302302
"url": "https://www.washington.edu/research/oris/"
303-
},
304-
{
305-
"title": "MyFinancial.Desktop",
306-
"url": "http://ucs.admin.uw.edu/myfd"
307303
}
308304
]
309305
},

0 commit comments

Comments
 (0)