alex/canvasManagement
1
0
Fork 0
mirror of https://github.com/alexmickelson/canvasManagement.git synced 2026-03-26 07:38:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

improving sidebar

Browse Source
This commit is contained in:
Alex Mickelson
2024-09-19 22:30:30 -06:00
parent dc66c704da
commit 65cdb15e1c
11 changed files with 52 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nextjs/src/app/course/[courseName]/calendar/CalendarMonth.tsx
View File

@@ -62,7 +62,7 @@ function CalendarWeek({
monthNumber: number; monthNumber: number;
}) { }) {
return ( return (
<div className="grid grid-cols-7 m-1"> <div className="grid grid-cols-7">
{week.map((day, dayIndex) => ( {week.map((day, dayIndex) => (
<Day key={dayIndex} day={day} month={monthNumber} /> <Day key={dayIndex} day={day} month={monthNumber} />
))} ))}

16
nextjs/src/app/course/[courseName]/calendar/CourseCalendar.tsx
View File

@@ -25,19 +25,21 @@ export default function CourseCalendar() {
return ( return (
<div <div
className=" className="
h-full min-h-0
overflow-y-scroll
border-4 border-4
border-gray-900 border-gray-900
rounded-xl rounded-xl
bg-slate-950 bg-slate-950
p-1
" "
> >
<CalendarItemsContextProvider> <div className="h-full overflow-y-scroll pe-1">
{months.map((month) => ( <CalendarItemsContextProvider>
<CalendarMonth key={month.month + "" + month.year} month={month} /> {months.map((month) => (
))} <CalendarMonth key={month.month + "" + month.year} month={month} />
</CalendarItemsContextProvider> ))}
</CalendarItemsContextProvider>
</div>
</div> </div>
); );
} }

31
nextjs/src/app/course/[courseName]/modules/ExpandableModule.tsx
View File

@@ -12,14 +12,15 @@ import {
useQuizzesQueries, useQuizzesQueries,
} from "@/hooks/localCourse/quizHooks"; } from "@/hooks/localCourse/quizHooks";
import { IModuleItem } from "@/models/local/IModuleItem"; import { IModuleItem } from "@/models/local/IModuleItem";
import { getDateFromStringOrThrow } from "@/models/local/timeUtils"; import {
import { Suspense, useEffect, useRef, useState } from "react"; dateToMarkdownString,
getDateFromString,
getDateFromStringOrThrow,
getDateOnlyMarkdownString,
} from "@/models/local/timeUtils";
import { Fragment, useRef, useState } from "react";
import Modal from "../../../../components/Modal"; import Modal from "../../../../components/Modal";
import NewItemForm from "./NewItemForm"; import NewItemForm from "./NewItemForm";
import { useCanvasModulesQuery } from "@/hooks/canvas/canvasModuleHooks";
import { Spinner } from "@/components/Spinner";
import { SuspenseAndErrorHandling } from "@/components/SuspenseAndErrorHandling";
import { isServer } from "@tanstack/react-query";
import { ModuleCanvasStatus } from "./ModuleCanvasStatus"; import { ModuleCanvasStatus } from "./ModuleCanvasStatus";
import ClientOnly from "@/components/ClientOnly"; import ClientOnly from "@/components/ClientOnly";
import ExpandIcon from "../../../../components/icons/ExpandIcon"; import ExpandIcon from "../../../../components/icons/ExpandIcon";
@@ -107,9 +108,21 @@ export default function ExpandableModule({
</div> </div>
)} )}
</Modal> </Modal>
{moduleItems.map(({ type, item }) => ( <div className="grid grid-cols-[auto_1fr]">
<div key={item.name}>{item.name}</div>
))} {moduleItems.map(({ type, item }) => {
const date = getDateFromString(item.dueAt);
return (
<Fragment key={item.name + type}>
<div className="text-end text-slate-500 me-2">
{date && getDateOnlyMarkdownString(date)}
</div>
<div className="">{item.name}</div>
</Fragment>
);
})}
</div>
</div> </div>
</div> </div>
); );

3
nextjs/src/app/course/[courseName]/modules/[moduleName]/assignment/[assignmentName]/EditAssignment.tsx
View File

