feat: assign tasks to groups

TheRealSeber · TheRealSeber · commit bcda12edcaee · 2025-03-01T13:07:10.000+01:00
diff --git a/.prettierrc b/.prettierrc
@@ -3,7 +3,7 @@
 	"singleQuote": true,
 	"trailingComma": "none",
 	"printWidth": 100,
-	"endOfLine": "crlf",
+	"endOfLine": "lf",
 	"plugins": ["prettier-plugin-svelte"],
 	"overrides": [
 		{
diff --git a/messages/en.json b/messages/en.json
@@ -56,6 +56,9 @@
 	"task_form_task_file_description": "Please upload a file with the task description.",
 	"task_form_task_language_label": "Language of the solution",
 	"task_form_submit": "Submit",
+	"task_assign_groups_form_title": "Assign groups to the task",
+	"task_assign_group_select_title": "Available groups",
+	"task_assign_groups_submit": "Assign groups",
 
 	"submissions_table_title": "A list of all submissions made by the user.",
 	"submissions_task_link_label": "Task link",
diff --git a/messages/pl.json b/messages/pl.json
@@ -56,6 +56,9 @@
 	"task_form_task_file_description": "Proszę przesłać plik z opisem zadania.",
 	"task_form_task_language_label": "Język zadania",
 	"task_form_submit": "Wyślij",
+	"task_assign_groups_form_title": "Przypisz grupy do zadania",
+	"task_assign_group_select_title": "Dostępne grupy",
+	"task_assign_groups_submit": "Przypisz",
 
 	"submissions_table_title": "Lista wszystkich zgłoszeń użytkownika.",
 	"submissions_task_link_label": "Link do zadania",
diff --git a/src/lib/components/tasks/EditTaskDialog.svelte b/src/lib/components/tasks/EditTaskDialog.svelte
@@ -1,27 +1,35 @@
 <script lang="ts">
-	import type { TaskData, UserData } from '$lib/backendSchemas';
+	import type { GroupData, TaskData, UserData } from '$lib/backendSchemas';
 	import * as AlertDialog from '$components/ui/alert-dialog/index.js';
 	import { buttonVariants } from '$components/ui/button/index.js';
 	import * as m from '$lib/paraglide/messages.js';
 	import { fileProxy, superForm, type Infer, type SuperValidated } from 'sveltekit-superforms';
-	import { editTaskSchema, type EditTaskSchema } from './formSchemas';
+	import {
+		assignTaskToGroupsSchema,
+		editTaskSchema,
+		type AssingTaskToGroupsSchema,
+		type EditTaskSchema
+	} from './formSchemas';
 	import * as Form from '$components/ui/form';
 	import { zodClient } from 'sveltekit-superforms/adapters';
 	import Input from '../ui/input/input.svelte';
 	import Separator from '../ui/separator/separator.svelte';
 	import Label from '../ui/label/label.svelte';
+	import * as Select from '$lib/components/ui/select/index.js';
 
 	let {
-		localUser,
 		taskData,
-		editTaskForm
+		userGroups,
+		editTaskForm,
+		assingTaskToGroupsForm
 	}: {
-		localUser: UserData;
 		taskData: Omit<TaskData, 'description_url'>;
+		userGroups: GroupData[];
 		editTaskForm: SuperValidated<Infer<EditTaskSchema>>;
+		assingTaskToGroupsForm: SuperValidated<Infer<AssingTaskToGroupsSchema>>;
 	} = $props();
 
-	const form = superForm(editTaskForm, {
+	const editForm = superForm(editTaskForm, {
 		validators: zodClient(editTaskSchema),
 		resetForm: false,
 		onResult: ({ result: { type } }) => {
@@ -32,13 +40,31 @@
 		}
 	});
 
-	const { form: formData, message, enhance } = form;
+	const assignToGroupsForm = superForm(assingTaskToGroupsForm, {
+		validators: zodClient(assignTaskToGroupsSchema),
+		resetForm: false,
+		onResult: ({ result: { type } }) => {
+			if (type === 'success') {
+				open = false;
+				location.reload();
+			}
+		}
+	});
+
+	const { form: editTaskFormData, message: editTaskMessage, enhance: editTaskEnhance } = editForm;
+	const {
+		form: assignToGroupsFormData,
+		message: assignToGroupsMessage,
+		enhance: assignToGroupsEnhance
+	} = assignToGroupsForm;
+
+	$editTaskFormData.id = taskData.id;
+	$editTaskFormData.title = taskData.title;
+	$editTaskFormData.archive = null;
 
-	$formData.id = taskData.id;
-	$formData.title = taskData.title;
-	$formData.archive = null;
+	$assignToGroupsFormData.taskId = taskData.id;
 
-	const file = fileProxy(form, 'archive');
+	const file = fileProxy(editForm, 'archive');
 
 	let open = $state(false);
 </script>
@@ -51,25 +77,25 @@
 		<AlertDialog.Header>
 			<AlertDialog.Title>{m.edit_task_title()}</AlertDialog.Title>
 			<AlertDialog.Description>
-				<form enctype="multipart/form-data" action="?/editTask" method="POST" use:enhance>
-					<Form.Field {form} name="id" hidden>
+				<form enctype="multipart/form-data" action="?/editTask" method="POST" use:editTaskEnhance>
+					<Form.Field form={editForm} name="id" hidden>
 						<Form.Control>
 							{#snippet children({ props })}
-								<Input type="number" {...props} bind:value={$formData.id} />
+								<Input type="number" {...props} bind:value={$editTaskFormData.id} />
 							{/snippet}
 						</Form.Control>
 						<Form.FieldErrors />
 					</Form.Field>
-					<Form.Field {form} name="title">
+					<Form.Field form={editForm} name="title">
 						<Form.Control>
 							{#snippet children({ props })}
 								<Form.Label>{m.edit_task_title_label()}</Form.Label>
-								<Input {...props} bind:value={$formData.title} />
+								<Input {...props} bind:value={$editTaskFormData.title} />
 							{/snippet}
 						</Form.Control>
 						<Form.FieldErrors />
 					</Form.Field>
-					<Form.Field {form} name="archive">
+					<Form.Field form={editForm} name="archive">
 						<Form.Control>
 							{#snippet children({ props })}
 								<Label for="archive">{m.task_form_task_file_label()}</Label>
@@ -85,8 +111,8 @@
 						<Form.Description>{m.task_form_task_file_description()}</Form.Description>
 						<Form.FieldErrors />
 					</Form.Field>
-					{#if $message}
-						<p class="text-destructive my-2 text-sm font-medium">{$message}</p>
+					{#if $editTaskMessage}
+						<p class="text-destructive my-2 text-sm font-medium">{$editTaskMessage}</p>
 					{/if}
 					<Separator class="my-4" />
 					<div class="flex-row w-full">
@@ -96,6 +122,49 @@
 						<Form.Button type="submit">{m.edit_profile_submit()}</Form.Button>
 					</div>
 				</form>
+				<Separator class="my-4" />
+				<h2 class="font-semibold text-lg text-foreground">
+					{m.task_assign_groups_form_title()}
+				</h2>
+				<form action="?/assignGroups" method="POST" use:assignToGroupsEnhance>
+					<Form.Field form={assignToGroupsForm} name="taskId" hidden>
+						<Form.Control>
+							{#snippet children({ props })}
+								<Input type="number" {...props} bind:value={$assignToGroupsFormData.taskId} />
+							{/snippet}
+						</Form.Control>
+						<Form.FieldErrors />
+					</Form.Field>
+					<Form.Field form={assignToGroupsForm} name="groupIds" class="my-4">
+						<Form.Control>
+							{#snippet children({ props })}
+								<Select.Root
+									type="multiple"
+									bind:value={$assignToGroupsFormData.groupIds}
+									{...props}
+								>
+									<Select.Trigger class="w-[180px]">
+										{m.task_assign_group_select_title()}
+									</Select.Trigger>
+									<Select.Content>
+										<Select.Group>
+											{#each userGroups as userGroup}
+												<Select.Item value={userGroup.id.toString()} label={userGroup.name}
+													>{userGroup.name}</Select.Item
+												>
+											{/each}
+										</Select.Group>
+									</Select.Content>
+								</Select.Root>
+							{/snippet}
+						</Form.Control>
+						<Form.FieldErrors />
+					</Form.Field>
+					{#if $assignToGroupsMessage}
+						<p class="text-destructive my-2 text-sm font-medium">{$assignToGroupsMessage}</p>
+					{/if}
+					<Form.Button type="submit">{m.task_assign_groups_submit()}</Form.Button>
+				</form>
 			</AlertDialog.Description>
 		</AlertDialog.Header>
 		<AlertDialog.Footer>
diff --git a/src/lib/components/tasks/TaskView.svelte b/src/lib/components/tasks/TaskView.svelte
@@ -3,23 +3,33 @@
 	import * as m from '$lib/paraglide/messages.js';
 	import type { Infer, SuperValidated } from 'sveltekit-superforms';
 	import { type UploadTaskSolutionSchema } from './solutions/formSchema';
-	import { UserRole, type LanguageConfig, type TaskData, type UserData } from '$lib/backendSchemas';
+	import {
+		UserRole,
+		type GroupData,
+		type LanguageConfig,
+		type TaskData,
+		type UserData
+	} from '$lib/backendSchemas';
 	import EditTaskDialog from './EditTaskDialog.svelte';
-	import type { EditTaskSchema } from './formSchemas';
+	import type { AssingTaskToGroupsSchema, EditTaskSchema } from './formSchemas';
 
 	let {
 		localUser,
 		task,
 		uploadSolutionForm,
 		editTaskForm,
+		assingTaskToGroupsForm,
+		userGroups,
 		availableLanguages
 	}: {
 		localUser: UserData;
 		task: Omit<TaskData, 'description_url'> & {
 			description_file: Promise<ArrayBuffer>;
 		};
 		editTaskForm: SuperValidated<Infer<EditTaskSchema>>;
+		assingTaskToGroupsForm: SuperValidated<Infer<AssingTaskToGroupsSchema>>;
 		uploadSolutionForm: SuperValidated<Infer<UploadTaskSolutionSchema>>;
+		userGroups: GroupData[];
 		availableLanguages: LanguageConfig[];
 	} = $props();
 
@@ -28,13 +38,20 @@
 		task_id: task.id,
 		availableLanguages: availableLanguages
 	};
+
+	function isAllowedToEdit() {
+		return (
+			(localUser.role === UserRole.Teacher && task.created_by === localUser.id) ||
+			localUser.role === UserRole.Admin
+		);
+	}
 </script>
 
 <div class="container mb-12 flex flex-col flex-1">
 	<div class="flex justify-between p-4 items-center">
 		<h1 class="text-2xl font-bold my-4">{task.title}</h1>
-		{#if localUser.role !== UserRole.Student}
-			<EditTaskDialog taskData={task} {editTaskForm} {localUser} />
+		{#if isAllowedToEdit()}
+			<EditTaskDialog taskData={task} {editTaskForm} {assingTaskToGroupsForm} {userGroups} />
 		{/if}
 	</div>
 	<div class="flex-1 flex overflow-hidden">
diff --git a/src/lib/components/tasks/formSchemas.ts b/src/lib/components/tasks/formSchemas.ts
@@ -49,6 +49,18 @@ export const editTaskSchema = z.object({
 		})
 });
 
+export const assignTaskToGroupsSchema = z.object({
+	taskId: z.number().int().positive(),
+	groupIds: z
+		.array(z.string())
+		.refine(
+			(groupIds) => groupIds.every((id) => !isNaN(Number(id)) && Number.isInteger(Number(id))),
+			{
+				message: 'All groupIds must be string representations of integers'
+			}
+		)
+});
+
 const requiredFolders = ['input', 'output'];
 const inFileRegex = /^\/\d+.in$/;
 const outFileRegex = /^\/\d+.out$/;
@@ -122,3 +134,4 @@ function verifyTaskInOut(loadedZip: JSZip, mainFolderPath: string) {
 
 export type CreateTaskSchema = typeof createTaskSchema;
 export type EditTaskSchema = typeof editTaskSchema;
+export type AssingTaskToGroupsSchema = typeof assignTaskToGroupsSchema;
diff --git a/src/lib/components/users/formSchemas.ts b/src/lib/components/users/formSchemas.ts
@@ -18,7 +18,8 @@ export const editPasswordSchema = z
 		currentPassword: z.string().nonempty(m.form_schema_password_required_error_message()),
 		newPassword: z
 			.string()
-			.min(6)
+			.min(8)
+			.max(50)
 			.regex(passwordValidationRegex, m.form_schema_password_regex_error_message()),
 		confirmPassword: z.string().nonempty(m.form_schema_password_required_error_message())
 	})
diff --git a/src/routes/dashboard/tasks/[taskId]/+page.server.ts b/src/routes/dashboard/tasks/[taskId]/+page.server.ts
diff --git a/src/routes/dashboard/tasks/[taskId]/+page.svelte b/src/routes/dashboard/tasks/[taskId]/+page.svelte

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"singleQuote": true,`
`4`	`4`	`"trailingComma": "none",`
`5`	`5`	`"printWidth": 100,`
`6`		`- "endOfLine": "crlf",`
	`6`	`+ "endOfLine": "lf",`
`7`	`7`	`"plugins": ["prettier-plugin-svelte"],`
`8`	`8`	`"overrides": [`
`9`	`9`	`{`