subject editor

Author: Bluerberry

prisma/schema.prisma

@@ -179,27 +179,15 @@ model Subject {
 	domainId		Int?
 	parentSubjects	Subject[]	@relation("SubjectRelation")
 	childSubjects	Subject[]	@relation("SubjectRelation")
-	lectures		SubjectLecture[]
-}
-
-model SubjectLecture {
-	subjectId		Int
-	lectureId		Int
-	x				Int			@default(0)
-	y				Int			@default(0)
-
-	subject			Subject		@relation(fields: [subjectId], references: [id], onDelete: Cascade)
-	lecture			Lecture		@relation(fields: [lectureId], references: [id], onDelete: Cascade)
-
-	@@id([subjectId, lectureId])
+	lectures		Lecture[]
 }
 
 model Lecture {
 	id				Int			@id @default(autoincrement())
 	graph			Graph		@relation(fields: [graphId], references: [id], onDelete: Cascade)
 	graphId			Int
 	name			String		@default("")
-	subjects		SubjectLecture[]
+	subjects		Subject[]
 }
 
 model GraphLink {

src/lib/components/Dropdown.svelte

@@ -54,7 +54,6 @@
 	let header: HTMLButtonElement
 	let query: string = ''
 
-	$: console.log(options)
 	$: choice = options.find(option => option.value === value)
 	$: options = options.sort((a, b) => {
 		if (a.validation.severity === Severity.error) return 1
@@ -73,11 +72,11 @@
 
 
 <div class="dropdown" bind:this={dropdown}>
-	<div 
-		class="wrapper" 
+	<div
+		class="wrapper"
 		class:visible
-		use:losefocus={() => visibility(false)} 
-		use:clickoutside={() => visibility(false)}  
+		use:losefocus={() => visibility(false)}
+		use:clickoutside={() => visibility(false)}
 		bind:this={wrapper}
 	>
 
@@ -176,7 +175,7 @@
 			width: 100%
 			height: auto
 			overflow: hidden
-		
+
 			&.visible .header
 				border-color: $tudelft-blue
 				border-bottom-color: $gray
@@ -186,7 +185,7 @@
 				&::after
 					translate: 0 80%
 					rotate: -135deg
-			
+
 			.header
 				position: relative
 				display: block

src/lib/components/Validation.svelte

@@ -29,7 +29,7 @@
 
 	$: show_error_icon = has_errors
 	$: error_disabled = !compact && one_error && !has_warnings
-	$: error_msg = compact ? '' : warning_disabled ? data.errors[0].short : data.errors.length
+	$: error_msg = compact ? '' : error_disabled ? data.errors[0].short : data.errors.length
 
 	$: one_warning = data.warnings.length === 1
 	$: has_warnings = data.warnings.length > 0
@@ -43,7 +43,7 @@
 					 : compact ? compact_tooltip
 					 : errors_visible ? 'Hide errors'
 					 : 'Show errors'
-	
+
 	$: warning_tooltip = warning_disabled ? ''
 					   : compact ? compact_tooltip
 					   : warnings_visible ? 'Hide warnings'
@@ -224,7 +224,7 @@
 
 			&:not(:disabled)
 				cursor: pointer
-				
+
 			img
 				width: $input-icon-size
 				height: $input-icon-size
@@ -243,7 +243,7 @@
 			border-radius: $border-radius
 
 			box-shadow: $shadow
-			
+
 			.item
 				display: grid
 				grid-template: "icon short show" auto "icon long long" auto / $input-icon-size auto 1fr

src/lib/scripts/controllers/CourseController.ts

@@ -330,10 +330,10 @@ class CourseController {
 	 * @throws `APIError` if the API call fails
 	 */
 
-	async getGraphOptions(): Promise<DropdownOption<GraphController>[]> {
+	async getGraphOptions(): Promise<DropdownOption<number>[]> {
 		const graphs = await this.getGraphs()
 		return graphs.map(graph => ({
-			value: graph,
+			value: graph.id,
 			label: graph.name,
 			validation: ValidationData.success()
 		}))

src/lib/scripts/controllers/FieldControllers.ts

@@ -17,7 +17,8 @@ import type {
 	SerializedGraph,
 	SerializedDomain,
 	SerializedSubject,
-	SerializedLecture
+	SerializedLecture,
+	DropdownOption
 } from '$scripts/types'
 
 // Exports
@@ -106,7 +107,7 @@ abstract class FieldController {
 	abstract unassignParent(parent: FieldController, mirror?: boolean): void
 	abstract unassignChild(child: FieldController, mirror?: boolean): void
 
-	abstract matchesQuery(query: string): Promise<boolean>
+	abstract matchesQuery(query: string): boolean
 }
 
 class DomainController extends FieldController {
@@ -407,11 +408,11 @@ class DomainController extends FieldController {
 	 */
 
 	static revive(cache: ControllerCache, data: SerializedDomain): DomainController {
-		const existing = cache.find(DomainController, data.id)
-		if (existing) {
-			if (!existing.represents(data)) {
+		const domain = cache.find(DomainController, data.id)
+		if (domain) {
+			if (!domain.represents(data))
 				throw new Error(`DomainError: Attempted to revive Domain with ID ${data.id}, but server data is out of sync with cache`)
-			}
+			return domain
 		}
 
 		return new DomainController(cache, data.id, data.x, data.y, data.name, data.style, data.graph, data.parents, data.children, data.subjects)
@@ -866,7 +867,7 @@ class DomainController extends FieldController {
 	 * @returns Whether the domain matches the query
 	 */
 
-	async matchesQuery(query: string): Promise<boolean> {
+	matchesQuery(query: string): boolean {
 		const query_lower = query.toLowerCase()
 		const name = this.trimmed_name.toLowerCase()
 		const style = this.style ? styles[this.style].display_name.toLowerCase() : ''
@@ -966,7 +967,7 @@ class SubjectController extends FieldController {
 
 		// Call API to get the graph data
 		this._pending_graph = this.cache
-			.fetch(`/api/subject/${this.id}/course`, { method: 'GET' })
+			.fetch(`/api/subject/${this.id}/graph`, { method: 'GET' })
 			.then(
 				async response => {
 					const data = await response.json() as SerializedGraph
@@ -976,10 +977,10 @@ class SubjectController extends FieldController {
 				},
 				error => {
 					this._pending_graph = undefined
-					throw new Error(`APIError (/api/subject/${this.id}/course GET): ${error}`)
+					throw new Error(`APIError (/api/subject/${this.id}/graph GET): ${error}`)
 				}
 			)
-		
+
 		return await this._pending_graph
 	}
 
@@ -1025,6 +1026,17 @@ class SubjectController extends FieldController {
 		return await this._pending_domain
 	}
 
+	async getDomainOptions(): Promise<DropdownOption<number>[]> {
+		const domains = await this.getGraph()
+			.then(graph => graph.getDomains())
+
+		return domains.map(domain => ({
+			value: domain.id,
+			label: domain.name,
+			validation: ValidationData.success()
+		}))
+	}
+
 	/**
 	 * Get the lectures assigned to this subject, from the cache or the API
 	 * @returns The lectures assigned to this subject
@@ -1109,7 +1121,7 @@ class SubjectController extends FieldController {
 					throw new Error(`APIError (/api/subject/${this.id}/parents GET): ${error}`)
 				}
 			)
-		
+
 		return await this._pending_parents as SubjectController[]
 	}
 
@@ -1153,7 +1165,7 @@ class SubjectController extends FieldController {
 					throw new Error(`APIError (/api/subject/${this.id}/children GET): ${error}`)
 				}
 			)
-		
+
 		return await this._pending_children as SubjectController[]
 	}
 
@@ -1208,11 +1220,11 @@ class SubjectController extends FieldController {
 	 */
 
 	static revive(cache: ControllerCache, data: SerializedSubject): SubjectController {
-		const existing = cache.find(SubjectController, data.id)
-		if (existing) {
-			if (!existing.represents(data))
+		const subject = cache.find(SubjectController, data.id)
+		if (subject) {
+			if (!subject.represents(data))
 				throw new Error(`SubjectError: Attempted to revive Subject with ID ${data.id}, but server data is out of sync with cache`)
-			return existing
+			return subject
 		}
 
 		return new SubjectController(cache, data.id, data.x, data.y, data.name, data.domain, data.graph, data.parents, data.children, data.lectures)
@@ -1659,11 +1671,16 @@ class SubjectController extends FieldController {
 	 * @returns Whether the subject matches the query
 	 */
 
-	async matchesQuery(query: string): Promise<boolean> {
+	matchesQuery(query: string): boolean {
 		const query_lower = query.toLowerCase()
-		const name = this.trimmed_name.toLowerCase()
-		const domain = await this.getDomain().then(domain => domain?.name.toLowerCase() || '')
+		const name_lower = this.trimmed_name.toLowerCase()
+		if (this._domain_id === null)  {
+			return name.includes(query_lower)
+		}
+
+		const domain = this.cache.find(DomainController, this._domain_id)
+		const domain_lower = domain ? domain.trimmed_name.toLowerCase() : ''
 
-		return name.includes(query_lower) || domain.includes(query_lower)
+		return name_lower.includes(query_lower) || domain_lower.includes(query_lower)
 	}
 }

src/lib/scripts/controllers/GraphController.ts

@@ -33,14 +33,14 @@ export { GraphController, SortOption }
 enum SortOption {
 	ascending  = 0b1000000000,
 	descending = 0b0100000000,
-	relations  = 0b0010000000,
-	subjects   = 0b0001000000,
-	domains    = 0b0000100000,
+	relation  = 0b0010000000,
+	subject   = 0b0001000000,
+	domain    = 0b0000100000,
 	index      = 0b0000010000,
 	name       = 0b0000001000,
 	style      = 0b0000000100,
-	parents    = 0b0000000010,
-	children   = 0b0000000001
+	parent    = 0b0000000010,
+	child   = 0b0000000001
 }
 
 
@@ -328,7 +328,7 @@ class GraphController {
 			lectures.map(async lecture => ({
 				value: lecture,
 				label: lecture.trimmed_name,
-				validation: await lecture.validate()
+				validation: ValidationData.success()
 			}))
 		)
 	}
@@ -750,13 +750,13 @@ class GraphController {
 		const [
 			domains,
 			domain_relations,
-			subjects, 
+			subjects,
 			subject_relations,
 			lectures
 		] = await Promise.all([
-			this.getDomains(), 
+			this.getDomains(),
 			this.getDomainRelations(),
-			this.getSubjects(), 
+			this.getSubjects(),
 			this.getSubjectRelations(),
 			this.getLectures()
 		])
@@ -1043,23 +1043,23 @@ class GraphController {
 			throw new Error('GraphError: Invalid sort option')
 		}
 
-		if (option & SortOption.relations) {
-			if (option & SortOption.domains) {
+		if (option & SortOption.relation) {
+			if (option & SortOption.domain) {
 				if (option & SortOption.index) {
 					// Sort domain relations by index
-				} else if (option & SortOption.parents) {
+				} else if (option & SortOption.parent) {
 					// Sort domain relations by parents
-				} else if (option & SortOption.children) {
+				} else if (option & SortOption.child) {
 					// Sort domain relations by children
 				} else {
 					throw new Error('GraphError: Invalid sort option')
 				}
-			} else if (option & SortOption.subjects) {
+			} else if (option & SortOption.subject) {
 				if (option & SortOption.index) {
 					// Sort subject relations by index
-				} else if (option & SortOption.parents) {
+				} else if (option & SortOption.parent) {
 					// Sort subject relations by parents
-				} else if (option & SortOption.children) {
+				} else if (option & SortOption.child) {
 					// Sort subject relations by children
 				} else {
 					throw new Error('GraphError: Invalid sort option')
@@ -1068,7 +1068,7 @@ class GraphController {
 				throw new Error('GraphError: Invalid sort option')
 			}
 		} else {
-			if (option & SortOption.subjects) {
+			if (option & SortOption.subject) {
 				const subjects = await this.getSubjects()
 				let comparable: { value: string | number, subject: SubjectController }[]
 
@@ -1091,7 +1091,7 @@ class GraphController {
 				}
 
 				// Sort subjects by domain
-				else if (option & SortOption.domains) {
+				else if (option & SortOption.domain) {
 					comparable = await Promise.all(
 						subjects.map(async subject => ({
 							value: await subject.getDomain().then(domain => domain?.trimmed_name || ''),
@@ -1114,7 +1114,7 @@ class GraphController {
 				if (descending) comparable.reverse()
 				this._subjects = comparable.map(pair => pair.subject)
 
-			} else if (option & SortOption.domains) {
+			} else if (option & SortOption.domain) {
 				const domains = await this.getDomains()
 				let comparable: { value: string | number, domain: DomainController }[]