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

Merge remote-tracking branch 'origin/dev' into feat/indieningen-kunnen-posten-en-bekijken-#194

Browse source 
# Conflicts:
#	frontend/src/queries/groups.ts
#	frontend/src/queries/submissions.ts
This commit is contained in:
Gerald Schmittinger 2025-04-18 23:41:52 +02:00
commit ce5c0ea629
14 changed files with 152 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,24 +5,45 @@ import type { GroupDTO } from "@dwengo-1/common/interfaces/group";
import {
QueryClient,
useMutation,
type UseMutationReturnType,
useQuery,
useQueryClient,
type UseMutationReturnType,
type UseQueryReturnType,
} from "@tanstack/vue-query";
import { computed, toValue, type MaybeRefOrGetter } from "vue";
import { invalidateAllSubmissionKeys } from "./submissions";
export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean) {
type GroupsQueryKey = ["groups", string, number, boolean];
export function groupsQueryKey(classid: string, assignmentNumber: number, full: boolean): GroupsQueryKey {
return ["groups", classid, assignmentNumber, full];
}
function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number) {
type GroupQueryKey = ["group", string, number, number];
function groupQueryKey(classid: string, assignmentNumber: number, groupNumber: number): GroupQueryKey {
return ["group", classid, assignmentNumber, groupNumber];
}
function groupSubmissionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
type GroupSubmissionsQueryKey = ["group-submissions", string, number, number, boolean];
function groupSubmissionsQueryKey(
classid: string,
assignmentNumber: number,
groupNumber: number,
full: boolean,
): GroupSubmissionsQueryKey {
return ["group-submissions", classid, assignmentNumber, groupNumber, full];
}
function groupQuestionsQueryKey(classid: string, assignmentNumber: number, groupNumber: number, full: boolean) {
type GroupQuestionsQueryKey = ["group-questions", string, number, number, boolean];
function groupQuestionsQueryKey(
classid: string,
assignmentNumber: number,
groupNumber: number,
full: boolean,
): GroupQuestionsQueryKey {
return ["group-questions", classid, assignmentNumber, groupNumber, full];
}
@ -31,13 +52,14 @@ export async function invalidateAllGroupKeys(
classid?: string,
assignmentNumber?: number,
groupNumber?: number,
) {
): Promise<void> {
const keys = ["group", "group-submissions", "group-questions"];
for (const key of keys) {
const queryKey = [key, classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined);
await queryClient.invalidateQueries({ queryKey: queryKey });
}
await Promise.all(
keys.map(async (key) => {
const queryKey = [key, classid, assignmentNumber, groupNumber].filter((arg) => arg !== undefined);
return queryClient.invalidateQueries({ queryKey: queryKey });
}),
);
await queryClient.invalidateQueries({
queryKey: ["groups", classid, assignmentNumber].filter((arg) => arg !== undefined),
@ -51,12 +73,20 @@ function checkEnabled(
): boolean {
return Boolean(classid) && !isNaN(Number(groupNumber)) && !isNaN(Number(assignmentNumber));
}
interface Values {
cid: string | undefined;
an: number | undefined;
gn: number | undefined;
f: boolean;
}
function toValues(
classid: MaybeRefOrGetter<string | undefined>,
assignmentNumber: MaybeRefOrGetter<number | undefined>,
groupNumber: MaybeRefOrGetter<number | undefined>,
full: MaybeRefOrGetter<boolean>,
) {
): Values {
return { cid: toValue(classid), an: toValue(assignmentNumber), gn: toValue(groupNumber), f: toValue(full) };
}