fix(app-degree-pages): improving search relevancy

Author: oatkar

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

@@ -50,24 +50,22 @@ function filterData({
     if (!searchTerm) return true;
     const regex = new RegExp(searchTerm, "i");
     const title = regex.test(resolver.getMajorDesc());
-    if (title){
+    if (title) {
       return true;
     }
-    else{
-      return false;
-    }
+
+    return false;
   };
 
   const filterByKeywordDescription = (resolver, searchTerm) => {
     if (!searchTerm) return true;
     const regex = new RegExp(searchTerm, "i");
     const description = regex.test(resolver.getFullDescription());
-    if (description){
+    if (description) {
       return true;
     }
-    else{
-      return false;
-    }
+
+    return false;
   };
 
   const filterByBlacklist = resolver =>
@@ -104,26 +102,31 @@ function filterData({
     );
   };
 
-  let filteredByTitle = [];
-  let filteredByDescription = [];
-  let newPrograms;
+  const filteredByTitle = [];
+  const filteredByDescription = [];
 
-  newPrograms = programs.filter(degree => {
+  const newPrograms = programs.filter(degree => {
     const resolver = degreeDataPropResolverService(degree);
 
-    if(filterByKeywordTitle(resolver, keyword)) {
-      if (applyFilters(degree)) {
-        filteredByTitle.push(degree);
-      }
-      return false;
-    }
+    const isFilteredByTitle = filterByKeywordTitle(resolver, keyword);
+    const isFilteredByDescription = filterByKeywordDescription(
+      resolver,
+      keyword
+    );
 
-    if(filterByKeywordDescription(resolver, keyword)) {
-      if (applyFilters(degree)) {
+    if (
+      (isFilteredByTitle || isFilteredByDescription) &&
+      applyFilters(degree)
+    ) {
+      if (isFilteredByTitle) {
+        filteredByTitle.push(degree);
+      } else {
         filteredByDescription.push(degree);
       }
-      return false;
+      return true;
     }
+
+    return false;
   });
 
   return filteredByTitle.concat(filteredByDescription);

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

@@ -91,7 +91,6 @@ function degreeDataPropResolverService(row = {}) {
       /** @type {string} */
       const gradRequirement2 = row["degreeRequirements"] || "";
       return `${gradRequirement1}${gradRequirement2}`;
-
     },
     isOnline: () => row["asuOnlineAcadPlanUrl"], // Returns null if online url is not available
     // See getGeneralDegreeMajorMap for more info
@@ -222,9 +221,8 @@ function degreeDataPropResolverService(row = {}) {
       const text = row["stemOptText"];
       if (text && text !== "") {
         return "Yes";
-      } else {
-        return "No";
       }
+      return "No";
     },
     getSubPlnMajorMaps: () => {
       if (!row["subplans"] || !row["majorMapSubplans"]) return [];