Merge branch 'dev' of https://github.com/ASU/asu-unity-stack into uds-1852-mobile-blockquote

Author: scott-williams-az

.github/pull_request_template.md

@@ -8,6 +8,14 @@
 <!-- Solution -->
 <!-- Testing Steps -->
 
+## Checklist
+
+- [ ] Tests pass for relevant code changes
+
+## Important Reminders
+<!-- Add meaningful tests -->
+<!-- Remove tests that do not provide value -->
+
 ### Links
 
 - [JIRA ticket](https://asudev.jira.com/browse/UDS-0000)

.storybook-config/index.js

@@ -1,6 +1,7 @@
 import ListingPage from "../src/components/ListingPage/index.stories";
 import DetailPage from "../src/components/DetailPage/index.stories";
 import "@asu/unity-bootstrap-theme/src/scss/unity-bootstrap-theme.bundle.scss";
+import "bootstrap/dist/js/bootstrap.bundle.js";
 
 const parameters = {
   actions: { argTypesRegex: "^on[A-Z].*" },

packages/app-degree-pages/.storybook/preview-head.html

@@ -1,3 +1,20 @@
+# [@asu/app-degree-pages-v3.0.4](https://github.com/asu/asu-unity-stack/compare/@asu/app-degree-pages-v3.0.3...@asu/app-degree-pages-v3.0.4) (2025-04-22)
+
+
+### Bug Fixes
+
+* **app-degree-pages:** show major map link if application-requirements are null ([9b7618b](https://github.com/asu/asu-unity-stack/commit/9b7618b4d7e35ea931771de48af5402aba71db5a))
+* **app-degree-pages:** update view majormap to use same style as undergraduateTemplate ([6954dc5](https://github.com/asu/asu-unity-stack/commit/6954dc51f0eb2866deb5590d9f9c524795105a52))
+
+# [@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)
+
+
+### Bug Fixes
+
+* **app-degree-pages:** changes ([43046a8](https://github.com/asu/asu-unity-stack/commit/43046a8f36984a5cfaf583051697ac546291ca50))
+* **app-degree-pages:** improve the search relevancy by displaying title matches first ([ad9b0bc](https://github.com/asu/asu-unity-stack/commit/ad9b0bc4f0f9373905e72f22f46697fe29be656c))
+* **app-degree-pages:** improving search relevancy ([20e4e20](https://github.com/asu/asu-unity-stack/commit/20e4e20f31c609be24cd8a4f97957c797c2b38ce))
+
 # [@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)
 
 

packages/app-degree-pages/.storybook/preview.js

@@ -19,11 +19,11 @@
     <!-- *************************************************************** -->
     <!-- Load React. -->
     <script
-      src="https://unpkg.com/react@18/umd/react.production.min.js"
+      src="https://unpkg.com/react@18.3.1/umd/react.development.js"
       crossorigin
     ></script>
     <script
-      src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"
+      src="https://unpkg.com/react-dom@18.3.1/umd/react-dom.development.js"
       crossorigin
     ></script>
     <!-- *************************************************************** -->

packages/app-degree-pages/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@asu/app-degree-pages",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "ASU implementation of degree pages",
   "main": "./dist/degreePages.cjs.js",
   "browser": "./dist/degreePages.umd.js",

packages/app-degree-pages/examples/detail-page.html

@@ -102,6 +102,29 @@ const undergraduateTemplate = ({
   );
 };
 
+const viewCurriculum = majorMapURL => {
+  const label = "View Curriculum";
+  return (
+    <>
+      <p>
+        View curriculum below for a detailed list of courses and other
+        requirements.
+      </p>
+      <ButtonList>
+        <li>
+          <Button
+            ariaLabel={label}
+            color="maroon"
+            href={majorMapURL}
+            label={label}
+            size="small"
+          />
+        </li>
+      </ButtonList>
+    </>
+  );
+};
+
 /**
  * @param {ApplicationRequirementsProps} props
  * @returns {JSX.Element}
@@ -112,17 +135,33 @@ function ApplicationRequirements({
   isMinorOrCertificate,
   additionalRequirements,
   minorRequirements,
+  majorMapURL,
 }) {
-  let reqsLabel;
-  if (graduateRequirements || isMinorOrCertificate) {
-    reqsLabel = !isMinorOrCertificate
-      ? "Degree requirements"
-      : "Program requirements";
-  } else {
-    reqsLabel = !isMinorOrCertificate
-      ? "Admission requirements"
-      : "Program requirements";
+  if (!graduateRequirements && !isMinorOrCertificate) {
+    // if the program is not a graduate program AND not a minor/certificate
+    // we only show the undergraduate template
+    return (
+      <section
+        id={progDetailSectionIds.applicationRequirements.targetIdName}
+        data-testid="application-requirements"
+      >
+        <h2>
+          <span className="highlight-gold">Admission requirements</span>
+        </h2>
+        {undergraduateTemplate({
+          transferRequirements,
+          additionalRequirements,
+        })}
+      </section>
+    );
   }
+
+  const reqsLabel = !isMinorOrCertificate
+    ? "Degree requirements"
+    : "Program requirements";
+
+  const requirements = graduateRequirements || minorRequirements;
+
   return (
     <>
       <section
@@ -132,35 +171,28 @@ function ApplicationRequirements({
         <h2>
           <span className="highlight-gold">{reqsLabel}</span>
         </h2>
-        {graduateRequirements || isMinorOrCertificate ? (
+        {requirements ? (
           <div
-            dangerouslySetInnerHTML={sanitizeDangerousMarkup(
-              graduateRequirements || minorRequirements
-            )}
+            dangerouslySetInnerHTML={sanitizeDangerousMarkup(requirements)}
           />
         ) : (
-          undergraduateTemplate({
-            transferRequirements,
-            additionalRequirements,
-          })
+          viewCurriculum(majorMapURL)
         )}
       </section>
 
-      {graduateRequirements || isMinorOrCertificate ? (
-        <section
-          id={progDetailSectionIds.degreeRequirements.targetIdName}
-          data-testid="degree-requirements"
-        >
-          <h2>
-            <span className="highlight-gold">Admission requirements</span>
-          </h2>
-          <div
-            dangerouslySetInnerHTML={sanitizeDangerousMarkup(
-              additionalRequirements
-            )}
-          />
-        </section>
-      ) : null}
+      <section
+        id={progDetailSectionIds.degreeRequirements.targetIdName}
+        data-testid="degree-requirements"
+      >
+        <h2>
+          <span className="highlight-gold">Admission requirements</span>
+        </h2>
+        <div
+          dangerouslySetInnerHTML={sanitizeDangerousMarkup(
+            additionalRequirements
+          )}
+        />
+      </section>
     </>
   );
 }
@@ -171,6 +203,7 @@ ApplicationRequirements.propTypes = {
   isMinorOrCertificate: PropTypes.bool,
   additionalRequirements: PropTypes.string,
   minorRequirements: PropTypes.string,
+  majorMapURL: PropTypes.string,
 };
 
 export { ApplicationRequirements };

packages/app-degree-pages/package.json

@@ -258,6 +258,7 @@ const DetailPage = ({
                       minorRequirements={resolver.getMinorCourseRequirements()}
                       additionalRequirements={resolver.getAdmissionsRequirementsText()}
                       transferRequirements={resolver.getTransferAdmission()}
+                      majorMapURL={resolver.getGeneralDegreeMajorMap()}
                     />
                   )}
 

packages/app-degree-pages/src/components/DetailPage/components/ApplicationRequirements/index.jsx

@@ -46,10 +46,26 @@ function filterData({
     !isAccelConcValid(acceleratedConcurrent) ||
     row[acceleratedConcurrent.value]?.length > 0;
 
-  const filterByKeyword = (resolver, searchTerm) => {
+  const filterByKeywordTitle = (resolver, searchTerm) => {
     if (!searchTerm) return true;
     const regex = new RegExp(searchTerm, "i");
-    return regex.test(resolver.getFullDescription());
+    const title = regex.test(resolver.getMajorDesc());
+    if (title) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const filterByKeywordDescription = (resolver, searchTerm) => {
+    if (!searchTerm) return true;
+    const regex = new RegExp(searchTerm, "i");
+    const description = regex.test(resolver.getFullDescription());
+    if (description) {
+      return true;
+    }
+
+    return false;
   };
 
   const filterByBlacklist = resolver =>
@@ -81,13 +97,39 @@ function filterData({
       filterByDepartmentCode(resolver) &&
       filterByCampus(resolver) &&
       filterByAcceleratedConcurrent(row) &&
-      filterByKeyword(resolver, keyword) &&
       filterByBlacklist(resolver) &&
       filterGraduateCerts(resolver)
     );
   };
 
-  return programs.filter(applyFilters);
+  const filteredByTitle = [];
+  const filteredByDescription = [];
+
+  const newPrograms = programs.filter(degree => {
+    const resolver = degreeDataPropResolverService(degree);
+
+    const isFilteredByTitle = filterByKeywordTitle(resolver, keyword);
+    const isFilteredByDescription = filterByKeywordDescription(
+      resolver,
+      keyword
+    );
+
+    if (
+      (isFilteredByTitle || isFilteredByDescription) &&
+      applyFilters(degree)
+    ) {
+      if (isFilteredByTitle) {
+        filteredByTitle.push(degree);
+      } else {
+        filteredByDescription.push(degree);
+      }
+      return true;
+    }
+
+    return false;
+  });
+
+  return filteredByTitle.concat(filteredByDescription);
 }
 
 /**