More upstream fixes

Author: gumaerc

frontends/api/src/mitxonline/test-utils/factories/courses.ts

@@ -1,14 +1,16 @@
 import { mergeOverrides, makePaginatedFactory } from "ol-test-utilities"
 import type { PartialFactory } from "ol-test-utilities"
-import type { V2CourseWithCourseRuns } from "@mitodl/mitxonline-api-axios/v2"
+import type { CourseWithCourseRunsSerializerV2 } from "@mitodl/mitxonline-api-axios/v2"
 import { faker } from "@faker-js/faker/locale/en"
 import { UniqueEnforcer } from "enforce-unique"
 
 const uniqueCourseId = new UniqueEnforcer()
 const uniqueCourseRunId = new UniqueEnforcer()
 
-const course: PartialFactory<V2CourseWithCourseRuns> = (overrides = {}) => {
-  const defaults: V2CourseWithCourseRuns = {
+const course: PartialFactory<CourseWithCourseRunsSerializerV2> = (
+  overrides = {},
+) => {
+  const defaults: CourseWithCourseRunsSerializerV2 = {
     id: uniqueCourseId.enforce(() => faker.number.int()),
     title: faker.lorem.words(3),
     readable_id: faker.lorem.slug(),
@@ -86,7 +88,7 @@ const course: PartialFactory<V2CourseWithCourseRuns> = (overrides = {}) => {
     ingest_content_files_for_ai: faker.datatype.boolean(),
   }
 
-  return mergeOverrides<V2CourseWithCourseRuns>(defaults, overrides)
+  return mergeOverrides<CourseWithCourseRunsSerializerV2>(defaults, overrides)
 }
 
 const courses = makePaginatedFactory(course)

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/transform.ts

@@ -6,7 +6,7 @@
 
 import {
   CourseRunEnrollment,
-  V2CourseWithCourseRuns,
+  CourseWithCourseRunsSerializerV2,
   V2Program,
   V2ProgramCollection,
 } from "@mitodl/mitxonline-api-axios/v2"
@@ -72,7 +72,7 @@ const mitxonlineEnrollments = (data: CourseRunEnrollment[]) =>
   data.map((course) => mitxonlineEnrollment(course))
 
 const mitxonlineUnenrolledCourse = (
-  course: V2CourseWithCourseRuns,
+  course: CourseWithCourseRunsSerializerV2,
 ): DashboardCourse => {
   const run = course.courseruns.find((run) => run.id === course.next_run_id)
   return {
@@ -98,7 +98,7 @@ const mitxonlineUnenrolledCourse = (
 }
 
 const mitxonlineCourses = (raw: {
-  courses: V2CourseWithCourseRuns[]
+  courses: CourseWithCourseRunsSerializerV2[]
   enrollments: CourseRunEnrollment[]
 }) => {
   const enrollmentsByCourseId = groupBy(