fix: adjust type for start and end

laurelin60 · Dec 29, 2023 · 66aaaa3 · 66aaaa3
1 parent bdb23a4
commit 66aaaa3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/components/search/blurb.tsx b/components/search/blurb.tsx
@@ -6,7 +6,7 @@ interface BlurbProps {
         data: CollegeObject[],
         filterValues: FilterValues,
     ) => CollegeObject[];
-    data: CollegeObject[];
+    data: CollegeObject[] | undefined;
     filterValues: FilterValues;
     searchUniversity: string;
     searchGE: string;
@@ -26,10 +26,13 @@ const SearchBlurb = (props: BlurbProps) => {
                     <div>
                         We found{" "}
                         <b className="text-black">
-                            {filterData(data, filterValues).length} courses
+                            {data ? filterData(data, filterValues).length : "x"}
+                            courses
                         </b>{" "}
                         that may articulate to{" "}
-                        <b className="text-black">{searchUniversity}</b> for{" "}
+                        <b className="text-black">
+                            {searchUniversity}
+                        </b> for{" "}
                         <b className="text-black">{`${searchGE?.split(
                             " ",
                         )[0]} Category ${searchGE?.split(" ")[1]}`}</b>{" "}

diff --git a/components/search/filter-utils.ts b/components/search/filter-utils.ts
@@ -13,8 +13,8 @@ export const startsAfter = (
     );
 };
 
-export const endsBefore = (end: string | undefined, result: CollegeObject) => {
-    if (end == undefined) return true;
+export const endsBefore = (end: string, result: CollegeObject) => {
+    if (end == "") return true;
 
     return (
         `2024-${result.endMonth.toString().padStart(2, "0")}-${result.endDay
@@ -23,7 +23,14 @@ export const endsBefore = (end: string | undefined, result: CollegeObject) => {
     );
 };
 
-export function filterData(data: CollegeObject[], filterValues: FilterValues) {
+export function filterData(
+    data: CollegeObject[] | undefined,
+    filterValues: FilterValues,
+) {
+    if (!data) {
+        return [];
+    }
+
     const filteredResults = data.filter((result) => {
         const onlineFormat =
             (filterValues.format[0] && filterValues.format[1]) ||

diff --git a/components/search/filterComponents.tsx b/components/search/filterComponents.tsx
@@ -118,7 +118,7 @@ export const CalendarFilter = (props: CalendarFilterProps) => {
 
 interface InstitutionDropdownProps {
     defaultValue: string;
-    courses: CollegeObject[];
+    courses: CollegeObject[] | undefined;
     onChange: Dispatch<SetStateAction<string>>;
 }
 
@@ -139,13 +139,15 @@ export const InstitutionDropdown = (props: InstitutionDropdownProps) => {
         (course: CollegeObject) => course.sendingInstitution,
     );
 
-    for (const college of sendingInstitutions) {
-        if (!uniqueColleges.includes(college)) {
-            uniqueColleges.push(college);
+    if (sendingInstitutions) {
+        for (const college of sendingInstitutions) {
+            if (!uniqueColleges.includes(college)) {
+                uniqueColleges.push(college);
+            }
         }
-    }
 
-    uniqueColleges.sort();
+        uniqueColleges.sort();
+    }
 
     return (
         <div className="relative flex flex-col">

diff --git a/components/search/filters.tsx b/components/search/filters.tsx
@@ -19,7 +19,7 @@ interface SearchFilterProps {
     setMin: Dispatch<SetStateAction<number>>;
     setMax: Dispatch<SetStateAction<number>>;
     filterValues: FilterValues;
-    courses: CollegeObject[];
+    courses: CollegeObject[] | undefined;
 }
 
 export const SearchFilters = (props: SearchFilterProps) => {

diff --git a/components/search/search.tsx b/components/search/search.tsx
@@ -43,8 +43,8 @@ export type FilterValues = {
     format: boolean[];
     enrollment: boolean[];
     available: boolean[];
-    start: string | undefined;
-    end: string | undefined;
+    start: string;
+    end: string;
     institution: string;
     min: number;
     max: number;
@@ -84,7 +84,7 @@ const Search = () => {
 
     const [sort, setSort] = useState("Default Sort");
 
-    const [courses, setCourses] = useState<CollegeObject[]>([]);
+    const [courses, setCourses] = useState<CollegeObject[]>();
 
     const [filterValues, setFilterValues] = useState<FilterValues>({
         format: format,