tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix: group query toValue used in wrong places

Browse source
This commit is contained in:
Adriaan Jacquet 2025-04-09 22:06:52 +02:00
parent f8ac37397d
commit d0044fa219
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/queries/groups.ts
View file

@ -13,11 +13,11 @@ function groupsQueryKey(classid: string, assignmentNumber: number) {
function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) { function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
return [ "group", classid, assignmentNumber, groupNumber ]; return [ "group", classid, assignmentNumber, groupNumber ];
} }
function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number) { function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
return [ "group-submissions", classid, assignmentNumber, groupNumber ]; return [ "group-submissions", classid, assignmentNumber, groupNumber, full ];
} }
function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number) { function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
return [ "group-questions", classid, assignmentNumber, groupNumber ]; return [ "group-questions", classid, assignmentNumber, groupNumber, full ];
} }
export function useGroupsQuery( export function useGroupsQuery(
@ -55,7 +55,7 @@ export function useGroupSubmissionsQuery(
groupController.update(classid, assignmentNumber); groupController.update(classid, assignmentNumber);
return useQuery({ return useQuery({
queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)), queryKey: computed(() => groupSubmissionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!, toValue(full)!)),
queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!), queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
enabled: () => !isNaN(Number(toValue(groupNumber))), enabled: () => !isNaN(Number(toValue(groupNumber))),
}); });
@ -67,10 +67,10 @@ export function useGroupQuestionsQuery(
groupNumber: MaybeRefOrGetter<number | undefined>, groupNumber: MaybeRefOrGetter<number | undefined>,
full: MaybeRefOrGetter<boolean> = true, full: MaybeRefOrGetter<boolean> = true,
): UseQueryReturnType<QuestionsResponse, Error> { ): UseQueryReturnType<QuestionsResponse, Error> {
groupController.update(classid, assignmentNumber); groupController.update(toValue(classid)!, toValue(assignmentNumber));
return useQuery({ return useQuery({
queryKey: computed(() => groupQuestionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!)), queryKey: computed(() => groupQuestionsQueryKey(classid, assignmentNumber, toValue(groupNumber)!, toValue(full)!)),
queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!), queryFn: async () => groupController.getSubmissions(toValue(groupNumber)!, toValue(full)!),
enabled: () => !isNaN(Number(toValue(groupNumber))), enabled: () => !isNaN(Number(toValue(groupNumber))),
}); });