Skip to content

Commit

Permalink
fix: remove unused props for CourseDescriptionPanel and CourseMenu af…
Browse files Browse the repository at this point in the history
…ter tokenifying last routes
  • Loading branch information
ollibowers committed Sep 8, 2024
1 parent 75ead8f commit cedc5b3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { useLocation } from 'react-router-dom';
import { useQuery } from '@tanstack/react-query';
import { Typography } from 'antd';
import { CoursesResponse, DegreeResponse, PlannerResponse } from 'types/userResponse';
import { CoursesResponse } from 'types/userResponse';
import { getCourseInfo, getCoursePrereqs, getCoursesUnlockedWhenTaken } from 'utils/api/coursesApi';
import { getCourseTimetable } from 'utils/api/timetableApi';
import getEnrolmentCapacity from 'utils/getEnrolmentCapacity';
Expand Down Expand Up @@ -31,18 +31,14 @@ type CourseDescriptionPanelProps = {
className?: string;
courseCode: string;
onCourseClick?: (code: string) => void;
planner?: PlannerResponse;
courses?: CoursesResponse;
degree?: DegreeResponse;
};

const CourseDescriptionPanel = ({
className,
courseCode,
onCourseClick,
planner,
courses,
degree
courses
}: CourseDescriptionPanelProps) => {
const token = useToken();

Expand Down
5 changes: 2 additions & 3 deletions frontend/src/pages/CourseSelector/CourseMenu/CourseMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { MenuProps } from 'antd';
import { CourseUnitsStructure, MenuDataStructure, MenuDataSubgroup } from 'types/courseMenu';
import { CourseValidation } from 'types/courses';
import { ProgramStructure } from 'types/structure';
import { CoursesResponse, DegreeResponse, PlannerResponse } from 'types/userResponse';
import { CoursesResponse, DegreeResponse } from 'types/userResponse';
import { getAllUnlockedCourses } from 'utils/api/coursesApi';
import { addToUnplanned, removeCourse } from 'utils/api/plannerApi';
import { getProgramStructure } from 'utils/api/programsApi';
Expand All @@ -24,7 +24,6 @@ type SubgroupTitleProps = {
};

type CourseMenuProps = {
planner?: PlannerResponse;
courses?: CoursesResponse;
degree?: DegreeResponse;
};
Expand All @@ -38,7 +37,7 @@ const SubgroupTitle = ({ title, currUOC, totalUOC }: SubgroupTitleProps) => (
</S.SubgroupHeader>
);

const CourseMenu = ({ planner, courses, degree }: CourseMenuProps) => {
const CourseMenu = ({ courses, degree }: CourseMenuProps) => {
const token = useToken();

const inPlanner = (courseId: string) => courses && !!courses[courseId];
Expand Down
15 changes: 2 additions & 13 deletions frontend/src/pages/CourseSelector/CourseSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { useQuery } from '@tanstack/react-query';
import { getUserCourses, getUserDegree, getUserPlanner } from 'utils/api/userApi';
import { getUserCourses, getUserDegree } from 'utils/api/userApi';
import openNotification from 'utils/openNotification';
import infographic from 'assets/infographicFontIndependent.svg';
import CourseDescriptionPanel from 'components/CourseDescriptionPanel';
Expand All @@ -17,11 +17,6 @@ import S from './styles';
const CourseSelector = () => {
const token = useToken();

const plannerQuery = useQuery({
queryKey: ['planner'],
queryFn: () => getUserPlanner(token)
});

const coursesQuery = useQuery({
queryKey: ['courses'],
queryFn: () => getUserCourses(token)
Expand Down Expand Up @@ -88,19 +83,13 @@ const CourseSelector = () => {
<CourseBanner courses={coursesQuery.data} />
<CourseTabs />
<S.ContentWrapper $offset={menuOffset}>
<CourseMenu
planner={plannerQuery.data}
courses={coursesQuery.data}
degree={degreeQuery.data}
/>
<CourseMenu courses={coursesQuery.data} degree={degreeQuery.data} />
<S.ContentResizer ref={divRef} $offset={menuOffset} />
{courseCode ? (
<div style={{ overflow: 'auto' }}>
<CourseDescriptionPanel
courseCode={courseCode}
planner={plannerQuery.data}
courses={coursesQuery.data}
degree={degreeQuery.data}
onCourseClick={onCourseClick}
/>
</div>
Expand Down

0 comments on commit cedc5b3

Please sign in to comment.