Skip to content

Commit 9230d5c

Browse files
committed
set page_size explicitly when we can
1 parent cc382dc commit 9230d5c

2 files changed

Lines changed: 66 additions & 16 deletions

File tree

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.test.tsx

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ describe("EnrollmentDisplay", () => {
202202
setMockResponse.get(
203203
mitxonline.urls.programs.programsList({
204204
id: [programAsCourseProgram.id],
205+
page_size: 1,
205206
}),
206207
{
207208
count: 1,
@@ -213,6 +214,7 @@ describe("EnrollmentDisplay", () => {
213214
setMockResponse.get(
214215
mitxonline.urls.courses.coursesList({
215216
id: programAsCourseProgram.courses,
217+
page_size: programAsCourseProgram.courses.length,
216218
}),
217219
programAsCourseCourses,
218220
)
@@ -558,7 +560,10 @@ describe("EnrollmentDisplay", () => {
558560
)
559561
setMockResponse.get(mitxonline.urls.programs.programDetail(123), program)
560562
setMockResponse.get(
561-
mitxonline.urls.courses.coursesList({ id: program.courses }),
563+
mitxonline.urls.courses.coursesList({
564+
id: program.courses,
565+
page_size: program.courses.length,
566+
}),
562567
courses,
563568
)
564569
// Also mock the undefined id case (when program data isn't loaded yet)
@@ -620,7 +625,10 @@ describe("EnrollmentDisplay", () => {
620625
)
621626
setMockResponse.get(mitxonline.urls.programs.programDetail(456), program)
622627
setMockResponse.get(
623-
mitxonline.urls.courses.coursesList({ id: program.courses }),
628+
mitxonline.urls.courses.coursesList({
629+
id: program.courses,
630+
page_size: program.courses.length,
631+
}),
624632
courses,
625633
)
626634
// Also mock the undefined id case (when program data isn't loaded yet)
@@ -732,11 +740,17 @@ describe("EnrollmentDisplay", () => {
732740
parentProgram,
733741
)
734742
setMockResponse.get(
735-
mitxonline.urls.courses.coursesList({ id: parentProgram.courses }),
743+
mitxonline.urls.courses.coursesList({
744+
id: parentProgram.courses,
745+
page_size: parentProgram.courses.length,
746+
}),
736747
parentCourses,
737748
)
738749
setMockResponse.get(
739-
mitxonline.urls.programs.programsList({ id: [900] }),
750+
mitxonline.urls.programs.programsList({
751+
id: [900],
752+
page_size: 1,
753+
}),
740754
{
741755
count: 1,
742756
next: null,
@@ -749,7 +763,10 @@ describe("EnrollmentDisplay", () => {
749763
programAsCourseProgram,
750764
)
751765
setMockResponse.get(
752-
mitxonline.urls.courses.coursesList({ id: [11, 12] }),
766+
mitxonline.urls.courses.coursesList({
767+
id: [11, 12],
768+
page_size: 2,
769+
}),
753770
programAsCourseCourses,
754771
)
755772

@@ -813,7 +830,10 @@ describe("EnrollmentDisplay", () => {
813830
)
814831
setMockResponse.get(mitxonline.urls.programs.programDetail(789), program)
815832
setMockResponse.get(
816-
mitxonline.urls.courses.coursesList({ id: program.courses }),
833+
mitxonline.urls.courses.coursesList({
834+
id: program.courses,
835+
page_size: program.courses.length,
836+
}),
817837
courses,
818838
)
819839
// Also mock the undefined id case
@@ -919,7 +939,10 @@ describe("EnrollmentDisplay", () => {
919939
)
920940
setMockResponse.get(mitxonline.urls.programs.programDetail(777), program)
921941
setMockResponse.get(
922-
mitxonline.urls.courses.coursesList({ id: program.courses }),
942+
mitxonline.urls.courses.coursesList({
943+
id: program.courses,
944+
page_size: program.courses.length,
945+
}),
923946
courses,
924947
)
925948

@@ -1018,7 +1041,10 @@ describe("EnrollmentDisplay", () => {
10181041
)
10191042
setMockResponse.get(mitxonline.urls.programs.programDetail(666), program)
10201043
setMockResponse.get(
1021-
mitxonline.urls.courses.coursesList({ id: program.courses }),
1044+
mitxonline.urls.courses.coursesList({
1045+
id: program.courses,
1046+
page_size: program.courses.length,
1047+
}),
10221048
courses,
10231049
)
10241050

@@ -1108,7 +1134,10 @@ describe("EnrollmentDisplay", () => {
11081134
)
11091135
setMockResponse.get(mitxonline.urls.programs.programDetail(999), program)
11101136
setMockResponse.get(
1111-
mitxonline.urls.courses.coursesList({ id: program.courses }),
1137+
mitxonline.urls.courses.coursesList({
1138+
id: program.courses,
1139+
page_size: program.courses.length,
1140+
}),
11121141
courses,
11131142
)
11141143

@@ -1215,7 +1244,10 @@ describe("EnrollmentDisplay", () => {
12151244
)
12161245
setMockResponse.get(mitxonline.urls.programs.programDetail(888), program)
12171246
setMockResponse.get(
1218-
mitxonline.urls.courses.coursesList({ id: program.courses }),
1247+
mitxonline.urls.courses.coursesList({
1248+
id: program.courses,
1249+
page_size: program.courses.length,
1250+
}),
12191251
courses,
12201252
)
12211253

@@ -1306,7 +1338,10 @@ describe("EnrollmentDisplay", () => {
13061338
program,
13071339
)
13081340
setMockResponse.get(
1309-
mitxonline.urls.courses.coursesList({ id: program.courses }),
1341+
mitxonline.urls.courses.coursesList({
1342+
id: program.courses,
1343+
page_size: program.courses.length,
1344+
}),
13101345
courses,
13111346
)
13121347

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,10 @@ const ProgramEnrollmentDisplay: React.FC<ProgramEnrollmentDisplayProps> = ({
367367
)
368368

369369
const { data: programCourses, isLoading: programCoursesLoading } = useQuery({
370-
...coursesQueries.coursesList({ id: program?.courses || [] }),
370+
...coursesQueries.coursesList({
371+
id: program?.courses || [],
372+
page_size: program?.courses?.length || undefined,
373+
}),
371374
enabled: !!program && program.courses.length > 0 && enrolledInProgram,
372375
})
373376

@@ -379,7 +382,10 @@ const ProgramEnrollmentDisplay: React.FC<ProgramEnrollmentDisplayProps> = ({
379382

380383
const { data: requiredPrograms, isLoading: requiredProgramsLoading } =
381384
useQuery({
382-
...programsQueries.programsList({ id: requiredProgramIds }),
385+
...programsQueries.programsList({
386+
id: requiredProgramIds,
387+
page_size: requiredProgramIds.length || undefined,
388+
}),
383389
enabled: Boolean(enrolledInProgram && requiredProgramIds.length > 0),
384390
})
385391

@@ -404,7 +410,10 @@ const ProgramEnrollmentDisplay: React.FC<ProgramEnrollmentDisplayProps> = ({
404410
data: requiredProgramCourses,
405411
isLoading: requiredProgramCoursesLoading,
406412
} = useQuery({
407-
...coursesQueries.coursesList({ id: programAsCourseCourseIds }),
413+
...coursesQueries.coursesList({
414+
id: programAsCourseCourseIds,
415+
page_size: programAsCourseCourseIds.length || undefined,
416+
}),
408417
enabled: Boolean(enrolledInProgram && programAsCourseCourseIds.length > 0),
409418
})
410419

@@ -722,7 +731,10 @@ const AllEnrollmentsDisplay: React.FC = () => {
722731

723732
const { data: homeCoursePrograms, isLoading: homeCourseProgramsLoading } =
724733
useQuery({
725-
...programsQueries.programsList({ id: programAsCourseProgramIds }),
734+
...programsQueries.programsList({
735+
id: programAsCourseProgramIds,
736+
page_size: programAsCourseProgramIds.length || undefined,
737+
}),
726738
enabled: programAsCourseProgramIds.length > 0,
727739
})
728740

@@ -740,7 +752,10 @@ const AllEnrollmentsDisplay: React.FC = () => {
740752
data: homeCourseProgramModuleCourses,
741753
isLoading: homeCourseProgramModuleCoursesLoading,
742754
} = useQuery({
743-
...coursesQueries.coursesList({ id: homeCourseProgramModuleIds }),
755+
...coursesQueries.coursesList({
756+
id: homeCourseProgramModuleIds,
757+
page_size: homeCourseProgramModuleIds.length || undefined,
758+
}),
744759
enabled: homeCourseProgramModuleIds.length > 0,
745760
})
746761

0 commit comments

Comments
 (0)