Merge pull request #127 from PRIME-TU-Delft/development

Development

Author: Bluerberry

prisma/migrations/20241219115059_unchanged_rework/migration.sql

@@ -0,0 +1,87 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `unchanged` on the `Course` table. All the data in the column will be lost.
+  - You are about to drop the column `unchanged` on the `Domain` table. All the data in the column will be lost.
+  - You are about to drop the column `domainName` on the `Graph` table. All the data in the column will be lost.
+  - You are about to drop the column `lectureName` on the `Graph` table. All the data in the column will be lost.
+  - You are about to drop the column `subjectName` on the `Graph` table. All the data in the column will be lost.
+  - You are about to drop the column `unchanged` on the `Graph` table. All the data in the column will be lost.
+  - You are about to drop the column `unchanged` on the `Lecture` table. All the data in the column will be lost.
+  - You are about to drop the column `unchanged` on the `Link` table. All the data in the column will be lost.
+  - You are about to drop the column `unchanged` on the `Program` table. All the data in the column will be lost.
+  - You are about to drop the column `unchanged` on the `Subject` table. All the data in the column will be lost.
+  - The primary key for the `_AdminRelation` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - The primary key for the `_CourseToProgram` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - The primary key for the `_DomainRelation` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - The primary key for the `_EditorRelation` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - The primary key for the `_LectureToSubject` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - The primary key for the `_SubjectRelation` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - A unique constraint covering the columns `[A,B]` on the table `_AdminRelation` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[A,B]` on the table `_CourseToProgram` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[A,B]` on the table `_DomainRelation` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[A,B]` on the table `_EditorRelation` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[A,B]` on the table `_LectureToSubject` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[A,B]` on the table `_SubjectRelation` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- AlterTable
+ALTER TABLE "Course" DROP COLUMN "unchanged";
+
+-- AlterTable
+ALTER TABLE "Domain" DROP COLUMN "unchanged";
+
+-- AlterTable
+ALTER TABLE "Graph" DROP COLUMN "domainName",
+DROP COLUMN "lectureName",
+DROP COLUMN "subjectName",
+DROP COLUMN "unchanged";
+
+-- AlterTable
+ALTER TABLE "Lecture" DROP COLUMN "unchanged",
+ALTER COLUMN "order" DROP DEFAULT;
+
+-- AlterTable
+ALTER TABLE "Link" DROP COLUMN "unchanged";
+
+-- AlterTable
+ALTER TABLE "Program" DROP COLUMN "unchanged";
+
+-- AlterTable
+ALTER TABLE "Subject" DROP COLUMN "unchanged";
+
+-- AlterTable
+ALTER TABLE "_AdminRelation" DROP CONSTRAINT "_AdminRelation_AB_pkey";
+
+-- AlterTable
+ALTER TABLE "_CourseToProgram" DROP CONSTRAINT "_CourseToProgram_AB_pkey";
+
+-- AlterTable
+ALTER TABLE "_DomainRelation" DROP CONSTRAINT "_DomainRelation_AB_pkey";
+
+-- AlterTable
+ALTER TABLE "_EditorRelation" DROP CONSTRAINT "_EditorRelation_AB_pkey";
+
+-- AlterTable
+ALTER TABLE "_LectureToSubject" DROP CONSTRAINT "_LectureToSubject_AB_pkey";
+
+-- AlterTable
+ALTER TABLE "_SubjectRelation" DROP CONSTRAINT "_SubjectRelation_AB_pkey";
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_AdminRelation_AB_unique" ON "_AdminRelation"("A", "B");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_CourseToProgram_AB_unique" ON "_CourseToProgram"("A", "B");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_DomainRelation_AB_unique" ON "_DomainRelation"("A", "B");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_EditorRelation_AB_unique" ON "_EditorRelation"("A", "B");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_LectureToSubject_AB_unique" ON "_LectureToSubject"("A", "B");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_SubjectRelation_AB_unique" ON "_SubjectRelation"("A", "B");

prisma/schema.prisma

@@ -85,7 +85,6 @@ model VerificationToken {
 
 model Program {
 	id				Int			@id @default(autoincrement())
-	unchanged		Boolean		@default(true)
 	name			String
 
 	courses			Course[]
@@ -103,7 +102,6 @@ enum CourseType {
 
 model Course {
 	id				Int			@id @default(autoincrement())
-	unchanged		Boolean		@default(true)
 	type			CourseType	@default(COURSE)
 	code			String		@unique
 	name			String
@@ -120,7 +118,6 @@ model Course {
 
 model Graph {
 	id				Int			@id @default(autoincrement())
-	unchanged		Boolean		@default(true)
 	name			String
 	courseId		Int
 
@@ -149,7 +146,6 @@ enum DomainStyle {
 
 model Domain {
 	id				Int			@id @default(autoincrement())
-	unchanged		Boolean		@default(true)
 	name			String		@default("")
 	style			DomainStyle?
 	order			Int
@@ -165,7 +161,6 @@ model Domain {
 
 model Subject {
 	id				Int			@id @default(autoincrement())
-	unchanged		Boolean		@default(true)
 	name			String		@default("")
 	x				Int			@default(0)
 	y				Int			@default(0)
@@ -181,9 +176,8 @@ model Subject {
 
 model Lecture {
 	id				Int			@id @default(autoincrement())
-	unchanged		Boolean		@default(true)
 	name			String		@default("")
-	order			Int			@default(-1)
+	order			Int
 	graphId			Int
 
 	graph			Graph		@relation(fields: [graphId], references: [id], onDelete: Cascade)
@@ -192,7 +186,6 @@ model Lecture {
 
 model Link {
 	id				Int			@id @default(autoincrement())
-	unchanged		Boolean		@default(true)
 	name			String		@default("")
 	courseId		Int
 	graphId			Int?

src/lib/components/Feedback.svelte

@@ -13,7 +13,7 @@
 	// Functions
 	function onMouseEnter() {
 		timeout = setTimeout(() => {
-			show_dropdown = data.errors.length + data.warnings.length > 1 || compact
+			show_dropdown = !disable_dropdown
 		}, settings.UNIVERSAL_HOVER_DELAY)
 	}
 
@@ -23,8 +23,12 @@
 	}
 
 	function setDropdown(value?: boolean) {
-		if (value !== undefined) lock_dropdown = value
-		else lock_dropdown = !lock_dropdown && (data.errors.length + data.warnings.length > 1 || compact)
+		if (value !== undefined) {
+			lock_dropdown = value
+		} else {
+			lock_dropdown = !lock_dropdown
+		}
+
 		show_dropdown = lock_dropdown
 		clearTimeout(timeout)
 	}
@@ -50,10 +54,10 @@
 					   : data.warnings.length > 1 ? `${data.warnings[0].short} (${data.warnings.length - 1} more)`
 					   : data.warnings[0].short
 	
-	$: disable_toggle = !compact && data.errors.length + data.warnings.length < 2
-					  || compact && data.errors.length + data.warnings.length < 1
+	$: disable_dropdown = !compact && data.errors.length + data.warnings.length < 2
+						|| compact && data.errors.length + data.warnings.length < 1
 	
-	$: if (disable_toggle) setDropdown(false)
+	$: if (disable_dropdown) setDropdown(false)
 
 </script>
 
@@ -65,7 +69,7 @@
 		on:mouseenter={ onMouseEnter }
 		on:mouseleave={ onMouseLeave }
 		on:click={ () => setDropdown() }
-		disabled={ disable_toggle }
+		disabled={ disable_dropdown }
 	>
 		{#if show_error_icon}
 			<img 

src/lib/components/FormModal.svelte

@@ -77,7 +77,7 @@
 					on:click={ async () => await submit() }
 					disabled={ submitting || controller.validate().severity === Severity.error }
 				> <slot name="submit" /> </Button>
-				<Feedback animate data={ controller.validate() } />
+				<Feedback data={ controller.validate() } />
 			</div>
 		</form>
 	</dialog>

src/lib/components/Graph.svelte

@@ -142,6 +142,10 @@
 				top: 0.75rem + $card-thin-padding - math.div($dropdown-icon-size, 4)
 				border-width: 0 1px 1px 0
 
+			&:focus-visible
+				outline: $default-outline
+				border-color: $white				
+
 			.title
 				padding-right: $card-thin-padding + 1rem
 
@@ -172,6 +176,7 @@
 				width: 1.75rem
 				height: 1.75rem
 				padding: $input-icon-padding
+				border-radius: $default-border-radius	
 
 				cursor: pointer
 
@@ -182,6 +187,9 @@
 					transform-origin: center
 					pointer-events: none
 
+				&:focus-visible
+					outline: $default-outline	
+
 				&:hover img
 					scale: $scale-on-hover
 </style>

src/lib/components/LinkButton.svelte

@@ -5,6 +5,7 @@
 	export let href: string | undefined = undefined
 	export let submit: boolean = false
 	export let disabled: boolean = false
+	export let thin: boolean = false
 
 </script>
 
@@ -15,6 +16,7 @@
 	<button
 		class="link-button"
 		class:disabled
+		class:thin
 		disabled={ disabled }
 		type={ submit ? 'submit' : 'button' }
 		on:click
@@ -28,6 +30,7 @@
 		href={ disabled ? '' : href }
 		class="link-button" 
 		class:disabled
+		class:thin
 	>
 		<slot />
 	</a>
@@ -60,6 +63,9 @@
 			pointer-events: none
 
 		// Styling options
+		&.thin
+			padding: $input-thin-padding
+
 		&.disabled
 			color: $gray
 			pointer-events: none

src/lib/components/SaveStatus.svelte

@@ -3,34 +3,48 @@
 
 	import success_icon from '$assets/success-icon.svg'
 	import warning_icon from '$assets/warning-icon.svg'
+	import error_icon from '$assets/error-icon.svg'
 
-	export function setSaving(value: boolean) {
-		saving = value
+	export function setSaving() {
+		if (timer) clearTimeout(timer)
+		timer = setTimeout(() => timer = undefined, MIN_SAVE_TIME)
+		saving = true
+	}
 
-		if (value) {
-			unsaved = false
-			if (timer) clearTimeout(timer)
-			timer = setTimeout(() => timer = undefined, MIN_SAVE_TIME)
-		}
+	export function setIdle() {
+		error = undefined
+		unsaved = false
+		saving = false
 	}
 
 	export function setUnsaved() {
+		error = undefined
 		unsaved = true
 	}
 
+	export function setError(message: string) {
+		error = message
+	}
+
 	const MIN_SAVE_TIME = 1000
 
 	let timer: NodeJS.Timeout | undefined
+	let error: string | undefined
 	let unsaved = false
 	let saving = false
 
 </script>
 
 <!-- Markdown -->
 
-<div class="saving">
+<div class="save-status">
+
+	{#if error}
+
+		<img src={ error_icon } alt="">
+		{ error }
 
-	{#if saving || timer !== undefined}
+	{:else if saving || timer !== undefined}
 
 		<span class="spinner" />
 		Saving...
@@ -59,13 +73,14 @@
 	$spinner-size: 1rem
 	$spinner-width: 1.5px
 
-	.saving
+	.save-status
 		display: flex
 		flex-flow: row nowrap
 		align-items: center
 		gap: $form-small-gap
 
 		width: max-content
+		margin-bottom: $form-small-gap - 2rem
 		color: $gray
 
 		img

src/lib/components/SortableList.svelte

@@ -58,7 +58,7 @@
 
 	// Main
 	type T = $$Generic
-	export let list: T[] & { uuid: string, validate: (strict: boolean) => Validation }[]
+	export let list: T[] & { id: number, validate: (strict: boolean) => Validation }[]
 	let origin: number | null = null // Index of the element being dragged
 
 	const dispatch = createEventDispatcher<{rearrange: T[]}>()
@@ -69,7 +69,7 @@
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <div class="list" on:dragover|preventDefault>
-	{#each list as item, index (item.uuid)}
+	{#each list as item, index (item.id)}
 
 		<div
 			class="row"