mirror of
https://github.com/alexmickelson/canvasManagement.git
synced 2026-03-26 07:38:33 -06:00
adding editing assignment groups
This commit is contained in:
@@ -0,0 +1,123 @@
|
||||
"use client";
|
||||
|
||||
import {
|
||||
useLocalCourseSettingsQuery,
|
||||
useUpdateLocalCourseSettingsMutation,
|
||||
} from "@/hooks/localCourse/localCoursesHooks";
|
||||
import { LocalAssignmentGroup } from "@/models/local/assignment/localAssignmentGroup";
|
||||
import { useEffect, useState } from "react";
|
||||
import TextInput from "./TextInput";
|
||||
import { useSetAssignmentGroupsMutation } from "@/hooks/canvas/canvasCourseHooks";
|
||||
|
||||
export default function AssignmentGroupManagement() {
|
||||
const { data: settings } = useLocalCourseSettingsQuery();
|
||||
const updateSettings = useUpdateLocalCourseSettingsMutation();
|
||||
const applyInCanvas = useSetAssignmentGroupsMutation(settings.canvasId); // untested
|
||||
|
||||
const [assignmentGroups, setAssignmentGroups] = useState<
|
||||
LocalAssignmentGroup[]
|
||||
>(settings.assignmentGroups);
|
||||
|
||||
useEffect(() => {
|
||||
const delay = 1000;
|
||||
const handler = setTimeout(() => {
|
||||
if (
|
||||
!areAssignmentGroupsEqual(assignmentGroups, settings.assignmentGroups)
|
||||
) {
|
||||
updateSettings.mutate({
|
||||
...settings,
|
||||
assignmentGroups,
|
||||
});
|
||||
}
|
||||
}, delay);
|
||||
|
||||
return () => {
|
||||
clearTimeout(handler);
|
||||
};
|
||||
}, [assignmentGroups, settings, updateSettings]);
|
||||
|
||||
return (
|
||||
<div>
|
||||
{assignmentGroups.map((group) => (
|
||||
<div key={group.id} className="flex flex-row gap-3">
|
||||
<TextInput
|
||||
value={group.name}
|
||||
setValue={(newValue) =>
|
||||
setAssignmentGroups((oldGroups) =>
|
||||
oldGroups.map((g) =>
|
||||
g.id === group.id ? { ...g, name: newValue } : g
|
||||
)
|
||||
)
|
||||
}
|
||||
label={"Group Name"}
|
||||
/>
|
||||
<TextInput
|
||||
value={group.weight.toString()}
|
||||
setValue={(newValue) =>
|
||||
setAssignmentGroups((oldGroups) =>
|
||||
oldGroups.map((g) =>
|
||||
g.id === group.id
|
||||
? { ...g, weight: parseInt(newValue || "0") }
|
||||
: g
|
||||
)
|
||||
)
|
||||
}
|
||||
label={"Weight"}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
<button
|
||||
onClick={() => {
|
||||
setAssignmentGroups((oldGroups) => [
|
||||
...oldGroups,
|
||||
{
|
||||
id: Date.now().toString(),
|
||||
name: "",
|
||||
weight: 0,
|
||||
},
|
||||
]);
|
||||
}}
|
||||
>
|
||||
Add Assignment Group
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function areAssignmentGroupsEqual(
|
||||
list1: LocalAssignmentGroup[],
|
||||
list2: LocalAssignmentGroup[]
|
||||
): boolean {
|
||||
// Check if lists have the same length
|
||||
if (list1.length !== list2.length) return false;
|
||||
|
||||
// Sort both lists by the unique 'id' or 'canvasId' as a fallback
|
||||
const sortedList1 = [...list1].sort((a, b) => {
|
||||
if (a.id !== b.id) return a.id > b.id ? 1 : -1;
|
||||
if (a.canvasId !== b.canvasId) return (a.canvasId || 0) - (b.canvasId || 0);
|
||||
return 0;
|
||||
});
|
||||
|
||||
const sortedList2 = [...list2].sort((a, b) => {
|
||||
if (a.id !== b.id) return a.id > b.id ? 1 : -1;
|
||||
if (a.canvasId !== b.canvasId) return (a.canvasId || 0) - (b.canvasId || 0);
|
||||
return 0;
|
||||
});
|
||||
|
||||
// Deep compare each object in the sorted lists
|
||||
for (let i = 0; i < sortedList1.length; i++) {
|
||||
const group1 = sortedList1[i];
|
||||
const group2 = sortedList2[i];
|
||||
|
||||
if (
|
||||
group1.id !== group2.id ||
|
||||
group1.name !== group2.name ||
|
||||
group1.weight !== group2.weight ||
|
||||
group1.canvasId !== group2.canvasId
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
23
nextjs/src/app/course/[courseName]/settings/TextInput.tsx
Normal file
23
nextjs/src/app/course/[courseName]/settings/TextInput.tsx
Normal file
@@ -0,0 +1,23 @@
|
||||
import React from "react";
|
||||
|
||||
export default function TextInput({
|
||||
value,
|
||||
setValue,
|
||||
label,
|
||||
}: {
|
||||
value: string;
|
||||
setValue: (newValue: string) => void;
|
||||
label: string;
|
||||
}) {
|
||||
return (
|
||||
<label className="block">
|
||||
{label}
|
||||
<br />
|
||||
<input
|
||||
className="bg-slate-800 rounded-md px-1"
|
||||
value={value}
|
||||
onChange={(e) => setValue(e.target.value)}
|
||||
/>
|
||||
</label>
|
||||
);
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import StartAndEndDate from "./StartAndEndDate";
|
||||
import SettingsHeader from "./SettingsHeader";
|
||||
import DefaultDueTime from "./DefaultDueTime";
|
||||
import DaysOfWeekSelector from "./DaysOfWeekSelector";
|
||||
import AssignmentGroupManagement from "./AssignmentGroupManagement";
|
||||
|
||||
export default function page() {
|
||||
return (
|
||||
@@ -12,6 +13,7 @@ export default function page() {
|
||||
<DaysOfWeekSelector />
|
||||
<StartAndEndDate />
|
||||
<DefaultDueTime />
|
||||
<AssignmentGroupManagement />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
import { LocalAssignmentGroup } from "@/models/local/assignment/localAssignmentGroup";
|
||||
import { canvasAssignmentGroupService } from "@/services/canvas/canvasAssignmentGroupService";
|
||||
import { canvasService } from "@/services/canvas/canvasService";
|
||||
import { useSuspenseQuery } from "@tanstack/react-query";
|
||||
import { useMutation, useSuspenseQuery } from "@tanstack/react-query";
|
||||
|
||||
export const canvasCourseKeys = {
|
||||
courseDetails: (canavasId: number) =>
|
||||
["canvas", canavasId, "course details"] as const,
|
||||
assignmentGroups: (canavasId: number) =>
|
||||
["canvas", canavasId, "assignment groups"] as const,
|
||||
};
|
||||
|
||||
export const useCanvasCourseQuery = (canvasId: number) =>
|
||||
@@ -11,3 +15,39 @@ export const useCanvasCourseQuery = (canvasId: number) =>
|
||||
queryKey: canvasCourseKeys.courseDetails(canvasId),
|
||||
queryFn: async () => await canvasService.getCourse(canvasId),
|
||||
});
|
||||
|
||||
export const useSetAssignmentGroupsMutation = (canvasId: number) => {
|
||||
const { data: canvasAssignmentGroups } = useAssignmentGroupsQuery(canvasId);
|
||||
return useMutation({
|
||||
mutationFn: async (localAssignmentGroups: LocalAssignmentGroup[]) => {
|
||||
const localNames = localAssignmentGroups.map((g) => g.name);
|
||||
const groupsToDelete = canvasAssignmentGroups.filter(
|
||||
(c) => !localNames.includes(c.name)
|
||||
);
|
||||
await Promise.all([
|
||||
...groupsToDelete.map(
|
||||
async (g) =>
|
||||
await canvasAssignmentGroupService.delete(canvasId, g.id, g.name)
|
||||
),
|
||||
...localAssignmentGroups.map(async (group) => {
|
||||
const canvasGroup = canvasAssignmentGroups.find(
|
||||
(c) => c.name === group.name
|
||||
);
|
||||
if (!canvasGroup) {
|
||||
await canvasAssignmentGroupService.create(canvasId, group);
|
||||
} else {
|
||||
if (canvasGroup.group_weight !== group.weight)
|
||||
await canvasAssignmentGroupService.update(canvasId, group);
|
||||
}
|
||||
}),
|
||||
]);
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
export const useAssignmentGroupsQuery = (canvasId: number) => {
|
||||
return useSuspenseQuery({
|
||||
queryKey: canvasCourseKeys.assignmentGroups(canvasId),
|
||||
queryFn: async () => await canvasAssignmentGroupService.getAll(canvasId),
|
||||
});
|
||||
};
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
export interface CanvasAssignmentGroup {
|
||||
id: number; // TypeScript doesn't have `ulong`, so using `number` for large integers.
|
||||
name: string;
|
||||
position: number;
|
||||
group_weight: number;
|
||||
// sis_source_id?: string; // Uncomment if needed.
|
||||
// integration_data?: Record<string, string>; // Uncomment if needed.
|
||||
// assignments?: CanvasAssignment[]; // Uncomment if needed, assuming CanvasAssignment is defined.
|
||||
// rules?: any; // Assuming 'rules' is of unknown type, so using 'any' here.
|
||||
}
|
||||
@@ -16,7 +16,7 @@ export interface LocalCourseSettings {
|
||||
name: string;
|
||||
assignmentGroups: LocalAssignmentGroup[];
|
||||
daysOfWeek: DayOfWeek[];
|
||||
canvasId?: number;
|
||||
canvasId: number;
|
||||
startDate: string;
|
||||
endDate: string;
|
||||
defaultDueTime: SimpleTimeOnly;
|
||||
|
||||
67
nextjs/src/services/canvas/canvasAssignmentGroupService.ts
Normal file
67
nextjs/src/services/canvas/canvasAssignmentGroupService.ts
Normal file
@@ -0,0 +1,67 @@
|
||||
import { canvasServiceUtils } from "./canvasServiceUtils";
|
||||
import { axiosClient } from "../axiosUtils";
|
||||
import { CanvasAssignmentGroup } from "@/models/canvas/assignments/canvasAssignmentGroup";
|
||||
import { LocalAssignmentGroup } from "@/models/local/assignment/localAssignmentGroup";
|
||||
import { rateLimitAwareDelete } from "./canvasWebRequestor";
|
||||
|
||||
const baseCanvasUrl = "https://snow.instructure.com/api/v1";
|
||||
|
||||
export const canvasAssignmentGroupService = {
|
||||
async getAll(courseId: number): Promise<CanvasAssignmentGroup[]> {
|
||||
console.log("Requesting assignment groups");
|
||||
const url = `${baseCanvasUrl}/courses/${courseId}/assignment_groups`;
|
||||
const assignmentGroups = await canvasServiceUtils.paginatedRequest<
|
||||
CanvasAssignmentGroup[]
|
||||
>({
|
||||
url,
|
||||
});
|
||||
return assignmentGroups.flatMap((groupList) => groupList);
|
||||
},
|
||||
|
||||
async create(
|
||||
canvasCourseId: number,
|
||||
localAssignmentGroup: LocalAssignmentGroup
|
||||
): Promise<LocalAssignmentGroup> {
|
||||
console.log(`Creating assignment group: ${localAssignmentGroup.name}`);
|
||||
const url = `${baseCanvasUrl}/courses/${canvasCourseId}/assignment_groups`;
|
||||
const body = {
|
||||
name: localAssignmentGroup.name,
|
||||
group_weight: localAssignmentGroup.weight,
|
||||
};
|
||||
|
||||
const { data: canvasAssignmentGroup } =
|
||||
await axiosClient.post<CanvasAssignmentGroup>(url, body);
|
||||
|
||||
return {
|
||||
...localAssignmentGroup,
|
||||
canvasId: canvasAssignmentGroup.id,
|
||||
};
|
||||
},
|
||||
|
||||
async update(
|
||||
canvasCourseId: number,
|
||||
localAssignmentGroup: LocalAssignmentGroup
|
||||
): Promise<void> {
|
||||
console.log(`Updating assignment group: ${localAssignmentGroup.name}`);
|
||||
if (!localAssignmentGroup.canvasId) {
|
||||
throw new Error("Cannot update assignment group if canvas ID is null");
|
||||
}
|
||||
const url = `${baseCanvasUrl}/courses/${canvasCourseId}/assignment_groups/${localAssignmentGroup.canvasId}`;
|
||||
const body = {
|
||||
name: localAssignmentGroup.name,
|
||||
group_weight: localAssignmentGroup.weight,
|
||||
};
|
||||
|
||||
await axiosClient.put(url, body);
|
||||
},
|
||||
|
||||
async delete(
|
||||
canvasCourseId: number,
|
||||
canvasAssignmentGroupId: number
|
||||
, assignmentGroupName: string
|
||||
): Promise<void> {
|
||||
console.log(`Deleting assignment group: ${assignmentGroupName}`);
|
||||
const url = `${baseCanvasUrl}/courses/${canvasCourseId}/assignment_groups/${canvasAssignmentGroupId}`;
|
||||
await rateLimitAwareDelete(url);
|
||||
},
|
||||
};
|
||||
Reference in New Issue
Block a user