Cleaned up comments and console.logs to put this issue on hiatus - current bug with switching ts around

Author: Meredith Zhang

client/src/App.tsx

@@ -176,8 +176,7 @@ const App: React.FC = () => {
      * Retrieves term data from the scraper backend
      */
     const fetchTermData = async () => {
-      const { term, termName, year, firstDayOfTerm, termsData } = await getAvailableTermDetails(); // term is 
-      // switched after this. this be rpoblem.
+      const { term, termName, year, firstDayOfTerm, termsData } = await getAvailableTermDetails(); 
       setTerm(term);
       setTermName(termName);
       setYear(year);

client/src/constants/timetable.ts

@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 import { isWithinInterval, parse } from 'date-fns';
-
+import { getTermsWithClassData } from '../utils/getTermsWithClassData';
 import { client } from '../api/config';
 import NetworkError from '../interfaces/NetworkError';
 import { Term, TermDataList } from '../interfaces/Periods';
@@ -113,6 +113,38 @@ export const convertToTermName = (termId: string) => {
   }
 };
 
+const getTermToDisplay = async (
+  termInfoMap: Map<Term, TermDateDetails>,
+
+): Promise<Term> => {
+
+  // (CURRENTLY BUGGED) Prioritise last selected term
+  if (localStorage.getItem('currSelectedTerm')) {
+    const storedTerm = localStorage.getItem('currSelectedTerm');
+
+    if (storedTerm) {
+      const currSelectedTerm = JSON.parse(storedTerm)
+      return currSelectedTerm.term
+
+    }
+    
+  } 
+  
+  // (TODO) If no selected term, display the latest term the user has timetable data for 
+
+  // If no class data, display the latest term with timetable data 
+  
+  const keys_term = sortTerms(Array.from(termInfoMap.keys()));
+  const termsWithData = await getTermsWithClassData(keys_term)
+
+  if (termsWithData && termsWithData.length > 0) {
+    return termsWithData[termsWithData.length - 1]
+  }
+  
+  // Default to T1 in case there are 0 terms with course data
+  return keys_term[1]
+};
+
 /**
  * @returns The details of the latest term there is data for
  */
@@ -135,7 +167,8 @@ export const getAvailableTermDetails = async () => {
 
   try {
     const termMapInfo = await constructTermDetailsMap();
-    const currTermId = await get_current_term(termMapInfo);
+    const currTermId = await getTermToDisplay(termMapInfo);
+    console.log(" curr term id" + currTermId);
     firstDayOfTerm =
       termMapInfo.get(currTermId)?.startDate?.toLocaleDateString().split('/').reverse().join('-') || 'default-date';
 

client/src/context/UserContext.tsx

@@ -149,6 +149,7 @@ const UserContextProvider = ({ children }: UserContextProviderProps) => {
           throw new NetworkError("Couldn't get response for user information!");
         }
       } catch (error) {
+        setUser(undefinedUser);
         console.log(error);
       }
     };