Merge pull request #2564 from StoDevX/modularize-search

Modularize keywordSearch function

Author: hawkrives

package.json

@@ -102,9 +102,9 @@
     "events": "2.0.0",
     "get-urls": "7.2.0",
     "glamorous-native": "1.4.0",
-    "hamming": "0.0.2",
     "html-entities": "1.2.1",
     "htmlparser2": "3.9.2",
+    "keyword-search": "0.1.1",
     "lodash": "4.17.9",
     "moment": "2.22.1",
     "moment-timezone": "0.5.16",

source/views/sis/course-search/search.js

@@ -30,7 +30,7 @@ import {RecentItemsList} from '../components/recent-search/list'
 import {Separator} from '../../components/separator'
 import {buildFilters} from './lib/build-filters'
 import type {FilterComboType} from './lib/format-filter-combo'
-import hamming from 'hamming'
+import keywordSearch from 'keyword-search'
 
 const PROMPT_TEXT =
 	'We need to download the courses from the server. This will take a few seconds.'
@@ -72,18 +72,6 @@ type State = {
 	query: string,
 }
 
-function keywordSearch(query: string, item: string) {
-	const keywords = query.split(' ')
-	const itemWords = item.split(' ')
-	return keywords.every(keyword =>
-		itemWords.some(
-			word =>
-				keyword.length <= word.length &&
-				hamming(keyword, word.slice(0, keyword.length)) < 2,
-		),
-	)
-}
-
 function executeSearch(args: {
 	text: string,
 	filters: FilterType[],
@@ -100,10 +88,10 @@ function executeSearch(args: {
 
 	const results = filteredCourses.filter(
 		course =>
-			keywordSearch(query, course.name.toLowerCase()) ||
-			keywordSearch(query, (course.title || '').toLowerCase()) ||
+			keywordSearch(query, course.name.toLowerCase(), 1) ||
+			keywordSearch(query, (course.title || '').toLowerCase(), 1) ||
 			(course.instructors || []).some(name =>
-				keywordSearch(query, name.toLowerCase()),
+				keywordSearch(query, name.toLowerCase(), 1),
 			) ||
 			deptNum(course)
 				.toLowerCase()

yarn.lock

@@ -3880,6 +3880,12 @@ [email protected]:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/junk/-/junk-2.1.0.tgz#f431b4b7f072dc500a5f10ce7f4ec71930e70134"
 
+[email protected]:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/keyword-search/-/keyword-search-0.1.1.tgz#f7615e739024de410a92dd0071ff20b8ae01956f"
+  dependencies:
+    hamming "0.0.2"
+
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -6394,7 +6400,7 @@ vinyl@^0.5.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-"vm2@github:patriksimek/vm2#custom_files":
+vm2@patriksimek/vm2#custom_files:
   version "3.5.0"
   resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57"