Skip to content

Commit 5fdaae1

Browse files
Merge branch 'dev' into uds-1892
2 parents e38f718 + adfaa8f commit 5fdaae1

File tree

35 files changed

+689
-140
lines changed

35 files changed

+689
-140
lines changed

.github/pull_request_template.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
<!-- Solution -->
99
<!-- Testing Steps -->
1010

11+
## Checklist
12+
13+
- [ ] Tests pass for relevant code changes
14+
15+
## Important Reminders
16+
<!-- Add meaningful tests -->
17+
<!-- Remove tests that do not provide value -->
18+
1119
### Links
1220

1321
- [JIRA ticket](https://asudev.jira.com/browse/UDS-0000)

packages/app-degree-pages/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# [@asu/app-degree-pages-v3.0.3](https://github.com/asu/asu-unity-stack/compare/@asu/app-degree-pages-v3.0.2...@asu/app-degree-pages-v3.0.3) (2025-04-08)
2+
3+
4+
### Bug Fixes
5+
6+
* **app-degree-pages:** changes ([43046a8](https://github.com/asu/asu-unity-stack/commit/43046a8f36984a5cfaf583051697ac546291ca50))
7+
* **app-degree-pages:** improve the search relevancy by displaying title matches first ([ad9b0bc](https://github.com/asu/asu-unity-stack/commit/ad9b0bc4f0f9373905e72f22f46697fe29be656c))
8+
* **app-degree-pages:** improving search relevancy ([20e4e20](https://github.com/asu/asu-unity-stack/commit/20e4e20f31c609be24cd8a4f97957c797c2b38ce))
9+
110
# [@asu/app-degree-pages-v3.0.2](https://github.com/asu/asu-unity-stack/compare/@asu/app-degree-pages-v3.0.1...@asu/app-degree-pages-v3.0.2) (2025-03-03)
211

312

packages/app-degree-pages/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@asu/app-degree-pages",
3-
"version": "3.0.2",
3+
"version": "3.0.3",
44
"description": "ASU implementation of degree pages",
55
"main": "./dist/degreePages.cjs.js",
66
"browser": "./dist/degreePages.umd.js",

packages/app-degree-pages/src/core/services/degree-data-manager-service.js

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,26 @@ function filterData({
4646
!isAccelConcValid(acceleratedConcurrent) ||
4747
row[acceleratedConcurrent.value]?.length > 0;
4848

49-
const filterByKeyword = (resolver, searchTerm) => {
49+
const filterByKeywordTitle = (resolver, searchTerm) => {
5050
if (!searchTerm) return true;
5151
const regex = new RegExp(searchTerm, "i");
52-
return regex.test(resolver.getFullDescription());
52+
const title = regex.test(resolver.getMajorDesc());
53+
if (title) {
54+
return true;
55+
}
56+
57+
return false;
58+
};
59+
60+
const filterByKeywordDescription = (resolver, searchTerm) => {
61+
if (!searchTerm) return true;
62+
const regex = new RegExp(searchTerm, "i");
63+
const description = regex.test(resolver.getFullDescription());
64+
if (description) {
65+
return true;
66+
}
67+
68+
return false;
5369
};
5470

5571
const filterByBlacklist = resolver =>
@@ -81,13 +97,39 @@ function filterData({
8197
filterByDepartmentCode(resolver) &&
8298
filterByCampus(resolver) &&
8399
filterByAcceleratedConcurrent(row) &&
84-
filterByKeyword(resolver, keyword) &&
85100
filterByBlacklist(resolver) &&
86101
filterGraduateCerts(resolver)
87102
);
88103
};
89104

90-
return programs.filter(applyFilters);
105+
const filteredByTitle = [];
106+
const filteredByDescription = [];
107+
108+
const newPrograms = programs.filter(degree => {
109+
const resolver = degreeDataPropResolverService(degree);
110+
111+
const isFilteredByTitle = filterByKeywordTitle(resolver, keyword);
112+
const isFilteredByDescription = filterByKeywordDescription(
113+
resolver,
114+
keyword
115+
);
116+
117+
if (
118+
(isFilteredByTitle || isFilteredByDescription) &&
119+
applyFilters(degree)
120+
) {
121+
if (isFilteredByTitle) {
122+
filteredByTitle.push(degree);
123+
} else {
124+
filteredByDescription.push(degree);
125+
}
126+
return true;
127+
}
128+
129+
return false;
130+
});
131+
132+
return filteredByTitle.concat(filteredByDescription);
91133
}
92134

93135
/**

packages/app-degree-pages/src/core/services/degree-data-prop-resolver-service.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ function degreeDataPropResolverService(row = {}) {
9191
/** @type {string} */
9292
const gradRequirement2 = row["degreeRequirements"] || "";
9393
return `${gradRequirement1}${gradRequirement2}`;
94-
9594
},
9695
isOnline: () => row["asuOnlineAcadPlanUrl"], // Returns null if online url is not available
9796
// See getGeneralDegreeMajorMap for more info
@@ -222,9 +221,8 @@ function degreeDataPropResolverService(row = {}) {
222221
const text = row["stemOptText"];
223222
if (text && text !== "") {
224223
return "Yes";
225-
} else {
226-
return "No";
227224
}
225+
return "No";
228226
},
229227
getSubPlnMajorMaps: () => {
230228
if (!row["subplans"] || !row["majorMapSubplans"]) return [];

packages/app-rfi/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# [@asu/app-rfi-v3.3.0](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v3.2.0...@asu/app-rfi-v3.3.0) (2025-04-01)
2+
3+
4+
### Features
5+
6+
* **app-rfi:** simple change to rebuild release ([13f8a3b](https://github.com/asu/asu-unity-stack/commit/13f8a3b546f4f29d47e3c895e9f48b6058415744))
7+
18
# [@asu/app-rfi-v3.2.0](https://github.com/asu/asu-unity-stack/compare/@asu/app-rfi-v3.1.0...@asu/app-rfi-v3.2.0) (2025-03-05)
29

310

packages/app-rfi/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ submission payload and add the host's source ID (which serves as an API key and
99
identifier) to the payload, and then send it off to the RFI submissions service
1010
which processes and routes the submissions to Undergrad, Grad, and ASUOnline
1111
middleware destinations so that the RFI request ultimately lands in the
12-
appropriate Salesforce destination.
12+
appropriate Salesforce destination.
1313

1414
## Installation and Requirements
1515

packages/app-rfi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@asu/app-rfi",
3-
"version": "3.2.0",
3+
"version": "3.3.0",
44
"description": "ASU Request For Information (RFI) form",
55
"main": "./dist/appRfi.cjs.js",
66
"browser": "./dist/appRfi.umd.js",

packages/component-header-footer/CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# [@asu/component-header-footer-v1.0.7](https://github.com/asu/asu-unity-stack/compare/@asu/component-header-footer-v1.0.6...@asu/component-header-footer-v1.0.7) (2025-04-18)
2+
3+
4+
### Bug Fixes
5+
6+
* **component-header-footer:** removed aria-labelledby and added span for desktop ([a67d7df](https://github.com/asu/asu-unity-stack/commit/a67d7df86122ab283910d7a01e6006c33c6f88e3))
7+
8+
# [@asu/component-header-footer-v1.0.6](https://github.com/asu/asu-unity-stack/compare/@asu/component-header-footer-v1.0.5...@asu/component-header-footer-v1.0.6) (2025-04-01)
9+
10+
11+
### Bug Fixes
12+
13+
* **component-header-footer:** add correct outline for footer links and buttons onfocus ([201a77a](https://github.com/asu/asu-unity-stack/commit/201a77aec078cb98f84dd5c3e2e322872f9769dd))
14+
15+
# [@asu/component-header-footer-v1.0.5](https://github.com/asu/asu-unity-stack/compare/@asu/component-header-footer-v1.0.4...@asu/component-header-footer-v1.0.5) (2025-03-31)
16+
17+
18+
### Bug Fixes
19+
20+
* **component-header-footer:** fixing variable name ([499e391](https://github.com/asu/asu-unity-stack/commit/499e39106e5584522c5feab466ab33a31c20c5a4))
21+
* **component-header-footer:** updated logo alt and title from brand header ([f952066](https://github.com/asu/asu-unity-stack/commit/f95206680c29589a536a8c8739fa3bde8f4d95d1))
22+
123
# [@asu/component-header-footer-v1.0.4](https://github.com/asu/asu-unity-stack/compare/@asu/component-header-footer-v1.0.3...@asu/component-header-footer-v1.0.4) (2025-03-19)
224

325

packages/component-header-footer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@asu/component-header-footer",
3-
"version": "1.0.4",
3+
"version": "1.0.7",
44
"description": "ASU Global Header and Footer",
55
"main": "./dist/asuHeaderFooter.cjs.js",
66
"browser": "./dist/asuHeaderFooter.umd.js",

0 commit comments

Comments
 (0)