@@ -90,8 +90,7 @@ export default function EditAssignment({
<div className="text-red-300">{error && error}</div> <div className="text-red-300">{error && error}</div>
<div className="px-3 h-full"> <div className="px-3 h-full">
<AssignmentPreview assignment={assignment} />
<AssignmentPreview assignment={assignment} />
</div> </div>
</div> </div>
</div> </div>

6
nextjs/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPage.tsx
View File

@@ -9,10 +9,6 @@ import { localPageMarkdownUtils } from "@/models/local/page/localCoursePage";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import PagePreview from "./PagePreview"; import PagePreview from "./PagePreview";
import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks"; import { useLocalCourseSettingsQuery } from "@/hooks/localCourse/localCoursesHooks";
import {
useCanvasPagesQuery,
useCreateCanvasPageMutation,
} from "@/hooks/canvas/canvasPageHooks";
import EditPageButtons from "./EditPageButtons"; import EditPageButtons from "./EditPageButtons";
import ClientOnly from "@/components/ClientOnly"; import ClientOnly from "@/components/ClientOnly";
@@ -29,7 +25,6 @@ export default function EditPage({
localPageMarkdownUtils.toMarkdown(page) localPageMarkdownUtils.toMarkdown(page)
); );
const [error, setError] = useState(""); const [error, setError] = useState("");
const { data: settings } = useLocalCourseSettingsQuery(); const { data: settings } = useLocalCourseSettingsQuery();
useEffect(() => { useEffect(() => {
@@ -78,7 +73,6 @@ export default function EditPage({
<EditPageButtons <EditPageButtons
pageName={pageName} pageName={pageName}
moduleName={moduleName} moduleName={moduleName}
courseCanvasId={settings.canvasId}
/> />
</ClientOnly> </ClientOnly>
)} )}

10
nextjs/src/app/course/[courseName]/modules/[moduleName]/page/[pageName]/EditPageButtons.tsx
View File

@@ -16,19 +16,17 @@ import React from "react";
export default function EditPageButtons({ export default function EditPageButtons({
moduleName, moduleName,
pageName, pageName,
courseCanvasId,
}: { }: {
pageName: string; pageName: string;
moduleName: string; moduleName: string;
courseCanvasId: number;
}) { }) {
const { courseName } = useCourseContext(); const { courseName } = useCourseContext();
const { data: settings } = useLocalCourseSettingsQuery(); const { data: settings } = useLocalCourseSettingsQuery();
const { data: page } = usePageQuery(moduleName, pageName); const { data: page } = usePageQuery(moduleName, pageName);
const { data: canvasPages } = useCanvasPagesQuery(courseCanvasId); const { data: canvasPages } = useCanvasPagesQuery();
const createPageInCanvas = useCreateCanvasPageMutation(courseCanvasId); const createPageInCanvas = useCreateCanvasPageMutation();
const updatePageInCanvas = useUpdateCanvasPageMutation(courseCanvasId); const updatePageInCanvas = useUpdateCanvasPageMutation();
const deletePageInCanvas = useDeleteCanvasPageMutation(courseCanvasId); const deletePageInCanvas = useDeleteCanvasPageMutation();
const pageInCanvas = canvasPages?.find((p) => p.title === pageName); const pageInCanvas = canvasPages?.find((p) => p.title === pageName);

25
nextjs/src/hooks/canvas/canvasPageHooks.ts
View File

@@ -4,9 +4,9 @@ import { useMutation, useQuery, useQueryClient, useSuspenseQuery } from "@tansta
import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks"; import { useLocalCourseSettingsQuery } from "../localCourse/localCoursesHooks";
export const canvasPageKeys = { export const canvasPageKeys = {
pagesInCourse: (canvasCourseId: number) => [ pagesInCourse: (courseCanvasId: number) => [
"canvas", "canvas",
canvasCourseId, courseCanvasId,
"pages", "pages",
], ],
}; };
@@ -19,20 +19,22 @@ export const useCanvasPagesQuery = () => {
}); });
}; };
export const useCreateCanvasPageMutation = (canvasCourseId: number) => { export const useCreateCanvasPageMutation = () => {
const { data: settings } = useLocalCourseSettingsQuery();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: async (page: LocalCoursePage) => mutationFn: async (page: LocalCoursePage) =>
canvasPageService.create(canvasCourseId, page), canvasPageService.create(settings.canvasId, page),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryClient.invalidateQueries({
queryKey: canvasPageKeys.pagesInCourse(canvasCourseId), queryKey: canvasPageKeys.pagesInCourse(settings.canvasId),
}); });
}, },
}); });
}; };
export const useUpdateCanvasPageMutation = (canvasCourseId: number) => { export const useUpdateCanvasPageMutation = () => {
const { data: settings } = useLocalCourseSettingsQuery();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: async ({ mutationFn: async ({
@@ -41,23 +43,24 @@ export const useUpdateCanvasPageMutation = (canvasCourseId: number) => {
}: { }: {
page: LocalCoursePage; page: LocalCoursePage;
canvasPageId: number; canvasPageId: number;
}) => canvasPageService.update(canvasCourseId, canvasPageId, page), }) => canvasPageService.update(settings.canvasId, canvasPageId, page),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryClient.invalidateQueries({
queryKey: canvasPageKeys.pagesInCourse(canvasCourseId), queryKey: canvasPageKeys.pagesInCourse(settings.canvasId),
}); });
}, },
}); });
}; };
export const useDeleteCanvasPageMutation = (canvasCourseId: number) => { export const useDeleteCanvasPageMutation = () => {
const { data: settings } = useLocalCourseSettingsQuery();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: async (canvasPageId: number) => mutationFn: async (canvasPageId: number) =>
canvasPageService.delete(canvasCourseId, canvasPageId), canvasPageService.delete(settings.canvasId, canvasPageId),
onSuccess: () => { onSuccess: () => {
queryClient.invalidateQueries({ queryClient.invalidateQueries({
queryKey: canvasPageKeys.pagesInCourse(canvasCourseId), queryKey: canvasPageKeys.pagesInCourse(settings.canvasId),
}); });
}, },
}); });

