1200CS highlighting fix

UTDNebula · Oct 18, 2023 · 5652d89 · 5652d89
1 parent a79c921
commit 5652d89
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/components/common/SearchBar/searchBar.tsx b/components/common/SearchBar/searchBar.tsx
@@ -3,8 +3,7 @@ import { Autocomplete, InputAdornment, InputBase, Paper } from '@mui/material';
 import Popper from '@mui/material/Popper';
 import match from 'autosuggest-highlight/match';
 import parse from 'autosuggest-highlight/parse';
-import * as React from 'react';
-import { useEffect } from 'react';
+import React, { useEffect } from 'react';
 
 import SearchQuery from '../../../modules/SearchQuery/SearchQuery';
 import searchQueryLabel from '../../../modules/searchQueryLabel/searchQueryLabel';
@@ -126,10 +125,17 @@ export const SearchBar = (props: SearchProps) => {
             //add spaces between prefix and course number
             const matches = match(
               text,
-              inputValue.replace(
-                /([a-zA-Z]{2,4})([0-9][0-9V]?[0-9]{0,2})/,
-                '$1 $2',
-              ),
+              inputValue
+                .replace(
+                  //CS1200 -> CS 1200
+                  /([a-zA-Z]{2,4})([0-9][0-9V]?[0-9]{0,2})/,
+                  '$1 $2',
+                )
+                .replace(
+                  //1200CS -> 1200 CS
+                  /([0-9][0-9V][0-9]{2})([a-zA-Z]{1,4})/,
+                  '$1 $2',
+                ),
             );
             const parts = parse(text, matches);
             console.log(parts);

diff --git a/components/common/SplashPageSearchBar/splashPageSearchBar.tsx b/components/common/SplashPageSearchBar/splashPageSearchBar.tsx
@@ -2,8 +2,7 @@ import { Search } from '@mui/icons-material';
 import { Autocomplete, InputAdornment, InputBase } from '@mui/material';
 import match from 'autosuggest-highlight/match';
 import parse from 'autosuggest-highlight/parse';
-import * as React from 'react';
-import { useEffect } from 'react';
+import React, { useEffect } from 'react';
 
 import SearchQuery from '../../../modules/SearchQuery/SearchQuery';
 import searchQueryLabel from '../../../modules/searchQueryLabel/searchQueryLabel';
@@ -107,8 +106,16 @@ export const SplashPageSearchBar = (props: SearchProps) => {
             const matches = match(
               text,
               inputValue
-                .replace(/([a-zA-Z]{2,4})([0-9][0-9V]?[0-9]{0,2})/, '$1 $2')
-                .replace(/([0-9][0-9V]?[0-9]{0,2})([a-zA-Z]{2,4})/, '$1 $2'),
+                .replace(
+                  //CS1200 -> CS 1200
+                  /([a-zA-Z]{2,4})([0-9][0-9V]?[0-9]{0,2})/,
+                  '$1 $2',
+                )
+                .replace(
+                  //1200CS -> 1200 CS
+                  /([0-9][0-9V][0-9]{2})([a-zA-Z]{1,4})/,
+                  '$1 $2',
+                ),
             );
             const parts = parse(text, matches);
             return (

diff --git a/data/autocomplete_graph.json b/data/autocomplete_graph.json