Merge pull request #46 from hs-shell/develop

bugfix: add validation for date range format to prevent undefined rep…

Author: 6-keem

src/hooks/useCourseData.tsx

@@ -101,7 +101,7 @@ export function useCourseData(courses: any[]) {
       setIsPending(false);
     } catch (error) {
       localStorage.removeItem('lastRequestTime');
-      // setIsError(true);
+      setIsError(true);
       setIsPending(false);
     }
   }, [courses]);

src/lib/utils.ts

@@ -6,17 +6,27 @@ export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
 
-export function isCurrentDateInRange(dateRange: string) {
+export function isCurrentDateInRange(dateRange: string | null) {
+  if (!dateRange || !dateRange.includes(' ~ ')) {
+    return false;
+  }
+
   const [startStr, endStr] = dateRange.split(' ~ ');
 
+  if (!startStr || !endStr) {
+    return false;
+  }
+
   const startDate = new Date(startStr.replace(/-/g, '/'));
   const endDate = new Date(endStr.replace(/-/g, '/'));
 
   const currentDate = new Date();
 
   return currentDate >= startDate && currentDate <= endDate;
 }
-export function isCurrentDateByDate(date: string) {
+
+export function isCurrentDateByDate(date: string | null) {
+  if (!date || date.length <= 1) return false;
   const endDate = new Date(date);
   const currentDate = new Date();
   return currentDate <= endDate;