4
nextjs/src/services/canvas/canvasService.ts
View File

@@ -1,8 +1,6 @@
import { CanvasEnrollmentTermModel } from "@/models/canvas/enrollmentTerms/canvasEnrollmentTermModel"; import { CanvasEnrollmentTermModel } from "@/models/canvas/enrollmentTerms/canvasEnrollmentTermModel";
import { canvasApi, canvasServiceUtils } from "./canvasServiceUtils"; import { canvasApi } from "./canvasServiceUtils";
import { CanvasCourseModel } from "@/models/canvas/courses/canvasCourseModel"; import { CanvasCourseModel } from "@/models/canvas/courses/canvasCourseModel";
import { CanvasModuleItem } from "@/models/canvas/modules/canvasModuleItems";
import { CanvasPage } from "@/models/canvas/pages/canvasPageModel";
import { CanvasEnrollmentModel } from "@/models/canvas/enrollments/canvasEnrollmentModel"; import { CanvasEnrollmentModel } from "@/models/canvas/enrollments/canvasEnrollmentModel";
import { axiosClient } from "../axiosUtils"; import { axiosClient } from "../axiosUtils";

152
nextjs/src/services/fileStorage/utils/courseDifferences.ts
View File

@@ -1,152 +0,0 @@
import { LocalCourse, LocalCourseSettings } from "@/models/local/localCourse";
import { LocalModule } from "@/models/local/localModules";
export const CourseDifferences = {
getDeletedChanges(
newCourse: LocalCourse,
oldCourse: LocalCourse
): DeleteCourseChanges {
if (newCourse === oldCourse) {
const emptyDeletes: DeleteCourseChanges = {
namesOfModulesToDeleteCompletely: [],
deleteContentsOfModule: [],
};
return emptyDeletes;
}
const moduleNamesNoLongerReferenced = oldCourse.modules
.filter(
(oldModule) =>
!newCourse.modules.some(
(newModule) => newModule.name === oldModule.name
)
)
.map((oldModule) => oldModule.name);
const modulesWithDeletions = oldCourse.modules
.filter(
(oldModule) =>
!newCourse.modules.some(
(newModule) =>
JSON.stringify(newModule) === JSON.stringify(oldModule)
)
)
.map((oldModule) => {
const newModule = newCourse.modules.find(
(m) => m.name === oldModule.name
);
if (!newModule) return oldModule;
const unreferencedAssignments = oldModule.assignments.filter(
(oldAssignment) =>
!newModule.assignments.some(
(newAssignment) => newAssignment.name === oldAssignment.name
)
);
const unreferencedQuizzes = oldModule.quizzes.filter(
(oldQuiz) =>
!newModule.quizzes.some((newQuiz) => newQuiz.name === oldQuiz.name)
);
const unreferencedPages = oldModule.pages.filter(
(oldPage) =>
!newModule.pages.some((newPage) => newPage.name === oldPage.name)
);
return {
...oldModule,
assignments: unreferencedAssignments,
quizzes: unreferencedQuizzes,
pages: unreferencedPages,
};
});
return {
namesOfModulesToDeleteCompletely: moduleNamesNoLongerReferenced,
deleteContentsOfModule: modulesWithDeletions,
};
},
getNewChanges(
newCourse: LocalCourse,
oldCourse: LocalCourse
): NewCourseChanges {
if (newCourse === oldCourse) {
const emptyChanges: NewCourseChanges = {
modules: [],
};
return emptyChanges;
}
const differentModules = newCourse.modules
.filter(
(newModule) =>
!oldCourse.modules.some(
(oldModule) =>
JSON.stringify(oldModule) === JSON.stringify(newModule)
)
)
.map((newModule) => {
const oldModule = oldCourse.modules.find(
(m) => m.name === newModule.name
);
if (!oldModule) return newModule;
const newAssignments = newModule.assignments.filter(
(newAssignment) =>
!oldModule.assignments.some(
(oldAssignment) =>
JSON.stringify(newAssignment) === JSON.stringify(oldAssignment)
)
);
const newQuizzes = newModule.quizzes.filter(
(newQuiz) =>
!oldModule.quizzes.some(
(oldQuiz) => JSON.stringify(newQuiz) === JSON.stringify(oldQuiz)
)
);
const newPages = newModule.pages.filter(
(newPage) =>
!oldModule.pages.some(
(oldPage) => JSON.stringify(newPage) === JSON.stringify(oldPage)
)
);
return {
...newModule,
assignments: newAssignments,
quizzes: newQuizzes,
pages: newPages,
};
});
return {
settings: newCourse.settings,
modules: differentModules,
};
},
};
export interface DeleteCourseChanges {
namesOfModulesToDeleteCompletely: string[];
deleteContentsOfModule: LocalModule[];
}
export interface NewCourseChanges {
modules: LocalModule[];
settings?: LocalCourseSettings;
}
// Default values for DeleteCourseChanges and NewCourseChanges
// export const createDeleteCourseChanges = (
// init?: Partial<DeleteCourseChanges>
// ): DeleteCourseChanges => ({
// namesOfModulesToDeleteCompletely: init?.namesOfModulesToDeleteCompletely ?? [],
// deleteContentsOfModule: init?.deleteContentsOfModule ?? [],
// });
// export const createNewCourseChanges = (
// init?: Partial<NewCourseChanges>
// ): NewCourseChanges => ({
// modules: init?.modules ?? [],
// settings: init?.settings,
// });

