working through test fixes

Author: jkachel

frontends/api/src/mitxonline/hooks/courses/queries.ts

@@ -26,13 +26,20 @@ const coursesQueries = {
   coursesListInfinite: (opts?: CoursesApiApiV2CoursesListRequest) =>
     infiniteQueryOptions({
       queryKey: coursesKeys.coursesList(opts),
-      queryFn:
-        async ({ pageParam = 1 }): Promise<PaginatedCourseWithCourseRunsSerializerV2List> => {
-          return coursesApi.apiV2CoursesList({ ...opts, page: pageParam }).then((res) => res.data)
-        },
+      queryFn: async ({
+        pageParam = 1,
+      }): Promise<PaginatedCourseWithCourseRunsSerializerV2List> => {
+        return coursesApi
+          .apiV2CoursesList({ ...opts, page: pageParam })
+          .then((res) => res.data)
+      },
       initialPageParam: 1,
       getNextPageParam: (lastPage, allPages, pageParam): number | null => {
-        return lastPage && lastPage.next ? (pageParam ? pageParam + 1 : null) : null
+        return lastPage && lastPage.next
+          ? pageParam
+            ? pageParam + 1
+            : null
+          : null
       },
     }),
 }

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/test-utils.ts

@@ -154,13 +154,13 @@ const setupProgramsAndCourses = () => {
     { results: [programB] },
   )
   setMockResponse.get(
-    urls.courses.coursesList({ id: programA.courses, org_id: orgX.id }),
+    urls.courses.coursesList({ id: programA.courses, org_id: orgX.id, page: 1 }),
     {
       results: coursesA.results,
     },
   )
   setMockResponse.get(
-    urls.courses.coursesList({ id: programB.courses, org_id: orgX.id }),
+    urls.courses.coursesList({ id: programB.courses, org_id: orgX.id, page: 1 }),
     {
       results: coursesB.results,
     },
@@ -262,6 +262,7 @@ function setupOrgDashboardMocks(
       mitxonline.urls.courses.coursesList({
         id: program.courses,
         org_id: org.id,
+        page: 1,
       }),
       { results: courses },
     )

frontends/main/src/app-pages/DashboardPage/OrganizationContent.test.tsx

@@ -144,6 +144,8 @@ describe("OrganizationContent", () => {
       { results: coursesB },
     )
 
+    console.log(coursesA, coursesB)
+
     renderWithProviders(<OrganizationContent orgSlug={orgX.slug} />)
 
     const collectionHeader = await screen.findByRole("heading", {
@@ -156,6 +158,7 @@ describe("OrganizationContent", () => {
     expect(collectionItems.length).toBe(1)
     const collection = within(collectionItems[0])
     expect(collection.getByText(programCollection.title)).toBeInTheDocument()
+    console.log(collectionItems[0])
 
     // Wait for the course data to load and check that courses are displayed
     await waitFor(() => {

frontends/main/src/app-pages/DashboardPage/OrganizationContent.tsx

@@ -1,6 +1,6 @@
 "use client"
 
-import React, { useMemo } from "react"
+import React from "react"
 import DOMPurify from "dompurify"
 import Image from "next/image"
 import { useFeatureFlagEnabled } from "posthog-js/react"
@@ -251,7 +251,10 @@ const OrgProgramDisplay: React.FC<{
   )
   const hasValidCertificate = !!programEnrollment?.certificate
   const courses = useInfiniteQuery(
-    coursesQueries.coursesListInfinite({ id: program.courseIds, org_id: orgId }),
+    coursesQueries.coursesListInfinite({
+      id: program.courseIds,
+      org_id: orgId,
+    }),
   )
   const skeleton = (
     <Skeleton width="100%" height="65px" style={{ marginBottom: "16px" }} />
@@ -261,7 +264,7 @@ const OrgProgramDisplay: React.FC<{
   if (courses.hasNextPage && !courses.isFetching) courses.fetchNextPage()
 
   const transformedCourses = transform.mitxonlineOrgCourses({
-    courses: (() =>{
+    courses: (() => {
       let courseData: Array<CourseWithCourseRunsSerializerV2> = []
 
       for (const page of courses.data?.pages || []) {