Add support for 2026 timetable data alongside 2025 (#1090)

* Add support for multiple years at a time

* Revert broken changes for default term

* Update new timetable promotional popup

* Switch back to production GraphQL API

Author: lhvy

client/src/App.tsx

@@ -19,6 +19,7 @@ import Timetable from './components/timetable/Timetable';
 import { TimetableTabs } from './components/timetableTabs/TimetableTabs';
 import { contentPadding, rightContentPadding, themes } from './constants/theme';
 import {
+  convertToTermName,
   daysLong,
   getAvailableTermDetails,
   getDefaultEndTime,
@@ -180,8 +181,8 @@ const App: React.FC = () => {
     const fetchTermData = async () => {
       const { term, termName, year, firstDayOfTerm, termsData } = await getAvailableTermDetails();
       setTerm(term);
-      setTermName(termName);
       setYear(year);
+      setTermName(termName);
       setFirstDayOfTerm(firstDayOfTerm);
       const termsSortedList: TermDataList = sortTerms(termsData);
       setTermsData(termsSortedList);
@@ -212,7 +213,7 @@ const App: React.FC = () => {
      * Retrieves the list of all courses from the scraper backend
      */
     const fetchCoursesList = async () => {
-      const { courses } = await getCoursesList(term.substring(0, 2));
+      const { courses } = await getCoursesList(parseInt(year, 10), term.substring(0, 2));
       setCoursesList(courses);
     };
 
@@ -301,9 +302,11 @@ const App: React.FC = () => {
     const codes: string[] = Array.isArray(data) ? data : [data];
     Promise.all(
       codes.map((code) =>
-        getCourseInfo(term.substring(0, 2), code, term.substring(2), isConvertToLocalTimezone).catch((err) => {
-          return err;
-        }),
+        getCourseInfo(term.substring(0, 2), code, parseInt(term.substring(2), 10), isConvertToLocalTimezone).catch(
+          (err) => {
+            return err;
+          },
+        ),
       ),
     ).then((result) => {
       const addedCourses = result.filter((course) => course.code !== undefined) as CourseData[];
@@ -644,7 +647,7 @@ const App: React.FC = () => {
                   <SubcomPromotion />
                   <PromotionPopup
                     imgSrc={T3SelectGif}
-                    title="Next term's timetable has been released! 🎉"
+                    title="The 2026 Term 1 timetable has been released! 🎉"
                     subTitle="Organise, plan and schedule with newly released timetable"
                     bullets={[
                       {

client/src/api/getCourseInfo.ts

@@ -9,8 +9,8 @@ import { dbCourseToCourseData } from '../utils/DbCourse';
 import { graphQLCourseToDbCourse } from '../utils/graphQLCourseToDbCourse';
 
 const GET_COURSE_INFO = gql`
-  query GetCourseInfo($courseCode: String!, $term: String!, $year: String!) {
-    courses(where: { course_code: { _eq: $courseCode } }) {
+  query GetCourseInfo($courseCode: String!, $term: String!, $year: Int!) {
+    courses(where: { course_code: { _eq: $courseCode }, year: { _eq: $year } }) {
       course_code
       course_name
       classes(where: { term: { _eq: $term }, year: { _eq: $year }, activity: { _neq: "Course Enrolment" } }) {
@@ -105,7 +105,7 @@ const sortUnique = (arr: number[]): number[] => {
 const getCourseInfo = async (
   term: string,
   courseCode: CourseCode,
-  year: string,
+  year: number,
   isConvertToLocalTimezone: boolean,
 ): Promise<CourseData> => {
   try {

client/src/api/getCoursesList.ts

@@ -15,15 +15,16 @@ const toCoursesList = (data: FetchedCourse[]): CoursesList =>
   }));
 
 const GET_COURSE_LIST = gql`
-  query GetCoursesByTerm($term: String!) {
-    courses(where: { terms: { _ilike: $term } }) {
+  query GetCoursesByTerm {
+    courses {
       campus
       career
       faculty
       modes
       school
       course_code
       course_name
+      year
       terms
       uoc
     }
@@ -42,13 +43,14 @@ const GET_COURSE_LIST = gql`
  * @example
  * const coursesList = await getCoursesList('T1')
  */
-const getCoursesList = async (term: string): Promise<CoursesListWithDate> => {
+const getCoursesList = async (year: number, term: string): Promise<CoursesListWithDate> => {
   try {
     const termWithWildcard = `%${term}%`;
-    const { data } = await client.query({ query: GET_COURSE_LIST, variables: { term: termWithWildcard } });
+    const { data } = await client.query({ query: GET_COURSE_LIST });
+    const courses = data.courses.filter((course: any) => course.terms.includes(term) && course.year === year);
 
     return {
-      courses: toCoursesList(data.courses),
+      courses: toCoursesList(courses),
     };
   } catch (error) {
     throw new NetworkError('Could not connect to server');

client/src/components/controls/CustomEvent.tsx

@@ -65,7 +65,7 @@ const CustomEvent: React.FC = () => {
   useEffect(() => {
     const tutoringActivities = ['Tutorial', 'Laboratory', 'Tutorial-Laboratory', 'Workshop', 'Seminar', 'Project'];
     if (courseCode !== '') {
-      getCourseInfo(term.substring(0, 2), courseCode, term.substring(2), isConvertToLocalTimezone)
+      getCourseInfo(term.substring(0, 2), courseCode, parseInt(term.substring(2), 10), isConvertToLocalTimezone)
         .catch((err) => {
           return err;
         })

client/src/components/promotions/PromotionPopup.tsx

@@ -49,7 +49,7 @@ const StyledMedia = styled('img')`
 `;
 
 // Note: this hard-coded value must be incremented for each new release of a promotional banner
-const CURRENT_PROMO_VERSION = 1;
+const CURRENT_PROMO_VERSION = 2;
 const NEW_FEATURE_PROMOTION_KEY = 'newfeatpromo';
 
 const NewFeaturePromotion = ({ imgSrc, title, subTitle, bullets }: PromotionPopupProps) => {

client/src/constants/timetable.ts

@@ -127,7 +127,15 @@ export const getAvailableTermDetails = async () => {
     firstDayOfTerm =
       termMapInfo.get(currTermId)?.startDate?.toLocaleDateString().split('/').reverse().join('-') || 'default-date';
 
-    const termsSortedList: TermDataList = sortTerms(Array.from(termMapInfo.keys()));
+    const termsSortedList: TermDataList = sortTerms(Array.from(termMapInfo.keys())).filter((termId) => {
+      const term = termId.substring(0, 2);
+      const termYear = parseInt(termId.substring(2), 10);
+      if (termYear > parseInt(currTermId.substring(2), 10) && term !== 'U1' && term !== 'T1') {
+        return false;
+      }
+      return true;
+    });
+
     // Store the term details in local storage.
     localStorage.setItem(
       'termData',