587
nextjs/src/services/tests/courseDifferenceChanges.test.ts
View File

@@ -1,587 +0,0 @@
import { describe, it, expect } from "vitest";
import { LocalCourse } from "@/models/local/localCourse";
import { CourseDifferences } from "../fileStorage/utils/courseDifferences";
import { AssignmentSubmissionType } from "@/models/local/assignment/assignmentSubmissionType";
describe("CourseDifferencesChangesTests", () => {
// it("can detect new settings", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// settings: {
// ...oldCourse.settings,
// name: "new course name",
// },
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(0);
// expect(differences.settings).not.toBeNull();
// expect(differences.settings?.name).toBe("new course name");
// });
// it("can detect new module", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).not.toBeNull();
// expect(differences.modules).toHaveLength(1);
// expect(differences.modules?.[0].name).toBe("new module");
// });
// it("can detect changed assignment", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [
// {
// name: "test assignment",
// description: "",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "new module",
// assignments: [
// {
// name: "test assignment",
// description: "new description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).not.toBeNull();
// expect(differences.modules).toHaveLength(1);
// expect(differences.modules?.[0].assignments?.[0].description).toBe(
// "new description"
// );
// });
// it("can properly ignore unchanged modules", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [
// {
// name: "test assignment",
// description: "",
// dueAt: commonDate,
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(0);
// });
// it("only changed assignment represented", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [
// {
// name: "test assignment",
// description: "",
// dueAt: commonDate,
// submissionTypes: [AssignmentSubmissionType.ONLINE_UPLOAD],
// allowedFileUploadExtensions: [],
// rubric: [{ points: 1, label: "rubric" }],
// },
// {
// name: "test assignment 2",
// description: "",
// dueAt: commonDate,
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "new module",
// assignments: [
// {
// name: "test assignment",
// description: "",
// dueAt: commonDate,
// submissionTypes: [AssignmentSubmissionType.ONLINE_UPLOAD],
// allowedFileUploadExtensions: [],
// rubric: [{ points: 1, label: "rubric" }],
// },
// {
// name: "test assignment 2 with a new name",
// description: "",
// dueAt: commonDate,
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(1);
// expect(differences.modules?.[0].assignments).toHaveLength(1);
// expect(differences.modules?.[0].assignments?.[0].name).toBe(
// "test assignment 2 with a new name"
// );
// });
// it("identical quizzes ignored", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [
// {
// name: "Test Quiz",
// description: "this is my description",
// dueAt: commonDate,
// shuffleAnswers: true,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: -1,
// questions: [],
// },
// ],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(0);
// });
// it("can detect different quiz", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [
// {
// name: "Test Quiz",
// description: "this is my description",
// dueAt: commonDate,
// shuffleAnswers: true,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: -1,
// questions: [],
// },
// ],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [
// {
// name: "Test Quiz",
// description: "this is my description",
// dueAt: commonDate,
// shuffleAnswers: true,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: -1,
// questions: [],
// lockAt: "12/31/9999 23:59:59",
// },
// ],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(1);
// expect(differences.modules?.[0].quizzes).toHaveLength(1);
// expect(differences.modules?.[0].quizzes?.[0].lockAt).toBe(
// "12/31/9999 23:59:59"
// );
// });
// it("can detect only different quiz when other quizzes stay", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [
// {
// name: "Test Quiz",
// description: "this is my description",
// dueAt: commonDate,
// shuffleAnswers: true,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: -1,
// questions: [],
// },
// ],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [
// {
// name: "Test Quiz",
// description: "this is my description",
// dueAt: commonDate,
// shuffleAnswers: true,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: -1,
// questions: [],
// },
// {
// name: "Test Quiz 2",
// description: "this is my description",
// dueAt: commonDate,
// shuffleAnswers: true,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: -1,
// questions: [],
// },
// ],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(1);
// expect(differences.modules?.[0].quizzes).toHaveLength(1);
// expect(differences.modules?.[0].quizzes?.[0].name).toBe("Test Quiz 2");
// });
// it("same pages not detected", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [],
// pages: [
// {
// name: "test page",
// text: "test description",
// dueAt: commonDate,
// },
// ],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(0);
// });
// it("different page detected", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [],
// pages: [
// {
// name: "test page",
// text: "test description",
// dueAt: commonDate,
// },
// ],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [],
// pages: [
// {
// name: "test page",
// text: "test description changed",
// dueAt: commonDate,
// },
// ],
// },
// ],
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(1);
// expect(differences.modules?.[0].pages).toHaveLength(1);
// expect(differences.modules?.[0].pages?.[0].text).toBe(
// "test description changed"
// );
// });
// it("different page detected but not same page", () => {
// const commonDate = "07/09/2024 23:59:00";
// const oldCourse: LocalCourse = {
// settings: {
// name: "Test Course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: commonDate,
// endDate: commonDate,
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [],
// pages: [
// {
// name: "test page",
// text: "test description",
// dueAt: commonDate,
// },
// ],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "new module",
// assignments: [],
// quizzes: [],
// pages: [
// {
// name: "test page",
// text: "test description",
// dueAt: commonDate,
// },
// {
// name: "test page 2",
// text: "test description",
// dueAt: commonDate,
// },
// ],
// },
// ],
// };
// const differences = CourseDifferences.getNewChanges(newCourse, oldCourse);
// expect(differences.modules).toHaveLength(1);
// expect(differences.modules?.[0].pages).toHaveLength(1);
// expect(differences.modules?.[0].pages?.[0].name).toBe("test page 2");
// });
});

451
nextjs/src/services/tests/courseDifferencesDeletions.test.ts
View File

@@ -1,451 +0,0 @@
import { describe, it, expect } from "vitest";
import { LocalCourse } from "@/models/local/localCourse";
import { CourseDifferences } from "../fileStorage/utils/courseDifferences";
describe("CourseDifferencesDeletionsTests", () => {
// it("same module does not get deleted", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "test course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "test module",
// assignments: [],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "test module",
// assignments: [],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getDeletedChanges(
// newCourse,
// oldCourse
// );
// expect(differences.namesOfModulesToDeleteCompletely).toHaveLength(0);
// });
// it("changed module - old one gets deleted", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "test course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "test module",
// assignments: [],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "test module 2",
// assignments: [],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getDeletedChanges(
// newCourse,
// oldCourse
// );
// expect(differences.namesOfModulesToDeleteCompletely).toHaveLength(1);
// expect(differences.namesOfModulesToDeleteCompletely[0]).toBe("test module");
// });
// it("new assignment name gets deleted", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "test course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "test module",
// assignments: [
// {
// name: "test assignment",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "test module",
// assignments: [
// {
// name: "test assignment changed name",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getDeletedChanges(
// newCourse,
// oldCourse
// );
// expect(differences.namesOfModulesToDeleteCompletely).toHaveLength(0);
// expect(differences.deleteContentsOfModule).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].assignments).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].assignments[0].name).toBe(
// "test assignment"
// );
// });
// it("assignments with changed descriptions do not get deleted", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "test course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "test module",
// assignments: [
// {
// name: "test assignment",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "test module",
// assignments: [
// {
// name: "test assignment",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getDeletedChanges(
// newCourse,
// oldCourse
// );
// expect(differences.deleteContentsOfModule).toHaveLength(0);
// });
// it("can detect changed and unchanged assignments", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "test course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "test module",
// assignments: [
// {
// name: "test assignment",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// {
// name: "test assignment 2",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "test module",
// assignments: [
// {
// name: "test assignment",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// {
// name: "test assignment 2 changed",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// submissionTypes: [],
// allowedFileUploadExtensions: [],
// rubric: [],
// },
// ],
// quizzes: [],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getDeletedChanges(
// newCourse,
// oldCourse
// );
// expect(differences.deleteContentsOfModule).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].assignments).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].assignments[0].name).toBe(
// "test assignment 2"
// );
// });
// it("changed quizzes get deleted", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "test course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "test module",
// assignments: [],
// quizzes: [
// {
// name: "Test Quiz",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// shuffleAnswers: false,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: 0,
// questions: [],
// },
// {
// name: "Test Quiz 2",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// shuffleAnswers: false,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: 0,
// questions: [],
// },
// ],
// pages: [],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "test module",
// assignments: [],
// quizzes: [
// {
// name: "Test Quiz",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// shuffleAnswers: false,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: 0,
// questions: [],
// },
// {
// name: "Test Quiz 3",
// description: "test description",
// dueAt: "07/09/2024 23:59:00",
// shuffleAnswers: false,
// showCorrectAnswers: false,
// oneQuestionAtATime: false,
// allowedAttempts: 0,
// questions: [],
// },
// ],
// pages: [],
// },
// ],
// };
// const differences = CourseDifferences.getDeletedChanges(
// newCourse,
// oldCourse
// );
// expect(differences.deleteContentsOfModule).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].quizzes).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].quizzes[0].name).toBe(
// "Test Quiz 2"
// );
// });
// it("changed pages get deleted", () => {
// const oldCourse: LocalCourse = {
// settings: {
// name: "test course",
// assignmentGroups: [],
// daysOfWeek: [],
// startDate: "07/09/2024 23:59:00",
// endDate: "07/09/2024 23:59:00",
// defaultDueTime: {
// hour: 23,
// minute: 59,
// },
// },
// modules: [
// {
// name: "test module",
// assignments: [],
// quizzes: [],
// pages: [
// {
// name: "Test Page",
// text: "test contents",
// dueAt: "07/09/2024 23:59:00",
// },
// {
// name: "Test Page 2",
// text: "test contents",
// dueAt: "07/09/2024 23:59:00",
// },
// ],
// },
// ],
// };
// const newCourse: LocalCourse = {
// ...oldCourse,
// modules: [
// {
// name: "test module",
// assignments: [],
// quizzes: [],
// pages: [
// {
// name: "Test Page",
// text: "test contents",
// dueAt: "07/09/2024 23:59:00",
// },
// {
// name: "Test Page 3",
// text: "test contents",
// dueAt: "07/09/2024 23:59:00",
// },
// ],
// },
// ],
// };
// const differences = CourseDifferences.getDeletedChanges(
// newCourse,
// oldCourse
// );
// expect(differences.deleteContentsOfModule).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].pages).toHaveLength(1);
// expect(differences.deleteContentsOfModule[0].pages[0].name).toBe(
// "Test Page 2"
// );
// });
});