From b6304078c55559e1d86c9c9c9949fc25fec12933 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 26 Apr 2024 23:26:05 +0200
Subject: [PATCH 001/565] Fix import error

---
 frontend/src/app/core/menu/user-menu/user-menu.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index e24b9270..c6ccd4a1 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
 import { Observable, map } from 'rxjs';
-import { User } from 'src/app/user/user';
+import { User } from 'src/app/user/models/user';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 

From a092da68f822e51f0ad531cfbd056d93a91a9788 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 26 Apr 2024 23:26:15 +0200
Subject: [PATCH 002/565] Refactor auth service

---
 frontend/src/app/services/auth.service.ts | 61 ++++++++++-------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 24bda552..4176e896 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,9 +1,9 @@
-import { Injectable } from '@angular/core';
+import { Injectable, computed } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
-import { BehaviorSubject, Observable, catchError, map, mergeMap, of, tap } from 'rxjs';
-import { User, UserResponse } from '../user/models/user';
+import { BehaviorSubject, Observable, catchError, map, of, switchMap, tap } from 'rxjs';
+import { RegistrationForm, ResetPasswordForm, User, UserResponse } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
@@ -12,17 +12,15 @@ import { HttpClient } from '@angular/common/http';
     providedIn: 'root'
 })
 export class AuthService {
-    private currentUserSubject$ = new BehaviorSubject<User | null | undefined>(undefined);
+    private currentUserSubject$ = new BehaviorSubject<User | null>(null);
 
-    currentUser$: Observable<User | null | undefined> = this.currentUserSubject$.pipe();
-    isAuthenticated$: Observable<boolean | undefined> = this.currentUserSubject$.pipe(
+    public currentUser = computed(() => this.currentUserSubject$.value);
+
+    currentUser$ = this.currentUserSubject$.pipe();
+    isAuthenticated$ = this.currentUserSubject$.pipe(
         map(_.isObject)
     )
 
-    private authRoute(route: string): string {
-        return `/users/${route}`
-    }
-
     constructor(
         private sessionService: SessionService,
         private router: Router,
@@ -34,6 +32,10 @@ export class AuthService {
         this.setInitialAuth();
     }
 
+    private authRoute(route: string): string {
+        return `/users/${route}`;
+    }
+
     private setAuth(user: User | null): void {
         this.currentUserSubject$.next(user);
     }
@@ -42,56 +44,52 @@ export class AuthService {
         this.currentUserSubject$.next(null);
     }
 
-    private checkUser(): Observable<User | null> {
+    private checkUser$(): Observable<User | null> {
         return this.http.get<UserResponse>(this.authRoute('user/')).pipe(
+            // TODO: proper error handling.
             catchError(error => of(null)),
             map(parseUserData),
         );
     }
 
+    // TODO: this belongs in the app component.
     private setInitialAuth(): void {
-        this.checkUser()
+        this.checkUser$()
             .pipe(takeUntilDestroyed())
             .subscribe(user =>
                 this.setAuth(user),
             );
     }
 
-    public currentUser(): User | null | undefined {
-        return this.currentUserSubject$.value;
-    }
-
     /**
      * Logs in, retrieves user response, transforms to User object
      */
-    public login(username: string, password: string): Observable<User | null> {
+    public login$(username: string, password: string): Observable<User | null> {
         return this.http.post<{ key: string }>(
             this.authRoute('login/'),
             { username, password }
         ).pipe(
-            mergeMap(() => this.checkUser()),
+            switchMap(() => this.checkUser$()),
+            // Side effect: set the user in the service.
             tap(data => this.setAuth(data)),
         );
     }
 
-    public logout(redirectToLogin: boolean = false): void {
+    public logout(redirectToLogin = false): void {
         this.purgeAuth();
         this.http.post(
             this.authRoute('logout/'),
             {}
+            // Subscribe in component
         ).subscribe((data) => {
-            console.log(data);
             if (redirectToLogin) {
                 this.showLogin();
             }
         });
     }
 
-    public register(
-        username: string, email: string, password1: string, password2: string
-    ): Observable<any> {
-        const data = { username, email, password1, password2 };
-        return this.http.post(this.authRoute('registration/'), data);
+    public register$(registrationForm: RegistrationForm): Observable<any> {
+        return this.http.post(this.authRoute('registration/'), registrationForm);
     }
 
     public verifyEmail(key: string): Observable<any> {
@@ -123,20 +121,11 @@ export class AuthService {
         );
     }
 
-    public resetPassword(
-        uid: string,
-        token: string,
-        newPassword1: string,
-        newPassword2: string
+    public resetPassword(resetPasswordForm: ResetPasswordForm
     ): Observable<{ detail: string }> {
         return this.http.post<{ detail: string }>(
             this.authRoute('password/reset/confirm/'),
-            {
-                uid,
-                token,
-                new_password1: newPassword1,
-                new_password2: newPassword2,
-            }
+            resetPasswordForm
         );
     }
 

From 9977613d2c58196d05fe392a795d69345d226502 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 26 Apr 2024 23:26:27 +0200
Subject: [PATCH 003/565] Early out

---
 frontend/src/app/user/utils.ts | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index 43b7b441..0a32ed28 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -7,18 +7,17 @@ import _ from 'underscore';
 * @returns User object
 */
 export const parseUserData = (result: UserResponse | null): User | null => {
-    if (result) {
-        return new User(
-            result.id,
-            result.username,
-            result.email,
-            result.first_name,
-            result.last_name,
-            result.is_staff,
-        );
-    } else {
+    if (!result) {
         return null;
     }
+    return new User(
+        result.id,
+        result.username,
+        result.email,
+        result.first_name,
+        result.last_name,
+        result.is_staff,
+    );
 }
 
 /**

From 1437df3c7cda431b815cffe14c3f6f9838a6322f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 27 Apr 2024 23:29:23 +0200
Subject: [PATCH 004/565] Registration form

---
 .../menu/user-menu/user-menu.component.html   |  2 +-
 frontend/src/app/routes.ts                    |  6 ++
 frontend/src/app/services/auth.service.ts     | 17 ++++--
 .../src/app/user/login/login.component.ts     |  3 +-
 frontend/src/app/user/models/user.ts          | 14 +++++
 .../app/user/register/register.component.html | 52 ++++++++++++++++
 .../app/user/register/register.component.scss |  0
 .../user/register/register.component.spec.ts  | 21 +++++++
 .../app/user/register/register.component.ts   | 61 +++++++++++++++++++
 frontend/src/app/user/user.module.ts          |  6 +-
 frontend/src/app/user/validation.ts           | 22 ++++++-
 11 files changed, 191 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/app/user/register/register.component.html
 create mode 100644 frontend/src/app/user/register/register.component.scss
 create mode 100644 frontend/src/app/user/register/register.component.spec.ts
 create mode 100644 frontend/src/app/user/register/register.component.ts

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 161c77a9..31450d1c 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -24,7 +24,7 @@
                 Sign in
             </a>
         </li>
-        <li class="nav-item" hidden> <!-- hide registration link until this is implemented -->
+        <li class="nav-item">
             <a [routerLink]="['/register']" routerLinkActive="active" class="nav-link">
                 Register
             </a>
diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 7c501e1e..983867bc 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -3,6 +3,7 @@ import { Routes } from '@angular/router';
 import { HomeComponent } from './home/home.component';
 import { LoginComponent } from './user/login/login.component';
 import { VerifyEmailComponent } from './user/verify-email/verify-email.component';
+import { RegisterComponent } from './user/register/register.component';
 
 const routes: Routes = [
     {
@@ -13,6 +14,11 @@ const routes: Routes = [
         path: 'login',
         component: LoginComponent,
     },
+    {
+        path: 'register',
+        component: RegisterComponent,
+
+    },
     {
         path: 'confirm-email/:key',
         component: VerifyEmailComponent,
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 4176e896..c7b68a40 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -2,8 +2,8 @@ import { Injectable, computed } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
-import { BehaviorSubject, Observable, catchError, map, of, switchMap, tap } from 'rxjs';
-import { RegistrationForm, ResetPasswordForm, User, UserResponse } from '../user/models/user';
+import { BehaviorSubject, Observable, Subject, catchError, map, of, switchMap, tap } from 'rxjs';
+import { UserRegistration, ResetPasswordForm, User, UserResponse } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
@@ -21,6 +21,15 @@ export class AuthService {
         map(_.isObject)
     )
 
+    public newRegistration$ = new Subject<UserRegistration>();
+
+    public registration$ = this.newRegistration$.pipe(
+        switchMap(registrationForm => this.http.post(
+            this.authRoute('registration/'), registrationForm)
+        ),
+        catchError(error => of(null)),
+    );
+
     constructor(
         private sessionService: SessionService,
         private router: Router,
@@ -88,10 +97,6 @@ export class AuthService {
         });
     }
 
-    public register$(registrationForm: RegistrationForm): Observable<any> {
-        return this.http.post(this.authRoute('registration/'), registrationForm);
-    }
-
     public verifyEmail(key: string): Observable<any> {
         return this.http.post(
             this.authRoute('registration/verify-email/'),
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index ec06c180..f8fad7f1 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -6,7 +6,6 @@ import { AuthService } from '@services/auth.service';
 import { passwordValidators, usernameValidators } from '../validation';
 
 
-
 @Component({
   selector: 'lc-login',
   templateUrl: './login.component.html',
@@ -39,7 +38,7 @@ export class LoginComponent {
     submit() {
         const valid = this.checkValidation();
         if (valid) {
-            this.authService.login(
+            this.authService.login$(
                 this.usernameInput.value as string, this.passwordInput.value as string
             ).subscribe({
                 next: () => this.loginSucces(),
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index 667b3e4f..d65cf747 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -17,3 +17,17 @@ export class User {
         public isStaff: boolean,
     ) { }
 }
+
+export interface UserRegistration {
+    username: string;
+    email: string;
+    password1: string;
+    password2: string;
+}
+
+export interface ResetPasswordForm {
+    uid: string;
+    token: string;
+    new_password1: string;
+    new_password2: string;
+}
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
new file mode 100644
index 00000000..8a86172e
--- /dev/null
+++ b/frontend/src/app/user/register/register.component.html
@@ -0,0 +1,52 @@
+<h3>Register</h3>
+
+<p>Enter your details in the form below to create a new user account.</p>
+
+<form class="needs-validation" [formGroup]="form" (ngSubmit)="submit()">
+    <div>
+        <label for="username" class="form-label" required>Username</label>
+        <input
+            type="text"
+            id="username"
+            class="form-control"
+            [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
+            [formControl]="form.controls.username">
+        <p *ngIf="form.controls.username.hasError('required')" class="invalid-feedback">Please provide a username</p>
+        <p *ngIf="form.controls.username.hasError('minlength')" class="invalid-feedback">Username must be at least 3 characters long</p>
+        <p *ngIf="form.controls.username.hasError('maxlength')" class="invalid-feedback">Username must be at most 150 characters long</p>
+    </div>
+    <div>
+        <label for="email" class="form-label">Email</label>
+        <input
+            type="email"
+            id="email"
+            class="form-control"
+            [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid"
+            [formControl]="form.controls.email">
+        <p class="invalid-feedback">Please provide a valid email</p>
+    </div>
+    <div>
+        <label for="password1" class="form-label">Password</label>
+        <input
+            type="password"
+            id="password1"
+            class="form-control"
+            [class.is-invalid]="form.controls.password1.touched && form.controls.password1.invalid"
+            [formControl]="form.controls.password1">
+        <p *ngIf="form.controls.password1.hasError('required')" class="invalid-feedback">Please provide a password</p>
+        <p *ngIf="form.controls.password1.hasError('minlength')" class="invalid-feedback">Password must be at least 8 characters long</p>
+    </div>
+    <div>
+        <label for="password2" class="form-label">Confirm Password</label>
+        <input
+            type="password"
+            class="form-control"
+            id="password2"
+            [class.is-invalid]="form.controls.password2.touched && form.controls.password2.invalid"
+            [formControl]="form.controls.password2">
+        <p *ngIf="form.controls.password2.hasError('required')" class="invalid-feedback">Please provide a password</p>
+        <p *ngIf="form.controls.password2.hasError('minlength')" class="invalid-feedback">Password must be at least 8 characters long</p>
+    </div>
+    <p *ngIf="form.hasError('passwords')" class="is-invalid">Passwords do not match.</p>
+    <button type="submit" class="btn btn-primary mt-3">Register</button>
+</form>
diff --git a/frontend/src/app/user/register/register.component.scss b/frontend/src/app/user/register/register.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/user/register/register.component.spec.ts b/frontend/src/app/user/register/register.component.spec.ts
new file mode 100644
index 00000000..9c4c73c8
--- /dev/null
+++ b/frontend/src/app/user/register/register.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RegisterComponent } from './register.component';
+
+describe('RegisterComponent', () => {
+  let component: RegisterComponent;
+  let fixture: ComponentFixture<RegisterComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [RegisterComponent]
+    });
+    fixture = TestBed.createComponent(RegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
new file mode 100644
index 00000000..6d79f29b
--- /dev/null
+++ b/frontend/src/app/user/register/register.component.ts
@@ -0,0 +1,61 @@
+import { Component } from '@angular/core';
+import { UserRegistration } from '../models/user';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { usernameValidators, passwordValidators, identicalPasswordsValidator } from '../validation';
+import { AuthService } from '@services/auth.service';
+
+type RegisterForm = {
+    [key in keyof UserRegistration]: FormControl<string>;
+}
+
+@Component({
+  selector: 'lc-register',
+  templateUrl: './register.component.html',
+  styleUrls: ['./register.component.scss']
+})
+export class RegisterComponent {
+    form = new FormGroup<RegisterForm>({
+        username: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+                ...usernameValidators
+            ]
+        }),
+        email: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+                Validators.email,
+            ]
+        }),
+        password1: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+                ...passwordValidators,
+            ]
+        }),
+        password2: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+            Validators.required,
+            ...passwordValidators,
+        ]}),
+    }, {
+        validators: identicalPasswordsValidator
+    });
+
+    registrationResult$ = this.authService.registration$;
+
+    constructor(private authService: AuthService) { }
+
+    public submit(): void {
+        this.form.updateValueAndValidity();
+        if (!this.form.valid) {
+            return;
+        }
+        this.authService.newRegistration$.next(this.form.getRawValue());
+    }
+
+}
diff --git a/frontend/src/app/user/user.module.ts b/frontend/src/app/user/user.module.ts
index c7f72b4f..adf180a1 100644
--- a/frontend/src/app/user/user.module.ts
+++ b/frontend/src/app/user/user.module.ts
@@ -2,13 +2,13 @@ import { NgModule } from '@angular/core';
 import { LoginComponent } from './login/login.component';
 import { SharedModule } from '../shared/shared.module';
 import { VerifyEmailComponent } from './verify-email/verify-email.component';
-
-
+import { RegisterComponent } from './register/register.component';
 
 @NgModule({
     declarations: [
         LoginComponent,
-        VerifyEmailComponent
+        VerifyEmailComponent,
+        RegisterComponent
     ],
     imports: [
         SharedModule
diff --git a/frontend/src/app/user/validation.ts b/frontend/src/app/user/validation.ts
index b8174ae4..90fc9e42 100644
--- a/frontend/src/app/user/validation.ts
+++ b/frontend/src/app/user/validation.ts
@@ -1,4 +1,4 @@
-import { Validators } from "@angular/forms";
+import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from "@angular/forms";
 
 /**
  * Validation for usernames
@@ -8,6 +8,7 @@ import { Validators } from "@angular/forms";
  * - letters, digits and `@.+-_` only
  */
 export const usernameValidators = [
+    Validators.minLength(3),
     Validators.maxLength(150),
     Validators.pattern(/^[\w@+-]+$/),
 ];
@@ -18,3 +19,22 @@ export const usernameValidators = [
 export const passwordValidators = [
     Validators.minLength(8),
 ];
+
+
+
+/**
+ * Validates that two password fields have identical values.
+ *
+ * @param form - The form control containing at least two controls named `password1` and `password2`.
+ * @returns A `ValidationErrors` object if the passwords do not match, otherwise `null`.
+ */
+export const identicalPasswordsValidator: ValidatorFn = (form: AbstractControl): ValidationErrors | null => {
+    const password1 = form.get('password1');
+    const password2 = form.get('password2');
+
+    if (!password1?.value || !password2?.value) {
+        return null;
+    }
+
+    return password1.value === password2.value ? null : { 'passwords': 'Passwords do not match' };
+};

From af5580a655b49a97dcfea5fd16a4438cbc0ad645 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 28 Apr 2024 11:07:11 +0200
Subject: [PATCH 005/565] Tweak register form

---
 .../src/app/user/register/register.component.html     | 11 +++++++----
 .../src/app/user/register/register.component.scss     |  3 +++
 frontend/src/app/user/register/register.component.ts  |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index 8a86172e..c19651f9 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -1,16 +1,19 @@
-<h3>Register</h3>
+<h2>Register</h2>
 
 <p>Enter your details in the form below to create a new user account.</p>
 
 <form class="needs-validation" [formGroup]="form" (ngSubmit)="submit()">
     <div>
-        <label for="username" class="form-label" required>Username</label>
+        <label for="username" class="form-label">
+            Username
+        </label>
         <input
             type="text"
             id="username"
             class="form-control"
             [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
-            [formControl]="form.controls.username">
+            [formControl]="form.controls.username"
+        >
         <p *ngIf="form.controls.username.hasError('required')" class="invalid-feedback">Please provide a username</p>
         <p *ngIf="form.controls.username.hasError('minlength')" class="invalid-feedback">Username must be at least 3 characters long</p>
         <p *ngIf="form.controls.username.hasError('maxlength')" class="invalid-feedback">Username must be at most 150 characters long</p>
@@ -47,6 +50,6 @@ <h3>Register</h3>
         <p *ngIf="form.controls.password2.hasError('required')" class="invalid-feedback">Please provide a password</p>
         <p *ngIf="form.controls.password2.hasError('minlength')" class="invalid-feedback">Password must be at least 8 characters long</p>
     </div>
-    <p *ngIf="form.hasError('passwords')" class="is-invalid">Passwords do not match.</p>
+    <p class="invalid-feedback" [class.visible]="form.hasError('passwords')">Passwords do not match.</p>
     <button type="submit" class="btn btn-primary mt-3">Register</button>
 </form>
diff --git a/frontend/src/app/user/register/register.component.scss b/frontend/src/app/user/register/register.component.scss
index e69de29b..de5644b4 100644
--- a/frontend/src/app/user/register/register.component.scss
+++ b/frontend/src/app/user/register/register.component.scss
@@ -0,0 +1,3 @@
+.visible {
+    display: block !important;
+}
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index 6d79f29b..d4ded3a3 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -52,6 +52,7 @@ export class RegisterComponent {
 
     public submit(): void {
         this.form.updateValueAndValidity();
+        this.form.markAllAsTouched();
         if (!this.form.valid) {
             return;
         }

From e6b81ca0a74ba58a4aa65fa32f58740f39f04ef6 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 28 Apr 2024 20:58:49 +0200
Subject: [PATCH 006/565] Login component; extract utils

---
 frontend/src/app/services/auth.service.ts     |  88 +++++++++------
 .../src/app/user/login/login.component.html   |  48 +++++---
 .../src/app/user/login/login.component.ts     | 103 +++++++-----------
 frontend/src/app/user/models/user.ts          |   5 +
 .../app/user/register/register.component.html |  32 ++++--
 .../app/user/register/register.component.ts   |  86 +++++++++++++--
 frontend/src/app/user/utils.ts                |  62 +++++++++++
 7 files changed, 289 insertions(+), 135 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index c7b68a40..ca3946b8 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -2,8 +2,8 @@ import { Injectable, computed } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
-import { BehaviorSubject, Observable, Subject, catchError, map, of, switchMap, tap } from 'rxjs';
-import { UserRegistration, ResetPasswordForm, User, UserResponse } from '../user/models/user';
+import { BehaviorSubject, Observable, Subject, catchError, map, of, switchMap, tap, merge, share } from 'rxjs';
+import { UserRegistration, ResetPasswordForm, User, UserResponse, UserLogin } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
@@ -19,17 +19,54 @@ export class AuthService {
     currentUser$ = this.currentUserSubject$.pipe();
     isAuthenticated$ = this.currentUserSubject$.pipe(
         map(_.isObject)
-    )
+    );
 
-    public newRegistration$ = new Subject<UserRegistration>();
+    public initialAuth$ = new Subject<void>();
 
+    public newRegistration$ = new Subject<UserRegistration>();
     public registration$ = this.newRegistration$.pipe(
-        switchMap(registrationForm => this.http.post(
-            this.authRoute('registration/'), registrationForm)
+        switchMap(registrationForm => this.http.post<null>(
+            this.authRoute('registration/'), registrationForm).pipe(
+                // Catch the error and return it so we can show the error and the stream does not complete.
+                catchError(error => of({ errorObject: error.error })),
+            ),
         ),
-        catchError(error => of(null)),
+        share()
+    );
+
+    public newLogin$ = new Subject<UserLogin>();
+    public login$ = this.newLogin$.pipe(
+        switchMap(loginForm => this.http.post<any>(
+            this.authRoute('login/'), loginForm
+        )),
+    );
+
+    public user$ = merge([
+        this.login$,
+        this.initialAuth$
+    ]).pipe(
+        switchMap(() => this.http.get<UserResponse>(
+            this.authRoute('user/')
+        ).pipe(
+            catchError(error => of(null)),
+            map(parseUserData),
+        )),
     );
 
+
+    /**
+     * Logs in, retrieves user response, transforms to User object
+     */
+    // public loginOld$(loginForm: UserLogin): Observable<User | null> {
+    //     return this.http.post<{ key: string }>(
+    //         this.authRoute('login/'),
+    //         loginForm
+    //     ).pipe(
+    //         switchMap(() => this.checkUser$()),
+    //         tap(data => this.setAuth(data)),
+    //     );
+    // }
+
     constructor(
         private sessionService: SessionService,
         private router: Router,
@@ -38,7 +75,7 @@ export class AuthService {
         this.sessionService.expired.pipe(
             takeUntilDestroyed()
         ).subscribe(() => this.logout());
-        this.setInitialAuth();
+        // this.setInitialAuth();
     }
 
     private authRoute(route: string): string {
@@ -53,36 +90,15 @@ export class AuthService {
         this.currentUserSubject$.next(null);
     }
 
-    private checkUser$(): Observable<User | null> {
-        return this.http.get<UserResponse>(this.authRoute('user/')).pipe(
-            // TODO: proper error handling.
-            catchError(error => of(null)),
-            map(parseUserData),
-        );
-    }
 
     // TODO: this belongs in the app component.
-    private setInitialAuth(): void {
-        this.checkUser$()
-            .pipe(takeUntilDestroyed())
-            .subscribe(user =>
-                this.setAuth(user),
-            );
-    }
-
-    /**
-     * Logs in, retrieves user response, transforms to User object
-     */
-    public login$(username: string, password: string): Observable<User | null> {
-        return this.http.post<{ key: string }>(
-            this.authRoute('login/'),
-            { username, password }
-        ).pipe(
-            switchMap(() => this.checkUser$()),
-            // Side effect: set the user in the service.
-            tap(data => this.setAuth(data)),
-        );
-    }
+    // private setInitialAuth(): void {
+    //     this.checkUser$
+    //         .pipe(takeUntilDestroyed())
+    //         .subscribe(user =>
+    //             this.setAuth(user),
+    //         );
+    // }
 
     public logout(redirectToLogin = false): void {
         this.purgeAuth();
diff --git a/frontend/src/app/user/login/login.component.html b/frontend/src/app/user/login/login.component.html
index 0f7f8433..30005466 100644
--- a/frontend/src/app/user/login/login.component.html
+++ b/frontend/src/app/user/login/login.component.html
@@ -1,26 +1,40 @@
-<form>
-    <div class="mb-3" id="usernameField">
-        <label class="form-label" for="usernameInput">Username</label>
-        <input class="form-control" id="usernameInput" [formControl]="usernameInput"
-            [class.is-invalid]="usernameErrorMessage != ''">
-        <div class="invalid-feedback">
-            {{usernameErrorMessage}}
-        </div>
+<h2>Sign in</h2>
+
+<p>Sign in using the form below.</p>
+
+<form [formGroup]="form" (ngSubmit)="submit()">
+    <div class="mb-3">
+        <label for="username" class="form-label">
+            Username
+        </label>
+        <input
+            type="text"
+            id="username"
+            class="form-control"
+            [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
+            [formControl]="form.controls.username">
+        <p *ngIf="form.controls.username.hasError('required')" class="invalid-feedback">Username is required.</p>
+        <p *ngIf="form.controls.username.hasError('invalid')" class="invalid-feedback">Invalid username.</p>
     </div>
-    <div class="mb-3" id="passwordField">
-        <label class="form-label" for="passwordInput">Password</label>
-        <input type="password" class="form-control" id="passwordInput" [formControl]="passwordInput"
-            [class.is-invalid]="passwordErrorMessage != ''">
-        <div class="invalid-feedback">
-            {{passwordErrorMessage}}
-        </div>
+    <div class="mb-3">
+        <label for="password" class="form-label">
+            Password
+        </label>
+        <input
+            type="password"
+            id="password"
+            class="form-control"
+            [formControl]="form.controls.password"
+            [class.is-invalid]="form.controls.password.touched && form.controls.password.invalid">
+        <p *ngIf="form.controls.password.hasError('required')" class="invalid-feedback">Password is required.</p>
+        <p *ngIf="form.controls.password.hasError('invalid')" class="invalid-feedback">Invalid password.</p>
     </div>
     <div class="mb-3">
-        <button type="submit" class="btn btn-primary" (click)="submit()">
+        <button type="submit" class="btn btn-primary mt-3">
             Sign in
         </button>
     </div>
-    <div class="alert alert-danger" *ngIf="requestFailed" role="alert">
+    <div class="alert alert-danger" *ngIf="loginReturnError$ | async" role="alert">
         Failed to sign in.
     </div>
 </form>
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index f8fad7f1..6f69a417 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -1,81 +1,62 @@
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component } from '@angular/core';
-import { FormControl, Validators } from '@angular/forms';
+import { Component, DestroyRef, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AuthService } from '@services/auth.service';
 import { passwordValidators, usernameValidators } from '../validation';
+import { UserLogin } from '../models/user';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { catchError, ignoreElements, of } from 'rxjs';
 
+type LoginForm = {
+    [key in keyof UserLogin]: FormControl<string>;
+}
 
 @Component({
   selector: 'lc-login',
   templateUrl: './login.component.html',
   styleUrls: ['./login.component.scss']
 })
-export class LoginComponent {
-    usernameInput = new FormControl('', [
-        Validators.required,
-        ...usernameValidators
-    ]);
-    usernameErrorMessage = '';
-    passwordInput = new FormControl('', [
-        Validators.required,
-        ...passwordValidators,
-    ]);
-    passwordErrorMessage = '';
-
-    requestFailed = false;
-
-    private returnUrl: string;
+export class LoginComponent implements OnInit {
+    form = new FormGroup<LoginForm>({
+        username: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [Validators.required]
+        }),
+        password: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [Validators.required]
+        }),
+    });
+
+    returnUrl = this.activatedRoute.snapshot.queryParams['returnUrl'] || '/';
+
+    loginReturn$ = this.authService.login$;
+    loginReturnError$ = this.authService.login$.pipe(
+        ignoreElements(),
+        catchError(error => of(error))
+    );
 
     constructor(
         private authService: AuthService,
         private activatedRoute: ActivatedRoute,
         private router: Router,
-    ) {
-        this.returnUrl = this.activatedRoute.snapshot.queryParams['returnUrl'] || '/';
+        private destroyRef: DestroyRef,
+    ) { }
+
+    ngOnInit(): void {
+        this.loginReturn$.pipe(
+            takeUntilDestroyed(this.destroyRef)
+        ).subscribe(() => {
+            this.router.navigate([this.returnUrl]);
+        })
     }
 
-    submit() {
-        const valid = this.checkValidation();
-        if (valid) {
-            this.authService.login$(
-                this.usernameInput.value as string, this.passwordInput.value as string
-            ).subscribe({
-                next: () => this.loginSucces(),
-                error: (e: HttpErrorResponse) => this.loginFailed(e)
-            });
+    submit(): void {
+        this.form.updateValueAndValidity();
+        this.form.markAllAsTouched();
+        if (!this.form.valid) {
+            return;
         }
-    }
-
-    private checkValidation() {
-        if (this.usernameInput.invalid) {
-            if (this.usernameInput.errors?.['required']) {
-                this.usernameErrorMessage = 'username is required';
-            } else {
-                this.usernameErrorMessage = 'invalid username';
-            }
-        } else {
-            this.usernameErrorMessage = '';
-        }
-
-        if (this.passwordInput.invalid) {
-            if (this.passwordInput.errors?.['required']) {
-                this.passwordErrorMessage = 'password is required';
-            } else {
-                this.passwordErrorMessage = 'invalid password';
-            }
-        } else {
-            this.passwordErrorMessage = '';
-        }
-
-        return this.usernameInput.valid && this.passwordInput.valid;
-    }
-
-    private loginSucces() {
-        this.router.navigate([this.returnUrl]);
-    }
-
-    private loginFailed(error: HttpErrorResponse) {
-        this.requestFailed = true;
+        this.authService.newLogin$.next(this.form.getRawValue());
     }
 }
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index d65cf747..83f24353 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -25,6 +25,11 @@ export interface UserRegistration {
     password2: string;
 }
 
+export interface UserLogin {
+    username: string;
+    password: string;
+}
+
 export interface ResetPasswordForm {
     uid: string;
     token: string;
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index c19651f9..c03b27ea 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -2,6 +2,8 @@ <h2>Register</h2>
 
 <p>Enter your details in the form below to create a new user account.</p>
 
+<p>Already have an account? <a routerLink="/login">Sign in</a></p>
+
 <form class="needs-validation" [formGroup]="form" (ngSubmit)="submit()">
     <div>
         <label for="username" class="form-label">
@@ -14,9 +16,9 @@ <h2>Register</h2>
             [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
             [formControl]="form.controls.username"
         >
-        <p *ngIf="form.controls.username.hasError('required')" class="invalid-feedback">Please provide a username</p>
-        <p *ngIf="form.controls.username.hasError('minlength')" class="invalid-feedback">Username must be at least 3 characters long</p>
-        <p *ngIf="form.controls.username.hasError('maxlength')" class="invalid-feedback">Username must be at most 150 characters long</p>
+        <p *ngFor="let error of userErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
     </div>
     <div>
         <label for="email" class="form-label">Email</label>
@@ -26,7 +28,9 @@ <h2>Register</h2>
             class="form-control"
             [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid"
             [formControl]="form.controls.email">
-        <p class="invalid-feedback">Please provide a valid email</p>
+        <p *ngFor="let error of emailErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
     </div>
     <div>
         <label for="password1" class="form-label">Password</label>
@@ -36,8 +40,9 @@ <h2>Register</h2>
             class="form-control"
             [class.is-invalid]="form.controls.password1.touched && form.controls.password1.invalid"
             [formControl]="form.controls.password1">
-        <p *ngIf="form.controls.password1.hasError('required')" class="invalid-feedback">Please provide a password</p>
-        <p *ngIf="form.controls.password1.hasError('minlength')" class="invalid-feedback">Password must be at least 8 characters long</p>
+        <p *ngFor="let error of password1Errors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
     </div>
     <div>
         <label for="password2" class="form-label">Confirm Password</label>
@@ -47,9 +52,16 @@ <h2>Register</h2>
             id="password2"
             [class.is-invalid]="form.controls.password2.touched && form.controls.password2.invalid"
             [formControl]="form.controls.password2">
-        <p *ngIf="form.controls.password2.hasError('required')" class="invalid-feedback">Please provide a password</p>
-        <p *ngIf="form.controls.password2.hasError('minlength')" class="invalid-feedback">Password must be at least 8 characters long</p>
+        <p *ngFor="let error of password2Errors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
     </div>
-    <p class="invalid-feedback" [class.visible]="form.hasError('passwords')">Passwords do not match.</p>
-    <button type="submit" class="btn btn-primary mt-3">Register</button>
+    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback visible">{{ error}}</p>
+    <button type="submit" class="btn btn-primary my-3">Register</button>
 </form>
+
+<div *ngIf="registrationSuccessful$ | async" class="alert alert-success" role="alert">
+    <h2 class="h6 alert-heading">Registration successful</h2>
+    <p>Your account details have been registered successfully.</p>
+    <p>Please check your email inbox for a verification email and click the link.</p>
+</div>
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index d4ded3a3..fe118900 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -1,17 +1,43 @@
-import { Component } from '@angular/core';
+import { Component, DestroyRef } from '@angular/core';
 import { UserRegistration } from '../models/user';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { usernameValidators, passwordValidators, identicalPasswordsValidator } from '../validation';
 import { AuthService } from '@services/auth.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { filter, map } from 'rxjs';
+import { controlErrorMessages$, setErrors, updateFormValidity } from '../utils';
 
 type RegisterForm = {
     [key in keyof UserRegistration]: FormControl<string>;
 }
 
+const errorMessageMap: Record<keyof UserRegistration | 'form', Record<string, string>> = {
+    username: {
+        'required': 'Username is required.',
+        'minlength': 'Username must be at least 3 characters long.',
+        'maxlength': 'Username must be at most 150 characters long.',
+    },
+    email: {
+        'required': 'Email is required.',
+        'email': 'Email is invalid.',
+    },
+    password1: {
+        'required': 'Password is required.',
+        'minlength': 'Password must be at least 8 characters long.',
+    },
+    password2: {
+        'required': 'Password is required.',
+        'minlength': 'Password must be at least 8 characters long.',
+    },
+    form: {
+        'passwords': 'Passwords must be identical.',
+    }
+};
+
 @Component({
-  selector: 'lc-register',
-  templateUrl: './register.component.html',
-  styleUrls: ['./register.component.scss']
+    selector: 'lc-register',
+    templateUrl: './register.component.html',
+    styleUrls: ['./register.component.scss']
 })
 export class RegisterComponent {
     form = new FormGroup<RegisterForm>({
@@ -39,24 +65,62 @@ export class RegisterComponent {
         password2: new FormControl<string>('', {
             nonNullable: true,
             validators: [
-            Validators.required,
-            ...passwordValidators,
-        ]}),
+                Validators.required,
+                ...passwordValidators,
+            ]
+        }),
     }, {
         validators: identicalPasswordsValidator
     });
 
-    registrationResult$ = this.authService.registration$;
+    userErrors$ = controlErrorMessages$('username', this.form, errorMessageMap.username);
+    emailErrors$ = controlErrorMessages$('email', this.form, errorMessageMap.email);
+    password1Errors$ = controlErrorMessages$('password1', this.form, errorMessageMap.password1);
+    password2Errors$ = controlErrorMessages$('password2', this.form, errorMessageMap.password2);
+    formErrors$ = this.form.statusChanges.pipe(
+        map(() => {
+            const formErrors = this.form.errors ?? {};
+            const formErrorMessages = errorMessageMap.form;
+            const messages: string[] = [];
+            for (const errorKey in formErrors) {
+                if (errorKey in formErrorMessages) {
+                    messages.push(formErrorMessages[errorKey]);
+                } else {
+                    messages.push(formErrors[errorKey]);
+                }
+            }
+            return messages;
+        })
+    );
+
+    registrationSuccessful$ = this.authService.registration$.pipe(
+        filter(result => result === null),
+        map(() => true),
+    );
 
-    constructor(private authService: AuthService) { }
+    constructor(
+        private authService: AuthService,
+        private destroyRef: DestroyRef,
+    ) { }
+
+    ngOnInit(): void {
+        this.authService.registration$
+            .pipe(
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(result => {
+                if (result?.errorObject) {
+                    setErrors(result.errorObject, this.form);
+                }
+            });
+    }
 
     public submit(): void {
-        this.form.updateValueAndValidity();
         this.form.markAllAsTouched();
+        updateFormValidity(this.form);
         if (!this.form.valid) {
             return;
         }
         this.authService.newRegistration$.next(this.form.getRawValue());
     }
-
 }
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index 0a32ed28..bbdd0368 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -1,5 +1,7 @@
+import { FormGroup } from "@angular/forms";
 import { User, UserResponse } from "./models/user";
 import _ from 'underscore';
+import { Observable, map } from "rxjs";
 
 /* Transforms backend user response to User object
 *
@@ -39,3 +41,63 @@ export const encodeUserData = (data: Partial<User>): Partial<UserResponse> => {
     };
     return _.omit(encoded, _.isUndefined);
 };
+
+
+/**
+ * Interprets backend validation errors and adds errors to their associated controls.
+ *
+ * Others are not tied to specific controls. These are added to the form itself with a generic 'invalid' key.
+ *
+ * @param errorObject - The error object containing the control names as keys and the corresponding error messages as values.
+ * @param form - The form to which the errors should be added.
+ */
+export function setErrors(errorObject: Record<string, string>, form: FormGroup): void {
+    for (const errorKey in errorObject) {
+        const control = form.get(errorKey);
+        const error = errorObject[errorKey];
+        if (control) {
+            control.setErrors({'invalid': error});
+        } else {
+            form.setErrors({'invalid': error});
+        }
+    }
+}
+
+
+/**
+ * Watches a FormControl and turns its errors into an array of string messages.
+ *
+ * @param controlName - The name of the form control.
+ * @param form - The FormGroup instance.
+ * @param errorMessageMap - A mapping object that contains error messages for each control.
+ * @returns An Observable that emits an array of error messages every time the control's status changes.
+ */
+export function controlErrorMessages$<T extends FormGroup, K extends string & keyof T['controls']>(controlName: K, form: T, errorMessageMap: Record<string, string>): Observable<string[]> {
+    const control = form.controls[controlName];
+    return control.statusChanges.pipe(
+        map(() => {
+            const errors = control.errors ?? {};
+            const messages: string[] = Object.keys(errors)
+                .map(errorKey => {
+                    if (errorKey in errorMessageMap) {
+                        return errorMessageMap[errorKey];
+                    } else {
+                        return errors[errorKey];
+                    }
+                });
+            return messages;
+        }),
+    );
+}
+
+/**
+ * Updates the validity of all controls in the given form and the form itself.
+ *
+ * @param form - The form group to update.
+ */
+export function updateFormValidity(form: FormGroup): void {
+    Object.values(form.controls).forEach(control => {
+        control.updateValueAndValidity();
+    });
+    form.updateValueAndValidity();
+}

From fcd78f0351833cc40f92839f6a9dc45f2a571946 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 2 May 2024 10:49:30 +0200
Subject: [PATCH 007/565] Minor cleanup

---
 frontend/src/app/user/login/login.component.ts       | 6 +++---
 frontend/src/app/user/register/register.component.ts | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 6f69a417..362d7bbe 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -2,10 +2,10 @@ import { Component, DestroyRef, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AuthService } from '@services/auth.service';
-import { passwordValidators, usernameValidators } from '../validation';
 import { UserLogin } from '../models/user';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { catchError, ignoreElements, of } from 'rxjs';
+import { updateFormValidity } from '../utils';
 
 type LoginForm = {
     [key in keyof UserLogin]: FormControl<string>;
@@ -51,9 +51,9 @@ export class LoginComponent implements OnInit {
         })
     }
 
-    submit(): void {
-        this.form.updateValueAndValidity();
+    public submit(): void {
         this.form.markAllAsTouched();
+        updateFormValidity(this.form);
         if (!this.form.valid) {
             return;
         }
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index fe118900..59f86a18 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef } from '@angular/core';
+import { Component, DestroyRef, OnInit } from '@angular/core';
 import { UserRegistration } from '../models/user';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { usernameValidators, passwordValidators, identicalPasswordsValidator } from '../validation';
@@ -39,7 +39,7 @@ const errorMessageMap: Record<keyof UserRegistration | 'form', Record<string, st
     templateUrl: './register.component.html',
     styleUrls: ['./register.component.scss']
 })
-export class RegisterComponent {
+export class RegisterComponent implements OnInit {
     form = new FormGroup<RegisterForm>({
         username: new FormControl<string>('', {
             nonNullable: true,

From bd98611b7fffc06abf05a6bc73112bdd3f1c27db Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 2 May 2024 11:06:46 +0200
Subject: [PATCH 008/565] Updated verify email

---
 frontend/src/app/services/auth.service.ts     | 23 +++++---
 .../verify-email/verify-email.component.html  |  2 +-
 .../verify-email/verify-email.component.ts    | 59 +++++++++----------
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index ca3946b8..92a6d383 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -8,6 +8,10 @@ import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
 
+interface VerificationResult {
+    detail: string;
+}
+
 @Injectable({
     providedIn: 'root'
 })
@@ -41,6 +45,16 @@ export class AuthService {
         )),
     );
 
+    public verifyEmail$ = new Subject<string>();
+    public verifyEmailResult$ = this.verifyEmail$.pipe(
+        switchMap(key => this.http.post<VerificationResult>(
+            this.authRoute('registration/verify-email/'),
+            { key }
+        )),
+        share()
+    );
+
+
     public user$ = merge([
         this.login$,
         this.initialAuth$
@@ -113,14 +127,9 @@ export class AuthService {
         });
     }
 
-    public verifyEmail(key: string): Observable<any> {
-        return this.http.post(
-            this.authRoute('registration/verify-email/'),
-            { key }
-        );
-    }
 
-    public keyInfo(key: string): Observable<{ username: string, email: string }> {
+
+    public keyInfo$(key: string): Observable<{ username: string, email: string }> {
         return this.http.post<{ username: string; email: string }>(
             this.authRoute('registration/key-info/'),
             { key }
diff --git a/frontend/src/app/user/verify-email/verify-email.component.html b/frontend/src/app/user/verify-email/verify-email.component.html
index 3a944177..412aac4e 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.html
+++ b/frontend/src/app/user/verify-email/verify-email.component.html
@@ -18,7 +18,7 @@ <h2 class="h6 alert-heading">Error</h2>
 <div *ngIf="success$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">E-mail confirmed</h2>
     Your email address has been verified!
-    <a *ngIf="directToLogin; else homeLink" [routerLink]="['/login']" class="alert-link">
+    <a *ngIf="directToLogin$ | async; else homeLink" [routerLink]="['/login']" class="alert-link">
         Sign in
     </a>
     <ng-template #homeLink>
diff --git a/frontend/src/app/user/verify-email/verify-email.component.ts b/frontend/src/app/user/verify-email/verify-email.component.ts
index a2ee9941..d12f49b4 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.ts
@@ -3,49 +3,46 @@ import { Component, DestroyRef } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
 import { AuthService } from '@services/auth.service';
-import { Observable, Subject, catchError, filter, of, switchMap, take } from 'rxjs';
+import { Observable, Subject, catchError, filter, ignoreElements, map, merge, of, share, switchMap, take } from 'rxjs';
 import _ from 'underscore';
 
+
+
 @Component({
     selector: 'lc-verify-email',
     templateUrl: './verify-email.component.html',
     styleUrls: ['./verify-email.component.scss']
 })
 export class VerifyEmailComponent {
-    key: string;
-    userDetails$: Observable<{ username: string, email: string } | undefined>;
-    error$ = new Subject<HttpErrorResponse>();
-    success$ = new Subject<boolean>();
-    directToLogin: boolean = false;
+    private key = this.activatedRoute.snapshot.params['key'];
+
+    public userDetails$ = this.authService.keyInfo$(this.key).pipe(share())
+
+    public error$ = merge(
+        this.userDetails$.pipe(ignoreElements()),
+        this.authService.verifyEmailResult$.pipe(ignoreElements()),
+    ).pipe(
+        catchError((e: HttpErrorResponse) => of(e))
+    );
+
+    public success$ = this.authService.verifyEmailResult$.pipe(
+        map(() => true),
+        catchError(() => of(false)),
+    );
+
+    public directToLogin$ = this.success$.pipe(
+        switchMap(() => this.authService.isAuthenticated$.pipe(
+            filter(_.negate(_.isUndefined)),
+            take(1))
+        )
+    );
 
     constructor(
         private activatedRoute: ActivatedRoute,
         private authService: AuthService,
-        private destroyRef: DestroyRef,
-    ) {
-        this.key = this.activatedRoute.snapshot.params['key'];
-        this.userDetails$ = this.authService.keyInfo(this.key).pipe(
-            takeUntilDestroyed(),
-            catchError((e: HttpErrorResponse) => {
-                this.error$.next(e);
-                return of(undefined);
-            })
-        );
-        this.success$.pipe(
-            switchMap(() => this.authService.isAuthenticated$.pipe(
-                filter(_.negate(_.isUndefined)),
-                take(1))
-            ),
-            takeUntilDestroyed(),
-        ).subscribe(isLoggedIn => this.directToLogin = !isLoggedIn);
-    }
+    ) { }
 
-    confirm() {
-        this.authService.verifyEmail(this.key).pipe(
-            takeUntilDestroyed(this.destroyRef)
-        ).subscribe({
-            next: () => this.success$.next(true),
-            error: (e) => this.error$.next(e),
-        })
+    public confirm() {
+        this.authService.verifyEmail$.next(this.key);
     }
 }

From ec7c9b510d0813e5252eb6e32b7f333cea4396b1 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 2 May 2024 11:30:05 +0200
Subject: [PATCH 009/565] Password forgotten page WIP

---
 frontend/src/app/services/auth.service.ts     |  9 +++-
 .../src/app/user/login/login.component.html   |  4 ++
 frontend/src/app/user/models/user.ts          |  4 ++
 .../password-forgotten.component.html         | 18 ++++++++
 .../password-forgotten.component.scss         |  0
 .../password-forgotten.component.spec.ts      | 21 +++++++++
 .../password-forgotten.component.ts           | 46 +++++++++++++++++++
 frontend/src/app/user/user.module.ts          |  4 +-
 8 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/app/user/password-forgotten/password-forgotten.component.html
 create mode 100644 frontend/src/app/user/password-forgotten/password-forgotten.component.scss
 create mode 100644 frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
 create mode 100644 frontend/src/app/user/password-forgotten/password-forgotten.component.ts

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 92a6d383..f3277e39 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -3,7 +3,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
 import { BehaviorSubject, Observable, Subject, catchError, map, of, switchMap, tap, merge, share } from 'rxjs';
-import { UserRegistration, ResetPasswordForm, User, UserResponse, UserLogin } from '../user/models/user';
+import { UserRegistration, ResetPasswordForm, User, UserResponse, UserLogin, PasswordForgotten } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
@@ -45,6 +45,13 @@ export class AuthService {
         )),
     );
 
+    public passwordForgotten$ = new Subject<PasswordForgotten>()
+    public passwordForgottenResult$ = this.passwordForgotten$.pipe(
+        switchMap(form => this.http.post<any>(
+            this.authRoute(''), form
+        ))
+    );
+
     public verifyEmail$ = new Subject<string>();
     public verifyEmailResult$ = this.verifyEmail$.pipe(
         switchMap(key => this.http.post<VerificationResult>(
diff --git a/frontend/src/app/user/login/login.component.html b/frontend/src/app/user/login/login.component.html
index 30005466..b3b976ae 100644
--- a/frontend/src/app/user/login/login.component.html
+++ b/frontend/src/app/user/login/login.component.html
@@ -38,3 +38,7 @@ <h2>Sign in</h2>
         Failed to sign in.
     </div>
 </form>
+
+<div>
+    <a [routerLink]="['/password-forgotten']">Forgotten your password? Click here.</a>
+</div>
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index 83f24353..23326543 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -36,3 +36,7 @@ export interface ResetPasswordForm {
     new_password1: string;
     new_password2: string;
 }
+
+export interface PasswordForgotten {
+    email: string;
+}
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.html b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
new file mode 100644
index 00000000..079a0660
--- /dev/null
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
@@ -0,0 +1,18 @@
+<h2>Forgotten your password?</h2>
+
+<p>Enter your email address in the form below. You will receive a link to a page where you can reset your password.</p>
+
+<form>
+    <div>
+        <label for="email" class="form-label">Email address</label>
+        <input id="email" type="text" class="form-control" [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid" [formControl]="form.controls.email" />
+        <p *ngFor="let error of emailErrors$ | async" class="invalid-feedback">{{ error }}</p>
+    </div>
+    <button type="submit" class="btn btn-primary my-3">Submit</button>
+</form>
+
+<div *ngIf="passwordForgottenSuccessful$ | async" class="alert alert-success" role="alert">
+    <h2 class="h6 alert-heading">Password reset request received</h2>
+    <p>Your request to reset your password has been received successfully.</p>
+    <p>Check your email inbox for a message containing a link to a page where you may reset your password.</p>
+</div>
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.scss b/frontend/src/app/user/password-forgotten/password-forgotten.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
new file mode 100644
index 00000000..4d53ddae
--- /dev/null
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PasswordForgottenComponent } from './password-forgotten.component';
+
+describe('PasswordForgottenComponent', () => {
+  let component: PasswordForgottenComponent;
+  let fixture: ComponentFixture<PasswordForgottenComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [PasswordForgottenComponent]
+    });
+    fixture = TestBed.createComponent(PasswordForgottenComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
new file mode 100644
index 00000000..42e1b76d
--- /dev/null
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -0,0 +1,46 @@
+import { Component } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { controlErrorMessages$, updateFormValidity } from '../utils';
+import { of } from 'rxjs';
+import { AuthService } from '@services/auth.service';
+import { PasswordForgotten } from '../models/user';
+
+type PasswordForgottenForm = {
+    [key in keyof PasswordForgotten]: FormControl<string>;
+}
+
+const errorMessageMap: Record<keyof PasswordForgotten, Record<string, string>> = {
+    email: {
+        'required': 'Email is required.',
+        'email': 'Email is invalid.',
+    }
+}
+
+@Component({
+  selector: 'lc-password-forgotten',
+  templateUrl: './password-forgotten.component.html',
+  styleUrls: ['./password-forgotten.component.scss']
+})
+export class PasswordForgottenComponent {
+    form = new FormGroup<PasswordForgottenForm>({
+        email: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [Validators.required, Validators.email]
+        })
+    });
+
+    emailErrors$ = controlErrorMessages$('email', this.form, errorMessageMap.email);
+
+    passwordForgottenSuccessful$ = of(null)
+
+    constructor(private authService: AuthService) { }
+
+    public submit(): void {
+        this.form.markAllAsTouched();
+        updateFormValidity(this.form);
+        if (!this.form.valid) {
+            return;
+        }
+    }
+
+}
diff --git a/frontend/src/app/user/user.module.ts b/frontend/src/app/user/user.module.ts
index adf180a1..8dc24637 100644
--- a/frontend/src/app/user/user.module.ts
+++ b/frontend/src/app/user/user.module.ts
@@ -3,12 +3,14 @@ import { LoginComponent } from './login/login.component';
 import { SharedModule } from '../shared/shared.module';
 import { VerifyEmailComponent } from './verify-email/verify-email.component';
 import { RegisterComponent } from './register/register.component';
+import { PasswordForgottenComponent } from './password-forgotten/password-forgotten.component';
 
 @NgModule({
     declarations: [
         LoginComponent,
         VerifyEmailComponent,
-        RegisterComponent
+        RegisterComponent,
+        PasswordForgottenComponent
     ],
     imports: [
         SharedModule

From e3b579af49e5a9c63bc5823ac0cacec6e64c4f54 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 2 May 2024 16:07:37 +0200
Subject: [PATCH 010/565] Password forgotten component

---
 .../password-forgotten/password-forgotten.component.html | 4 ++--
 .../password-forgotten/password-forgotten.component.ts   | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.html b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
index 079a0660..0a9c5ea6 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.html
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
@@ -2,10 +2,10 @@ <h2>Forgotten your password?</h2>
 
 <p>Enter your email address in the form below. You will receive a link to a page where you can reset your password.</p>
 
-<form>
+<form [formGroup]="form" (ngSubmit)="submit()">
     <div>
         <label for="email" class="form-label">Email address</label>
-        <input id="email" type="text" class="form-control" [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid" [formControl]="form.controls.email" />
+        <input id="email" type="email" class="form-control" [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid" [formControl]="form.controls.email" />
         <p *ngFor="let error of emailErrors$ | async" class="invalid-feedback">{{ error }}</p>
     </div>
     <button type="submit" class="btn btn-primary my-3">Submit</button>
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index 42e1b76d..77acd620 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { controlErrorMessages$, updateFormValidity } from '../utils';
-import { of } from 'rxjs';
+import { filter } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { PasswordForgotten } from '../models/user';
 
@@ -29,9 +29,11 @@ export class PasswordForgottenComponent {
         })
     });
 
-    emailErrors$ = controlErrorMessages$('email', this.form, errorMessageMap.email);
+    public emailErrors$ = controlErrorMessages$('email', this.form, errorMessageMap.email);
 
-    passwordForgottenSuccessful$ = of(null)
+    public passwordForgottenSuccessful$ = this.authService.passwordForgottenResult$.pipe(
+        filter(result => !('error' in result)),
+    );
 
     constructor(private authService: AuthService) { }
 
@@ -41,6 +43,7 @@ export class PasswordForgottenComponent {
         if (!this.form.valid) {
             return;
         }
+        this.authService.passwordForgotten$.next(this.form.getRawValue())
     }
 
 }

From ca42ab05b0d6c41da1ae08ac9e494ad766120d58 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 2 May 2024 16:23:28 +0200
Subject: [PATCH 011/565] Unified error interface

---
 frontend/src/app/services/auth.service.ts     | 50 ++++++++++---------
 .../src/app/user/login/login.component.ts     | 14 +++---
 frontend/src/app/user/models/user.ts          |  2 +-
 .../app/user/register/register.component.ts   |  6 +--
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index f3277e39..9cf7d103 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -3,15 +3,19 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
 import { BehaviorSubject, Observable, Subject, catchError, map, of, switchMap, tap, merge, share } from 'rxjs';
-import { UserRegistration, ResetPasswordForm, User, UserResponse, UserLogin, PasswordForgotten } from '../user/models/user';
+import { UserRegistration, User, UserResponse, UserLogin, PasswordForgotten, PasswordReset } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
 
-interface VerificationResult {
+interface AuthAPIResult {
     detail: string;
 }
 
+interface AuthAPIError {
+    error: Record<string, string>;
+}
+
 @Injectable({
     providedIn: 'root'
 })
@@ -29,10 +33,9 @@ export class AuthService {
 
     public newRegistration$ = new Subject<UserRegistration>();
     public registration$ = this.newRegistration$.pipe(
-        switchMap(registrationForm => this.http.post<null>(
+        switchMap(registrationForm => this.http.post<void>(
             this.authRoute('registration/'), registrationForm).pipe(
-                // Catch the error and return it so we can show the error and the stream does not complete.
-                catchError(error => of({ errorObject: error.error })),
+                catchError(error => of<AuthAPIError>({ error: error.error })),
             ),
         ),
         share()
@@ -40,21 +43,34 @@ export class AuthService {
 
     public newLogin$ = new Subject<UserLogin>();
     public login$ = this.newLogin$.pipe(
-        switchMap(loginForm => this.http.post<any>(
+        switchMap(loginForm => this.http.post<AuthAPIResult>(
             this.authRoute('login/'), loginForm
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error })),
         )),
     );
 
     public passwordForgotten$ = new Subject<PasswordForgotten>()
     public passwordForgottenResult$ = this.passwordForgotten$.pipe(
-        switchMap(form => this.http.post<any>(
-            this.authRoute(''), form
-        ))
+        switchMap(form => this.http.post<AuthAPIResult>(
+            this.authRoute('password/reset/'), form
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error}))
+        )),
+    );
+
+    public passwordReset$ = new Subject<PasswordReset>();
+    public passwordResetResult$ = this.passwordReset$.pipe(
+        switchMap(form => this.http.post<AuthAPIResult>(
+            this.authRoute('password/reset/confirm/'), form
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error}))
+        )),
     );
 
     public verifyEmail$ = new Subject<string>();
     public verifyEmailResult$ = this.verifyEmail$.pipe(
-        switchMap(key => this.http.post<VerificationResult>(
+        switchMap(key => this.http.post<AuthAPIResult>(
             this.authRoute('registration/verify-email/'),
             { key }
         )),
@@ -151,20 +167,6 @@ export class AuthService {
         );
     }
 
-    public requestResetPassword(email: string): Observable<{ detail: string }> {
-        return this.http.post<{ detail: string }>(
-            this.authRoute('password/reset/'),
-            { email }
-        );
-    }
-
-    public resetPassword(resetPasswordForm: ResetPasswordForm
-    ): Observable<{ detail: string }> {
-        return this.http.post<{ detail: string }>(
-            this.authRoute('password/reset/confirm/'),
-            resetPasswordForm
-        );
-    }
 
     public updateSettings(update: Partial<User>): Observable<any> {
         const data = encodeUserData(update);
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 362d7bbe..18ef2dd3 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { AuthService } from '@services/auth.service';
 import { UserLogin } from '../models/user';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { catchError, ignoreElements, of } from 'rxjs';
+import { filter } from 'rxjs';
 import { updateFormValidity } from '../utils';
 
 type LoginForm = {
@@ -17,7 +17,7 @@ type LoginForm = {
   styleUrls: ['./login.component.scss']
 })
 export class LoginComponent implements OnInit {
-    form = new FormGroup<LoginForm>({
+    public form = new FormGroup<LoginForm>({
         username: new FormControl<string>('', {
             nonNullable: true,
             validators: [Validators.required]
@@ -28,12 +28,12 @@ export class LoginComponent implements OnInit {
         }),
     });
 
-    returnUrl = this.activatedRoute.snapshot.queryParams['returnUrl'] || '/';
+    private returnUrl = this.activatedRoute.snapshot.queryParams['returnUrl'] || '/';
 
-    loginReturn$ = this.authService.login$;
-    loginReturnError$ = this.authService.login$.pipe(
-        ignoreElements(),
-        catchError(error => of(error))
+    private loginReturn$ = this.authService.login$;
+
+    public loginReturnError$ = this.authService.login$.pipe(
+        filter(response => 'error' in response),
     );
 
     constructor(
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index 23326543..8d139b91 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -30,7 +30,7 @@ export interface UserLogin {
     password: string;
 }
 
-export interface ResetPasswordForm {
+export interface PasswordReset {
     uid: string;
     token: string;
     new_password1: string;
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index 59f86a18..e4e9d69e 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -94,7 +94,7 @@ export class RegisterComponent implements OnInit {
     );
 
     registrationSuccessful$ = this.authService.registration$.pipe(
-        filter(result => result === null),
+        filter(result => !(result?.error)),
         map(() => true),
     );
 
@@ -109,8 +109,8 @@ export class RegisterComponent implements OnInit {
                 takeUntilDestroyed(this.destroyRef)
             )
             .subscribe(result => {
-                if (result?.errorObject) {
-                    setErrors(result.errorObject, this.form);
+                if (result?.error) {
+                    setErrors(result.error, this.form);
                 }
             });
     }

From 8a6fe420fa4d831838d4efd0f420ed75150efd13 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 2 May 2024 16:23:37 +0200
Subject: [PATCH 012/565] Added password forgotten route

---
 frontend/src/app/routes.ts                                   | 5 +++++
 .../password-forgotten/password-forgotten.component.html     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 983867bc..805b9547 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -4,6 +4,7 @@ import { HomeComponent } from './home/home.component';
 import { LoginComponent } from './user/login/login.component';
 import { VerifyEmailComponent } from './user/verify-email/verify-email.component';
 import { RegisterComponent } from './user/register/register.component';
+import { PasswordForgottenComponent } from './user/password-forgotten/password-forgotten.component';
 
 const routes: Routes = [
     {
@@ -23,6 +24,10 @@ const routes: Routes = [
         path: 'confirm-email/:key',
         component: VerifyEmailComponent,
     },
+    {
+        path: 'password-forgotten',
+        component: PasswordForgottenComponent
+    },
     {
         path: '',
         redirectTo: '/home',
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.html b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
index 0a9c5ea6..f3e0e754 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.html
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
@@ -14,5 +14,5 @@ <h2>Forgotten your password?</h2>
 <div *ngIf="passwordForgottenSuccessful$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">Password reset request received</h2>
     <p>Your request to reset your password has been received successfully.</p>
-    <p>Check your email inbox for a message containing a link to a page where you may reset your password.</p>
+    <p>If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.</p>
 </div>

From 6db917f181d32e85fef84d45d586f19444168599 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 08:58:17 +0200
Subject: [PATCH 013/565] Reset password component

---
 frontend/src/app/routes.ts                    |   6 +-
 frontend/src/app/services/auth.service.ts     |   4 +-
 frontend/src/app/user/models/user.ts          |   2 +-
 .../reset-password.component.html             |  49 ++++++++
 .../reset-password.component.scss             |   0
 .../reset-password.component.spec.ts          |  21 ++++
 .../reset-password.component.ts               | 117 ++++++++++++++++++
 frontend/src/app/user/user.module.ts          |   4 +-
 8 files changed, 198 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/app/user/reset-password/reset-password.component.html
 create mode 100644 frontend/src/app/user/reset-password/reset-password.component.scss
 create mode 100644 frontend/src/app/user/reset-password/reset-password.component.spec.ts
 create mode 100644 frontend/src/app/user/reset-password/reset-password.component.ts

diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 805b9547..6d18e177 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -5,6 +5,7 @@ import { LoginComponent } from './user/login/login.component';
 import { VerifyEmailComponent } from './user/verify-email/verify-email.component';
 import { RegisterComponent } from './user/register/register.component';
 import { PasswordForgottenComponent } from './user/password-forgotten/password-forgotten.component';
+import { ResetPasswordComponent } from './user/reset-password/reset-password.component';
 
 const routes: Routes = [
     {
@@ -18,7 +19,6 @@ const routes: Routes = [
     {
         path: 'register',
         component: RegisterComponent,
-
     },
     {
         path: 'confirm-email/:key',
@@ -28,6 +28,10 @@ const routes: Routes = [
         path: 'password-forgotten',
         component: PasswordForgottenComponent
     },
+    {
+        path: 'reset-password/:uid/:token',
+        component: ResetPasswordComponent
+    },
     {
         path: '',
         redirectTo: '/home',
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 9cf7d103..463ffddd 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -3,7 +3,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
 import { BehaviorSubject, Observable, Subject, catchError, map, of, switchMap, tap, merge, share } from 'rxjs';
-import { UserRegistration, User, UserResponse, UserLogin, PasswordForgotten, PasswordReset } from '../user/models/user';
+import { UserRegistration, User, UserResponse, UserLogin, PasswordForgotten, ResetPassword } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
@@ -59,7 +59,7 @@ export class AuthService {
         )),
     );
 
-    public passwordReset$ = new Subject<PasswordReset>();
+    public passwordReset$ = new Subject<ResetPassword>();
     public passwordResetResult$ = this.passwordReset$.pipe(
         switchMap(form => this.http.post<AuthAPIResult>(
             this.authRoute('password/reset/confirm/'), form
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index 8d139b91..644a998b 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -30,7 +30,7 @@ export interface UserLogin {
     password: string;
 }
 
-export interface PasswordReset {
+export interface ResetPassword {
     uid: string;
     token: string;
     new_password1: string;
diff --git a/frontend/src/app/user/reset-password/reset-password.component.html b/frontend/src/app/user/reset-password/reset-password.component.html
new file mode 100644
index 00000000..0734c7c5
--- /dev/null
+++ b/frontend/src/app/user/reset-password/reset-password.component.html
@@ -0,0 +1,49 @@
+<h2>Reset password</h2>
+
+<p>Enter your new password below to change your password.</p>
+
+<form [formGroup]="form" (ngSubmit)="submit()">
+    <div>
+        <label for="password1" class="form-label">
+            New password
+        </label>
+        <input
+            type="password"
+            id="password1"
+            class="form-control"
+            [class.is-invalid]="form.controls.new_password1.touched && form.controls.new_password1.invalid"
+            [formControl]="form.controls.new_password1"
+        >
+        <p *ngFor="let error of password1Errors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
+    </div>
+    <div>
+        <label for="password2" class="form-label">
+            Repeat your new password
+        </label>
+        <input
+            type="password"
+            id="password2"
+            class="form-control"
+            [class.is-invalid]="form.controls.new_password2.touched && form.controls.new_password2.invalid"
+            [formControl]="form.controls.new_password2"
+        >
+        <p *ngFor="let error of password2Errors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
+    </div>
+    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+        {{ error }}
+    </p>
+    <button type="submit" class="btn btn-primary my-3">
+        Submit
+    </button>
+</form>
+
+<div *ngIf="resetPasswordSuccesful$ | async" class="alert alert-success" role="alert">
+    <h2 class="h6 alert-heading">Password reset successful</h2>
+    <p>Your password has been changed successfully.</p>
+    <a [routerLink]="['/login']">Click here to go back to the login form.</a>
+
+</div>
diff --git a/frontend/src/app/user/reset-password/reset-password.component.scss b/frontend/src/app/user/reset-password/reset-password.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/user/reset-password/reset-password.component.spec.ts b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
new file mode 100644
index 00000000..b83561b9
--- /dev/null
+++ b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ResetPasswordComponent } from './reset-password.component';
+
+describe('ResetPasswordComponent', () => {
+  let component: ResetPasswordComponent;
+  let fixture: ComponentFixture<ResetPasswordComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ResetPasswordComponent]
+    });
+    fixture = TestBed.createComponent(ResetPasswordComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
new file mode 100644
index 00000000..05852b72
--- /dev/null
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -0,0 +1,117 @@
+import { Component, DestroyRef, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { ResetPassword } from '../models/user';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { identicalPasswordsValidator, passwordValidators } from '../validation';
+import { controlErrorMessages$, setErrors, updateFormValidity } from '../utils';
+import { filter, map } from 'rxjs';
+import { AuthService } from '@services/auth.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+type ResetPasswordForm = {
+    [key in keyof ResetPassword]: FormControl<string>;
+}
+
+const errorMessageMap: Pick<Record<keyof ResetPassword | 'form', Record<string, string>>, 'new_password1' | 'new_password2' | 'form' | 'token'> = {
+    new_password1: {
+        'required': 'Password is required.',
+        'minlength': 'Password must be at least 8 characters long.',
+    },
+    new_password2: {
+        'required': 'Password is required.',
+        'minlength': 'Password must be at least 8 characters long.',
+    },
+    form: {
+        'passwords': 'Passwords must be identical.',
+        'invalid': 'The token is invalid. Please request a new password reset link.'
+    },
+    token: {
+        'invalid': 'The URL is invalid. Please request a new one.'
+    }
+};
+
+@Component({
+  selector: 'lc-reset-password',
+  templateUrl: './reset-password.component.html',
+  styleUrls: ['./reset-password.component.scss']
+})
+export class ResetPasswordComponent implements OnInit {
+    private uid = this.activatedRoute.snapshot.params['uid'];
+    private token = this.activatedRoute.snapshot.params['token'];
+
+    public form = new FormGroup<ResetPasswordForm>({
+        uid: new FormControl<string>(this.uid, {
+            nonNullable: true }),
+        token: new FormControl<string>(this.token, { nonNullable: true }),
+        new_password1: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+                ...passwordValidators
+            ]
+        }),
+        new_password2: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+                ...passwordValidators
+            ]
+        }),
+    }, {
+        validators: identicalPasswordsValidator<keyof ResetPassword>('new_password1', 'new_password2')
+    });
+
+    public password1Errors$ = controlErrorMessages$('new_password1', this.form, errorMessageMap.new_password1);
+    public password2Errors$ = controlErrorMessages$('new_password2', this.form, errorMessageMap.new_password2);
+    public formErrors$ = this.form.statusChanges.pipe(
+        map(() => {
+            // We also include errors from the hidden 'uid' and 'token' controls in the form errors.
+            const formErrors =
+                {
+                    ...this.form.errors,
+                    ...this.form.controls.token.errors,
+                    ...this.form.controls.uid.errors
+                 } ?? {};
+            const formErrorMessages = errorMessageMap.form;
+            const messages: string[] = [];
+            for (const errorKey in formErrors) {
+                if (errorKey in formErrorMessages) {
+                    messages.push(formErrorMessages[errorKey]);
+                } else {
+                    messages.push(formErrors[errorKey]);
+                }
+            }
+            return messages;
+        })
+    );
+
+    public resetPasswordSuccesful$ = this.authService.resetPasswordResult$.pipe(
+        filter(result => !('error' in result)),
+        map(() => true)
+    );
+
+    constructor(
+        private activatedRoute: ActivatedRoute,
+        private authService: AuthService,
+        private destroyRef: DestroyRef
+    ) { }
+
+    ngOnInit(): void {
+        this.authService.resetPasswordResult$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(result => {
+                if ('error' in result) {
+                    setErrors(result.error, this.form);
+                }
+            });
+    }
+
+    public submit(): void {
+        this.form.markAllAsTouched();
+        updateFormValidity(this.form);
+        if (!this.form.valid) {
+            return;
+        }
+        this.authService.resetPassword$.next(this.form.getRawValue());
+    }
+}
diff --git a/frontend/src/app/user/user.module.ts b/frontend/src/app/user/user.module.ts
index 8dc24637..08cbd0e1 100644
--- a/frontend/src/app/user/user.module.ts
+++ b/frontend/src/app/user/user.module.ts
@@ -4,13 +4,15 @@ import { SharedModule } from '../shared/shared.module';
 import { VerifyEmailComponent } from './verify-email/verify-email.component';
 import { RegisterComponent } from './register/register.component';
 import { PasswordForgottenComponent } from './password-forgotten/password-forgotten.component';
+import { ResetPasswordComponent } from './reset-password/reset-password.component';
 
 @NgModule({
     declarations: [
         LoginComponent,
         VerifyEmailComponent,
         RegisterComponent,
-        PasswordForgottenComponent
+        PasswordForgottenComponent,
+        ResetPasswordComponent,
     ],
     imports: [
         SharedModule

From b726f935fbc9d65c925deb64c01d583dc186e71c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 08:59:00 +0200
Subject: [PATCH 014/565] Generalize subject naming

---
 frontend/src/app/services/auth.service.ts         | 15 ++++++++-------
 frontend/src/app/user/login/login.component.ts    |  6 +++---
 .../src/app/user/register/register.component.ts   |  8 ++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 463ffddd..d5b4c774 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -31,8 +31,8 @@ export class AuthService {
 
     public initialAuth$ = new Subject<void>();
 
-    public newRegistration$ = new Subject<UserRegistration>();
-    public registration$ = this.newRegistration$.pipe(
+    public registration$ = new Subject<UserRegistration>();
+    public registrationResult$ = this.registration$.pipe(
         switchMap(registrationForm => this.http.post<void>(
             this.authRoute('registration/'), registrationForm).pipe(
                 catchError(error => of<AuthAPIError>({ error: error.error })),
@@ -41,8 +41,8 @@ export class AuthService {
         share()
     );
 
-    public newLogin$ = new Subject<UserLogin>();
-    public login$ = this.newLogin$.pipe(
+    public login$ = new Subject<UserLogin>();
+    public loginResult$ = this.login$.pipe(
         switchMap(loginForm => this.http.post<AuthAPIResult>(
             this.authRoute('login/'), loginForm
         ).pipe(
@@ -59,13 +59,14 @@ export class AuthService {
         )),
     );
 
-    public passwordReset$ = new Subject<ResetPassword>();
-    public passwordResetResult$ = this.passwordReset$.pipe(
+    public resetPassword$ = new Subject<ResetPassword>();
+    public resetPasswordResult$ = this.resetPassword$.pipe(
         switchMap(form => this.http.post<AuthAPIResult>(
             this.authRoute('password/reset/confirm/'), form
         ).pipe(
             catchError(error => of<AuthAPIError>({ error: error.error}))
         )),
+        share()
     );
 
     public verifyEmail$ = new Subject<string>();
@@ -79,7 +80,7 @@ export class AuthService {
 
 
     public user$ = merge([
-        this.login$,
+        this.loginResult$,
         this.initialAuth$
     ]).pipe(
         switchMap(() => this.http.get<UserResponse>(
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 18ef2dd3..4db452c6 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -30,9 +30,9 @@ export class LoginComponent implements OnInit {
 
     private returnUrl = this.activatedRoute.snapshot.queryParams['returnUrl'] || '/';
 
-    private loginReturn$ = this.authService.login$;
+    private loginReturn$ = this.authService.loginResult$;
 
-    public loginReturnError$ = this.authService.login$.pipe(
+    public loginReturnError$ = this.authService.loginResult$.pipe(
         filter(response => 'error' in response),
     );
 
@@ -57,6 +57,6 @@ export class LoginComponent implements OnInit {
         if (!this.form.valid) {
             return;
         }
-        this.authService.newLogin$.next(this.form.getRawValue());
+        this.authService.login$.next(this.form.getRawValue());
     }
 }
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index e4e9d69e..967bb5c5 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -70,7 +70,7 @@ export class RegisterComponent implements OnInit {
             ]
         }),
     }, {
-        validators: identicalPasswordsValidator
+        validators: identicalPasswordsValidator<keyof RegisterForm>('password1', 'password2')
     });
 
     userErrors$ = controlErrorMessages$('username', this.form, errorMessageMap.username);
@@ -93,7 +93,7 @@ export class RegisterComponent implements OnInit {
         })
     );
 
-    registrationSuccessful$ = this.authService.registration$.pipe(
+    registrationSuccessful$ = this.authService.registrationResult$.pipe(
         filter(result => !(result?.error)),
         map(() => true),
     );
@@ -104,7 +104,7 @@ export class RegisterComponent implements OnInit {
     ) { }
 
     ngOnInit(): void {
-        this.authService.registration$
+        this.authService.registrationResult$
             .pipe(
                 takeUntilDestroyed(this.destroyRef)
             )
@@ -121,6 +121,6 @@ export class RegisterComponent implements OnInit {
         if (!this.form.valid) {
             return;
         }
-        this.authService.newRegistration$.next(this.form.getRawValue());
+        this.authService.registration$.next(this.form.getRawValue());
     }
 }

From 570944d7180a85cb77121b3ea37bf6b1eb90f1df Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 08:59:22 +0200
Subject: [PATCH 015/565] identicalPasswordsValidator needs arguments

---
 frontend/src/app/user/validation.ts | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/user/validation.ts b/frontend/src/app/user/validation.ts
index 90fc9e42..91814714 100644
--- a/frontend/src/app/user/validation.ts
+++ b/frontend/src/app/user/validation.ts
@@ -21,20 +21,23 @@ export const passwordValidators = [
 ];
 
 
-
 /**
- * Validates that two password fields have identical values.
+ * Form-level validator that checks whether two password fields have identical values.
  *
- * @param form - The form control containing at least two controls named `password1` and `password2`.
+ * @param password1ControlName - The name of the first password control field on the form.
+ * @param password2ControlName - The name of the second password control field on the form.
  * @returns A `ValidationErrors` object if the passwords do not match, otherwise `null`.
  */
-export const identicalPasswordsValidator: ValidatorFn = (form: AbstractControl): ValidationErrors | null => {
-    const password1 = form.get('password1');
-    const password2 = form.get('password2');
+export function identicalPasswordsValidator<T>(password1ControlName: string & T, password2ControlName: string & T): ValidatorFn {
+
+    return (form: AbstractControl): ValidationErrors | null => {
+        const password1 = form.get(password1ControlName);
+        const password2 = form.get(password2ControlName);
 
-    if (!password1?.value || !password2?.value) {
-        return null;
-    }
+        if (!password1?.value || !password2?.value) {
+            return null;
+        }
 
-    return password1.value === password2.value ? null : { 'passwords': 'Passwords do not match' };
-};
+        return password1.value === password2.value ? null : { 'passwords': 'Passwords do not match' };
+    };
+}

From 77fb3e9fb2fb3a5ff83273c691747c17dfa6e789 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 08:59:44 +0200
Subject: [PATCH 016/565] Generalize styling rules

---
 frontend/src/app/user/register/register.component.html | 9 ++++++---
 frontend/src/app/user/register/register.component.scss | 4 +---
 frontend/src/styles.scss                               | 4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index c03b27ea..a13cc0b8 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -4,7 +4,7 @@ <h2>Register</h2>
 
 <p>Already have an account? <a routerLink="/login">Sign in</a></p>
 
-<form class="needs-validation" [formGroup]="form" (ngSubmit)="submit()">
+<form [formGroup]="form" (ngSubmit)="submit()">
     <div>
         <label for="username" class="form-label">
             Username
@@ -39,7 +39,8 @@ <h2>Register</h2>
             id="password1"
             class="form-control"
             [class.is-invalid]="form.controls.password1.touched && form.controls.password1.invalid"
-            [formControl]="form.controls.password1">
+            [formControl]="form.controls.password1"
+        >
         <p *ngFor="let error of password1Errors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
@@ -56,7 +57,9 @@ <h2>Register</h2>
             {{ error }}
         </p>
     </div>
-    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback visible">{{ error}}</p>
+    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+        {{ error}}
+    </p>
     <button type="submit" class="btn btn-primary my-3">Register</button>
 </form>
 
diff --git a/frontend/src/app/user/register/register.component.scss b/frontend/src/app/user/register/register.component.scss
index de5644b4..8b137891 100644
--- a/frontend/src/app/user/register/register.component.scss
+++ b/frontend/src/app/user/register/register.component.scss
@@ -1,3 +1 @@
-.visible {
-    display: block !important;
-}
+
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 319df4dc..6b6004e7 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -12,3 +12,7 @@
         padding: 0 !important;
     }
 }
+
+.always-block {
+    display: block !important;
+}

From 49d46fa482c52222e7003f358ed4fae1da0c159a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 09:57:09 +0200
Subject: [PATCH 017/565] Central error message mapping

---
 .../password-forgotten.component.ts           |  8 +-
 .../app/user/register/register.component.html |  2 +-
 .../app/user/register/register.component.ts   | 53 ++---------
 .../reset-password.component.ts               | 50 ++---------
 frontend/src/app/user/utils.ts                | 87 +++++++++++++++----
 5 files changed, 89 insertions(+), 111 deletions(-)

diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index 77acd620..3ce5c3c3 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -9,12 +9,6 @@ type PasswordForgottenForm = {
     [key in keyof PasswordForgotten]: FormControl<string>;
 }
 
-const errorMessageMap: Record<keyof PasswordForgotten, Record<string, string>> = {
-    email: {
-        'required': 'Email is required.',
-        'email': 'Email is invalid.',
-    }
-}
 
 @Component({
   selector: 'lc-password-forgotten',
@@ -29,7 +23,7 @@ export class PasswordForgottenComponent {
         })
     });
 
-    public emailErrors$ = controlErrorMessages$('email', this.form, errorMessageMap.email);
+    public emailErrors$ = controlErrorMessages$(this.form, 'email');
 
     public passwordForgottenSuccessful$ = this.authService.passwordForgottenResult$.pipe(
         filter(result => !('error' in result)),
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index a13cc0b8..bb25da66 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -58,7 +58,7 @@ <h2>Register</h2>
         </p>
     </div>
     <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
-        {{ error}}
+        {{ error }}
     </p>
     <button type="submit" class="btn btn-primary my-3">Register</button>
 </form>
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index 967bb5c5..4951ed70 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -5,42 +5,19 @@ import { usernameValidators, passwordValidators, identicalPasswordsValidator } f
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { filter, map } from 'rxjs';
-import { controlErrorMessages$, setErrors, updateFormValidity } from '../utils';
+import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
 
 type RegisterForm = {
     [key in keyof UserRegistration]: FormControl<string>;
 }
 
-const errorMessageMap: Record<keyof UserRegistration | 'form', Record<string, string>> = {
-    username: {
-        'required': 'Username is required.',
-        'minlength': 'Username must be at least 3 characters long.',
-        'maxlength': 'Username must be at most 150 characters long.',
-    },
-    email: {
-        'required': 'Email is required.',
-        'email': 'Email is invalid.',
-    },
-    password1: {
-        'required': 'Password is required.',
-        'minlength': 'Password must be at least 8 characters long.',
-    },
-    password2: {
-        'required': 'Password is required.',
-        'minlength': 'Password must be at least 8 characters long.',
-    },
-    form: {
-        'passwords': 'Passwords must be identical.',
-    }
-};
-
 @Component({
     selector: 'lc-register',
     templateUrl: './register.component.html',
     styleUrls: ['./register.component.scss']
 })
 export class RegisterComponent implements OnInit {
-    form = new FormGroup<RegisterForm>({
+    public form = new FormGroup<RegisterForm>({
         username: new FormControl<string>('', {
             nonNullable: true,
             validators: [
@@ -73,27 +50,13 @@ export class RegisterComponent implements OnInit {
         validators: identicalPasswordsValidator<keyof RegisterForm>('password1', 'password2')
     });
 
-    userErrors$ = controlErrorMessages$('username', this.form, errorMessageMap.username);
-    emailErrors$ = controlErrorMessages$('email', this.form, errorMessageMap.email);
-    password1Errors$ = controlErrorMessages$('password1', this.form, errorMessageMap.password1);
-    password2Errors$ = controlErrorMessages$('password2', this.form, errorMessageMap.password2);
-    formErrors$ = this.form.statusChanges.pipe(
-        map(() => {
-            const formErrors = this.form.errors ?? {};
-            const formErrorMessages = errorMessageMap.form;
-            const messages: string[] = [];
-            for (const errorKey in formErrors) {
-                if (errorKey in formErrorMessages) {
-                    messages.push(formErrorMessages[errorKey]);
-                } else {
-                    messages.push(formErrors[errorKey]);
-                }
-            }
-            return messages;
-        })
-    );
+    public userErrors$ = controlErrorMessages$(this.form, 'username');
+    public emailErrors$ = controlErrorMessages$(this.form, 'email');
+    public password1Errors$ = controlErrorMessages$(this.form, 'password1', 'password');
+    public password2Errors$ = controlErrorMessages$(this.form, 'password2', 'password');
+    public formErrors$ = formErrorMessages$(this.form);
 
-    registrationSuccessful$ = this.authService.registrationResult$.pipe(
+    public registrationSuccessful$ = this.authService.registrationResult$.pipe(
         filter(result => !(result?.error)),
         map(() => true),
     );
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index 05852b72..a2a1abaa 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router';
 import { ResetPassword } from '../models/user';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { identicalPasswordsValidator, passwordValidators } from '../validation';
-import { controlErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { filter, map } from 'rxjs';
+import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
+import { filter, map, merge } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
@@ -12,24 +12,6 @@ type ResetPasswordForm = {
     [key in keyof ResetPassword]: FormControl<string>;
 }
 
-const errorMessageMap: Pick<Record<keyof ResetPassword | 'form', Record<string, string>>, 'new_password1' | 'new_password2' | 'form' | 'token'> = {
-    new_password1: {
-        'required': 'Password is required.',
-        'minlength': 'Password must be at least 8 characters long.',
-    },
-    new_password2: {
-        'required': 'Password is required.',
-        'minlength': 'Password must be at least 8 characters long.',
-    },
-    form: {
-        'passwords': 'Passwords must be identical.',
-        'invalid': 'The token is invalid. Please request a new password reset link.'
-    },
-    token: {
-        'invalid': 'The URL is invalid. Please request a new one.'
-    }
-};
-
 @Component({
   selector: 'lc-reset-password',
   templateUrl: './reset-password.component.html',
@@ -61,28 +43,12 @@ export class ResetPasswordComponent implements OnInit {
         validators: identicalPasswordsValidator<keyof ResetPassword>('new_password1', 'new_password2')
     });
 
-    public password1Errors$ = controlErrorMessages$('new_password1', this.form, errorMessageMap.new_password1);
-    public password2Errors$ = controlErrorMessages$('new_password2', this.form, errorMessageMap.new_password2);
-    public formErrors$ = this.form.statusChanges.pipe(
-        map(() => {
-            // We also include errors from the hidden 'uid' and 'token' controls in the form errors.
-            const formErrors =
-                {
-                    ...this.form.errors,
-                    ...this.form.controls.token.errors,
-                    ...this.form.controls.uid.errors
-                 } ?? {};
-            const formErrorMessages = errorMessageMap.form;
-            const messages: string[] = [];
-            for (const errorKey in formErrors) {
-                if (errorKey in formErrorMessages) {
-                    messages.push(formErrorMessages[errorKey]);
-                } else {
-                    messages.push(formErrors[errorKey]);
-                }
-            }
-            return messages;
-        })
+    public password1Errors$ = controlErrorMessages$(this.form, 'new_password1', 'password');
+    public password2Errors$ = controlErrorMessages$(this.form, 'new_password2', 'password');
+    public formErrors$ = merge(
+        formErrorMessages$(this.form),
+        controlErrorMessages$(this.form, 'token'),
+        controlErrorMessages$(this.form, 'uid')
     );
 
     public resetPasswordSuccesful$ = this.authService.resetPasswordResult$.pipe(
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index bbdd0368..b21744e1 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -1,4 +1,4 @@
-import { FormGroup } from "@angular/forms";
+import { AbstractControl, FormGroup } from "@angular/forms";
 import { User, UserResponse } from "./models/user";
 import _ from 'underscore';
 import { Observable, map } from "rxjs";
@@ -63,33 +63,88 @@ export function setErrors(errorObject: Record<string, string>, form: FormGroup):
     }
 }
 
+export const ERROR_MAP: Record<string, Record<string, string>> = {
+    username: {
+        'required': 'Username is required.',
+        'minlength': 'Username must be at least 3 characters long.',
+        'maxlength': 'Username must be at most 150 characters long.',
+    },
+    email: {
+        'required': 'Email is required.',
+        'email': 'Email is invalid.',
+    },
+    password: {
+        'required': 'Password is required.',
+        'minlength': 'Password must be at least 8 characters long.',
+    },
+    token: {
+        'invalid': 'The URL is invalid. Please request a new one.'
+    },
+    uid: {
+        'invalid': 'The URL is invalid. Please request a new one.'
+    },
+    form: {
+        'passwords': 'Passwords must be identical.',
+    }
+};
+
 
 /**
  * Watches a FormControl and turns its errors into an array of string messages.
  *
- * @param controlName - The name of the form control.
+ * Uses the optional parameter `lookup` to determine which error messages from `ERROR_MAP` to use. If no `lookup` is
+ * provided, `controlName` is used. If no error messages are found using either `lookup` or `controlName`, `ERROR_MAP['form']` is used.
+ *
  * @param form - The FormGroup instance.
- * @param errorMessageMap - A mapping object that contains error messages for each control.
+ * @param controlName - The name of the form control.
+ * @param lookup - The key to use in the error map. Defaults to the control name.
  * @returns An Observable that emits an array of error messages every time the control's status changes.
  */
-export function controlErrorMessages$<T extends FormGroup, K extends string & keyof T['controls']>(controlName: K, form: T, errorMessageMap: Record<string, string>): Observable<string[]> {
+export function controlErrorMessages$<F extends FormGroup, K extends string & keyof F['controls']>(
+    form: F,
+    controlName: K,
+    lookup?: string,
+): Observable<string[]> {
     const control = form.controls[controlName];
+    // Get a subset of error messages based on the lookup key, if provided, or the control name.
+    const messagesForControl = lookup ? ERROR_MAP[lookup] : ERROR_MAP[controlName] ?? ERROR_MAP['form'];
     return control.statusChanges.pipe(
-        map(() => {
-            const errors = control.errors ?? {};
-            const messages: string[] = Object.keys(errors)
-                .map(errorKey => {
-                    if (errorKey in errorMessageMap) {
-                        return errorMessageMap[errorKey];
-                    } else {
-                        return errors[errorKey];
-                    }
-                });
-            return messages;
-        }),
+        map(() => mapErrorsToMessages(form, messagesForControl))
     );
 }
 
+/**
+ * Watches a FormGroup and turns its errors into an array of string messages.
+ *
+ * Uses the optional parameter `lookup` to determine which error messages from `ERROR_MAP` to use. If no `lookup` is
+ * provided, or if no error messages are found, `ERROR_MAP['form']` is used.
+ *
+ * @param form The form group to check for errors.
+ * @param lookup Optional parameter to specify a specific error lookup key.
+ * @returns An observable that emits an array of error messages.
+ */
+export function formErrorMessages$<F extends FormGroup>(form: F, lookup?: string): Observable<string[]> {
+    const messagesForForm = lookup ? ERROR_MAP[lookup] : ERROR_MAP['form'];
+    return form.statusChanges.pipe(
+        map(() => mapErrorsToMessages(form, messagesForForm))
+    );
+}
+
+/**
+ * Maps control errors to error messages using the provided error map.
+ *
+ * If no message is specified for an error key, the error value itself is used as the message.
+ *
+ * @param control - The control containing the errors.
+ * @param errorMap - The map of error keys to error messages.
+ * @returns An array of error messages.
+ */
+function mapErrorsToMessages(control: AbstractControl, errorMap: Record<string, string>): string[] {
+    const errors = control.errors ?? {};
+    return Object.keys(errors)
+        .map(errorKey => errorKey in errorMap ? errorMap[errorKey] : errors[errorKey]);
+}
+
 /**
  * Updates the validity of all controls in the given form and the form itself.
  *

From 836a6cfc73891e81cc322b6f87be3c98ee84c04b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 10:40:21 +0200
Subject: [PATCH 018/565] Merge user streams

---
 frontend/src/app/app.component.ts         |  13 ++-
 frontend/src/app/services/auth.service.ts | 103 ++++++++--------------
 frontend/src/app/user/models/user.ts      |   5 ++
 frontend/src/app/user/utils.ts            |   3 +-
 4 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index ef30769c..d802326f 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,10 +1,17 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { AuthService } from '@services/auth.service';
 
 @Component({
   selector: 'lc-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
-export class AppComponent {
-  title = 'lettercraft';
+export class AppComponent implements OnInit {
+    title = 'lettercraft';
+
+    constructor(private authService: AuthService) { }
+
+    ngOnInit(): void {
+        this.authService.initialAuth$.next();
+    }
 }
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index d5b4c774..eb7d40b1 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -2,8 +2,8 @@ import { Injectable, computed } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
-import { BehaviorSubject, Observable, Subject, catchError, map, of, switchMap, tap, merge, share } from 'rxjs';
-import { UserRegistration, User, UserResponse, UserLogin, PasswordForgotten, ResetPassword } from '../user/models/user';
+import { Observable, Subject, catchError, map, of, switchMap, tap, merge, share } from 'rxjs';
+import { UserRegistration, User, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
@@ -20,17 +20,16 @@ interface AuthAPIError {
     providedIn: 'root'
 })
 export class AuthService {
-    private currentUserSubject$ = new BehaviorSubject<User | null>(null);
-
-    public currentUser = computed(() => this.currentUserSubject$.value);
-
-    currentUser$ = this.currentUserSubject$.pipe();
-    isAuthenticated$ = this.currentUserSubject$.pipe(
-        map(_.isObject)
+    public login$ = new Subject<UserLogin>();
+    public loginResult$ = this.login$.pipe(
+        switchMap(loginForm => this.http.post<AuthAPIResult>(
+            this.authRoute('login/'), loginForm
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error })),
+        )),
+        share()
     );
 
-    public initialAuth$ = new Subject<void>();
-
     public registration$ = new Subject<UserRegistration>();
     public registrationResult$ = this.registration$.pipe(
         switchMap(registrationForm => this.http.post<void>(
@@ -41,15 +40,6 @@ export class AuthService {
         share()
     );
 
-    public login$ = new Subject<UserLogin>();
-    public loginResult$ = this.login$.pipe(
-        switchMap(loginForm => this.http.post<AuthAPIResult>(
-            this.authRoute('login/'), loginForm
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error })),
-        )),
-    );
-
     public passwordForgotten$ = new Subject<PasswordForgotten>()
     public passwordForgottenResult$ = this.passwordForgotten$.pipe(
         switchMap(form => this.http.post<AuthAPIResult>(
@@ -78,11 +68,12 @@ export class AuthService {
         share()
     );
 
+    public initialAuth$ = new Subject<void>();
 
-    public user$ = merge([
-        this.loginResult$,
-        this.initialAuth$
-    ]).pipe(
+    public backendUser$ = merge(
+        this.loginResult$.pipe(tap(() => console.log('Login!'))),
+        this.initialAuth$.pipe(tap(() => console.log('Init auth!')))
+    ).pipe(
         switchMap(() => this.http.get<UserResponse>(
             this.authRoute('user/')
         ).pipe(
@@ -91,19 +82,18 @@ export class AuthService {
         )),
     );
 
+    // Used to reset the user manually.
+    private purgeAuth$ = new Subject<void>();
+
+    public currentUser$: Observable<User | null> = merge(
+        this.purgeAuth$.pipe(map(() => null)),
+        this.backendUser$
+    );
+
+    public isAuthenticated$ = this.currentUser$.pipe(
+        map(_.isObject)
+    );
 
-    /**
-     * Logs in, retrieves user response, transforms to User object
-     */
-    // public loginOld$(loginForm: UserLogin): Observable<User | null> {
-    //     return this.http.post<{ key: string }>(
-    //         this.authRoute('login/'),
-    //         loginForm
-    //     ).pipe(
-    //         switchMap(() => this.checkUser$()),
-    //         tap(data => this.setAuth(data)),
-    //     );
-    // }
 
     constructor(
         private sessionService: SessionService,
@@ -113,33 +103,23 @@ export class AuthService {
         this.sessionService.expired.pipe(
             takeUntilDestroyed()
         ).subscribe(() => this.logout());
-        // this.setInitialAuth();
-    }
 
-    private authRoute(route: string): string {
-        return `/users/${route}`;
+        this.backendUser$.subscribe(user => console.log('New user received!', user));
     }
 
-    private setAuth(user: User | null): void {
-        this.currentUserSubject$.next(user);
+    public keyInfo$(key: string): Observable<KeyInfo> {
+        return this.http.post<KeyInfo>(
+            this.authRoute('registration/key-info/'),
+            { key }
+        );
     }
 
-    private purgeAuth(): void {
-        this.currentUserSubject$.next(null);
+    private authRoute(route: string): string {
+        return `/users/${route}`;
     }
 
-
-    // TODO: this belongs in the app component.
-    // private setInitialAuth(): void {
-    //     this.checkUser$
-    //         .pipe(takeUntilDestroyed())
-    //         .subscribe(user =>
-    //             this.setAuth(user),
-    //         );
-    // }
-
     public logout(redirectToLogin = false): void {
-        this.purgeAuth();
+        this.purgeAuth$.next();
         this.http.post(
             this.authRoute('logout/'),
             {}
@@ -151,31 +131,20 @@ export class AuthService {
         });
     }
 
-
-
-    public keyInfo$(key: string): Observable<{ username: string, email: string }> {
-        return this.http.post<{ username: string; email: string }>(
-            this.authRoute('registration/key-info/'),
-            { key }
-        );
-    }
-
     public showLogin(returnUrl?: string) {
-        this.currentUser$
         this.router.navigate(
             ['/login'],
             returnUrl ? { queryParams: { returnUrl } } : undefined
         );
     }
 
-
     public updateSettings(update: Partial<User>): Observable<any> {
         const data = encodeUserData(update);
         return this.http.patch<UserResponse>(
             this.authRoute('user/'),
             data
         ).pipe(
-            tap(res => this.setAuth(parseUserData(res))),
+            // tap(res => this.setAuth(parseUserData(res))),
         );
     }
 
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index 644a998b..2c9cf931 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -40,3 +40,8 @@ export interface ResetPassword {
 export interface PasswordForgotten {
     email: string;
 }
+
+export interface KeyInfo {
+    username: string;
+    email: string;
+}
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index b21744e1..0a612303 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -3,7 +3,8 @@ import { User, UserResponse } from "./models/user";
 import _ from 'underscore';
 import { Observable, map } from "rxjs";
 
-/* Transforms backend user response to User object
+/**
+* Transforms backend user response to User object
 *
 * @param result User response data
 * @returns User object

From b7d3e6f504f8300b8ec7f6ca79f3a1df98959f3e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 12:59:51 +0200
Subject: [PATCH 019/565] Update user-menu

---
 frontend/src/app/app.component.ts             |  7 ++--
 .../menu/user-menu/user-menu.component.html   |  2 +-
 .../menu/user-menu/user-menu.component.ts     | 31 +++++++-------
 frontend/src/app/services/auth.service.ts     | 40 ++++++++-----------
 4 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index d802326f..f7a00a31 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component } from '@angular/core';
 import { AuthService } from '@services/auth.service';
 
 @Component({
@@ -6,12 +6,13 @@ import { AuthService } from '@services/auth.service';
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
-export class AppComponent implements OnInit {
+export class AppComponent implements AfterViewInit {
     title = 'lettercraft';
 
     constructor(private authService: AuthService) { }
 
-    ngOnInit(): void {
+    ngAfterViewInit(): void {
+        // We subscribe to user info in our template, so we should only call this after the view has been initialized.
         this.authService.initialAuth$.next();
     }
 }
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 31450d1c..07ae7eb2 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -12,7 +12,7 @@
                 {{user.username}}
             </button>
             <div ngbDropdownMenu aria-labelledby="userDropdown" class="dropdown-menu dropdown-menu-end">
-                <a ngbDropdownItem [routerLink]="['/settings']" hidden>Settings</a>  <!-- hide settings link until this is implemented -->
+                <a ngbDropdownItem [routerLink]="['/settings']">Settings</a>
                 <a *ngIf="user.isStaff" ngbDropdownItem href="/admin/">Administration</a>
                 <button ngbDropdownItem (click)="logout()">Sign out</button>
             </div>
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index c6ccd4a1..0a6d1509 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { Observable, map } from 'rxjs';
-import { User } from 'src/app/user/models/user';
+import { map } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 
@@ -11,26 +10,24 @@ import _ from 'underscore';
   styleUrls: ['./user-menu.component.scss']
 })
 export class UserMenuComponent {
-    isLoading$: Observable<boolean>;
-    user$: Observable<User | null | undefined>;
-    showSignIn$: Observable<boolean>;
+    public isLoading$ = this.authService.currentUser$.pipe(
+        map(_.isUndefined)
+    );
 
-    icons = {
+    public user$ = this.authService.currentUser$;
+
+    public showSignIn$ = this.authService.currentUser$.pipe(
+        map(_.isNull)
+    );
+
+    public icons = {
         user: faUser,
     };
 
-    constructor(private authService: AuthService) {
-        this.isLoading$ = this.authService.currentUser$.pipe(
-            map(_.isUndefined)
-        );
-        this.user$ = this.authService.currentUser$;
-        this.showSignIn$ = this.authService.currentUser$.pipe(
-            map(_.isNull)
-        );
-    }
+    constructor(public authService: AuthService) { }
 
-    logout() {
-        this.authService.logout(false);
+    logout(): void {
+        this.authService.logout$.next();
     }
 
 }
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index eb7d40b1..4c7d1f69 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,8 +1,8 @@
-import { Injectable, computed } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
-import { Observable, Subject, catchError, map, of, switchMap, tap, merge, share } from 'rxjs';
+import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith } from 'rxjs';
 import { UserRegistration, User, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
@@ -71,8 +71,8 @@ export class AuthService {
     public initialAuth$ = new Subject<void>();
 
     public backendUser$ = merge(
-        this.loginResult$.pipe(tap(() => console.log('Login!'))),
-        this.initialAuth$.pipe(tap(() => console.log('Init auth!')))
+        this.loginResult$,
+        this.initialAuth$
     ).pipe(
         switchMap(() => this.http.get<UserResponse>(
             this.authRoute('user/')
@@ -80,14 +80,21 @@ export class AuthService {
             catchError(error => of(null)),
             map(parseUserData),
         )),
+        share()
     );
 
-    // Used to reset the user manually.
-    private purgeAuth$ = new Subject<void>();
+    public logout$ = new Subject<void>();
+    public logoutResult$ = this.logout$.pipe(
+        switchMap(() => this.http.post<AuthAPIResult>(this.authRoute('logout/'), {})),
+        share()
+    );
 
-    public currentUser$: Observable<User | null> = merge(
-        this.purgeAuth$.pipe(map(() => null)),
+    public currentUser$: Observable<User | undefined | null> = merge(
+        this.logoutResult$.pipe(map(() => null)),
         this.backendUser$
+    ).pipe(
+        startWith(undefined),
+        share()
     );
 
     public isAuthenticated$ = this.currentUser$.pipe(
@@ -102,9 +109,7 @@ export class AuthService {
     ) {
         this.sessionService.expired.pipe(
             takeUntilDestroyed()
-        ).subscribe(() => this.logout());
-
-        this.backendUser$.subscribe(user => console.log('New user received!', user));
+        ).subscribe(() => this.logout$.next());
     }
 
     public keyInfo$(key: string): Observable<KeyInfo> {
@@ -118,19 +123,6 @@ export class AuthService {
         return `/users/${route}`;
     }
 
-    public logout(redirectToLogin = false): void {
-        this.purgeAuth$.next();
-        this.http.post(
-            this.authRoute('logout/'),
-            {}
-            // Subscribe in component
-        ).subscribe((data) => {
-            if (redirectToLogin) {
-                this.showLogin();
-            }
-        });
-    }
-
     public showLogin(returnUrl?: string) {
         this.router.navigate(
             ['/login'],

From 4efc9d6c0fb23a94b64a00b2e2c57f5597166120 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 16:06:02 +0200
Subject: [PATCH 020/565] Added user-settings form

---
 frontend/src/app/routes.ts                    |   5 +
 frontend/src/app/services/auth.service.ts     |  52 +++++----
 frontend/src/app/user/models/user.ts          |   5 +
 .../user-settings.component.html              |  70 ++++++++++++
 .../user-settings.component.scss              |   0
 .../user-settings.component.spec.ts           |  21 ++++
 .../user-settings/user-settings.component.ts  | 108 ++++++++++++++++++
 frontend/src/app/user/user.module.ts          |   2 +
 frontend/src/app/user/utils.ts                |  10 +-
 9 files changed, 251 insertions(+), 22 deletions(-)
 create mode 100644 frontend/src/app/user/user-settings/user-settings.component.html
 create mode 100644 frontend/src/app/user/user-settings/user-settings.component.scss
 create mode 100644 frontend/src/app/user/user-settings/user-settings.component.spec.ts
 create mode 100644 frontend/src/app/user/user-settings/user-settings.component.ts

diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 6d18e177..cf8bbcf5 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -6,6 +6,7 @@ import { VerifyEmailComponent } from './user/verify-email/verify-email.component
 import { RegisterComponent } from './user/register/register.component';
 import { PasswordForgottenComponent } from './user/password-forgotten/password-forgotten.component';
 import { ResetPasswordComponent } from './user/reset-password/reset-password.component';
+import { UserSettingsComponent } from './user/user-settings/user-settings.component';
 
 const routes: Routes = [
     {
@@ -32,6 +33,10 @@ const routes: Routes = [
         path: 'reset-password/:uid/:token',
         component: ResetPasswordComponent
     },
+    {
+        path: 'user-settings',
+        component: UserSettingsComponent
+    },
     {
         path: '',
         redirectTo: '/home',
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 4c7d1f69..1f82be9c 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { Router } from '@angular/router';
-import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith } from 'rxjs';
-import { UserRegistration, User, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo } from '../user/models/user';
+import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom } from 'rxjs';
+import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
@@ -33,19 +33,19 @@ export class AuthService {
     public registration$ = new Subject<UserRegistration>();
     public registrationResult$ = this.registration$.pipe(
         switchMap(registrationForm => this.http.post<void>(
-            this.authRoute('registration/'), registrationForm).pipe(
-                catchError(error => of<AuthAPIError>({ error: error.error })),
-            ),
-        ),
+            this.authRoute('registration/'), registrationForm
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error })),
+        )),
         share()
     );
 
-    public passwordForgotten$ = new Subject<PasswordForgotten>()
+    public passwordForgotten$ = new Subject<PasswordForgotten>();
     public passwordForgottenResult$ = this.passwordForgotten$.pipe(
         switchMap(form => this.http.post<AuthAPIResult>(
             this.authRoute('password/reset/'), form
         ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error}))
+            catchError(error => of<AuthAPIError>({ error: error.error }))
         )),
     );
 
@@ -54,7 +54,7 @@ export class AuthService {
         switchMap(form => this.http.post<AuthAPIResult>(
             this.authRoute('password/reset/confirm/'), form
         ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error}))
+            catchError(error => of<AuthAPIError>({ error: error.error }))
         )),
         share()
     );
@@ -68,6 +68,19 @@ export class AuthService {
         share()
     );
 
+    public updateSettings$ = new Subject<UserSettings>();
+    public updateSettingsResult$ = this.updateSettings$.pipe(
+        switchMap(update => this.http.patch<UserResponse>(
+            this.authRoute('user/'),
+            encodeUserData(update)
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error })),
+        )),
+        share()
+    );
+
+
+
     public initialAuth$ = new Subject<void>();
 
     public backendUser$ = merge(
@@ -83,15 +96,22 @@ export class AuthService {
         share()
     );
 
+    private updateSettingsUser$ = this.updateSettingsResult$
+    .pipe(
+        withLatestFrom(this.backendUser$),
+        map(([userData, currentUser]) => 'error' in userData ? currentUser : parseUserData(userData)),
+    );
+
     public logout$ = new Subject<void>();
     public logoutResult$ = this.logout$.pipe(
         switchMap(() => this.http.post<AuthAPIResult>(this.authRoute('logout/'), {})),
         share()
     );
 
-    public currentUser$: Observable<User | undefined | null> = merge(
+    public currentUser$ = merge(
         this.logoutResult$.pipe(map(() => null)),
-        this.backendUser$
+        this.backendUser$,
+        this.updateSettingsUser$
     ).pipe(
         startWith(undefined),
         share()
@@ -130,14 +150,6 @@ export class AuthService {
         );
     }
 
-    public updateSettings(update: Partial<User>): Observable<any> {
-        const data = encodeUserData(update);
-        return this.http.patch<UserResponse>(
-            this.authRoute('user/'),
-            data
-        ).pipe(
-            // tap(res => this.setAuth(parseUserData(res))),
-        );
-    }
+
 
 }
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index 2c9cf931..f1653778 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -45,3 +45,8 @@ export interface KeyInfo {
     username: string;
     email: string;
 }
+
+// Dj-rest-auth does not let you update your email address.
+export type UserSettings = Pick<User, 'id' | 'firstName' | 'lastName'> & {
+    username?: string
+}
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
new file mode 100644
index 00000000..b686a92a
--- /dev/null
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -0,0 +1,70 @@
+<h2>User settings</h2>
+
+<p>Use the form below to change your name or password.</p>
+
+<form [formGroup]="form" (ngSubmit)="submit()">
+    <div *ngIf="form.controls.username as control">
+        <label for="username" class="form-label">
+            Username
+        </label>
+        <input
+            type="text"
+            id="username"
+            class="form-control"
+            [class.is-invalid]="control.touched && control.invalid"
+            [formControl]="control"
+        >
+        <p *ngFor="let error of usernameErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
+    </div>
+    <div>
+        <label for="first-name" class="form-label">First name</label>
+        <input
+            type="text"
+            id="first-name"
+            class="form-control"
+            [class.is-invalid]="form.controls.firstName.touched && form.controls.firstName.invalid"
+            [formControl]="form.controls.firstName">
+        <p *ngFor="let error of firstNameErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
+    </div>
+    <div>
+        <label for="last-name" class="form-label">
+            Last name
+        </label>
+        <input
+            type="text"
+            id="first-name"
+            class="form-control"
+            [class.is-invalid]="form.controls.lastName.touched && form.controls.lastName.invalid"
+            [formControl]="form.controls.lastName">
+        <p *ngFor="let error of lastNameErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
+    </div>
+    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+        {{ error }}
+    </p>
+    <button type="submit" class="btn btn-primary my-3">Save changes</button>
+</form>
+
+<div *ngIf="settingsUpdatedSuccessful$ | async" class="alert alert-success" role="alert">
+    <h2 class="h6 alert-heading">User settings updated</h2>
+    <p>Your user settings have been updated.</p>
+</div>
+
+<div>
+    <p>Click here to request a new password</p>
+    <button class="btn btn-primary" (click)="requestNewPassword()">
+        Request new password
+    </button>
+</div>
+
+<div>
+    <p>Click here to delete your account.</p>
+    <button class="btn btn-danger" (click)="deleteAccount()">
+        Delete account
+    </button>
+</div>
diff --git a/frontend/src/app/user/user-settings/user-settings.component.scss b/frontend/src/app/user/user-settings/user-settings.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/user/user-settings/user-settings.component.spec.ts b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
new file mode 100644
index 00000000..b042a994
--- /dev/null
+++ b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserSettingsComponent } from './user-settings.component';
+
+describe('UserSettingsComponent', () => {
+  let component: UserSettingsComponent;
+  let fixture: ComponentFixture<UserSettingsComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [UserSettingsComponent]
+    });
+    fixture = TestBed.createComponent(UserSettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
new file mode 100644
index 00000000..6ec5600e
--- /dev/null
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -0,0 +1,108 @@
+import { Component, DestroyRef, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { AuthService } from '@services/auth.service';
+import { User, UserSettings } from '../models/user';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { filter, map } from 'rxjs';
+import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
+
+type UserSettingsForm = { [key in keyof UserSettings]: FormControl<UserSettings[key]> };
+
+@Component({
+  selector: 'lc-user-settings',
+  templateUrl: './user-settings.component.html',
+  styleUrls: ['./user-settings.component.scss']
+})
+export class UserSettingsComponent implements OnInit {
+    public form = new FormGroup<UserSettingsForm>({
+        id: new FormControl<number>(-1, {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+            ]
+        }),
+        username: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+            ]
+        }),
+        firstName: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+            ]
+        }),
+        lastName: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+            ]
+        }),
+    });
+
+    public usernameErrors$ = controlErrorMessages$(this.form, 'username');
+    public firstNameErrors$ = controlErrorMessages$(this.form, 'firstName');
+    public lastNameErrors$ = controlErrorMessages$(this.form, 'lastName');
+    public formErrors$ = formErrorMessages$(this.form);
+
+    public settingsUpdatedSuccessful$ = this.authService.updateSettingsResult$.pipe(
+        filter(result => !('error' in result)),
+        map(() => true),
+    );
+
+    // See submit() for explanation.
+    private currentUsername: string | null = null;
+
+    constructor(
+        private authService: AuthService,
+        private destroyRef: DestroyRef
+    ) { }
+
+    ngOnInit(): void {
+        this.authService.currentUser$
+            .pipe(
+                filter(user => !!user),
+                takeUntilDestroyed(this.destroyRef)
+            ).subscribe(user => {
+                if (!user) {
+                    return;
+                }
+                this.form.patchValue(user);
+                this.currentUsername = user.username;
+            });
+
+        this.authService.updateSettingsResult$
+            .pipe(
+                takeUntilDestroyed(this.destroyRef)
+        ).subscribe(result => {
+            if ('error' in result) {
+                setErrors(result.error, this.form);
+            }
+        });
+    }
+
+    public requestNewPassword(): void {
+        // TODO: Implement!
+    }
+
+    public deleteAccount(): void {
+        // TODO: Implement!
+    }
+
+    public submit(): void {
+        this.form.markAllAsTouched();
+        updateFormValidity(this.form);
+        if (this.form.invalid) {
+            return;
+        }
+        const patchInput = this.form.getRawValue();
+
+        // If we send the username along, dj-auth-rest will assume it has changed, returning a 'username already taken' error if we did not change it.
+        if (patchInput.username === this.currentUsername) {
+            delete patchInput.username;
+        }
+
+        this.authService.updateSettings$.next(patchInput);
+    }
+}
diff --git a/frontend/src/app/user/user.module.ts b/frontend/src/app/user/user.module.ts
index 08cbd0e1..6cd5b480 100644
--- a/frontend/src/app/user/user.module.ts
+++ b/frontend/src/app/user/user.module.ts
@@ -5,6 +5,7 @@ import { VerifyEmailComponent } from './verify-email/verify-email.component';
 import { RegisterComponent } from './register/register.component';
 import { PasswordForgottenComponent } from './password-forgotten/password-forgotten.component';
 import { ResetPasswordComponent } from './reset-password/reset-password.component';
+import { UserSettingsComponent } from './user-settings/user-settings.component';
 
 @NgModule({
     declarations: [
@@ -13,6 +14,7 @@ import { ResetPasswordComponent } from './reset-password/reset-password.componen
         RegisterComponent,
         PasswordForgottenComponent,
         ResetPasswordComponent,
+        UserSettingsComponent,
     ],
     imports: [
         SharedModule
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index 0a612303..3cee566d 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -86,7 +86,13 @@ export const ERROR_MAP: Record<string, Record<string, string>> = {
     },
     form: {
         'passwords': 'Passwords must be identical.',
-    }
+    },
+    firstName: {
+        'required': 'First name is required.',
+    },
+    lastName: {
+        'required': 'Last name is required.',
+    },
 };
 
 
@@ -110,7 +116,7 @@ export function controlErrorMessages$<F extends FormGroup, K extends string & ke
     // Get a subset of error messages based on the lookup key, if provided, or the control name.
     const messagesForControl = lookup ? ERROR_MAP[lookup] : ERROR_MAP[controlName] ?? ERROR_MAP['form'];
     return control.statusChanges.pipe(
-        map(() => mapErrorsToMessages(form, messagesForControl))
+        map(() => mapErrorsToMessages(control, messagesForControl))
     );
 }
 

From 33df81b3a8f1c0e7fff4744217a5e1bda936e6f9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 16:06:22 +0200
Subject: [PATCH 021/565] Cleanup

---
 frontend/src/app/core/menu/user-menu/user-menu.component.html | 2 +-
 frontend/src/app/user/register/register.component.html        | 2 +-
 frontend/src/app/user/register/register.component.ts          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 07ae7eb2..3103b138 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -12,7 +12,7 @@
                 {{user.username}}
             </button>
             <div ngbDropdownMenu aria-labelledby="userDropdown" class="dropdown-menu dropdown-menu-end">
-                <a ngbDropdownItem [routerLink]="['/settings']">Settings</a>
+                <a ngbDropdownItem [routerLink]="['/user-settings']">Settings</a>
                 <a *ngIf="user.isStaff" ngbDropdownItem href="/admin/">Administration</a>
                 <button ngbDropdownItem (click)="logout()">Sign out</button>
             </div>
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index bb25da66..b979f7a1 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -16,7 +16,7 @@ <h2>Register</h2>
             [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
             [formControl]="form.controls.username"
         >
-        <p *ngFor="let error of userErrors$ | async" class="invalid-feedback">
+        <p *ngFor="let error of usernameErrors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
     </div>
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index 4951ed70..2e75abf3 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -50,7 +50,7 @@ export class RegisterComponent implements OnInit {
         validators: identicalPasswordsValidator<keyof RegisterForm>('password1', 'password2')
     });
 
-    public userErrors$ = controlErrorMessages$(this.form, 'username');
+    public usernameErrors$ = controlErrorMessages$(this.form, 'username');
     public emailErrors$ = controlErrorMessages$(this.form, 'email');
     public password1Errors$ = controlErrorMessages$(this.form, 'password1', 'password');
     public password2Errors$ = controlErrorMessages$(this.form, 'password2', 'password');

From 2458b790c1674c4ec8d16bb1d73366f0f1959534 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 16:59:09 +0200
Subject: [PATCH 022/565] Password reset request from user settings form

---
 frontend/src/app/services/auth.service.ts       | 12 ------------
 frontend/src/app/user/models/user.ts            |  4 ++--
 .../user-settings/user-settings.component.html  |  8 +++++++-
 .../user-settings/user-settings.component.ts    | 17 ++++++++++++++---
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 1f82be9c..8a5e59a0 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -121,10 +121,8 @@ export class AuthService {
         map(_.isObject)
     );
 
-
     constructor(
         private sessionService: SessionService,
-        private router: Router,
         private http: HttpClient,
     ) {
         this.sessionService.expired.pipe(
@@ -142,14 +140,4 @@ export class AuthService {
     private authRoute(route: string): string {
         return `/users/${route}`;
     }
-
-    public showLogin(returnUrl?: string) {
-        this.router.navigate(
-            ['/login'],
-            returnUrl ? { queryParams: { returnUrl } } : undefined
-        );
-    }
-
-
-
 }
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index f1653778..9990e844 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -46,7 +46,7 @@ export interface KeyInfo {
     email: string;
 }
 
-// Dj-rest-auth does not let you update your email address.
-export type UserSettings = Pick<User, 'id' | 'firstName' | 'lastName'> & {
+// Dj-rest-auth does not let you update your email address, but we need it to request the password reset form.
+export type UserSettings = Pick<User, 'id' | 'email' | 'firstName' | 'lastName'> & {
     username?: string
 }
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
index b686a92a..9a6f93ff 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.html
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -55,9 +55,15 @@ <h2 class="h6 alert-heading">User settings updated</h2>
     <p>Your user settings have been updated.</p>
 </div>
 
+<div *ngIf="passwordResetRequestSuccessful$ | async" class="alert alert-success" role="alert">
+    <h2 class="h6 alert-heading">Password reset request received</h2>
+    <p>Your request to reset your password has been received successfully.</p>
+    <p>Please check your mailbox for a link to a page where you may reset your password.</p>
+</div>
+
 <div>
     <p>Click here to request a new password</p>
-    <button class="btn btn-primary" (click)="requestNewPassword()">
+    <button class="btn btn-primary" (click)="requestPasswordReset()">
         Request new password
     </button>
 </div>
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index 6ec5600e..9057668f 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -21,6 +21,10 @@ export class UserSettingsComponent implements OnInit {
                 Validators.required,
             ]
         }),
+        // dj-rest-auth does not let you change your email address, so we don't need to validate it.
+        email: new FormControl<string>('', {
+            nonNullable: true
+        }),
         username: new FormControl<string>('', {
             nonNullable: true,
             validators: [
@@ -51,6 +55,11 @@ export class UserSettingsComponent implements OnInit {
         map(() => true),
     );
 
+    public passwordResetRequestSuccessful$ = this.authService.passwordForgottenResult$.pipe(
+        filter(result => !('error' in result)),
+        map(() => true),
+    );
+
     // See submit() for explanation.
     private currentUsername: string | null = null;
 
@@ -82,8 +91,8 @@ export class UserSettingsComponent implements OnInit {
         });
     }
 
-    public requestNewPassword(): void {
-        // TODO: Implement!
+    public requestPasswordReset(): void {
+        this.authService.passwordForgotten$.next({ email: this.form.getRawValue().email });
     }
 
     public deleteAccount(): void {
@@ -98,7 +107,9 @@ export class UserSettingsComponent implements OnInit {
         }
         const patchInput = this.form.getRawValue();
 
-        // If we send the username along, dj-auth-rest will assume it has changed, returning a 'username already taken' error if we did not change it.
+        // If we send the username along, dj-auth-rest will assume it has changed,
+        // returning a 'username already taken' error if it hasn't.
+        // Therefore we remove the username from the input if it has not changed.
         if (patchInput.username === this.currentUsername) {
             delete patchInput.username;
         }

From 40e97c98d96d54d54bdd584360ce55bc6cb953d7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 20:39:30 +0200
Subject: [PATCH 023/565] Loading spinner in LoginComponent

---
 .../src/app/user/login/login.component.html   |  4 +++
 .../src/app/user/login/login.component.ts     | 26 +++++--------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/frontend/src/app/user/login/login.component.html b/frontend/src/app/user/login/login.component.html
index b3b976ae..c53cbff0 100644
--- a/frontend/src/app/user/login/login.component.html
+++ b/frontend/src/app/user/login/login.component.html
@@ -32,7 +32,11 @@ <h2>Sign in</h2>
     <div class="mb-3">
         <button type="submit" class="btn btn-primary mt-3">
             Sign in
+            <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+                <span class="visually-hidden">Logging in...</span>
+            </div>
         </button>
+
     </div>
     <div class="alert alert-danger" *ngIf="loginReturnError$ | async" role="alert">
         Failed to sign in.
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 4db452c6..e3a22372 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { AuthService } from '@services/auth.service';
 import { UserLogin } from '../models/user';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { filter } from 'rxjs';
+import { Observable, filter, map, merge, startWith } from 'rxjs';
 import { updateFormValidity } from '../utils';
 
 type LoginForm = {
@@ -16,7 +16,7 @@ type LoginForm = {
   templateUrl: './login.component.html',
   styleUrls: ['./login.component.scss']
 })
-export class LoginComponent implements OnInit {
+export class LoginComponent {
     public form = new FormGroup<LoginForm>({
         username: new FormControl<string>('', {
             nonNullable: true,
@@ -28,28 +28,16 @@ export class LoginComponent implements OnInit {
         }),
     });
 
-    private returnUrl = this.activatedRoute.snapshot.queryParams['returnUrl'] || '/';
-
-    private loginReturn$ = this.authService.loginResult$;
-
     public loginReturnError$ = this.authService.loginResult$.pipe(
         filter(response => 'error' in response),
     );
 
-    constructor(
-        private authService: AuthService,
-        private activatedRoute: ActivatedRoute,
-        private router: Router,
-        private destroyRef: DestroyRef,
-    ) { }
+    public loading$: Observable<boolean> = merge(
+        this.authService.login$.pipe(map(() => true)),
+        this.authService.loginResult$.pipe(map(() => false)),
+    ).pipe(startWith(false));
 
-    ngOnInit(): void {
-        this.loginReturn$.pipe(
-            takeUntilDestroyed(this.destroyRef)
-        ).subscribe(() => {
-            this.router.navigate([this.returnUrl]);
-        })
-    }
+    constructor(private authService: AuthService) { }
 
     public submit(): void {
         this.form.markAllAsTouched();

From c5386536786deecb6ad1005a772ab580c47a1fa7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 3 May 2024 20:42:04 +0200
Subject: [PATCH 024/565] Merge error messages

---
 frontend/src/app/services/auth.service.ts                | 2 --
 .../app/user/reset-password/reset-password.component.ts  | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 8a5e59a0..3a483c80 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -79,8 +79,6 @@ export class AuthService {
         share()
     );
 
-
-
     public initialAuth$ = new Subject<void>();
 
     public backendUser$ = merge(
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index a2a1abaa..856e5b68 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -4,9 +4,10 @@ import { ResetPassword } from '../models/user';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { identicalPasswordsValidator, passwordValidators } from '../validation';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { filter, map, merge } from 'rxjs';
+import { combineLatest, filter, map, merge, tap } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import _ from 'underscore';
 
 type ResetPasswordForm = {
     [key in keyof ResetPassword]: FormControl<string>;
@@ -45,10 +46,12 @@ export class ResetPasswordComponent implements OnInit {
 
     public password1Errors$ = controlErrorMessages$(this.form, 'new_password1', 'password');
     public password2Errors$ = controlErrorMessages$(this.form, 'new_password2', 'password');
-    public formErrors$ = merge(
+    public formErrors$ = combineLatest([
         formErrorMessages$(this.form),
         controlErrorMessages$(this.form, 'token'),
-        controlErrorMessages$(this.form, 'uid')
+        controlErrorMessages$(this.form, 'uid'),
+    ]).pipe(
+        map(errorLists => _.flatten(errorLists, 1))
     );
 
     public resetPasswordSuccesful$ = this.authService.resetPasswordResult$.pipe(

From d8824d9597529ed72c488fae3b8820897fe64537 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 09:29:16 +0200
Subject: [PATCH 025/565] Loading spinners

---
 .../core/menu/user-menu/user-menu.component.html |  7 ++++++-
 .../core/menu/user-menu/user-menu.component.ts   |  7 ++++++-
 frontend/src/app/user/login/login.component.html |  2 +-
 frontend/src/app/user/login/login.component.ts   |  4 ++--
 .../password-forgotten.component.html            |  9 +++++++--
 .../password-forgotten.component.ts              | 10 +++++++---
 .../app/user/register/register.component.html    |  9 +++++++--
 .../src/app/user/register/register.component.ts  |  9 +++++++--
 .../reset-password/reset-password.component.html |  6 ++++--
 .../reset-password/reset-password.component.ts   |  9 +++++++--
 .../user-settings/user-settings.component.html   | 14 +++++++++++---
 .../user-settings/user-settings.component.ts     | 16 +++++++++++++---
 .../verify-email/verify-email.component.html     |  7 ++++++-
 .../user/verify-email/verify-email.component.ts  | 10 +++++++---
 14 files changed, 91 insertions(+), 28 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 3103b138..d3fef9bd 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -14,7 +14,12 @@
             <div ngbDropdownMenu aria-labelledby="userDropdown" class="dropdown-menu dropdown-menu-end">
                 <a ngbDropdownItem [routerLink]="['/user-settings']">Settings</a>
                 <a *ngIf="user.isStaff" ngbDropdownItem href="/admin/">Administration</a>
-                <button ngbDropdownItem (click)="logout()">Sign out</button>
+                <button ngbDropdownItem (click)="logout()">
+                    Sign out
+                    <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+                        <span class="visually-hidden">Signing out...</span>
+                    </div>
+                </button>
             </div>
         </li>
     </ng-container>
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index 0a6d1509..06c14233 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { map } from 'rxjs';
+import { map, merge, startWith } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 
@@ -24,6 +24,11 @@ export class UserMenuComponent {
         user: faUser,
     };
 
+    public loading$ = merge(
+        this.authService.logout$.pipe(map(() => true)),
+        this.authService.logoutResult$.pipe(map(() => false)),
+    ).pipe(startWith(false));
+
     constructor(public authService: AuthService) { }
 
     logout(): void {
diff --git a/frontend/src/app/user/login/login.component.html b/frontend/src/app/user/login/login.component.html
index c53cbff0..020e4f97 100644
--- a/frontend/src/app/user/login/login.component.html
+++ b/frontend/src/app/user/login/login.component.html
@@ -38,7 +38,7 @@ <h2>Sign in</h2>
         </button>
 
     </div>
-    <div class="alert alert-danger" *ngIf="loginReturnError$ | async" role="alert">
+    <div class="alert alert-danger" *ngIf="loginError$ | async" role="alert">
         Failed to sign in.
     </div>
 </form>
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index e3a22372..1179a32d 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -28,11 +28,11 @@ export class LoginComponent {
         }),
     });
 
-    public loginReturnError$ = this.authService.loginResult$.pipe(
+    public loginError$ = this.authService.loginResult$.pipe(
         filter(response => 'error' in response),
     );
 
-    public loading$: Observable<boolean> = merge(
+    public loading$ = merge(
         this.authService.login$.pipe(map(() => true)),
         this.authService.loginResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.html b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
index f3e0e754..cc3ef63b 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.html
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
@@ -8,10 +8,15 @@ <h2>Forgotten your password?</h2>
         <input id="email" type="email" class="form-control" [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid" [formControl]="form.controls.email" />
         <p *ngFor="let error of emailErrors$ | async" class="invalid-feedback">{{ error }}</p>
     </div>
-    <button type="submit" class="btn btn-primary my-3">Submit</button>
+    <button type="submit" class="btn btn-primary my-3">
+        Submit
+        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+            <span class="visually-hidden">Requesting password reset link...</span>
+        </div>
+    </button>
 </form>
 
-<div *ngIf="passwordForgottenSuccessful$ | async" class="alert alert-success" role="alert">
+<div *ngIf="success$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">Password reset request received</h2>
     <p>Your request to reset your password has been received successfully.</p>
     <p>If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.</p>
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index 3ce5c3c3..a726dcc4 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { controlErrorMessages$, updateFormValidity } from '../utils';
-import { filter } from 'rxjs';
+import { filter, map, merge, startWith } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { PasswordForgotten } from '../models/user';
 
@@ -9,7 +9,6 @@ type PasswordForgottenForm = {
     [key in keyof PasswordForgotten]: FormControl<string>;
 }
 
-
 @Component({
   selector: 'lc-password-forgotten',
   templateUrl: './password-forgotten.component.html',
@@ -25,10 +24,15 @@ export class PasswordForgottenComponent {
 
     public emailErrors$ = controlErrorMessages$(this.form, 'email');
 
-    public passwordForgottenSuccessful$ = this.authService.passwordForgottenResult$.pipe(
+    public success$ = this.authService.passwordForgottenResult$.pipe(
         filter(result => !('error' in result)),
     );
 
+    public loading$ = merge(
+        this.authService.passwordForgotten$.pipe(map(() => true)),
+        this.authService.passwordForgottenResult$.pipe(map(() => false))
+    ).pipe(startWith(false));
+
     constructor(private authService: AuthService) { }
 
     public submit(): void {
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index b979f7a1..aa83a7db 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -60,10 +60,15 @@ <h2>Register</h2>
     <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
         {{ error }}
     </p>
-    <button type="submit" class="btn btn-primary my-3">Register</button>
+    <button type="submit" class="btn btn-primary my-3">
+        Register
+        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+            <span class="visually-hidden">Registering...</span>
+        </div>
+    </button>
 </form>
 
-<div *ngIf="registrationSuccessful$ | async" class="alert alert-success" role="alert">
+<div *ngIf="success$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">Registration successful</h2>
     <p>Your account details have been registered successfully.</p>
     <p>Please check your email inbox for a verification email and click the link.</p>
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index 2e75abf3..abf1b118 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -4,7 +4,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { usernameValidators, passwordValidators, identicalPasswordsValidator } from '../validation';
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { filter, map } from 'rxjs';
+import { filter, map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
 
 type RegisterForm = {
@@ -56,11 +56,16 @@ export class RegisterComponent implements OnInit {
     public password2Errors$ = controlErrorMessages$(this.form, 'password2', 'password');
     public formErrors$ = formErrorMessages$(this.form);
 
-    public registrationSuccessful$ = this.authService.registrationResult$.pipe(
+    public success$ = this.authService.registrationResult$.pipe(
         filter(result => !(result?.error)),
         map(() => true),
     );
 
+    public loading$ = merge(
+        this.authService.registration$.pipe(map(() => true)),
+        this.authService.registrationResult$.pipe(map(() => false))
+    ).pipe(startWith(false));
+
     constructor(
         private authService: AuthService,
         private destroyRef: DestroyRef,
diff --git a/frontend/src/app/user/reset-password/reset-password.component.html b/frontend/src/app/user/reset-password/reset-password.component.html
index 0734c7c5..8ca20248 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.html
+++ b/frontend/src/app/user/reset-password/reset-password.component.html
@@ -38,12 +38,14 @@ <h2>Reset password</h2>
     </p>
     <button type="submit" class="btn btn-primary my-3">
         Submit
+        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+            <span class="visually-hidden">Updating password...</span>
+        </div>
     </button>
 </form>
 
-<div *ngIf="resetPasswordSuccesful$ | async" class="alert alert-success" role="alert">
+<div *ngIf="success$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">Password reset successful</h2>
     <p>Your password has been changed successfully.</p>
     <a [routerLink]="['/login']">Click here to go back to the login form.</a>
-
 </div>
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index 856e5b68..4d2f1dc9 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -4,7 +4,7 @@ import { ResetPassword } from '../models/user';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { identicalPasswordsValidator, passwordValidators } from '../validation';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { combineLatest, filter, map, merge, tap } from 'rxjs';
+import { combineLatest, filter, map, merge, startWith, tap } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import _ from 'underscore';
@@ -54,11 +54,16 @@ export class ResetPasswordComponent implements OnInit {
         map(errorLists => _.flatten(errorLists, 1))
     );
 
-    public resetPasswordSuccesful$ = this.authService.resetPasswordResult$.pipe(
+    public success$ = this.authService.resetPasswordResult$.pipe(
         filter(result => !('error' in result)),
         map(() => true)
     );
 
+    public loading$ = merge(
+        this.authService.resetPassword$.pipe(map(() => true)),
+        this.authService.resetPasswordResult$.pipe(map(() => false))
+    ).pipe(startWith(false));
+
     constructor(
         private activatedRoute: ActivatedRoute,
         private authService: AuthService,
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
index 9a6f93ff..219417a5 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.html
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -47,15 +47,20 @@ <h2>User settings</h2>
     <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
         {{ error }}
     </p>
-    <button type="submit" class="btn btn-primary my-3">Save changes</button>
+    <button type="submit" class="btn btn-primary my-3">
+        Save changes
+        <div *ngIf="updateSettingsLoading$ | async" class="spinner-border spinner-border-sm" role="status">
+            <span class="visually-hidden">Requesting password reset link...</span>
+        </div>
+    </button>
 </form>
 
-<div *ngIf="settingsUpdatedSuccessful$ | async" class="alert alert-success" role="alert">
+<div *ngIf="updateSettingsSuccess$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">User settings updated</h2>
     <p>Your user settings have been updated.</p>
 </div>
 
-<div *ngIf="passwordResetRequestSuccessful$ | async" class="alert alert-success" role="alert">
+<div *ngIf="requestResetSuccess$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">Password reset request received</h2>
     <p>Your request to reset your password has been received successfully.</p>
     <p>Please check your mailbox for a link to a page where you may reset your password.</p>
@@ -65,6 +70,9 @@ <h2 class="h6 alert-heading">Password reset request received</h2>
     <p>Click here to request a new password</p>
     <button class="btn btn-primary" (click)="requestPasswordReset()">
         Request new password
+        <div *ngIf="requestResetLoading | async" class="spinner-border spinner-border-sm" role="status">
+            <span class="visually-hidden">Requesting password reset link...</span>
+        </div>
     </button>
 </div>
 
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index 9057668f..887d818d 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { AuthService } from '@services/auth.service';
 import { User, UserSettings } from '../models/user';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { filter, map } from 'rxjs';
+import { filter, map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
 
 type UserSettingsForm = { [key in keyof UserSettings]: FormControl<UserSettings[key]> };
@@ -50,16 +50,26 @@ export class UserSettingsComponent implements OnInit {
     public lastNameErrors$ = controlErrorMessages$(this.form, 'lastName');
     public formErrors$ = formErrorMessages$(this.form);
 
-    public settingsUpdatedSuccessful$ = this.authService.updateSettingsResult$.pipe(
+    public updateSettingsSuccess$ = this.authService.updateSettingsResult$.pipe(
         filter(result => !('error' in result)),
         map(() => true),
     );
 
-    public passwordResetRequestSuccessful$ = this.authService.passwordForgottenResult$.pipe(
+    public updateSettingsLoading$ = merge(
+        this.authService.updateSettings$.pipe(map(() => true)),
+        this.authService.updateSettingsResult$.pipe(map(() => false))
+    ).pipe(startWith(false))
+
+    public requestResetSuccess$ = this.authService.passwordForgottenResult$.pipe(
         filter(result => !('error' in result)),
         map(() => true),
     );
 
+    public requestResetLoading = merge(
+        this.authService.passwordForgotten$.pipe(map(() => true)),
+        this.authService.passwordForgottenResult$.pipe(map(() => false))
+    ).pipe(startWith(false))
+
     // See submit() for explanation.
     private currentUsername: string | null = null;
 
diff --git a/frontend/src/app/user/verify-email/verify-email.component.html b/frontend/src/app/user/verify-email/verify-email.component.html
index 412aac4e..dc4b268d 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.html
+++ b/frontend/src/app/user/verify-email/verify-email.component.html
@@ -7,7 +7,12 @@ <h1>Confirm e-mail address</h1>
         is an e-mail address for user {{userDetails.username}}.
     </p>
 
-    <button class="btn btn-primary" (click)="confirm()">Confirm</button>
+    <button class="btn btn-primary" (click)="confirm()">
+        Confirm
+        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+            <span class="visually-hidden">Verifying email...</span>
+        </div>
+    </button>
 </div>
 
 <div *ngIf="error$ | async as error" class="alert alert-danger" role="alert">
diff --git a/frontend/src/app/user/verify-email/verify-email.component.ts b/frontend/src/app/user/verify-email/verify-email.component.ts
index d12f49b4..4a3f321f 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.ts
@@ -1,9 +1,8 @@
 import { HttpErrorResponse } from '@angular/common/http';
-import { Component, DestroyRef } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { AuthService } from '@services/auth.service';
-import { Observable, Subject, catchError, filter, ignoreElements, map, merge, of, share, switchMap, take } from 'rxjs';
+import { catchError, filter, ignoreElements, map, merge, of, share, startWith, switchMap, take } from 'rxjs';
 import _ from 'underscore';
 
 
@@ -30,6 +29,11 @@ export class VerifyEmailComponent {
         catchError(() => of(false)),
     );
 
+    public loading$ = merge(
+        this.authService.verifyEmail$.pipe(map(() => true)),
+        this.authService.verifyEmailResult$.pipe(map(() => false))
+    ).pipe(startWith(false));
+
     public directToLogin$ = this.success$.pipe(
         switchMap(() => this.authService.isAuthenticated$.pipe(
             filter(_.negate(_.isUndefined)),

From d2994903de31585017facdeeb072ec025d4a7fa0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 10:23:28 +0200
Subject: [PATCH 026/565] Delete user frontend

---
 frontend/src/app/services/auth.service.ts      | 10 ++++++++++
 .../reset-password/reset-password.component.ts |  2 +-
 .../user-settings/user-settings.component.html |  7 ++++++-
 .../user-settings/user-settings.component.ts   | 18 ++++++++++++++----
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 3a483c80..7101ae58 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -79,6 +79,16 @@ export class AuthService {
         share()
     );
 
+    public deleteUser$ = new Subject<void>();
+    public deleteUserResult$ = this.deleteUser$.pipe(
+        switchMap(() => this.http.delete<AuthAPIResult>(
+            this.authRoute('delete/')
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error }))
+        )),
+        share()
+    );
+
     public initialAuth$ = new Subject<void>();
 
     public backendUser$ = merge(
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index 4d2f1dc9..d6fc428a 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -4,7 +4,7 @@ import { ResetPassword } from '../models/user';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { identicalPasswordsValidator, passwordValidators } from '../validation';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { combineLatest, filter, map, merge, startWith, tap } from 'rxjs';
+import { combineLatest, filter, map, merge, startWith } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import _ from 'underscore';
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
index 219417a5..04ad119c 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.html
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -60,6 +60,11 @@ <h2 class="h6 alert-heading">User settings updated</h2>
     <p>Your user settings have been updated.</p>
 </div>
 
+<div *ngIf="deleteUserSuccess$ | async" class="alert alert-success" role="alert">
+    <h2 class="h6 alert-heading">User deleted</h2>
+    <p>User account deleted.</p>
+</div>
+
 <div *ngIf="requestResetSuccess$ | async" class="alert alert-success" role="alert">
     <h2 class="h6 alert-heading">Password reset request received</h2>
     <p>Your request to reset your password has been received successfully.</p>
@@ -70,7 +75,7 @@ <h2 class="h6 alert-heading">Password reset request received</h2>
     <p>Click here to request a new password</p>
     <button class="btn btn-primary" (click)="requestPasswordReset()">
         Request new password
-        <div *ngIf="requestResetLoading | async" class="spinner-border spinner-border-sm" role="status">
+        <div *ngIf="requestResetLoading$ | async" class="spinner-border spinner-border-sm" role="status">
             <span class="visually-hidden">Requesting password reset link...</span>
         </div>
     </button>
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index 887d818d..08b606f3 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -1,7 +1,7 @@
 import { Component, DestroyRef, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { AuthService } from '@services/auth.service';
-import { User, UserSettings } from '../models/user';
+import { UserSettings } from '../models/user';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { filter, map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
@@ -65,10 +65,20 @@ export class UserSettingsComponent implements OnInit {
         map(() => true),
     );
 
-    public requestResetLoading = merge(
+    public requestResetLoading$ = merge(
         this.authService.passwordForgotten$.pipe(map(() => true)),
         this.authService.passwordForgottenResult$.pipe(map(() => false))
-    ).pipe(startWith(false))
+    ).pipe(startWith(false));
+
+    public deleteUserSuccess$ = this.authService.deleteUserResult$.pipe(
+        filter(result => !('error' in result)),
+        map(() => true)
+    );
+
+    public deleteUserLoading$ = merge(
+        this.authService.deleteUser$.pipe(map(() => true)),
+        this.authService.deleteUserResult$.pipe(map(() => false))
+    ).pipe(startWith(false));
 
     // See submit() for explanation.
     private currentUsername: string | null = null;
@@ -106,7 +116,7 @@ export class UserSettingsComponent implements OnInit {
     }
 
     public deleteAccount(): void {
-        // TODO: Implement!
+        this.authService.deleteUser$.next();
     }
 
     public submit(): void {

From 3d25b7d41d7e9cebb36d8bbff70de933175a3bc6 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 10:39:27 +0200
Subject: [PATCH 027/565] Rudimentary deletion backend

---
 backend/user/urls.py                                      | 8 +++++++-
 backend/user/views.py                                     | 6 +++++-
 frontend/src/app/user/register/register.component.ts      | 2 +-
 .../app/user/reset-password/reset-password.component.ts   | 2 +-
 .../src/app/user/verify-email/verify-email.component.ts   | 1 -
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/backend/user/urls.py b/backend/user/urls.py
index c26f551d..f2e17602 100644
--- a/backend/user/urls.py
+++ b/backend/user/urls.py
@@ -1,5 +1,5 @@
 from django.urls import include, path, re_path
-from .views import redirect_confirm, KeyInfoView
+from .views import DeleteUser, redirect_confirm, KeyInfoView
 from dj_rest_auth.registration.views import VerifyEmailView
 
 from .views import KeyInfoView, redirect_confirm, redirect_reset
@@ -23,6 +23,12 @@
         redirect_reset,
         name="password_reset_confirm",
     ),
+    # delete user
+    path(
+        "delete/",
+        DeleteUser.as_view(),
+        name="delete user"
+    ),
     # generic routes
     path("", include("dj_rest_auth.urls")),
     path("registration/", include("dj_rest_auth.registration.urls")),
diff --git a/backend/user/views.py b/backend/user/views.py
index e462d9e0..d028a3a2 100644
--- a/backend/user/views.py
+++ b/backend/user/views.py
@@ -1,5 +1,5 @@
 from allauth.account.models import EmailConfirmationHMAC
-from django.http import HttpResponseRedirect
+from django.http import HttpRequest, HttpResponseRedirect
 from rest_framework.exceptions import APIException
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
@@ -43,6 +43,10 @@ def post(self, request):
         except Exception as e:
             raise APIException(e)
 
+class DeleteUser(APIView):
+    def delete(self, request: HttpRequest):
+        user = request.user
+        user.delete()
 
 class UserViewSet(ModelViewSet):
     permission_classes = [IsAuthenticated]
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index abf1b118..59a87d36 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -8,7 +8,7 @@ import { filter, map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
 
 type RegisterForm = {
-    [key in keyof UserRegistration]: FormControl<string>;
+    [key in keyof UserRegistration]: FormControl<UserRegistration[key]>;
 }
 
 @Component({
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index d6fc428a..52055415 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -10,7 +10,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import _ from 'underscore';
 
 type ResetPasswordForm = {
-    [key in keyof ResetPassword]: FormControl<string>;
+    [key in keyof ResetPassword]: FormControl<ResetPassword[key]>;
 }
 
 @Component({
diff --git a/frontend/src/app/user/verify-email/verify-email.component.ts b/frontend/src/app/user/verify-email/verify-email.component.ts
index 4a3f321f..1d8db6bb 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.ts
@@ -6,7 +6,6 @@ import { catchError, filter, ignoreElements, map, merge, of, share, startWith, s
 import _ from 'underscore';
 
 
-
 @Component({
     selector: 'lc-verify-email',
     templateUrl: './verify-email.component.html',

From 38151a16e9586680d45776eda157b76bce74c84d Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 13:47:30 +0200
Subject: [PATCH 028/565] Added ESLint

---
 frontend/.eslintrc.json |  91 ++--
 frontend/angular.json   | 206 +++++----
 frontend/package.json   |  13 +-
 frontend/yarn.lock      | 980 ++++++++++++++++++++++++++++++++++++++--
 4 files changed, 1098 insertions(+), 192 deletions(-)

diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
index 9880384f..8b594cbb 100644
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -1,50 +1,47 @@
 {
-    "root": true,
-    "ignorePatterns": [
-      "projects/**/*"
-    ],
-    "overrides": [
-      {
-        "files": [
-          "*.ts"
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "lc",
+            "style": "camelCase"
+          }
         ],
-        "parserOptions": {
-          "project": [
-            "tsconfig.json"
-          ],
-          "createDefaultProgram": true
-        },
-        "extends": [
-          "plugin:@angular-eslint/recommended",
-          "plugin:@angular-eslint/template/process-inline-templates"
-        ],
-        "rules": {
-          "@angular-eslint/directive-selector": [
-            "error",
-            {
-              "type": "attribute",
-              "prefix": "lc",
-              "style": "camelCase"
-            }
-          ],
-          "@angular-eslint/component-selector": [
-            "error",
-            {
-              "type": "element",
-              "prefix": "lc",
-              "style": "kebab-case"
-            }
-          ]
-        }
-      },
-      {
-        "files": [
-          "*.html"
-        ],
-        "extends": [
-          "plugin:@angular-eslint/template/recommended"
-        ],
-        "rules": {}
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "lc",
+            "style": "kebab-case"
+          }
+        ]
       }
-    ]
-  }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended",
+        "plugin:@angular-eslint/template/accessibility"
+      ],
+      "rules": {}
+    }
+  ]
+}
diff --git a/frontend/angular.json b/frontend/angular.json
index 180d5b0f..facd5306 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -1,104 +1,116 @@
 {
-    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-    "version": 1,
-    "cli": {
-        "packageManager": "yarn",
-        "analytics": false
-    },
-    "newProjectRoot": "projects",
-    "projects": {
-        "lettercraft": {
-            "projectType": "application",
-            "schematics": {
-                "@schematics/angular:component": {
-                    "style": "scss"
-                }
-            },
-            "root": "",
-            "sourceRoot": "src",
-            "prefix": "lc",
-            "architect": {
-                "build": {
-                    "builder": "@angular-devkit/build-angular:browser",
-                    "options": {
-                        "outputPath": "dist",
-                        "index": "src/index.html",
-                        "main": "src/main.ts",
-                        "polyfills": [
-                            "zone.js"
-                        ],
-                        "tsConfig": "tsconfig.app.json",
-                        "inlineStyleLanguage": "scss",
-                        "assets": [
-                            "src/favicon.ico",
-                            "src/assets"
-                        ],
-                        "styles": [
-                            "src/styles.scss"
-                        ],
-                        "scripts": []
-                    },
-                    "configurations": {
-                        "production": {
-                            "budgets": [
-                                {
-                                    "type": "initial",
-                                    "maximumWarning": "500kb",
-                                    "maximumError": "1mb"
-                                },
-                                {
-                                    "type": "anyComponentStyle",
-                                    "maximumWarning": "2kb",
-                                    "maximumError": "4kb"
-                                }
-                            ],
-                            "outputHashing": "all",
-                            "outputPath": "dist"
-                        },
-                        "development": {
-                            "buildOptimizer": false,
-                            "optimization": false,
-                            "vendorChunk": true,
-                            "extractLicenses": false,
-                            "sourceMap": true,
-                            "namedChunks": true
-                        }
-                    },
-                    "defaultConfiguration": "production"
-                },
-                "serve": {
-                    "builder": "@angular-devkit/build-angular:dev-server",
-                    "configurations": {
-                        "production": {
-                            "browserTarget": "lettercraft:build:production"
-                        },
-                        "development": {
-                            "browserTarget": "lettercraft:build:development"
-                        }
-                    },
-                    "defaultConfiguration": "development"
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "cli": {
+    "packageManager": "yarn",
+    "analytics": false,
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ]
+  },
+  "newProjectRoot": "projects",
+  "projects": {
+    "lettercraft": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "lc",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
                 },
-                "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
-                    "options": {
-                        "polyfills": [
-                            "zone.js",
-                            "zone.js/testing"
-                        ],
-                        "tsConfig": "tsconfig.spec.json",
-                        "inlineStyleLanguage": "scss",
-                        "assets": [
-                            "src/favicon.ico",
-                            "src/assets"
-                        ],
-                        "styles": [
-                            "src/styles.scss"
-                        ],
-                        "scripts": [],
-                        "karmaConfig": "karma.conf.js"
-                    }
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
                 }
+              ],
+              "outputHashing": "all",
+              "outputPath": "dist"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "browserTarget": "lettercraft:build:production"
+            },
+            "development": {
+              "browserTarget": "lettercraft:build:development"
             }
+          },
+          "defaultConfiguration": "development"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing"
+            ],
+            "tsConfig": "tsconfig.spec.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": [],
+            "karmaConfig": "karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
+          }
         }
+      }
     }
+  }
 }
diff --git a/frontend/package.json b/frontend/package.json
index 13c7e603..521d8ce4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,7 +11,8 @@
     "serve:en": "ng serve --proxy-config ../proxy.conf.json --configuration=en",
     "stop": "lsof -t -i tcp:4200 | xargs kill -9 || echo \"not running\"",
     "pretest": "yarn prebuild",
-    "watch-test": "ng test --watch=true"
+    "watch-test": "ng test --watch=true",
+    "lint": "ng lint"
   },
   "private": true,
   "dependencies": {
@@ -39,11 +40,19 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^16.2.10",
+    "@angular-eslint/builder": "16.3.1",
+    "@angular-eslint/eslint-plugin": "16.3.1",
+    "@angular-eslint/eslint-plugin-template": "16.3.1",
+    "@angular-eslint/schematics": "16.3.1",
+    "@angular-eslint/template-parser": "16.3.1",
     "@angular/cli": "~16.2.10",
     "@angular/compiler-cli": "^16.2.12",
     "@angular/localize": "^16.2.12",
     "@types/jasmine": "~4.3.0",
     "@types/underscore": "^1.11.15",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
+    "eslint": "^8.51.0",
     "jasmine-core": "~4.5.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "~3.1.0",
@@ -52,4 +61,4 @@
     "karma-jasmine-html-reporter": "~2.0.0",
     "typescript": "~4.9.4"
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 28a3c4b1..eaeb815c 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -121,6 +121,68 @@
     ora "5.4.1"
     rxjs "7.8.1"
 
+"@angular-eslint/builder@16.3.1":
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-16.3.1.tgz#b9f62dff8f38d40f7293a14adf1cd3cdb65454e4"
+  integrity sha512-PmIOnRwqdOW1bvZtpTGBTDcOq/Czm3D+IPC/k90yIMs1VsAtcxqUmUtELje+ylJeb2LPeEZavekSnEpcatM4HQ==
+  dependencies:
+    "@nx/devkit" "16.5.1"
+    nx "16.5.1"
+
+"@angular-eslint/bundled-angular-compiler@16.3.1":
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.3.1.tgz#c4e9828020e26be17abb87197118a7faaa8a97c5"
+  integrity sha512-m4WP1xwS9XLcC/3n6lIcG5HZoai/5eb5W3xm48GVcv//0qE2p7S96RSgKPgGHvif5pF8O9xAqEWs3gDEG45+7A==
+
+"@angular-eslint/eslint-plugin-template@16.3.1":
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.3.1.tgz#021ccd4140bf9311ef9d46d5045859dc7c80020f"
+  integrity sha512-+RcFEWqNiRt3+5jXvmlIDlXtP9+vjdmgmVL6tt8yDbqdjBOewtyMu4pE4YaR4sFboyxgME9PbO2WrOyPXh6xjg==
+  dependencies:
+    "@angular-eslint/bundled-angular-compiler" "16.3.1"
+    "@angular-eslint/utils" "16.3.1"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
+    aria-query "5.3.0"
+    axobject-query "4.0.0"
+
+"@angular-eslint/eslint-plugin@16.3.1":
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-16.3.1.tgz#e2b3d9d891eed6a48c20803db0b0cd0edf8caf64"
+  integrity sha512-kSc8ESfoy8TUSthbq0Lpq9e17I+3Smy4rHoNpKCFEGuJgPs0+OssZMxB6a5EawGbv2EKTPEtrxzFm1WsLR0U9Q==
+  dependencies:
+    "@angular-eslint/utils" "16.3.1"
+    "@typescript-eslint/utils" "5.62.0"
+
+"@angular-eslint/schematics@16.3.1":
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-16.3.1.tgz#fb37bbca768d3275f4a399c8a0b05e62b4ea8224"
+  integrity sha512-cqrdobdtRY2XjLa6PhuGOQ7UhTRk2AvWS01sKeGjZ94nQJm5NUtEUyf6u3deIPYllW7gSAWjYzKUObKcTW/R+g==
+  dependencies:
+    "@angular-eslint/eslint-plugin" "16.3.1"
+    "@angular-eslint/eslint-plugin-template" "16.3.1"
+    "@nx/devkit" "16.5.1"
+    ignore "5.2.4"
+    nx "16.5.1"
+    strip-json-comments "3.1.1"
+    tmp "0.2.1"
+
+"@angular-eslint/template-parser@16.3.1":
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-16.3.1.tgz#f8ecd8b49aafe04264614694e9171015be1156b4"
+  integrity sha512-9+SxUtxB2iOnm0ldS2ow0stMxe02rB/TxeMIe8fxsLFHZdw8RQvs/p3HLvVHXzv6gUblMHebIb/ubUmwEVb2SA==
+  dependencies:
+    "@angular-eslint/bundled-angular-compiler" "16.3.1"
+    eslint-scope "^7.0.0"
+
+"@angular-eslint/utils@16.3.1":
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-16.3.1.tgz#92b36e7a3e4ca3993565f8fc4df0bcc4cc12ceeb"
+  integrity sha512-tEBcce0rG+DmcPO8jhRffUFDioGw3G4cUAE15XlRctY1J3QzOBH9HdUOTDt0mMjBgpWCzh0YVT1Moh2bPXU9Xg==
+  dependencies:
+    "@angular-eslint/bundled-angular-compiler" "16.3.1"
+    "@typescript-eslint/utils" "5.62.0"
+
 "@angular/animations@^16.2.12":
   version "16.2.12"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-16.2.12.tgz#27744d8176e09e70e0f6d837c3abcfcee843a936"
@@ -1572,6 +1634,38 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
+"@eslint-community/eslint-utils@^4.2.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
+
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+
 "@fortawesome/angular-fontawesome@^0.13":
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.13.0.tgz#3e343ff5ea62934cb0309a52bbf732adecf216fc"
@@ -1603,6 +1697,25 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -1715,7 +1828,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1791,6 +1904,90 @@
     read-package-json-fast "^3.0.0"
     which "^3.0.0"
 
+"@nrwl/devkit@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-16.5.1.tgz#43985cc1105e85afd8323586477c4a0d1b2eeee3"
+  integrity sha512-NB+DE/+AFJ7lKH/WBFyatJEhcZGj25F24ncDkwjZ6MzEiSOGOJS0LaV/R+VUsmS5EHTPXYOpn3zHWWAcJhyOmA==
+  dependencies:
+    "@nx/devkit" "16.5.1"
+
+"@nrwl/tao@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.5.1.tgz#e6e6b1ab73238497d4d9f014b30af18722e73503"
+  integrity sha512-x+gi/fKdM6uQNIti9exFlm3V5LBP3Y8vOEziO42HdOigyrXa0S0HD2WMpccmp6PclYKhwEDUjKJ39xh5sdh4Ig==
+  dependencies:
+    nx "16.5.1"
+
+"@nx/devkit@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-16.5.1.tgz#1d6a27895a7c85edebe0ba31e0a394839ad5fdd2"
+  integrity sha512-T1acZrVVmJw/sJ4PIGidCBYBiBqlg/jT9e8nIGXLSDS20xcLvfo4zBQf8UZLrmHglnwwpDpOWuVJCp2rYA5aDg==
+  dependencies:
+    "@nrwl/devkit" "16.5.1"
+    ejs "^3.1.7"
+    ignore "^5.0.4"
+    semver "7.5.3"
+    tmp "~0.2.1"
+    tslib "^2.3.0"
+
+"@nx/nx-darwin-arm64@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.1.tgz#87111664de492e5ae270ef2adc74553e03d77341"
+  integrity sha512-q98TFI4B/9N9PmKUr1jcbtD4yAFs1HfYd9jUXXTQOlfO9SbDjnrYJgZ4Fp9rMNfrBhgIQ4x1qx0AukZccKmH9Q==
+
+"@nx/nx-darwin-x64@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.1.tgz#05c34ce8f8f23eeae0529d3c1022ee3e95a608a1"
+  integrity sha512-j9HmL1l8k7EVJ3eOM5y8COF93gqrydpxCDoz23ZEtsY+JHY77VAiRQsmqBgEx9GGA2dXi9VEdS67B0+1vKariw==
+
+"@nx/nx-freebsd-x64@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.1.tgz#b4303ac5066f5c8ced7768097d6c85e8055c7d3a"
+  integrity sha512-CXSPT01aVS869tvCCF2tZ7LnCa8l41wJ3mTVtWBkjmRde68E5Up093hklRMyXb3kfiDYlfIKWGwrV4r0eH6x1A==
+
+"@nx/nx-linux-arm-gnueabihf@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.1.tgz#4dde9e8c79da9c5a213b6938dff74f65dd79c157"
+  integrity sha512-BhrumqJSZCWFfLFUKl4CAUwR0Y0G2H5EfFVGKivVecEQbb+INAek1aa6c89evg2/OvetQYsJ+51QknskwqvLsA==
+
+"@nx/nx-linux-arm64-gnu@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.1.tgz#43dcdbd9b39fa91923ab949d161aa25c650f56d9"
+  integrity sha512-x7MsSG0W+X43WVv7JhiSq2eKvH2suNKdlUHEG09Yt0vm3z0bhtym1UCMUg3IUAK7jy9hhLeDaFVFkC6zo+H/XQ==
+
+"@nx/nx-linux-arm64-musl@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.1.tgz#fc33960cecb0064c3dd3330f393e3a38be8a71b7"
+  integrity sha512-J+/v/mFjOm74I0PNtH5Ka+fDd+/dWbKhpcZ2R1/6b9agzZk+Ff/SrwJcSYFXXWKbPX+uQ4RcJoytT06Zs3s0ow==
+
+"@nx/nx-linux-x64-gnu@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz#2b2ffbb80e29455b6900ec20d4249055590dc58f"
+  integrity sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==
+
+"@nx/nx-linux-x64-musl@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz#955b2eae615ee6cf1954e24d42c205b1de8772bf"
+  integrity sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==
+
+"@nx/nx-win32-arm64-msvc@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.1.tgz#1dc4a7e3662eb757214c46d8db432f61e43a3dd9"
+  integrity sha512-qtqiLS9Y9TYyAbbpq58kRoOroko4ZXg5oWVqIWFHoxc5bGPweQSJCROEqd1AOl2ZDC6BxfuVHfhDDop1kK05WA==
+
+"@nx/nx-win32-x64-msvc@16.5.1":
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz#d2f4a1b2bf675bceb6fb16174b836438293f9dca"
+  integrity sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==
+
+"@parcel/watcher@2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
+  integrity sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==
+  dependencies:
+    node-addon-api "^3.2.1"
+    node-gyp-build "^4.3.0"
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -2011,6 +2208,11 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
+"@types/semver@^7.3.12":
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
+
 "@types/send@*":
   version "0.17.4"
   resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
@@ -2054,6 +2256,95 @@
   dependencies:
     "@types/node" "*"
 
+"@typescript-eslint/eslint-plugin@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+  dependencies:
+    "@eslint-community/regexpp" "^4.4.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
+    debug "^4.3.4"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/parser@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    debug "^4.3.4"
+
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+
+"@typescript-eslint/type-utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
+
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
+
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    eslint-visitor-keys "^3.3.0"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 "@vitejs/plugin-basic-ssl@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz#48c46eab21e0730921986ce742563ae83fe7fe34"
@@ -2200,11 +2491,26 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"@yarnpkg/lockfile@1.1.0":
+"@yarnpkg/lockfile@1.1.0", "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
+"@yarnpkg/parsers@3.0.0-rc.46":
+  version "3.0.0-rc.46"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz#03f8363111efc0ea670e53b0282cd3ef62de4e01"
+  integrity sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==
+  dependencies:
+    js-yaml "^3.10.0"
+    tslib "^2.4.0"
+
+"@zkochan/js-yaml@0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826"
+  integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==
+  dependencies:
+    argparse "^2.0.1"
+
 abab@^2.0.3, abab@^2.0.5, abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
@@ -2236,6 +2542,11 @@ acorn-import-assertions@^1.9.0:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
   integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
+acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
 acorn-walk@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
@@ -2251,6 +2562,11 @@ acorn@^8.2.4, acorn@^8.7.1, acorn@^8.8.2:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
   integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
+acorn@^8.9.0:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99"
@@ -2310,7 +2626,7 @@ ajv@8.12.0, ajv@^8.0.0, ajv@^8.9.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.12.5:
+ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2320,7 +2636,7 @@ ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ansi-colors@4.1.3:
+ansi-colors@4.1.3, ansi-colors@^4.1.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
@@ -2399,6 +2715,13 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+aria-query@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
+  dependencies:
+    dequal "^2.0.3"
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -2409,6 +2732,16 @@ array-flatten@^2.1.2:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+async@^3.2.3:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+  integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -2426,6 +2759,22 @@ autoprefixer@10.4.14:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+axios@^1.0.0:
+  version "1.6.8"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
+  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
+axobject-query@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.0.0.tgz#04a4c90dce33cc5d606c76d6216e3b250ff70dab"
+  integrity sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==
+  dependencies:
+    dequal "^2.0.3"
+
 babel-loader@9.1.3:
   version "9.1.3"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a"
@@ -2499,7 +2848,7 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bl@^4.1.0:
+bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -2711,7 +3060,7 @@ chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2754,13 +3103,18 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-cursor@^3.1.0:
+cli-cursor@3.1.0, cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
+cli-spinners@2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
+  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+
 cli-spinners@^2.5.0:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.1.tgz#9c0b9dad69a6d47cbb4333c14319b060ed395a35"
@@ -3003,7 +3357,7 @@ critters@0.0.20:
     postcss "^8.4.23"
     pretty-bytes "^5.3.0"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3090,7 +3444,7 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3109,6 +3463,11 @@ decimal.js@^10.2.1:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
+deep-is@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
 default-gateway@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
@@ -3157,6 +3516,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
+dequal@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
 destroy@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
@@ -3191,6 +3555,13 @@ dns-packet@^5.2.2:
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
 dom-serialize@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -3238,6 +3609,16 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.3"
 
+dotenv@~10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+
+duplexer@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
+
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -3248,6 +3629,13 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
+ejs@^3.1.7:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
+  integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==
+  dependencies:
+    jake "^10.8.5"
+
 electron-to-chromium@^1.4.535:
   version "1.4.579"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.579.tgz#40ddec29bb5549908e82ccd652cf5da2e5900c23"
@@ -3280,6 +3668,13 @@ encoding@^0.1.13:
   dependencies:
     iconv-lite "^0.6.2"
 
+end-of-stream@^1.4.1:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  dependencies:
+    once "^1.4.0"
+
 engine.io-parser@~5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz#9f213c77512ff1a6cc0c7a86108a7ffceb16fcfb"
@@ -3309,6 +3704,13 @@ enhanced-resolve@^5.15.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+enquirer@~2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
@@ -3424,6 +3826,11 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
@@ -3435,7 +3842,7 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-scope@5.1.1:
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3443,11 +3850,84 @@ eslint-scope@5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
+eslint-scope@^7.0.0, eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint@^8.51.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
+    doctrine "^3.0.0"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
+    text-table "^0.2.0"
+
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
+
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+esquery@^1.4.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -3460,7 +3940,7 @@ estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
@@ -3566,6 +4046,17 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-glob@3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-glob@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0"
@@ -3588,7 +4079,7 @@ fast-glob@3.3.1:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.2.11, fast-glob@^3.3.0:
+fast-glob@^3.2.11, fast-glob@^3.2.9, fast-glob@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -3604,6 +4095,11 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
+
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
@@ -3618,13 +4114,27 @@ faye-websocket@^0.11.3:
   dependencies:
     websocket-driver ">=0.5.1"
 
-figures@^3.0.0:
+figures@3.2.0, figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+filelist@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
+  dependencies:
+    minimatch "^5.0.1"
+
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -3674,6 +4184,14 @@ find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-up@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
@@ -3682,16 +4200,40 @@ find-up@^6.3.0:
     locate-path "^7.1.0"
     path-exists "^5.0.0"
 
+flat-cache@^3.0.4:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+  dependencies:
+    flatted "^3.2.9"
+    keyv "^4.5.3"
+    rimraf "^3.0.2"
+
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
 flatted@^3.2.7:
   version "3.2.9"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
   integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
 
+flatted@^3.2.9:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
+
 follow-redirects@^1.0.0:
   version "1.15.3"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
   integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
 
+follow-redirects@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
+  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+
 foreground-child@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
@@ -3709,6 +4251,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -3724,6 +4275,20 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-extra@^11.1.0:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -3818,7 +4383,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.1, glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -3830,6 +4395,18 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^10.2.2:
   version "10.3.10"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
@@ -3869,6 +4446,25 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^13.19.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
+  dependencies:
+    type-fest "^0.20.2"
+
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
 globby@^13.1.1:
   version "13.2.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
@@ -3892,6 +4488,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 guess-parser@0.4.22:
   version "0.4.22"
   resolved "https://registry.yarnpkg.com/guess-parser/-/guess-parser-0.4.22.tgz#c26ab9e21b69bbc761960c5a1511476ae85428eb"
@@ -4126,11 +4727,16 @@ ignore-walk@^6.0.0:
   dependencies:
     minimatch "^9.0.0"
 
-ignore@^5.2.4:
+ignore@5.2.4, ignore@^5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
+ignore@^5.0.4, ignore@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
@@ -4141,7 +4747,7 @@ immutable@^4.0.0:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f"
   integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
 
-import-fresh@^3.3.0:
+import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -4257,7 +4863,7 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -4279,6 +4885,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
@@ -4389,6 +5000,16 @@ jackspeak@^2.3.5:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jake@^10.8.5:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b"
+  integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==
+  dependencies:
+    async "^3.2.3"
+    chalk "^4.0.2"
+    filelist "^1.0.4"
+    minimatch "^3.1.2"
+
 jasmine-core@^4.1.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-4.6.0.tgz#6884fc3d5b66bf293e422751eed6d6da217c38f5"
@@ -4418,7 +5039,14 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
+js-yaml@4.1.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+js-yaml@^3.10.0, js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -4426,13 +5054,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsdom@^16.4.0:
   version "16.7.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
@@ -4476,6 +5097,11 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
@@ -4496,6 +5122,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
+
 json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
@@ -4513,6 +5144,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonparse@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -4586,6 +5226,13 @@ karma@~6.4.0:
     ua-parser-js "^0.7.30"
     yargs "^16.1.1"
 
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -4628,6 +5275,14 @@ less@4.1.3:
     needle "^3.1.0"
     source-map "~0.6.0"
 
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
 license-webpack-plugin@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz#1e18442ed20b754b82f1adeff42249b81d11aec6"
@@ -4640,6 +5295,11 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+lines-and-columns@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42"
+  integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==
+
 loader-runner@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -4666,6 +5326,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 locate-path@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
@@ -4678,6 +5345,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
 lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
@@ -4870,7 +5542,14 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@^3.0.4, minimatch@^3.1.1:
+minimatch@3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.5.tgz#4da8f1290ee0f0f8e83d60ca69f8f134068604a3"
+  integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -4891,7 +5570,7 @@ minimatch@^9.0.0, minimatch@^9.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -5029,6 +5708,16 @@ nanoid@^3.3.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
+
 needle@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/needle/-/needle-3.2.0.tgz#07d240ebcabfd65c76c03afae7f6defe6469df44"
@@ -5056,7 +5745,7 @@ nice-napi@^1.0.2:
     node-addon-api "^3.0.0"
     node-gyp-build "^4.2.2"
 
-node-addon-api@^3.0.0:
+node-addon-api@^3.0.0, node-addon-api@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
@@ -5071,6 +5760,11 @@ node-gyp-build@^4.2.2:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
   integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
 
+node-gyp-build@^4.3.0:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5"
+  integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==
+
 node-gyp@^9.0.0:
   version "9.4.1"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
@@ -5218,6 +5912,57 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
   integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
+nx@16.5.1:
+  version "16.5.1"
+  resolved "https://registry.yarnpkg.com/nx/-/nx-16.5.1.tgz#fc0d19090d8faae5f431f9fec199adf95881150c"
+  integrity sha512-I3hJRE4hG7JWAtncWwDEO3GVeGPpN0TtM8xH5ArZXyDuVeTth/i3TtJzdDzqXO1HHtIoAQN0xeq4n9cLuMil5g==
+  dependencies:
+    "@nrwl/tao" "16.5.1"
+    "@parcel/watcher" "2.0.4"
+    "@yarnpkg/lockfile" "^1.1.0"
+    "@yarnpkg/parsers" "3.0.0-rc.46"
+    "@zkochan/js-yaml" "0.0.6"
+    axios "^1.0.0"
+    chalk "^4.1.0"
+    cli-cursor "3.1.0"
+    cli-spinners "2.6.1"
+    cliui "^7.0.2"
+    dotenv "~10.0.0"
+    enquirer "~2.3.6"
+    fast-glob "3.2.7"
+    figures "3.2.0"
+    flat "^5.0.2"
+    fs-extra "^11.1.0"
+    glob "7.1.4"
+    ignore "^5.0.4"
+    js-yaml "4.1.0"
+    jsonc-parser "3.2.0"
+    lines-and-columns "~2.0.3"
+    minimatch "3.0.5"
+    npm-run-path "^4.0.1"
+    open "^8.4.0"
+    semver "7.5.3"
+    string-width "^4.2.3"
+    strong-log-transformer "^2.1.0"
+    tar-stream "~2.2.0"
+    tmp "~0.2.1"
+    tsconfig-paths "^4.1.2"
+    tslib "^2.3.0"
+    v8-compile-cache "2.3.0"
+    yargs "^17.6.2"
+    yargs-parser "21.1.1"
+  optionalDependencies:
+    "@nx/nx-darwin-arm64" "16.5.1"
+    "@nx/nx-darwin-x64" "16.5.1"
+    "@nx/nx-freebsd-x64" "16.5.1"
+    "@nx/nx-linux-arm-gnueabihf" "16.5.1"
+    "@nx/nx-linux-arm64-gnu" "16.5.1"
+    "@nx/nx-linux-arm64-musl" "16.5.1"
+    "@nx/nx-linux-x64-gnu" "16.5.1"
+    "@nx/nx-linux-x64-musl" "16.5.1"
+    "@nx/nx-win32-arm64-msvc" "16.5.1"
+    "@nx/nx-win32-x64-msvc" "16.5.1"
+
 object-assign@^4:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -5257,7 +6002,7 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0:
+once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
@@ -5271,7 +6016,7 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@8.4.2, open@^8.0.9:
+open@8.4.2, open@^8.0.9, open@^8.4.0:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
   integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
@@ -5280,6 +6025,18 @@ open@8.4.2, open@^8.0.9:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+optionator@^0.9.3:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.5"
+
 ora@5.4.1, ora@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
@@ -5307,6 +6064,13 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-limit@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
@@ -5321,6 +6085,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-locate@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
@@ -5567,6 +6338,11 @@ postcss@8.4.31, postcss@^8.2.14, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
 pretty-bytes@^5.3.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
@@ -5603,6 +6379,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -5703,7 +6484,7 @@ readable-stream@^2.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
+readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -5967,6 +6748,13 @@ selfsigned@^2.1.1:
     "@types/node-forge" "^1.3.0"
     node-forge "^1"
 
+semver@7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
@@ -5984,6 +6772,13 @@ semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
+semver@^7.3.7:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -6112,6 +6907,11 @@ sigstore@^1.3.0:
     "@sigstore/tuf" "^1.0.3"
     make-fetch-happen "^11.0.1"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slash@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
@@ -6341,11 +7141,30 @@ strip-ansi@^7.0.1:
   dependencies:
     ansi-regex "^6.0.1"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
+
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-json-comments@3.1.1, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+strong-log-transformer@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10"
+  integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==
+  dependencies:
+    duplexer "^0.1.1"
+    minimist "^1.2.0"
+    through "^2.3.4"
+
 supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -6387,6 +7206,17 @@ tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
+tar-stream@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 tar@^6.1.11, tar@^6.1.2:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
@@ -6439,12 +7269,12 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-text-table@0.2.0:
+text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-through@^2.3.6:
+through@^2.3.4, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -6454,6 +7284,13 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+tmp@0.2.1, tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -6461,12 +7298,10 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-tmp@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
+tmp@~0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
+  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
@@ -6507,16 +7342,37 @@ tree-kill@1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
+tsconfig-paths@^4.1.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
   integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==
 
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.1:
+tslib@^1.8.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.4.1:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
 tuf-js@^1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"
@@ -6526,6 +7382,18 @@ tuf-js@^1.1.7:
     debug "^4.3.4"
     make-fetch-happen "^11.1.1"
 
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
 type-fest@^0.21.3:
   version "0.21.3"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
@@ -6625,6 +7493,11 @@ universalify@^0.2.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
   integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
+universalify@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -6668,6 +7541,11 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+v8-compile-cache@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
 validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -6926,6 +7804,11 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -6989,17 +7872,17 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yargs-parser@21.1.1, yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
-  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
-
-yargs@17.7.2, yargs@^17.2.1:
+yargs@17.7.2, yargs@^17.2.1, yargs@^17.6.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -7025,6 +7908,11 @@ yargs@^16.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 yocto-queue@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"

From 685aa09b8e9c235525a942e9e9d5241a44efb086 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 13:48:39 +0200
Subject: [PATCH 029/565] Linting changes

---
 frontend/src/app/app.component.spec.ts           | 3 ---
 frontend/src/app/core/footer/footer.component.ts | 3 ---
 frontend/src/app/core/menu/menu.component.ts     | 2 --
 3 files changed, 8 deletions(-)

diff --git a/frontend/src/app/app.component.spec.ts b/frontend/src/app/app.component.spec.ts
index 2da638f5..e9aeb13f 100644
--- a/frontend/src/app/app.component.spec.ts
+++ b/frontend/src/app/app.component.spec.ts
@@ -1,7 +1,4 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 import { AppComponent } from './app.component';
 import { FooterComponent } from './core/footer/footer.component';
diff --git a/frontend/src/app/core/footer/footer.component.ts b/frontend/src/app/core/footer/footer.component.ts
index c70f5ac2..97c680b4 100644
--- a/frontend/src/app/core/footer/footer.component.ts
+++ b/frontend/src/app/core/footer/footer.component.ts
@@ -8,7 +8,4 @@ import { environment } from '@env';
 })
 export class FooterComponent {
     environment = environment;
-
-    constructor() { }
-
 }
diff --git a/frontend/src/app/core/menu/menu.component.ts b/frontend/src/app/core/menu/menu.component.ts
index 91615fa2..daa42b70 100644
--- a/frontend/src/app/core/menu/menu.component.ts
+++ b/frontend/src/app/core/menu/menu.component.ts
@@ -8,8 +8,6 @@ import { Component } from '@angular/core';
 export class MenuComponent {
     burgerActive = false;
 
-    constructor() { }
-
     toggleBurger() {
         this.burgerActive = !this.burgerActive;
     }

From 4d31818d0ec3a267ea49fd72884418b7d3f70498 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 14:51:10 +0200
Subject: [PATCH 030/565] Linting checks

---
 .../src/app/core/menu/user-menu/user-menu.component.spec.ts | 2 +-
 frontend/src/app/services/auth.service.ts                   | 3 +--
 frontend/src/app/user/login/login.component.ts              | 6 ++----
 frontend/src/mock/auth.service.mock.ts                      | 1 +
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
index feccdda8..c4916107 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
@@ -24,7 +24,7 @@ describe('UserMenuComponent', () => {
             declarations: [UserMenuComponent],
             imports: [SharedTestingModule],
         });
-        authService = TestBed.inject(AuthService) as any as AuthServiceMock;
+        authService = TestBed.inject(AuthService) as unknown as AuthServiceMock;
         fixture = TestBed.createComponent(UserMenuComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 7101ae58..790e0f33 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
-import { Router } from '@angular/router';
 import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom } from 'rxjs';
 import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
@@ -98,7 +97,7 @@ export class AuthService {
         switchMap(() => this.http.get<UserResponse>(
             this.authRoute('user/')
         ).pipe(
-            catchError(error => of(null)),
+            catchError(() => of(null)),
             map(parseUserData),
         )),
         share()
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 1179a32d..4b5c895f 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -1,10 +1,8 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
 import { AuthService } from '@services/auth.service';
 import { UserLogin } from '../models/user';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Observable, filter, map, merge, startWith } from 'rxjs';
+import { filter, map, merge, startWith } from 'rxjs';
 import { updateFormValidity } from '../utils';
 
 type LoginForm = {
diff --git a/frontend/src/mock/auth.service.mock.ts b/frontend/src/mock/auth.service.mock.ts
index 739b8ce2..29d398e9 100644
--- a/frontend/src/mock/auth.service.mock.ts
+++ b/frontend/src/mock/auth.service.mock.ts
@@ -19,6 +19,7 @@ export class AuthServiceMock {
         this.currentUser$.next(value);
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     login(username: string, password: string): Observable<User | null> {
         return of(testUser({ username }));
     }

From 0461b5dd7094a3401722777296ae12fbf4ad178a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 15:37:32 +0200
Subject: [PATCH 031/565] Toasts

---
 frontend/src/app/app.component.html           |  1 +
 frontend/src/app/core/core.module.ts          |  3 ++
 .../toast-container.component.html            | 11 ++++++
 .../toast-container.component.scss            |  7 ++++
 .../toast-container.component.spec.ts         | 21 +++++++++++
 .../toast-container.component.ts              | 11 ++++++
 frontend/src/app/services/auth.service.ts     |  4 +-
 .../src/app/services/toast.service.spec.ts    | 16 ++++++++
 frontend/src/app/services/toast.service.ts    | 37 +++++++++++++++++++
 frontend/src/main.ts                          |  2 +
 frontend/tsconfig.app.json                    |  4 +-
 frontend/tsconfig.spec.json                   |  3 +-
 12 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/app/core/toast-container/toast-container.component.html
 create mode 100644 frontend/src/app/core/toast-container/toast-container.component.scss
 create mode 100644 frontend/src/app/core/toast-container/toast-container.component.spec.ts
 create mode 100644 frontend/src/app/core/toast-container/toast-container.component.ts
 create mode 100644 frontend/src/app/services/toast.service.spec.ts
 create mode 100644 frontend/src/app/services/toast.service.ts

diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
index d4a76184..50154d29 100644
--- a/frontend/src/app/app.component.html
+++ b/frontend/src/app/app.component.html
@@ -1,5 +1,6 @@
 <div class="app">
     <lc-menu role="banner"></lc-menu>
+    <lc-toast-container aria-live="polite" aria-atomic="true" />
     <main class="main-content mt-5 mb-5">
         <div class="container">
             <router-outlet></router-outlet>
diff --git a/frontend/src/app/core/core.module.ts b/frontend/src/app/core/core.module.ts
index 0366cabc..a84236ba 100644
--- a/frontend/src/app/core/core.module.ts
+++ b/frontend/src/app/core/core.module.ts
@@ -3,6 +3,7 @@ import { SharedModule } from '../shared/shared.module';
 import { FooterComponent } from './footer/footer.component';
 import { MenuComponent } from './menu/menu.component';
 import { UserMenuComponent } from './menu/user-menu/user-menu.component';
+import { ToastContainerComponent } from './toast-container/toast-container.component';
 
 
 
@@ -11,6 +12,7 @@ import { UserMenuComponent } from './menu/user-menu/user-menu.component';
         FooterComponent,
         MenuComponent,
         UserMenuComponent,
+        ToastContainerComponent,
     ],
     imports: [
         SharedModule
@@ -18,6 +20,7 @@ import { UserMenuComponent } from './menu/user-menu/user-menu.component';
     exports: [
         FooterComponent,
         MenuComponent,
+        ToastContainerComponent
     ]
 })
 export class CoreModule { }
diff --git a/frontend/src/app/core/toast-container/toast-container.component.html b/frontend/src/app/core/toast-container/toast-container.component.html
new file mode 100644
index 00000000..12a606a4
--- /dev/null
+++ b/frontend/src/app/core/toast-container/toast-container.component.html
@@ -0,0 +1,11 @@
+<ngb-toast
+    *ngFor="let toast of toastService.toasts"
+    class="mb-2"
+    [class]="toast.className"
+    [header]="toast.header"
+    [autohide]="true"
+    [delay]="toast.delay || 5000"
+    (hidden)="toastService.remove(toast)"
+>
+    {{ toast.body }}
+</ngb-toast>
diff --git a/frontend/src/app/core/toast-container/toast-container.component.scss b/frontend/src/app/core/toast-container/toast-container.component.scss
new file mode 100644
index 00000000..1c14a073
--- /dev/null
+++ b/frontend/src/app/core/toast-container/toast-container.component.scss
@@ -0,0 +1,7 @@
+:host {
+    position: fixed;
+    top: 0;
+    right: 0;
+    margin: 0.5em;
+    z-index: 1200;
+  }
diff --git a/frontend/src/app/core/toast-container/toast-container.component.spec.ts b/frontend/src/app/core/toast-container/toast-container.component.spec.ts
new file mode 100644
index 00000000..fb73b016
--- /dev/null
+++ b/frontend/src/app/core/toast-container/toast-container.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ToastContainerComponent } from './toast-container.component';
+
+describe('ToastContainerComponent', () => {
+  let component: ToastContainerComponent;
+  let fixture: ComponentFixture<ToastContainerComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ToastContainerComponent]
+    });
+    fixture = TestBed.createComponent(ToastContainerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/core/toast-container/toast-container.component.ts b/frontend/src/app/core/toast-container/toast-container.component.ts
new file mode 100644
index 00000000..efe7cd72
--- /dev/null
+++ b/frontend/src/app/core/toast-container/toast-container.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { ToastService } from '@services/toast.service';
+
+@Component({
+  selector: 'lc-toast-container',
+  templateUrl: './toast-container.component.html',
+  styleUrls: ['./toast-container.component.scss']
+})
+export class ToastContainerComponent {
+    constructor(public toastService: ToastService) { }
+}
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 790e0f33..09641d3c 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
-import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom } from 'rxjs';
+import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay } from 'rxjs';
 import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
@@ -121,7 +121,7 @@ export class AuthService {
         this.updateSettingsUser$
     ).pipe(
         startWith(undefined),
-        share()
+        shareReplay(1)
     );
 
     public isAuthenticated$ = this.currentUser$.pipe(
diff --git a/frontend/src/app/services/toast.service.spec.ts b/frontend/src/app/services/toast.service.spec.ts
new file mode 100644
index 00000000..e0413db8
--- /dev/null
+++ b/frontend/src/app/services/toast.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ToastService } from './toast.service';
+
+describe('ToastService', () => {
+  let service: ToastService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ToastService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/services/toast.service.ts b/frontend/src/app/services/toast.service.ts
new file mode 100644
index 00000000..1fd385df
--- /dev/null
+++ b/frontend/src/app/services/toast.service.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+
+type ToastType = 'success' | 'info' | 'warning' | 'danger';
+
+interface Toast {
+    header: string;
+    body: string;
+    className: string;
+    delay?: number;
+}
+
+const TOAST_STYLES: Record<ToastType, string> = {
+    success: 'bg-success text-light',
+    info: 'bg-info text-dark',
+    warning: 'bg-warning text-dark',
+    danger: 'bg-danger text-light',
+};
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ToastService {
+    public toasts: Toast[] = [];
+
+    public show(header: string, body: string, type: ToastType = 'info', delay?: number) {
+        const className = TOAST_STYLES[type];
+        this.toasts.push({ header, body, delay, className });
+    }
+
+    public remove(toast: Toast): void {
+        this.toasts = this.toasts.filter(t => t !== toast);
+    }
+
+    public clear(): void {
+        this.toasts = [];
+    }
+}
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index c58dc05c..be6bfabe 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,3 +1,5 @@
+/// <reference types="@angular/localize" />
+
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index 374cc9d2..ec26f703 100644
--- a/frontend/tsconfig.app.json
+++ b/frontend/tsconfig.app.json
@@ -3,7 +3,9 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
-    "types": []
+    "types": [
+      "@angular/localize"
+    ]
   },
   "files": [
     "src/main.ts"
diff --git a/frontend/tsconfig.spec.json b/frontend/tsconfig.spec.json
index 18ce5c40..c63b6982 100644
--- a/frontend/tsconfig.spec.json
+++ b/frontend/tsconfig.spec.json
@@ -4,7 +4,8 @@
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [
-    "jasmine"
+      "jasmine",
+      "@angular/localize"
     ]
   },
   "include": [

From 64afba1b5b5f3a1e3c6980ee6a36539b556a45d1 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 20:41:21 +0200
Subject: [PATCH 032/565] Add toasters

---
 .../toast-container.component.html            |  4 +-
 .../toast-container.component.scss            |  2 +-
 frontend/src/app/services/auth.service.ts     | 14 ++--
 frontend/src/app/services/toast.service.ts    | 27 +++++++-
 .../src/app/user/login/login.component.html   | 17 ++---
 .../src/app/user/login/login.component.ts     | 38 +++++++---
 .../password-forgotten.component.html         |  6 --
 .../password-forgotten.component.ts           | 40 ++++++++---
 .../app/user/register/register.component.html |  5 --
 .../app/user/register/register.component.ts   | 15 ++--
 .../reset-password.component.html             |  6 --
 .../reset-password.component.ts               | 22 +++---
 .../user-settings.component.html              | 16 -----
 .../user-settings/user-settings.component.ts  | 55 +++++++++++----
 .../verify-email/verify-email.component.html  | 16 -----
 .../verify-email/verify-email.component.ts    | 69 +++++++++++++------
 16 files changed, 216 insertions(+), 136 deletions(-)

diff --git a/frontend/src/app/core/toast-container/toast-container.component.html b/frontend/src/app/core/toast-container/toast-container.component.html
index 12a606a4..2c65bb13 100644
--- a/frontend/src/app/core/toast-container/toast-container.component.html
+++ b/frontend/src/app/core/toast-container/toast-container.component.html
@@ -1,10 +1,10 @@
 <ngb-toast
     *ngFor="let toast of toastService.toasts"
-    class="mb-2"
+    class="mt-2"
     [class]="toast.className"
     [header]="toast.header"
     [autohide]="true"
-    [delay]="toast.delay || 5000"
+    [delay]="toast.delay"
     (hidden)="toastService.remove(toast)"
 >
     {{ toast.body }}
diff --git a/frontend/src/app/core/toast-container/toast-container.component.scss b/frontend/src/app/core/toast-container/toast-container.component.scss
index 1c14a073..42d1ad05 100644
--- a/frontend/src/app/core/toast-container/toast-container.component.scss
+++ b/frontend/src/app/core/toast-container/toast-container.component.scss
@@ -1,6 +1,6 @@
 :host {
     position: fixed;
-    top: 0;
+    bottom: 0;
     right: 0;
     margin: 0.5em;
     z-index: 1200;
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 09641d3c..5d77de13 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -63,6 +63,8 @@ export class AuthService {
         switchMap(key => this.http.post<AuthAPIResult>(
             this.authRoute('registration/verify-email/'),
             { key }
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error }))
         )),
         share()
     );
@@ -104,10 +106,10 @@ export class AuthService {
     );
 
     private updateSettingsUser$ = this.updateSettingsResult$
-    .pipe(
-        withLatestFrom(this.backendUser$),
-        map(([userData, currentUser]) => 'error' in userData ? currentUser : parseUserData(userData)),
-    );
+        .pipe(
+            withLatestFrom(this.backendUser$),
+            map(([userData, currentUser]) => 'error' in userData ? currentUser : parseUserData(userData)),
+        );
 
     public logout$ = new Subject<void>();
     public logoutResult$ = this.logout$.pipe(
@@ -137,10 +139,12 @@ export class AuthService {
         ).subscribe(() => this.logout$.next());
     }
 
-    public keyInfo$(key: string): Observable<KeyInfo> {
+    public keyInfo$(key: string): Observable<KeyInfo | AuthAPIError> {
         return this.http.post<KeyInfo>(
             this.authRoute('registration/key-info/'),
             { key }
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error }))
         );
     }
 
diff --git a/frontend/src/app/services/toast.service.ts b/frontend/src/app/services/toast.service.ts
index 1fd385df..333d5326 100644
--- a/frontend/src/app/services/toast.service.ts
+++ b/frontend/src/app/services/toast.service.ts
@@ -6,6 +6,13 @@ interface Toast {
     header: string;
     body: string;
     className: string;
+    delay: number;
+}
+
+interface ToastInput {
+    header?: string;
+    body: string;
+    type?: ToastType;
     delay?: number;
 }
 
@@ -16,15 +23,29 @@ const TOAST_STYLES: Record<ToastType, string> = {
     danger: 'bg-danger text-light',
 };
 
+const TOAST_DEFAULT_HEADERS: Record<ToastType, string> = {
+    success: 'Success',
+    info: 'Info',
+    warning: 'Warning',
+    danger: 'Error',
+};
+
 @Injectable({
   providedIn: 'root'
 })
 export class ToastService {
     public toasts: Toast[] = [];
 
-    public show(header: string, body: string, type: ToastType = 'info', delay?: number) {
-        const className = TOAST_STYLES[type];
-        this.toasts.push({ header, body, delay, className });
+    public show(toastInput: ToastInput): Toast {
+        const type = toastInput.type || 'info';
+        const toast: Toast = {
+            className: TOAST_STYLES[type],
+            header: toastInput.header || TOAST_DEFAULT_HEADERS[type],
+            body: toastInput.body,
+            delay: toastInput.delay || 5000,
+        }
+        this.toasts.push(toast);
+        return toast;
     }
 
     public remove(toast: Toast): void {
diff --git a/frontend/src/app/user/login/login.component.html b/frontend/src/app/user/login/login.component.html
index 020e4f97..5e6f4d63 100644
--- a/frontend/src/app/user/login/login.component.html
+++ b/frontend/src/app/user/login/login.component.html
@@ -13,8 +13,9 @@ <h2>Sign in</h2>
             class="form-control"
             [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
             [formControl]="form.controls.username">
-        <p *ngIf="form.controls.username.hasError('required')" class="invalid-feedback">Username is required.</p>
-        <p *ngIf="form.controls.username.hasError('invalid')" class="invalid-feedback">Invalid username.</p>
+        <p *ngFor="let error of usernameErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
     </div>
     <div class="mb-3">
         <label for="password" class="form-label">
@@ -26,9 +27,13 @@ <h2>Sign in</h2>
             class="form-control"
             [formControl]="form.controls.password"
             [class.is-invalid]="form.controls.password.touched && form.controls.password.invalid">
-        <p *ngIf="form.controls.password.hasError('required')" class="invalid-feedback">Password is required.</p>
-        <p *ngIf="form.controls.password.hasError('invalid')" class="invalid-feedback">Invalid password.</p>
+        <p *ngFor="let error of passwordErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
     </div>
+    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+        {{ error }}
+    </p>
     <div class="mb-3">
         <button type="submit" class="btn btn-primary mt-3">
             Sign in
@@ -36,10 +41,6 @@ <h2>Sign in</h2>
                 <span class="visually-hidden">Logging in...</span>
             </div>
         </button>
-
-    </div>
-    <div class="alert alert-danger" *ngIf="loginError$ | async" role="alert">
-        Failed to sign in.
     </div>
 </form>
 
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 4b5c895f..308fb433 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -1,9 +1,11 @@
-import { Component } from '@angular/core';
+import { Component, DestroyRef, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { AuthService } from '@services/auth.service';
 import { UserLogin } from '../models/user';
-import { filter, map, merge, startWith } from 'rxjs';
-import { updateFormValidity } from '../utils';
+import { map, merge, startWith } from 'rxjs';
+import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
+import { ToastService } from '@services/toast.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 type LoginForm = {
     [key in keyof UserLogin]: FormControl<string>;
@@ -14,7 +16,7 @@ type LoginForm = {
   templateUrl: './login.component.html',
   styleUrls: ['./login.component.scss']
 })
-export class LoginComponent {
+export class LoginComponent implements OnInit {
     public form = new FormGroup<LoginForm>({
         username: new FormControl<string>('', {
             nonNullable: true,
@@ -26,16 +28,36 @@ export class LoginComponent {
         }),
     });
 
-    public loginError$ = this.authService.loginResult$.pipe(
-        filter(response => 'error' in response),
-    );
+    public usernameErrors$ = controlErrorMessages$(this.form, 'username');
+    public passwordErrors$ = controlErrorMessages$(this.form, 'password');
+    public formErrors$ = formErrorMessages$(this.form);
 
     public loading$ = merge(
         this.authService.login$.pipe(map(() => true)),
         this.authService.loginResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
 
-    constructor(private authService: AuthService) { }
+    constructor(
+        private authService: AuthService,
+        private toastService: ToastService,
+        private destroyRef: DestroyRef,
+    ) { }
+
+    ngOnInit(): void {
+        this.authService.loginResult$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(result => {
+                if ('error' in result) {
+                    setErrors(result.error, this.form);
+                } else {
+                    this.toastService.show({
+                        header: 'Sign in successful',
+                        body: 'You have been successfully signed in.',
+                        type: 'success'
+                    })
+                }
+            })
+    }
 
     public submit(): void {
         this.form.markAllAsTouched();
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.html b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
index cc3ef63b..57e2c7ef 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.html
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
@@ -15,9 +15,3 @@ <h2>Forgotten your password?</h2>
         </div>
     </button>
 </form>
-
-<div *ngIf="success$ | async" class="alert alert-success" role="alert">
-    <h2 class="h6 alert-heading">Password reset request received</h2>
-    <p>Your request to reset your password has been received successfully.</p>
-    <p>If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.</p>
-</div>
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index a726dcc4..79ac3f18 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -1,9 +1,11 @@
-import { Component } from '@angular/core';
+import { Component, DestroyRef, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { controlErrorMessages$, updateFormValidity } from '../utils';
-import { filter, map, merge, startWith } from 'rxjs';
+import { map, merge, startWith } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { PasswordForgotten } from '../models/user';
+import { ToastService } from '@services/toast.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 type PasswordForgottenForm = {
     [key in keyof PasswordForgotten]: FormControl<string>;
@@ -14,7 +16,7 @@ type PasswordForgottenForm = {
   templateUrl: './password-forgotten.component.html',
   styleUrls: ['./password-forgotten.component.scss']
 })
-export class PasswordForgottenComponent {
+export class PasswordForgottenComponent implements OnInit {
     form = new FormGroup<PasswordForgottenForm>({
         email: new FormControl<string>('', {
             nonNullable: true,
@@ -24,16 +26,37 @@ export class PasswordForgottenComponent {
 
     public emailErrors$ = controlErrorMessages$(this.form, 'email');
 
-    public success$ = this.authService.passwordForgottenResult$.pipe(
-        filter(result => !('error' in result)),
-    );
-
     public loading$ = merge(
         this.authService.passwordForgotten$.pipe(map(() => true)),
         this.authService.passwordForgottenResult$.pipe(map(() => false))
     ).pipe(startWith(false));
 
-    constructor(private authService: AuthService) { }
+    constructor(
+        private authService: AuthService,
+        private toastService: ToastService,
+        private destroyRef: DestroyRef
+    ) { }
+
+    ngOnInit(): void {
+        this.authService.passwordForgotten$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(result => {
+                if ('error' in result) {
+                    this.toastService.show({
+                        header: 'Reset request failed',
+                        body: 'Request to send password reset email failed. Please try again.',
+                        type: 'danger'
+                    })
+                } else {
+                    this.toastService.show({
+                        header: 'Password reset request successful',
+                        body: 'If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.',
+                        type: 'success',
+                        delay: 10000
+                    })
+                }
+            });
+    }
 
     public submit(): void {
         this.form.markAllAsTouched();
@@ -43,5 +66,4 @@ export class PasswordForgottenComponent {
         }
         this.authService.passwordForgotten$.next(this.form.getRawValue())
     }
-
 }
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index aa83a7db..4c091f67 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -68,8 +68,3 @@ <h2>Register</h2>
     </button>
 </form>
 
-<div *ngIf="success$ | async" class="alert alert-success" role="alert">
-    <h2 class="h6 alert-heading">Registration successful</h2>
-    <p>Your account details have been registered successfully.</p>
-    <p>Please check your email inbox for a verification email and click the link.</p>
-</div>
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index 59a87d36..b487c480 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -4,8 +4,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { usernameValidators, passwordValidators, identicalPasswordsValidator } from '../validation';
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { filter, map, merge, startWith } from 'rxjs';
+import { map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
+import { ToastService } from '@services/toast.service';
 
 type RegisterForm = {
     [key in keyof UserRegistration]: FormControl<UserRegistration[key]>;
@@ -56,11 +57,6 @@ export class RegisterComponent implements OnInit {
     public password2Errors$ = controlErrorMessages$(this.form, 'password2', 'password');
     public formErrors$ = formErrorMessages$(this.form);
 
-    public success$ = this.authService.registrationResult$.pipe(
-        filter(result => !(result?.error)),
-        map(() => true),
-    );
-
     public loading$ = merge(
         this.authService.registration$.pipe(map(() => true)),
         this.authService.registrationResult$.pipe(map(() => false))
@@ -68,6 +64,7 @@ export class RegisterComponent implements OnInit {
 
     constructor(
         private authService: AuthService,
+        private toastService: ToastService,
         private destroyRef: DestroyRef,
     ) { }
 
@@ -79,6 +76,12 @@ export class RegisterComponent implements OnInit {
             .subscribe(result => {
                 if (result?.error) {
                     setErrors(result.error, this.form);
+                } else {
+                    this.toastService.show({
+                        header: 'Registration successful',
+                        body: 'You have been successfully registered. Please check your email for a confirmation link.',
+                        type: 'success',
+                    });
                 }
             });
     }
diff --git a/frontend/src/app/user/reset-password/reset-password.component.html b/frontend/src/app/user/reset-password/reset-password.component.html
index 8ca20248..11c7b2dc 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.html
+++ b/frontend/src/app/user/reset-password/reset-password.component.html
@@ -43,9 +43,3 @@ <h2>Reset password</h2>
         </div>
     </button>
 </form>
-
-<div *ngIf="success$ | async" class="alert alert-success" role="alert">
-    <h2 class="h6 alert-heading">Password reset successful</h2>
-    <p>Your password has been changed successfully.</p>
-    <a [routerLink]="['/login']">Click here to go back to the login form.</a>
-</div>
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index 52055415..1fbbe436 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -4,10 +4,11 @@ import { ResetPassword } from '../models/user';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { identicalPasswordsValidator, passwordValidators } from '../validation';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { combineLatest, filter, map, merge, startWith } from 'rxjs';
+import { combineLatest, map, merge, startWith } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import _ from 'underscore';
+import { ToastService } from '@services/toast.service';
 
 type ResetPasswordForm = {
     [key in keyof ResetPassword]: FormControl<ResetPassword[key]>;
@@ -24,8 +25,11 @@ export class ResetPasswordComponent implements OnInit {
 
     public form = new FormGroup<ResetPasswordForm>({
         uid: new FormControl<string>(this.uid, {
-            nonNullable: true }),
-        token: new FormControl<string>(this.token, { nonNullable: true }),
+            nonNullable: true
+        }),
+        token: new FormControl<string>(this.token, {
+            nonNullable: true
+        }),
         new_password1: new FormControl<string>('', {
             nonNullable: true,
             validators: [
@@ -54,11 +58,6 @@ export class ResetPasswordComponent implements OnInit {
         map(errorLists => _.flatten(errorLists, 1))
     );
 
-    public success$ = this.authService.resetPasswordResult$.pipe(
-        filter(result => !('error' in result)),
-        map(() => true)
-    );
-
     public loading$ = merge(
         this.authService.resetPassword$.pipe(map(() => true)),
         this.authService.resetPasswordResult$.pipe(map(() => false))
@@ -67,6 +66,7 @@ export class ResetPasswordComponent implements OnInit {
     constructor(
         private activatedRoute: ActivatedRoute,
         private authService: AuthService,
+        private toastService: ToastService,
         private destroyRef: DestroyRef
     ) { }
 
@@ -76,6 +76,12 @@ export class ResetPasswordComponent implements OnInit {
             .subscribe(result => {
                 if ('error' in result) {
                     setErrors(result.error, this.form);
+                } else {
+                    this.toastService.show({
+                        header: 'Password reset',
+                        body: 'Your password has been successfully reset.',
+                        type: 'success'
+                    })
                 }
             });
     }
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
index 04ad119c..103f130c 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.html
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -55,22 +55,6 @@ <h2>User settings</h2>
     </button>
 </form>
 
-<div *ngIf="updateSettingsSuccess$ | async" class="alert alert-success" role="alert">
-    <h2 class="h6 alert-heading">User settings updated</h2>
-    <p>Your user settings have been updated.</p>
-</div>
-
-<div *ngIf="deleteUserSuccess$ | async" class="alert alert-success" role="alert">
-    <h2 class="h6 alert-heading">User deleted</h2>
-    <p>User account deleted.</p>
-</div>
-
-<div *ngIf="requestResetSuccess$ | async" class="alert alert-success" role="alert">
-    <h2 class="h6 alert-heading">Password reset request received</h2>
-    <p>Your request to reset your password has been received successfully.</p>
-    <p>Please check your mailbox for a link to a page where you may reset your password.</p>
-</div>
-
 <div>
     <p>Click here to request a new password</p>
     <button class="btn btn-primary" (click)="requestPasswordReset()">
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index 08b606f3..65e46ec7 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -5,6 +5,7 @@ import { UserSettings } from '../models/user';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { filter, map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
+import { ToastService } from '@services/toast.service';
 
 type UserSettingsForm = { [key in keyof UserSettings]: FormControl<UserSettings[key]> };
 
@@ -50,31 +51,16 @@ export class UserSettingsComponent implements OnInit {
     public lastNameErrors$ = controlErrorMessages$(this.form, 'lastName');
     public formErrors$ = formErrorMessages$(this.form);
 
-    public updateSettingsSuccess$ = this.authService.updateSettingsResult$.pipe(
-        filter(result => !('error' in result)),
-        map(() => true),
-    );
-
     public updateSettingsLoading$ = merge(
         this.authService.updateSettings$.pipe(map(() => true)),
         this.authService.updateSettingsResult$.pipe(map(() => false))
     ).pipe(startWith(false))
 
-    public requestResetSuccess$ = this.authService.passwordForgottenResult$.pipe(
-        filter(result => !('error' in result)),
-        map(() => true),
-    );
-
     public requestResetLoading$ = merge(
         this.authService.passwordForgotten$.pipe(map(() => true)),
         this.authService.passwordForgottenResult$.pipe(map(() => false))
     ).pipe(startWith(false));
 
-    public deleteUserSuccess$ = this.authService.deleteUserResult$.pipe(
-        filter(result => !('error' in result)),
-        map(() => true)
-    );
-
     public deleteUserLoading$ = merge(
         this.authService.deleteUser$.pipe(map(() => true)),
         this.authService.deleteUserResult$.pipe(map(() => false))
@@ -85,6 +71,7 @@ export class UserSettingsComponent implements OnInit {
 
     constructor(
         private authService: AuthService,
+        private toastService: ToastService,
         private destroyRef: DestroyRef
     ) { }
 
@@ -101,12 +88,50 @@ export class UserSettingsComponent implements OnInit {
                 this.currentUsername = user.username;
             });
 
+        this.authService.passwordForgottenResult$
+            .pipe(
+                takeUntilDestroyed(this.destroyRef)
+            ).subscribe(result => {
+                if (!('error' in result)) {
+                    this.toastService.show({
+                        header: 'Password reset email sent',
+                        body: 'An email has been sent to you with instructions on how to reset your password.',
+                        type: 'success'
+                    });
+                }
+            });
+
+        this.authService.deleteUserResult$
+            .pipe(
+                takeUntilDestroyed(this.destroyRef)
+            ).subscribe(result => {
+                if ('error' in result) {
+                    this.toastService.show({
+                        header: 'Error deleting account',
+                        body: 'An error occurred while deleting your account. Please try again later.',
+                        type: 'danger'
+                    });
+                } else {
+                    this.toastService.show({
+                        header: 'Account deleted',
+                        body: 'Your account has been successfully deleted.',
+                        type: 'success'
+                    });
+                }
+            });
+
         this.authService.updateSettingsResult$
             .pipe(
                 takeUntilDestroyed(this.destroyRef)
         ).subscribe(result => {
             if ('error' in result) {
                 setErrors(result.error, this.form);
+            } else {
+                this.toastService.show({
+                    header: 'Settings updated',
+                    body: 'Your settings have been successfully updated.',
+                    type: 'success'
+                });
             }
         });
     }
diff --git a/frontend/src/app/user/verify-email/verify-email.component.html b/frontend/src/app/user/verify-email/verify-email.component.html
index dc4b268d..48588932 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.html
+++ b/frontend/src/app/user/verify-email/verify-email.component.html
@@ -14,19 +14,3 @@ <h1>Confirm e-mail address</h1>
         </div>
     </button>
 </div>
-
-<div *ngIf="error$ | async as error" class="alert alert-danger" role="alert">
-    <h2 class="h6 alert-heading">Error</h2>
-    {{error.error}}
-</div>
-
-<div *ngIf="success$ | async" class="alert alert-success" role="alert">
-    <h2 class="h6 alert-heading">E-mail confirmed</h2>
-    Your email address has been verified!
-    <a *ngIf="directToLogin$ | async; else homeLink" [routerLink]="['/login']" class="alert-link">
-        Sign in
-    </a>
-    <ng-template #homeLink>
-        <a [routerLink]="['/']" class="alert-link">Return to home page</a>
-    </ng-template>
-</div>
diff --git a/frontend/src/app/user/verify-email/verify-email.component.ts b/frontend/src/app/user/verify-email/verify-email.component.ts
index 1d8db6bb..f33bcd1d 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.ts
@@ -1,9 +1,9 @@
-import { HttpErrorResponse } from '@angular/common/http';
-import { Component } from '@angular/core';
+import { Component, DestroyRef, OnInit } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
 import { AuthService } from '@services/auth.service';
-import { catchError, filter, ignoreElements, map, merge, of, share, startWith, switchMap, take } from 'rxjs';
-import _ from 'underscore';
+import { ToastService } from '@services/toast.service';
+import { map, merge, share, startWith } from 'rxjs';
 
 
 @Component({
@@ -11,21 +11,18 @@ import _ from 'underscore';
     templateUrl: './verify-email.component.html',
     styleUrls: ['./verify-email.component.scss']
 })
-export class VerifyEmailComponent {
+export class VerifyEmailComponent implements OnInit {
     private key = this.activatedRoute.snapshot.params['key'];
 
-    public userDetails$ = this.authService.keyInfo$(this.key).pipe(share())
+    private keyInfo$ = this.authService.keyInfo$(this.key);
 
-    public error$ = merge(
-        this.userDetails$.pipe(ignoreElements()),
-        this.authService.verifyEmailResult$.pipe(ignoreElements()),
-    ).pipe(
-        catchError((e: HttpErrorResponse) => of(e))
+    private keyInfoError$ = this.keyInfo$.pipe(
+        map(results => 'error' in results ? results : null),
     );
 
-    public success$ = this.authService.verifyEmailResult$.pipe(
-        map(() => true),
-        catchError(() => of(false)),
+    public userDetails$ = this.keyInfo$.pipe(
+        map(results => 'error' in results ? null : results),
+        share()
     );
 
     public loading$ = merge(
@@ -33,19 +30,47 @@ export class VerifyEmailComponent {
         this.authService.verifyEmailResult$.pipe(map(() => false))
     ).pipe(startWith(false));
 
-    public directToLogin$ = this.success$.pipe(
-        switchMap(() => this.authService.isAuthenticated$.pipe(
-            filter(_.negate(_.isUndefined)),
-            take(1))
-        )
-    );
-
     constructor(
         private activatedRoute: ActivatedRoute,
         private authService: AuthService,
+        private toastService: ToastService,
+        private destroyRef: DestroyRef
     ) { }
 
-    public confirm() {
+    ngOnInit(): void {
+        this.keyInfoError$.pipe(
+            takeUntilDestroyed(this.destroyRef)
+        ).subscribe(result => {
+            if (!result) {
+                return;
+            }
+            this.toastService.show({
+                header: 'Email address verification failed.',
+                body: 'Failed to verify email address.',
+                type: 'danger'
+            });
+        });
+
+        this.authService.verifyEmailResult$.pipe(
+            takeUntilDestroyed(this.destroyRef)
+        ).subscribe(result => {
+            if ('error' in result) {
+                this.toastService.show({
+                    header: 'Email verification failed',
+                    body: 'Failed to verify email address.',
+                    type: 'danger',
+                })
+            } else {
+                this.toastService.show({
+                    header: 'Email verified',
+                    body: 'Email address has been verified.',
+                    type: 'success',
+                });
+            }
+        });
+    }
+
+    public confirm(): void {
         this.authService.verifyEmail$.next(this.key);
     }
 }

From 214a3d88d13cb4dab6a66f159ccabf9e2030b936 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 20:52:09 +0200
Subject: [PATCH 033/565] Simplify keyInfo calls

---
 frontend/src/app/services/auth.service.ts     | 23 +++++++++++--------
 .../verify-email/verify-email.component.ts    | 14 ++++++-----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 5d77de13..d56bb0c2 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
-import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay } from 'rxjs';
+import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay, tap } from 'rxjs';
 import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
@@ -39,6 +39,17 @@ export class AuthService {
         share()
     );
 
+    public keyInfo$ = new Subject<string>();
+    public keyInfoResult$ = this.keyInfo$.pipe(
+        switchMap(key => this.http.post<KeyInfo>(
+            this.authRoute('registration/key-info/'),
+            { key }
+        ).pipe(
+            catchError(error => of<AuthAPIError>({ error: error.error })),
+        )),
+        share()
+    );
+
     public passwordForgotten$ = new Subject<PasswordForgotten>();
     public passwordForgottenResult$ = this.passwordForgotten$.pipe(
         switchMap(form => this.http.post<AuthAPIResult>(
@@ -46,6 +57,7 @@ export class AuthService {
         ).pipe(
             catchError(error => of<AuthAPIError>({ error: error.error }))
         )),
+        share()
     );
 
     public resetPassword$ = new Subject<ResetPassword>();
@@ -139,14 +151,7 @@ export class AuthService {
         ).subscribe(() => this.logout$.next());
     }
 
-    public keyInfo$(key: string): Observable<KeyInfo | AuthAPIError> {
-        return this.http.post<KeyInfo>(
-            this.authRoute('registration/key-info/'),
-            { key }
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error }))
-        );
-    }
+
 
     private authRoute(route: string): string {
         return `/users/${route}`;
diff --git a/frontend/src/app/user/verify-email/verify-email.component.ts b/frontend/src/app/user/verify-email/verify-email.component.ts
index f33bcd1d..2f284771 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
+import { AfterViewInit, Component, DestroyRef, OnInit } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute } from '@angular/router';
 import { AuthService } from '@services/auth.service';
@@ -11,16 +11,14 @@ import { map, merge, share, startWith } from 'rxjs';
     templateUrl: './verify-email.component.html',
     styleUrls: ['./verify-email.component.scss']
 })
-export class VerifyEmailComponent implements OnInit {
+export class VerifyEmailComponent implements OnInit, AfterViewInit {
     private key = this.activatedRoute.snapshot.params['key'];
 
-    private keyInfo$ = this.authService.keyInfo$(this.key);
-
-    private keyInfoError$ = this.keyInfo$.pipe(
+    private keyInfoError$ = this.authService.keyInfoResult$.pipe(
         map(results => 'error' in results ? results : null),
     );
 
-    public userDetails$ = this.keyInfo$.pipe(
+    public userDetails$ = this.authService.keyInfoResult$.pipe(
         map(results => 'error' in results ? null : results),
         share()
     );
@@ -70,6 +68,10 @@ export class VerifyEmailComponent implements OnInit {
         });
     }
 
+    ngAfterViewInit(): void {
+        this.authService.keyInfo$.next(this.key);
+    }
+
     public confirm(): void {
         this.authService.verifyEmail$.next(this.key);
     }

From 6ab145addee0bd1fa64d19007b0a3a85e9c109e0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 22:39:29 +0200
Subject: [PATCH 034/565] Add throttleTime

---
 frontend/src/app/app.component.ts             | 36 +++++++++++++++++--
 .../menu/user-menu/user-menu.component.html   | 10 ++++--
 .../menu/user-menu/user-menu.component.ts     |  6 ++--
 frontend/src/app/services/auth.service.ts     | 26 +++++++++-----
 .../src/app/user/login/login.component.ts     |  9 +++--
 .../app/user/register/register.component.ts   |  3 ++
 6 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index f7a00a31..fd42b673 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,15 +1,45 @@
-import { AfterViewInit, Component } from '@angular/core';
+import { AfterViewInit, Component, DestroyRef, OnInit } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Router } from '@angular/router';
 import { AuthService } from '@services/auth.service';
+import { ToastService } from '@services/toast.service';
+import { take } from 'underscore';
 
 @Component({
   selector: 'lc-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
-export class AppComponent implements AfterViewInit {
+export class AppComponent implements OnInit, AfterViewInit {
     title = 'lettercraft';
 
-    constructor(private authService: AuthService) { }
+    constructor(
+        private authService: AuthService,
+        private router: Router,
+        private toastService: ToastService,
+        private destroyRef: DestroyRef,
+    ) { }
+
+    ngOnInit(): void {
+        this.authService.logoutResult$.pipe(
+            takeUntilDestroyed(this.destroyRef)
+        ).subscribe(result => {
+            if ('error' in result) {
+                this.toastService.show({
+                    header: 'Sign out failed',
+                    body: 'There was an error signing you out. Please try again.',
+                    type: 'danger'
+                });
+            } else {
+                this.toastService.show({
+                    header: 'Sign out successful',
+                    body: 'You have been successfully signed out.',
+                    type: 'success'
+                });
+                this.router.navigate(['/']);
+            }
+        })
+    }
 
     ngAfterViewInit(): void {
         // We subscribe to user info in our template, so we should only call this after the view has been initialized.
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index d3fef9bd..6c8fe5cc 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -16,9 +16,6 @@
                 <a *ngIf="user.isStaff" ngbDropdownItem href="/admin/">Administration</a>
                 <button ngbDropdownItem (click)="logout()">
                     Sign out
-                    <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
-                        <span class="visually-hidden">Signing out...</span>
-                    </div>
                 </button>
             </div>
         </li>
@@ -35,5 +32,12 @@
             </a>
         </li>
     </ng-container>
+    <ng-container *ngIf="loading$ | async">
+        <li class="d-flex align-items-center">
+            <div class="spinner-border spinner-border-sm text-light" role="status">
+                <span class="visually-hidden">Signing out...</span>
+            </div>
+        </li>
+    </ng-container>
 </ul>
 
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index 06c14233..db02e0b0 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { map, merge, startWith } from 'rxjs';
+import { map, merge, startWith, tap } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 
@@ -27,11 +27,11 @@ export class UserMenuComponent {
     public loading$ = merge(
         this.authService.logout$.pipe(map(() => true)),
         this.authService.logoutResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    ).pipe(startWith(false), tap(console.log));
 
     constructor(public authService: AuthService) { }
 
-    logout(): void {
+    public logout(): void {
         this.authService.logout$.next();
     }
 
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index d56bb0c2..dc822e57 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
-import { Observable, Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay, tap } from 'rxjs';
+import { Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay, throttleTime, debounceTime } from 'rxjs';
 import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
@@ -21,6 +21,7 @@ interface AuthAPIError {
 export class AuthService {
     public login$ = new Subject<UserLogin>();
     public loginResult$ = this.login$.pipe(
+        throttleTime(500),
         switchMap(loginForm => this.http.post<AuthAPIResult>(
             this.authRoute('login/'), loginForm
         ).pipe(
@@ -31,6 +32,7 @@ export class AuthService {
 
     public registration$ = new Subject<UserRegistration>();
     public registrationResult$ = this.registration$.pipe(
+        throttleTime(500),
         switchMap(registrationForm => this.http.post<void>(
             this.authRoute('registration/'), registrationForm
         ).pipe(
@@ -41,6 +43,7 @@ export class AuthService {
 
     public keyInfo$ = new Subject<string>();
     public keyInfoResult$ = this.keyInfo$.pipe(
+        throttleTime(500),
         switchMap(key => this.http.post<KeyInfo>(
             this.authRoute('registration/key-info/'),
             { key }
@@ -52,6 +55,7 @@ export class AuthService {
 
     public passwordForgotten$ = new Subject<PasswordForgotten>();
     public passwordForgottenResult$ = this.passwordForgotten$.pipe(
+        throttleTime(500),
         switchMap(form => this.http.post<AuthAPIResult>(
             this.authRoute('password/reset/'), form
         ).pipe(
@@ -62,6 +66,7 @@ export class AuthService {
 
     public resetPassword$ = new Subject<ResetPassword>();
     public resetPasswordResult$ = this.resetPassword$.pipe(
+        throttleTime(500),
         switchMap(form => this.http.post<AuthAPIResult>(
             this.authRoute('password/reset/confirm/'), form
         ).pipe(
@@ -72,6 +77,7 @@ export class AuthService {
 
     public verifyEmail$ = new Subject<string>();
     public verifyEmailResult$ = this.verifyEmail$.pipe(
+        throttleTime(500),
         switchMap(key => this.http.post<AuthAPIResult>(
             this.authRoute('registration/verify-email/'),
             { key }
@@ -83,6 +89,7 @@ export class AuthService {
 
     public updateSettings$ = new Subject<UserSettings>();
     public updateSettingsResult$ = this.updateSettings$.pipe(
+        throttleTime(500),
         switchMap(update => this.http.patch<UserResponse>(
             this.authRoute('user/'),
             encodeUserData(update)
@@ -94,6 +101,7 @@ export class AuthService {
 
     public deleteUser$ = new Subject<void>();
     public deleteUserResult$ = this.deleteUser$.pipe(
+        throttleTime(500),
         switchMap(() => this.http.delete<AuthAPIResult>(
             this.authRoute('delete/')
         ).pipe(
@@ -102,6 +110,14 @@ export class AuthService {
         share()
     );
 
+    public logout$ = new Subject<void>();
+    public logoutResult$ = this.logout$.pipe(
+        throttleTime(500),
+        switchMap(() => this.http.post<AuthAPIResult>(this.authRoute('logout/'), {})),
+        share()
+    );
+
+
     public initialAuth$ = new Subject<void>();
 
     public backendUser$ = merge(
@@ -123,12 +139,6 @@ export class AuthService {
             map(([userData, currentUser]) => 'error' in userData ? currentUser : parseUserData(userData)),
         );
 
-    public logout$ = new Subject<void>();
-    public logoutResult$ = this.logout$.pipe(
-        switchMap(() => this.http.post<AuthAPIResult>(this.authRoute('logout/'), {})),
-        share()
-    );
-
     public currentUser$ = merge(
         this.logoutResult$.pipe(map(() => null)),
         this.backendUser$,
@@ -151,8 +161,6 @@ export class AuthService {
         ).subscribe(() => this.logout$.next());
     }
 
-
-
     private authRoute(route: string): string {
         return `/users/${route}`;
     }
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 308fb433..88b7685f 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -6,6 +6,7 @@ import { map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
 import { ToastService } from '@services/toast.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Router } from '@angular/router';
 
 type LoginForm = {
     [key in keyof UserLogin]: FormControl<string>;
@@ -18,11 +19,11 @@ type LoginForm = {
 })
 export class LoginComponent implements OnInit {
     public form = new FormGroup<LoginForm>({
-        username: new FormControl<string>('', {
+        username: new FormControl<string>('baltus', {
             nonNullable: true,
             validators: [Validators.required]
         }),
-        password: new FormControl<string>('', {
+        password: new FormControl<string>('knerbonius', {
             nonNullable: true,
             validators: [Validators.required]
         }),
@@ -41,6 +42,7 @@ export class LoginComponent implements OnInit {
         private authService: AuthService,
         private toastService: ToastService,
         private destroyRef: DestroyRef,
+        private router: Router,
     ) { }
 
     ngOnInit(): void {
@@ -54,7 +56,8 @@ export class LoginComponent implements OnInit {
                         header: 'Sign in successful',
                         body: 'You have been successfully signed in.',
                         type: 'success'
-                    })
+                    });
+                    this.router.navigate(['/']);
                 }
             })
     }
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index b487c480..e5a65207 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -7,6 +7,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { map, merge, startWith } from 'rxjs';
 import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
 import { ToastService } from '@services/toast.service';
+import { Router } from '@angular/router';
 
 type RegisterForm = {
     [key in keyof UserRegistration]: FormControl<UserRegistration[key]>;
@@ -66,6 +67,7 @@ export class RegisterComponent implements OnInit {
         private authService: AuthService,
         private toastService: ToastService,
         private destroyRef: DestroyRef,
+        private router: Router,
     ) { }
 
     ngOnInit(): void {
@@ -82,6 +84,7 @@ export class RegisterComponent implements OnInit {
                         body: 'You have been successfully registered. Please check your email for a confirmation link.',
                         type: 'success',
                     });
+                    this.router.navigate(['/']);
                 }
             });
     }

From 35edac006944ae756a9804e5d3bb773d1c043afc Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 4 May 2024 23:26:26 +0200
Subject: [PATCH 035/565] Styling changes

---
 .../menu/user-menu/user-menu.component.ts     |  2 +-
 frontend/src/app/services/auth.service.ts     |  1 -
 .../password-forgotten.component.ts           |  2 +-
 .../app/user/register/register.component.html |  6 +--
 .../user-settings.component.html              | 50 ++++++++-----------
 .../user-settings.component.scss              |  3 ++
 .../user-settings/user-settings.component.ts  |  8 ---
 7 files changed, 29 insertions(+), 43 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index db02e0b0..34469b3d 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -27,7 +27,7 @@ export class UserMenuComponent {
     public loading$ = merge(
         this.authService.logout$.pipe(map(() => true)),
         this.authService.logoutResult$.pipe(map(() => false)),
-    ).pipe(startWith(false), tap(console.log));
+    ).pipe(startWith(false));
 
     constructor(public authService: AuthService) { }
 
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index dc822e57..6b692e6f 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -117,7 +117,6 @@ export class AuthService {
         share()
     );
 
-
     public initialAuth$ = new Subject<void>();
 
     public backendUser$ = merge(
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index 79ac3f18..08257b3e 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -38,7 +38,7 @@ export class PasswordForgottenComponent implements OnInit {
     ) { }
 
     ngOnInit(): void {
-        this.authService.passwordForgotten$
+        this.authService.passwordForgottenResult$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe(result => {
                 if ('error' in result) {
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index 4c091f67..5b0043c4 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -5,7 +5,7 @@ <h2>Register</h2>
 <p>Already have an account? <a routerLink="/login">Sign in</a></p>
 
 <form [formGroup]="form" (ngSubmit)="submit()">
-    <div>
+    <div class="mb-2">
         <label for="username" class="form-label">
             Username
         </label>
@@ -20,7 +20,7 @@ <h2>Register</h2>
             {{ error }}
         </p>
     </div>
-    <div>
+    <div class="mb-2">
         <label for="email" class="form-label">Email</label>
         <input
             type="email"
@@ -32,7 +32,7 @@ <h2>Register</h2>
             {{ error }}
         </p>
     </div>
-    <div>
+    <div class="mb-2">
         <label for="password1" class="form-label">Password</label>
         <input
             type="password"
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
index 103f130c..31bd9fc1 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.html
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -26,9 +26,6 @@ <h2>User settings</h2>
             class="form-control"
             [class.is-invalid]="form.controls.firstName.touched && form.controls.firstName.invalid"
             [formControl]="form.controls.firstName">
-        <p *ngFor="let error of firstNameErrors$ | async" class="invalid-feedback">
-            {{ error }}
-        </p>
     </div>
     <div>
         <label for="last-name" class="form-label">
@@ -40,34 +37,29 @@ <h2>User settings</h2>
             class="form-control"
             [class.is-invalid]="form.controls.lastName.touched && form.controls.lastName.invalid"
             [formControl]="form.controls.lastName">
-        <p *ngFor="let error of lastNameErrors$ | async" class="invalid-feedback">
-            {{ error }}
-        </p>
     </div>
     <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
         {{ error }}
     </p>
-    <button type="submit" class="btn btn-primary my-3">
-        Save changes
-        <div *ngIf="updateSettingsLoading$ | async" class="spinner-border spinner-border-sm" role="status">
-            <span class="visually-hidden">Requesting password reset link...</span>
-        </div>
-    </button>
-</form>
-
-<div>
-    <p>Click here to request a new password</p>
-    <button class="btn btn-primary" (click)="requestPasswordReset()">
-        Request new password
-        <div *ngIf="requestResetLoading$ | async" class="spinner-border spinner-border-sm" role="status">
-            <span class="visually-hidden">Requesting password reset link...</span>
-        </div>
-    </button>
-</div>
 
-<div>
-    <p>Click here to delete your account.</p>
-    <button class="btn btn-danger" (click)="deleteAccount()">
-        Delete account
-    </button>
-</div>
+    <div class="d-flex flex-wrap justify-content-start align-items-center button-row mt-3">
+        <button type="submit" class="btn btn-primary">
+            Save changes
+            <div *ngIf="updateSettingsLoading$ | async" class="spinner-border spinner-border-sm" role="status">
+                <span class="visually-hidden">Requesting password reset link...</span>
+            </div>
+        </button>
+        <button class="btn btn-primary" type="button" (click)="requestPasswordReset()">
+            Request new password
+            <div *ngIf="requestResetLoading$ | async" class="spinner-border spinner-border-sm" role="status">
+                <span class="visually-hidden">Requesting password reset link...</span>
+            </div>
+        </button>
+        <button class="btn btn-danger" type="button" (click)="deleteAccount()">
+            Delete account
+            <div *ngIf="deleteUserLoading$ | async" class="spinner-border spinner-border-sm" role="status">
+                <span class="visually-hidden">Deleting account...</span>
+            </div>
+        </button>
+    </div>
+</form>
diff --git a/frontend/src/app/user/user-settings/user-settings.component.scss b/frontend/src/app/user/user-settings/user-settings.component.scss
index e69de29b..b265c0f8 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.scss
+++ b/frontend/src/app/user/user-settings/user-settings.component.scss
@@ -0,0 +1,3 @@
+.button-row {
+    gap: 2em;
+}
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index 65e46ec7..1b42c32b 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -34,21 +34,13 @@ export class UserSettingsComponent implements OnInit {
         }),
         firstName: new FormControl<string>('', {
             nonNullable: true,
-            validators: [
-                Validators.required,
-            ]
         }),
         lastName: new FormControl<string>('', {
             nonNullable: true,
-            validators: [
-                Validators.required,
-            ]
         }),
     });
 
     public usernameErrors$ = controlErrorMessages$(this.form, 'username');
-    public firstNameErrors$ = controlErrorMessages$(this.form, 'firstName');
-    public lastNameErrors$ = controlErrorMessages$(this.form, 'lastName');
     public formErrors$ = formErrorMessages$(this.form);
 
     public updateSettingsLoading$ = merge(

From fb4bbde72ecc850f47128169676dee678cb20a18 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 11:48:51 +0200
Subject: [PATCH 036/565] Fix login component tests

---
 frontend/src/app/services/auth.service.ts     |  8 +--
 .../app/user/login/login.component.spec.ts    | 57 +++++++++++++------
 .../src/app/user/login/login.component.ts     |  4 +-
 frontend/src/app/user/utils.ts                |  8 ++-
 4 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 6b692e6f..707143e5 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,18 +1,18 @@
 import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
-import { Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay, throttleTime, debounceTime } from 'rxjs';
+import { Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay, throttleTime } from 'rxjs';
 import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
 import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
 
-interface AuthAPIResult {
+export interface AuthAPIResult {
     detail: string;
 }
 
-interface AuthAPIError {
-    error: Record<string, string>;
+export interface AuthAPIError {
+    error: Record<string, string | string[]>;
 }
 
 @Injectable({
diff --git a/frontend/src/app/user/login/login.component.spec.ts b/frontend/src/app/user/login/login.component.spec.ts
index d85c20f2..ebb4336d 100644
--- a/frontend/src/app/user/login/login.component.spec.ts
+++ b/frontend/src/app/user/login/login.component.spec.ts
@@ -2,25 +2,31 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LoginComponent } from './login.component';
 import { AuthService } from '@services/auth.service';
-import { AuthServiceMock } from '@mock/auth.service.mock';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { Router } from '@angular/router';
+import { HttpTestingController } from '@angular/common/http/testing';
+import { ToastService } from '@services/toast.service';
+import { toSignal } from '@angular/core/rxjs-interop';
 
-describe('LoginComponent', () => {
+fdescribe('LoginComponent', () => {
     let component: LoginComponent;
     let fixture: ComponentFixture<LoginComponent>;
-    let authService: AuthService;
+    let toastService: ToastService;
     let router: Router;
+    let httpTestingController: HttpTestingController;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LoginComponent],
             providers: [
-                { provide: AuthService, useClass: AuthServiceMock }
+                ToastService,
+                // { provide: AuthService, useClass: AuthServiceMock }
+                AuthService
             ],
             imports: [SharedTestingModule]
         });
-        authService = TestBed.inject(AuthService);
+        httpTestingController = TestBed.inject(HttpTestingController);
+        toastService = TestBed.inject(ToastService);
         router = TestBed.inject(Router);
         fixture = TestBed.createComponent(LoginComponent);
         component = fixture.componentInstance;
@@ -33,30 +39,47 @@ describe('LoginComponent', () => {
 
     it('should check missing input', () => {
         component.submit();
-        expect(component.usernameInput.invalid).toBeTrue();
-        expect(component.usernameErrorMessage).toBe('username is required');
-        expect(component.passwordInput.invalid).toBeTrue();
-        expect(component.passwordErrorMessage).toBe('password is required');
+        expect(component.form.controls.username.invalid).toBeTrue();
+        expect(component.form.controls.username.errors).toEqual({ 'required': true });
+        expect(component.form.controls.password.invalid).toBeTrue();
+        expect(component.form.controls.password.errors).toEqual({ 'required': true });
     });
 
     it('should check invalid usernames', () => {
-        component.usernameInput.setValue('te$t');
-        component.passwordInput.setValue('secretpassword');
+        component.form.controls.username.setValue('te$t');
+        component.form.controls.password.setValue('secretpassword');
         component.submit();
-        expect(component.usernameInput.invalid).toBeTrue();
-        expect(component.usernameErrorMessage).toBe('invalid username');
+
+        const req = httpTestingController.expectOne('/users/login/');
+        req.flush({
+            'non_field_errors': [
+                "Unable to log in with provided credentials."
+            ]
+        }, { status: 400, statusText: 'Bad request' })
+
+
+        expect(component.form.invalid).toBeTrue();
+        expect(component.form.errors).toEqual({ 'invalid': 'Unable to log in with provided credentials.' });
     });
 
     it('should accept valid input', () => {
-        component.usernameInput.setValue('test');
-        component.passwordInput.setValue('secretpassword');
+        component.form.controls.username.setValue('user');
+        component.form.controls.password.setValue('secretpassword');
 
-        const loginSpy = spyOn(authService, 'login').and.callThrough();
         const routerSpy = spyOn(router, 'navigate');
 
+        // Signals are convenient for testing observables.
+        // We simply call the signal to get the latest value.
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
+
         component.submit();
+        expect(loading()).toBeTrue();
+
+        const req = httpTestingController.expectOne('/users/login/');
+        req.flush({ 'key': 'abcdefghijklmnopqrstuvwxyz' });
 
-        expect(loginSpy).toHaveBeenCalled();
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(1);
         expect(routerSpy).toHaveBeenCalledWith(['/']);
     });
 });
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 88b7685f..9a3b7adb 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -19,11 +19,11 @@ type LoginForm = {
 })
 export class LoginComponent implements OnInit {
     public form = new FormGroup<LoginForm>({
-        username: new FormControl<string>('baltus', {
+        username: new FormControl<string>('', {
             nonNullable: true,
             validators: [Validators.required]
         }),
-        password: new FormControl<string>('knerbonius', {
+        password: new FormControl<string>('', {
             nonNullable: true,
             validators: [Validators.required]
         }),
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index 3cee566d..92b25344 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -2,6 +2,7 @@ import { AbstractControl, FormGroup } from "@angular/forms";
 import { User, UserResponse } from "./models/user";
 import _ from 'underscore';
 import { Observable, map } from "rxjs";
+import { AuthAPIError } from "@services/auth.service";
 
 /**
 * Transforms backend user response to User object
@@ -52,14 +53,15 @@ export const encodeUserData = (data: Partial<User>): Partial<UserResponse> => {
  * @param errorObject - The error object containing the control names as keys and the corresponding error messages as values.
  * @param form - The form to which the errors should be added.
  */
-export function setErrors(errorObject: Record<string, string>, form: FormGroup): void {
+export function setErrors(errorObject: AuthAPIError['error'], form: FormGroup): void {
     for (const errorKey in errorObject) {
         const control = form.get(errorKey);
         const error = errorObject[errorKey];
+        const errorMessage = Array.isArray(error) ? error.join('; ') : error;
         if (control) {
-            control.setErrors({'invalid': error});
+            control.setErrors({'invalid': errorMessage});
         } else {
-            form.setErrors({'invalid': error});
+            form.setErrors({'invalid': errorMessage});
         }
     }
 }

From 0aca79243bcc214e97c6596eb128dd8c3fe8ef1a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 12:07:25 +0200
Subject: [PATCH 037/565] Password forgotten tests

---
 frontend/src/app/services/toast.service.ts    | 11 +--
 .../app/user/login/login.component.spec.ts    |  3 +-
 .../password-forgotten.component.spec.ts      | 69 +++++++++++++++----
 .../password-forgotten.component.ts           |  1 +
 4 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/frontend/src/app/services/toast.service.ts b/frontend/src/app/services/toast.service.ts
index 333d5326..02ed7c58 100644
--- a/frontend/src/app/services/toast.service.ts
+++ b/frontend/src/app/services/toast.service.ts
@@ -10,7 +10,7 @@ interface Toast {
 }
 
 interface ToastInput {
-    header?: string;
+    header: string;
     body: string;
     type?: ToastType;
     delay?: number;
@@ -23,13 +23,6 @@ const TOAST_STYLES: Record<ToastType, string> = {
     danger: 'bg-danger text-light',
 };
 
-const TOAST_DEFAULT_HEADERS: Record<ToastType, string> = {
-    success: 'Success',
-    info: 'Info',
-    warning: 'Warning',
-    danger: 'Error',
-};
-
 @Injectable({
   providedIn: 'root'
 })
@@ -40,7 +33,7 @@ export class ToastService {
         const type = toastInput.type || 'info';
         const toast: Toast = {
             className: TOAST_STYLES[type],
-            header: toastInput.header || TOAST_DEFAULT_HEADERS[type],
+            header: toastInput.header,
             body: toastInput.body,
             delay: toastInput.delay || 5000,
         }
diff --git a/frontend/src/app/user/login/login.component.spec.ts b/frontend/src/app/user/login/login.component.spec.ts
index ebb4336d..496d1cb7 100644
--- a/frontend/src/app/user/login/login.component.spec.ts
+++ b/frontend/src/app/user/login/login.component.spec.ts
@@ -8,7 +8,7 @@ import { HttpTestingController } from '@angular/common/http/testing';
 import { ToastService } from '@services/toast.service';
 import { toSignal } from '@angular/core/rxjs-interop';
 
-fdescribe('LoginComponent', () => {
+describe('LoginComponent', () => {
     let component: LoginComponent;
     let fixture: ComponentFixture<LoginComponent>;
     let toastService: ToastService;
@@ -20,7 +20,6 @@ fdescribe('LoginComponent', () => {
             declarations: [LoginComponent],
             providers: [
                 ToastService,
-                // { provide: AuthService, useClass: AuthServiceMock }
                 AuthService
             ],
             imports: [SharedTestingModule]
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
index 4d53ddae..9a5fb91f 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
@@ -1,21 +1,64 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PasswordForgottenComponent } from './password-forgotten.component';
+import { HttpTestingController } from '@angular/common/http/testing';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { ToastService } from '@services/toast.service';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('PasswordForgottenComponent', () => {
-  let component: PasswordForgottenComponent;
-  let fixture: ComponentFixture<PasswordForgottenComponent>;
+    let component: PasswordForgottenComponent;
+    let fixture: ComponentFixture<PasswordForgottenComponent>;
+    let httpTestingController: HttpTestingController;
+    let toastService: ToastService;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [PasswordForgottenComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [PasswordForgottenComponent],
+            imports: [SharedTestingModule]
+        });
+        fixture = TestBed.createComponent(PasswordForgottenComponent);
+        httpTestingController = TestBed.inject(HttpTestingController);
+        toastService = TestBed.inject(ToastService);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+
+    it('should check missing input', () => {
+        component.submit();
+
+        httpTestingController.expectNone('/users/password/reset/');
+
+        expect(component.form.controls.email.invalid).toBeTrue();
+        expect(component.form.controls.email.errors).toEqual({ 'required': true });
+    });
+
+    it('should check invalid email', () => {
+        component.form.controls.email.setValue('test');
+        component.submit();
+
+        httpTestingController.expectNone('/users/password/reset/');
+
+        expect(component.form.invalid).toBeTrue();
+        expect(component.form.controls.email.errors).toEqual({ 'email': true });
+    });
+
+    it('should submit valid input', () => {
+        component.form.controls.email.setValue('test@test.nl');
+
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
+
+        component.submit();
+        expect(loading()).toBeTrue();
+
+        const req = httpTestingController.expectOne('/users/password/reset/');
+        req.flush({ "detail": "Password reset e-mail has been sent." });
+
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(1);
     });
-    fixture = TestBed.createComponent(PasswordForgottenComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
 });
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index 08257b3e..807eaf62 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -52,6 +52,7 @@ export class PasswordForgottenComponent implements OnInit {
                         header: 'Password reset request successful',
                         body: 'If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.',
                         type: 'success',
+                        // This is a long message, so we show it for 10 seconds.
                         delay: 10000
                     })
                 }

From db3999e7e3f04efab1a791fe5e0ca4279b344384 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 12:10:55 +0200
Subject: [PATCH 038/565] ToastService tests

---
 .../src/app/services/toast.service.spec.ts    | 75 ++++++++++++++++---
 frontend/src/app/services/toast.service.ts    |  8 +-
 2 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/services/toast.service.spec.ts b/frontend/src/app/services/toast.service.spec.ts
index e0413db8..8272bbdc 100644
--- a/frontend/src/app/services/toast.service.spec.ts
+++ b/frontend/src/app/services/toast.service.spec.ts
@@ -1,16 +1,73 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ToastService } from './toast.service';
+import { TOAST_STYLES, ToastInput, ToastService } from './toast.service';
 
 describe('ToastService', () => {
-  let service: ToastService;
+    let service: ToastService;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(ToastService);
-  });
+    beforeEach(() => {
+        TestBed.configureTestingModule({});
+        service = TestBed.inject(ToastService);
+    });
 
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
+    it('should be created', () => {
+        expect(service).toBeTruthy();
+    });
+
+    it('should show a toast', () => {
+        const toastInput: ToastInput = {
+        header: 'Test Header',
+        body: 'Test Body',
+        type: 'success',
+        delay: 3000,
+        };
+
+        const toast = service.show(toastInput);
+
+        expect(service.toasts.length).toBe(1);
+        expect(service.toasts[0]).toEqual({
+        className: TOAST_STYLES['success'],
+        header: 'Test Header',
+        body: 'Test Body',
+        delay: 3000,
+        });
+        expect(toast).toEqual(service.toasts[0]);
+    });
+
+    it('should remove a toast', () => {
+        const toastInput: ToastInput = {
+        header: 'Test Header',
+        body: 'Test Body',
+        type: 'info',
+        delay: 5000,
+        };
+
+        const toast = service.show(toastInput);
+        service.remove(toast);
+
+        expect(service.toasts.length).toBe(0);
+    });
+
+    it('should clear all toasts', () => {
+        const toastInput1: ToastInput = {
+        header: 'Test Header 1',
+        body: 'Test Body 1',
+        type: 'warning',
+        delay: 2000,
+        };
+
+        const toastInput2: ToastInput = {
+        header: 'Test Header 2',
+        body: 'Test Body 2',
+        type: 'danger',
+        delay: 4000,
+        };
+
+        service.show(toastInput1);
+        service.show(toastInput2);
+        service.clear();
+
+        expect(service.toasts.length).toBe(0);
+    });
 });
+
diff --git a/frontend/src/app/services/toast.service.ts b/frontend/src/app/services/toast.service.ts
index 02ed7c58..31339417 100644
--- a/frontend/src/app/services/toast.service.ts
+++ b/frontend/src/app/services/toast.service.ts
@@ -1,22 +1,22 @@
 import { Injectable } from '@angular/core';
 
-type ToastType = 'success' | 'info' | 'warning' | 'danger';
+export type ToastType = 'success' | 'info' | 'warning' | 'danger';
 
-interface Toast {
+export interface Toast {
     header: string;
     body: string;
     className: string;
     delay: number;
 }
 
-interface ToastInput {
+export interface ToastInput {
     header: string;
     body: string;
     type?: ToastType;
     delay?: number;
 }
 
-const TOAST_STYLES: Record<ToastType, string> = {
+export const TOAST_STYLES: Record<ToastType, string> = {
     success: 'bg-success text-light',
     info: 'bg-info text-dark',
     warning: 'bg-warning text-dark',

From 0a3a16d9755661af2eee42355aaa8800b0c589dc Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 14:03:07 +0200
Subject: [PATCH 039/565] Add user utils tests

---
 frontend/src/app/user/utils.spec.ts | 142 ++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 frontend/src/app/user/utils.spec.ts

diff --git a/frontend/src/app/user/utils.spec.ts b/frontend/src/app/user/utils.spec.ts
new file mode 100644
index 00000000..98214606
--- /dev/null
+++ b/frontend/src/app/user/utils.spec.ts
@@ -0,0 +1,142 @@
+import { TestBed } from '@angular/core/testing';
+import { FormGroup, FormControl, Validators } from '@angular/forms';
+import { User, UserResponse } from './models/user';
+import { parseUserData, encodeUserData, setErrors, controlErrorMessages$, formErrorMessages$, updateFormValidity } from './utils';
+import { toSignal } from '@angular/core/rxjs-interop';
+
+describe('User utils', () => {
+    let form: FormGroup;
+    beforeEach(() => {
+        form = new FormGroup({
+            username: new FormControl<string>('', {
+                validators: [
+                    Validators.required
+                ]
+            }),
+            email: new FormControl<string>('', {
+                validators: [
+                    Validators.required,
+                    Validators.email
+                ]
+            }),
+        });
+    });
+
+    describe('parseUserData', () => {
+        it('should return null if result is null', () => {
+            const result: UserResponse | null = null;
+            const user = parseUserData(result);
+            expect(user).toBeNull();
+        });
+
+        it('should return a User object if result is not null', () => {
+            const result: UserResponse = {
+                id: 1,
+                username: 'testuser',
+                email: 'test@example.com',
+                first_name: 'Test',
+                last_name: 'User',
+                is_staff: true,
+            };
+            const user = parseUserData(result);
+            expect(user).toBeInstanceOf(User);
+            expect(user?.id).toBe(1);
+            expect(user?.username).toBe('testuser');
+            expect(user?.email).toBe('test@example.com');
+            expect(user?.firstName).toBe('Test');
+            expect(user?.lastName).toBe('User');
+            expect(user?.isStaff).toBe(true);
+        });
+    });
+
+    describe('encodeUserData', () => {
+        it('should encode partial User data to UserResponse object', () => {
+            const data: Partial<User> = {
+                id: 1,
+                username: 'testuser',
+                email: 'test@example.com',
+                firstName: 'Test',
+                lastName: 'User',
+                isStaff: true,
+            };
+            const encoded = encodeUserData(data);
+            expect(encoded).toEqual({
+                id: 1,
+                username: 'testuser',
+                email: 'test@example.com',
+                first_name: 'Test',
+                last_name: 'User',
+                is_staff: true,
+            });
+        });
+    });
+
+    describe('setErrors', () => {
+        it('should set errors on associated controls', () => {
+            const errorObject = {
+                username: 'Username is required.',
+                email: 'Email is invalid.',
+            };
+            setErrors(errorObject, form);
+            expect(form.get('username')?.errors).toEqual({ 'invalid': 'Username is required.' });
+            expect(form.get('email')?.errors).toEqual({ 'invalid': 'Email is invalid.' });
+        });
+
+        it('should set errors on the form itself for non-associated controls', () => {
+            const errorObject = {
+                random: 'Passwords must be identical.',
+            };
+            setErrors(errorObject, form);
+            expect(form.errors).toEqual({
+                'invalid': 'Passwords must be identical.'
+            });
+        });
+    });
+
+    describe('controlErrorMessages$', () => {
+        it('should return an Observable of error messages for a specific control', () => {
+            const usernameMessages = TestBed.runInInjectionContext(() => toSignal(controlErrorMessages$(form, 'username')));
+
+            form.get('username')?.updateValueAndValidity();
+
+            expect(usernameMessages()).toEqual(['Username is required.']);
+        });
+
+        it('should use errors based on a provided lookup name', () => {
+            const usernameMessages = TestBed.runInInjectionContext(() => toSignal(
+                controlErrorMessages$(form, 'username', 'email'))
+            );
+
+            form.get('username')?.updateValueAndValidity();
+
+            expect(usernameMessages()).toEqual(['Email is required.']);
+        });
+    });
+
+    describe('formErrorMessages$', () => {
+        it('should return an Observable of error messages for the form', () => {
+            const formMessages = TestBed.runInInjectionContext(() => toSignal(
+                formErrorMessages$(form))
+            );
+
+            form.updateValueAndValidity();
+
+            expect(formMessages()?.length).toBe(0);
+
+            form.setErrors({ 'random': 'This is a random error.' });
+
+            expect(formMessages()).toEqual(['This is a random error.']);
+        });
+    });
+
+    describe('updateFormValidity', () => {
+        it('should update the validity of all controls in the form', () => {
+            form.controls['username'].setErrors({ 'invalid': 'Username is required.' });
+            form.controls['email'].setErrors({ 'invalid': 'Email is invalid.' });
+            updateFormValidity(form);
+            expect(form.controls['username'].valid).toBe(false);
+            expect(form.controls['email'].valid).toBe(false);
+            expect(form.valid).toBe(false);
+        });
+    });
+});

From 1c6cc18b1b4b27dba70ffd5a3aa3b7e67821d13e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 16:04:44 +0200
Subject: [PATCH 040/565] Formatting

---
 .../src/app/user/login/login.component.html   |  45 ++++--
 .../app/user/login/login.component.spec.ts    |  85 +++++-----
 .../src/app/user/login/login.component.ts     |  59 +++----
 frontend/src/app/user/models/user.ts          |   9 +-
 .../password-forgotten.component.html         |  29 +++-
 .../password-forgotten.component.spec.ts      |  46 +++---
 .../password-forgotten.component.ts           |  62 ++++----
 .../app/user/register/register.component.html |  55 +++++--
 .../app/user/register/register.component.scss |   1 -
 .../app/user/register/register.component.ts   | 129 +++++++++-------
 .../reset-password.component.html             |  35 +++--
 .../reset-password.component.spec.ts          |  30 ++--
 .../reset-password.component.ts               | 125 ++++++++-------
 .../user-settings.component.html              |  69 ++++++---
 .../user-settings.component.spec.ts           |  30 ++--
 .../user-settings/user-settings.component.ts  | 133 ++++++++--------
 frontend/src/app/user/utils.spec.ts           | 146 ++++++++++--------
 frontend/src/app/user/utils.ts                |  87 ++++++-----
 frontend/src/app/user/validation.ts           |  24 +--
 .../verify-email/verify-email.component.html  |  10 +-
 .../verify-email.component.spec.ts            |  10 +-
 .../verify-email/verify-email.component.ts    |  89 ++++++-----
 22 files changed, 743 insertions(+), 565 deletions(-)

diff --git a/frontend/src/app/user/login/login.component.html b/frontend/src/app/user/login/login.component.html
index 5e6f4d63..76384338 100644
--- a/frontend/src/app/user/login/login.component.html
+++ b/frontend/src/app/user/login/login.component.html
@@ -4,40 +4,55 @@ <h2>Sign in</h2>
 
 <form [formGroup]="form" (ngSubmit)="submit()">
     <div class="mb-3">
-        <label for="username" class="form-label">
-            Username
-        </label>
+        <label for="username" class="form-label"> Username </label>
         <input
             type="text"
             id="username"
             class="form-control"
-            [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
-            [formControl]="form.controls.username">
-        <p *ngFor="let error of usernameErrors$ | async" class="invalid-feedback">
+            [class.is-invalid]="
+                form.controls.username.touched && form.controls.username.invalid
+            "
+            [formControl]="form.controls.username"
+        />
+        <p
+            *ngFor="let error of usernameErrors$ | async"
+            class="invalid-feedback"
+        >
             {{ error }}
         </p>
     </div>
     <div class="mb-3">
-        <label for="password" class="form-label">
-            Password
-        </label>
+        <label for="password" class="form-label"> Password </label>
         <input
             type="password"
             id="password"
             class="form-control"
             [formControl]="form.controls.password"
-            [class.is-invalid]="form.controls.password.touched && form.controls.password.invalid">
-        <p *ngFor="let error of passwordErrors$ | async" class="invalid-feedback">
+            [class.is-invalid]="
+                form.controls.password.touched && form.controls.password.invalid
+            "
+        />
+        <p
+            *ngFor="let error of passwordErrors$ | async"
+            class="invalid-feedback"
+        >
             {{ error }}
         </p>
     </div>
-    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+    <p
+        *ngFor="let error of formErrors$ | async"
+        class="invalid-feedback always-block"
+    >
         {{ error }}
     </p>
     <div class="mb-3">
         <button type="submit" class="btn btn-primary mt-3">
             Sign in
-            <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+            <div
+                *ngIf="loading$ | async"
+                class="spinner-border spinner-border-sm"
+                role="status"
+            >
                 <span class="visually-hidden">Logging in...</span>
             </div>
         </button>
@@ -45,5 +60,7 @@ <h2>Sign in</h2>
 </form>
 
 <div>
-    <a [routerLink]="['/password-forgotten']">Forgotten your password? Click here.</a>
+    <a [routerLink]="['/password-forgotten']">
+        Forgotten your password? Click here.
+    </a>
 </div>
diff --git a/frontend/src/app/user/login/login.component.spec.ts b/frontend/src/app/user/login/login.component.spec.ts
index 496d1cb7..05fa9ac7 100644
--- a/frontend/src/app/user/login/login.component.spec.ts
+++ b/frontend/src/app/user/login/login.component.spec.ts
@@ -1,14 +1,14 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { LoginComponent } from './login.component';
-import { AuthService } from '@services/auth.service';
-import { SharedTestingModule } from '@shared/shared-testing.module';
-import { Router } from '@angular/router';
-import { HttpTestingController } from '@angular/common/http/testing';
-import { ToastService } from '@services/toast.service';
-import { toSignal } from '@angular/core/rxjs-interop';
+import { LoginComponent } from "./login.component";
+import { AuthService } from "@services/auth.service";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { Router } from "@angular/router";
+import { HttpTestingController } from "@angular/common/http/testing";
+import { ToastService } from "@services/toast.service";
+import { toSignal } from "@angular/core/rxjs-interop";
 
-describe('LoginComponent', () => {
+describe("LoginComponent", () => {
     let component: LoginComponent;
     let fixture: ComponentFixture<LoginComponent>;
     let toastService: ToastService;
@@ -18,11 +18,8 @@ describe('LoginComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LoginComponent],
-            providers: [
-                ToastService,
-                AuthService
-            ],
-            imports: [SharedTestingModule]
+            providers: [ToastService, AuthService],
+            imports: [SharedTestingModule],
         });
         httpTestingController = TestBed.inject(HttpTestingController);
         toastService = TestBed.inject(ToastService);
@@ -32,53 +29,63 @@ describe('LoginComponent', () => {
         fixture.detectChanges();
     });
 
-    it('should create', () => {
+    it("should create", () => {
         expect(component).toBeTruthy();
     });
 
-    it('should check missing input', () => {
+    it("should check missing input", () => {
         component.submit();
         expect(component.form.controls.username.invalid).toBeTrue();
-        expect(component.form.controls.username.errors).toEqual({ 'required': true });
+        expect(component.form.controls.username.errors).toEqual({
+            required: true,
+        });
         expect(component.form.controls.password.invalid).toBeTrue();
-        expect(component.form.controls.password.errors).toEqual({ 'required': true });
+        expect(component.form.controls.password.errors).toEqual({
+            required: true,
+        });
     });
 
-    it('should check invalid usernames', () => {
-        component.form.controls.username.setValue('te$t');
-        component.form.controls.password.setValue('secretpassword');
+    it("should check invalid usernames", () => {
+        component.form.controls.username.setValue("te$t");
+        component.form.controls.password.setValue("secretpassword");
         component.submit();
 
-        const req = httpTestingController.expectOne('/users/login/');
-        req.flush({
-            'non_field_errors': [
-                "Unable to log in with provided credentials."
-            ]
-        }, { status: 400, statusText: 'Bad request' })
-
+        const req = httpTestingController.expectOne("/users/login/");
+        req.flush(
+            {
+                non_field_errors: [
+                    "Unable to log in with provided credentials.",
+                ],
+            },
+            { status: 400, statusText: "Bad request" },
+        );
 
         expect(component.form.invalid).toBeTrue();
-        expect(component.form.errors).toEqual({ 'invalid': 'Unable to log in with provided credentials.' });
+        expect(component.form.errors).toEqual({
+            invalid: "Unable to log in with provided credentials.",
+        });
     });
 
-    it('should accept valid input', () => {
-        component.form.controls.username.setValue('user');
-        component.form.controls.password.setValue('secretpassword');
+    it("should accept valid input", () => {
+        component.form.controls.username.setValue("user");
+        component.form.controls.password.setValue("secretpassword");
 
-        const routerSpy = spyOn(router, 'navigate');
+        const routerSpy = spyOn(router, "navigate");
 
-        // Signals are convenient for testing observables.
-        // We simply call the signal to get the latest value.
-        const loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
+        // toSignal lets us inspect the latest value of an Observable.
+        // It basically turns it into a BehaviorSubject.
+        const loading = TestBed.runInInjectionContext(() =>
+            toSignal(component.loading$),
+        );
 
         component.submit();
         expect(loading()).toBeTrue();
 
-        const req = httpTestingController.expectOne('/users/login/');
-        req.flush({ 'key': 'abcdefghijklmnopqrstuvwxyz' });
+        const req = httpTestingController.expectOne("/users/login/");
+        req.flush({ key: "abcdefghijklmnopqrstuvwxyz" });
 
         expect(loading()).toBeFalse();
         expect(toastService.toasts.length).toBe(1);
-        expect(routerSpy).toHaveBeenCalledWith(['/']);
+        expect(routerSpy).toHaveBeenCalledWith(["/"]);
     });
 });
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 9a3b7adb..0388b0d7 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -1,36 +1,41 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { AuthService } from '@services/auth.service';
-import { UserLogin } from '../models/user';
-import { map, merge, startWith } from 'rxjs';
-import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { ToastService } from '@services/toast.service';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Router } from '@angular/router';
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { AuthService } from "@services/auth.service";
+import { UserLogin } from "../models/user";
+import { map, merge, startWith } from "rxjs";
+import {
+    controlErrorMessages$,
+    formErrorMessages$,
+    setErrors,
+    updateFormValidity,
+} from "../utils";
+import { ToastService } from "@services/toast.service";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { Router } from "@angular/router";
 
 type LoginForm = {
     [key in keyof UserLogin]: FormControl<string>;
-}
+};
 
 @Component({
-  selector: 'lc-login',
-  templateUrl: './login.component.html',
-  styleUrls: ['./login.component.scss']
+    selector: "lc-login",
+    templateUrl: "./login.component.html",
+    styleUrls: ["./login.component.scss"],
 })
 export class LoginComponent implements OnInit {
     public form = new FormGroup<LoginForm>({
-        username: new FormControl<string>('', {
+        username: new FormControl<string>("", {
             nonNullable: true,
-            validators: [Validators.required]
+            validators: [Validators.required],
         }),
-        password: new FormControl<string>('', {
+        password: new FormControl<string>("", {
             nonNullable: true,
-            validators: [Validators.required]
+            validators: [Validators.required],
         }),
     });
 
-    public usernameErrors$ = controlErrorMessages$(this.form, 'username');
-    public passwordErrors$ = controlErrorMessages$(this.form, 'password');
+    public usernameErrors$ = controlErrorMessages$(this.form, "username");
+    public passwordErrors$ = controlErrorMessages$(this.form, "password");
     public formErrors$ = formErrorMessages$(this.form);
 
     public loading$ = merge(
@@ -43,23 +48,23 @@ export class LoginComponent implements OnInit {
         private toastService: ToastService,
         private destroyRef: DestroyRef,
         private router: Router,
-    ) { }
+    ) {}
 
     ngOnInit(): void {
         this.authService.loginResult$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe(result => {
-                if ('error' in result) {
+            .subscribe((result) => {
+                if ("error" in result) {
                     setErrors(result.error, this.form);
                 } else {
                     this.toastService.show({
-                        header: 'Sign in successful',
-                        body: 'You have been successfully signed in.',
-                        type: 'success'
+                        header: "Sign in successful",
+                        body: "You have been successfully signed in.",
+                        type: "success",
                     });
-                    this.router.navigate(['/']);
+                    this.router.navigate(["/"]);
                 }
-            })
+            });
     }
 
     public submit(): void {
diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts
index 9990e844..b3d2748e 100644
--- a/frontend/src/app/user/models/user.ts
+++ b/frontend/src/app/user/models/user.ts
@@ -47,6 +47,9 @@ export interface KeyInfo {
 }
 
 // Dj-rest-auth does not let you update your email address, but we need it to request the password reset form.
-export type UserSettings = Pick<User, 'id' | 'email' | 'firstName' | 'lastName'> & {
-    username?: string
-}
+export type UserSettings = Pick<
+    User,
+    "id" | "email" | "firstName" | "lastName"
+> & {
+    username?: string;
+};
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.html b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
index 57e2c7ef..2111b230 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.html
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
@@ -1,17 +1,36 @@
 <h2>Forgotten your password?</h2>
 
-<p>Enter your email address in the form below. You will receive a link to a page where you can reset your password.</p>
+<p>
+    Enter your email address in the form below. You will receive a link to a
+    page where you can reset your password.
+</p>
 
 <form [formGroup]="form" (ngSubmit)="submit()">
     <div>
         <label for="email" class="form-label">Email address</label>
-        <input id="email" type="email" class="form-control" [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid" [formControl]="form.controls.email" />
-        <p *ngFor="let error of emailErrors$ | async" class="invalid-feedback">{{ error }}</p>
+        <input
+            id="email"
+            type="email"
+            class="form-control"
+            [class.is-invalid]="
+                form.controls.email.touched && form.controls.email.invalid
+            "
+            [formControl]="form.controls.email"
+        />
+        <p *ngFor="let error of emailErrors$ | async" class="invalid-feedback">
+            {{ error }}
+        </p>
     </div>
     <button type="submit" class="btn btn-primary my-3">
         Submit
-        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
-            <span class="visually-hidden">Requesting password reset link...</span>
+        <div
+            *ngIf="loading$ | async"
+            class="spinner-border spinner-border-sm"
+            role="status"
+        >
+            <span class="visually-hidden">
+                Requesting password reset link...
+            </span>
         </div>
     </button>
 </form>
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
index 9a5fb91f..dfb9a3b8 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.spec.ts
@@ -1,12 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { PasswordForgottenComponent } from './password-forgotten.component';
-import { HttpTestingController } from '@angular/common/http/testing';
-import { toSignal } from '@angular/core/rxjs-interop';
-import { ToastService } from '@services/toast.service';
-import { SharedTestingModule } from '@shared/shared-testing.module';
+import { PasswordForgottenComponent } from "./password-forgotten.component";
+import { HttpTestingController } from "@angular/common/http/testing";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { ToastService } from "@services/toast.service";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
-describe('PasswordForgottenComponent', () => {
+describe("PasswordForgottenComponent", () => {
     let component: PasswordForgottenComponent;
     let fixture: ComponentFixture<PasswordForgottenComponent>;
     let httpTestingController: HttpTestingController;
@@ -15,7 +15,7 @@ describe('PasswordForgottenComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [PasswordForgottenComponent],
-            imports: [SharedTestingModule]
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(PasswordForgottenComponent);
         httpTestingController = TestBed.inject(HttpTestingController);
@@ -24,39 +24,43 @@ describe('PasswordForgottenComponent', () => {
         fixture.detectChanges();
     });
 
-    it('should create', () => {
+    it("should create", () => {
         expect(component).toBeTruthy();
     });
 
-    it('should check missing input', () => {
+    it("should check missing input", () => {
         component.submit();
 
-        httpTestingController.expectNone('/users/password/reset/');
+        httpTestingController.expectNone("/users/password/reset/");
 
         expect(component.form.controls.email.invalid).toBeTrue();
-        expect(component.form.controls.email.errors).toEqual({ 'required': true });
+        expect(component.form.controls.email.errors).toEqual({
+            required: true,
+        });
     });
 
-    it('should check invalid email', () => {
-        component.form.controls.email.setValue('test');
+    it("should check invalid email", () => {
+        component.form.controls.email.setValue("test");
         component.submit();
 
-        httpTestingController.expectNone('/users/password/reset/');
+        httpTestingController.expectNone("/users/password/reset/");
 
         expect(component.form.invalid).toBeTrue();
-        expect(component.form.controls.email.errors).toEqual({ 'email': true });
+        expect(component.form.controls.email.errors).toEqual({ email: true });
     });
 
-    it('should submit valid input', () => {
-        component.form.controls.email.setValue('test@test.nl');
+    it("should submit valid input", () => {
+        component.form.controls.email.setValue("test@test.nl");
 
-        const loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
+        const loading = TestBed.runInInjectionContext(() =>
+            toSignal(component.loading$),
+        );
 
         component.submit();
         expect(loading()).toBeTrue();
 
-        const req = httpTestingController.expectOne('/users/password/reset/');
-        req.flush({ "detail": "Password reset e-mail has been sent." });
+        const req = httpTestingController.expectOne("/users/password/reset/");
+        req.flush({ detail: "Password reset e-mail has been sent." });
 
         expect(loading()).toBeFalse();
         expect(toastService.toasts.length).toBe(1);
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index 807eaf62..654eb584 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -1,60 +1,60 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { controlErrorMessages$, updateFormValidity } from '../utils';
-import { map, merge, startWith } from 'rxjs';
-import { AuthService } from '@services/auth.service';
-import { PasswordForgotten } from '../models/user';
-import { ToastService } from '@services/toast.service';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { controlErrorMessages$, updateFormValidity } from "../utils";
+import { map, merge, startWith } from "rxjs";
+import { AuthService } from "@services/auth.service";
+import { PasswordForgotten } from "../models/user";
+import { ToastService } from "@services/toast.service";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 
 type PasswordForgottenForm = {
     [key in keyof PasswordForgotten]: FormControl<string>;
-}
+};
 
 @Component({
-  selector: 'lc-password-forgotten',
-  templateUrl: './password-forgotten.component.html',
-  styleUrls: ['./password-forgotten.component.scss']
+    selector: "lc-password-forgotten",
+    templateUrl: "./password-forgotten.component.html",
+    styleUrls: ["./password-forgotten.component.scss"],
 })
 export class PasswordForgottenComponent implements OnInit {
     form = new FormGroup<PasswordForgottenForm>({
-        email: new FormControl<string>('', {
+        email: new FormControl<string>("", {
             nonNullable: true,
-            validators: [Validators.required, Validators.email]
-        })
+            validators: [Validators.required, Validators.email],
+        }),
     });
 
-    public emailErrors$ = controlErrorMessages$(this.form, 'email');
+    public emailErrors$ = controlErrorMessages$(this.form, "email");
 
     public loading$ = merge(
         this.authService.passwordForgotten$.pipe(map(() => true)),
-        this.authService.passwordForgottenResult$.pipe(map(() => false))
+        this.authService.passwordForgottenResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
 
     constructor(
         private authService: AuthService,
         private toastService: ToastService,
-        private destroyRef: DestroyRef
-    ) { }
+        private destroyRef: DestroyRef,
+    ) {}
 
     ngOnInit(): void {
         this.authService.passwordForgottenResult$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe(result => {
-                if ('error' in result) {
+            .subscribe((result) => {
+                if ("error" in result) {
                     this.toastService.show({
-                        header: 'Reset request failed',
-                        body: 'Request to send password reset email failed. Please try again.',
-                        type: 'danger'
-                    })
+                        header: "Reset request failed",
+                        body: "Request to send password reset email failed. Please try again.",
+                        type: "danger",
+                    });
                 } else {
                     this.toastService.show({
-                        header: 'Password reset request successful',
-                        body: 'If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.',
-                        type: 'success',
+                        header: "Password reset request successful",
+                        body: "If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.",
+                        type: "success",
                         // This is a long message, so we show it for 10 seconds.
-                        delay: 10000
-                    })
+                        delay: 10000,
+                    });
                 }
             });
     }
@@ -65,6 +65,6 @@ export class PasswordForgottenComponent implements OnInit {
         if (!this.form.valid) {
             return;
         }
-        this.authService.passwordForgotten$.next(this.form.getRawValue())
+        this.authService.passwordForgotten$.next(this.form.getRawValue());
     }
 }
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index 5b0043c4..5b6e9ddf 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -6,17 +6,20 @@ <h2>Register</h2>
 
 <form [formGroup]="form" (ngSubmit)="submit()">
     <div class="mb-2">
-        <label for="username" class="form-label">
-            Username
-        </label>
+        <label for="username" class="form-label"> Username </label>
         <input
             type="text"
             id="username"
             class="form-control"
-            [class.is-invalid]="form.controls.username.touched && form.controls.username.invalid"
+            [class.is-invalid]="
+                form.controls.username.touched && form.controls.username.invalid
+            "
             [formControl]="form.controls.username"
+        />
+        <p
+            *ngFor="let error of usernameErrors$ | async"
+            class="invalid-feedback"
         >
-        <p *ngFor="let error of usernameErrors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
     </div>
@@ -26,8 +29,11 @@ <h2>Register</h2>
             type="email"
             id="email"
             class="form-control"
-            [class.is-invalid]="form.controls.email.touched && form.controls.email.invalid"
-            [formControl]="form.controls.email">
+            [class.is-invalid]="
+                form.controls.email.touched && form.controls.email.invalid
+            "
+            [formControl]="form.controls.email"
+        />
         <p *ngFor="let error of emailErrors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
@@ -38,10 +44,16 @@ <h2>Register</h2>
             type="password"
             id="password1"
             class="form-control"
-            [class.is-invalid]="form.controls.password1.touched && form.controls.password1.invalid"
+            [class.is-invalid]="
+                form.controls.password1.touched &&
+                form.controls.password1.invalid
+            "
             [formControl]="form.controls.password1"
+        />
+        <p
+            *ngFor="let error of password1Errors$ | async"
+            class="invalid-feedback"
         >
-        <p *ngFor="let error of password1Errors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
     </div>
@@ -51,20 +63,33 @@ <h2>Register</h2>
             type="password"
             class="form-control"
             id="password2"
-            [class.is-invalid]="form.controls.password2.touched && form.controls.password2.invalid"
-            [formControl]="form.controls.password2">
-        <p *ngFor="let error of password2Errors$ | async" class="invalid-feedback">
+            [class.is-invalid]="
+                form.controls.password2.touched &&
+                form.controls.password2.invalid
+            "
+            [formControl]="form.controls.password2"
+        />
+        <p
+            *ngFor="let error of password2Errors$ | async"
+            class="invalid-feedback"
+        >
             {{ error }}
         </p>
     </div>
-    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+    <p
+        *ngFor="let error of formErrors$ | async"
+        class="invalid-feedback always-block"
+    >
         {{ error }}
     </p>
     <button type="submit" class="btn btn-primary my-3">
         Register
-        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+        <div
+            *ngIf="loading$ | async"
+            class="spinner-border spinner-border-sm"
+            role="status"
+        >
             <span class="visually-hidden">Registering...</span>
         </div>
     </button>
 </form>
-
diff --git a/frontend/src/app/user/register/register.component.scss b/frontend/src/app/user/register/register.component.scss
index 8b137891..e69de29b 100644
--- a/frontend/src/app/user/register/register.component.scss
+++ b/frontend/src/app/user/register/register.component.scss
@@ -1 +0,0 @@
-
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index e5a65207..ecc80418 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -1,66 +1,77 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
-import { UserRegistration } from '../models/user';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { usernameValidators, passwordValidators, identicalPasswordsValidator } from '../validation';
-import { AuthService } from '@services/auth.service';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { map, merge, startWith } from 'rxjs';
-import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { ToastService } from '@services/toast.service';
-import { Router } from '@angular/router';
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { UserRegistration } from "../models/user";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import {
+    usernameValidators,
+    passwordValidators,
+    identicalPasswordsValidator,
+} from "../validation";
+import { AuthService } from "@services/auth.service";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { map, merge, startWith } from "rxjs";
+import {
+    controlErrorMessages$,
+    formErrorMessages$,
+    setErrors,
+    updateFormValidity,
+} from "../utils";
+import { ToastService } from "@services/toast.service";
+import { Router } from "@angular/router";
 
 type RegisterForm = {
     [key in keyof UserRegistration]: FormControl<UserRegistration[key]>;
-}
+};
 
 @Component({
-    selector: 'lc-register',
-    templateUrl: './register.component.html',
-    styleUrls: ['./register.component.scss']
+    selector: "lc-register",
+    templateUrl: "./register.component.html",
+    styleUrls: ["./register.component.scss"],
 })
 export class RegisterComponent implements OnInit {
-    public form = new FormGroup<RegisterForm>({
-        username: new FormControl<string>('', {
-            nonNullable: true,
-            validators: [
-                Validators.required,
-                ...usernameValidators
-            ]
-        }),
-        email: new FormControl<string>('', {
-            nonNullable: true,
-            validators: [
-                Validators.required,
-                Validators.email,
-            ]
-        }),
-        password1: new FormControl<string>('', {
-            nonNullable: true,
-            validators: [
-                Validators.required,
-                ...passwordValidators,
-            ]
-        }),
-        password2: new FormControl<string>('', {
-            nonNullable: true,
-            validators: [
-                Validators.required,
-                ...passwordValidators,
-            ]
-        }),
-    }, {
-        validators: identicalPasswordsValidator<keyof RegisterForm>('password1', 'password2')
-    });
+    public form = new FormGroup<RegisterForm>(
+        {
+            username: new FormControl<string>("", {
+                nonNullable: true,
+                validators: [Validators.required, ...usernameValidators],
+            }),
+            email: new FormControl<string>("", {
+                nonNullable: true,
+                validators: [Validators.required, Validators.email],
+            }),
+            password1: new FormControl<string>("", {
+                nonNullable: true,
+                validators: [Validators.required, ...passwordValidators],
+            }),
+            password2: new FormControl<string>("", {
+                nonNullable: true,
+                validators: [Validators.required, ...passwordValidators],
+            }),
+        },
+        {
+            validators: identicalPasswordsValidator<keyof RegisterForm>(
+                "password1",
+                "password2",
+            ),
+        },
+    );
 
-    public usernameErrors$ = controlErrorMessages$(this.form, 'username');
-    public emailErrors$ = controlErrorMessages$(this.form, 'email');
-    public password1Errors$ = controlErrorMessages$(this.form, 'password1', 'password');
-    public password2Errors$ = controlErrorMessages$(this.form, 'password2', 'password');
+    public usernameErrors$ = controlErrorMessages$(this.form, "username");
+    public emailErrors$ = controlErrorMessages$(this.form, "email");
+    public password1Errors$ = controlErrorMessages$(
+        this.form,
+        "password1",
+        "password",
+    );
+    public password2Errors$ = controlErrorMessages$(
+        this.form,
+        "password2",
+        "password",
+    );
     public formErrors$ = formErrorMessages$(this.form);
 
     public loading$ = merge(
         this.authService.registration$.pipe(map(() => true)),
-        this.authService.registrationResult$.pipe(map(() => false))
+        this.authService.registrationResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
 
     constructor(
@@ -68,23 +79,21 @@ export class RegisterComponent implements OnInit {
         private toastService: ToastService,
         private destroyRef: DestroyRef,
         private router: Router,
-    ) { }
+    ) {}
 
     ngOnInit(): void {
         this.authService.registrationResult$
-            .pipe(
-                takeUntilDestroyed(this.destroyRef)
-            )
-            .subscribe(result => {
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
                 if (result?.error) {
                     setErrors(result.error, this.form);
                 } else {
                     this.toastService.show({
-                        header: 'Registration successful',
-                        body: 'You have been successfully registered. Please check your email for a confirmation link.',
-                        type: 'success',
+                        header: "Registration successful",
+                        body: "You have been successfully registered. Please check your email for a confirmation link.",
+                        type: "success",
                     });
-                    this.router.navigate(['/']);
+                    this.router.navigate(["/"]);
                 }
             });
     }
diff --git a/frontend/src/app/user/reset-password/reset-password.component.html b/frontend/src/app/user/reset-password/reset-password.component.html
index 11c7b2dc..ff80cb33 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.html
+++ b/frontend/src/app/user/reset-password/reset-password.component.html
@@ -4,17 +4,21 @@ <h2>Reset password</h2>
 
 <form [formGroup]="form" (ngSubmit)="submit()">
     <div>
-        <label for="password1" class="form-label">
-            New password
-        </label>
+        <label for="password1" class="form-label"> New password </label>
         <input
             type="password"
             id="password1"
             class="form-control"
-            [class.is-invalid]="form.controls.new_password1.touched && form.controls.new_password1.invalid"
+            [class.is-invalid]="
+                form.controls.new_password1.touched &&
+                form.controls.new_password1.invalid
+            "
             [formControl]="form.controls.new_password1"
+        />
+        <p
+            *ngFor="let error of password1Errors$ | async"
+            class="invalid-feedback"
         >
-        <p *ngFor="let error of password1Errors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
     </div>
@@ -26,19 +30,32 @@ <h2>Reset password</h2>
             type="password"
             id="password2"
             class="form-control"
-            [class.is-invalid]="form.controls.new_password2.touched && form.controls.new_password2.invalid"
+            [class.is-invalid]="
+                form.controls.new_password2.touched &&
+                form.controls.new_password2.invalid
+            "
             [formControl]="form.controls.new_password2"
+        />
+        <p
+            *ngFor="let error of password2Errors$ | async"
+            class="invalid-feedback"
         >
-        <p *ngFor="let error of password2Errors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
     </div>
-    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+    <p
+        *ngFor="let error of formErrors$ | async"
+        class="invalid-feedback always-block"
+    >
         {{ error }}
     </p>
     <button type="submit" class="btn btn-primary my-3">
         Submit
-        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+        <div
+            *ngIf="loading$ | async"
+            class="spinner-border spinner-border-sm"
+            role="status"
+        >
             <span class="visually-hidden">Updating password...</span>
         </div>
     </button>
diff --git a/frontend/src/app/user/reset-password/reset-password.component.spec.ts b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
index b83561b9..b6b51159 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.spec.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
@@ -1,21 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { ResetPasswordComponent } from './reset-password.component';
+import { ResetPasswordComponent } from "./reset-password.component";
 
-describe('ResetPasswordComponent', () => {
-  let component: ResetPasswordComponent;
-  let fixture: ComponentFixture<ResetPasswordComponent>;
+describe("ResetPasswordComponent", () => {
+    let component: ResetPasswordComponent;
+    let fixture: ComponentFixture<ResetPasswordComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [ResetPasswordComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [ResetPasswordComponent],
+        });
+        fixture = TestBed.createComponent(ResetPasswordComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(ResetPasswordComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index 1fbbe436..5a01a76d 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -1,87 +1,98 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ResetPassword } from '../models/user';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { identicalPasswordsValidator, passwordValidators } from '../validation';
-import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { combineLatest, map, merge, startWith } from 'rxjs';
-import { AuthService } from '@services/auth.service';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import _ from 'underscore';
-import { ToastService } from '@services/toast.service';
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { ResetPassword } from "../models/user";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { identicalPasswordsValidator, passwordValidators } from "../validation";
+import {
+    controlErrorMessages$,
+    formErrorMessages$,
+    setErrors,
+    updateFormValidity,
+} from "../utils";
+import { combineLatest, map, merge, startWith } from "rxjs";
+import { AuthService } from "@services/auth.service";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import _ from "underscore";
+import { ToastService } from "@services/toast.service";
 
 type ResetPasswordForm = {
     [key in keyof ResetPassword]: FormControl<ResetPassword[key]>;
-}
+};
 
 @Component({
-  selector: 'lc-reset-password',
-  templateUrl: './reset-password.component.html',
-  styleUrls: ['./reset-password.component.scss']
+    selector: "lc-reset-password",
+    templateUrl: "./reset-password.component.html",
+    styleUrls: ["./reset-password.component.scss"],
 })
 export class ResetPasswordComponent implements OnInit {
-    private uid = this.activatedRoute.snapshot.params['uid'];
-    private token = this.activatedRoute.snapshot.params['token'];
+    private uid = this.activatedRoute.snapshot.params["uid"];
+    private token = this.activatedRoute.snapshot.params["token"];
 
-    public form = new FormGroup<ResetPasswordForm>({
-        uid: new FormControl<string>(this.uid, {
-            nonNullable: true
-        }),
-        token: new FormControl<string>(this.token, {
-            nonNullable: true
-        }),
-        new_password1: new FormControl<string>('', {
-            nonNullable: true,
-            validators: [
-                Validators.required,
-                ...passwordValidators
-            ]
-        }),
-        new_password2: new FormControl<string>('', {
-            nonNullable: true,
-            validators: [
-                Validators.required,
-                ...passwordValidators
-            ]
-        }),
-    }, {
-        validators: identicalPasswordsValidator<keyof ResetPassword>('new_password1', 'new_password2')
-    });
+    public form = new FormGroup<ResetPasswordForm>(
+        {
+            uid: new FormControl<string>(this.uid, {
+                nonNullable: true,
+            }),
+            token: new FormControl<string>(this.token, {
+                nonNullable: true,
+            }),
+            new_password1: new FormControl<string>("", {
+                nonNullable: true,
+                validators: [Validators.required, ...passwordValidators],
+            }),
+            new_password2: new FormControl<string>("", {
+                nonNullable: true,
+                validators: [Validators.required, ...passwordValidators],
+            }),
+        },
+        {
+            validators: identicalPasswordsValidator<keyof ResetPassword>(
+                "new_password1",
+                "new_password2",
+            ),
+        },
+    );
 
-    public password1Errors$ = controlErrorMessages$(this.form, 'new_password1', 'password');
-    public password2Errors$ = controlErrorMessages$(this.form, 'new_password2', 'password');
+    public password1Errors$ = controlErrorMessages$(
+        this.form,
+        "new_password1",
+        "password",
+    );
+    public password2Errors$ = controlErrorMessages$(
+        this.form,
+        "new_password2",
+        "password",
+    );
     public formErrors$ = combineLatest([
         formErrorMessages$(this.form),
-        controlErrorMessages$(this.form, 'token'),
-        controlErrorMessages$(this.form, 'uid'),
-    ]).pipe(
-        map(errorLists => _.flatten(errorLists, 1))
-    );
+        controlErrorMessages$(this.form, "token"),
+        controlErrorMessages$(this.form, "uid"),
+    ]).pipe(map((errorLists) => _.flatten(errorLists, 1)));
 
     public loading$ = merge(
         this.authService.resetPassword$.pipe(map(() => true)),
-        this.authService.resetPasswordResult$.pipe(map(() => false))
+        this.authService.resetPasswordResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
 
     constructor(
         private activatedRoute: ActivatedRoute,
         private authService: AuthService,
         private toastService: ToastService,
-        private destroyRef: DestroyRef
-    ) { }
+        private destroyRef: DestroyRef,
+    ) {}
 
     ngOnInit(): void {
         this.authService.resetPasswordResult$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe(result => {
-                if ('error' in result) {
+            .subscribe((result) => {
+                if ("error" in result) {
                     setErrors(result.error, this.form);
                 } else {
                     this.toastService.show({
-                        header: 'Password reset',
-                        body: 'Your password has been successfully reset.',
-                        type: 'success'
-                    })
+                        header: "Password reset",
+                        body: "Your password has been successfully reset.",
+                        type: "success",
+                    });
                 }
             });
     }
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
index 31bd9fc1..d099c610 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.html
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -4,17 +4,18 @@ <h2>User settings</h2>
 
 <form [formGroup]="form" (ngSubmit)="submit()">
     <div *ngIf="form.controls.username as control">
-        <label for="username" class="form-label">
-            Username
-        </label>
+        <label for="username" class="form-label"> Username </label>
         <input
             type="text"
             id="username"
             class="form-control"
             [class.is-invalid]="control.touched && control.invalid"
             [formControl]="control"
+        />
+        <p
+            *ngFor="let error of usernameErrors$ | async"
+            class="invalid-feedback"
         >
-        <p *ngFor="let error of usernameErrors$ | async" class="invalid-feedback">
             {{ error }}
         </p>
     </div>
@@ -24,40 +25,70 @@ <h2>User settings</h2>
             type="text"
             id="first-name"
             class="form-control"
-            [class.is-invalid]="form.controls.firstName.touched && form.controls.firstName.invalid"
-            [formControl]="form.controls.firstName">
+            [class.is-invalid]="
+                form.controls.firstName.touched &&
+                form.controls.firstName.invalid
+            "
+            [formControl]="form.controls.firstName"
+        />
     </div>
     <div>
-        <label for="last-name" class="form-label">
-            Last name
-        </label>
+        <label for="last-name" class="form-label"> Last name </label>
         <input
             type="text"
             id="first-name"
             class="form-control"
-            [class.is-invalid]="form.controls.lastName.touched && form.controls.lastName.invalid"
-            [formControl]="form.controls.lastName">
+            [class.is-invalid]="
+                form.controls.lastName.touched && form.controls.lastName.invalid
+            "
+            [formControl]="form.controls.lastName"
+        />
     </div>
-    <p *ngFor="let error of formErrors$ | async" class="invalid-feedback always-block">
+    <p
+        *ngFor="let error of formErrors$ | async"
+        class="invalid-feedback always-block"
+    >
         {{ error }}
     </p>
 
-    <div class="d-flex flex-wrap justify-content-start align-items-center button-row mt-3">
+    <div
+        class="d-flex flex-wrap justify-content-start align-items-center button-row mt-3"
+    >
         <button type="submit" class="btn btn-primary">
             Save changes
-            <div *ngIf="updateSettingsLoading$ | async" class="spinner-border spinner-border-sm" role="status">
-                <span class="visually-hidden">Requesting password reset link...</span>
+            <div
+                *ngIf="updateSettingsLoading$ | async"
+                class="spinner-border spinner-border-sm"
+                role="status"
+            >
+                <span class="visually-hidden"
+                    >Requesting password reset link...</span
+                >
             </div>
         </button>
-        <button class="btn btn-primary" type="button" (click)="requestPasswordReset()">
+        <button
+            class="btn btn-primary"
+            type="button"
+            (click)="requestPasswordReset()"
+        >
             Request new password
-            <div *ngIf="requestResetLoading$ | async" class="spinner-border spinner-border-sm" role="status">
-                <span class="visually-hidden">Requesting password reset link...</span>
+            <div
+                *ngIf="requestResetLoading$ | async"
+                class="spinner-border spinner-border-sm"
+                role="status"
+            >
+                <span class="visually-hidden">
+                    Requesting password reset link...
+                </span>
             </div>
         </button>
         <button class="btn btn-danger" type="button" (click)="deleteAccount()">
             Delete account
-            <div *ngIf="deleteUserLoading$ | async" class="spinner-border spinner-border-sm" role="status">
+            <div
+                *ngIf="deleteUserLoading$ | async"
+                class="spinner-border spinner-border-sm"
+                role="status"
+            >
                 <span class="visually-hidden">Deleting account...</span>
             </div>
         </button>
diff --git a/frontend/src/app/user/user-settings/user-settings.component.spec.ts b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
index b042a994..57c0217a 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.spec.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
@@ -1,21 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { UserSettingsComponent } from './user-settings.component';
+import { UserSettingsComponent } from "./user-settings.component";
 
-describe('UserSettingsComponent', () => {
-  let component: UserSettingsComponent;
-  let fixture: ComponentFixture<UserSettingsComponent>;
+describe("UserSettingsComponent", () => {
+    let component: UserSettingsComponent;
+    let fixture: ComponentFixture<UserSettingsComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [UserSettingsComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [UserSettingsComponent],
+        });
+        fixture = TestBed.createComponent(UserSettingsComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(UserSettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index 1b42c32b..dea78521 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -1,61 +1,64 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { AuthService } from '@services/auth.service';
-import { UserSettings } from '../models/user';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { filter, map, merge, startWith } from 'rxjs';
-import { controlErrorMessages$, formErrorMessages$, setErrors, updateFormValidity } from '../utils';
-import { ToastService } from '@services/toast.service';
-
-type UserSettingsForm = { [key in keyof UserSettings]: FormControl<UserSettings[key]> };
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { AuthService } from "@services/auth.service";
+import { UserSettings } from "../models/user";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { filter, map, merge, startWith } from "rxjs";
+import {
+    controlErrorMessages$,
+    formErrorMessages$,
+    setErrors,
+    updateFormValidity,
+} from "../utils";
+import { ToastService } from "@services/toast.service";
+
+type UserSettingsForm = {
+    [key in keyof UserSettings]: FormControl<UserSettings[key]>;
+};
 
 @Component({
-  selector: 'lc-user-settings',
-  templateUrl: './user-settings.component.html',
-  styleUrls: ['./user-settings.component.scss']
+    selector: "lc-user-settings",
+    templateUrl: "./user-settings.component.html",
+    styleUrls: ["./user-settings.component.scss"],
 })
 export class UserSettingsComponent implements OnInit {
     public form = new FormGroup<UserSettingsForm>({
         id: new FormControl<number>(-1, {
             nonNullable: true,
-            validators: [
-                Validators.required,
-            ]
+            validators: [Validators.required],
         }),
         // dj-rest-auth does not let you change your email address, so we don't need to validate it.
-        email: new FormControl<string>('', {
-            nonNullable: true
+        email: new FormControl<string>("", {
+            nonNullable: true,
         }),
-        username: new FormControl<string>('', {
+        username: new FormControl<string>("", {
             nonNullable: true,
-            validators: [
-                Validators.required,
-            ]
+            validators: [Validators.required],
         }),
-        firstName: new FormControl<string>('', {
+        firstName: new FormControl<string>("", {
             nonNullable: true,
         }),
-        lastName: new FormControl<string>('', {
+        lastName: new FormControl<string>("", {
             nonNullable: true,
         }),
     });
 
-    public usernameErrors$ = controlErrorMessages$(this.form, 'username');
+    public usernameErrors$ = controlErrorMessages$(this.form, "username");
     public formErrors$ = formErrorMessages$(this.form);
 
     public updateSettingsLoading$ = merge(
         this.authService.updateSettings$.pipe(map(() => true)),
-        this.authService.updateSettingsResult$.pipe(map(() => false))
-    ).pipe(startWith(false))
+        this.authService.updateSettingsResult$.pipe(map(() => false)),
+    ).pipe(startWith(false));
 
     public requestResetLoading$ = merge(
         this.authService.passwordForgotten$.pipe(map(() => true)),
-        this.authService.passwordForgottenResult$.pipe(map(() => false))
+        this.authService.passwordForgottenResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
 
     public deleteUserLoading$ = merge(
         this.authService.deleteUser$.pipe(map(() => true)),
-        this.authService.deleteUserResult$.pipe(map(() => false))
+        this.authService.deleteUserResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
 
     // See submit() for explanation.
@@ -64,15 +67,16 @@ export class UserSettingsComponent implements OnInit {
     constructor(
         private authService: AuthService,
         private toastService: ToastService,
-        private destroyRef: DestroyRef
-    ) { }
+        private destroyRef: DestroyRef,
+    ) {}
 
     ngOnInit(): void {
         this.authService.currentUser$
             .pipe(
-                filter(user => !!user),
-                takeUntilDestroyed(this.destroyRef)
-            ).subscribe(user => {
+                filter((user) => !!user),
+                takeUntilDestroyed(this.destroyRef),
+            )
+            .subscribe((user) => {
                 if (!user) {
                     return;
                 }
@@ -81,55 +85,54 @@ export class UserSettingsComponent implements OnInit {
             });
 
         this.authService.passwordForgottenResult$
-            .pipe(
-                takeUntilDestroyed(this.destroyRef)
-            ).subscribe(result => {
-                if (!('error' in result)) {
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                if (!("error" in result)) {
                     this.toastService.show({
-                        header: 'Password reset email sent',
-                        body: 'An email has been sent to you with instructions on how to reset your password.',
-                        type: 'success'
+                        header: "Password reset email sent",
+                        body: "An email has been sent to you with instructions on how to reset your password.",
+                        type: "success",
                     });
                 }
             });
 
         this.authService.deleteUserResult$
-            .pipe(
-                takeUntilDestroyed(this.destroyRef)
-            ).subscribe(result => {
-                if ('error' in result) {
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                if ("error" in result) {
                     this.toastService.show({
-                        header: 'Error deleting account',
-                        body: 'An error occurred while deleting your account. Please try again later.',
-                        type: 'danger'
+                        header: "Error deleting account",
+                        body: "An error occurred while deleting your account. Please try again later.",
+                        type: "danger",
                     });
                 } else {
                     this.toastService.show({
-                        header: 'Account deleted',
-                        body: 'Your account has been successfully deleted.',
-                        type: 'success'
+                        header: "Account deleted",
+                        body: "Your account has been successfully deleted.",
+                        type: "success",
                     });
                 }
             });
 
         this.authService.updateSettingsResult$
-            .pipe(
-                takeUntilDestroyed(this.destroyRef)
-        ).subscribe(result => {
-            if ('error' in result) {
-                setErrors(result.error, this.form);
-            } else {
-                this.toastService.show({
-                    header: 'Settings updated',
-                    body: 'Your settings have been successfully updated.',
-                    type: 'success'
-                });
-            }
-        });
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                if ("error" in result) {
+                    setErrors(result.error, this.form);
+                } else {
+                    this.toastService.show({
+                        header: "Settings updated",
+                        body: "Your settings have been successfully updated.",
+                        type: "success",
+                    });
+                }
+            });
     }
 
     public requestPasswordReset(): void {
-        this.authService.passwordForgotten$.next({ email: this.form.getRawValue().email });
+        this.authService.passwordForgotten$.next({
+            email: this.form.getRawValue().email,
+        });
     }
 
     public deleteAccount(): void {
diff --git a/frontend/src/app/user/utils.spec.ts b/frontend/src/app/user/utils.spec.ts
index 98214606..34649e6b 100644
--- a/frontend/src/app/user/utils.spec.ts
+++ b/frontend/src/app/user/utils.spec.ts
@@ -1,141 +1,151 @@
-import { TestBed } from '@angular/core/testing';
-import { FormGroup, FormControl, Validators } from '@angular/forms';
-import { User, UserResponse } from './models/user';
-import { parseUserData, encodeUserData, setErrors, controlErrorMessages$, formErrorMessages$, updateFormValidity } from './utils';
-import { toSignal } from '@angular/core/rxjs-interop';
-
-describe('User utils', () => {
+import { TestBed } from "@angular/core/testing";
+import { FormGroup, FormControl, Validators } from "@angular/forms";
+import { User, UserResponse } from "./models/user";
+import {
+    parseUserData,
+    encodeUserData,
+    setErrors,
+    controlErrorMessages$,
+    formErrorMessages$,
+    updateFormValidity,
+} from "./utils";
+import { toSignal } from "@angular/core/rxjs-interop";
+
+describe("User utils", () => {
     let form: FormGroup;
     beforeEach(() => {
         form = new FormGroup({
-            username: new FormControl<string>('', {
-                validators: [
-                    Validators.required
-                ]
+            username: new FormControl<string>("", {
+                validators: [Validators.required],
             }),
-            email: new FormControl<string>('', {
-                validators: [
-                    Validators.required,
-                    Validators.email
-                ]
+            email: new FormControl<string>("", {
+                validators: [Validators.required, Validators.email],
             }),
         });
     });
 
-    describe('parseUserData', () => {
-        it('should return null if result is null', () => {
+    describe("parseUserData", () => {
+        it("should return null if result is null", () => {
             const result: UserResponse | null = null;
             const user = parseUserData(result);
             expect(user).toBeNull();
         });
 
-        it('should return a User object if result is not null', () => {
+        it("should return a User object if result is not null", () => {
             const result: UserResponse = {
                 id: 1,
-                username: 'testuser',
-                email: 'test@example.com',
-                first_name: 'Test',
-                last_name: 'User',
+                username: "testuser",
+                email: "test@example.com",
+                first_name: "Test",
+                last_name: "User",
                 is_staff: true,
             };
             const user = parseUserData(result);
             expect(user).toBeInstanceOf(User);
             expect(user?.id).toBe(1);
-            expect(user?.username).toBe('testuser');
-            expect(user?.email).toBe('test@example.com');
-            expect(user?.firstName).toBe('Test');
-            expect(user?.lastName).toBe('User');
+            expect(user?.username).toBe("testuser");
+            expect(user?.email).toBe("test@example.com");
+            expect(user?.firstName).toBe("Test");
+            expect(user?.lastName).toBe("User");
             expect(user?.isStaff).toBe(true);
         });
     });
 
-    describe('encodeUserData', () => {
-        it('should encode partial User data to UserResponse object', () => {
+    describe("encodeUserData", () => {
+        it("should encode partial User data to UserResponse object", () => {
             const data: Partial<User> = {
                 id: 1,
-                username: 'testuser',
-                email: 'test@example.com',
-                firstName: 'Test',
-                lastName: 'User',
+                username: "testuser",
+                email: "test@example.com",
+                firstName: "Test",
+                lastName: "User",
                 isStaff: true,
             };
             const encoded = encodeUserData(data);
             expect(encoded).toEqual({
                 id: 1,
-                username: 'testuser',
-                email: 'test@example.com',
-                first_name: 'Test',
-                last_name: 'User',
+                username: "testuser",
+                email: "test@example.com",
+                first_name: "Test",
+                last_name: "User",
                 is_staff: true,
             });
         });
     });
 
-    describe('setErrors', () => {
-        it('should set errors on associated controls', () => {
+    describe("setErrors", () => {
+        it("should set errors on associated controls", () => {
             const errorObject = {
-                username: 'Username is required.',
-                email: 'Email is invalid.',
+                username: "Username is required.",
+                email: "Email is invalid.",
             };
             setErrors(errorObject, form);
-            expect(form.get('username')?.errors).toEqual({ 'invalid': 'Username is required.' });
-            expect(form.get('email')?.errors).toEqual({ 'invalid': 'Email is invalid.' });
+            expect(form.get("username")?.errors).toEqual({
+                invalid: "Username is required.",
+            });
+            expect(form.get("email")?.errors).toEqual({
+                invalid: "Email is invalid.",
+            });
         });
 
-        it('should set errors on the form itself for non-associated controls', () => {
+        it("should set errors on the form itself for non-associated controls", () => {
             const errorObject = {
-                random: 'Passwords must be identical.',
+                random: "Passwords must be identical.",
             };
             setErrors(errorObject, form);
             expect(form.errors).toEqual({
-                'invalid': 'Passwords must be identical.'
+                invalid: "Passwords must be identical.",
             });
         });
     });
 
-    describe('controlErrorMessages$', () => {
-        it('should return an Observable of error messages for a specific control', () => {
-            const usernameMessages = TestBed.runInInjectionContext(() => toSignal(controlErrorMessages$(form, 'username')));
+    describe("controlErrorMessages$", () => {
+        it("should return an Observable of error messages for a specific control", () => {
+            const usernameMessages = TestBed.runInInjectionContext(() =>
+                toSignal(controlErrorMessages$(form, "username")),
+            );
 
-            form.get('username')?.updateValueAndValidity();
+            form.get("username")?.updateValueAndValidity();
 
-            expect(usernameMessages()).toEqual(['Username is required.']);
+            expect(usernameMessages()).toEqual(["Username is required."]);
         });
 
-        it('should use errors based on a provided lookup name', () => {
-            const usernameMessages = TestBed.runInInjectionContext(() => toSignal(
-                controlErrorMessages$(form, 'username', 'email'))
+        it("should use errors based on a provided lookup name", () => {
+            const usernameMessages = TestBed.runInInjectionContext(() =>
+                toSignal(controlErrorMessages$(form, "username", "email")),
             );
 
-            form.get('username')?.updateValueAndValidity();
+            form.get("username")?.updateValueAndValidity();
 
-            expect(usernameMessages()).toEqual(['Email is required.']);
+            expect(usernameMessages()).toEqual(["Email is required."]);
         });
     });
 
-    describe('formErrorMessages$', () => {
-        it('should return an Observable of error messages for the form', () => {
-            const formMessages = TestBed.runInInjectionContext(() => toSignal(
-                formErrorMessages$(form))
+    describe("formErrorMessages$", () => {
+        it("should return an Observable of error messages for the form", () => {
+            const formMessages = TestBed.runInInjectionContext(() =>
+                toSignal(formErrorMessages$(form)),
             );
 
             form.updateValueAndValidity();
 
             expect(formMessages()?.length).toBe(0);
 
-            form.setErrors({ 'random': 'This is a random error.' });
+            form.setErrors({ random: "This is a random error." });
 
-            expect(formMessages()).toEqual(['This is a random error.']);
+            expect(formMessages()).toEqual(["This is a random error."]);
         });
     });
 
-    describe('updateFormValidity', () => {
-        it('should update the validity of all controls in the form', () => {
-            form.controls['username'].setErrors({ 'invalid': 'Username is required.' });
-            form.controls['email'].setErrors({ 'invalid': 'Email is invalid.' });
+    describe("updateFormValidity", () => {
+        it("should update the validity of all controls in the form", () => {
+            form.controls["username"].setErrors({
+                invalid: "Username is required.",
+            });
+            form.controls["email"].setErrors({ invalid: "Email is invalid." });
             updateFormValidity(form);
-            expect(form.controls['username'].valid).toBe(false);
-            expect(form.controls['email'].valid).toBe(false);
+            expect(form.controls["username"].valid).toBe(false);
+            expect(form.controls["email"].valid).toBe(false);
             expect(form.valid).toBe(false);
         });
     });
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index 92b25344..3075ddf2 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -1,15 +1,15 @@
 import { AbstractControl, FormGroup } from "@angular/forms";
 import { User, UserResponse } from "./models/user";
-import _ from 'underscore';
+import _ from "underscore";
 import { Observable, map } from "rxjs";
 import { AuthAPIError } from "@services/auth.service";
 
 /**
-* Transforms backend user response to User object
-*
-* @param result User response data
-* @returns User object
-*/
+ * Transforms backend user response to User object
+ *
+ * @param result User response data
+ * @returns User object
+ */
 export const parseUserData = (result: UserResponse | null): User | null => {
     if (!result) {
         return null;
@@ -22,7 +22,7 @@ export const parseUserData = (result: UserResponse | null): User | null => {
         result.last_name,
         result.is_staff,
     );
-}
+};
 
 /**
  * Transfroms User data to backend UserResponse object
@@ -44,7 +44,6 @@ export const encodeUserData = (data: Partial<User>): Partial<UserResponse> => {
     return _.omit(encoded, _.isUndefined);
 };
 
-
 /**
  * Interprets backend validation errors and adds errors to their associated controls.
  *
@@ -53,51 +52,53 @@ export const encodeUserData = (data: Partial<User>): Partial<UserResponse> => {
  * @param errorObject - The error object containing the control names as keys and the corresponding error messages as values.
  * @param form - The form to which the errors should be added.
  */
-export function setErrors(errorObject: AuthAPIError['error'], form: FormGroup): void {
+export function setErrors(
+    errorObject: AuthAPIError["error"],
+    form: FormGroup,
+): void {
     for (const errorKey in errorObject) {
         const control = form.get(errorKey);
         const error = errorObject[errorKey];
-        const errorMessage = Array.isArray(error) ? error.join('; ') : error;
+        const errorMessage = Array.isArray(error) ? error.join("; ") : error;
         if (control) {
-            control.setErrors({'invalid': errorMessage});
+            control.setErrors({ invalid: errorMessage });
         } else {
-            form.setErrors({'invalid': errorMessage});
+            form.setErrors({ invalid: errorMessage });
         }
     }
 }
 
 export const ERROR_MAP: Record<string, Record<string, string>> = {
     username: {
-        'required': 'Username is required.',
-        'minlength': 'Username must be at least 3 characters long.',
-        'maxlength': 'Username must be at most 150 characters long.',
+        required: "Username is required.",
+        minlength: "Username must be at least 3 characters long.",
+        maxlength: "Username must be at most 150 characters long.",
     },
     email: {
-        'required': 'Email is required.',
-        'email': 'Email is invalid.',
+        required: "Email is required.",
+        email: "Email is invalid.",
     },
     password: {
-        'required': 'Password is required.',
-        'minlength': 'Password must be at least 8 characters long.',
+        required: "Password is required.",
+        minlength: "Password must be at least 8 characters long.",
     },
     token: {
-        'invalid': 'The URL is invalid. Please request a new one.'
+        invalid: "The URL is invalid. Please request a new one.",
     },
     uid: {
-        'invalid': 'The URL is invalid. Please request a new one.'
+        invalid: "The URL is invalid. Please request a new one.",
     },
     form: {
-        'passwords': 'Passwords must be identical.',
+        passwords: "Passwords must be identical.",
     },
     firstName: {
-        'required': 'First name is required.',
+        required: "First name is required.",
     },
     lastName: {
-        'required': 'Last name is required.',
+        required: "Last name is required.",
     },
 };
 
-
 /**
  * Watches a FormControl and turns its errors into an array of string messages.
  *
@@ -109,16 +110,17 @@ export const ERROR_MAP: Record<string, Record<string, string>> = {
  * @param lookup - The key to use in the error map. Defaults to the control name.
  * @returns An Observable that emits an array of error messages every time the control's status changes.
  */
-export function controlErrorMessages$<F extends FormGroup, K extends string & keyof F['controls']>(
-    form: F,
-    controlName: K,
-    lookup?: string,
-): Observable<string[]> {
+export function controlErrorMessages$<
+    F extends FormGroup,
+    K extends string & keyof F["controls"],
+>(form: F, controlName: K, lookup?: string): Observable<string[]> {
     const control = form.controls[controlName];
     // Get a subset of error messages based on the lookup key, if provided, or the control name.
-    const messagesForControl = lookup ? ERROR_MAP[lookup] : ERROR_MAP[controlName] ?? ERROR_MAP['form'];
+    const messagesForControl = lookup
+        ? ERROR_MAP[lookup]
+        : ERROR_MAP[controlName] ?? ERROR_MAP["form"];
     return control.statusChanges.pipe(
-        map(() => mapErrorsToMessages(control, messagesForControl))
+        map(() => mapErrorsToMessages(control, messagesForControl)),
     );
 }
 
@@ -132,10 +134,13 @@ export function controlErrorMessages$<F extends FormGroup, K extends string & ke
  * @param lookup Optional parameter to specify a specific error lookup key.
  * @returns An observable that emits an array of error messages.
  */
-export function formErrorMessages$<F extends FormGroup>(form: F, lookup?: string): Observable<string[]> {
-    const messagesForForm = lookup ? ERROR_MAP[lookup] : ERROR_MAP['form'];
+export function formErrorMessages$<F extends FormGroup>(
+    form: F,
+    lookup?: string,
+): Observable<string[]> {
+    const messagesForForm = lookup ? ERROR_MAP[lookup] : ERROR_MAP["form"];
     return form.statusChanges.pipe(
-        map(() => mapErrorsToMessages(form, messagesForForm))
+        map(() => mapErrorsToMessages(form, messagesForForm)),
     );
 }
 
@@ -148,10 +153,14 @@ export function formErrorMessages$<F extends FormGroup>(form: F, lookup?: string
  * @param errorMap - The map of error keys to error messages.
  * @returns An array of error messages.
  */
-function mapErrorsToMessages(control: AbstractControl, errorMap: Record<string, string>): string[] {
+function mapErrorsToMessages(
+    control: AbstractControl,
+    errorMap: Record<string, string>,
+): string[] {
     const errors = control.errors ?? {};
-    return Object.keys(errors)
-        .map(errorKey => errorKey in errorMap ? errorMap[errorKey] : errors[errorKey]);
+    return Object.keys(errors).map((errorKey) =>
+        errorKey in errorMap ? errorMap[errorKey] : errors[errorKey],
+    );
 }
 
 /**
@@ -160,7 +169,7 @@ function mapErrorsToMessages(control: AbstractControl, errorMap: Record<string,
  * @param form - The form group to update.
  */
 export function updateFormValidity(form: FormGroup): void {
-    Object.values(form.controls).forEach(control => {
+    Object.values(form.controls).forEach((control) => {
         control.updateValueAndValidity();
     });
     form.updateValueAndValidity();
diff --git a/frontend/src/app/user/validation.ts b/frontend/src/app/user/validation.ts
index 91814714..adea086a 100644
--- a/frontend/src/app/user/validation.ts
+++ b/frontend/src/app/user/validation.ts
@@ -1,4 +1,9 @@
-import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from "@angular/forms";
+import {
+    AbstractControl,
+    ValidationErrors,
+    ValidatorFn,
+    Validators,
+} from "@angular/forms";
 
 /**
  * Validation for usernames
@@ -15,11 +20,8 @@ export const usernameValidators = [
 
 /**
  * Validation for passwords
-*/
-export const passwordValidators = [
-    Validators.minLength(8),
-];
-
+ */
+export const passwordValidators = [Validators.minLength(8)];
 
 /**
  * Form-level validator that checks whether two password fields have identical values.
@@ -28,8 +30,10 @@ export const passwordValidators = [
  * @param password2ControlName - The name of the second password control field on the form.
  * @returns A `ValidationErrors` object if the passwords do not match, otherwise `null`.
  */
-export function identicalPasswordsValidator<T>(password1ControlName: string & T, password2ControlName: string & T): ValidatorFn {
-
+export function identicalPasswordsValidator<T>(
+    password1ControlName: string & T,
+    password2ControlName: string & T,
+): ValidatorFn {
     return (form: AbstractControl): ValidationErrors | null => {
         const password1 = form.get(password1ControlName);
         const password2 = form.get(password2ControlName);
@@ -38,6 +42,8 @@ export function identicalPasswordsValidator<T>(password1ControlName: string & T,
             return null;
         }
 
-        return password1.value === password2.value ? null : { 'passwords': 'Passwords do not match' };
+        return password1.value === password2.value
+            ? null
+            : { passwords: "Passwords do not match" };
     };
 }
diff --git a/frontend/src/app/user/verify-email/verify-email.component.html b/frontend/src/app/user/verify-email/verify-email.component.html
index 48588932..0e3c8c1f 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.html
+++ b/frontend/src/app/user/verify-email/verify-email.component.html
@@ -3,13 +3,17 @@ <h1>Confirm e-mail address</h1>
 <div *ngIf="userDetails$ | async as userDetails" class="mb-3">
     <p>
         Please confirm that
-        <a href="mailto:{{userDetails.email}}">{{userDetails.email}}</a>
-        is an e-mail address for user {{userDetails.username}}.
+        <a href="mailto:{{ userDetails.email }}">{{ userDetails.email }}</a>
+        is an e-mail address for user {{ userDetails.username }}.
     </p>
 
     <button class="btn btn-primary" (click)="confirm()">
         Confirm
-        <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm" role="status">
+        <div
+            *ngIf="loading$ | async"
+            class="spinner-border spinner-border-sm"
+            role="status"
+        >
             <span class="visually-hidden">Verifying email...</span>
         </div>
     </button>
diff --git a/frontend/src/app/user/verify-email/verify-email.component.spec.ts b/frontend/src/app/user/verify-email/verify-email.component.spec.ts
index 62cf6285..85a9930b 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.spec.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.spec.ts
@@ -1,9 +1,9 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { VerifyEmailComponent } from './verify-email.component';
-import { SharedTestingModule } from '@shared/shared-testing.module';
+import { VerifyEmailComponent } from "./verify-email.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
-describe('VerifyEmailComponent', () => {
+describe("VerifyEmailComponent", () => {
     let component: VerifyEmailComponent;
     let fixture: ComponentFixture<VerifyEmailComponent>;
 
@@ -17,7 +17,7 @@ describe('VerifyEmailComponent', () => {
         fixture.detectChanges();
     });
 
-    it('should create', () => {
+    it("should create", () => {
         expect(component).toBeTruthy();
     });
 });
diff --git a/frontend/src/app/user/verify-email/verify-email.component.ts b/frontend/src/app/user/verify-email/verify-email.component.ts
index 2f284771..0245bc08 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.ts
@@ -1,71 +1,70 @@
-import { AfterViewInit, Component, DestroyRef, OnInit } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { ActivatedRoute } from '@angular/router';
-import { AuthService } from '@services/auth.service';
-import { ToastService } from '@services/toast.service';
-import { map, merge, share, startWith } from 'rxjs';
-
+import { AfterViewInit, Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute } from "@angular/router";
+import { AuthService } from "@services/auth.service";
+import { ToastService } from "@services/toast.service";
+import { map, merge, share, startWith } from "rxjs";
 
 @Component({
-    selector: 'lc-verify-email',
-    templateUrl: './verify-email.component.html',
-    styleUrls: ['./verify-email.component.scss']
+    selector: "lc-verify-email",
+    templateUrl: "./verify-email.component.html",
+    styleUrls: ["./verify-email.component.scss"],
 })
 export class VerifyEmailComponent implements OnInit, AfterViewInit {
-    private key = this.activatedRoute.snapshot.params['key'];
+    private key = this.activatedRoute.snapshot.params["key"];
 
     private keyInfoError$ = this.authService.keyInfoResult$.pipe(
-        map(results => 'error' in results ? results : null),
+        map((results) => ("error" in results ? results : null)),
     );
 
     public userDetails$ = this.authService.keyInfoResult$.pipe(
-        map(results => 'error' in results ? null : results),
-        share()
+        map((results) => ("error" in results ? null : results)),
+        share(),
     );
 
     public loading$ = merge(
         this.authService.verifyEmail$.pipe(map(() => true)),
-        this.authService.verifyEmailResult$.pipe(map(() => false))
+        this.authService.verifyEmailResult$.pipe(map(() => false)),
     ).pipe(startWith(false));
 
     constructor(
         private activatedRoute: ActivatedRoute,
         private authService: AuthService,
         private toastService: ToastService,
-        private destroyRef: DestroyRef
-    ) { }
+        private destroyRef: DestroyRef,
+    ) {}
 
     ngOnInit(): void {
-        this.keyInfoError$.pipe(
-            takeUntilDestroyed(this.destroyRef)
-        ).subscribe(result => {
-            if (!result) {
-                return;
-            }
-            this.toastService.show({
-                header: 'Email address verification failed.',
-                body: 'Failed to verify email address.',
-                type: 'danger'
-            });
-        });
-
-        this.authService.verifyEmailResult$.pipe(
-            takeUntilDestroyed(this.destroyRef)
-        ).subscribe(result => {
-            if ('error' in result) {
-                this.toastService.show({
-                    header: 'Email verification failed',
-                    body: 'Failed to verify email address.',
-                    type: 'danger',
-                })
-            } else {
+        this.keyInfoError$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                if (!result) {
+                    return;
+                }
                 this.toastService.show({
-                    header: 'Email verified',
-                    body: 'Email address has been verified.',
-                    type: 'success',
+                    header: "Email address verification failed.",
+                    body: "Failed to verify email address.",
+                    type: "danger",
                 });
-            }
-        });
+            });
+
+        this.authService.verifyEmailResult$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                if ("error" in result) {
+                    this.toastService.show({
+                        header: "Email verification failed",
+                        body: "Failed to verify email address.",
+                        type: "danger",
+                    });
+                } else {
+                    this.toastService.show({
+                        header: "Email verified",
+                        body: "Email address has been verified.",
+                        type: "success",
+                    });
+                }
+            });
     }
 
     ngAfterViewInit(): void {

From 1041a0e9a7dcb40bd0c6b1c3da57558c3a6c2b71 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 16:39:39 +0200
Subject: [PATCH 041/565] Register component tests

---
 .../app/user/login/login.component.spec.ts    |   3 +-
 .../user/register/register.component.spec.ts  | 160 ++++++++++++++++--
 frontend/src/app/user/validation.ts           |   2 +-
 3 files changed, 148 insertions(+), 17 deletions(-)

diff --git a/frontend/src/app/user/login/login.component.spec.ts b/frontend/src/app/user/login/login.component.spec.ts
index 05fa9ac7..a04398f2 100644
--- a/frontend/src/app/user/login/login.component.spec.ts
+++ b/frontend/src/app/user/login/login.component.spec.ts
@@ -45,7 +45,7 @@ describe("LoginComponent", () => {
         });
     });
 
-    it("should check invalid usernames", () => {
+    it("should check invalid login details", () => {
         component.form.controls.username.setValue("te$t");
         component.form.controls.password.setValue("secretpassword");
         component.submit();
@@ -80,6 +80,7 @@ describe("LoginComponent", () => {
 
         component.submit();
         expect(loading()).toBeTrue();
+        expect(component.form.valid).toBeTrue();
 
         const req = httpTestingController.expectOne("/users/login/");
         req.flush({ key: "abcdefghijklmnopqrstuvwxyz" });
diff --git a/frontend/src/app/user/register/register.component.spec.ts b/frontend/src/app/user/register/register.component.spec.ts
index 9c4c73c8..7ff77b54 100644
--- a/frontend/src/app/user/register/register.component.spec.ts
+++ b/frontend/src/app/user/register/register.component.spec.ts
@@ -1,21 +1,151 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { RegisterComponent } from "./register.component";
+import { HttpTestingController } from "@angular/common/http/testing";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { Router } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import { toSignal } from "@angular/core/rxjs-interop";
 
-import { RegisterComponent } from './register.component';
+describe("RegisterComponent", () => {
+    let component: RegisterComponent;
+    let fixture: ComponentFixture<RegisterComponent>;
+    let httpTestingController: HttpTestingController;
+    let router: Router;
+    let toastService: ToastService;
 
-describe('RegisterComponent', () => {
-  let component: RegisterComponent;
-  let fixture: ComponentFixture<RegisterComponent>;
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [RegisterComponent],
+            imports: [SharedTestingModule]
+        });
+        httpTestingController = TestBed.inject(HttpTestingController);
+        toastService = TestBed.inject(ToastService);
+        router = TestBed.inject(Router);
+        fixture = TestBed.createComponent(RegisterComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+
+    it("should check missing input", () => {
+        component.submit();
+
+        httpTestingController.expectNone("/users/registration/");
+
+        expect(component.form.controls.username.invalid).toBeTrue();
+        expect(component.form.controls.username.errors).toEqual({
+            required: true,
+        });
+
+        expect(component.form.controls.email.invalid).toBeTrue();
+        expect(component.form.controls.email.errors).toEqual({
+            required: true,
+        });
+
+        expect(component.form.controls.password1.invalid).toBeTrue();
+        expect(component.form.controls.password1.errors).toEqual({
+            required: true,
+        });
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [RegisterComponent]
+        expect(component.form.controls.password2.invalid).toBeTrue();
+        expect(component.form.controls.password2.errors).toEqual({
+            required: true,
+        });
     });
-    fixture = TestBed.createComponent(RegisterComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it("should check whether a username has the required length", () => {
+        const control = component.form.controls.username;
+        control.setValue("a");
+        control.updateValueAndValidity();
+        expect(control.errors).toEqual({
+            minlength: { requiredLength: 3, actualLength: 1 },
+        });
+
+        control.setValue("ThisNameIsTooLong".repeat(10));
+        control.updateValueAndValidity();
+        expect(control.errors).toEqual({
+            maxlength: { requiredLength: 150, actualLength: 170 },
+        });
+    });
+
+    it("should check whether an email is valid", () => {
+        const control = component.form.controls.email;
+        control.setValue("invalid");
+        control.updateValueAndValidity();
+        expect(control.errors).toEqual({
+            email: true,
+        });
+    });
+
+    it("should check whether a password has the required length", () => {
+        const control = component.form.controls.password1;
+        control.setValue("a");
+        control.updateValueAndValidity();
+        expect(control.errors).toEqual({
+            minlength: { requiredLength: 8, actualLength: 1 },
+        });
+    });
+
+    it("should check whether passwords are identical", () => {
+        component.form.controls.password1.setValue("password");
+        component.form.controls.password2.setValue("password1");
+        component.submit();
+
+        expect(component.form.invalid).toBeTrue();
+        expect(component.form.errors).toEqual({
+            passwords: true,
+        });
+    });
+
+    it("should handle valid input", () => {
+        component.form.controls.username.setValue("frodo");
+        component.form.controls.email.setValue("frodo@shire.me");
+        component.form.controls.password1.setValue("theonering");
+        component.form.controls.password2.setValue("theonering");
+
+        const routerSpy = spyOn(router, "navigate");
+
+        const loading = TestBed.runInInjectionContext(() =>
+            toSignal(component.loading$),
+        );
+
+        component.submit();
+        expect(loading()).toBeTrue();
+        expect(component.form.valid).toBeTrue();
+
+        const req = httpTestingController.expectOne("/users/registration/");
+        req.flush(null);
+
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(1);
+        expect(routerSpy).toHaveBeenCalledWith(["/"]);
+    });
+
+    it("should handle trying to register with an existing username", () => {
+        component.form.controls.username.setValue("frodo");
+        component.form.controls.email.setValue("frodo@shire.me");
+        component.form.controls.password1.setValue("theonering");
+        component.form.controls.password2.setValue("theonering");
+
+        const routerSpy = spyOn(router, "navigate");
+
+        const loading = TestBed.runInInjectionContext(() =>
+            toSignal(component.loading$),
+        );
+
+        component.submit();
+        expect(loading()).toBeTrue();
+        expect(component.form.valid).toBeTrue();
+
+        const req = httpTestingController.expectOne("/users/registration/");
+        req.flush({"username":["A user with that username already exists."]}, { status: 400, statusText: "Bad request" });
+
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(0);
+        expect(routerSpy).not.toHaveBeenCalled();
+        expect(component.form.controls.username.errors).toEqual({ invalid: 'A user with that username already exists.' });
+    });
 });
diff --git a/frontend/src/app/user/validation.ts b/frontend/src/app/user/validation.ts
index adea086a..7c1ba1bb 100644
--- a/frontend/src/app/user/validation.ts
+++ b/frontend/src/app/user/validation.ts
@@ -44,6 +44,6 @@ export function identicalPasswordsValidator<T>(
 
         return password1.value === password2.value
             ? null
-            : { passwords: "Passwords do not match" };
+            : { passwords: true };
     };
 }

From 2fb0d0339e28c8f181137a730755e982c6f6646b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 23:02:38 +0200
Subject: [PATCH 042/565] Reset password unit tests

---
 .../reset-password.component.spec.ts          | 109 +++++++++++++++++-
 frontend/src/app/user/utils.ts                |   2 +-
 2 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/user/reset-password/reset-password.component.spec.ts b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
index b6b51159..a22ea05e 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.spec.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
@@ -1,15 +1,24 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { ResetPasswordComponent } from "./reset-password.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { ToastService } from "@services/toast.service";
+import { HttpTestingController } from "@angular/common/http/testing";
+import { toSignal } from "@angular/core/rxjs-interop";
 
-describe("ResetPasswordComponent", () => {
+fdescribe("ResetPasswordComponent", () => {
     let component: ResetPasswordComponent;
     let fixture: ComponentFixture<ResetPasswordComponent>;
+    let toastService: ToastService;
+    let httpTestingController: HttpTestingController;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [ResetPasswordComponent],
+            imports: [SharedTestingModule]
         });
+        toastService = TestBed.inject(ToastService);
+        httpTestingController = TestBed.inject(HttpTestingController);
         fixture = TestBed.createComponent(ResetPasswordComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
@@ -18,4 +27,102 @@ describe("ResetPasswordComponent", () => {
     it("should create", () => {
         expect(component).toBeTruthy();
     });
+
+    it("should check missing input", () => {
+        component.submit();
+        expect(component.form.controls.new_password1.invalid).toBeTrue();
+        expect(component.form.controls.new_password1.errors).toEqual({
+            required: true
+        });
+        expect(component.form.controls.new_password2.invalid).toBeTrue();
+        expect(component.form.controls.new_password2.errors).toEqual({
+            required: true
+        });
+    });
+
+    it("should handle an invalid UID", () => {
+        component.form.setValue({
+            uid: "abcdefg",
+            token: "hijklm",
+            new_password1: "balrogofmorgoth",
+            new_password2: "balrogofmorgoth"
+        })
+        component.submit();
+
+        const req = httpTestingController.expectOne("/users/password/reset/confirm/");
+        req.flush({
+            uid: ["Invalid value"]
+        }, {
+            status: 400, statusText: "Bad request"
+        });
+
+        expect(component.form.invalid).toBeTrue();
+        expect(component.form.controls.uid.errors).toEqual({
+            'invalid': 'Invalid value'
+        });
+    });
+
+    it("should handle an invalid token", () => {
+        component.form.setValue({
+            uid: "abcdefg",
+            token: "hijklm",
+            new_password1: "balrogofmorgoth",
+            new_password2: "balrogofmorgoth"
+        })
+        component.submit();
+
+        const req = httpTestingController.expectOne("/users/password/reset/confirm/");
+        req.flush({
+            token: ["Invalid value"]
+        }, {
+            status: 400, statusText: "Bad request"
+        });
+
+        expect(component.form.invalid).toBeTrue();
+        expect(component.form.controls.token.errors).toEqual({
+            'invalid': 'Invalid value'
+        });
+    });
+
+    it("should handle a password mismatch", () => {
+        component.form.setValue({
+            uid: "valid",
+            token: "valid",
+            new_password1: "balrogofmorgoth",
+            new_password2: "frodooftheshire"
+        });
+        component.submit();
+
+        httpTestingController.expectNone("/users/password/reset/confirm/");
+
+        expect(component.form.invalid).toBeTrue();
+        expect(component.form.errors).toEqual({
+            'passwords': true
+        });
+    });
+
+    it("should handle a successful password reset", () => {
+        component.form.setValue({
+            uid: "valid",
+            token: "valid",
+            new_password1: "balrogofmorgoth",
+            new_password2: "balrogofmorgoth"
+        });
+
+        const loading = TestBed.runInInjectionContext(() =>
+            toSignal(component.loading$)
+        );
+
+        component.submit();
+        expect(loading()).toBeTrue();
+        expect(component.form.valid).toBeTrue();
+
+        const req = httpTestingController.expectOne("/users/password/reset/confirm/");
+        req.flush({
+            detail: "Password has been reset with the new password."
+        });
+
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(1);
+    });
 });
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index 3075ddf2..8921d879 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -100,7 +100,7 @@ export const ERROR_MAP: Record<string, Record<string, string>> = {
 };
 
 /**
- * Watches a FormControl and turns its errors into an array of string messages.
+ * Watches a FormControl and returns an Observable that yields an array of error messages.
  *
  * Uses the optional parameter `lookup` to determine which error messages from `ERROR_MAP` to use. If no `lookup` is
  * provided, `controlName` is used. If no error messages are found using either `lookup` or `controlName`, `ERROR_MAP['form']` is used.

From b01b376c9c0e11e874dfbbedda8709b905099a31 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 5 May 2024 23:43:01 +0200
Subject: [PATCH 043/565] UserSettings tests

---
 .../reset-password.component.spec.ts          |   2 +-
 .../user-settings.component.spec.ts           | 155 ++++++++++++++++++
 .../user-settings/user-settings.component.ts  |   6 +-
 3 files changed, 161 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/user/reset-password/reset-password.component.spec.ts b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
index a22ea05e..d0990934 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.spec.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.spec.ts
@@ -6,7 +6,7 @@ import { ToastService } from "@services/toast.service";
 import { HttpTestingController } from "@angular/common/http/testing";
 import { toSignal } from "@angular/core/rxjs-interop";
 
-fdescribe("ResetPasswordComponent", () => {
+describe("ResetPasswordComponent", () => {
     let component: ResetPasswordComponent;
     let fixture: ComponentFixture<ResetPasswordComponent>;
     let toastService: ToastService;
diff --git a/frontend/src/app/user/user-settings/user-settings.component.spec.ts b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
index 57c0217a..13e6a606 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.spec.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
@@ -1,15 +1,46 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { UserSettingsComponent } from "./user-settings.component";
+import { ToastService } from "@services/toast.service";
+import { AuthService } from "@services/auth.service";
+import { HttpTestingController } from "@angular/common/http/testing";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { User } from "../models/user";
+import { Observable, of } from "rxjs";
+import { Injectable } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+
+const fakeUser: User = {
+    id: 1,
+    email: 'frodo@shire.me',
+    firstName: 'Frodo',
+    lastName: 'Baggins',
+    username: 'frodo',
+    isStaff: false
+}
+
+@Injectable({ providedIn: 'root' })
+class AuthServiceMock extends AuthService {
+    public override currentUser$: Observable<User | null | undefined> = of(fakeUser);
+}
 
 describe("UserSettingsComponent", () => {
     let component: UserSettingsComponent;
     let fixture: ComponentFixture<UserSettingsComponent>;
+    let toastService: ToastService;
+    let httpTestingController: HttpTestingController;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [UserSettingsComponent],
+            providers: [{
+                provide: AuthService,
+                useClass: AuthServiceMock
+            }],
+            imports: [SharedTestingModule]
         });
+        toastService = TestBed.inject(ToastService);
+        httpTestingController = TestBed.inject(HttpTestingController);
         fixture = TestBed.createComponent(UserSettingsComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
@@ -18,4 +49,128 @@ describe("UserSettingsComponent", () => {
     it("should create", () => {
         expect(component).toBeTruthy();
     });
+
+    it("should patch the form with existing user data during OnInit", () => {
+        expect(component.form.value).toEqual({
+            id: 1,
+            email: 'frodo@shire.me',
+            username: 'frodo',
+            firstName: 'Frodo',
+            lastName: 'Baggins'
+        });
+        expect(component['currentUsername']).toBe('frodo');
+    });
+
+    it("should check missing input", () => {
+        component.form.controls.username?.setValue('');
+        component.submit();
+
+        httpTestingController.expectNone("/users/user/");
+
+        expect(component.form.controls.username?.invalid).toBeTrue();
+        expect(component.form.controls.username?.errors).toEqual({
+            required: true
+        });
+    });
+
+    it("should handle an invalid username", () => {
+        component.form.controls.username?.setValue('fb');
+        component.submit();
+
+        httpTestingController.expectNone("/users/user/");
+
+        expect(component.form.controls.username?.invalid).toBeTrue();
+        expect(component.form.controls.username?.errors).toEqual({
+            minlength: {requiredLength: 3, actualLength: 2}
+        });
+    });
+
+    it("should handle a username that is already taken", () => {
+        component.form.controls.username?.setValue('frodo');
+        component.submit();
+
+        const req = httpTestingController.expectOne("/users/user/");
+        req.flush({
+            username: ["A user with that username already exists." ]
+        }, {
+            status: 400, statusText: "Bad request"
+        });
+
+        expect(component.form.invalid).toBeTrue();
+        expect(component.form.controls.username?.errors).toEqual({
+            'invalid': 'A user with that username already exists.'
+        });
+    });
+
+    it("should handle a password reset request", () => {
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.requestResetLoading$));
+
+        component.requestPasswordReset();
+        expect(loading()).toBeTrue()
+
+        const req = httpTestingController.expectOne("/users/password/reset/");
+        req.flush({
+            detail: "Password reset e-mail has been sent."
+        });
+
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(1);
+    });
+
+    it("should handle a user settings update", () => {
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.updateSettingsLoading$));
+
+        component.form.controls.firstName.setValue('Bilbo');
+
+        component.submit();
+        expect(loading()).toBeTrue()
+
+        const req = httpTestingController.expectOne("/users/user/");
+        req.flush({
+            "id": 1,
+            "username": "frodo",
+            "email": "frodo@shire.me",
+            "first_name": "Bilbo",
+            "last_name": "Baggins",
+            "is_staff": false
+        });
+
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(1);
+        expect(component.form.controls.firstName.value).toBe('Bilbo');
+    });
+
+    it("should handle a username change", () => {
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.updateSettingsLoading$));
+
+        component.form.controls.username?.setValue('Samwise');
+
+        component.submit();
+        expect(loading()).toBeTrue();
+
+        const req = httpTestingController.expectOne("/users/user/");
+        req.flush({
+            "id": 1,
+            "username": "Samwise",
+            "email": "frodo@shire.me",
+            "first_name": "Frodo",
+            "last_name": "Baggins",
+            "is_staff": false
+        });
+
+        expect(loading()).toBeFalse();
+        expect(toastService.toasts.length).toBe(1);
+        expect(component.form.controls.username?.value).toBe('Samwise');
+    });
+
+    it("should remove the username from the input if it's the same as the current username", () => {
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.updateSettingsLoading$));
+
+        component.submit();
+        expect(loading()).toBeTrue();
+
+        const req = httpTestingController.expectOne("/users/user/").request;
+        expect(req.method).toBe('PATCH');
+        expect(req.body).not.toContain('username');
+    });
 });
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index dea78521..bf982e5e 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -11,6 +11,7 @@ import {
     updateFormValidity,
 } from "../utils";
 import { ToastService } from "@services/toast.service";
+import { usernameValidators } from "../validation";
 
 type UserSettingsForm = {
     [key in keyof UserSettings]: FormControl<UserSettings[key]>;
@@ -33,7 +34,10 @@ export class UserSettingsComponent implements OnInit {
         }),
         username: new FormControl<string>("", {
             nonNullable: true,
-            validators: [Validators.required],
+            validators: [
+                Validators.required,
+                ...usernameValidators
+            ],
         }),
         firstName: new FormControl<string>("", {
             nonNullable: true,

From 36e190c89bf482265d8b7c09d76e0d65c7525ff7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 8 May 2024 09:59:26 +0200
Subject: [PATCH 044/565] VerifyEmail tests

---
 .../verify-email/verify-email.component.html  |  9 +++-
 .../verify-email.component.spec.ts            | 52 +++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/user/verify-email/verify-email.component.html b/frontend/src/app/user/verify-email/verify-email.component.html
index 0e3c8c1f..0d61394a 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.html
+++ b/frontend/src/app/user/verify-email/verify-email.component.html
@@ -1,6 +1,6 @@
 <h1>Confirm e-mail address</h1>
 
-<div *ngIf="userDetails$ | async as userDetails" class="mb-3">
+<div *ngIf="userDetails$ | async as userDetails; else noUser" class="mb-3">
     <p>
         Please confirm that
         <a href="mailto:{{ userDetails.email }}">{{ userDetails.email }}</a>
@@ -18,3 +18,10 @@ <h1>Confirm e-mail address</h1>
         </div>
     </button>
 </div>
+
+<ng-template #noUser>
+    <section class="no-user-details mt-4">
+        <h5>User details could not be verified.</h5>
+        <p>Please check the URL, refresh the page and request a new verification link if the problem persists.</p>
+    </section>
+</ng-template>
diff --git a/frontend/src/app/user/verify-email/verify-email.component.spec.ts b/frontend/src/app/user/verify-email/verify-email.component.spec.ts
index 85a9930b..e7f46030 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.spec.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.spec.ts
@@ -2,16 +2,26 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { VerifyEmailComponent } from "./verify-email.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { AuthService } from "@services/auth.service";
+import { ToastService } from "@services/toast.service";
+import { HttpTestingController } from "@angular/common/http/testing";
+import { By } from "@angular/platform-browser";
+import { toSignal } from "@angular/core/rxjs-interop";
 
 describe("VerifyEmailComponent", () => {
     let component: VerifyEmailComponent;
     let fixture: ComponentFixture<VerifyEmailComponent>;
+    let toastService: ToastService;
+    let httpTestingController: HttpTestingController
 
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [VerifyEmailComponent],
+            providers: [AuthService],
             imports: [SharedTestingModule],
         });
+        toastService = TestBed.inject(ToastService);
+        httpTestingController = TestBed.inject(HttpTestingController);
         fixture = TestBed.createComponent(VerifyEmailComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
@@ -20,4 +30,46 @@ describe("VerifyEmailComponent", () => {
     it("should create", () => {
         expect(component).toBeTruthy();
     });
+
+    it("should handle a key info error", () => {
+        const req = httpTestingController.expectOne('/users/registration/key-info/');
+
+        req.flush('Confirmation key does not exist.', { status: 400, statusText: 'Bad request' });
+
+        expect(toastService.toasts.length).toBe(1);
+
+        fixture.detectChanges();
+        const element = fixture.debugElement;
+        expect(element.query(By.css('.no-user-details'))).toBeTruthy();
+    });
+
+    it("should handle a successful email verification", () => {
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
+
+        component.confirm();
+        expect(loading()).toBeTrue();
+
+        const req = httpTestingController.expectOne('/users/registration/verify-email/');
+        req.flush({ detail: "ok" });
+
+        expect(toastService.toasts.length).toBe(1);
+        expect(toastService.toasts[0].header).toBe('Email verified');
+        expect(loading()).toBeFalse();
+    });
+
+    it("should handle a failed email verification", () => {
+        const loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
+
+        component.confirm();
+        expect(loading()).toBeTrue();
+
+        const req = httpTestingController.expectOne('/users/registration/verify-email/');
+        req.flush({
+            detail: "Not found."
+        }, { status: 404, statusText: "Not Found" });
+
+        expect(toastService.toasts.length).toBe(1);
+        expect(toastService.toasts[0].header).toBe('Email verification failed');
+        expect(loading()).toBeFalse();
+    });
 });

From e2f9ea09c4050d3ef72c3a19b3c75fc076e84323 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 8 May 2024 09:59:40 +0200
Subject: [PATCH 045/565] Use Bootstrap text-bg classes

---
 frontend/src/app/services/toast.service.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/services/toast.service.ts b/frontend/src/app/services/toast.service.ts
index 31339417..bd40e04e 100644
--- a/frontend/src/app/services/toast.service.ts
+++ b/frontend/src/app/services/toast.service.ts
@@ -17,10 +17,10 @@ export interface ToastInput {
 }
 
 export const TOAST_STYLES: Record<ToastType, string> = {
-    success: 'bg-success text-light',
-    info: 'bg-info text-dark',
-    warning: 'bg-warning text-dark',
-    danger: 'bg-danger text-light',
+    success: 'text-bg-success',
+    info: 'text-bg-info',
+    warning: 'text-bg-warning',
+    danger: 'text-bg-danger',
 };
 
 @Injectable({

From 0699ddd9253d5ced5e3f51b7868786ec16ec8fbd Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 14 May 2024 14:59:09 +0200
Subject: [PATCH 046/565] UserMenu tests (WIP)

---
 .../user-menu/user-menu.component.spec.ts     | 64 +++++++++++++------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
index c4916107..0f2c3451 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
@@ -1,16 +1,33 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
 import { UserMenuComponent } from './user-menu.component';
 import { AuthService } from '@services/auth.service';
-import { AuthServiceMock, testUser } from '@mock/auth.service.mock';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { HttpTestingController } from '@angular/common/http/testing';
+import { UserResponse } from 'src/app/user/models/user';
+import { Injectable, Signal } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
+
+const fakeUserResponse: UserResponse = {
+    id: 1,
+    username: "frodo",
+    email: "frodo@shire.me",
+    first_name: "Frodo",
+    last_name: "Baggins",
+    is_staff: false
+}
 
+@Injectable({ providedIn: 'root' })
+class MockAuthService extends AuthService {
 
-describe('UserMenuComponent', () => {
+}
+
+fdescribe('UserMenuComponent', () => {
     let component: UserMenuComponent;
     let fixture: ComponentFixture<UserMenuComponent>;
-    let authService: AuthServiceMock;
+    let authService: AuthService;
+    let httpTestingController: HttpTestingController;
+    let loading: Signal<boolean | undefined>;
 
     const spinner = () => fixture.debugElement.query(By.css('.spinner-border'));
     const signInLink = () => fixture.debugElement.query(By.css('a[href="/login"]'));
@@ -18,43 +35,52 @@ describe('UserMenuComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            providers: [
-                { provide: AuthService, useClass: AuthServiceMock }
-            ],
+            providers: [AuthService],
             declarations: [UserMenuComponent],
             imports: [SharedTestingModule],
         });
-        authService = TestBed.inject(AuthService) as unknown as AuthServiceMock;
+        httpTestingController = TestBed.inject(HttpTestingController);
+        authService = TestBed.inject(AuthService);
         fixture = TestBed.createComponent(UserMenuComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
+        loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
+    });
+
+    afterEach(() => {
+        httpTestingController.verify();
     });
 
     it('should create', () => {
         expect(component).toBeTruthy();
     });
 
+    // it('should show sign-in when not logged in', () => { });
+
     it('should show a loading spinner', () => {
         expect(spinner()).toBeTruthy();
         expect(signInLink()).toBeFalsy();
         expect(userDropdownTrigger()).toBeFalsy();
     });
 
-    it('should show sign-in when not logged in', () => {
-        authService._setUser(null);
-        fixture.detectChanges();
+    // it('should show an admin menu when user is a staff member', () => { });
+
 
-        expect(spinner()).toBeFalsy();
-        expect(signInLink()).toBeTruthy();
-        expect(userDropdownTrigger()).toBeFalsy();
-    });
 
     it('should show a user menu when logged in', () => {
-        authService._setUser(testUser({}));
+        // Normally called in AppComponent.ngAfterViewInit();
+        authService.initialAuth$.next();
+        const req = httpTestingController.expectOne('/users/user/');
+        req.flush(fakeUserResponse);
         fixture.detectChanges();
 
-        expect(spinner()).toBeFalsy();
-        expect(signInLink()).toBeFalsy();
-        expect(userDropdownTrigger()).toBeTruthy();
+        expect(loading()).toBeFalse();
+
+        // authService._setUser(testUser({}));
+        // fixture.detectChanges();
+
+        // expect(spinner()).toBeFalsy();
+        // expect(signInLink()).toBeFalsy();
+        // expect(userDropdownTrigger()).toBeTruthy();
     });
 });

From 1a0ea4d2e8f4288907fb1d35bbb02bd837526100 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 14 May 2024 15:51:11 +0200
Subject: [PATCH 047/565] UserMenu tests

---
 .../menu/user-menu/user-menu.component.html   |  4 +-
 .../user-menu/user-menu.component.spec.ts     | 54 ++++++++++++-------
 .../menu/user-menu/user-menu.component.ts     |  4 +-
 3 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 6c8fe5cc..0c9d31a2 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -1,5 +1,5 @@
 <ul class="navbar-nav">
-    <li class="navbar-text" *ngIf="isLoading$ | async">
+    <li class="navbar-text" *ngIf="authLoading$ | async">
         <div class="spinner-border" role="status">
             <span class="visually-hidden">Loading user data...</span>
         </div>
@@ -32,7 +32,7 @@
             </a>
         </li>
     </ng-container>
-    <ng-container *ngIf="loading$ | async">
+    <ng-container *ngIf="logoutLoading$ | async">
         <li class="d-flex align-items-center">
             <div class="spinner-border spinner-border-sm text-light" role="status">
                 <span class="visually-hidden">Signing out...</span>
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
index 0f2c3451..fe033aae 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
@@ -4,9 +4,10 @@ import { UserMenuComponent } from './user-menu.component';
 import { AuthService } from '@services/auth.service';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { HttpTestingController } from '@angular/common/http/testing';
-import { UserResponse } from 'src/app/user/models/user';
+import { User, UserResponse } from 'src/app/user/models/user';
 import { Injectable, Signal } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
+import { Observable, of } from 'rxjs';
 
 const fakeUserResponse: UserResponse = {
     id: 1,
@@ -17,17 +18,21 @@ const fakeUserResponse: UserResponse = {
     is_staff: false
 }
 
-@Injectable({ providedIn: 'root' })
-class MockAuthService extends AuthService {
-
+const fakeAdminResponse: UserResponse = {
+    id: 1,
+    username: "gandalf",
+    email: "gandalf@istari.me",
+    first_name: "Gandalf",
+    last_name: "The Grey",
+    is_staff: true
 }
 
-fdescribe('UserMenuComponent', () => {
+
+describe('UserMenuComponent', () => {
     let component: UserMenuComponent;
     let fixture: ComponentFixture<UserMenuComponent>;
     let authService: AuthService;
     let httpTestingController: HttpTestingController;
-    let loading: Signal<boolean | undefined>;
 
     const spinner = () => fixture.debugElement.query(By.css('.spinner-border'));
     const signInLink = () => fixture.debugElement.query(By.css('a[href="/login"]'));
@@ -35,8 +40,8 @@ fdescribe('UserMenuComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            providers: [AuthService],
             declarations: [UserMenuComponent],
+            providers: [AuthService],
             imports: [SharedTestingModule],
         });
         httpTestingController = TestBed.inject(HttpTestingController);
@@ -44,7 +49,6 @@ fdescribe('UserMenuComponent', () => {
         fixture = TestBed.createComponent(UserMenuComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
-        loading = TestBed.runInInjectionContext(() => toSignal(component.loading$));
     });
 
     afterEach(() => {
@@ -55,7 +59,16 @@ fdescribe('UserMenuComponent', () => {
         expect(component).toBeTruthy();
     });
 
-    // it('should show sign-in when not logged in', () => { });
+    it('should show sign-in when not logged in', () => {
+        authService.initialAuth$.next();
+        const req = httpTestingController.expectOne('/users/user/');
+        req.flush(null);
+        fixture.detectChanges();
+
+        expect(spinner()).toBeFalsy();
+        expect(signInLink()).toBeTruthy();
+        expect(userDropdownTrigger()).toBeFalsy();
+    });
 
     it('should show a loading spinner', () => {
         expect(spinner()).toBeTruthy();
@@ -63,8 +76,18 @@ fdescribe('UserMenuComponent', () => {
         expect(userDropdownTrigger()).toBeFalsy();
     });
 
-    // it('should show an admin menu when user is a staff member', () => { });
+    it('should show an admin menu when user is a staff member', () => {
+        // Normally called in AppComponent.ngAfterViewInit();
+        authService.initialAuth$.next();
+        const req = httpTestingController.expectOne('/users/user/');
+        req.flush(fakeAdminResponse);
+        fixture.detectChanges();
 
+        expect(spinner()).toBeFalsy();
+        expect(signInLink()).toBeFalsy();
+        expect(userDropdownTrigger()).toBeTruthy();
+        expect(userDropdownTrigger().nativeElement.textContent).toContain('gandalf');
+    });
 
 
     it('should show a user menu when logged in', () => {
@@ -74,13 +97,8 @@ fdescribe('UserMenuComponent', () => {
         req.flush(fakeUserResponse);
         fixture.detectChanges();
 
-        expect(loading()).toBeFalse();
-
-        // authService._setUser(testUser({}));
-        // fixture.detectChanges();
-
-        // expect(spinner()).toBeFalsy();
-        // expect(signInLink()).toBeFalsy();
-        // expect(userDropdownTrigger()).toBeTruthy();
+        expect(spinner()).toBeFalsy();
+        expect(signInLink()).toBeFalsy();
+        expect(userDropdownTrigger()).toBeTruthy();
     });
 });
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index 1abc9bba..b9732e40 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -10,7 +10,7 @@ import _ from 'underscore';
   styleUrls: ['./user-menu.component.scss']
 })
 export class UserMenuComponent {
-    public isLoading$ = this.authService.currentUser$.pipe(
+    public authLoading$ = this.authService.currentUser$.pipe(
         map(_.isUndefined)
     );
 
@@ -24,7 +24,7 @@ export class UserMenuComponent {
         user: faUser,
     };
 
-    public loading$ = merge(
+    public logoutLoading$ = merge(
         this.authService.logout$.pipe(map(() => true)),
         this.authService.logoutResult$.pipe(map(() => false)),
     ).pipe(startWith(false));

From 5f92ea3f1750a2e83c68012287cf2cd860ba4433 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 14 May 2024 16:32:46 +0200
Subject: [PATCH 048/565] Use correct headers in template

---
 frontend/src/app/user/login/login.component.html             | 4 ++--
 .../password-forgotten/password-forgotten.component.html     | 5 ++---
 frontend/src/app/user/register/register.component.html       | 2 +-
 .../app/user/reset-password/reset-password.component.html    | 2 +-
 .../src/app/user/user-settings/user-settings.component.html  | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/user/login/login.component.html b/frontend/src/app/user/login/login.component.html
index 76384338..e4d0ff85 100644
--- a/frontend/src/app/user/login/login.component.html
+++ b/frontend/src/app/user/login/login.component.html
@@ -1,4 +1,4 @@
-<h2>Sign in</h2>
+<h1>Sign in</h1>
 
 <p>Sign in using the form below.</p>
 
@@ -61,6 +61,6 @@ <h2>Sign in</h2>
 
 <div>
     <a [routerLink]="['/password-forgotten']">
-        Forgotten your password? Click here.
+        Forgotten your password?
     </a>
 </div>
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.html b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
index 2111b230..7b894926 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.html
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.html
@@ -1,8 +1,7 @@
-<h2>Forgotten your password?</h2>
+<h1>Forgotten your password?</h1>
 
 <p>
-    Enter your email address in the form below. You will receive a link to a
-    page where you can reset your password.
+    Enter your email address in the form below. You will receive an email with instructions to reset your password.
 </p>
 
 <form [formGroup]="form" (ngSubmit)="submit()">
diff --git a/frontend/src/app/user/register/register.component.html b/frontend/src/app/user/register/register.component.html
index 5b6e9ddf..64b95d21 100644
--- a/frontend/src/app/user/register/register.component.html
+++ b/frontend/src/app/user/register/register.component.html
@@ -1,4 +1,4 @@
-<h2>Register</h2>
+<h1>Register</h1>
 
 <p>Enter your details in the form below to create a new user account.</p>
 
diff --git a/frontend/src/app/user/reset-password/reset-password.component.html b/frontend/src/app/user/reset-password/reset-password.component.html
index ff80cb33..8e8e484b 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.html
+++ b/frontend/src/app/user/reset-password/reset-password.component.html
@@ -1,4 +1,4 @@
-<h2>Reset password</h2>
+<h1>Reset password</h1>
 
 <p>Enter your new password below to change your password.</p>
 
diff --git a/frontend/src/app/user/user-settings/user-settings.component.html b/frontend/src/app/user/user-settings/user-settings.component.html
index d099c610..0538995b 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.html
+++ b/frontend/src/app/user/user-settings/user-settings.component.html
@@ -1,4 +1,4 @@
-<h2>User settings</h2>
+<h1>User settings</h1>
 
 <p>Use the form below to change your name or password.</p>
 

From adb00d269f3a22f0063be610bcc6e0543839c2bb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 14 May 2024 16:50:17 +0200
Subject: [PATCH 049/565] Remove initialAuth$ subject

---
 frontend/src/app/app.component.ts                  | 10 ++--------
 .../menu/user-menu/user-menu.component.spec.ts     | 14 +++-----------
 frontend/src/app/services/auth.service.ts          |  8 ++------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index fd42b673..5c695659 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,16 +1,15 @@
-import { AfterViewInit, Component, DestroyRef, OnInit } from '@angular/core';
+import { Component, DestroyRef, OnInit } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Router } from '@angular/router';
 import { AuthService } from '@services/auth.service';
 import { ToastService } from '@services/toast.service';
-import { take } from 'underscore';
 
 @Component({
   selector: 'lc-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
-export class AppComponent implements OnInit, AfterViewInit {
+export class AppComponent implements OnInit {
     title = 'lettercraft';
 
     constructor(
@@ -40,9 +39,4 @@ export class AppComponent implements OnInit, AfterViewInit {
             }
         })
     }
-
-    ngAfterViewInit(): void {
-        // We subscribe to user info in our template, so we should only call this after the view has been initialized.
-        this.authService.initialAuth$.next();
-    }
 }
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
index fe033aae..6874516c 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.spec.ts
@@ -4,10 +4,7 @@ import { UserMenuComponent } from './user-menu.component';
 import { AuthService } from '@services/auth.service';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { HttpTestingController } from '@angular/common/http/testing';
-import { User, UserResponse } from 'src/app/user/models/user';
-import { Injectable, Signal } from '@angular/core';
-import { toSignal } from '@angular/core/rxjs-interop';
-import { Observable, of } from 'rxjs';
+import { UserResponse } from 'src/app/user/models/user';
 
 const fakeUserResponse: UserResponse = {
     id: 1,
@@ -31,7 +28,6 @@ const fakeAdminResponse: UserResponse = {
 describe('UserMenuComponent', () => {
     let component: UserMenuComponent;
     let fixture: ComponentFixture<UserMenuComponent>;
-    let authService: AuthService;
     let httpTestingController: HttpTestingController;
 
     const spinner = () => fixture.debugElement.query(By.css('.spinner-border'));
@@ -45,7 +41,6 @@ describe('UserMenuComponent', () => {
             imports: [SharedTestingModule],
         });
         httpTestingController = TestBed.inject(HttpTestingController);
-        authService = TestBed.inject(AuthService);
         fixture = TestBed.createComponent(UserMenuComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
@@ -56,11 +51,11 @@ describe('UserMenuComponent', () => {
     });
 
     it('should create', () => {
+        httpTestingController.expectOne('/users/user/');
         expect(component).toBeTruthy();
     });
 
     it('should show sign-in when not logged in', () => {
-        authService.initialAuth$.next();
         const req = httpTestingController.expectOne('/users/user/');
         req.flush(null);
         fixture.detectChanges();
@@ -71,14 +66,13 @@ describe('UserMenuComponent', () => {
     });
 
     it('should show a loading spinner', () => {
+        httpTestingController.expectOne('/users/user/');
         expect(spinner()).toBeTruthy();
         expect(signInLink()).toBeFalsy();
         expect(userDropdownTrigger()).toBeFalsy();
     });
 
     it('should show an admin menu when user is a staff member', () => {
-        // Normally called in AppComponent.ngAfterViewInit();
-        authService.initialAuth$.next();
         const req = httpTestingController.expectOne('/users/user/');
         req.flush(fakeAdminResponse);
         fixture.detectChanges();
@@ -91,8 +85,6 @@ describe('UserMenuComponent', () => {
 
 
     it('should show a user menu when logged in', () => {
-        // Normally called in AppComponent.ngAfterViewInit();
-        authService.initialAuth$.next();
         const req = httpTestingController.expectOne('/users/user/');
         req.flush(fakeUserResponse);
         fixture.detectChanges();
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 707143e5..479d9dfb 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -117,12 +117,8 @@ export class AuthService {
         share()
     );
 
-    public initialAuth$ = new Subject<void>();
-
-    public backendUser$ = merge(
-        this.loginResult$,
-        this.initialAuth$
-    ).pipe(
+    public backendUser$ = this.loginResult$.pipe(
+        startWith(undefined),
         switchMap(() => this.http.get<UserResponse>(
             this.authRoute('user/')
         ).pipe(

From 09891b057dce89a7e14b5ad2ce8797fb19d6f45b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 15 May 2024 10:43:03 +0200
Subject: [PATCH 050/565] Refactor to general Request class

---
 frontend/src/app/app.component.ts             |  36 +----
 .../menu/user-menu/user-menu.component.ts     |  46 ++++--
 frontend/src/app/services/auth.service.ts     | 137 +++++-------------
 frontend/src/app/user/Request.ts              |  74 ++++++++++
 .../src/app/user/login/login.component.ts     |  34 ++---
 .../password-forgotten.component.ts           |  42 +++---
 .../app/user/register/register.component.ts   |  32 ++--
 .../reset-password.component.ts               |  29 ++--
 .../user-settings/user-settings.component.ts  |  95 +++++-------
 frontend/src/app/user/utils.ts                |   4 +-
 .../verify-email/verify-email.component.ts    |  49 +++----
 11 files changed, 274 insertions(+), 304 deletions(-)
 create mode 100644 frontend/src/app/user/Request.ts

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index 5c695659..5fda6737 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,42 +1,10 @@
-import { Component, DestroyRef, OnInit } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { Router } from '@angular/router';
-import { AuthService } from '@services/auth.service';
-import { ToastService } from '@services/toast.service';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'lc-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
-export class AppComponent implements OnInit {
+export class AppComponent {
     title = 'lettercraft';
-
-    constructor(
-        private authService: AuthService,
-        private router: Router,
-        private toastService: ToastService,
-        private destroyRef: DestroyRef,
-    ) { }
-
-    ngOnInit(): void {
-        this.authService.logoutResult$.pipe(
-            takeUntilDestroyed(this.destroyRef)
-        ).subscribe(result => {
-            if ('error' in result) {
-                this.toastService.show({
-                    header: 'Sign out failed',
-                    body: 'There was an error signing you out. Please try again.',
-                    type: 'danger'
-                });
-            } else {
-                this.toastService.show({
-                    header: 'Sign out successful',
-                    body: 'You have been successfully signed out.',
-                    type: 'success'
-                });
-                this.router.navigate(['/']);
-            }
-        })
-    }
 }
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index b9732e40..e92c1dd0 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,15 +1,18 @@
-import { Component } from '@angular/core';
+import { Component, DestroyRef, OnInit } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { map, merge, startWith } from 'rxjs';
+import { map } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
+import { ToastService } from '@services/toast.service';
+import { Router } from '@angular/router';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'lc-user-menu',
   templateUrl: './user-menu.component.html',
   styleUrls: ['./user-menu.component.scss']
 })
-export class UserMenuComponent {
+export class UserMenuComponent implements OnInit {
     public authLoading$ = this.authService.currentUser$.pipe(
         map(_.isUndefined)
     );
@@ -24,15 +27,40 @@ export class UserMenuComponent {
         user: faUser,
     };
 
-    public logoutLoading$ = merge(
-        this.authService.logout$.pipe(map(() => true)),
-        this.authService.logoutResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    public logoutLoading$ = this.authService.logout.loading$;
 
-    constructor(public authService: AuthService) { }
+    constructor(
+        private authService: AuthService,
+        private toastService: ToastService,
+        private router: Router,
+        private destroyRef: DestroyRef
+    ) { }
+
+    ngOnInit(): void {
+        this.authService.logout.error$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => {
+                this.toastService.show({
+                    header: 'Sign out failed',
+                    body: 'There was an error signing you out. Please try again.',
+                    type: 'danger'
+                });
+            });
+
+        this.authService.logout.success$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => {
+                this.toastService.show({
+                    header: 'Sign out successful',
+                    body: 'You have been successfully signed out.',
+                    type: 'success'
+                });
+                this.router.navigate(['/']);
+            });
+    }
 
     public logout(): void {
-        this.authService.logout$.next();
+        this.authService.logout.subject.next();
     }
 
 }
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 479d9dfb..a0c854fc 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,123 +1,58 @@
 import { Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
-import { Subject, catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay, throttleTime } from 'rxjs';
+import { catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay } from 'rxjs';
 import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
-import { encodeUserData, parseUserData } from '../user/utils';
+import { parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
+import { HttpVerb, Request } from '../user/Request';
 
 export interface AuthAPIResult {
     detail: string;
 }
 
-export interface AuthAPIError {
-    error: Record<string, string | string[]>;
-}
-
 @Injectable({
     providedIn: 'root'
 })
 export class AuthService {
-    public login$ = new Subject<UserLogin>();
-    public loginResult$ = this.login$.pipe(
-        throttleTime(500),
-        switchMap(loginForm => this.http.post<AuthAPIResult>(
-            this.authRoute('login/'), loginForm
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error })),
-        )),
-        share()
+    public login = this.createRequest<UserLogin, AuthAPIResult>(
+        this.authRoute('login/'), 'get'
     );
-
-    public registration$ = new Subject<UserRegistration>();
-    public registrationResult$ = this.registration$.pipe(
-        throttleTime(500),
-        switchMap(registrationForm => this.http.post<void>(
-            this.authRoute('registration/'), registrationForm
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error })),
-        )),
-        share()
+    public registration = this.createRequest<UserRegistration, never>(
+        this.authRoute('registration/'),
+        'post'
     );
-
-    public keyInfo$ = new Subject<string>();
-    public keyInfoResult$ = this.keyInfo$.pipe(
-        throttleTime(500),
-        switchMap(key => this.http.post<KeyInfo>(
-            this.authRoute('registration/key-info/'),
-            { key }
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error })),
-        )),
-        share()
+    public passwordForgotten = this.createRequest<PasswordForgotten, AuthAPIResult>(
+        this.authRoute('password/reset/'),
+        'post'
     );
-
-    public passwordForgotten$ = new Subject<PasswordForgotten>();
-    public passwordForgottenResult$ = this.passwordForgotten$.pipe(
-        throttleTime(500),
-        switchMap(form => this.http.post<AuthAPIResult>(
-            this.authRoute('password/reset/'), form
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error }))
-        )),
-        share()
-    );
-
-    public resetPassword$ = new Subject<ResetPassword>();
-    public resetPasswordResult$ = this.resetPassword$.pipe(
-        throttleTime(500),
-        switchMap(form => this.http.post<AuthAPIResult>(
-            this.authRoute('password/reset/confirm/'), form
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error }))
-        )),
-        share()
+    public resetPassword = this.createRequest<ResetPassword, AuthAPIResult>(
+        this.authRoute('password/reset/confirm/'),
+        'post'
     );
-
-    public verifyEmail$ = new Subject<string>();
-    public verifyEmailResult$ = this.verifyEmail$.pipe(
-        throttleTime(500),
-        switchMap(key => this.http.post<AuthAPIResult>(
-            this.authRoute('registration/verify-email/'),
-            { key }
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error }))
-        )),
-        share()
+    public verifyEmail = this.createRequest<string, AuthAPIResult>(
+        this.authRoute('registration/verify-email/'),
+        'post'
     );
-
-    public updateSettings$ = new Subject<UserSettings>();
-    public updateSettingsResult$ = this.updateSettings$.pipe(
-        throttleTime(500),
-        switchMap(update => this.http.patch<UserResponse>(
-            this.authRoute('user/'),
-            encodeUserData(update)
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error })),
-        )),
-        share()
+    public updateSettings = this.createRequest<Partial<UserSettings>, UserResponse>(
+        this.authRoute('user/'),
+        'patch'
     );
-
-    public deleteUser$ = new Subject<void>();
-    public deleteUserResult$ = this.deleteUser$.pipe(
-        throttleTime(500),
-        switchMap(() => this.http.delete<AuthAPIResult>(
-            this.authRoute('delete/')
-        ).pipe(
-            catchError(error => of<AuthAPIError>({ error: error.error }))
-        )),
-        share()
+    public keyInfo = this.createRequest<string, KeyInfo>(
+        this.authRoute('registration/key-info/'),
+        'post'
+    )
+    public deleteUser = this.createRequest<void, AuthAPIResult>(
+        this.authRoute('delete/'),
+        'delete'
     );
-
-    public logout$ = new Subject<void>();
-    public logoutResult$ = this.logout$.pipe(
-        throttleTime(500),
-        switchMap(() => this.http.post<AuthAPIResult>(this.authRoute('logout/'), {})),
-        share()
+    public logout = this.createRequest<void, AuthAPIResult>(
+        this.authRoute('logout/'),
+        'post'
     );
 
-    public backendUser$ = this.loginResult$.pipe(
+    public backendUser$ = this.login.result$.pipe(
         startWith(undefined),
         switchMap(() => this.http.get<UserResponse>(
             this.authRoute('user/')
@@ -128,14 +63,14 @@ export class AuthService {
         share()
     );
 
-    private updateSettingsUser$ = this.updateSettingsResult$
+    private updateSettingsUser$ = this.updateSettings.result$
         .pipe(
             withLatestFrom(this.backendUser$),
             map(([userData, currentUser]) => 'error' in userData ? currentUser : parseUserData(userData)),
         );
 
     public currentUser$ = merge(
-        this.logoutResult$.pipe(map(() => null)),
+        this.logout.result$.pipe(map(() => null)),
         this.backendUser$,
         this.updateSettingsUser$
     ).pipe(
@@ -153,10 +88,14 @@ export class AuthService {
     ) {
         this.sessionService.expired.pipe(
             takeUntilDestroyed()
-        ).subscribe(() => this.logout$.next());
+        ).subscribe(() => this.logout.subject.next());
     }
 
     private authRoute(route: string): string {
         return `/users/${route}`;
     }
+
+    private createRequest<Input, Result extends object | never = AuthAPIResult>(route: string, verb: HttpVerb): Request<Input, Result> {
+        return new Request<Input, Result>(this.http, route, verb);
+    }
 }
diff --git a/frontend/src/app/user/Request.ts b/frontend/src/app/user/Request.ts
new file mode 100644
index 00000000..9def1c7b
--- /dev/null
+++ b/frontend/src/app/user/Request.ts
@@ -0,0 +1,74 @@
+import { HttpClient } from "@angular/common/http";
+import { Observable, Subject, catchError, filter, map, merge, of, share, startWith, switchMap, throttleTime } from "rxjs";
+
+
+export type HttpVerb = 'get' | 'post' | 'patch' | 'delete';
+export type RequestError = { error: Record<string, string | string[]>; };
+
+
+/**
+ * Represents a HTTP request made to the application backend.
+ *
+ * Contains the following properties:
+ * - `subject`: The subject used to emit input values for the request.
+ * - `result$`: Emits the raw result or error of the request.
+ * - `error$`: Emits the error of the request.
+ * - `success$`: Emits when the request is successful.
+ *
+ * @template Input The type of the request input.
+ * @template Result The type of the request result.
+ */
+export class Request<Input, Result extends object | never> {
+    public subject: Subject<Input>;
+    public result$: Observable<Result | RequestError>;
+    public error$: Observable<RequestError>;
+    public success$: Observable<Result>;
+    public loading$: Observable<boolean>;
+
+    /**
+     * Creates an instance of AuthRequest.
+     * @param http The HttpClient instance used to make the HTTP request.
+     * @param route The route for the request.
+     * @param verb The HTTP verb for the request.
+     */
+    constructor(
+        private http: HttpClient,
+        private route: string,
+        private verb: HttpVerb
+    ) {
+        this.subject = new Subject<Input>();
+
+        this.result$ = this.subject.pipe(
+            throttleTime(500),
+            switchMap(input => {
+                switch (this.verb) {
+                    case "get":
+                        return this.http.get<Result>(this.route);
+                    case "post":
+                        return this.http.post<Result>(this.route, input);
+                    case "patch":
+                        return this.http.patch<Result>(this.route, input);
+                    case "delete":
+                        return this.http.delete<Result>(this.route);
+                }
+            }),
+            catchError(error => of<RequestError>({ error: error.error })),
+            share()
+        );
+
+        this.success$ = this.result$.pipe(
+            filter((result): result is Result => result ? !('error' in result) : true)
+        );
+
+        this.error$ = this.result$.pipe(
+            filter((result): result is RequestError => result && 'error' in result)
+        );
+
+        this.loading$ = merge(
+            this.subject.pipe(map(() => true)),
+            this.result$.pipe(map(() => false))
+        ).pipe(
+            startWith(false),
+        );
+    }
+}
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 0388b0d7..7d86cc53 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -2,7 +2,6 @@ import { Component, DestroyRef, OnInit } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { AuthService } from "@services/auth.service";
 import { UserLogin } from "../models/user";
-import { map, merge, startWith } from "rxjs";
 import {
     controlErrorMessages$,
     formErrorMessages$,
@@ -38,10 +37,7 @@ export class LoginComponent implements OnInit {
     public passwordErrors$ = controlErrorMessages$(this.form, "password");
     public formErrors$ = formErrorMessages$(this.form);
 
-    public loading$ = merge(
-        this.authService.login$.pipe(map(() => true)),
-        this.authService.loginResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    public loading$ = this.authService.login.loading$;
 
     constructor(
         private authService: AuthService,
@@ -51,20 +47,20 @@ export class LoginComponent implements OnInit {
     ) {}
 
     ngOnInit(): void {
-        this.authService.loginResult$
-            .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if ("error" in result) {
-                    setErrors(result.error, this.form);
-                } else {
-                    this.toastService.show({
-                        header: "Sign in successful",
-                        body: "You have been successfully signed in.",
-                        type: "success",
-                    });
-                    this.router.navigate(["/"]);
-                }
+        this.authService.login.success$.pipe(
+            takeUntilDestroyed(this.destroyRef)
+        ).subscribe(() => {
+            this.toastService.show({
+                header: "Sign in successful",
+                body: "You have been successfully signed in.",
+                type: "success",
             });
+            this.router.navigate(["/"]);
+        });
+
+        this.authService.login.error$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => setErrors(result.error, this.form));
     }
 
     public submit(): void {
@@ -73,6 +69,6 @@ export class LoginComponent implements OnInit {
         if (!this.form.valid) {
             return;
         }
-        this.authService.login$.next(this.form.getRawValue());
+        this.authService.login.subject.next(this.form.getRawValue());
     }
 }
diff --git a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
index 654eb584..75cc7720 100644
--- a/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
+++ b/frontend/src/app/user/password-forgotten/password-forgotten.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnInit } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { controlErrorMessages$, updateFormValidity } from "../utils";
-import { map, merge, startWith } from "rxjs";
 import { AuthService } from "@services/auth.service";
 import { PasswordForgotten } from "../models/user";
 import { ToastService } from "@services/toast.service";
@@ -26,10 +25,7 @@ export class PasswordForgottenComponent implements OnInit {
 
     public emailErrors$ = controlErrorMessages$(this.form, "email");
 
-    public loading$ = merge(
-        this.authService.passwordForgotten$.pipe(map(() => true)),
-        this.authService.passwordForgottenResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    public loading$ = this.authService.passwordForgotten.loading$;
 
     constructor(
         private authService: AuthService,
@@ -38,25 +34,25 @@ export class PasswordForgottenComponent implements OnInit {
     ) {}
 
     ngOnInit(): void {
-        this.authService.passwordForgottenResult$
+        this.authService.passwordForgotten.success$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if ("error" in result) {
-                    this.toastService.show({
-                        header: "Reset request failed",
-                        body: "Request to send password reset email failed. Please try again.",
-                        type: "danger",
-                    });
-                } else {
-                    this.toastService.show({
-                        header: "Password reset request successful",
-                        body: "If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.",
-                        type: "success",
-                        // This is a long message, so we show it for 10 seconds.
-                        delay: 10000,
-                    });
-                }
+            .subscribe(() => {
+                this.toastService.show({
+                    header: "Password reset request successful",
+                    body: "If your email address is known to us, an email has been sent containing a link to a page where you may reset your password.",
+                    type: "success",
+                    // This is a long message, so we show it for 10 seconds.
+                    delay: 10000,
+                });
             });
+
+        this.authService.passwordForgotten.error$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.toastService.show({
+                header: "Reset request failed",
+                body: "Request to send password reset email failed. Please try again.",
+                type: "danger",
+            }));
     }
 
     public submit(): void {
@@ -65,6 +61,6 @@ export class PasswordForgottenComponent implements OnInit {
         if (!this.form.valid) {
             return;
         }
-        this.authService.passwordForgotten$.next(this.form.getRawValue());
+        this.authService.passwordForgotten.subject.next(this.form.getRawValue());
     }
 }
diff --git a/frontend/src/app/user/register/register.component.ts b/frontend/src/app/user/register/register.component.ts
index ecc80418..44a46ad2 100644
--- a/frontend/src/app/user/register/register.component.ts
+++ b/frontend/src/app/user/register/register.component.ts
@@ -8,7 +8,6 @@ import {
 } from "../validation";
 import { AuthService } from "@services/auth.service";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { map, merge, startWith } from "rxjs";
 import {
     controlErrorMessages$,
     formErrorMessages$,
@@ -69,10 +68,7 @@ export class RegisterComponent implements OnInit {
     );
     public formErrors$ = formErrorMessages$(this.form);
 
-    public loading$ = merge(
-        this.authService.registration$.pipe(map(() => true)),
-        this.authService.registrationResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    public loading$ = this.authService.registration.loading$;
 
     constructor(
         private authService: AuthService,
@@ -82,19 +78,19 @@ export class RegisterComponent implements OnInit {
     ) {}
 
     ngOnInit(): void {
-        this.authService.registrationResult$
+        this.authService.registration.error$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if (result?.error) {
-                    setErrors(result.error, this.form);
-                } else {
-                    this.toastService.show({
-                        header: "Registration successful",
-                        body: "You have been successfully registered. Please check your email for a confirmation link.",
-                        type: "success",
-                    });
-                    this.router.navigate(["/"]);
-                }
+            .subscribe((result) => setErrors(result.error, this.form));
+
+        this.authService.registration.success$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => {
+                this.toastService.show({
+                    header: "Registration successful",
+                    body: "You have been successfully registered. Please check your email for a confirmation link.",
+                    type: "success",
+                });
+                this.router.navigate(["/"]);
             });
     }
 
@@ -104,6 +100,6 @@ export class RegisterComponent implements OnInit {
         if (!this.form.valid) {
             return;
         }
-        this.authService.registration$.next(this.form.getRawValue());
+        this.authService.registration.subject.next(this.form.getRawValue());
     }
 }
diff --git a/frontend/src/app/user/reset-password/reset-password.component.ts b/frontend/src/app/user/reset-password/reset-password.component.ts
index 5a01a76d..1e56843e 100644
--- a/frontend/src/app/user/reset-password/reset-password.component.ts
+++ b/frontend/src/app/user/reset-password/reset-password.component.ts
@@ -69,10 +69,7 @@ export class ResetPasswordComponent implements OnInit {
         controlErrorMessages$(this.form, "uid"),
     ]).pipe(map((errorLists) => _.flatten(errorLists, 1)));
 
-    public loading$ = merge(
-        this.authService.resetPassword$.pipe(map(() => true)),
-        this.authService.resetPasswordResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    public loading$ = this.authService.resetPassword.loading$;
 
     constructor(
         private activatedRoute: ActivatedRoute,
@@ -82,19 +79,17 @@ export class ResetPasswordComponent implements OnInit {
     ) {}
 
     ngOnInit(): void {
-        this.authService.resetPasswordResult$
+        this.authService.resetPassword.error$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if ("error" in result) {
-                    setErrors(result.error, this.form);
-                } else {
-                    this.toastService.show({
-                        header: "Password reset",
-                        body: "Your password has been successfully reset.",
-                        type: "success",
-                    });
-                }
-            });
+            .subscribe(result => setErrors(result.error, this.form));
+
+        this.authService.resetPassword.success$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.toastService.show({
+                header: "Password reset",
+                body: "Your password has been successfully reset.",
+                type: "success",
+            }));
     }
 
     public submit(): void {
@@ -103,6 +98,6 @@ export class ResetPasswordComponent implements OnInit {
         if (!this.form.valid) {
             return;
         }
-        this.authService.resetPassword$.next(this.form.getRawValue());
+        this.authService.resetPassword.subject.next(this.form.getRawValue());
     }
 }
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index bf982e5e..c2499a8d 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -3,9 +3,10 @@ import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { AuthService } from "@services/auth.service";
 import { UserSettings } from "../models/user";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { filter, map, merge, startWith } from "rxjs";
+import { filter } from "rxjs";
 import {
     controlErrorMessages$,
+    encodeUserData,
     formErrorMessages$,
     setErrors,
     updateFormValidity,
@@ -50,20 +51,9 @@ export class UserSettingsComponent implements OnInit {
     public usernameErrors$ = controlErrorMessages$(this.form, "username");
     public formErrors$ = formErrorMessages$(this.form);
 
-    public updateSettingsLoading$ = merge(
-        this.authService.updateSettings$.pipe(map(() => true)),
-        this.authService.updateSettingsResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
-
-    public requestResetLoading$ = merge(
-        this.authService.passwordForgotten$.pipe(map(() => true)),
-        this.authService.passwordForgottenResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
-
-    public deleteUserLoading$ = merge(
-        this.authService.deleteUser$.pipe(map(() => true)),
-        this.authService.deleteUserResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    public updateSettingsLoading$ = this.authService.updateSettings.loading$;
+    public requestResetLoading$ = this.authService.passwordForgotten.loading$;
+    public deleteUserLoading$ = this.authService.deleteUser.loading$;
 
     // See submit() for explanation.
     private currentUsername: string | null = null;
@@ -88,59 +78,54 @@ export class UserSettingsComponent implements OnInit {
                 this.currentUsername = user.username;
             });
 
-        this.authService.passwordForgottenResult$
+        this.authService.passwordForgotten.success$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if (!("error" in result)) {
-                    this.toastService.show({
-                        header: "Password reset email sent",
-                        body: "An email has been sent to you with instructions on how to reset your password.",
-                        type: "success",
-                    });
-                }
+            .subscribe(() => {
+                this.toastService.show({
+                    header: "Password reset email sent",
+                    body: "An email has been sent to you with instructions on how to reset your password.",
+                    type: "success",
+                });
             });
 
-        this.authService.deleteUserResult$
+
+        this.authService.deleteUser.error$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if ("error" in result) {
-                    this.toastService.show({
-                        header: "Error deleting account",
-                        body: "An error occurred while deleting your account. Please try again later.",
-                        type: "danger",
-                    });
-                } else {
-                    this.toastService.show({
-                        header: "Account deleted",
-                        body: "Your account has been successfully deleted.",
-                        type: "success",
-                    });
-                }
-            });
+            .subscribe(() => this.toastService.show({
+                header: "Error deleting account",
+                body: "An error occurred while deleting your account. Please try again later.",
+                type: "danger",
+            }));
 
-        this.authService.updateSettingsResult$
+        this.authService.deleteUser.success$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if ("error" in result) {
-                    setErrors(result.error, this.form);
-                } else {
-                    this.toastService.show({
-                        header: "Settings updated",
-                        body: "Your settings have been successfully updated.",
-                        type: "success",
-                    });
-                }
-            });
+            .subscribe(() => this.toastService.show({
+                header: "Account deleted",
+                body: "Your account has been successfully deleted.",
+                type: "success",
+            }));
+
+        this.authService.updateSettings.error$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(result => setErrors(result.error, this.form));
+
+        this.authService.updateSettings.success$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.toastService.show({
+                header: "Settings updated",
+                body: "Your settings have been successfully updated.",
+                type: "success",
+            }));
     }
 
     public requestPasswordReset(): void {
-        this.authService.passwordForgotten$.next({
+        this.authService.passwordForgotten.subject.next({
             email: this.form.getRawValue().email,
         });
     }
 
     public deleteAccount(): void {
-        this.authService.deleteUser$.next();
+        this.authService.deleteUser.subject.next();
     }
 
     public submit(): void {
@@ -158,6 +143,6 @@ export class UserSettingsComponent implements OnInit {
             delete patchInput.username;
         }
 
-        this.authService.updateSettings$.next(patchInput);
+        this.authService.updateSettings.subject.next(encodeUserData(patchInput));
     }
 }
diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts
index 8921d879..7d02b5c6 100644
--- a/frontend/src/app/user/utils.ts
+++ b/frontend/src/app/user/utils.ts
@@ -2,7 +2,7 @@ import { AbstractControl, FormGroup } from "@angular/forms";
 import { User, UserResponse } from "./models/user";
 import _ from "underscore";
 import { Observable, map } from "rxjs";
-import { AuthAPIError } from "@services/auth.service";
+import { RequestError } from "./Request";
 
 /**
  * Transforms backend user response to User object
@@ -53,7 +53,7 @@ export const encodeUserData = (data: Partial<User>): Partial<UserResponse> => {
  * @param form - The form to which the errors should be added.
  */
 export function setErrors(
-    errorObject: AuthAPIError["error"],
+    errorObject: RequestError["error"],
     form: FormGroup,
 ): void {
     for (const errorKey in errorObject) {
diff --git a/frontend/src/app/user/verify-email/verify-email.component.ts b/frontend/src/app/user/verify-email/verify-email.component.ts
index 0245bc08..529b72fb 100644
--- a/frontend/src/app/user/verify-email/verify-email.component.ts
+++ b/frontend/src/app/user/verify-email/verify-email.component.ts
@@ -13,19 +13,12 @@ import { map, merge, share, startWith } from "rxjs";
 export class VerifyEmailComponent implements OnInit, AfterViewInit {
     private key = this.activatedRoute.snapshot.params["key"];
 
-    private keyInfoError$ = this.authService.keyInfoResult$.pipe(
-        map((results) => ("error" in results ? results : null)),
-    );
-
-    public userDetails$ = this.authService.keyInfoResult$.pipe(
+    public userDetails$ = this.authService.keyInfo.result$.pipe(
         map((results) => ("error" in results ? null : results)),
         share(),
     );
 
-    public loading$ = merge(
-        this.authService.verifyEmail$.pipe(map(() => true)),
-        this.authService.verifyEmailResult$.pipe(map(() => false)),
-    ).pipe(startWith(false));
+    public loading$ = this.authService.verifyEmail.loading$;
 
     constructor(
         private activatedRoute: ActivatedRoute,
@@ -35,7 +28,7 @@ export class VerifyEmailComponent implements OnInit, AfterViewInit {
     ) {}
 
     ngOnInit(): void {
-        this.keyInfoError$
+        this.authService.keyInfo.error$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((result) => {
                 if (!result) {
@@ -48,30 +41,30 @@ export class VerifyEmailComponent implements OnInit, AfterViewInit {
                 });
             });
 
-        this.authService.verifyEmailResult$
+        this.authService.verifyEmail.error$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                if ("error" in result) {
-                    this.toastService.show({
-                        header: "Email verification failed",
-                        body: "Failed to verify email address.",
-                        type: "danger",
-                    });
-                } else {
-                    this.toastService.show({
-                        header: "Email verified",
-                        body: "Email address has been verified.",
-                        type: "success",
-                    });
-                }
-            });
+            .subscribe(() => this.toastService.show({
+                header: "Email verification failed",
+                body: "Failed to verify email address.",
+                type: "danger",
+            }));
+
+        this.authService.verifyEmail.success$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.toastService.show({
+                header: "Email verified",
+                body: "Email address has been verified.",
+                type: "success",
+            }));
     }
 
+    // We are subscribing to results of this call in the template, so we should
+    // only start listening after the view has been initialized.
     ngAfterViewInit(): void {
-        this.authService.keyInfo$.next(this.key);
+        this.authService.keyInfo.subject.next(this.key);
     }
 
     public confirm(): void {
-        this.authService.verifyEmail$.next(this.key);
+        this.authService.verifyEmail.subject.next(this.key);
     }
 }

From 6f0f28194f5486c205066ab5c17dbc1fa75c99bb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 15 May 2024 13:06:21 +0200
Subject: [PATCH 051/565] Move user settings quirk to authService

---
 frontend/src/app/services/auth.service.ts     | 33 +++++++++++++++++--
 frontend/src/app/user/Request.ts              | 14 ++++----
 .../user-settings/user-settings.component.ts  | 17 ++--------
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index a0c854fc..da1cbed6 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { SessionService } from './session.service';
 import { catchError, map, of, switchMap, merge, share, startWith, withLatestFrom, shareReplay } from 'rxjs';
 import { UserRegistration, UserResponse, UserLogin, PasswordForgotten, ResetPassword, KeyInfo, UserSettings } from '../user/models/user';
-import { parseUserData } from '../user/utils';
+import { encodeUserData, parseUserData } from '../user/utils';
 import _ from 'underscore';
 import { HttpClient } from '@angular/common/http';
 import { HttpVerb, Request } from '../user/Request';
@@ -17,7 +17,8 @@ export interface AuthAPIResult {
 })
 export class AuthService {
     public login = this.createRequest<UserLogin, AuthAPIResult>(
-        this.authRoute('login/'), 'get'
+        this.authRoute('login/'),
+        'post'
     );
     public registration = this.createRequest<UserRegistration, never>(
         this.authRoute('registration/'),
@@ -91,6 +92,32 @@ export class AuthService {
         ).subscribe(() => this.logout.subject.next());
     }
 
+    // Keeping track of the latest version of the username
+    private currentUserName = toSignal<string | null>(
+        this.currentUser$.pipe(
+            map(user => user?.username ?? null)
+        )
+    );
+
+    /**
+     * Encodes the user settings and sends them to the server to be updated.
+     *
+     * Due to a quirk in dj-auth-rest, the username must only be sent along if it has changed.
+     * If the username is not changed, it will be removed from the input.
+     *
+     * @param userSettings - The user settings to be submitted.
+     * @returns void
+     */
+    public newUserSettings(userSettings: UserSettings): void {
+        console.log('Current user name:', this.currentUserName())
+        console.log('Identical:', userSettings.username === this.currentUserName())
+        if (userSettings.username === this.currentUserName()) {
+            delete userSettings.username;
+        }
+        const encoded = encodeUserData(userSettings);
+        this.updateSettings.subject.next(encoded);
+    }
+
     private authRoute(route: string): string {
         return `/users/${route}`;
     }
diff --git a/frontend/src/app/user/Request.ts b/frontend/src/app/user/Request.ts
index 9def1c7b..05aa7d0c 100644
--- a/frontend/src/app/user/Request.ts
+++ b/frontend/src/app/user/Request.ts
@@ -1,5 +1,5 @@
 import { HttpClient } from "@angular/common/http";
-import { Observable, Subject, catchError, filter, map, merge, of, share, startWith, switchMap, throttleTime } from "rxjs";
+import { Observable, OperatorFunction, Subject, catchError, filter, map, merge, of, share, startWith, switchMap, throttleTime } from "rxjs";
 
 
 export type HttpVerb = 'get' | 'post' | 'patch' | 'delete';
@@ -38,21 +38,23 @@ export class Request<Input, Result extends object | never> {
     ) {
         this.subject = new Subject<Input>();
 
+        // Catches errors and returns them as a RequestError object.
+        const catchToError: OperatorFunction<Result, Result | RequestError> = catchError(error => of<RequestError>({ error: error.error }));
+
         this.result$ = this.subject.pipe(
             throttleTime(500),
             switchMap(input => {
                 switch (this.verb) {
                     case "get":
-                        return this.http.get<Result>(this.route);
+                        return this.http.get<Result>(this.route).pipe(catchToError);
                     case "post":
-                        return this.http.post<Result>(this.route, input);
+                        return this.http.post<Result>(this.route, input).pipe(catchToError);
                     case "patch":
-                        return this.http.patch<Result>(this.route, input);
+                        return this.http.patch<Result>(this.route, input).pipe(catchToError);
                     case "delete":
-                        return this.http.delete<Result>(this.route);
+                        return this.http.delete<Result>(this.route).pipe(catchToError);
                 }
             }),
-            catchError(error => of<RequestError>({ error: error.error })),
             share()
         );
 
diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index c2499a8d..1c60fc29 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -6,7 +6,6 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { filter } from "rxjs";
 import {
     controlErrorMessages$,
-    encodeUserData,
     formErrorMessages$,
     setErrors,
     updateFormValidity,
@@ -55,9 +54,6 @@ export class UserSettingsComponent implements OnInit {
     public requestResetLoading$ = this.authService.passwordForgotten.loading$;
     public deleteUserLoading$ = this.authService.deleteUser.loading$;
 
-    // See submit() for explanation.
-    private currentUsername: string | null = null;
-
     constructor(
         private authService: AuthService,
         private toastService: ToastService,
@@ -75,7 +71,6 @@ export class UserSettingsComponent implements OnInit {
                     return;
                 }
                 this.form.patchValue(user);
-                this.currentUsername = user.username;
             });
 
         this.authService.passwordForgotten.success$
@@ -134,15 +129,7 @@ export class UserSettingsComponent implements OnInit {
         if (this.form.invalid) {
             return;
         }
-        const patchInput = this.form.getRawValue();
-
-        // If we send the username along, dj-auth-rest will assume it has changed,
-        // returning a 'username already taken' error if it hasn't.
-        // Therefore we remove the username from the input if it has not changed.
-        if (patchInput.username === this.currentUsername) {
-            delete patchInput.username;
-        }
-
-        this.authService.updateSettings.subject.next(encodeUserData(patchInput));
+        const userSettings = this.form.getRawValue();
+        this.authService.newUserSettings(userSettings);
     }
 }

From 78414d23b564730e9c937aef274f72a2a75efed4 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 15 May 2024 13:31:21 +0200
Subject: [PATCH 052/565] Fix tests

---
 frontend/src/app/services/auth.service.ts                     | 2 --
 .../app/user/user-settings/user-settings.component.spec.ts    | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index da1cbed6..77418daf 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -109,8 +109,6 @@ export class AuthService {
      * @returns void
      */
     public newUserSettings(userSettings: UserSettings): void {
-        console.log('Current user name:', this.currentUserName())
-        console.log('Identical:', userSettings.username === this.currentUserName())
         if (userSettings.username === this.currentUserName()) {
             delete userSettings.username;
         }
diff --git a/frontend/src/app/user/user-settings/user-settings.component.spec.ts b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
index 13e6a606..1844a71a 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.spec.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.spec.ts
@@ -44,6 +44,9 @@ describe("UserSettingsComponent", () => {
         fixture = TestBed.createComponent(UserSettingsComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
+
+        // Initial request to get the user data in AuthService
+        httpTestingController.expectOne("/users/user/").flush(fakeUser);
     });
 
     it("should create", () => {
@@ -58,7 +61,6 @@ describe("UserSettingsComponent", () => {
             firstName: 'Frodo',
             lastName: 'Baggins'
         });
-        expect(component['currentUsername']).toBe('frodo');
     });
 
     it("should check missing input", () => {

From 829b60382ed10badc7ac45f97689c64511d8d609 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 10 Jun 2024 16:32:59 +0200
Subject: [PATCH 053/565] prevent title field overflow during migration

---
 ...06_source_edition_author_source_edition_title_and_more.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/source/migrations/0006_source_edition_author_source_edition_title_and_more.py b/backend/source/migrations/0006_source_edition_author_source_edition_title_and_more.py
index e18dfdfc..2e8183a5 100644
--- a/backend/source/migrations/0006_source_edition_author_source_edition_title_and_more.py
+++ b/backend/source/migrations/0006_source_edition_author_source_edition_title_and_more.py
@@ -9,7 +9,10 @@ def migrate_bibliographical_info_to_edition_title(apps, schema_editor):
     Source = apps.get_model("source", "Source")
     for source in Source.objects.all():
         if source.bibliographical_info:
-            source.edition_title = source.bibliographical_info
+            title = source.bibliographical_info[
+                : min(255, len(source.bibliographical_info))
+            ]
+            source.edition_title = title
             source.save()
 
 

From 5679c2033da60dd9cb9687565c45abb897e9c75f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 09:22:26 +0200
Subject: [PATCH 054/565] Update requirements

---
 backend/requirements.in  |  2 ++
 backend/requirements.txt | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/backend/requirements.in b/backend/requirements.in
index 0fed07d4..ca219c62 100644
--- a/backend/requirements.in
+++ b/backend/requirements.in
@@ -9,3 +9,5 @@ pytest-django
 pytest-xdist
 dj_rest_auth
 django-allauth
+graphene
+graphene-django
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 6061d6e0..8b0630a2 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -2,10 +2,12 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile
+#    pip-compile requirements.in
 #
 --no-binary psycopg2
 
+aniso8601==9.0.1
+    # via graphene
 asgiref==3.7.2
     # via django
 beautifulsoup4==4.12.2
@@ -16,6 +18,8 @@ cffi==1.16.0
     # via cryptography
 charset-normalizer==3.3.2
     # via requests
+colorama==0.4.6
+    # via pytest
 cryptography==42.0.5
     # via pyjwt
 defusedxml==0.7.1
@@ -30,6 +34,7 @@ django==4.2.7
     #   django-livereload-server
     #   django-revproxy
     #   djangorestframework
+    #   graphene-django
 django-allauth==0.61.1
     # via -r requirements.in
 django-livereload-server==0.4
@@ -46,6 +51,21 @@ execnet==2.0.2
     # via pytest-xdist
 faker==23.2.0
     # via -r requirements.in
+graphene==3.3
+    # via
+    #   -r requirements.in
+    #   graphene-django
+graphene-django==3.2.2
+    # via -r requirements.in
+graphql-core==3.2.3
+    # via
+    #   graphene
+    #   graphene-django
+    #   graphql-relay
+graphql-relay==3.2.0
+    # via
+    #   graphene
+    #   graphene-django
 idna==3.7
     # via requests
 iniconfig==2.0.0
@@ -56,12 +76,16 @@ packaging==23.2
     # via pytest
 pluggy==1.3.0
     # via pytest
+promise==2.3
+    # via graphene-django
 psycopg2==2.9.9
     # via -r requirements.in
 pycparser==2.22
     # via cffi
 pyjwt[crypto]==2.8.0
-    # via django-allauth
+    # via
+    #   django-allauth
+    #   pyjwt
 pytest==7.4.3
     # via
     #   -r requirements.in
@@ -86,17 +110,22 @@ requests-oauthlib==2.0.0
 six==1.16.0
     # via
     #   django-livereload-server
+    #   promise
     #   python-dateutil
 soupsieve==2.5
     # via beautifulsoup4
 sqlparse==0.4.4
     # via django
+text-unidecode==1.3
+    # via graphene-django
 tomli==2.0.1
     # via pytest
 tornado==6.3.3
     # via django-livereload-server
 typing-extensions==4.8.0
     # via asgiref
+tzdata==2024.1
+    # via django
 urllib3==2.0.7
     # via
     #   django-revproxy

From b89e60360a97878623934f6424763d7c9249d9b9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 09:23:06 +0200
Subject: [PATCH 055/565] API app

---
 backend/api/__init__.py            | 0
 backend/api/admin.py               | 3 +++
 backend/api/apps.py                | 6 ++++++
 backend/api/migrations/__init__.py | 0
 backend/api/models.py              | 3 +++
 backend/api/tests.py               | 3 +++
 backend/api/views.py               | 3 +++
 backend/lettercraft/settings.py    | 1 +
 8 files changed, 19 insertions(+)
 create mode 100644 backend/api/__init__.py
 create mode 100644 backend/api/admin.py
 create mode 100644 backend/api/apps.py
 create mode 100644 backend/api/migrations/__init__.py
 create mode 100644 backend/api/models.py
 create mode 100644 backend/api/tests.py
 create mode 100644 backend/api/views.py

diff --git a/backend/api/__init__.py b/backend/api/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/api/admin.py b/backend/api/admin.py
new file mode 100644
index 00000000..8c38f3f3
--- /dev/null
+++ b/backend/api/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/backend/api/apps.py b/backend/api/apps.py
new file mode 100644
index 00000000..878e7d54
--- /dev/null
+++ b/backend/api/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ApiConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "api"
diff --git a/backend/api/migrations/__init__.py b/backend/api/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/api/models.py b/backend/api/models.py
new file mode 100644
index 00000000..71a83623
--- /dev/null
+++ b/backend/api/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/backend/api/tests.py b/backend/api/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/backend/api/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/backend/api/views.py b/backend/api/views.py
new file mode 100644
index 00000000..91ea44a2
--- /dev/null
+++ b/backend/api/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.
diff --git a/backend/lettercraft/settings.py b/backend/lettercraft/settings.py
index 50371486..daaabd91 100644
--- a/backend/lettercraft/settings.py
+++ b/backend/lettercraft/settings.py
@@ -52,6 +52,7 @@
     "source",
     "space",
     "user",
+    "graphene_django",
 ]
 
 MIDDLEWARE = [

From 3740504972b0d326cfb688ae6c86dc5e03a3caeb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 09:35:27 +0200
Subject: [PATCH 056/565] Update URLs

---
 backend/api/urls.py         | 7 +++++++
 backend/lettercraft/urls.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 backend/api/urls.py

diff --git a/backend/api/urls.py b/backend/api/urls.py
new file mode 100644
index 00000000..9a9e7a60
--- /dev/null
+++ b/backend/api/urls.py
@@ -0,0 +1,7 @@
+from django.conf import settings
+from django.urls import path
+from graphene_django.views import GraphQLView
+
+urlpatterns = [
+    path("graphql", GraphQLView.as_view(graphiql=settings.ENABLE_GRAPHIQL)),
+]
diff --git a/backend/lettercraft/urls.py b/backend/lettercraft/urls.py
index 57b5f41c..82948251 100644
--- a/backend/lettercraft/urls.py
+++ b/backend/lettercraft/urls.py
@@ -37,7 +37,7 @@
     path("api", RedirectView.as_view(url="/api/", permanent=True)),
     path("api-auth", RedirectView.as_view(url="/api-auth/", permanent=True)),
     path("admin/", admin.site.urls),
-    path("api/", include(api_router.urls)),
+    path("api/", include("api.urls")),
     path(
         "api-auth/",
         include(

From 8ad187df83264e83c2396aef5fe0cfd0e3f0d537 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 09:35:37 +0200
Subject: [PATCH 057/565] Add Schema

---
 backend/api/graphql/__init__.py |  0
 backend/api/graphql/schema.py   | 12 ++++++++++++
 backend/lettercraft/settings.py |  4 ++++
 3 files changed, 16 insertions(+)
 create mode 100644 backend/api/graphql/__init__.py
 create mode 100644 backend/api/graphql/schema.py

diff --git a/backend/api/graphql/__init__.py b/backend/api/graphql/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/api/graphql/schema.py b/backend/api/graphql/schema.py
new file mode 100644
index 00000000..5029ca24
--- /dev/null
+++ b/backend/api/graphql/schema.py
@@ -0,0 +1,12 @@
+from graphene import ObjectType, Schema
+
+
+class Query(ObjectType):
+    pass
+
+
+class Mutation(ObjectType):
+    pass
+
+
+schema = Schema(query=Query, mutation=Mutation)
diff --git a/backend/lettercraft/settings.py b/backend/lettercraft/settings.py
index daaabd91..da9828b9 100644
--- a/backend/lettercraft/settings.py
+++ b/backend/lettercraft/settings.py
@@ -94,6 +94,10 @@
     ]
 }
 
+# GraphQL
+GRAPHENE = {"SCHEMA": "api.graphql.schema.schema"}
+ENABLE_GRAPHIQL = DEBUG
+
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 

From 11b79228ae4bbe40e64e428d40696d0f0a81ac39 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 10:13:55 +0200
Subject: [PATCH 058/565] Schema, SourceType and basic operations

---
 backend/api/graphql/schema.py                 | 10 ++++-
 .../source/mutations/DeleteSourceMutation.py  | 21 ++++++++++
 .../mutations/UpdateOrCreateSourceMutation.py | 40 +++++++++++++++++++
 backend/source/queries.py                     |  8 ++++
 backend/source/types/SourceType.py            | 15 +++++++
 5 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 backend/source/mutations/DeleteSourceMutation.py
 create mode 100644 backend/source/mutations/UpdateOrCreateSourceMutation.py
 create mode 100644 backend/source/queries.py
 create mode 100644 backend/source/types/SourceType.py

diff --git a/backend/api/graphql/schema.py b/backend/api/graphql/schema.py
index 5029ca24..9bee5b82 100644
--- a/backend/api/graphql/schema.py
+++ b/backend/api/graphql/schema.py
@@ -1,12 +1,18 @@
 from graphene import ObjectType, Schema
 
+from source.mutations.DeleteSourceMutation import DeleteSourceMutation
+from source.queries import SourceQueries
 
-class Query(ObjectType):
+from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
+
+
+class Query(SourceQueries, ObjectType):
     pass
 
 
 class Mutation(ObjectType):
-    pass
+    update_or_create_source = UpdateOrCreateSourceMutation.Field()
+    delete_source = DeleteSourceMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)
diff --git a/backend/source/mutations/DeleteSourceMutation.py b/backend/source/mutations/DeleteSourceMutation.py
new file mode 100644
index 00000000..5f39155e
--- /dev/null
+++ b/backend/source/mutations/DeleteSourceMutation.py
@@ -0,0 +1,21 @@
+from graphene import Mutation, ID, Boolean, ResolveInfo, String
+from source.models import Source
+
+
+class DeleteSourceMutation(Mutation):
+    ok = Boolean(required=True)
+    error = String()
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, id: str):
+        try:
+            source = Source.objects.get(pk=id)
+        except Source.DoesNotExist:
+            return cls(ok=False, error="Source not found.") # type: ignore
+
+        source.delete()
+
+        return cls(ok=True) # type: ignore
diff --git a/backend/source/mutations/UpdateOrCreateSourceMutation.py b/backend/source/mutations/UpdateOrCreateSourceMutation.py
new file mode 100644
index 00000000..613cffe6
--- /dev/null
+++ b/backend/source/mutations/UpdateOrCreateSourceMutation.py
@@ -0,0 +1,40 @@
+from graphene import ID, Field, InputObjectType, List, Mutation, ResolveInfo, String
+
+from source.models import Source
+from source.types.SourceType import SourceType
+
+
+class UpdateCreateSourceInput(InputObjectType):
+    id = ID()
+    name = String(required=True)
+    edition_author = String()
+    edition_title = String()
+    medieval_author = String()
+    medieval_title = String()
+
+
+class UpdateOrCreateSourceMutation(Mutation):
+    source = Field(SourceType)
+    errors = List(String)
+
+    class Arguments:
+        input = UpdateCreateSourceInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, input: UpdateCreateSourceInput):
+        source_id = getattr(input, "id", None)
+
+        if source_id:
+            try:
+                source = SourceType.get_queryset(Source.objects, info).get(pk=source_id)
+            except Source.DoesNotExist:
+                return cls(errors=["Source not found."])  # type: ignore
+        else:
+            source = Source()
+
+        for field, value in input.items():  # type: ignore
+            setattr(source, field, value)
+
+        source.save()
+
+        return cls(source=source)  # type: ignore
diff --git a/backend/source/queries.py b/backend/source/queries.py
new file mode 100644
index 00000000..3d832f4b
--- /dev/null
+++ b/backend/source/queries.py
@@ -0,0 +1,8 @@
+from graphene import ObjectType
+from graphene_django import DjangoListField
+
+from source.types.SourceType import SourceType
+
+
+class SourceQueries(ObjectType):
+    sources = DjangoListField(SourceType)
diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
new file mode 100644
index 00000000..29d6a029
--- /dev/null
+++ b/backend/source/types/SourceType.py
@@ -0,0 +1,15 @@
+from graphene import ResolveInfo
+from django.db.models import QuerySet
+from graphene_django import DjangoObjectType
+from source.models import Source
+
+
+class SourceType(DjangoObjectType):
+    class Meta:
+        model = Source
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[Source], info: ResolveInfo
+    ) -> QuerySet[Source]:
+        return queryset.all()

From 9a468aaa2e70e7b9b0f18e9d77bf0119b1263c54 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 10:29:43 +0200
Subject: [PATCH 059/565] Add Apollo and codegen

---
 frontend/codegen.ts                |   28 +
 frontend/package.json              |   11 +-
 frontend/src/app/app.module.ts     |    4 +
 frontend/src/app/graphql.module.ts |   24 +
 frontend/tsconfig.json             |   30 +-
 frontend/yarn.lock                 | 2359 +++++++++++++++++++++++++++-
 package.json                       |    1 +
 7 files changed, 2400 insertions(+), 57 deletions(-)
 create mode 100644 frontend/codegen.ts
 create mode 100644 frontend/src/app/graphql.module.ts

diff --git a/frontend/codegen.ts b/frontend/codegen.ts
new file mode 100644
index 00000000..a6d59f68
--- /dev/null
+++ b/frontend/codegen.ts
@@ -0,0 +1,28 @@
+import type { CodegenConfig } from '@graphql-codegen/cli'
+
+const config: CodegenConfig = {
+    schema: 'http://localhost:8000/api/graphql',
+    generates: {
+        './generated/graphql.ts': {
+            plugins: [
+                'typescript',
+                'typescript-operations',
+                'typescript-apollo-angular'
+            ],
+            config: {
+                addExplicitOverride: true
+            }
+        },
+        './generated/schema.graphql': {
+        plugins: ['schema-ast']
+        }
+    },
+    ignoreNoDocuments: true,
+    documents: [
+      "src/**/*.ts",
+      "src/**/*.graphql",
+    ],
+}
+
+export default config
+
diff --git a/frontend/package.json b/frontend/package.json
index 521d8ce4..f21bb6d4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,7 +12,8 @@
     "stop": "lsof -t -i tcp:4200 | xargs kill -9 || echo \"not running\"",
     "pretest": "yarn prebuild",
     "watch-test": "ng test --watch=true",
-    "lint": "ng lint"
+    "lint": "ng lint",
+    "codegen": "yarn graphql-codegen --verbose --watch"
   },
   "private": true,
   "dependencies": {
@@ -24,6 +25,7 @@
     "@angular/platform-browser": "^16.2.12",
     "@angular/platform-browser-dynamic": "^16.2.12",
     "@angular/router": "^16.2.12",
+    "@apollo/client": "^3.0.0",
     "@fortawesome/angular-fontawesome": "^0.13",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
@@ -31,8 +33,10 @@
     "@ngrx/effects": "^16.0.0",
     "@ngrx/store": "^16.0.0",
     "@popperjs/core": "^2.11.6",
+    "apollo-angular": "5.0.2",
     "bootstrap": "^5.2.3",
     "colors": "^1.4.0",
+    "graphql": "^16",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "underscore": "^1.13.6",
@@ -48,6 +52,9 @@
     "@angular/cli": "~16.2.10",
     "@angular/compiler-cli": "^16.2.12",
     "@angular/localize": "^16.2.12",
+    "@graphql-codegen/cli": "^5.0.2",
+    "@graphql-codegen/typescript-apollo-angular": "^4.0.0",
+    "@parcel/watcher": "^2.4.1",
     "@types/jasmine": "~4.3.0",
     "@types/underscore": "^1.11.15",
     "@typescript-eslint/eslint-plugin": "5.62.0",
@@ -61,4 +68,4 @@
     "karma-jasmine-html-reporter": "~2.0.0",
     "typescript": "~4.9.4"
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index da185e36..d6c33feb 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -7,6 +7,8 @@ import { HomeComponent } from './home/home.component';
 import { SharedModule } from './shared/shared.module';
 import { CoreModule } from './core/core.module';
 import { UserModule } from './user/user.module';
+import { GraphQLModule } from './graphql.module';
+import { HttpClientModule } from '@angular/common/http';
 
 @NgModule({
     declarations: [
@@ -18,6 +20,8 @@ import { UserModule } from './user/user.module';
         SharedModule,
         CoreModule,
         UserModule,
+        GraphQLModule,
+        HttpClientModule,
     ],
     providers: [],
     bootstrap: [AppComponent]
diff --git a/frontend/src/app/graphql.module.ts b/frontend/src/app/graphql.module.ts
new file mode 100644
index 00000000..9a801e4b
--- /dev/null
+++ b/frontend/src/app/graphql.module.ts
@@ -0,0 +1,24 @@
+import { APOLLO_OPTIONS, ApolloModule } from 'apollo-angular';
+import { HttpLink } from 'apollo-angular/http';
+import { NgModule } from '@angular/core';
+import { ApolloClientOptions, InMemoryCache } from '@apollo/client/core';
+
+const uri = 'http://localhost:8000/api/graphql'; // <-- add the URL of the GraphQL server here
+export function createApollo(httpLink: HttpLink): ApolloClientOptions<any> {
+  return {
+    link: httpLink.create({ uri }),
+    cache: new InMemoryCache(),
+  };
+}
+
+@NgModule({
+  exports: [ApolloModule],
+  providers: [
+    {
+      provide: APOLLO_OPTIONS,
+      useFactory: createApollo,
+      deps: [HttpLink],
+    },
+  ],
+})
+export class GraphQLModule {}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 62def0dd..acac7478 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "compileOnSave": false,
   "compilerOptions": {
@@ -21,21 +20,22 @@
     "useDefineForClassFields": false,
     "lib": [
       "ES2022",
-      "dom"
+      "dom",
+      "esnext.asynciterable"
     ],
     "paths": {
-        "@env": [
-            "src/environments/environment"
-        ],
-        "@services/*": [
-            "src/app/services/*"
-        ],
-        "@shared/*": [
-            "src/app/shared/*"
-        ],
-        "@mock/*": [
-            "src/mock/*"
-        ]
+      "@env": [
+        "src/environments/environment"
+      ],
+      "@services/*": [
+        "src/app/services/*"
+      ],
+      "@shared/*": [
+        "src/app/shared/*"
+      ],
+      "@mock/*": [
+        "src/mock/*"
+      ]
     },
     "allowSyntheticDefaultImports": true
   },
@@ -45,4 +45,4 @@
     "strictInputAccessModifiers": true,
     "strictTemplates": true
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index c5ba2aa7..69c80ad0 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -286,6 +286,56 @@
   dependencies:
     tslib "^2.3.0"
 
+"@apollo/client@^3.0.0":
+  version "3.10.5"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.10.5.tgz#7bc5d43b54b3d66b4fffdab6ad3cb207808041db"
+  integrity sha512-bZh5wLAT8b4KdEmqnqiQeDUttnR+NJ+gDYSN8T+U0uFGN++5LO5PTwySih6kIU5ErGGGw4NHI94YdSET3uLuBA==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    "@wry/caches" "^1.0.0"
+    "@wry/equality" "^0.5.6"
+    "@wry/trie" "^0.5.0"
+    graphql-tag "^2.12.6"
+    hoist-non-react-statics "^3.3.2"
+    optimism "^0.18.0"
+    prop-types "^15.7.2"
+    rehackt "^0.1.0"
+    response-iterator "^0.2.6"
+    symbol-observable "^4.0.0"
+    ts-invariant "^0.10.3"
+    tslib "^2.3.0"
+    zen-observable-ts "^1.2.5"
+
+"@ardatan/relay-compiler@12.0.0":
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz#2e4cca43088e807adc63450e8cab037020e91106"
+  integrity sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==
+  dependencies:
+    "@babel/core" "^7.14.0"
+    "@babel/generator" "^7.14.0"
+    "@babel/parser" "^7.14.0"
+    "@babel/runtime" "^7.0.0"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.0.0"
+    babel-preset-fbjs "^3.4.0"
+    chalk "^4.0.0"
+    fb-watchman "^2.0.0"
+    fbjs "^3.0.0"
+    glob "^7.1.1"
+    immutable "~3.7.6"
+    invariant "^2.2.4"
+    nullthrows "^1.1.1"
+    relay-runtime "12.0.0"
+    signedsource "^1.0.0"
+    yargs "^15.3.1"
+
+"@ardatan/sync-fetch@^0.0.1":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz#3385d3feedceb60a896518a1db857ec1e945348f"
+  integrity sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA==
+  dependencies:
+    node-fetch "^2.6.1"
+
 "@assemblyscript/loader@^0.10.1":
   version "0.10.1"
   resolved "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz"
@@ -307,6 +357,19 @@
     "@babel/highlight" "^7.23.4"
     chalk "^2.4.2"
 
+"@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
+  dependencies:
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
+
+"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed"
+  integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==
+
 "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.3":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz"
@@ -375,6 +438,27 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
+"@babel/core@^7.14.0", "@babel/core@^7.22.9":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4"
+  integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helpers" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/template" "^7.24.7"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
 "@babel/generator@7.22.9":
   version "7.22.9"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz"
@@ -385,6 +469,16 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d"
+  integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==
+  dependencies:
+    "@babel/types" "^7.24.7"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^2.5.1"
+
 "@babel/generator@^7.22.9", "@babel/generator@^7.23.0", "@babel/generator@^7.23.4":
   version "7.23.4"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.23.4.tgz"
@@ -412,6 +506,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-annotate-as-pure@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
+  integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
+  dependencies:
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz"
@@ -419,6 +520,17 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
+"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9"
+  integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==
+  dependencies:
+    "@babel/compat-data" "^7.24.7"
+    "@babel/helper-validator-option" "^7.24.7"
+    browserslist "^4.22.2"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
 "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz"
@@ -430,6 +542,21 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
+"@babel/helper-create-class-features-plugin@^7.18.6":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b"
+  integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.7"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    semver "^6.3.1"
+
 "@babel/helper-create-class-features-plugin@^7.22.15":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz"
@@ -470,6 +597,13 @@
   resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
+"@babel/helper-environment-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
+  dependencies:
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz"
@@ -478,6 +612,14 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.23.0"
 
+"@babel/helper-function-name@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
+  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
+  dependencies:
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz"
@@ -485,6 +627,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-hoist-variables@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
+  integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==
+  dependencies:
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-member-expression-to-functions@^7.22.15":
   version "7.23.0"
   resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz"
@@ -492,6 +641,14 @@
   dependencies:
     "@babel/types" "^7.23.0"
 
+"@babel/helper-member-expression-to-functions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f"
+  integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz"
@@ -499,6 +656,14 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.23.0", "@babel/helper-module-transforms@^7.23.3":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz"
@@ -510,6 +675,17 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.20"
 
+"@babel/helper-module-transforms@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8"
+  integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+
 "@babel/helper-optimise-call-expression@^7.22.5":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz"
@@ -517,11 +693,23 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-optimise-call-expression@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"
+  integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==
+  dependencies:
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz"
   integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
+"@babel/helper-plugin-utils@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0"
+  integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==
+
 "@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz"
@@ -540,6 +728,15 @@
     "@babel/helper-member-expression-to-functions" "^7.22.15"
     "@babel/helper-optimise-call-expression" "^7.22.5"
 
+"@babel/helper-replace-supers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765"
+  integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.7"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz"
@@ -547,6 +744,14 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz"
@@ -554,6 +759,14 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
+  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-split-export-declaration@7.22.6", "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
   resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz"
@@ -561,6 +774,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-split-export-declaration@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856"
+  integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==
+  dependencies:
+    "@babel/types" "^7.24.7"
+
 "@babel/helper-string-parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz"
@@ -571,16 +791,31 @@
   resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz"
   integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
+"@babel/helper-string-parser@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2"
+  integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==
+
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
 "@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.22.5":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz"
   integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
 
+"@babel/helper-validator-option@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6"
+  integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==
+
 "@babel/helper-wrap-function@^7.22.20":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz"
@@ -608,6 +843,14 @@
     "@babel/traverse" "^7.23.2"
     "@babel/types" "^7.23.0"
 
+"@babel/helpers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416"
+  integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==
+  dependencies:
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/highlight@^7.22.13":
   version "7.22.20"
   resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz"
@@ -626,6 +869,21 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.7"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
+"@babel/parser@^7.14.0", "@babel/parser@^7.16.8", "@babel/parser@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85"
+  integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
+
 "@babel/parser@^7.14.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.3":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz"
@@ -662,6 +920,25 @@
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
+"@babel/plugin-proposal-class-properties@^7.0.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-proposal-object-rest-spread@^7.0.0":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
+  dependencies:
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.20.7"
+
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   version "7.21.0-placeholder-for-preset-env.2"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz"
@@ -682,7 +959,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.12.13":
+"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
@@ -710,6 +987,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.7.tgz#d1759e84dd4b437cf9fae69b4c06c41d7625bfb7"
+  integrity sha512-9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz#2a0b406b5871a20a841240586b1300ce2088a778"
+  integrity sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-syntax-import-assertions@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz"
@@ -738,6 +1029,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d"
+  integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
@@ -759,7 +1057,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
@@ -802,6 +1100,13 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
+"@babel/plugin-transform-arrow-functions@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.7.tgz#4f6886c11e423bd69f3ce51dbf42424a5f275514"
+  integrity sha512-Dt9LQs6iEY++gXUwY03DNFat5C2NbO48jj+j/bSAz6b3HgPs39qcPiYt77fDObIcFwj3/C2ICX9YMwGflUoSHQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-arrow-functions@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz"
@@ -837,6 +1142,13 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/helper-remap-async-to-generator" "^7.22.20"
 
+"@babel/plugin-transform-block-scoped-functions@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.7.tgz#a4251d98ea0c0f399dafe1a35801eaba455bbf1f"
+  integrity sha512-yO7RAz6EsVQDaBH18IDJcMB1HnrUn2FJ/Jslc/WtPPWcjhpUJXU/rjbwmluzp7v/ZzWcEhTMXELnnsz8djWDwQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-block-scoped-functions@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz"
@@ -844,6 +1156,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-block-scoping@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.7.tgz#42063e4deb850c7bd7c55e626bf4e7ab48e6ce02"
+  integrity sha512-Nd5CvgMbWc+oWzBsuaMcbwjJWAcp5qzrbg69SZdHSP7AMY0AbWFqFO0WTFCA1jxhMCwodRwvRec8k0QUbZk7RQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-block-scoping@^7.22.5":
   version "7.23.4"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz"
@@ -868,6 +1187,20 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
+"@babel/plugin-transform-classes@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz#4ae6ef43a12492134138c1e45913f7c46c41b4bf"
+  integrity sha512-CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-classes@^7.22.6":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz"
@@ -883,6 +1216,14 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
+"@babel/plugin-transform-computed-properties@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.7.tgz#4cab3214e80bc71fae3853238d13d097b004c707"
+  integrity sha512-25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/template" "^7.24.7"
+
 "@babel/plugin-transform-computed-properties@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"
@@ -891,6 +1232,13 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/template" "^7.22.15"
 
+"@babel/plugin-transform-destructuring@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz#a097f25292defb6e6cc16d6333a4cfc1e3c72d9e"
+  integrity sha512-19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-destructuring@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz"
@@ -937,6 +1285,22 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-transform-flow-strip-types@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.7.tgz#ae454e62219288fbb734541ab00389bfb13c063e"
+  integrity sha512-cjRKJ7FobOH2eakx7Ja+KpJRj8+y+/SiB3ooYm/n2UJfxu0oEaOoxOinitkJcPqv9KxS0kxTGPUaR7L2XcXDXA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-flow" "^7.24.7"
+
+"@babel/plugin-transform-for-of@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.7.tgz#f25b33f72df1d8be76399e1b8f3f9d366eb5bc70"
+  integrity sha512-wo9ogrDG1ITTTBsy46oGiN1dS9A7MROBTcYsfS8DtsImMkHk9JXJ3EWQM6X2SUw4x80uGPlwj0o00Uoc6nEE3g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+
 "@babel/plugin-transform-for-of@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz"
@@ -944,6 +1308,15 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-function-name@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.7.tgz#6d8601fbffe665c894440ab4470bc721dd9131d6"
+  integrity sha512-U9FcnA821YoILngSmYkW6FjyQe2TyZD5pHt4EVIhmcTkrJw/3KqcrRSxuOo5tFZJi7TE19iDyI1u+weTI7bn2w==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-function-name@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz"
@@ -961,6 +1334,13 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
+"@babel/plugin-transform-literals@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.7.tgz#36b505c1e655151a9d7607799a9988fc5467d06c"
+  integrity sha512-vcwCbb4HDH+hWi8Pqenwnjy+UiklO4Kt1vfspcQYFhJdpthSnW8XvWGyDZWKNVrVbVViI/S7K9PDJZiUmP2fYQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-literals@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz"
@@ -976,6 +1356,13 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
+"@babel/plugin-transform-member-expression-literals@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.7.tgz#3b4454fb0e302e18ba4945ba3246acb1248315df"
+  integrity sha512-T/hRC1uqrzXMKLQ6UCwMT85S3EvqaBXDGf0FaMf4446Qx9vKwlghvee0+uuZcDUCZU5RuNi4781UQ7R308zzBw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-member-expression-literals@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz"
@@ -991,6 +1378,15 @@
     "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-modules-commonjs@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz#9fd5f7fdadee9085886b183f1ad13d1ab260f4ab"
+  integrity sha512-iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+
 "@babel/plugin-transform-modules-commonjs@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz"
@@ -1060,6 +1456,14 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.23.3"
 
+"@babel/plugin-transform-object-super@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.7.tgz#66eeaff7830bba945dd8989b632a40c04ed625be"
+  integrity sha512-A/vVLwN6lBrMFmMDmPPz0jnE6ZGx7Jq7d6sT/Ev4H65RER6pZ+kczlf1DthF5N0qaPHBsI7UXiE8Zy66nmAovg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.24.7"
+
 "@babel/plugin-transform-object-super@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz"
@@ -1094,6 +1498,13 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
+"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.7.tgz#5881f0ae21018400e320fc7eb817e529d1254b68"
+  integrity sha512-yGWW5Rr+sQOhK0Ot8hjDJuxU3XLRQGflvT4lhlSY0DFvdb3TwKaY26CJzHtYllU0vT9j58hc37ndFPsqT1SrzA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-parameters@^7.22.5", "@babel/plugin-transform-parameters@^7.23.3":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz"
@@ -1119,6 +1530,13 @@
     "@babel/helper-plugin-utils" "^7.22.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
+"@babel/plugin-transform-property-literals@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.7.tgz#f0d2ed8380dfbed949c42d4d790266525d63bbdc"
+  integrity sha512-EMi4MLQSHfd2nrCqQEWxFdha2gBCqU4ZcCng4WBGZ5CJL4bBRW0ptdqqDdeirGZcpALazVVNJqRmsO8/+oNCBA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-property-literals@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz"
@@ -1126,6 +1544,24 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-react-display-name@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.7.tgz#9caff79836803bc666bcfe210aeb6626230c293b"
+  integrity sha512-H/Snz9PFxKsS1JLI4dJLtnJgCJRoo0AUm3chP6NYr+9En1JMKloheEiLIhlp5MDVznWo+H3AAC1Mc8lmUEpsgg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
+"@babel/plugin-transform-react-jsx@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.7.tgz#17cd06b75a9f0e2bd076503400e7c4b99beedac4"
+  integrity sha512-+Dj06GDZEFRYvclU6k4bme55GKBEWUmByM/eoKuqg4zTNQHiApWRhQph5fxQB2wAEFvRzL1tOEj1RJ19wJrhoA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-jsx" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/plugin-transform-regenerator@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz"
@@ -1153,6 +1589,13 @@
     babel-plugin-polyfill-regenerator "^0.5.1"
     semver "^6.3.1"
 
+"@babel/plugin-transform-shorthand-properties@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.7.tgz#85448c6b996e122fa9e289746140aaa99da64e73"
+  integrity sha512-KsDsevZMDsigzbA09+vacnLpmPH4aWjcZjXdyFKGzpplxhbeB4wYtury3vglQkg6KM/xEPKt73eCjPPf1PgXBA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-shorthand-properties@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz"
@@ -1160,6 +1603,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-spread@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.7.tgz#e8a38c0fde7882e0fb8f160378f74bd885cc7bb3"
+  integrity sha512-x96oO0I09dgMDxJaANcRyD4ellXFLLiWhuwDxKZX5g2rWP1bTPkBSwCYv96VDXVT1bD9aPj8tppr5ITIh8hBng==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+
 "@babel/plugin-transform-spread@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz"
@@ -1175,6 +1626,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
+"@babel/plugin-transform-template-literals@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.7.tgz#a05debb4a9072ae8f985bcf77f3f215434c8f8c8"
+  integrity sha512-AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.24.7"
+
 "@babel/plugin-transform-template-literals@^7.22.5":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz"
@@ -1329,6 +1787,13 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@babel/runtime@^7.0.0":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"
+  integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/runtime@^7.8.4":
   version "7.23.2"
   resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz"
@@ -1345,6 +1810,15 @@
     "@babel/parser" "^7.22.5"
     "@babel/types" "^7.22.5"
 
+"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315"
+  integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
 "@babel/template@^7.22.15", "@babel/template@^7.22.5":
   version "7.22.15"
   resolved "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz"
@@ -1354,6 +1828,22 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
+"@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5"
+  integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-hoist-variables" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.22.8", "@babel/traverse@^7.23.4":
   version "7.23.4"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.4.tgz"
@@ -1386,6 +1876,15 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.18.13", "@babel/types@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
+  integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.4.4":
   version "7.23.3"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz"
@@ -1697,6 +2196,524 @@
   resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
+"@graphql-codegen/add@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-5.0.3.tgz#1ede6bac9a93661ed7fa5808b203d079e1b1d215"
+  integrity sha512-SxXPmramkth8XtBlAHu4H4jYcYXM/o3p01+psU+0NADQowA8jtYkK6MW5rV6T+CxkEaNZItfSmZRPgIuypcqnA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    tslib "~2.6.0"
+
+"@graphql-codegen/cli@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-5.0.2.tgz#07ff691c16da4c3dcc0e1995d3231530379ab317"
+  integrity sha512-MBIaFqDiLKuO4ojN6xxG9/xL9wmfD3ZjZ7RsPjwQnSHBCUXnEkdKvX+JVpx87Pq29Ycn8wTJUguXnTZ7Di0Mlw==
+  dependencies:
+    "@babel/generator" "^7.18.13"
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.18.13"
+    "@graphql-codegen/client-preset" "^4.2.2"
+    "@graphql-codegen/core" "^4.0.2"
+    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    "@graphql-tools/apollo-engine-loader" "^8.0.0"
+    "@graphql-tools/code-file-loader" "^8.0.0"
+    "@graphql-tools/git-loader" "^8.0.0"
+    "@graphql-tools/github-loader" "^8.0.0"
+    "@graphql-tools/graphql-file-loader" "^8.0.0"
+    "@graphql-tools/json-file-loader" "^8.0.0"
+    "@graphql-tools/load" "^8.0.0"
+    "@graphql-tools/prisma-loader" "^8.0.0"
+    "@graphql-tools/url-loader" "^8.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    "@whatwg-node/fetch" "^0.8.0"
+    chalk "^4.1.0"
+    cosmiconfig "^8.1.3"
+    debounce "^1.2.0"
+    detect-indent "^6.0.0"
+    graphql-config "^5.0.2"
+    inquirer "^8.0.0"
+    is-glob "^4.0.1"
+    jiti "^1.17.1"
+    json-to-pretty-yaml "^1.2.2"
+    listr2 "^4.0.5"
+    log-symbols "^4.0.0"
+    micromatch "^4.0.5"
+    shell-quote "^1.7.3"
+    string-env-interpolation "^1.0.1"
+    ts-log "^2.2.3"
+    tslib "^2.4.0"
+    yaml "^2.3.1"
+    yargs "^17.0.0"
+
+"@graphql-codegen/client-preset@^4.2.2":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-4.3.0.tgz#871fe064c3747f91c81946d6fc0f6e063bfe2f51"
+  integrity sha512-p2szj5YiyLUYnQn1h7S4dsSY2Jc1LNrm32ptkb6CGtqPo3w9vgqki2WRJwgeJN8s3bhifqWRPzhoid/smrFVgA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/template" "^7.20.7"
+    "@graphql-codegen/add" "^5.0.3"
+    "@graphql-codegen/gql-tag-operations" "4.0.7"
+    "@graphql-codegen/plugin-helpers" "^5.0.4"
+    "@graphql-codegen/typed-document-node" "^5.0.7"
+    "@graphql-codegen/typescript" "^4.0.7"
+    "@graphql-codegen/typescript-operations" "^4.2.1"
+    "@graphql-codegen/visitor-plugin-common" "^5.2.0"
+    "@graphql-tools/documents" "^1.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    "@graphql-typed-document-node/core" "3.2.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/core@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-4.0.2.tgz#7e6ec266276f54bbf02f60599d9e518f4a59d85e"
+  integrity sha512-IZbpkhwVqgizcjNiaVzNAzm/xbWT6YnGgeOLwVjm4KbJn3V2jchVtuzHH09G5/WkkLSk2wgbXNdwjM41JxO6Eg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    "@graphql-tools/schema" "^10.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/gql-tag-operations@4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.7.tgz#365f01dd6e2dc1853beb7de6d93c94d71efdf2ff"
+  integrity sha512-2I69+IDC8pqAohH6cgKse/vPfJ/4TRTJX96PkAKz8S4RD54PUHtBmzCdBInIFEP/vQuH5mFUAaIKXXjznmGOsg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.4"
+    "@graphql-codegen/visitor-plugin-common" "5.2.0"
+    "@graphql-tools/utils" "^10.0.0"
+    auto-bind "~4.0.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/plugin-helpers@^2.7.2":
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.7.2.tgz#6544f739d725441c826a8af6a49519f588ff9bed"
+  integrity sha512-kln2AZ12uii6U59OQXdjLk5nOlh1pHis1R98cDZGFnfaiAbX9V3fxcZ1MMJkB7qFUymTALzyjZoXXdyVmPMfRg==
+  dependencies:
+    "@graphql-tools/utils" "^8.8.0"
+    change-case-all "1.0.14"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    lodash "~4.17.0"
+    tslib "~2.4.0"
+
+"@graphql-codegen/plugin-helpers@^3.0.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-3.1.2.tgz#69a2e91178f478ea6849846ade0a59a844d34389"
+  integrity sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg==
+  dependencies:
+    "@graphql-tools/utils" "^9.0.0"
+    change-case-all "1.0.15"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    lodash "~4.17.0"
+    tslib "~2.4.0"
+
+"@graphql-codegen/plugin-helpers@^5.0.3", "@graphql-codegen/plugin-helpers@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.4.tgz#5f4c987c3f308ef1c8809ee0c43af0369867e0f6"
+  integrity sha512-MOIuHFNWUnFnqVmiXtrI+4UziMTYrcquljaI5f/T/Bc7oO7sXcfkAvgkNWEEi9xWreYwvuer3VHCuPI/lAFWbw==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.0"
+    change-case-all "1.0.15"
+    common-tags "1.8.2"
+    import-from "4.0.0"
+    lodash "~4.17.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/schema-ast@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-4.0.2.tgz#aeaa104e4555cca73a058f0a9350b4b0e290b377"
+  integrity sha512-5mVAOQQK3Oz7EtMl/l3vOQdc2aYClUzVDHHkMvZlunc+KlGgl81j8TLa+X7ANIllqU4fUEsQU3lJmk4hXP6K7Q==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.3"
+    "@graphql-tools/utils" "^10.0.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/typed-document-node@^5.0.7":
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.7.tgz#a1034785d860b1459b9d89b4530d872319f29233"
+  integrity sha512-rgFh96hAbNwPUxLVlRcNhGaw2+y7ZGx7giuETtdO8XzPasTQGWGRkZ3wXQ5UUiTX4X3eLmjnuoXYKT7HoxSznQ==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.4"
+    "@graphql-codegen/visitor-plugin-common" "5.2.0"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    tslib "~2.6.0"
+
+"@graphql-codegen/typescript-apollo-angular@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-apollo-angular/-/typescript-apollo-angular-4.0.0.tgz#ad8cf6b6ebb243b687f3c896640f0eaba1f43341"
+  integrity sha512-uZQGvZBXJrgJ+9KKeRrKcB8wHCsailJ1WaCizNLf2YsTBUELVX0SQRrSFptAul9qYzsS84LRs6ndJsmSUnER6w==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^3.0.0"
+    "@graphql-codegen/visitor-plugin-common" "2.13.1"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    tslib "~2.6.0"
+
+"@graphql-codegen/typescript-operations@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.1.tgz#887d5883d33d1e14a6f5dc90f125db343b3759d3"
+  integrity sha512-LhEPsaP+AI65zfK2j6CBAL4RT0bJL/rR9oRWlvwtHLX0t7YQr4CP4BXgvvej9brYdedAxHGPWeV1tPHy5/z9KQ==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.4"
+    "@graphql-codegen/typescript" "^4.0.7"
+    "@graphql-codegen/visitor-plugin-common" "5.2.0"
+    auto-bind "~4.0.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/typescript@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-4.0.7.tgz#32f0f0916ed2ef7efbc233d14af07057aafdeea8"
+  integrity sha512-Gn+JNvQBJhBqH7s83piAJ6UeU/MTj9GXWFO9bdbl8PMLCAM1uFAtg04iHfkGCtDKXcUg5a3Dt/SZG85uk5KuhA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.4"
+    "@graphql-codegen/schema-ast" "^4.0.2"
+    "@graphql-codegen/visitor-plugin-common" "5.2.0"
+    auto-bind "~4.0.0"
+    tslib "~2.6.0"
+
+"@graphql-codegen/visitor-plugin-common@2.13.1":
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.1.tgz#2228660f6692bcdb96b1f6d91a0661624266b76b"
+  integrity sha512-mD9ufZhDGhyrSaWQGrU1Q1c5f01TeWtSWy/cDwXYjJcHIj1Y/DG2x0tOflEfCvh5WcnmHNIw4lzDsg1W7iFJEg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^2.7.2"
+    "@graphql-tools/optimize" "^1.3.0"
+    "@graphql-tools/relay-operation-optimizer" "^6.5.0"
+    "@graphql-tools/utils" "^8.8.0"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.14"
+    dependency-graph "^0.11.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "~2.4.0"
+
+"@graphql-codegen/visitor-plugin-common@5.2.0", "@graphql-codegen/visitor-plugin-common@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.2.0.tgz#8c48c0a62575d5f302678aae3994a50e9ac72cd0"
+  integrity sha512-0p8AwmARaZCAlDFfQu6Sz+JV6SjbPDx3y2nNM7WAAf0au7Im/GpJ7Ke3xaIYBc1b2rTZ+DqSTJI/zomENGD9NA==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "^5.0.4"
+    "@graphql-tools/optimize" "^2.0.0"
+    "@graphql-tools/relay-operation-optimizer" "^7.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    auto-bind "~4.0.0"
+    change-case-all "1.0.15"
+    dependency-graph "^0.11.0"
+    graphql-tag "^2.11.0"
+    parse-filepath "^1.0.2"
+    tslib "~2.6.0"
+
+"@graphql-tools/apollo-engine-loader@^8.0.0":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.1.tgz#1ec8718af6130ff8039cd653991412472cdd7e55"
+  integrity sha512-NaPeVjtrfbPXcl+MLQCJLWtqe2/E4bbAqcauEOQ+3sizw1Fc2CNmhHRF8a6W4D0ekvTRRXAMptXYgA2uConbrA==
+  dependencies:
+    "@ardatan/sync-fetch" "^0.0.1"
+    "@graphql-tools/utils" "^10.0.13"
+    "@whatwg-node/fetch" "^0.9.0"
+    tslib "^2.4.0"
+
+"@graphql-tools/batch-execute@^9.0.4":
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-9.0.4.tgz#11601409c0c33491971fc82592de12390ec58be2"
+  integrity sha512-kkebDLXgDrep5Y0gK1RN3DMUlLqNhg60OAz0lTCqrYeja6DshxLtLkj+zV4mVbBA4mQOEoBmw6g1LZs3dA84/w==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.13"
+    dataloader "^2.2.2"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-tools/code-file-loader@^8.0.0":
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-8.1.2.tgz#a71b72875678625cbc2359ab77a5122980206b0b"
+  integrity sha512-GrLzwl1QV2PT4X4TEEfuTmZYzIZHLqoTGBjczdUzSqgCCcqwWzLB3qrJxFQfI8e5s1qZ1bhpsO9NoMn7tvpmyA==
+  dependencies:
+    "@graphql-tools/graphql-tag-pluck" "8.3.1"
+    "@graphql-tools/utils" "^10.0.13"
+    globby "^11.0.3"
+    tslib "^2.4.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/delegate@^10.0.4":
+  version "10.0.11"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-10.0.11.tgz#d66b46a5f90b0c323848e0b38379836842d1ce72"
+  integrity sha512-+sKeecdIVXhFB/66e5yjeKYZ3Lpn52yNG637ElVhciuLGgFc153rC6l6zcuNd9yx5wMrNx35U/h3HsMIEI3xNw==
+  dependencies:
+    "@graphql-tools/batch-execute" "^9.0.4"
+    "@graphql-tools/executor" "^1.2.1"
+    "@graphql-tools/schema" "^10.0.4"
+    "@graphql-tools/utils" "^10.2.1"
+    dataloader "^2.2.2"
+    tslib "^2.5.0"
+
+"@graphql-tools/documents@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/documents/-/documents-1.0.1.tgz#ae19cd5667d22c23b331d3a1429443ed7130faee"
+  integrity sha512-aweoMH15wNJ8g7b2r4C4WRuJxZ0ca8HtNO54rkye/3duxTkW4fGBEutCx03jCIr5+a1l+4vFJNP859QnAVBVCA==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tslib "^2.4.0"
+
+"@graphql-tools/executor-graphql-ws@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.2.tgz#2bf959d2319692460b39400c0fe1515dfbb9f034"
+  integrity sha512-+9ZK0rychTH1LUv4iZqJ4ESbmULJMTsv3XlFooPUngpxZkk00q6LqHKJRrsLErmQrVaC7cwQCaRBJa0teK17Lg==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.13"
+    "@types/ws" "^8.0.0"
+    graphql-ws "^5.14.0"
+    isomorphic-ws "^5.0.0"
+    tslib "^2.4.0"
+    ws "^8.13.0"
+
+"@graphql-tools/executor-http@^1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-1.0.9.tgz#87ca8b99a32241eb0cc30a9c500d2672e92d58b7"
+  integrity sha512-+NXaZd2MWbbrWHqU4EhXcrDbogeiCDmEbrAN+rMn4Nu2okDjn2MTFDbTIab87oEubQCH4Te1wDkWPKrzXup7+Q==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.13"
+    "@repeaterjs/repeater" "^3.0.4"
+    "@whatwg-node/fetch" "^0.9.0"
+    extract-files "^11.0.0"
+    meros "^1.2.1"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-tools/executor-legacy-ws@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.6.tgz#4ed311b731db8fd5c99e66a66361afbf9c2109fc"
+  integrity sha512-lDSxz9VyyquOrvSuCCnld3256Hmd+QI2lkmkEv7d4mdzkxkK4ddAWW1geQiWrQvWmdsmcnGGlZ7gDGbhEExwqg==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.13"
+    "@types/ws" "^8.0.0"
+    isomorphic-ws "^5.0.0"
+    tslib "^2.4.0"
+    ws "^8.15.0"
+
+"@graphql-tools/executor@^1.2.1":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-1.2.6.tgz#71caa7c52108e4744bfa5ffdc958126bb4b48ff2"
+  integrity sha512-+1kjfqzM5T2R+dCw7F4vdJ3CqG+fY/LYJyhNiWEFtq0ToLwYzR/KKyD8YuzTirEjSxWTVlcBh7endkx5n5F6ew==
+  dependencies:
+    "@graphql-tools/utils" "^10.1.1"
+    "@graphql-typed-document-node/core" "3.2.0"
+    "@repeaterjs/repeater" "^3.0.4"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-tools/git-loader@^8.0.0":
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-8.0.6.tgz#afc88e31e9ebd0a8b576c5e46192d83efea5437c"
+  integrity sha512-FQFO4H5wHAmHVyuUQrjvPE8re3qJXt50TWHuzrK3dEaief7JosmlnkLMDMbMBwtwITz9u1Wpl6doPhT2GwKtlw==
+  dependencies:
+    "@graphql-tools/graphql-tag-pluck" "8.3.1"
+    "@graphql-tools/utils" "^10.0.13"
+    is-glob "4.0.3"
+    micromatch "^4.0.4"
+    tslib "^2.4.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/github-loader@^8.0.0":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-8.0.1.tgz#011e1f9495d42a55139a12f576cc6bb04943ecf4"
+  integrity sha512-W4dFLQJ5GtKGltvh/u1apWRFKBQOsDzFxO9cJkOYZj1VzHCpRF43uLST4VbCfWve+AwBqOuKr7YgkHoxpRMkcg==
+  dependencies:
+    "@ardatan/sync-fetch" "^0.0.1"
+    "@graphql-tools/executor-http" "^1.0.9"
+    "@graphql-tools/graphql-tag-pluck" "^8.0.0"
+    "@graphql-tools/utils" "^10.0.13"
+    "@whatwg-node/fetch" "^0.9.0"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-tools/graphql-file-loader@^8.0.0":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.0.1.tgz#03869b14cb91d0ef539df8195101279bb2df9c9e"
+  integrity sha512-7gswMqWBabTSmqbaNyWSmRRpStWlcCkBc73E6NZNlh4YNuiyKOwbvSkOUYFOqFMfEL+cFsXgAvr87Vz4XrYSbA==
+  dependencies:
+    "@graphql-tools/import" "7.0.1"
+    "@graphql-tools/utils" "^10.0.13"
+    globby "^11.0.3"
+    tslib "^2.4.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/graphql-tag-pluck@8.3.1", "@graphql-tools/graphql-tag-pluck@^8.0.0":
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.3.1.tgz#fb6154d626a427f1910f76dff860e7a6cc61a4aa"
+  integrity sha512-ujits9tMqtWQQq4FI4+qnVPpJvSEn7ogKtyN/gfNT+ErIn6z1e4gyVGQpTK5sgAUXq1lW4gU/5fkFFC5/sL2rQ==
+  dependencies:
+    "@babel/core" "^7.22.9"
+    "@babel/parser" "^7.16.8"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/traverse" "^7.16.8"
+    "@babel/types" "^7.16.8"
+    "@graphql-tools/utils" "^10.0.13"
+    tslib "^2.4.0"
+
+"@graphql-tools/import@7.0.1":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-7.0.1.tgz#4e0d181c63350b1c926ae91b84a4cbaf03713c2c"
+  integrity sha512-935uAjAS8UAeXThqHfYVr4HEAp6nHJ2sximZKO1RzUTq5WoALMAhhGARl0+ecm6X+cqNUwIChJbjtaa6P/ML0w==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.13"
+    resolve-from "5.0.0"
+    tslib "^2.4.0"
+
+"@graphql-tools/json-file-loader@^8.0.0":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-8.0.1.tgz#3fcfe869f22d8129a74369da69bf491c0bff7c2d"
+  integrity sha512-lAy2VqxDAHjVyqeJonCP6TUemrpYdDuKt25a10X6zY2Yn3iFYGnuIDQ64cv3ytyGY6KPyPB+Kp+ZfOkNDG3FQA==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.13"
+    globby "^11.0.3"
+    tslib "^2.4.0"
+    unixify "^1.0.0"
+
+"@graphql-tools/load@^8.0.0":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-8.0.2.tgz#47d9916bf96dea05df27f11b53812f4327d9b6d2"
+  integrity sha512-S+E/cmyVmJ3CuCNfDuNF2EyovTwdWfQScXv/2gmvJOti2rGD8jTt9GYVzXaxhblLivQR9sBUCNZu/w7j7aXUCA==
+  dependencies:
+    "@graphql-tools/schema" "^10.0.3"
+    "@graphql-tools/utils" "^10.0.13"
+    p-limit "3.1.0"
+    tslib "^2.4.0"
+
+"@graphql-tools/merge@^9.0.0", "@graphql-tools/merge@^9.0.3":
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.4.tgz#66c34cbc2b9a99801c0efca7b8134b2c9aecdb06"
+  integrity sha512-MivbDLUQ+4Q8G/Hp/9V72hbn810IJDEZQ57F01sHnlrrijyadibfVhaQfW/pNH+9T/l8ySZpaR/DpL5i+ruZ+g==
+  dependencies:
+    "@graphql-tools/utils" "^10.0.13"
+    tslib "^2.4.0"
+
+"@graphql-tools/optimize@^1.3.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.4.0.tgz#20d6a9efa185ef8fc4af4fd409963e0907c6e112"
+  integrity sha512-dJs/2XvZp+wgHH8T5J2TqptT9/6uVzIYvA6uFACha+ufvdMBedkfR4b4GbT8jAKLRARiqRTxy3dctnwkTM2tdw==
+  dependencies:
+    tslib "^2.4.0"
+
+"@graphql-tools/optimize@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-2.0.0.tgz#7a9779d180824511248a50c5a241eff6e7a2d906"
+  integrity sha512-nhdT+CRGDZ+bk68ic+Jw1OZ99YCDIKYA5AlVAnBHJvMawSx9YQqQAIj4refNc1/LRieGiuWvhbG3jvPVYho0Dg==
+  dependencies:
+    tslib "^2.4.0"
+
+"@graphql-tools/prisma-loader@^8.0.0":
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-8.0.4.tgz#542be5567b93f1b6147ef85819eb5874969486b2"
+  integrity sha512-hqKPlw8bOu/GRqtYr0+dINAI13HinTVYBDqhwGAPIFmLr5s+qKskzgCiwbsckdrb5LWVFmVZc+UXn80OGiyBzg==
+  dependencies:
+    "@graphql-tools/url-loader" "^8.0.2"
+    "@graphql-tools/utils" "^10.0.13"
+    "@types/js-yaml" "^4.0.0"
+    "@whatwg-node/fetch" "^0.9.0"
+    chalk "^4.1.0"
+    debug "^4.3.1"
+    dotenv "^16.0.0"
+    graphql-request "^6.0.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.0"
+    jose "^5.0.0"
+    js-yaml "^4.0.0"
+    lodash "^4.17.20"
+    scuid "^1.1.0"
+    tslib "^2.4.0"
+    yaml-ast-parser "^0.0.43"
+
+"@graphql-tools/relay-operation-optimizer@^6.5.0":
+  version "6.5.18"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.5.18.tgz#a1b74a8e0a5d0c795b8a4d19629b654cf66aa5ab"
+  integrity sha512-mc5VPyTeV+LwiM+DNvoDQfPqwQYhPV/cl5jOBjTgSniyaq8/86aODfMkrE2OduhQ5E00hqrkuL2Fdrgk0w1QJg==
+  dependencies:
+    "@ardatan/relay-compiler" "12.0.0"
+    "@graphql-tools/utils" "^9.2.1"
+    tslib "^2.4.0"
+
+"@graphql-tools/relay-operation-optimizer@^7.0.0":
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.1.tgz#8ac33e1d2626b6816d9283769c4a05c062b8065a"
+  integrity sha512-y0ZrQ/iyqWZlsS/xrJfSir3TbVYJTYmMOu4TaSz6F4FRDTQ3ie43BlKkhf04rC28pnUOS4BO9pDcAo1D30l5+A==
+  dependencies:
+    "@ardatan/relay-compiler" "12.0.0"
+    "@graphql-tools/utils" "^10.0.13"
+    tslib "^2.4.0"
+
+"@graphql-tools/schema@^10.0.0", "@graphql-tools/schema@^10.0.3", "@graphql-tools/schema@^10.0.4":
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.4.tgz#d4fc739a2cc07b4fc5f31a714178a561cba210cd"
+  integrity sha512-HuIwqbKxPaJujox25Ra4qwz0uQzlpsaBOzO6CVfzB/MemZdd+Gib8AIvfhQArK0YIN40aDran/yi+E5Xf0mQww==
+  dependencies:
+    "@graphql-tools/merge" "^9.0.3"
+    "@graphql-tools/utils" "^10.2.1"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-tools/url-loader@^8.0.0", "@graphql-tools/url-loader@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-8.0.2.tgz#ee8e10a85d82c72662f6bc6bbc7b408510a36ebd"
+  integrity sha512-1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ==
+  dependencies:
+    "@ardatan/sync-fetch" "^0.0.1"
+    "@graphql-tools/delegate" "^10.0.4"
+    "@graphql-tools/executor-graphql-ws" "^1.1.2"
+    "@graphql-tools/executor-http" "^1.0.9"
+    "@graphql-tools/executor-legacy-ws" "^1.0.6"
+    "@graphql-tools/utils" "^10.0.13"
+    "@graphql-tools/wrap" "^10.0.2"
+    "@types/ws" "^8.0.0"
+    "@whatwg-node/fetch" "^0.9.0"
+    isomorphic-ws "^5.0.0"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.11"
+    ws "^8.12.0"
+
+"@graphql-tools/utils@^10.0.0", "@graphql-tools/utils@^10.0.13", "@graphql-tools/utils@^10.1.1", "@graphql-tools/utils@^10.2.1":
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.2.2.tgz#6477295fae051ffb5d6c28253aa6d8a449d4a820"
+  integrity sha512-ueoplzHIgFfxhFrF4Mf/niU/tYHuO6Uekm2nCYU72qpI+7Hn9dA2/o5XOBvFXDk27Lp5VSvQY5WfmRbqwVxaYQ==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    cross-inspect "1.0.0"
+    dset "^3.1.2"
+    tslib "^2.4.0"
+
+"@graphql-tools/utils@^8.8.0":
+  version "8.13.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.13.1.tgz#b247607e400365c2cd87ff54654d4ad25a7ac491"
+  integrity sha512-qIh9yYpdUFmctVqovwMdheVNJqFh+DQNWIhX87FJStfXYnmweBUDATok9fWPleKeFwxnW8IapKmY8m8toJEkAw==
+  dependencies:
+    tslib "^2.4.0"
+
+"@graphql-tools/utils@^9.0.0", "@graphql-tools/utils@^9.2.1":
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57"
+  integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.1.1"
+    tslib "^2.4.0"
+
+"@graphql-tools/wrap@^10.0.2":
+  version "10.0.5"
+  resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-10.0.5.tgz#614b964a158887b4a644f5425b2b9a57b5751f72"
+  integrity sha512-Cbr5aYjr3HkwdPvetZp1cpDWTGdD1Owgsb3z/ClzhmrboiK86EnQDxDvOJiQkDCPWE9lNBwj8Y4HfxroY0D9DQ==
+  dependencies:
+    "@graphql-tools/delegate" "^10.0.4"
+    "@graphql-tools/schema" "^10.0.3"
+    "@graphql-tools/utils" "^10.1.1"
+    tslib "^2.4.0"
+    value-or-promise "^1.0.12"
+
+"@graphql-typed-document-node/core@3.2.0", "@graphql-typed-document-node/core@^3.1.1", "@graphql-typed-document-node/core@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
+  integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==
+
 "@humanwhocodes/config-array@^0.11.14":
   version "0.11.14"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
@@ -1753,6 +2770,15 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
+  dependencies:
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@jridgewell/resolve-uri@^3.1.0":
   version "3.1.1"
   resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"
@@ -1763,6 +2789,11 @@
   resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
+
 "@jridgewell/source-map@^0.3.3":
   version "0.3.5"
   resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"
@@ -1784,6 +2815,19 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@kamilkisiela/fast-url-parser@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@kamilkisiela/fast-url-parser/-/fast-url-parser-1.1.4.tgz#9d68877a489107411b953c54ea65d0658b515809"
+  integrity sha512-gbkePEBupNydxCelHCESvFSFM8XPh1Zs/OAVRW/rKpEqPAl5PbOM90Si8mv9bvnR53uPD2s/FiRxdvSejpRJew==
+
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
   resolved "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"
@@ -1980,6 +3024,66 @@
   resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz#d2f4a1b2bf675bceb6fb16174b836438293f9dca"
   integrity sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==
 
+"@parcel/watcher-android-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84"
+  integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==
+
+"@parcel/watcher-darwin-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34"
+  integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==
+
+"@parcel/watcher-darwin-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020"
+  integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==
+
+"@parcel/watcher-freebsd-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8"
+  integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==
+
+"@parcel/watcher-linux-arm-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d"
+  integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==
+
+"@parcel/watcher-linux-arm64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7"
+  integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==
+
+"@parcel/watcher-linux-arm64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635"
+  integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==
+
+"@parcel/watcher-linux-x64-glibc@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39"
+  integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==
+
+"@parcel/watcher-linux-x64-musl@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16"
+  integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==
+
+"@parcel/watcher-win32-arm64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc"
+  integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==
+
+"@parcel/watcher-win32-ia32@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7"
+  integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==
+
+"@parcel/watcher-win32-x64@2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf"
+  integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==
+
 "@parcel/watcher@2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.0.4.tgz#f300fef4cc38008ff4b8c29d92588eced3ce014b"
@@ -1988,6 +3092,56 @@
     node-addon-api "^3.2.1"
     node-gyp-build "^4.3.0"
 
+"@parcel/watcher@^2.4.1":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8"
+  integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==
+  dependencies:
+    detect-libc "^1.0.3"
+    is-glob "^4.0.3"
+    micromatch "^4.0.5"
+    node-addon-api "^7.0.0"
+  optionalDependencies:
+    "@parcel/watcher-android-arm64" "2.4.1"
+    "@parcel/watcher-darwin-arm64" "2.4.1"
+    "@parcel/watcher-darwin-x64" "2.4.1"
+    "@parcel/watcher-freebsd-x64" "2.4.1"
+    "@parcel/watcher-linux-arm-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-glibc" "2.4.1"
+    "@parcel/watcher-linux-arm64-musl" "2.4.1"
+    "@parcel/watcher-linux-x64-glibc" "2.4.1"
+    "@parcel/watcher-linux-x64-musl" "2.4.1"
+    "@parcel/watcher-win32-arm64" "2.4.1"
+    "@parcel/watcher-win32-ia32" "2.4.1"
+    "@parcel/watcher-win32-x64" "2.4.1"
+
+"@peculiar/asn1-schema@^2.3.8":
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.8.tgz#04b38832a814e25731232dd5be883460a156da3b"
+  integrity sha512-ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA==
+  dependencies:
+    asn1js "^3.0.5"
+    pvtsutils "^1.3.5"
+    tslib "^2.6.2"
+
+"@peculiar/json-schema@^1.1.12":
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.12.tgz#fe61e85259e3b5ba5ad566cb62ca75b3d3cd5339"
+  integrity sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==
+  dependencies:
+    tslib "^2.0.0"
+
+"@peculiar/webcrypto@^1.4.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.5.0.tgz#9e57174c02c1291051c553600347e12b81469e10"
+  integrity sha512-BRs5XUAwiyCDQMsVA9IDvDa7UBR9gAvPHgugOeGng3YN6vJ9JYonyDc0lNczErgtCWtucjR5N7VtaonboD/ezg==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.3.8"
+    "@peculiar/json-schema" "^1.1.12"
+    pvtsutils "^1.3.5"
+    tslib "^2.6.2"
+    webcrypto-core "^1.8.0"
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
@@ -1998,6 +3152,11 @@
   resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
+"@repeaterjs/repeater@^3.0.4":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.6.tgz#be23df0143ceec3c69f8b6c2517971a5578fdaa2"
+  integrity sha512-Javneu5lsuhwNCryN+pXH93VPQ8g0dBX7wItHFgYiwQmzE1sVdg5tWHiOgHywzL2W21XQopa7IwIEnNbmeUJYA==
+
 "@schematics/angular@16.2.10":
   version "16.2.10"
   resolved "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.10.tgz"
@@ -2164,6 +3323,11 @@
   resolved "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.6.tgz"
   integrity sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g==
 
+"@types/js-yaml@^4.0.0":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.9.tgz#cd82382c4f902fed9691a2ed79ec68c5898af4c2"
+  integrity sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==
+
 "@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz"
@@ -2249,7 +3413,7 @@
   resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.15.tgz#29c776daecf6f1935da9adda17509686bf979947"
   integrity sha512-HP38xE+GuWGlbSRq9WrZkousaQ7dragtZCruBVMi0oX1migFZavZ3OROKHSkNp/9ouq82zrWtZpg18jFnVN96g==
 
-"@types/ws@^8.5.5":
+"@types/ws@^8.0.0", "@types/ws@^8.5.5":
   version "8.5.10"
   resolved "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz"
   integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==
@@ -2481,6 +3645,92 @@
     object-path "^0.11.5"
     tslib "^2.0.3"
 
+"@whatwg-node/events@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.0.3.tgz#13a65dd4f5893f55280f766e29ae48074927acad"
+  integrity sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA==
+
+"@whatwg-node/events@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.1.1.tgz#0ca718508249419587e130da26d40e29d99b5356"
+  integrity sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==
+
+"@whatwg-node/fetch@^0.8.0":
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.8.8.tgz#48c6ad0c6b7951a73e812f09dd22d75e9fa18cae"
+  integrity sha512-CdcjGC2vdKhc13KKxgsc6/616BQ7ooDIgPeTuAiE8qfCnS0mGzcfCOoZXypQSz73nxI+GWc7ZReIAVhxoE1KCg==
+  dependencies:
+    "@peculiar/webcrypto" "^1.4.0"
+    "@whatwg-node/node-fetch" "^0.3.6"
+    busboy "^1.6.0"
+    urlpattern-polyfill "^8.0.0"
+    web-streams-polyfill "^3.2.1"
+
+"@whatwg-node/fetch@^0.9.0":
+  version "0.9.18"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.9.18.tgz#ecf7483fd55d42093c8d8678403facac6fde1c58"
+  integrity sha512-hqoz6StCW+AjV/3N+vg0s1ah82ptdVUb9nH2ttj3UbySOXUvytWw2yqy8c1cKzyRk6mDD00G47qS3fZI9/gMjg==
+  dependencies:
+    "@whatwg-node/node-fetch" "^0.5.7"
+    urlpattern-polyfill "^10.0.0"
+
+"@whatwg-node/node-fetch@^0.3.6":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.3.6.tgz#e28816955f359916e2d830b68a64493124faa6d0"
+  integrity sha512-w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA==
+  dependencies:
+    "@whatwg-node/events" "^0.0.3"
+    busboy "^1.6.0"
+    fast-querystring "^1.1.1"
+    fast-url-parser "^1.1.3"
+    tslib "^2.3.1"
+
+"@whatwg-node/node-fetch@^0.5.7":
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.5.11.tgz#4bed979cebc18438e936bb753418b5b0450eb5ab"
+  integrity sha512-LS8tSomZa3YHnntpWt3PP43iFEEl6YeIsvDakczHBKlay5LdkXFr8w7v8H6akpG5nRrzydyB0k1iE2eoL6aKIQ==
+  dependencies:
+    "@kamilkisiela/fast-url-parser" "^1.1.4"
+    "@whatwg-node/events" "^0.1.0"
+    busboy "^1.6.0"
+    fast-querystring "^1.1.1"
+    tslib "^2.3.1"
+
+"@wry/caches@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@wry/caches/-/caches-1.0.1.tgz#8641fd3b6e09230b86ce8b93558d44cf1ece7e52"
+  integrity sha512-bXuaUNLVVkD20wcGBWRyo7j9N3TxePEWFZj2Y+r9OoUzfqmavM84+mFykRicNsBqatba5JLay1t48wxaXaWnlA==
+  dependencies:
+    tslib "^2.3.0"
+
+"@wry/context@^0.7.0":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.4.tgz#e32d750fa075955c4ab2cfb8c48095e1d42d5990"
+  integrity sha512-jmT7Sb4ZQWI5iyu3lobQxICu2nC/vbUhP0vIdd6tHC9PTfenmRmuIFqktc6GH9cgi+ZHnsLWPvfSvc4DrYmKiQ==
+  dependencies:
+    tslib "^2.3.0"
+
+"@wry/equality@^0.5.6":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.7.tgz#72ec1a73760943d439d56b7b1e9985aec5d497bb"
+  integrity sha512-BRFORjsTuQv5gxcXsuDXx6oGRhuVsEGwZy6LOzRRfgu+eSfxbhUQ9L9YtSEIuIjY/o7g3iWFjrc5eSY1GXP2Dw==
+  dependencies:
+    tslib "^2.3.0"
+
+"@wry/trie@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.4.3.tgz#077d52c22365871bf3ffcbab8e95cb8bc5689af4"
+  integrity sha512-I6bHwH0fSf6RqQcnnXLJKhkSXG45MFral3GxPaY4uAl0LYDZM+YDVDAiU9bYwjTuysy1S0IeecWtmq1SZA3M1w==
+  dependencies:
+    tslib "^2.3.0"
+
+"@wry/trie@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.5.0.tgz#11e783f3a53f6e4cd1d42d2d1323f5bc3fa99c94"
+  integrity sha512-FNoYzHawTMk/6KMQoEG5O4PuioX19UbwdQKF44yw0nLfOypfQdjtfZzo/UIJWAJ23sNIFbD1Ug9lbaDGMwbqQA==
+  dependencies:
+    tslib "^2.3.0"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
@@ -2582,6 +3832,13 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
+  dependencies:
+    debug "^4.3.4"
+
 agentkeepalive@^4.2.1:
   version "4.5.0"
   resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz"
@@ -2641,7 +3898,7 @@ ansi-colors@4.1.3, ansi-colors@^4.1.1:
   resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
-ansi-escapes@^4.2.1:
+ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
   resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
@@ -2690,6 +3947,13 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+apollo-angular@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-5.0.2.tgz#a60797d935a1191149454c2925503de889476b55"
+  integrity sha512-U+ApPHhmdDirO95kovNJKt0Zd8kthOWALWY1t22zCI4LrT7tLZDDs0LJAzFXcvILN3FDkXWOE9R6Sa29jNOCIQ==
+  dependencies:
+    tslib "^2.6.2"
+
 "aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
   resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"
@@ -2737,6 +4001,25 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
+
+asn1js@^3.0.1, asn1js@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.5.tgz#5ea36820443dbefb51cc7f88a2ebb5b462114f38"
+  integrity sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==
+  dependencies:
+    pvtsutils "^1.3.2"
+    pvutils "^1.1.3"
+    tslib "^2.4.0"
+
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
 async@^3.2.3:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
@@ -2747,6 +4030,11 @@ asynckit@^0.4.0:
   resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
+auto-bind@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb"
+  integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==
+
 autoprefixer@10.4.14:
   version "10.4.14"
   resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz"
@@ -2818,6 +4106,44 @@ babel-plugin-polyfill-regenerator@^0.5.1:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.4.3"
 
+babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
+  version "7.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
+  integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
+
+babel-preset-fbjs@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c"
+  integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.0.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
+    "@babel/plugin-syntax-class-properties" "^7.0.0"
+    "@babel/plugin-syntax-flow" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+    "@babel/plugin-transform-arrow-functions" "^7.0.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
+    "@babel/plugin-transform-block-scoping" "^7.0.0"
+    "@babel/plugin-transform-classes" "^7.0.0"
+    "@babel/plugin-transform-computed-properties" "^7.0.0"
+    "@babel/plugin-transform-destructuring" "^7.0.0"
+    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
+    "@babel/plugin-transform-for-of" "^7.0.0"
+    "@babel/plugin-transform-function-name" "^7.0.0"
+    "@babel/plugin-transform-literals" "^7.0.0"
+    "@babel/plugin-transform-member-expression-literals" "^7.0.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
+    "@babel/plugin-transform-object-super" "^7.0.0"
+    "@babel/plugin-transform-parameters" "^7.0.0"
+    "@babel/plugin-transform-property-literals" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
+    "@babel/plugin-transform-spread" "^7.0.0"
+    "@babel/plugin-transform-template-literals" "^7.0.0"
+    babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
@@ -2935,6 +4261,13 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"
@@ -2950,6 +4283,23 @@ browserslist@^4.14.5, browserslist@^4.21.5, browserslist@^4.21.9, browserslist@^
     node-releases "^2.0.13"
     update-browserslist-db "^1.0.13"
 
+browserslist@^4.22.2:
+  version "4.23.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.1.tgz#ce4af0534b3d37db5c1a4ca98b9080f985041e96"
+  integrity sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==
+  dependencies:
+    caniuse-lite "^1.0.30001629"
+    electron-to-chromium "^1.4.796"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.16"
+
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
@@ -2970,6 +4320,13 @@ builtins@^5.0.0:
   dependencies:
     semver "^7.0.0"
 
+busboy@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
+  dependencies:
+    streamsearch "^1.1.0"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"
@@ -3036,7 +4393,15 @@ callsites@^3.0.0:
   resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase@^5.3.1:
+camel-case@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
+  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
+  dependencies:
+    pascal-case "^3.1.2"
+    tslib "^2.0.3"
+
+camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -3051,6 +4416,20 @@ caniuse-lite@^1.0.30001541:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz"
   integrity sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==
 
+caniuse-lite@^1.0.30001629:
+  version "1.0.30001634"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz#aa563c8e7aeaf552f7ead60371bc8d803425deaa"
+  integrity sha512-fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==
+
+capital-case@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
+  integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+    upper-case-first "^2.0.2"
+
 chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
@@ -3068,6 +4447,56 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+change-case-all@1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.14.tgz#bac04da08ad143278d0ac3dda7eccd39280bfba1"
+  integrity sha512-CWVm2uT7dmSHdO/z1CXT/n47mWonyypzBbuCy5tN7uMg22BsfkhwT6oHmFCAk+gL1LOOxhdbB9SZz3J1KTY3gA==
+  dependencies:
+    change-case "^4.1.2"
+    is-lower-case "^2.0.2"
+    is-upper-case "^2.0.2"
+    lower-case "^2.0.2"
+    lower-case-first "^2.0.2"
+    sponge-case "^1.0.1"
+    swap-case "^2.0.2"
+    title-case "^3.0.3"
+    upper-case "^2.0.2"
+    upper-case-first "^2.0.2"
+
+change-case-all@1.0.15:
+  version "1.0.15"
+  resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz#de29393167fc101d646cd76b0ef23e27d09756ad"
+  integrity sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==
+  dependencies:
+    change-case "^4.1.2"
+    is-lower-case "^2.0.2"
+    is-upper-case "^2.0.2"
+    lower-case "^2.0.2"
+    lower-case-first "^2.0.2"
+    sponge-case "^1.0.1"
+    swap-case "^2.0.2"
+    title-case "^3.0.3"
+    upper-case "^2.0.2"
+    upper-case-first "^2.0.2"
+
+change-case@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12"
+  integrity sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==
+  dependencies:
+    camel-case "^4.1.2"
+    capital-case "^1.0.4"
+    constant-case "^3.0.4"
+    dot-case "^3.0.4"
+    header-case "^2.0.4"
+    no-case "^3.0.4"
+    param-case "^3.0.4"
+    pascal-case "^3.1.2"
+    path-case "^3.0.4"
+    sentence-case "^3.0.4"
+    snake-case "^3.0.4"
+    tslib "^2.0.3"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
@@ -3120,11 +4549,28 @@ cli-spinners@^2.5.0:
   resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz"
   integrity sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==
 
+cli-truncate@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
+  dependencies:
+    slice-ansi "^3.0.0"
+    string-width "^4.2.0"
+
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
@@ -3186,7 +4632,7 @@ color-support@^1.1.3:
   resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-colorette@^2.0.10:
+colorette@^2.0.10, colorette@^2.0.16:
   version "2.0.20"
   resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
@@ -3213,6 +4659,11 @@ common-path-prefix@^3.0.0:
   resolved "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz"
   integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
 
+common-tags@1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
+
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
@@ -3258,6 +4709,15 @@ console-control-strings@^1.1.0:
   resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
+constant-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1"
+  integrity sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+    upper-case "^2.0.2"
+
 content-disposition@0.5.4:
   version "0.5.4"
   resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"
@@ -3334,7 +4794,7 @@ cors@~2.8.5:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^8.2.0:
+cosmiconfig@^8.1.0, cosmiconfig@^8.1.3, cosmiconfig@^8.2.0:
   version "8.3.6"
   resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz"
   integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==
@@ -3357,6 +4817,20 @@ critters@0.0.20:
     postcss "^8.4.23"
     pretty-bytes "^5.3.0"
 
+cross-fetch@^3.1.5:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
+  integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
+  dependencies:
+    node-fetch "^2.6.12"
+
+cross-inspect@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cross-inspect/-/cross-inspect-1.0.0.tgz#5fda1af759a148594d2d58394a9e21364f6849af"
+  integrity sha512-4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ==
+  dependencies:
+    tslib "^2.4.0"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
@@ -3432,11 +4906,21 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
+dataloader@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0"
+  integrity sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==
+
 date-format@^4.0.14:
   version "4.0.14"
   resolved "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz"
   integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
 
+debounce@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
+  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
+
 debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
@@ -3458,6 +4942,11 @@ debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+
 decimal.js@^10.2.1:
   version "10.4.3"
   resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz"
@@ -3516,6 +5005,11 @@ depd@~1.1.2:
   resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
+dependency-graph@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
+  integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
+
 dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
@@ -3526,6 +5020,16 @@ destroy@1.2.0:
   resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
+detect-indent@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
+  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
+
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"
@@ -3609,11 +5113,29 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.3"
 
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+
+dotenv@^16.0.0:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
+
 dotenv@~10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+dset@^3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.3.tgz#c194147f159841148e8e34ca41f638556d9542d2"
+  integrity sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==
+
 duplexer@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -3641,6 +5163,11 @@ electron-to-chromium@^1.4.535:
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.579.tgz"
   integrity sha512-bJKvA+awBIzYR0xRced7PrQuRIwGQPpo6ZLP62GAShahU9fWpsNN2IP6BSP1BLDDSbxvBVRGAMWlvVVq3npmLA==
 
+electron-to-chromium@^1.4.796:
+  version "1.4.802"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz#49b397eadc95a49b1ac33eebee146b8e5a93773f"
+  integrity sha512-TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
@@ -3816,6 +5343,11 @@ escalade@^3.1.1:
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escalade@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
@@ -4041,6 +5573,16 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
+extract-files@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a"
+  integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==
+
+fast-decode-uri-component@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543"
+  integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==
+
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -4100,6 +5642,20 @@ fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fast-querystring@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53"
+  integrity sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==
+  dependencies:
+    fast-decode-uri-component "^1.0.1"
+
+fast-url-parser@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
+  integrity sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==
+  dependencies:
+    punycode "^1.3.2"
+
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
@@ -4114,6 +5670,31 @@ faye-websocket@^0.11.3:
   dependencies:
     websocket-driver ">=0.5.1"
 
+fb-watchman@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
+  dependencies:
+    bser "2.1.1"
+
+fbjs-css-vars@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8"
+  integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==
+
+fbjs@^3.0.0:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.5.tgz#aa0edb7d5caa6340011790bd9249dbef8a81128d"
+  integrity sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==
+  dependencies:
+    cross-fetch "^3.1.5"
+    fbjs-css-vars "^1.0.0"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^1.0.35"
+
 figures@3.2.0, figures@^3.0.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
@@ -4142,6 +5723,13 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 finalhandler@1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"
@@ -4351,7 +5939,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.5:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -4418,7 +6006,7 @@ glob@^10.2.2:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
     path-scurry "^1.10.1"
 
-glob@^7.1.3, glob@^7.1.4, glob@^7.1.7:
+glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4453,7 +6041,7 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.1.0:
+globby@^11.0.3, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -4493,6 +6081,48 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
+graphql-config@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-5.0.3.tgz#d9aa2954cf47a927f9cb83cdc4e42ae55d0b321e"
+  integrity sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==
+  dependencies:
+    "@graphql-tools/graphql-file-loader" "^8.0.0"
+    "@graphql-tools/json-file-loader" "^8.0.0"
+    "@graphql-tools/load" "^8.0.0"
+    "@graphql-tools/merge" "^9.0.0"
+    "@graphql-tools/url-loader" "^8.0.0"
+    "@graphql-tools/utils" "^10.0.0"
+    cosmiconfig "^8.1.0"
+    jiti "^1.18.2"
+    minimatch "^4.2.3"
+    string-env-interpolation "^1.0.1"
+    tslib "^2.4.0"
+
+graphql-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.1.0.tgz#f4eb2107967af3c7a5907eb3131c671eac89be4f"
+  integrity sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==
+  dependencies:
+    "@graphql-typed-document-node/core" "^3.2.0"
+    cross-fetch "^3.1.5"
+
+graphql-tag@^2.11.0, graphql-tag@^2.12.6:
+  version "2.12.6"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
+  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
+  dependencies:
+    tslib "^2.1.0"
+
+graphql-ws@^5.14.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.16.0.tgz#849efe02f384b4332109329be01d74c345842729"
+  integrity sha512-Ju2RCU2dQMgSKtArPbEtsK5gNLnsQyTNIo/T7cZNp96niC1x0KdJNZV0TIoilceBPQwfb5itrGl8pkFeOUMl4A==
+
+graphql@^16:
+  version "16.8.2"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.2.tgz#54771c7ff195da913f5e70af8044a026d32eca2a"
+  integrity sha512-cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg==
+
 guess-parser@0.4.22:
   version "0.4.22"
   resolved "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz"
@@ -4558,6 +6188,21 @@ hdr-histogram-percentiles-obj@^3.0.0:
   resolved "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz"
   integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==
 
+header-case@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz#5a42e63b55177349cf405beb8d775acabb92c063"
+  integrity sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==
+  dependencies:
+    capital-case "^1.0.4"
+    tslib "^2.0.3"
+
+hoist-non-react-statics@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+  integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
+  dependencies:
+    react-is "^16.7.0"
+
 hosted-git-info@^6.0.0:
   version "6.1.1"
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz"
@@ -4656,6 +6301,14 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 http-proxy-middleware@^2.0.3:
   version "2.0.6"
   resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"
@@ -4684,6 +6337,14 @@ https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+https-proxy-agent@^7.0.0:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
+  dependencies:
+    agent-base "^7.0.2"
+    debug "4"
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
@@ -4747,6 +6408,11 @@ immutable@^4.0.0:
   resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"
   integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==
 
+immutable@~3.7.6:
+  version "3.7.6"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
+  integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==
+
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
@@ -4755,6 +6421,11 @@ import-fresh@^3.2.1, import-fresh@^3.3.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-from@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2"
+  integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
@@ -4793,10 +6464,31 @@ ini@4.1.1:
   resolved "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz"
   integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
 
-inquirer@8.2.4:
-  version "8.2.4"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz"
-  integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==
+inquirer@8.2.4:
+  version "8.2.4"
+  resolved "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz"
+  integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.1"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.21"
+    mute-stream "0.0.8"
+    ora "^5.4.1"
+    run-async "^2.4.0"
+    rxjs "^7.5.5"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+    wrap-ansi "^7.0.0"
+
+inquirer@^8.0.0:
+  version "8.2.6"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.6.tgz#733b74888195d8d400a67ac332011b5fae5ea562"
+  integrity sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.1"
@@ -4812,7 +6504,14 @@ inquirer@8.2.4:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
-    wrap-ansi "^7.0.0"
+    wrap-ansi "^6.0.1"
+
+invariant@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
 
 ip@^2.0.0:
   version "2.0.0"
@@ -4829,6 +6528,14 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz"
   integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
 
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
+  dependencies:
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
@@ -4863,7 +6570,7 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+is-glob@4.0.3, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -4880,6 +6587,13 @@ is-lambda@^1.0.1:
   resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"
   integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
 
+is-lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-2.0.2.tgz#1c0884d3012c841556243483aa5d522f47396d2a"
+  integrity sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==
+  dependencies:
+    tslib "^2.0.3"
+
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
@@ -4907,21 +6621,47 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
+  dependencies:
+    is-unc-path "^1.0.0"
+
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
+  dependencies:
+    unc-path-regex "^0.1.2"
+
 is-unicode-supported@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
+is-upper-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz#f1105ced1fe4de906a5f39553e7d3803fd804649"
+  integrity sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==
+  dependencies:
+    tslib "^2.0.3"
+
 is-what@^3.14.1:
   version "3.14.1"
   resolved "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"
   integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
 
+is-windows@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
@@ -4949,6 +6689,11 @@ isobject@^3.0.1:
   resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isomorphic-ws@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf"
+  integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==
+
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.2"
   resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz"
@@ -5029,17 +6774,27 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jiti@^1.17.1:
+  version "1.21.6"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
+  integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
+
 jiti@^1.18.2:
   version "1.21.0"
   resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz"
   integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
 
-js-tokens@^4.0.0:
+jose@^5.0.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-5.4.0.tgz#4f6c2357e7b3cd4bc10ec65bb29e677d7adfbc84"
+  integrity sha512-6rpxTHPAQyWMb9A35BroFl1Sp0ST3DpPcm5EVIxZxdH+e0Hv9fwhyB3XLKFUcHNpdSDnETmBfuPPTTlYz5+USw==
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@4.1.0, js-yaml@^4.1.0:
+js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
@@ -5127,6 +6882,14 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
+json-to-pretty-yaml@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz#f4cd0bd0a5e8fe1df25aaf5ba118b099fd992d5b"
+  integrity sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==
+  dependencies:
+    remedial "^1.0.7"
+    remove-trailing-spaces "^1.0.6"
+
 json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"
@@ -5300,6 +7063,20 @@ lines-and-columns@~2.0.3:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42"
   integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==
 
+listr2@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5"
+  integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==
+  dependencies:
+    cli-truncate "^2.1.0"
+    colorette "^2.0.16"
+    log-update "^4.0.0"
+    p-map "^4.0.0"
+    rfdc "^1.3.0"
+    rxjs "^7.5.5"
+    through "^2.3.8"
+    wrap-ansi "^7.0.0"
+
 loader-runner@^4.2.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"
@@ -5350,12 +7127,17 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@^4.17.21, lodash@^4.7.0:
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
+
+lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0, lodash@~4.17.0:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.1.0:
+log-symbols@^4.0.0, log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -5363,6 +7145,16 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
+log-update@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
+  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
+  dependencies:
+    ansi-escapes "^4.3.0"
+    cli-cursor "^3.1.0"
+    slice-ansi "^4.0.0"
+    wrap-ansi "^6.2.0"
+
 log4js@^6.4.1:
   version "6.9.1"
   resolved "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz"
@@ -5374,6 +7166,27 @@ log4js@^6.4.1:
     rfdc "^1.3.0"
     streamroller "^3.1.5"
 
+loose-envify@^1.0.0, loose-envify@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
+lower-case-first@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-2.0.2.tgz#64c2324a2250bf7c37c5901e76a5b5309301160b"
+  integrity sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==
+  dependencies:
+    tslib "^2.0.3"
+
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+  dependencies:
+    tslib "^2.0.3"
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
@@ -5463,6 +7276,11 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1:
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
+map-cache@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
@@ -5490,6 +7308,11 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+meros@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/meros/-/meros-1.3.0.tgz#c617d2092739d55286bf618129280f362e6242f2"
+  integrity sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
@@ -5503,6 +7326,14 @@ micromatch@^4.0.2, micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+micromatch@^4.0.5:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
@@ -5556,6 +7387,13 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.3.tgz#b4dcece1d674dee104bb0fb833ebb85a78cbbca6"
+  integrity sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
@@ -5745,11 +7583,31 @@ nice-napi@^1.0.2:
     node-addon-api "^3.0.0"
     node-gyp-build "^4.2.2"
 
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+  dependencies:
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
+
 node-addon-api@^3.0.0, node-addon-api@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-addon-api@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.0.tgz#71f609369379c08e251c558527a107107b5e0fdb"
+  integrity sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==
+
+node-fetch@^2.6.1, node-fetch@^2.6.12:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"
@@ -5782,11 +7640,21 @@ node-gyp@^9.0.0:
     tar "^6.1.2"
     which "^2.0.2"
 
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
+
 node-releases@^2.0.13:
   version "2.0.13"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz"
   integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+
 nopt@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz"
@@ -5804,6 +7672,13 @@ normalize-package-data@^5.0.0:
     semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
 
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
@@ -5907,6 +7782,11 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
+nullthrows@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
+  integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
+
 nwsapi@^2.2.0:
   version "2.2.7"
   resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz"
@@ -5963,9 +7843,9 @@ nx@16.5.1:
     "@nx/nx-win32-arm64-msvc" "16.5.1"
     "@nx/nx-win32-x64-msvc" "16.5.1"
 
-object-assign@^4:
+object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-inspect@^1.9.0:
@@ -6025,6 +7905,16 @@ open@8.4.2, open@^8.0.9, open@^8.4.0:
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
+optimism@^0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.18.0.tgz#e7bb38b24715f3fdad8a9a7fc18e999144bbfa63"
+  integrity sha512-tGn8+REwLRNFnb9WmcY5IfpOqeX2kpaYJ1s6Ae3mn12AeydLkR3j+jSCmVQFoXqU8D41PAJ1RG1rCRNWmNZVmQ==
+  dependencies:
+    "@wry/caches" "^1.0.0"
+    "@wry/context" "^0.7.0"
+    "@wry/trie" "^0.4.3"
+    tslib "^2.3.0"
+
 optionator@^0.9.3:
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
@@ -6057,6 +7947,13 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
+p-limit@3.1.0, p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
@@ -6064,13 +7961,6 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
 p-limit@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz"
@@ -6148,6 +8038,14 @@ pako@^1.0.3:
   resolved "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
+param-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
+  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
+  dependencies:
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
@@ -6155,6 +8053,15 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parse-filepath@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
+  dependencies:
+    is-absolute "^1.0.0"
+    map-cache "^0.2.0"
+    path-root "^0.1.1"
+
 parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
@@ -6203,6 +8110,22 @@ parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+pascal-case@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
+  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+
+path-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f"
+  integrity sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==
+  dependencies:
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
@@ -6228,6 +8151,18 @@ path-parse@^1.0.7:
   resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-root-regex@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
+
+path-root@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
+  dependencies:
+    path-root-regex "^0.1.0"
+
 path-scurry@^1.10.1:
   version "1.10.1"
   resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz"
@@ -6251,6 +8186,11 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
+picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
+
 picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
@@ -6371,6 +8311,22 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+prop-types@^15.7.2:
+  version "15.8.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.1"
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
@@ -6394,11 +8350,28 @@ psl@^1.1.33:
   resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
+punycode@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
+
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
+pvtsutils@^1.3.2, pvtsutils@^1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.5.tgz#b8705b437b7b134cd7fd858f025a23456f1ce910"
+  integrity sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA==
+  dependencies:
+    tslib "^2.6.1"
+
+pvutils@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3"
+  integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==
+
 qjobs@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"
@@ -6453,6 +8426,11 @@ raw-body@2.5.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+react-is@^16.13.1, react-is@^16.7.0:
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
+
 read-package-json-fast@^3.0.0:
   version "3.0.2"
   resolved "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz"
@@ -6558,6 +8536,35 @@ regjsparser@^0.9.1:
   dependencies:
     jsesc "~0.5.0"
 
+rehackt@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.1.0.tgz#a7c5e289c87345f70da8728a7eb878e5d03c696b"
+  integrity sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==
+
+relay-runtime@12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz#1e039282bdb5e0c1b9a7dc7f6b9a09d4f4ff8237"
+  integrity sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    fbjs "^3.0.0"
+    invariant "^2.2.4"
+
+remedial@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/remedial/-/remedial-1.0.8.tgz#a5e4fd52a0e4956adbaf62da63a5a46a78c578a0"
+  integrity sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
+
+remove-trailing-spaces@^1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz#4354d22f3236374702f58ee373168f6d6887ada7"
+  integrity sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
@@ -6568,21 +8575,26 @@ require-from-string@^2.0.2:
   resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
+resolve-from@5.0.0, resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
 resolve-url-loader@5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz"
@@ -6612,6 +8624,11 @@ resolve@^1.14.2:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+response-iterator@^0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz#249005fb14d2e4eeb478a3f735a28fd8b4c9f3da"
+  integrity sha512-pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw==
+
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
@@ -6735,6 +8752,11 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.1.0"
 
+scuid@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
+  integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"
@@ -6798,6 +8820,15 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
+sentence-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f"
+  integrity sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+    upper-case-first "^2.0.2"
+
 serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"
@@ -6843,6 +8874,11 @@ set-function-length@^1.1.1:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.0"
 
+setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
+
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
@@ -6872,7 +8908,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.8.1:
+shell-quote@^1.7.3, shell-quote@^1.8.1:
   version "1.8.1"
   resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
@@ -6896,6 +8932,11 @@ signal-exit@^4.0.1:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
+signedsource@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
+  integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==
+
 sigstore@^1.3.0:
   version "1.9.0"
   resolved "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz"
@@ -6917,11 +8958,37 @@ slash@^4.0.0:
   resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
+slice-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
 smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
+snake-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
+  integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
+  dependencies:
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
+
 socket.io-adapter@~2.5.2:
   version "2.5.2"
   resolved "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz"
@@ -7057,6 +9124,13 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+sponge-case@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-1.0.1.tgz#260833b86453883d974f84854cdb63aecc5aef4c"
+  integrity sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==
+  dependencies:
+    tslib "^2.0.3"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
@@ -7095,6 +9169,16 @@ streamroller@^3.1.5:
     debug "^4.3.4"
     fs-extra "^8.1.0"
 
+streamsearch@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
+
+string-env-interpolation@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
+  integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==
+
 "string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -7191,9 +9275,16 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-symbol-observable@4.0.0:
+swap-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-2.0.2.tgz#671aedb3c9c137e2985ef51c51f9e98445bf70d9"
+  integrity sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==
+  dependencies:
+    tslib "^2.0.3"
+
+symbol-observable@4.0.0, symbol-observable@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
   integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
 
 symbol-tree@^3.2.4:
@@ -7274,7 +9365,7 @@ text-table@0.2.0, text-table@^0.2.0:
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-through@^2.3.4, through@^2.3.6:
+through@^2.3.4, through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
@@ -7284,6 +9375,13 @@ thunky@^1.0.2:
   resolved "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+title-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/title-case/-/title-case-3.0.3.tgz#bc689b46f02e411f1d1e1d081f7c3deca0489982"
+  integrity sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==
+  dependencies:
+    tslib "^2.0.3"
+
 tmp@0.2.1, tmp@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
@@ -7337,11 +9435,28 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 tree-kill@1.2.2:
   version "1.2.2"
   resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
+ts-invariant@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.10.3.tgz#3e048ff96e91459ffca01304dbc7f61c1f642f6c"
+  integrity sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==
+  dependencies:
+    tslib "^2.1.0"
+
+ts-log@^2.2.3:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.5.tgz#aef3252f1143d11047e2cb6f7cfaac7408d96623"
+  integrity sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==
+
 tsconfig-paths@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
@@ -7366,6 +9481,16 @@ tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.4
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
 
+tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.1, tslib@^2.6.2, tslib@~2.6.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+
+tslib@~2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -7422,6 +9547,16 @@ ua-parser-js@^0.7.30:
   resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz"
   integrity sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==
 
+ua-parser-js@^1.0.35:
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.38.tgz#66bb0c4c0e322fe48edfe6d446df6042e62f25e2"
+  integrity sha512-Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ==
+
+unc-path-regex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
+
 underscore@^1.13.6:
   version "1.13.6"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
@@ -7498,6 +9633,13 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
+unixify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090"
+  integrity sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==
+  dependencies:
+    normalize-path "^2.1.1"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
@@ -7511,6 +9653,28 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-browserslist-db@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356"
+  integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==
+  dependencies:
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
+
+upper-case-first@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324"
+  integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==
+  dependencies:
+    tslib "^2.0.3"
+
+upper-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a"
+  integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==
+  dependencies:
+    tslib "^2.0.3"
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
@@ -7526,6 +9690,16 @@ url-parse@^1.5.3:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+urlpattern-polyfill@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz#f0a03a97bfb03cdf33553e5e79a2aadd22cac8ec"
+  integrity sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==
+
+urlpattern-polyfill@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz#99f096e35eff8bf4b5a2aa7d58a1523d6ebc7ce5"
+  integrity sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==
+
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
@@ -7561,6 +9735,11 @@ validate-npm-package-name@^5.0.0:
   dependencies:
     builtins "^5.0.0"
 
+value-or-promise@^1.0.11, value-or-promise@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c"
+  integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==
+
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
@@ -7618,6 +9797,27 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+web-streams-polyfill@^3.2.1:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz#2073b91a2fdb1fbfbd401e7de0ac9f8214cecb4b"
+  integrity sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==
+
+webcrypto-core@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.8.0.tgz#aaea17f3dd9c77c304e3c494eb27ca07cc72ca37"
+  integrity sha512-kR1UQNH8MD42CYuLzvibfakG5Ew5seG85dMMoAM/1LqvckxaF6pUiidLuraIu4V+YCIFabYecUZAW0TuxAoaqw==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.3.8"
+    "@peculiar/json-schema" "^1.1.12"
+    asn1js "^3.0.1"
+    pvtsutils "^1.3.5"
+    tslib "^2.6.2"
+
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webidl-conversions@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"
@@ -7762,6 +9962,14 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 whatwg-url@^8.0.0, whatwg-url@^8.5.0:
   version "8.7.0"
   resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"
@@ -7771,6 +9979,11 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0:
     tr46 "^2.1.0"
     webidl-conversions "^6.1.0"
 
+which-module@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
+  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
+
 which@^1.2.1:
   version "1.3.1"
   resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
@@ -7818,6 +10031,15 @@ word-wrap@^1.2.5:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"
@@ -7837,6 +10059,11 @@ ws@^7.4.6:
   resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
+ws@^8.12.0, ws@^8.15.0:
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea"
+  integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==
+
 ws@^8.13.0:
   version "8.14.2"
   resolved "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz"
@@ -7857,6 +10084,11 @@ xmlchars@^2.2.0:
   resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+y18n@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
@@ -7872,17 +10104,35 @@ yallist@^4.0.0:
   resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml-ast-parser@^0.0.43:
+  version "0.0.43"
+  resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb"
+  integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
+
+yaml@^2.3.1:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.5.tgz#60630b206dd6d84df97003d33fc1ddf6296cca5e"
+  integrity sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==
+
 yargs-parser@21.1.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^20.2.2:
   version "20.2.9"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@17.7.2, yargs@^17.2.1, yargs@^17.6.2:
+yargs@17.7.2, yargs@^17.0.0, yargs@^17.2.1, yargs@^17.6.2:
   version "17.7.2"
   resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -7895,6 +10145,23 @@ yargs@17.7.2, yargs@^17.2.1, yargs@^17.6.2:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yargs@^15.3.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
+
 yargs@^16.1.1:
   version "16.2.0"
   resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
@@ -7918,6 +10185,18 @@ yocto-queue@^1.0.0:
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
+zen-observable-ts@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58"
+  integrity sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg==
+  dependencies:
+    zen-observable "0.8.15"
+
+zen-observable@0.8.15:
+  version "0.8.15"
+  resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15"
+  integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ==
+
 zone.js@~0.13.3:
   version "0.13.3"
   resolved "https://registry.npmjs.org/zone.js/-/zone.js-0.13.3.tgz"
diff --git a/package.json b/package.json
index dff862bf..2e94efa2 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
         "test": "yarn test-back && yarn test-front && yarn test-func",
         "start-front": "yarn front yarn serve",
         "start-back": "cd backend && python manage.py runserver --settings glue --pythonpath ..",
+        "codegen": "yarn front yarn codegen",
         "livereload-back": "cd backend && python manage.py livereload --settings glue --pythonpath ..",
         "watch-test-front": "yarn front yarn watch-test",
         "watch-test-back": "yarn test-back --looponfail",

From cf122bf0374f667972330b117e84b478562bdc1b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 12:11:25 +0200
Subject: [PATCH 060/565] Different environments

---
 frontend/src/environments/environment.prod.ts | 4 +++-
 frontend/src/environments/environment.ts      | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 0d48e5d7..1dd89172 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -1,8 +1,10 @@
+import { graphql } from 'graphql';
 import { version } from './version';
 
 export const environment = {
   production: true,
     assets: '/static/assets',
     version,
-    apiUrl: '/api/'
+    apiUrl: '/api/',
+    graphqlUrl: '/api/graphql',
 };
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
index 4c6a7f02..a07eebc0 100644
--- a/frontend/src/environments/environment.ts
+++ b/frontend/src/environments/environment.ts
@@ -9,6 +9,7 @@ export const environment = {
     assets: 'assets',
     version,
     apiUrl: '/api/',
+    graphqlUrl: '/api/graphql',
 };
 
 /*

From 07c3be3bd520a5ea0882c14c2c290a727519b9ac Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 12:11:36 +0200
Subject: [PATCH 061/565] Exempt CSRF for now

---
 backend/api/urls.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/api/urls.py b/backend/api/urls.py
index 9a9e7a60..0d254359 100644
--- a/backend/api/urls.py
+++ b/backend/api/urls.py
@@ -1,7 +1,11 @@
 from django.conf import settings
 from django.urls import path
 from graphene_django.views import GraphQLView
+from django.views.decorators.csrf import csrf_exempt
 
+# TODO: Handle CSRF correctly.
 urlpatterns = [
-    path("graphql", GraphQLView.as_view(graphiql=settings.ENABLE_GRAPHIQL)),
+    path(
+        "graphql", csrf_exempt(GraphQLView.as_view(graphiql=settings.ENABLE_GRAPHIQL))
+    ),
 ]

From 0a2be43833a62ffde0d2f188ce859353dbea149e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 12:11:45 +0200
Subject: [PATCH 062/565] Add generated files to gitignore

---
 frontend/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/.gitignore b/frontend/.gitignore
index 0711527e..17b437b7 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -40,3 +40,6 @@ testem.log
 # System files
 .DS_Store
 Thumbs.db
+
+# Generated files
+/generated/*.*

From 59a7f6e884b4669d971cd567a047705539974239 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 14 Jun 2024 12:52:40 +0200
Subject: [PATCH 063/565] Fix functional tests?

---
 functional-tests/test_foundations.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functional-tests/test_foundations.py b/functional-tests/test_foundations.py
index 29848764..5915335b 100644
--- a/functional-tests/test_foundations.py
+++ b/functional-tests/test_foundations.py
@@ -10,7 +10,7 @@ def test_lettercraft_admin(browser, admin_address):
 
 def test_lettercraft_api(browser, api_address):
     browser.get(api_address)
-    assert 'Api Root' in browser.title
+    assert 'Lettercraft & Epistolary Performance in Medieval Europe' in browser.title
 
 
 def test_lettercraft_api_auth(browser, api_auth_address):

From 0fa67165eecb862c0a83381f7e5584d33fdd8457 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 20 Jun 2024 13:32:59 +0200
Subject: [PATCH 064/565] merge region models

---
 backend/space/admin.py                        |  42 +--
 .../migrations/0011_merge_region_models.py    | 257 ++++++++++++++++++
 backend/space/models.py                       |  69 ++---
 3 files changed, 282 insertions(+), 86 deletions(-)
 create mode 100644 backend/space/migrations/0011_merge_region_models.py

diff --git a/backend/space/admin.py b/backend/space/admin.py
index 567aa25e..7d6a182f 100644
--- a/backend/space/admin.py
+++ b/backend/space/admin.py
@@ -4,20 +4,8 @@
 from core import admin as core_admin
 
 
-@admin.register(models.PoliticalRegion)
-class PoliticalRegion(admin.ModelAdmin):
-    list_display = ["name", "identifiable"]
-    list_filter = ["identifiable"]
-
-
-@admin.register(models.EcclesiasticalRegion)
-class EccleciasticalRegion(admin.ModelAdmin):
-    list_display = ["name", "identifiable"]
-    list_filter = ["identifiable"]
-
-
-@admin.register(models.GeographicalRegion)
-class GeographicalRegionAdmin(admin.ModelAdmin):
+@admin.register(models.Region)
+class RegionAdmin(admin.ModelAdmin):
     list_display = ["name", "identifiable"]
     list_filter = ["identifiable"]
 
@@ -29,24 +17,10 @@ class StructureAdmin(admin.ModelAdmin):
     list_filter = ["identifiable"]
 
 
-class PoliticalRegionFieldInlineAdmin(admin.StackedInline):
-    verbose_name = "Political region reference"
-    model = models.PoliticalRegionField
-    fields = ["space", "political_region"] + core_admin.description_field_fields
-    extra = 0
-
-
-class EcclesiasticalRegionFieldInlineAdmin(admin.StackedInline):
-    verbose_name = "Ecclesiastical region reference"
-    model = models.EcclesiasticalRegionField
-    fields = ["space", "ecclesiastical_region"] + core_admin.description_field_fields
-    extra = 0
-
-
-class GeographicalRegionFieldInlineAdmin(admin.StackedInline):
-    verbose_name = "Geographical region reference"
-    model = models.GeographicalRegionField
-    fields = ["space", "geographical_region"] + core_admin.description_field_fields
+class RegionFieldInlineAdmin(admin.StackedInline):
+    verbose_name = "Region reference"
+    model = models.RegionField
+    fields = ["space", "region"] + core_admin.description_field_fields
     extra = 0
 
 
@@ -73,9 +47,7 @@ class SpaceDescriptionAdmin(admin.ModelAdmin):
         core_admin.description_source_fieldset,
     ]
     inlines = [
-        PoliticalRegionFieldInlineAdmin,
-        EcclesiasticalRegionFieldInlineAdmin,
-        GeographicalRegionFieldInlineAdmin,
+        RegionFieldInlineAdmin,
         StructureFieldInlineAdmin,
         LandscapeFeatureInlineAdmin,
     ]
diff --git a/backend/space/migrations/0011_merge_region_models.py b/backend/space/migrations/0011_merge_region_models.py
new file mode 100644
index 00000000..16efc8f4
--- /dev/null
+++ b/backend/space/migrations/0011_merge_region_models.py
@@ -0,0 +1,257 @@
+# Generated by Django 4.2.7 on 2024-06-20 11:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+def region_submodels(apps):
+    """
+    Lists the pre-migration models for regions (political, ecclesiastical, geographical)
+    """
+
+    return [
+        (
+            apps.get_model("space", "PoliticalRegion"),
+            "political",
+            apps.get_model("space", "PoliticalRegionField"),
+            "political_region",
+        ),
+        (
+            apps.get_model("space", "EcclesiasticalRegion"),
+            "ecclesiastical",
+            apps.get_model("space", "EcclesiasticalRegionField"),
+            "ecclesiastical_region",
+        ),
+        (
+            apps.get_model("space", "GeographicalRegion"),
+            "geographical",
+            apps.get_model("space", "GeographicalRegionField"),
+            "geographical_region",
+        ),
+    ]
+
+
+def copy_subregions_to_region(apps, schema_editor):
+    Region = apps.get_model("space", "Region")
+    RegionField = apps.get_model("space", "RegionField")
+
+    submodels = region_submodels(apps)
+
+    for Model, region_type, FieldModel, field_property in submodels:
+        for obj in Model.objects.all():
+            region = Region.objects.create(
+                name=obj.name,
+                description=obj.description,
+                identifiable=obj.identifiable,
+                type=region_type,
+            )
+            for relation in FieldModel.objects.filter(**{field_property: obj}):
+                RegionField.objects.create(
+                    space=relation.space,
+                    region=region,
+                    source_mention=relation.source_mention,
+                    note=relation.note,
+                )
+
+
+def copy_region_to_subregions(apps, schema_editor):
+    Region = apps.get_model("space", "Region")
+    RegionField = apps.get_model("space", "RegionField")
+
+    submodels = region_submodels(apps)
+
+    for Model, region_type, FieldModel, field_property in submodels:
+        for region in Region.objects.filter(type=region_type):
+            obj = Model.object.create(
+                name=region.name,
+                description=region.description,
+                identifiable=region.identifiable,
+            )
+            for relation in RegionField.object.filter(region=region):
+                FieldModel.objects.create(
+                    space=relation.space,
+                    source_mention=relation.source_mention,
+                    note=relation.note,
+                    **{field_property: obj},
+                )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("space", "0010_remove_ecclesiasticalregionfield_source_terminology_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Region",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(
+                        help_text="A name to help identify this object", max_length=200
+                    ),
+                ),
+                (
+                    "description",
+                    models.TextField(
+                        blank=True,
+                        help_text="Longer description to help identify this object",
+                    ),
+                ),
+                (
+                    "identifiable",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description",
+                    ),
+                ),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[
+                            ("political", "political"),
+                            ("ecclesiastical", "ecclesiastical"),
+                            ("geographical", "geographical"),
+                        ],
+                        help_text="Kind of region",
+                        max_length=32,
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="RegionField",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "certainty",
+                    models.IntegerField(
+                        choices=[
+                            (0, "uncertain"),
+                            (1, "somewhat certain"),
+                            (2, "certain"),
+                        ],
+                        default=2,
+                        help_text="How certain are you of this value?",
+                    ),
+                ),
+                ("note", models.TextField(blank=True, help_text="Additional notes")),
+                (
+                    "source_mention",
+                    models.CharField(
+                        blank=True,
+                        choices=[
+                            ("direct", "directly mentioned"),
+                            ("implied", "implied"),
+                        ],
+                        help_text="How is this information presented in the text?",
+                        max_length=32,
+                    ),
+                ),
+                (
+                    "region",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="space.region"
+                    ),
+                ),
+                (
+                    "space",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="space.spacedescription",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+        migrations.AddField(
+            model_name="spacedescription",
+            name="regions",
+            field=models.ManyToManyField(
+                help_text="Regions referenced in this description",
+                through="space.RegionField",
+                to="space.region",
+            ),
+        ),
+        migrations.RunPython(
+            copy_subregions_to_region,
+            reverse_code=copy_region_to_subregions,
+        ),
+        migrations.RemoveField(
+            model_name="ecclesiasticalregionfield",
+            name="ecclesiastical_region",
+        ),
+        migrations.RemoveField(
+            model_name="ecclesiasticalregionfield",
+            name="space",
+        ),
+        migrations.RemoveField(
+            model_name="geographicalregionfield",
+            name="geographical_region",
+        ),
+        migrations.RemoveField(
+            model_name="geographicalregionfield",
+            name="space",
+        ),
+        migrations.RemoveField(
+            model_name="politicalregionfield",
+            name="political_region",
+        ),
+        migrations.RemoveField(
+            model_name="politicalregionfield",
+            name="space",
+        ),
+        migrations.RemoveField(
+            model_name="spacedescription",
+            name="ecclesiastical_regions",
+        ),
+        migrations.RemoveField(
+            model_name="spacedescription",
+            name="geographical_regions",
+        ),
+        migrations.RemoveField(
+            model_name="spacedescription",
+            name="political_regions",
+        ),
+        migrations.DeleteModel(
+            name="EcclesiasticalRegion",
+        ),
+        migrations.DeleteModel(
+            name="EcclesiasticalRegionField",
+        ),
+        migrations.DeleteModel(
+            name="GeographicalRegion",
+        ),
+        migrations.DeleteModel(
+            name="GeographicalRegionField",
+        ),
+        migrations.DeleteModel(
+            name="PoliticalRegion",
+        ),
+        migrations.DeleteModel(
+            name="PoliticalRegionField",
+        ),
+    ]
diff --git a/backend/space/models.py b/backend/space/models.py
index e162dc88..40b69939 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -13,22 +13,10 @@ class SpaceDescription(EntityDescription, models.Model):
     This model compounds all different aspects of space (geographical, political, etc.).
     """
 
-    political_regions = models.ManyToManyField(
-        to="PoliticalRegion",
-        through="PoliticalRegionField",
-        help_text="Political regions referenced in this description",
-    )
-
-    ecclesiastical_regions = models.ManyToManyField(
-        to="EcclesiasticalRegion",
-        through="EcclesiasticalRegionField",
-        help_text="Ecclesiastical regions referenced in this description",
-    )
-
-    geographical_regions = models.ManyToManyField(
-        to="GeographicalRegion",
-        through="GeographicalRegionField",
-        help_text="Geographical regions referenced in this description",
+    regions = models.ManyToManyField(
+        to="Region",
+        through="RegionField",
+        help_text="Regions referenced in this description",
     )
 
     structures = models.ManyToManyField(
@@ -38,28 +26,21 @@ class SpaceDescription(EntityDescription, models.Model):
     )
 
 
-class PoliticalRegion(HistoricalEntity, models.Model):
-    """
-    A political region, e.g. a kingdom or duchy
-    """
-
-    pass
-
-
-class EcclesiasticalRegion(HistoricalEntity, models.Model):
+class Region(HistoricalEntity, models.Model):
     """
-    An ecclesiastical region, e.g. a diocese
+    A region. Regions can be political (e.g. kingdoms), ecclesiastical (e.g. dioceses), or
+    geographical (e.g. a mountain range).
     """
 
-    pass
-
-
-class GeographicalRegion(HistoricalEntity, models.Model):
-    """
-    A geographical region or location, e.g. "the Pyrenees".
-    """
-
-    pass
+    type = models.CharField(
+        max_length=32,
+        choices=[
+            ("political", "political"),
+            ("ecclesiastical", "ecclesiastical"),
+            ("geographical", "geographical"),
+        ],
+        help_text="Kind of region",
+    )
 
 
 class Structure(HistoricalEntity, models.Model):
@@ -119,23 +100,9 @@ def clean(self):
             )
 
 
-class PoliticalRegionField(DescriptionField, models.Model):
-    space = models.ForeignKey(to=SpaceDescription, on_delete=models.CASCADE)
-    political_region = models.ForeignKey(to=PoliticalRegion, on_delete=models.CASCADE)
-
-
-class EcclesiasticalRegionField(DescriptionField, models.Model):
+class RegionField(DescriptionField, models.Model):
     space = models.ForeignKey(to=SpaceDescription, on_delete=models.CASCADE)
-    ecclesiastical_region = models.ForeignKey(
-        to=EcclesiasticalRegion, on_delete=models.CASCADE
-    )
-
-
-class GeographicalRegionField(DescriptionField, models.Model):
-    space = models.ForeignKey(to=SpaceDescription, on_delete=models.CASCADE)
-    geographical_region = models.ForeignKey(
-        to=GeographicalRegion, on_delete=models.CASCADE
-    )
+    region = models.ForeignKey(to=Region, on_delete=models.CASCADE)
 
 
 class StructureField(DescriptionField, models.Model):

From 6c1a7df161ffe617c9db0819b3a9cbd3782a2cb9 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 20 Jun 2024 13:59:47 +0200
Subject: [PATCH 065/565] add settlement model

---
 backend/space/admin.py                        | 14 ++++
 backend/space/migrations/0012_settlement.py   | 50 +++++++++++
 .../migrations/0013_move_settlement_data.py   | 84 +++++++++++++++++++
 backend/space/models.py                       | 28 +++++++
 4 files changed, 176 insertions(+)
 create mode 100644 backend/space/migrations/0012_settlement.py
 create mode 100644 backend/space/migrations/0013_move_settlement_data.py

diff --git a/backend/space/admin.py b/backend/space/admin.py
index 7d6a182f..ccd1db27 100644
--- a/backend/space/admin.py
+++ b/backend/space/admin.py
@@ -10,6 +10,12 @@ class RegionAdmin(admin.ModelAdmin):
     list_filter = ["identifiable"]
 
 
+@admin.register(models.Settlement)
+class SettlementAdmin(admin.ModelAdmin):
+    list_display = ["name", "identifiable"]
+    list_filter = ["identifiable"]
+
+
 @admin.register(models.Structure)
 class StructureAdmin(admin.ModelAdmin):
     readonly_fields = ["ancestors_display", "descendants_display"]
@@ -24,6 +30,13 @@ class RegionFieldInlineAdmin(admin.StackedInline):
     extra = 0
 
 
+class SettlementFieldInlineAdmin(admin.StackedInline):
+    verbose_name = "Settlement reference"
+    model = models.SettlementField
+    fields = ["space", "settlement"] + core_admin.description_field_fields
+    extra = 0
+
+
 class StructureFieldInlineAdmin(admin.StackedInline):
     verbose_name = "Structure reference"
     model = models.StructureField
@@ -48,6 +61,7 @@ class SpaceDescriptionAdmin(admin.ModelAdmin):
     ]
     inlines = [
         RegionFieldInlineAdmin,
+        SettlementFieldInlineAdmin,
         StructureFieldInlineAdmin,
         LandscapeFeatureInlineAdmin,
     ]
diff --git a/backend/space/migrations/0012_settlement.py b/backend/space/migrations/0012_settlement.py
new file mode 100644
index 00000000..52a846f0
--- /dev/null
+++ b/backend/space/migrations/0012_settlement.py
@@ -0,0 +1,50 @@
+# Generated by Django 4.2.7 on 2024-06-20 12:09
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('space', '0011_merge_region_models'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Settlement',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='A name to help identify this object', max_length=200)),
+                ('description', models.TextField(blank=True, help_text='Longer description to help identify this object')),
+                ('identifiable', models.BooleanField(default=True, help_text='Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='SettlementField',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('certainty', models.IntegerField(choices=[(0, 'uncertain'), (1, 'somewhat certain'), (2, 'certain')], default=2, help_text='How certain are you of this value?')),
+                ('note', models.TextField(blank=True, help_text='Additional notes')),
+                ('source_mention', models.CharField(blank=True, choices=[('direct', 'directly mentioned'), ('implied', 'implied')], help_text='How is this information presented in the text?', max_length=32)),
+                ('settlement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='space.settlement')),
+                ('space', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='space.spacedescription')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='spacedescription',
+            name='settlements',
+            field=models.ManyToManyField(help_text='Settlements referenced in this description', through='space.SettlementField', to='space.settlement'),
+        ),
+        migrations.AddField(
+            model_name='structure',
+            name='settlement',
+            field=models.ForeignKey(blank=True, help_text='The settlement containing this structure', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='structures', to='space.settlement'),
+        ),
+    ]
diff --git a/backend/space/migrations/0013_move_settlement_data.py b/backend/space/migrations/0013_move_settlement_data.py
new file mode 100644
index 00000000..960ae16b
--- /dev/null
+++ b/backend/space/migrations/0013_move_settlement_data.py
@@ -0,0 +1,84 @@
+from django.db import migrations
+
+
+def save_settlement_structures_as_settlement(apps, schema_editor):
+    Structure = apps.get_model("space", "Structure")
+    Settlement = apps.get_model("space", "Settlement")
+    StructureField = apps.get_model("space", "StructureField")
+    SettlementField = apps.get_model("space", "SettlementField")
+
+    for structure in Structure.objects.filter(level=0):
+
+        settlement = Settlement.objects.create(
+            name=structure.name,
+            description=structure.description,
+            identifiable=structure.identifiable,
+        )
+
+        descendants = Structure.objects.filter(parent=structure).union(
+            Structure.objects.filter(parent__parent=structure),
+            Structure.objects.filter(parent__parent__parent=structure),
+            Structure.objects.filter(parent__parent__parent__parent=structure),
+            Structure.objects.filter(parent__parent__parent__parent__parent=structure),
+        )
+
+        for child in descendants:
+            child.settlement = settlement
+            if child.parent == structure:
+                child.parent = None
+            child.save()
+
+        for relation in StructureField.objects.filter(structure=structure):
+            SettlementField.objects.create(
+                space=relation.space,
+                settlement=settlement,
+                source_mention=relation.source_mention,
+                note=relation.note,
+            )
+
+        structure.delete()
+
+
+def save_settlements_as_settlement_structures(apps, schema_editor):
+    Structure = apps.get_model("space", "Structure")
+    Settlement = apps.get_model("space", "Settlement")
+    StructureField = apps.get_model("space", "StructureField")
+    SettlementField = apps.get_model("space", "SettlementField")
+
+    for settlement in Settlement.objects.all():
+        structure = Structure.objects.create(
+            name=settlement.name,
+            description=settlement.description,
+            identifiable=settlement.identifiable,
+            level=0,
+        )
+
+        for child in Structure.objects.filter(settlement=settlement):
+            if not child.parent:
+                child.settlement = None
+                child.parent = structure
+                child.save()
+
+        for relation in SettlementField.objects.filter(settlement=settlement):
+            StructureField.objects.create(
+                space=relation.space,
+                structure=structure,
+                source_mention=relation.source_mention,
+                note=relation.note,
+            )
+
+        settlement.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("space", "0012_settlement"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            save_settlement_structures_as_settlement,
+            reverse_code=save_settlements_as_settlement_structures,
+        ),
+    ]
diff --git a/backend/space/models.py b/backend/space/models.py
index 40b69939..b383c56d 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -19,6 +19,12 @@ class SpaceDescription(EntityDescription, models.Model):
         help_text="Regions referenced in this description",
     )
 
+    settlements = models.ManyToManyField(
+        to="Settlement",
+        through="SettlementField",
+        help_text="Settlements referenced in this description",
+    )
+
     structures = models.ManyToManyField(
         to="Structure",
         through="StructureField",
@@ -43,6 +49,14 @@ class Region(HistoricalEntity, models.Model):
     )
 
 
+class Settlement(HistoricalEntity, models.Model):
+    """
+    A town or village.
+    """
+
+    pass
+
+
 class Structure(HistoricalEntity, models.Model):
     """
     A structure is a man-made site.
@@ -60,6 +74,15 @@ class LevelOptions(models.IntegerChoices):
         ROOM = 4, "room"
         SPOT = 5, "spot, object"
 
+    settlement = models.ForeignKey(
+        to=Settlement,
+        related_name="structures",
+        on_delete=models.CASCADE,
+        blank=True,
+        null=True,
+        help_text="The settlement containing this structure",
+    )
+
     level = models.IntegerField(choices=LevelOptions.choices)
     parent = models.ForeignKey(
         to="self",
@@ -105,6 +128,11 @@ class RegionField(DescriptionField, models.Model):
     region = models.ForeignKey(to=Region, on_delete=models.CASCADE)
 
 
+class SettlementField(DescriptionField, models.Model):
+    space = models.ForeignKey(to=SpaceDescription, on_delete=models.CASCADE)
+    settlement = models.ForeignKey(to=Settlement, on_delete=models.CASCADE)
+
+
 class StructureField(DescriptionField, models.Model):
     space = models.ForeignKey(to=SpaceDescription, on_delete=models.CASCADE)
     structure = models.ForeignKey(to=Structure, on_delete=models.CASCADE)

From 510a086a687c77df03e32bea83cacd89625a765e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 20 Jun 2024 14:35:15 +0200
Subject: [PATCH 066/565] simplify structure model

---
 backend/space/admin.py                        |  1 -
 ..._structure_parent_alter_structure_level.py | 22 +++++++++++
 backend/space/models.py                       | 39 -------------------
 3 files changed, 22 insertions(+), 40 deletions(-)
 create mode 100644 backend/space/migrations/0014_remove_structure_parent_alter_structure_level.py

diff --git a/backend/space/admin.py b/backend/space/admin.py
index ccd1db27..a98d95b8 100644
--- a/backend/space/admin.py
+++ b/backend/space/admin.py
@@ -18,7 +18,6 @@ class SettlementAdmin(admin.ModelAdmin):
 
 @admin.register(models.Structure)
 class StructureAdmin(admin.ModelAdmin):
-    readonly_fields = ["ancestors_display", "descendants_display"]
     list_display = ["name", "description", "identifiable"]
     list_filter = ["identifiable"]
 
diff --git a/backend/space/migrations/0014_remove_structure_parent_alter_structure_level.py b/backend/space/migrations/0014_remove_structure_parent_alter_structure_level.py
new file mode 100644
index 00000000..71b80a2e
--- /dev/null
+++ b/backend/space/migrations/0014_remove_structure_parent_alter_structure_level.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.7 on 2024-06-20 12:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('space', '0013_move_settlement_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='structure',
+            name='parent',
+        ),
+        migrations.AlterField(
+            model_name='structure',
+            name='level',
+            field=models.IntegerField(choices=[(1, 'road, square, crossroad'), (2, 'fortification'), (3, 'building, vessel'), (4, 'room'), (5, 'spot, object')]),
+        ),
+    ]
diff --git a/backend/space/models.py b/backend/space/models.py
index b383c56d..c527e880 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -67,7 +67,6 @@ class Structure(HistoricalEntity, models.Model):
     """
 
     class LevelOptions(models.IntegerChoices):
-        SETTLEMENT = 0, "settlement, population centre"
         ROAD = 1, "road, square, crossroad"
         FORTIFICATION = 2, "fortification"
         BUILDING = 3, "building, vessel"
@@ -84,44 +83,6 @@ class LevelOptions(models.IntegerChoices):
     )
 
     level = models.IntegerField(choices=LevelOptions.choices)
-    parent = models.ForeignKey(
-        to="self",
-        related_name="children",
-        on_delete=models.CASCADE,
-        blank=True,
-        null=True,
-        verbose_name="parent structure",
-        help_text="The structure containing this structure, e.g. the building containing a room.",
-    )
-
-    @property
-    def ancestors(self):
-        if self.parent:
-            return [self.parent] + self.parent.ancestors
-        else:
-            return []
-
-    @admin.display(description="Contained in structures")
-    def ancestors_display(self):
-        return ", ".join(str(a) for a in self.ancestors)
-
-    @property
-    def descendants(self):
-        iterate_descendants = (
-            [child] + child.descendants for child in self.children.all()
-        )
-        return list(itertools.chain.from_iterable(iterate_descendants))
-
-    @admin.display(description="Contains structures")
-    def descendants_display(self):
-        return ", ".join(str(a) for a in self.descendants)
-
-    def clean(self):
-        if self.parent:
-            validators.validate_level_deeper_than_parent(
-                self.level, self.parent, self.LevelOptions
-            )
-
 
 class RegionField(DescriptionField, models.Model):
     space = models.ForeignKey(to=SpaceDescription, on_delete=models.CASCADE)

From 0b83a4a910a2efbd733b4c04e6c4b2bc94cff2e9 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 20 Jun 2024 14:36:36 +0200
Subject: [PATCH 067/565] remove landscapefeature

---
 backend/space/admin.py                           |  7 -------
 .../migrations/0015_delete_landscapefeature.py   | 16 ++++++++++++++++
 backend/space/models.py                          | 15 ---------------
 3 files changed, 16 insertions(+), 22 deletions(-)
 create mode 100644 backend/space/migrations/0015_delete_landscapefeature.py

diff --git a/backend/space/admin.py b/backend/space/admin.py
index a98d95b8..7a898e0e 100644
--- a/backend/space/admin.py
+++ b/backend/space/admin.py
@@ -43,12 +43,6 @@ class StructureFieldInlineAdmin(admin.StackedInline):
     extra = 0
 
 
-class LandscapeFeatureInlineAdmin(admin.StackedInline):
-    model = models.LandscapeFeature
-    fields = ["landscape"] + core_admin.description_field_fields
-    extra = 0
-
-
 @admin.register(models.SpaceDescription)
 class SpaceDescriptionAdmin(admin.ModelAdmin):
     list_display = ["name", "description", "source"]
@@ -62,5 +56,4 @@ class SpaceDescriptionAdmin(admin.ModelAdmin):
         RegionFieldInlineAdmin,
         SettlementFieldInlineAdmin,
         StructureFieldInlineAdmin,
-        LandscapeFeatureInlineAdmin,
     ]
diff --git a/backend/space/migrations/0015_delete_landscapefeature.py b/backend/space/migrations/0015_delete_landscapefeature.py
new file mode 100644
index 00000000..cb21d1bf
--- /dev/null
+++ b/backend/space/migrations/0015_delete_landscapefeature.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.2.7 on 2024-06-20 12:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('space', '0014_remove_structure_parent_alter_structure_level'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='LandscapeFeature',
+        ),
+    ]
diff --git a/backend/space/models.py b/backend/space/models.py
index c527e880..a1055962 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -1,9 +1,6 @@
 from django.db import models
-from django.contrib import admin
-import itertools
 
 from core.models import DescriptionField, HistoricalEntity, EntityDescription
-from space import validators
 
 
 class SpaceDescription(EntityDescription, models.Model):
@@ -97,15 +94,3 @@ class SettlementField(DescriptionField, models.Model):
 class StructureField(DescriptionField, models.Model):
     space = models.ForeignKey(to=SpaceDescription, on_delete=models.CASCADE)
     structure = models.ForeignKey(to=Structure, on_delete=models.CASCADE)
-
-
-class LandscapeFeature(DescriptionField, models.Model):
-    """
-    A landscape feature describes natural or geological aspects of a
-    space, e.g. "a forest", "a hill", "a cave".
-    """
-
-    space = models.ForeignKey(
-        to=SpaceDescription, on_delete=models.CASCADE, related_name="landscape_features"
-    )
-    landscape = models.CharField(max_length=512, blank=False)

From e5a2f7bf5f4cbaf953f8976219bff925f315b16f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 20 Jun 2024 14:48:45 +0200
Subject: [PATCH 068/565] add regions to settlement

---
 backend/space/admin.py                         |  1 +
 .../migrations/0016_settlement_regions.py      | 18 ++++++++++++++++++
 backend/space/models.py                        |  7 ++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 backend/space/migrations/0016_settlement_regions.py

diff --git a/backend/space/admin.py b/backend/space/admin.py
index 7a898e0e..996cdb63 100644
--- a/backend/space/admin.py
+++ b/backend/space/admin.py
@@ -14,6 +14,7 @@ class RegionAdmin(admin.ModelAdmin):
 class SettlementAdmin(admin.ModelAdmin):
     list_display = ["name", "identifiable"]
     list_filter = ["identifiable"]
+    filter_horizontal = ["regions"]
 
 
 @admin.register(models.Structure)
diff --git a/backend/space/migrations/0016_settlement_regions.py b/backend/space/migrations/0016_settlement_regions.py
new file mode 100644
index 00000000..d21e553d
--- /dev/null
+++ b/backend/space/migrations/0016_settlement_regions.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-06-20 12:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('space', '0015_delete_landscapefeature'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='settlement',
+            name='regions',
+            field=models.ManyToManyField(blank=True, help_text='Surrounding regions of this settlement', related_name='settlements', to='space.region'),
+        ),
+    ]
diff --git a/backend/space/models.py b/backend/space/models.py
index a1055962..4ec35932 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -51,7 +51,12 @@ class Settlement(HistoricalEntity, models.Model):
     A town or village.
     """
 
-    pass
+    regions = models.ManyToManyField(
+        to=Region,
+        related_name="settlements",
+        blank=True,
+        help_text="Surrounding regions of this settlement",
+    )
 
 
 class Structure(HistoricalEntity, models.Model):

From 57de9d5b7b644d5bf693be250ca2032ca830595b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 20 Jun 2024 15:03:40 +0200
Subject: [PATCH 069/565] update unit tests

---
 backend/space/conftest.py                    | 21 ++++--
 backend/space/tests/test_model_validation.py | 21 ------
 backend/space/tests/test_models.py           | 67 --------------------
 backend/space/tests/test_space_models.py     | 10 +++
 4 files changed, 26 insertions(+), 93 deletions(-)
 delete mode 100644 backend/space/tests/test_model_validation.py
 delete mode 100644 backend/space/tests/test_models.py
 create mode 100644 backend/space/tests/test_space_models.py

diff --git a/backend/space/conftest.py b/backend/space/conftest.py
index e1bc2667..07b2a78e 100644
--- a/backend/space/conftest.py
+++ b/backend/space/conftest.py
@@ -4,14 +4,25 @@
 
 
 @pytest.fixture
-def road_structure(db):
-    return models.Structure.objects.create(
-        name="Sesame Street", level=models.Structure.LevelOptions.ROAD
+def region(db):
+    return models.Region.objects.create(
+        name="Muppetopia",
     )
 
 
 @pytest.fixture
-def building_structure(db):
-    return models.Structure.objects.create(
+def settlement(db, region):
+    settlement = models.Settlement.objects.create(
+        name="Muppet town",
+    )
+    settlement.regions.add(region)
+    return settlement
+
+
+@pytest.fixture
+def building_structure(db, settlement):
+    structure = models.Structure.objects.create(
         name="Bert and Ernie's house", level=models.Structure.LevelOptions.BUILDING
     )
+    structure.settlement.add(settlement)
+    return structure
diff --git a/backend/space/tests/test_model_validation.py b/backend/space/tests/test_model_validation.py
deleted file mode 100644
index de2687cd..00000000
--- a/backend/space/tests/test_model_validation.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import pytest
-from django.core.exceptions import ValidationError
-
-
-def test_validate_structure_correct_hierarchy(road_structure, building_structure):
-    building_structure.parent = road_structure
-    building_structure.save()
-    building_structure.clean()
-
-
-def test_validate_structure_incorrect_hierarchy(road_structure, building_structure):
-    road_structure.parent = building_structure
-    road_structure.save()
-    with pytest.raises(ValidationError) as e:
-        road_structure.clean()
-
-    message = e.value.args[0]
-    assert (
-        message
-        == "Cannot add a structure of level 1 (road, square, crossroad) as a child to a structure of level 3 (building, vessel)"
-    )
diff --git a/backend/space/tests/test_models.py b/backend/space/tests/test_models.py
deleted file mode 100644
index a1879c77..00000000
--- a/backend/space/tests/test_models.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import pytest
-
-from space import models
-
-
-@pytest.fixture
-def room_structure(db):
-    return models.Structure.objects.create(
-        name="Ernie's room", level=models.Structure.LevelOptions.ROOM
-    )
-
-
-@pytest.fixture
-def room_structure_2(db):
-    return models.Structure.objects.create(
-        name="Bert's room", level=models.Structure.LevelOptions.ROOM
-    )
-
-
-@pytest.fixture
-def spot_structure(db):
-    return models.Structure.objects.create(
-        name="Ernie's desk", level=models.Structure.LevelOptions.SPOT
-    )
-
-
-@pytest.fixture
-def structure_tree(
-    road_structure, building_structure, room_structure, room_structure_2, spot_structure
-):
-    spot_structure.parent = room_structure
-    spot_structure.save()
-
-    room_structure.parent = building_structure
-    room_structure.save()
-
-    room_structure_2.parent = building_structure
-    room_structure_2.save()
-
-    building_structure.parent = road_structure
-    building_structure.save()
-
-
-def test_structure_ancestors(
-    spot_structure, room_structure, building_structure, road_structure, structure_tree
-):
-    assert spot_structure.ancestors == [
-        room_structure,
-        building_structure,
-        road_structure,
-    ]
-
-
-def test_structure_descendants(
-    road_structure,
-    building_structure,
-    room_structure,
-    room_structure_2,
-    spot_structure,
-    structure_tree,
-):
-    assert road_structure.descendants == [
-        building_structure,
-        room_structure,
-        spot_structure,
-        room_structure_2,
-    ]
diff --git a/backend/space/tests/test_space_models.py b/backend/space/tests/test_space_models.py
new file mode 100644
index 00000000..781584f6
--- /dev/null
+++ b/backend/space/tests/test_space_models.py
@@ -0,0 +1,10 @@
+import pytest
+
+from space import models
+
+
+@pytest.fixture
+def test_models(db, region, settlement, structure):
+    assert region
+    assert settlement
+    assert structure

From 167c2c2bff364adb94fbdcf166851423712c8151 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 21 Jun 2024 15:16:19 +0200
Subject: [PATCH 070/565] Replace api app with graphql_app

---
 backend/api/admin.py                           | 3 ---
 backend/api/graphql/__init__.py                | 0
 backend/api/migrations/__init__.py             | 0
 backend/api/models.py                          | 3 ---
 backend/api/tests.py                           | 3 ---
 backend/api/views.py                           | 3 ---
 backend/{api => graphql_app}/__init__.py       | 0
 backend/{api => graphql_app}/apps.py           | 4 ++--
 backend/{api/graphql => graphql_app}/schema.py | 3 ---
 backend/{api => graphql_app}/urls.py           | 0
 backend/lettercraft/settings.py                | 1 +
 backend/lettercraft/urls.py                    | 2 +-
 12 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 backend/api/admin.py
 delete mode 100644 backend/api/graphql/__init__.py
 delete mode 100644 backend/api/migrations/__init__.py
 delete mode 100644 backend/api/models.py
 delete mode 100644 backend/api/tests.py
 delete mode 100644 backend/api/views.py
 rename backend/{api => graphql_app}/__init__.py (100%)
 rename backend/{api => graphql_app}/apps.py (60%)
 rename backend/{api/graphql => graphql_app}/schema.py (75%)
 rename backend/{api => graphql_app}/urls.py (100%)

diff --git a/backend/api/admin.py b/backend/api/admin.py
deleted file mode 100644
index 8c38f3f3..00000000
--- a/backend/api/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/backend/api/graphql/__init__.py b/backend/api/graphql/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/backend/api/migrations/__init__.py b/backend/api/migrations/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/backend/api/models.py b/backend/api/models.py
deleted file mode 100644
index 71a83623..00000000
--- a/backend/api/models.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.
diff --git a/backend/api/tests.py b/backend/api/tests.py
deleted file mode 100644
index 7ce503c2..00000000
--- a/backend/api/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/backend/api/views.py b/backend/api/views.py
deleted file mode 100644
index 91ea44a2..00000000
--- a/backend/api/views.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.
diff --git a/backend/api/__init__.py b/backend/graphql_app/__init__.py
similarity index 100%
rename from backend/api/__init__.py
rename to backend/graphql_app/__init__.py
diff --git a/backend/api/apps.py b/backend/graphql_app/apps.py
similarity index 60%
rename from backend/api/apps.py
rename to backend/graphql_app/apps.py
index 878e7d54..e6e69438 100644
--- a/backend/api/apps.py
+++ b/backend/graphql_app/apps.py
@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class ApiConfig(AppConfig):
+class GraphqlAppConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "api"
+    name = "graphql_app"
diff --git a/backend/api/graphql/schema.py b/backend/graphql_app/schema.py
similarity index 75%
rename from backend/api/graphql/schema.py
rename to backend/graphql_app/schema.py
index 9bee5b82..fa312ab0 100644
--- a/backend/api/graphql/schema.py
+++ b/backend/graphql_app/schema.py
@@ -1,8 +1,6 @@
 from graphene import ObjectType, Schema
 
-from source.mutations.DeleteSourceMutation import DeleteSourceMutation
 from source.queries import SourceQueries
-
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 
 
@@ -12,7 +10,6 @@ class Query(SourceQueries, ObjectType):
 
 class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
-    delete_source = DeleteSourceMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)
diff --git a/backend/api/urls.py b/backend/graphql_app/urls.py
similarity index 100%
rename from backend/api/urls.py
rename to backend/graphql_app/urls.py
diff --git a/backend/lettercraft/settings.py b/backend/lettercraft/settings.py
index da9828b9..715f91d3 100644
--- a/backend/lettercraft/settings.py
+++ b/backend/lettercraft/settings.py
@@ -53,6 +53,7 @@
     "space",
     "user",
     "graphene_django",
+    "graphql_app",
 ]
 
 MIDDLEWARE = [
diff --git a/backend/lettercraft/urls.py b/backend/lettercraft/urls.py
index 82948251..9be18671 100644
--- a/backend/lettercraft/urls.py
+++ b/backend/lettercraft/urls.py
@@ -37,7 +37,7 @@
     path("api", RedirectView.as_view(url="/api/", permanent=True)),
     path("api-auth", RedirectView.as_view(url="/api-auth/", permanent=True)),
     path("admin/", admin.site.urls),
-    path("api/", include("api.urls")),
+    path("api/", include("graphql_app.urls")),
     path(
         "api-auth/",
         include(

From 0a2f3b6fc37cb608ded32089910407f145e023b2 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 21 Jun 2024 15:17:00 +0200
Subject: [PATCH 071/565] Add authentication-checking middleware

---
 backend/graphql_app/middleware.py |  5 +++
 backend/graphql_app/tests.py      | 58 +++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 backend/graphql_app/middleware.py
 create mode 100644 backend/graphql_app/tests.py

diff --git a/backend/graphql_app/middleware.py b/backend/graphql_app/middleware.py
new file mode 100644
index 00000000..e4a5504d
--- /dev/null
+++ b/backend/graphql_app/middleware.py
@@ -0,0 +1,5 @@
+class GraphQLAuthMiddleware:
+    def resolve(self, next, root, info, **kwargs):
+        if info.context.user.is_authenticated:
+            return next(root, info, **kwargs)
+        raise Exception("User is not authenticated")
diff --git a/backend/graphql_app/tests.py b/backend/graphql_app/tests.py
new file mode 100644
index 00000000..51e20877
--- /dev/null
+++ b/backend/graphql_app/tests.py
@@ -0,0 +1,58 @@
+from graphene_django.utils.testing import GraphQLTestCase
+
+from source.models import Source
+from user.models import User
+
+
+class GraphQLAuthMiddleWareTestCase(GraphQLTestCase):
+    """
+    Tests for the GraphQLAuthMiddleware
+    """
+
+    GRAPHQL_URL = "/api/graphql"
+
+    SOURCES_QUERY = """
+        query GET_SOURCES {
+            sources {
+                id
+            }
+        }
+    """
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        cls.user = User.objects.create(
+            username="test", email="test@test.nl", password="test"
+        )
+
+        cls.source = Source.objects.create(
+            name="Test Source",
+            medieval_title="Test Medieval Title",
+            medieval_author="Test Medieval Author",
+            edition_title="Test Edition Title",
+            edition_author="Test Edition Author",
+        )
+
+        return super().setUpTestData()
+
+    def test_middleware_raises_exception_when_user_is_not_authenticated(self):
+        response = self.query(self.SOURCES_QUERY)
+
+        self.assertResponseHasErrors(response)
+
+        content = response.json()
+
+        self.assertEqual(content["errors"][0]["message"], "User is not authenticated")
+
+    def test_middleware_does_not_raise_exception_when_user_is_authenticated(self):
+        self.client.force_login(self.user)
+
+        response = self.query(self.SOURCES_QUERY)
+
+        self.assertResponseNoErrors(response)
+
+        content = response.json()
+
+        # The first Source in the list is the default MISSING_SOURCE.
+        self.assertEqual(len(content["data"]["sources"]), 2)
+        self.assertEqual(content["data"]["sources"][1]["id"], str(self.source.pk))

From 92c74560507fba709912f4c15a3e447385129df5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 21 Jun 2024 15:18:15 +0200
Subject: [PATCH 072/565] Use new relative GraphQL URL in frontend

---
 frontend/src/app/graphql.module.ts            | 4 ++--
 frontend/src/environments/environment.prod.ts | 3 +--
 frontend/src/environments/environment.ts      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/graphql.module.ts b/frontend/src/app/graphql.module.ts
index 9a801e4b..4b89297d 100644
--- a/frontend/src/app/graphql.module.ts
+++ b/frontend/src/app/graphql.module.ts
@@ -2,11 +2,11 @@ import { APOLLO_OPTIONS, ApolloModule } from 'apollo-angular';
 import { HttpLink } from 'apollo-angular/http';
 import { NgModule } from '@angular/core';
 import { ApolloClientOptions, InMemoryCache } from '@apollo/client/core';
+import { environment } from '@env';
 
-const uri = 'http://localhost:8000/api/graphql'; // <-- add the URL of the GraphQL server here
 export function createApollo(httpLink: HttpLink): ApolloClientOptions<any> {
   return {
-    link: httpLink.create({ uri }),
+    link: httpLink.create({ uri: environment.graphqlUrl }),
     cache: new InMemoryCache(),
   };
 }
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 1dd89172..816a0f47 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -1,4 +1,3 @@
-import { graphql } from 'graphql';
 import { version } from './version';
 
 export const environment = {
@@ -6,5 +5,5 @@ export const environment = {
     assets: '/static/assets',
     version,
     apiUrl: '/api/',
-    graphqlUrl: '/api/graphql',
+    graphqlUrl: '/graphql',
 };
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
index a07eebc0..31ffaff3 100644
--- a/frontend/src/environments/environment.ts
+++ b/frontend/src/environments/environment.ts
@@ -9,7 +9,7 @@ export const environment = {
     assets: 'assets',
     version,
     apiUrl: '/api/',
-    graphqlUrl: '/api/graphql',
+    graphqlUrl: '/graphql',
 };
 
 /*

From 8348fec060e5163f9dfa47ce55da78b8d968b1a1 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 21 Jun 2024 15:18:24 +0200
Subject: [PATCH 073/565] Remove DeleteSourceMutation

---
 .../source/mutations/DeleteSourceMutation.py  | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 backend/source/mutations/DeleteSourceMutation.py

diff --git a/backend/source/mutations/DeleteSourceMutation.py b/backend/source/mutations/DeleteSourceMutation.py
deleted file mode 100644
index 5f39155e..00000000
--- a/backend/source/mutations/DeleteSourceMutation.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from graphene import Mutation, ID, Boolean, ResolveInfo, String
-from source.models import Source
-
-
-class DeleteSourceMutation(Mutation):
-    ok = Boolean(required=True)
-    error = String()
-
-    class Arguments:
-        id = ID(required=True)
-
-    @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, id: str):
-        try:
-            source = Source.objects.get(pk=id)
-        except Source.DoesNotExist:
-            return cls(ok=False, error="Source not found.") # type: ignore
-
-        source.delete()
-
-        return cls(ok=True) # type: ignore

From 773a721cfb24f29a4a5f3ebee787d2ce71b62326 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 21 Jun 2024 15:37:49 +0200
Subject: [PATCH 074/565] Update settings.py

---
 backend/lettercraft/settings.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/lettercraft/settings.py b/backend/lettercraft/settings.py
index 715f91d3..c9e66cba 100644
--- a/backend/lettercraft/settings.py
+++ b/backend/lettercraft/settings.py
@@ -96,7 +96,12 @@
 }
 
 # GraphQL
-GRAPHENE = {"SCHEMA": "api.graphql.schema.schema"}
+GRAPHENE = {
+    "SCHEMA": "graphql_app.schema.schema",
+    "MIDDLEWARE": [
+        "graphql_app.middleware.GraphQLAuthMiddleware",
+    ],
+}
 ENABLE_GRAPHIQL = DEBUG
 
 # Database

From 1cea155667a1df2a040b1f0a3f064dbe4c945c83 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 21 Jun 2024 15:38:11 +0200
Subject: [PATCH 075/565] Add GraphQL tests to backend test runner

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2e94efa2..89862de0 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
         "django": "yarn back python manage.py",
         "startapp": "yarn back django-admin startapp --settings lettercraft.settings --pythonpath .",
         "test-front": "yarn front yarn test",
-        "test-back": "yarn back pytest",
+        "test-back": "yarn back python -m pytest && yarn back python manage.py test",
         "test-func": "yarn func pytest",
         "test": "yarn test-back && yarn test-front && yarn test-func",
         "start-front": "yarn front yarn serve",

From 050752e56d75525823363f49f0b3155ec37ad812 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:06:56 +0200
Subject: [PATCH 076/565] Core and Agent types

---
 backend/core/types/DateFieldType.py           | 25 +++++++++
 backend/core/types/DescriptionFieldType.py    | 23 ++++++++
 backend/core/types/EntityDescriptionType.py   | 55 +++++++++++++++++++
 backend/core/types/FieldType.py               | 28 ++++++++++
 backend/core/types/GQLSourceMention.py        |  6 ++
 backend/core/types/HistoricalEntityType.py    | 20 +++++++
 backend/core/types/NamedType.py               | 28 ++++++++++
 .../types/AgentDescriptionGenderType.py       | 22 ++++++++
 .../types/AgentDescriptionLocationType.py     | 19 +++++++
 backend/person/types/AgentDescriptionType.py  | 22 ++++++++
 backend/person/types/HistoricalPersonType.py  | 16 ++++++
 backend/person/types/PersonDateOfBirthType.py | 24 ++++++++
 backend/person/types/PersonDateOfDeathType.py | 24 ++++++++
 backend/person/types/PersonReferenceType.py   | 13 +++++
 14 files changed, 325 insertions(+)
 create mode 100644 backend/core/types/DateFieldType.py
 create mode 100644 backend/core/types/DescriptionFieldType.py
 create mode 100644 backend/core/types/EntityDescriptionType.py
 create mode 100644 backend/core/types/FieldType.py
 create mode 100644 backend/core/types/GQLSourceMention.py
 create mode 100644 backend/core/types/HistoricalEntityType.py
 create mode 100644 backend/core/types/NamedType.py
 create mode 100644 backend/person/types/AgentDescriptionGenderType.py
 create mode 100644 backend/person/types/AgentDescriptionLocationType.py
 create mode 100644 backend/person/types/AgentDescriptionType.py
 create mode 100644 backend/person/types/HistoricalPersonType.py
 create mode 100644 backend/person/types/PersonDateOfBirthType.py
 create mode 100644 backend/person/types/PersonDateOfDeathType.py
 create mode 100644 backend/person/types/PersonReferenceType.py

diff --git a/backend/core/types/DateFieldType.py b/backend/core/types/DateFieldType.py
new file mode 100644
index 00000000..aa8ba00d
--- /dev/null
+++ b/backend/core/types/DateFieldType.py
@@ -0,0 +1,25 @@
+from graphene import ObjectType, ResolveInfo, String
+
+from core.models import LettercraftDate
+
+
+class LettercraftDateType(ObjectType):
+    """
+    Type for models that extend the LettercraftDate model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    display_date = String(required=True)
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "year_lower",
+            "year_upper",
+            "year_exact",
+            "display_date",
+        ]
+
+    @staticmethod
+    def resolve_display_date(parent: LettercraftDate, info: ResolveInfo) -> str:
+        return parent.display_date
diff --git a/backend/core/types/DescriptionFieldType.py b/backend/core/types/DescriptionFieldType.py
new file mode 100644
index 00000000..d22e98d5
--- /dev/null
+++ b/backend/core/types/DescriptionFieldType.py
@@ -0,0 +1,23 @@
+from graphene import ObjectType, ResolveInfo
+from core.models import DescriptionField
+from core.types.EntityDescriptionType import GQLSourceMention
+from core.types.FieldType import LettercraftFieldType
+
+
+class DescriptionFieldType(LettercraftFieldType, ObjectType):
+    """
+    Type for models that extend the DescriptionField model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    source_mention = GQLSourceMention()
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "source_mention",
+        ] + LettercraftFieldType.fields()
+
+    @staticmethod
+    def resolve_source_mention(parent: DescriptionField, info: ResolveInfo) -> str:
+        return parent.source_mention
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
new file mode 100644
index 00000000..a6c81ddb
--- /dev/null
+++ b/backend/core/types/EntityDescriptionType.py
@@ -0,0 +1,55 @@
+from graphene import List, ObjectType, ResolveInfo, String
+
+from core.models import EntityDescription, Field
+from core.types.GQLSourceMention import GQLSourceMention
+from core.types.NamedType import NamedType
+from source.types.SourceType import SourceType
+
+
+class EntityDescriptionType(NamedType, ObjectType):
+    """
+    Type for models that extend the EntityDescription model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    source = Field(SourceType, required=True)
+    source_mention = GQLSourceMention()
+    designators = List(String, required=True)
+    book = String()
+    chapter = String()
+    page = String()
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "certainty",
+            "note",
+            "designators",
+            "book",
+            "chapter",
+            "page",
+        ] + NamedType.fields()
+
+    @staticmethod
+    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> SourceType:
+        return parent.source
+
+    @staticmethod
+    def resolve_source_mention(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.source_mention
+
+    @staticmethod
+    def resolve_designators(parent: EntityDescription, info: ResolveInfo) -> list[str]:
+        return parent.designators
+
+    @staticmethod
+    def resolve_book(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.book
+
+    @staticmethod
+    def resolve_chapter(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.chapter
+
+    @staticmethod
+    def resolve_page(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.page
diff --git a/backend/core/types/FieldType.py b/backend/core/types/FieldType.py
new file mode 100644
index 00000000..b19957f4
--- /dev/null
+++ b/backend/core/types/FieldType.py
@@ -0,0 +1,28 @@
+from graphene import ObjectType, Int, ResolveInfo, String
+
+from core.models import Field
+
+
+class LettercraftFieldType(ObjectType):
+    """
+    Type for models that extend the Field model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    certainty = Int(required=True)
+    note = String()
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "certainty",
+            "note",
+        ]
+
+    @staticmethod
+    def resolve_certainty(parent: Field, info: ResolveInfo) -> int:
+        return parent.certainty
+
+    @staticmethod
+    def resolve_note(parent: Field, info: ResolveInfo) -> str:
+        return parent.note
diff --git a/backend/core/types/GQLSourceMention.py b/backend/core/types/GQLSourceMention.py
new file mode 100644
index 00000000..a0f85b8d
--- /dev/null
+++ b/backend/core/types/GQLSourceMention.py
@@ -0,0 +1,6 @@
+from graphene import Enum
+
+from core.models import SourceMention
+
+
+GQLSourceMention = Enum.from_enum(SourceMention)
diff --git a/backend/core/types/HistoricalEntityType.py b/backend/core/types/HistoricalEntityType.py
new file mode 100644
index 00000000..91df0b87
--- /dev/null
+++ b/backend/core/types/HistoricalEntityType.py
@@ -0,0 +1,20 @@
+from graphene import Boolean, ObjectType
+
+from core.types.NamedType import NamedType
+
+
+class HistoricalEntityType(NamedType, ObjectType):
+    """
+    Type for models that extend the HistoricalEntity model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    identifiable = Boolean(required=True)
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "id",
+            "created_at",
+            "updated_at",
+        ] + NamedType.fields()
diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
new file mode 100644
index 00000000..ab14f6e5
--- /dev/null
+++ b/backend/core/types/NamedType.py
@@ -0,0 +1,28 @@
+from graphene import ObjectType, ResolveInfo, String
+
+from core.models import Named
+
+
+class NamedType(ObjectType):
+    """
+    Type for models that extend the Named model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    name = String(required=True)
+    description = String(required=False)
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "name",
+            "description",
+        ]
+
+    @staticmethod
+    def resolve_name(parent: Named, info: ResolveInfo) -> str:
+        return parent.name
+
+    @staticmethod
+    def resolve_description(parent: Named, info: ResolveInfo) -> str:
+        return parent.description
diff --git a/backend/person/types/AgentDescriptionGenderType.py b/backend/person/types/AgentDescriptionGenderType.py
new file mode 100644
index 00000000..95074608
--- /dev/null
+++ b/backend/person/types/AgentDescriptionGenderType.py
@@ -0,0 +1,22 @@
+from graphene import Enum, ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from person.models import AgentDescriptionGender, Gender
+
+GQLGender = Enum.from_enum(Gender)
+
+
+class AgentDescriptionGenderType(DescriptionFieldType, DjangoObjectType):
+    gender = GQLGender(required=True)
+
+    class Meta:
+        model = AgentDescriptionGender
+        fields = [
+            "id",
+            "agent",
+            "gender",
+        ] + DescriptionFieldType.fields()
+
+    @staticmethod
+    def resolve_gender(parent: AgentDescriptionGender, info: ResolveInfo) -> str:
+        return parent.gender
diff --git a/backend/person/types/AgentDescriptionLocationType.py b/backend/person/types/AgentDescriptionLocationType.py
new file mode 100644
index 00000000..df6b0007
--- /dev/null
+++ b/backend/person/types/AgentDescriptionLocationType.py
@@ -0,0 +1,19 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from person.models import AgentDescriptionLocation
+
+
+class AgentDescriptionLocationType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = AgentDescriptionLocation
+        fields = [
+            "id",
+            "agent",
+            "location",
+        ] + DescriptionFieldType.fields()
+
+    @staticmethod
+    def resolve_location(parent: AgentDescriptionLocation, info: ResolveInfo) -> str:
+        # TODO: Write SpaceDescriptionType
+        return str(parent.location)
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
new file mode 100644
index 00000000..f9f49f4e
--- /dev/null
+++ b/backend/person/types/AgentDescriptionType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+
+from django.db.models import QuerySet
+from core.types.EntityDescriptionType import EntityDescriptionType
+from person.models import AgentDescription
+
+
+class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
+    class Meta:
+        model = AgentDescription
+        fields = [
+            "id",
+            "describes",
+            "is_group",
+        ] + EntityDescriptionType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[AgentDescription], info: ResolveInfo
+    ) -> QuerySet[AgentDescription]:
+        return queryset.all()
diff --git a/backend/person/types/HistoricalPersonType.py b/backend/person/types/HistoricalPersonType.py
new file mode 100644
index 00000000..cc66816b
--- /dev/null
+++ b/backend/person/types/HistoricalPersonType.py
@@ -0,0 +1,16 @@
+from graphene_django import DjangoObjectType
+from core.types.HistoricalEntityType import HistoricalEntityType
+from django.db.models import QuerySet
+from person.models import HistoricalPerson
+
+
+class HistoricalPersonType(HistoricalEntityType, DjangoObjectType):
+    class Meta:
+        model = HistoricalPerson
+        fields = ["id"] + HistoricalEntityType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[HistoricalPerson], info: QuerySet[HistoricalPerson]
+    ) -> QuerySet[HistoricalPerson]:
+        return queryset.all()
diff --git a/backend/person/types/PersonDateOfBirthType.py b/backend/person/types/PersonDateOfBirthType.py
new file mode 100644
index 00000000..745d5852
--- /dev/null
+++ b/backend/person/types/PersonDateOfBirthType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+from core.types.DateFieldType import LettercraftDateType
+from core.types.FieldType import LettercraftFieldType
+from person.models import PersonDateOfBirth
+
+
+class PersonDateOfBirthType(
+    LettercraftFieldType, LettercraftDateType, DjangoObjectType
+):
+    class Meta:
+        model = PersonDateOfBirth
+        fields = (
+            ["id", "person"]
+            + LettercraftFieldType.fields()
+            + LettercraftDateType.fields()
+        )
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[PersonDateOfBirth], info: ResolveInfo
+    ) -> QuerySet[PersonDateOfBirth]:
+        return queryset.all()
diff --git a/backend/person/types/PersonDateOfDeathType.py b/backend/person/types/PersonDateOfDeathType.py
new file mode 100644
index 00000000..351e26fe
--- /dev/null
+++ b/backend/person/types/PersonDateOfDeathType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+from core.types.DateFieldType import LettercraftDateType
+from core.types.FieldType import LettercraftFieldType
+from person.models import PersonDateOfDeath
+
+
+class PersonDateOfDeathType(
+    LettercraftFieldType, LettercraftDateType, DjangoObjectType
+):
+    class Meta:
+        model = PersonDateOfDeath
+        fields = (
+            ["id", "person"]
+            + LettercraftFieldType.fields()
+            + LettercraftDateType.fields()
+        )
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[PersonDateOfDeath], info: ResolveInfo
+    ) -> QuerySet[PersonDateOfDeath]:
+        return queryset.all()
diff --git a/backend/person/types/PersonReferenceType.py b/backend/person/types/PersonReferenceType.py
new file mode 100644
index 00000000..a575c644
--- /dev/null
+++ b/backend/person/types/PersonReferenceType.py
@@ -0,0 +1,13 @@
+from graphene_django import DjangoObjectType
+from core.types.FieldType import LettercraftFieldType
+from person.models import PersonReference
+
+
+class PersonReferenceType(LettercraftFieldType, DjangoObjectType):
+    class Meta:
+        model = PersonReference
+        fields = [
+            "id",
+            "person",
+            "description",
+        ] + LettercraftFieldType.fields()

From eca690800c79a3628484391a3bbb3b59f878bb66 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:07:29 +0200
Subject: [PATCH 077/565] Outfactor SourceMention choices

---
 backend/core/models.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index ad4835c8..639ef0f1 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -2,6 +2,7 @@
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.contrib.postgres.fields import ArrayField
 
+
 class Field(models.Model):
     """
     A piece of information about an entity.
@@ -108,6 +109,11 @@ class Meta:
         abstract = True
 
 
+class SourceMention(models.TextChoices):
+    DIRECT = "direct", "directly mentioned"
+    IMPLIED = "implied", "implied"
+
+
 class EntityDescription(Named, models.Model):
     """
     A description of an entity (person, object, location, event) in a narrative source.
@@ -116,7 +122,7 @@ class EntityDescription(Named, models.Model):
     """
 
     source = models.ForeignKey(
-        to='source.Source',
+        to="source.Source",
         on_delete=models.PROTECT,
         help_text="Source text containing this description",
     )
@@ -124,7 +130,7 @@ class EntityDescription(Named, models.Model):
     source_mention = models.CharField(
         max_length=32,
         blank=True,
-        choices=[("direct", "directly mentioned"), ("implied", "implied")],
+        choices=SourceMention.choices,
         help_text="How is this entity presented in the text?",
     )
 
@@ -141,19 +147,19 @@ class EntityDescription(Named, models.Model):
     book = models.CharField(
         max_length=255,
         blank=True,
-        help_text="The book in the source"
+        help_text="The book in the source",
     )
 
     chapter = models.CharField(
         max_length=255,
         blank=True,
-        help_text="The chapter or chapters in the source"
+        help_text="The chapter or chapters in the source",
     )
 
     page = models.CharField(
         max_length=255,
         blank=True,
-        help_text="The page number or page range in the source"
+        help_text="The page number or page range in the source",
     )
 
     class Meta:
@@ -174,7 +180,7 @@ class DescriptionField(Field, models.Model):
     source_mention = models.CharField(
         max_length=32,
         blank=True,
-        choices=[("direct", "directly mentioned"), ("implied", "implied")],
+        choices=SourceMention.choices,
         help_text="How is this information presented in the text?",
     )
 

From faba1cfca0ac437d579111ace7386e08d8772ffa Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:54:03 +0200
Subject: [PATCH 078/565] Add AgentDescription queries

---
 backend/graphql_app/schema.py |  3 ++-
 backend/person/queries.py     | 39 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 backend/person/queries.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index fa312ab0..ae40c32e 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -1,10 +1,11 @@
 from graphene import ObjectType, Schema
 
+from person.queries import PersonQueries
 from source.queries import SourceQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 
 
-class Query(SourceQueries, ObjectType):
+class Query(SourceQueries, PersonQueries, ObjectType):
     pass
 
 
diff --git a/backend/person/queries.py b/backend/person/queries.py
new file mode 100644
index 00000000..213b8b90
--- /dev/null
+++ b/backend/person/queries.py
@@ -0,0 +1,39 @@
+from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
+from django.db.models import QuerySet, Q
+from person.models import AgentDescription
+from person.types.AgentDescriptionType import AgentDescriptionType
+
+
+class PersonQueries(ObjectType):
+    agent_description = Field(AgentDescriptionType, id=ID(required=True))
+    agent_descriptions = List(
+        NonNull(AgentDescriptionType), required=True, episode_id=ID(), source_id=ID()
+    )
+
+    @staticmethod
+    def resolve_agent_description(
+        parent: None, info: ResolveInfo, id: str
+    ) -> AgentDescription | None:
+        try:
+            return AgentDescriptionType.get_queryset(
+                AgentDescription.objects, info
+            ).get(id=id)
+        except AgentDescription.DoesNotExist:
+            return None
+
+    @staticmethod
+    def resolve_agent_descriptions(
+        parent: None,
+        info: ResolveInfo,
+        episode_id: str | None = None,
+        source_id: str | None = None,
+    ) -> QuerySet[AgentDescription]:
+        filters = Q()
+        if episode_id:
+            filters &= Q(episode_id=episode_id)
+        if source_id:
+            filters &= Q(source_id=source_id)
+
+        return AgentDescriptionType.get_queryset(AgentDescription.objects, info).filter(
+            filters
+        )

From d3d8f5c8bf0d083d5720dc3c7b9c192a5ddd3dc9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:54:31 +0200
Subject: [PATCH 079/565] Fix EntityDescriptionType imports and fields

---
 backend/core/types/EntityDescriptionType.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index a6c81ddb..58dbe404 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,8 +1,9 @@
-from graphene import List, ObjectType, ResolveInfo, String
+from graphene import List, ObjectType, ResolveInfo, String, Field
 
-from core.models import EntityDescription, Field
+from core.models import EntityDescription
 from core.types.GQLSourceMention import GQLSourceMention
 from core.types.NamedType import NamedType
+from source.models import Source
 from source.types.SourceType import SourceType
 
 
@@ -22,8 +23,8 @@ class EntityDescriptionType(NamedType, ObjectType):
     @staticmethod
     def fields() -> list[str]:
         return [
-            "certainty",
-            "note",
+            "source",
+            "source_mention",
             "designators",
             "book",
             "chapter",
@@ -31,7 +32,7 @@ def fields() -> list[str]:
         ] + NamedType.fields()
 
     @staticmethod
-    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> SourceType:
+    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> Source:
         return parent.source
 
     @staticmethod

From 48f54f49c20a604f05329f78f3175e3bbebbb55b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 12:18:36 +0200
Subject: [PATCH 080/565] Simplify abstract types

---
 backend/core/types/AbstractType.py          | 14 +++++++
 backend/core/types/EntityDescriptionType.py | 45 +++------------------
 backend/core/types/NamedType.py             | 25 +++---------
 3 files changed, 26 insertions(+), 58 deletions(-)
 create mode 100644 backend/core/types/AbstractType.py

diff --git a/backend/core/types/AbstractType.py b/backend/core/types/AbstractType.py
new file mode 100644
index 00000000..5149d573
--- /dev/null
+++ b/backend/core/types/AbstractType.py
@@ -0,0 +1,14 @@
+from graphene import ObjectType
+
+
+class AbstractType(ObjectType):
+    """
+    Simple type that allows that returns all fields of a type that inherits it.
+    """
+
+    @classmethod
+    def fields(cls) -> list[str]:
+        """
+        Returns all fields mentioned in the Meta class of the type inheriting AbstractType.
+        """
+        return list(cls._meta.fields.keys())
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index 58dbe404..567c1048 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,28 +1,19 @@
-from graphene import List, ObjectType, ResolveInfo, String, Field
+from graphene_django import DjangoObjectType
 
 from core.models import EntityDescription
-from core.types.GQLSourceMention import GQLSourceMention
+from core.types.AbstractType import AbstractType
 from core.types.NamedType import NamedType
-from source.models import Source
-from source.types.SourceType import SourceType
 
 
-class EntityDescriptionType(NamedType, ObjectType):
+class EntityDescriptionType(NamedType, AbstractType, DjangoObjectType):
     """
     Type for models that extend the EntityDescription model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    source = Field(SourceType, required=True)
-    source_mention = GQLSourceMention()
-    designators = List(String, required=True)
-    book = String()
-    chapter = String()
-    page = String()
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = EntityDescription
+        fields = [
             "source",
             "source_mention",
             "designators",
@@ -30,27 +21,3 @@ def fields() -> list[str]:
             "chapter",
             "page",
         ] + NamedType.fields()
-
-    @staticmethod
-    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> Source:
-        return parent.source
-
-    @staticmethod
-    def resolve_source_mention(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.source_mention
-
-    @staticmethod
-    def resolve_designators(parent: EntityDescription, info: ResolveInfo) -> list[str]:
-        return parent.designators
-
-    @staticmethod
-    def resolve_book(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.book
-
-    @staticmethod
-    def resolve_chapter(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.chapter
-
-    @staticmethod
-    def resolve_page(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.page
diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
index ab14f6e5..98dcaaba 100644
--- a/backend/core/types/NamedType.py
+++ b/backend/core/types/NamedType.py
@@ -1,28 +1,15 @@
-from graphene import ObjectType, ResolveInfo, String
+from graphene_django import DjangoObjectType
 
 from core.models import Named
+from core.types.AbstractType import AbstractType
 
 
-class NamedType(ObjectType):
+class NamedType(AbstractType, DjangoObjectType):
     """
     Type for models that extend the Named model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    name = String(required=True)
-    description = String(required=False)
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
-            "name",
-            "description",
-        ]
-
-    @staticmethod
-    def resolve_name(parent: Named, info: ResolveInfo) -> str:
-        return parent.name
-
-    @staticmethod
-    def resolve_description(parent: Named, info: ResolveInfo) -> str:
-        return parent.description
+    class Meta:
+        model = Named
+        fields = ["name", "description"]

From 087aaad5bfd5760e76d1425f6876e060b5575283 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 12:26:34 +0200
Subject: [PATCH 081/565] AbstractDjangoObjectType

---
 backend/core/types/AbstractDjangoObjectType.py | 17 +++++++++++++++++
 backend/core/types/AbstractType.py             | 14 --------------
 backend/core/types/EntityDescriptionType.py    |  6 ++----
 backend/core/types/HistoricalEntityType.py     | 16 +++++++---------
 backend/core/types/NamedType.py                |  6 ++----
 5 files changed, 28 insertions(+), 31 deletions(-)
 create mode 100644 backend/core/types/AbstractDjangoObjectType.py
 delete mode 100644 backend/core/types/AbstractType.py

diff --git a/backend/core/types/AbstractDjangoObjectType.py b/backend/core/types/AbstractDjangoObjectType.py
new file mode 100644
index 00000000..8e780eac
--- /dev/null
+++ b/backend/core/types/AbstractDjangoObjectType.py
@@ -0,0 +1,17 @@
+from graphene_django import DjangoObjectType
+
+
+class AbstractDjangoObjectType(DjangoObjectType):
+    """
+    Extends DjangoObjectType to include a fields method that returns all fields mentioned in the Meta class.
+    """
+
+    class Meta:
+        abstract = True
+
+    @classmethod
+    def fields(cls) -> list[str]:
+        """
+        Returns all fields mentioned in the Meta class of the inheriting class.
+        """
+        return list(cls._meta.fields.keys())
diff --git a/backend/core/types/AbstractType.py b/backend/core/types/AbstractType.py
deleted file mode 100644
index 5149d573..00000000
--- a/backend/core/types/AbstractType.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from graphene import ObjectType
-
-
-class AbstractType(ObjectType):
-    """
-    Simple type that allows that returns all fields of a type that inherits it.
-    """
-
-    @classmethod
-    def fields(cls) -> list[str]:
-        """
-        Returns all fields mentioned in the Meta class of the type inheriting AbstractType.
-        """
-        return list(cls._meta.fields.keys())
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index 567c1048..296bc5fd 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,11 +1,9 @@
-from graphene_django import DjangoObjectType
-
 from core.models import EntityDescription
-from core.types.AbstractType import AbstractType
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
 
 
-class EntityDescriptionType(NamedType, AbstractType, DjangoObjectType):
+class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
     """
     Type for models that extend the EntityDescription model.
     Should not be queried directly, but should be extended by other types.
diff --git a/backend/core/types/HistoricalEntityType.py b/backend/core/types/HistoricalEntityType.py
index 91df0b87..8e14a7fe 100644
--- a/backend/core/types/HistoricalEntityType.py
+++ b/backend/core/types/HistoricalEntityType.py
@@ -1,20 +1,18 @@
 from graphene import Boolean, ObjectType
 
+from core.models import HistoricalEntity
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
 
 
-class HistoricalEntityType(NamedType, ObjectType):
+class HistoricalEntityType(NamedType, AbstractDjangoObjectType):
     """
     Type for models that extend the HistoricalEntity model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    identifiable = Boolean(required=True)
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
-            "id",
-            "created_at",
-            "updated_at",
+    class Meta:
+        model = HistoricalEntity
+        fields = [
+            "identifiable",
         ] + NamedType.fields()
diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
index 98dcaaba..3588f9dc 100644
--- a/backend/core/types/NamedType.py
+++ b/backend/core/types/NamedType.py
@@ -1,10 +1,8 @@
-from graphene_django import DjangoObjectType
-
 from core.models import Named
-from core.types.AbstractType import AbstractType
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
 
-class NamedType(AbstractType, DjangoObjectType):
+class NamedType(AbstractDjangoObjectType):
     """
     Type for models that extend the Named model.
     Should not be queried directly, but should be extended by other types.

From 5d0b4332cd8a4f158bd7a08dd5e064920a10c7bf Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 16:40:05 +0200
Subject: [PATCH 082/565] Simplify more types

---
 backend/core/types/DateFieldType.py           | 16 ++++--------
 backend/core/types/DescriptionFieldType.py    | 17 ++++---------
 .../types/AgentDescriptionGenderType.py       | 11 +-------
 backend/person/types/AgentDescriptionType.py  | 25 +++++++++++++++++--
 backend/person/types/HistoricalPersonType.py  | 14 +++++++++--
 5 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/backend/core/types/DateFieldType.py b/backend/core/types/DateFieldType.py
index aa8ba00d..3afa4010 100644
--- a/backend/core/types/DateFieldType.py
+++ b/backend/core/types/DateFieldType.py
@@ -1,25 +1,19 @@
-from graphene import ObjectType, ResolveInfo, String
 
 from core.models import LettercraftDate
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
 
-class LettercraftDateType(ObjectType):
+class LettercraftDateType(AbstractDjangoObjectType):
     """
     Type for models that extend the LettercraftDate model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    display_date = String(required=True)
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = LettercraftDate
+        fields = [
             "year_lower",
             "year_upper",
             "year_exact",
             "display_date",
         ]
-
-    @staticmethod
-    def resolve_display_date(parent: LettercraftDate, info: ResolveInfo) -> str:
-        return parent.display_date
diff --git a/backend/core/types/DescriptionFieldType.py b/backend/core/types/DescriptionFieldType.py
index d22e98d5..c2b9a6ff 100644
--- a/backend/core/types/DescriptionFieldType.py
+++ b/backend/core/types/DescriptionFieldType.py
@@ -1,23 +1,16 @@
-from graphene import ObjectType, ResolveInfo
 from core.models import DescriptionField
-from core.types.EntityDescriptionType import GQLSourceMention
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.FieldType import LettercraftFieldType
 
 
-class DescriptionFieldType(LettercraftFieldType, ObjectType):
+class DescriptionFieldType(LettercraftFieldType, AbstractDjangoObjectType):
     """
     Type for models that extend the DescriptionField model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    source_mention = GQLSourceMention()
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = DescriptionField
+        fields = [
             "source_mention",
         ] + LettercraftFieldType.fields()
-
-    @staticmethod
-    def resolve_source_mention(parent: DescriptionField, info: ResolveInfo) -> str:
-        return parent.source_mention
diff --git a/backend/person/types/AgentDescriptionGenderType.py b/backend/person/types/AgentDescriptionGenderType.py
index 95074608..64ef0743 100644
--- a/backend/person/types/AgentDescriptionGenderType.py
+++ b/backend/person/types/AgentDescriptionGenderType.py
@@ -1,14 +1,9 @@
-from graphene import Enum, ResolveInfo
 from graphene_django import DjangoObjectType
 from core.types.DescriptionFieldType import DescriptionFieldType
-from person.models import AgentDescriptionGender, Gender
-
-GQLGender = Enum.from_enum(Gender)
+from person.models import AgentDescriptionGender
 
 
 class AgentDescriptionGenderType(DescriptionFieldType, DjangoObjectType):
-    gender = GQLGender(required=True)
-
     class Meta:
         model = AgentDescriptionGender
         fields = [
@@ -16,7 +11,3 @@ class Meta:
             "agent",
             "gender",
         ] + DescriptionFieldType.fields()
-
-    @staticmethod
-    def resolve_gender(parent: AgentDescriptionGender, info: ResolveInfo) -> str:
-        return parent.gender
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index f9f49f4e..3922edf8 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -1,18 +1,27 @@
-from graphene import ResolveInfo
+from graphene import Field, List, ResolveInfo
 from graphene_django import DjangoObjectType
 
 from django.db.models import QuerySet
 from core.types.EntityDescriptionType import EntityDescriptionType
-from person.models import AgentDescription
+from person.models import AgentDescription, HistoricalPerson, PersonReference
+from person.types.AgentDescriptionGenderType import AgentDescriptionGenderType
+from person.types.HistoricalPersonType import HistoricalPersonType
+from person.types.PersonReferenceType import PersonReferenceType
 
 
 class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
+    describes = List(HistoricalPersonType)
+    person_references = List(PersonReferenceType)
+    gender = Field(AgentDescriptionGenderType)
+
     class Meta:
         model = AgentDescription
         fields = [
             "id",
             "describes",
             "is_group",
+            "person_references",
+            "gender",
         ] + EntityDescriptionType.fields()
 
     @classmethod
@@ -20,3 +29,15 @@ def get_queryset(
         cls, queryset: QuerySet[AgentDescription], info: ResolveInfo
     ) -> QuerySet[AgentDescription]:
         return queryset.all()
+
+    @staticmethod
+    def resolve_describes(
+        parent: AgentDescription, info: ResolveInfo
+    ) -> QuerySet[HistoricalPerson]:
+        return parent.describes.all()
+
+    @staticmethod
+    def resolve_person_references(
+        agent_description: AgentDescription, info: ResolveInfo
+    ) -> QuerySet[PersonReference]:
+        return agent_description.person_references.all()  # type: ignore
diff --git a/backend/person/types/HistoricalPersonType.py b/backend/person/types/HistoricalPersonType.py
index cc66816b..2000193c 100644
--- a/backend/person/types/HistoricalPersonType.py
+++ b/backend/person/types/HistoricalPersonType.py
@@ -1,16 +1,26 @@
+from graphene import Field, ResolveInfo
 from graphene_django import DjangoObjectType
 from core.types.HistoricalEntityType import HistoricalEntityType
 from django.db.models import QuerySet
 from person.models import HistoricalPerson
+from person.types.PersonDateOfBirthType import PersonDateOfBirthType
+from person.types.PersonDateOfDeathType import PersonDateOfDeathType
 
 
 class HistoricalPersonType(HistoricalEntityType, DjangoObjectType):
+    date_of_birth = Field(PersonDateOfBirthType)
+    date_of_death = Field(PersonDateOfDeathType)
+
     class Meta:
         model = HistoricalPerson
-        fields = ["id"] + HistoricalEntityType.fields()
+        fields = [
+            "id",
+            "date_of_birth",
+            "date_of_death",
+        ] + HistoricalEntityType.fields()
 
     @classmethod
     def get_queryset(
-        cls, queryset: QuerySet[HistoricalPerson], info: QuerySet[HistoricalPerson]
+        cls, queryset: QuerySet[HistoricalPerson], info: ResolveInfo
     ) -> QuerySet[HistoricalPerson]:
         return queryset.all()

From 9fcb77422979a2826313f7c07be27dbe6fd00530 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 16:40:24 +0200
Subject: [PATCH 083/565] Add related_names on PersonReference

---
 ...er_personreference_description_and_more.py | 32 +++++++++++++++++++
 backend/person/models.py                      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 backend/person/migrations/0018_alter_personreference_description_and_more.py

diff --git a/backend/person/migrations/0018_alter_personreference_description_and_more.py b/backend/person/migrations/0018_alter_personreference_description_and_more.py
new file mode 100644
index 00000000..e991c30a
--- /dev/null
+++ b/backend/person/migrations/0018_alter_personreference_description_and_more.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.7 on 2024-06-22 14:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("person", "0017_delete_agentdescriptionsocialstatus_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="personreference",
+            name="description",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="person_references",
+                to="person.agentdescription",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="personreference",
+            name="person",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="person_references",
+                to="person.historicalperson",
+            ),
+        ),
+    ]
diff --git a/backend/person/models.py b/backend/person/models.py
index 60d34386..00dff057 100644
--- a/backend/person/models.py
+++ b/backend/person/models.py
@@ -57,10 +57,12 @@ class PersonReference(Field, models.Model):
     person = models.ForeignKey(
         to=HistoricalPerson,
         on_delete=models.CASCADE,
+        related_name="person_references",
     )
     description = models.ForeignKey(
         to="AgentDescription",
         on_delete=models.CASCADE,
+        related_name="person_references",
     )
 
 

From d8962b409214c4984b6c1c942659c1f35413d8fd Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 16:46:58 +0200
Subject: [PATCH 084/565] Add display_date property field resolver; remove
 unused GQLSourceMention enum

---
 backend/core/models.py                 | 2 +-
 backend/core/types/DateFieldType.py    | 6 ++++++
 backend/core/types/GQLSourceMention.py | 6 ------
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 backend/core/types/GQLSourceMention.py

diff --git a/backend/core/models.py b/backend/core/models.py
index 639ef0f1..70082692 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -61,7 +61,7 @@ class LettercraftDate(models.Model):
     )
 
     @property
-    def display_date(self):
+    def display_date(self) -> str:
         if self.year_exact:
             return str(self.year_exact)
         return f"c. {self.year_lower}–{self.year_upper}"
diff --git a/backend/core/types/DateFieldType.py b/backend/core/types/DateFieldType.py
index 3afa4010..b239da72 100644
--- a/backend/core/types/DateFieldType.py
+++ b/backend/core/types/DateFieldType.py
@@ -1,4 +1,5 @@
 
+from graphene import ResolveInfo, String
 from core.models import LettercraftDate
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
@@ -8,6 +9,7 @@ class LettercraftDateType(AbstractDjangoObjectType):
     Type for models that extend the LettercraftDate model.
     Should not be queried directly, but should be extended by other types.
     """
+    display_date = String(required=True)
 
     class Meta:
         model = LettercraftDate
@@ -17,3 +19,7 @@ class Meta:
             "year_exact",
             "display_date",
         ]
+
+    @staticmethod
+    def resolve_display_date(parent: LettercraftDate, info: ResolveInfo) -> str:
+        return parent.display_date
diff --git a/backend/core/types/GQLSourceMention.py b/backend/core/types/GQLSourceMention.py
deleted file mode 100644
index a0f85b8d..00000000
--- a/backend/core/types/GQLSourceMention.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from graphene import Enum
-
-from core.models import SourceMention
-
-
-GQLSourceMention = Enum.from_enum(SourceMention)

From 97f4aadb8010fe7a8e4d22217eaf5b5f92133b83 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 17:11:14 +0200
Subject: [PATCH 085/565] Update LettercraftFieldType

---
 backend/core/types/FieldType.py | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/backend/core/types/FieldType.py b/backend/core/types/FieldType.py
index b19957f4..ff1596ef 100644
--- a/backend/core/types/FieldType.py
+++ b/backend/core/types/FieldType.py
@@ -1,28 +1,16 @@
-from graphene import ObjectType, Int, ResolveInfo, String
-
 from core.models import Field
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
 
-class LettercraftFieldType(ObjectType):
+class LettercraftFieldType(AbstractDjangoObjectType):
     """
     Type for models that extend the Field model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    certainty = Int(required=True)
-    note = String()
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = Field
+        fields = [
             "certainty",
             "note",
         ]
-
-    @staticmethod
-    def resolve_certainty(parent: Field, info: ResolveInfo) -> int:
-        return parent.certainty
-
-    @staticmethod
-    def resolve_note(parent: Field, info: ResolveInfo) -> str:
-        return parent.note

From 4db7d7aabf577851672ab65da55b1226eff64eab Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 24 Jun 2024 11:01:51 +0200
Subject: [PATCH 086/565] fix tests

---
 backend/space/conftest.py                | 5 +++--
 backend/space/tests/test_space_models.py | 6 ------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/backend/space/conftest.py b/backend/space/conftest.py
index 07b2a78e..487ab8b8 100644
--- a/backend/space/conftest.py
+++ b/backend/space/conftest.py
@@ -20,9 +20,10 @@ def settlement(db, region):
 
 
 @pytest.fixture
-def building_structure(db, settlement):
+def structure(db, settlement):
     structure = models.Structure.objects.create(
         name="Bert and Ernie's house", level=models.Structure.LevelOptions.BUILDING
     )
-    structure.settlement.add(settlement)
+    structure.settlement = settlement
+    structure.save()
     return structure
diff --git a/backend/space/tests/test_space_models.py b/backend/space/tests/test_space_models.py
index 781584f6..be5f1ea6 100644
--- a/backend/space/tests/test_space_models.py
+++ b/backend/space/tests/test_space_models.py
@@ -1,9 +1,3 @@
-import pytest
-
-from space import models
-
-
-@pytest.fixture
 def test_models(db, region, settlement, structure):
     assert region
     assert settlement

From d4e0698c675c8e0e9cee4b556d5aff526d0514a0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:06:56 +0200
Subject: [PATCH 087/565] Core and Agent types

---
 backend/core/types/DateFieldType.py           | 25 +++++++++
 backend/core/types/DescriptionFieldType.py    | 23 ++++++++
 backend/core/types/EntityDescriptionType.py   | 55 +++++++++++++++++++
 backend/core/types/FieldType.py               | 28 ++++++++++
 backend/core/types/GQLSourceMention.py        |  6 ++
 backend/core/types/HistoricalEntityType.py    | 20 +++++++
 backend/core/types/NamedType.py               | 28 ++++++++++
 .../types/AgentDescriptionGenderType.py       | 22 ++++++++
 .../types/AgentDescriptionLocationType.py     | 19 +++++++
 backend/person/types/AgentDescriptionType.py  | 22 ++++++++
 backend/person/types/HistoricalPersonType.py  | 16 ++++++
 backend/person/types/PersonDateOfBirthType.py | 24 ++++++++
 backend/person/types/PersonDateOfDeathType.py | 24 ++++++++
 backend/person/types/PersonReferenceType.py   | 13 +++++
 14 files changed, 325 insertions(+)
 create mode 100644 backend/core/types/DateFieldType.py
 create mode 100644 backend/core/types/DescriptionFieldType.py
 create mode 100644 backend/core/types/EntityDescriptionType.py
 create mode 100644 backend/core/types/FieldType.py
 create mode 100644 backend/core/types/GQLSourceMention.py
 create mode 100644 backend/core/types/HistoricalEntityType.py
 create mode 100644 backend/core/types/NamedType.py
 create mode 100644 backend/person/types/AgentDescriptionGenderType.py
 create mode 100644 backend/person/types/AgentDescriptionLocationType.py
 create mode 100644 backend/person/types/AgentDescriptionType.py
 create mode 100644 backend/person/types/HistoricalPersonType.py
 create mode 100644 backend/person/types/PersonDateOfBirthType.py
 create mode 100644 backend/person/types/PersonDateOfDeathType.py
 create mode 100644 backend/person/types/PersonReferenceType.py

diff --git a/backend/core/types/DateFieldType.py b/backend/core/types/DateFieldType.py
new file mode 100644
index 00000000..aa8ba00d
--- /dev/null
+++ b/backend/core/types/DateFieldType.py
@@ -0,0 +1,25 @@
+from graphene import ObjectType, ResolveInfo, String
+
+from core.models import LettercraftDate
+
+
+class LettercraftDateType(ObjectType):
+    """
+    Type for models that extend the LettercraftDate model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    display_date = String(required=True)
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "year_lower",
+            "year_upper",
+            "year_exact",
+            "display_date",
+        ]
+
+    @staticmethod
+    def resolve_display_date(parent: LettercraftDate, info: ResolveInfo) -> str:
+        return parent.display_date
diff --git a/backend/core/types/DescriptionFieldType.py b/backend/core/types/DescriptionFieldType.py
new file mode 100644
index 00000000..d22e98d5
--- /dev/null
+++ b/backend/core/types/DescriptionFieldType.py
@@ -0,0 +1,23 @@
+from graphene import ObjectType, ResolveInfo
+from core.models import DescriptionField
+from core.types.EntityDescriptionType import GQLSourceMention
+from core.types.FieldType import LettercraftFieldType
+
+
+class DescriptionFieldType(LettercraftFieldType, ObjectType):
+    """
+    Type for models that extend the DescriptionField model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    source_mention = GQLSourceMention()
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "source_mention",
+        ] + LettercraftFieldType.fields()
+
+    @staticmethod
+    def resolve_source_mention(parent: DescriptionField, info: ResolveInfo) -> str:
+        return parent.source_mention
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
new file mode 100644
index 00000000..a6c81ddb
--- /dev/null
+++ b/backend/core/types/EntityDescriptionType.py
@@ -0,0 +1,55 @@
+from graphene import List, ObjectType, ResolveInfo, String
+
+from core.models import EntityDescription, Field
+from core.types.GQLSourceMention import GQLSourceMention
+from core.types.NamedType import NamedType
+from source.types.SourceType import SourceType
+
+
+class EntityDescriptionType(NamedType, ObjectType):
+    """
+    Type for models that extend the EntityDescription model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    source = Field(SourceType, required=True)
+    source_mention = GQLSourceMention()
+    designators = List(String, required=True)
+    book = String()
+    chapter = String()
+    page = String()
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "certainty",
+            "note",
+            "designators",
+            "book",
+            "chapter",
+            "page",
+        ] + NamedType.fields()
+
+    @staticmethod
+    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> SourceType:
+        return parent.source
+
+    @staticmethod
+    def resolve_source_mention(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.source_mention
+
+    @staticmethod
+    def resolve_designators(parent: EntityDescription, info: ResolveInfo) -> list[str]:
+        return parent.designators
+
+    @staticmethod
+    def resolve_book(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.book
+
+    @staticmethod
+    def resolve_chapter(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.chapter
+
+    @staticmethod
+    def resolve_page(parent: EntityDescription, info: ResolveInfo) -> str:
+        return parent.page
diff --git a/backend/core/types/FieldType.py b/backend/core/types/FieldType.py
new file mode 100644
index 00000000..b19957f4
--- /dev/null
+++ b/backend/core/types/FieldType.py
@@ -0,0 +1,28 @@
+from graphene import ObjectType, Int, ResolveInfo, String
+
+from core.models import Field
+
+
+class LettercraftFieldType(ObjectType):
+    """
+    Type for models that extend the Field model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    certainty = Int(required=True)
+    note = String()
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "certainty",
+            "note",
+        ]
+
+    @staticmethod
+    def resolve_certainty(parent: Field, info: ResolveInfo) -> int:
+        return parent.certainty
+
+    @staticmethod
+    def resolve_note(parent: Field, info: ResolveInfo) -> str:
+        return parent.note
diff --git a/backend/core/types/GQLSourceMention.py b/backend/core/types/GQLSourceMention.py
new file mode 100644
index 00000000..a0f85b8d
--- /dev/null
+++ b/backend/core/types/GQLSourceMention.py
@@ -0,0 +1,6 @@
+from graphene import Enum
+
+from core.models import SourceMention
+
+
+GQLSourceMention = Enum.from_enum(SourceMention)
diff --git a/backend/core/types/HistoricalEntityType.py b/backend/core/types/HistoricalEntityType.py
new file mode 100644
index 00000000..91df0b87
--- /dev/null
+++ b/backend/core/types/HistoricalEntityType.py
@@ -0,0 +1,20 @@
+from graphene import Boolean, ObjectType
+
+from core.types.NamedType import NamedType
+
+
+class HistoricalEntityType(NamedType, ObjectType):
+    """
+    Type for models that extend the HistoricalEntity model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    identifiable = Boolean(required=True)
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "id",
+            "created_at",
+            "updated_at",
+        ] + NamedType.fields()
diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
new file mode 100644
index 00000000..ab14f6e5
--- /dev/null
+++ b/backend/core/types/NamedType.py
@@ -0,0 +1,28 @@
+from graphene import ObjectType, ResolveInfo, String
+
+from core.models import Named
+
+
+class NamedType(ObjectType):
+    """
+    Type for models that extend the Named model.
+    Should not be queried directly, but should be extended by other types.
+    """
+
+    name = String(required=True)
+    description = String(required=False)
+
+    @staticmethod
+    def fields() -> list[str]:
+        return [
+            "name",
+            "description",
+        ]
+
+    @staticmethod
+    def resolve_name(parent: Named, info: ResolveInfo) -> str:
+        return parent.name
+
+    @staticmethod
+    def resolve_description(parent: Named, info: ResolveInfo) -> str:
+        return parent.description
diff --git a/backend/person/types/AgentDescriptionGenderType.py b/backend/person/types/AgentDescriptionGenderType.py
new file mode 100644
index 00000000..95074608
--- /dev/null
+++ b/backend/person/types/AgentDescriptionGenderType.py
@@ -0,0 +1,22 @@
+from graphene import Enum, ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from person.models import AgentDescriptionGender, Gender
+
+GQLGender = Enum.from_enum(Gender)
+
+
+class AgentDescriptionGenderType(DescriptionFieldType, DjangoObjectType):
+    gender = GQLGender(required=True)
+
+    class Meta:
+        model = AgentDescriptionGender
+        fields = [
+            "id",
+            "agent",
+            "gender",
+        ] + DescriptionFieldType.fields()
+
+    @staticmethod
+    def resolve_gender(parent: AgentDescriptionGender, info: ResolveInfo) -> str:
+        return parent.gender
diff --git a/backend/person/types/AgentDescriptionLocationType.py b/backend/person/types/AgentDescriptionLocationType.py
new file mode 100644
index 00000000..df6b0007
--- /dev/null
+++ b/backend/person/types/AgentDescriptionLocationType.py
@@ -0,0 +1,19 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from person.models import AgentDescriptionLocation
+
+
+class AgentDescriptionLocationType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = AgentDescriptionLocation
+        fields = [
+            "id",
+            "agent",
+            "location",
+        ] + DescriptionFieldType.fields()
+
+    @staticmethod
+    def resolve_location(parent: AgentDescriptionLocation, info: ResolveInfo) -> str:
+        # TODO: Write SpaceDescriptionType
+        return str(parent.location)
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
new file mode 100644
index 00000000..f9f49f4e
--- /dev/null
+++ b/backend/person/types/AgentDescriptionType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+
+from django.db.models import QuerySet
+from core.types.EntityDescriptionType import EntityDescriptionType
+from person.models import AgentDescription
+
+
+class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
+    class Meta:
+        model = AgentDescription
+        fields = [
+            "id",
+            "describes",
+            "is_group",
+        ] + EntityDescriptionType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[AgentDescription], info: ResolveInfo
+    ) -> QuerySet[AgentDescription]:
+        return queryset.all()
diff --git a/backend/person/types/HistoricalPersonType.py b/backend/person/types/HistoricalPersonType.py
new file mode 100644
index 00000000..cc66816b
--- /dev/null
+++ b/backend/person/types/HistoricalPersonType.py
@@ -0,0 +1,16 @@
+from graphene_django import DjangoObjectType
+from core.types.HistoricalEntityType import HistoricalEntityType
+from django.db.models import QuerySet
+from person.models import HistoricalPerson
+
+
+class HistoricalPersonType(HistoricalEntityType, DjangoObjectType):
+    class Meta:
+        model = HistoricalPerson
+        fields = ["id"] + HistoricalEntityType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[HistoricalPerson], info: QuerySet[HistoricalPerson]
+    ) -> QuerySet[HistoricalPerson]:
+        return queryset.all()
diff --git a/backend/person/types/PersonDateOfBirthType.py b/backend/person/types/PersonDateOfBirthType.py
new file mode 100644
index 00000000..745d5852
--- /dev/null
+++ b/backend/person/types/PersonDateOfBirthType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+from core.types.DateFieldType import LettercraftDateType
+from core.types.FieldType import LettercraftFieldType
+from person.models import PersonDateOfBirth
+
+
+class PersonDateOfBirthType(
+    LettercraftFieldType, LettercraftDateType, DjangoObjectType
+):
+    class Meta:
+        model = PersonDateOfBirth
+        fields = (
+            ["id", "person"]
+            + LettercraftFieldType.fields()
+            + LettercraftDateType.fields()
+        )
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[PersonDateOfBirth], info: ResolveInfo
+    ) -> QuerySet[PersonDateOfBirth]:
+        return queryset.all()
diff --git a/backend/person/types/PersonDateOfDeathType.py b/backend/person/types/PersonDateOfDeathType.py
new file mode 100644
index 00000000..351e26fe
--- /dev/null
+++ b/backend/person/types/PersonDateOfDeathType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+from core.types.DateFieldType import LettercraftDateType
+from core.types.FieldType import LettercraftFieldType
+from person.models import PersonDateOfDeath
+
+
+class PersonDateOfDeathType(
+    LettercraftFieldType, LettercraftDateType, DjangoObjectType
+):
+    class Meta:
+        model = PersonDateOfDeath
+        fields = (
+            ["id", "person"]
+            + LettercraftFieldType.fields()
+            + LettercraftDateType.fields()
+        )
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[PersonDateOfDeath], info: ResolveInfo
+    ) -> QuerySet[PersonDateOfDeath]:
+        return queryset.all()
diff --git a/backend/person/types/PersonReferenceType.py b/backend/person/types/PersonReferenceType.py
new file mode 100644
index 00000000..a575c644
--- /dev/null
+++ b/backend/person/types/PersonReferenceType.py
@@ -0,0 +1,13 @@
+from graphene_django import DjangoObjectType
+from core.types.FieldType import LettercraftFieldType
+from person.models import PersonReference
+
+
+class PersonReferenceType(LettercraftFieldType, DjangoObjectType):
+    class Meta:
+        model = PersonReference
+        fields = [
+            "id",
+            "person",
+            "description",
+        ] + LettercraftFieldType.fields()

From 882a8204d4369ea6bafaa2ffb0a23e5b72bf391b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:07:29 +0200
Subject: [PATCH 088/565] Outfactor SourceMention choices

---
 backend/core/models.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/core/models.py b/backend/core/models.py
index ad4835c8..639ef0f1 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -2,6 +2,7 @@
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.contrib.postgres.fields import ArrayField
 
+
 class Field(models.Model):
     """
     A piece of information about an entity.
@@ -108,6 +109,11 @@ class Meta:
         abstract = True
 
 
+class SourceMention(models.TextChoices):
+    DIRECT = "direct", "directly mentioned"
+    IMPLIED = "implied", "implied"
+
+
 class EntityDescription(Named, models.Model):
     """
     A description of an entity (person, object, location, event) in a narrative source.
@@ -116,7 +122,7 @@ class EntityDescription(Named, models.Model):
     """
 
     source = models.ForeignKey(
-        to='source.Source',
+        to="source.Source",
         on_delete=models.PROTECT,
         help_text="Source text containing this description",
     )
@@ -124,7 +130,7 @@ class EntityDescription(Named, models.Model):
     source_mention = models.CharField(
         max_length=32,
         blank=True,
-        choices=[("direct", "directly mentioned"), ("implied", "implied")],
+        choices=SourceMention.choices,
         help_text="How is this entity presented in the text?",
     )
 
@@ -141,19 +147,19 @@ class EntityDescription(Named, models.Model):
     book = models.CharField(
         max_length=255,
         blank=True,
-        help_text="The book in the source"
+        help_text="The book in the source",
     )
 
     chapter = models.CharField(
         max_length=255,
         blank=True,
-        help_text="The chapter or chapters in the source"
+        help_text="The chapter or chapters in the source",
     )
 
     page = models.CharField(
         max_length=255,
         blank=True,
-        help_text="The page number or page range in the source"
+        help_text="The page number or page range in the source",
     )
 
     class Meta:
@@ -174,7 +180,7 @@ class DescriptionField(Field, models.Model):
     source_mention = models.CharField(
         max_length=32,
         blank=True,
-        choices=[("direct", "directly mentioned"), ("implied", "implied")],
+        choices=SourceMention.choices,
         help_text="How is this information presented in the text?",
     )
 

From 4082cd878e097cd9128f378e6e1e2e36dbf50db9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:54:03 +0200
Subject: [PATCH 089/565] Add AgentDescription queries

---
 backend/graphql_app/schema.py |  3 ++-
 backend/person/queries.py     | 39 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 backend/person/queries.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index fa312ab0..ae40c32e 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -1,10 +1,11 @@
 from graphene import ObjectType, Schema
 
+from person.queries import PersonQueries
 from source.queries import SourceQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 
 
-class Query(SourceQueries, ObjectType):
+class Query(SourceQueries, PersonQueries, ObjectType):
     pass
 
 
diff --git a/backend/person/queries.py b/backend/person/queries.py
new file mode 100644
index 00000000..213b8b90
--- /dev/null
+++ b/backend/person/queries.py
@@ -0,0 +1,39 @@
+from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
+from django.db.models import QuerySet, Q
+from person.models import AgentDescription
+from person.types.AgentDescriptionType import AgentDescriptionType
+
+
+class PersonQueries(ObjectType):
+    agent_description = Field(AgentDescriptionType, id=ID(required=True))
+    agent_descriptions = List(
+        NonNull(AgentDescriptionType), required=True, episode_id=ID(), source_id=ID()
+    )
+
+    @staticmethod
+    def resolve_agent_description(
+        parent: None, info: ResolveInfo, id: str
+    ) -> AgentDescription | None:
+        try:
+            return AgentDescriptionType.get_queryset(
+                AgentDescription.objects, info
+            ).get(id=id)
+        except AgentDescription.DoesNotExist:
+            return None
+
+    @staticmethod
+    def resolve_agent_descriptions(
+        parent: None,
+        info: ResolveInfo,
+        episode_id: str | None = None,
+        source_id: str | None = None,
+    ) -> QuerySet[AgentDescription]:
+        filters = Q()
+        if episode_id:
+            filters &= Q(episode_id=episode_id)
+        if source_id:
+            filters &= Q(source_id=source_id)
+
+        return AgentDescriptionType.get_queryset(AgentDescription.objects, info).filter(
+            filters
+        )

From 5a5f8a66bd195852a87e2c865fed5ff86b1ed751 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 00:54:31 +0200
Subject: [PATCH 090/565] Fix EntityDescriptionType imports and fields

---
 backend/core/types/EntityDescriptionType.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index a6c81ddb..58dbe404 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,8 +1,9 @@
-from graphene import List, ObjectType, ResolveInfo, String
+from graphene import List, ObjectType, ResolveInfo, String, Field
 
-from core.models import EntityDescription, Field
+from core.models import EntityDescription
 from core.types.GQLSourceMention import GQLSourceMention
 from core.types.NamedType import NamedType
+from source.models import Source
 from source.types.SourceType import SourceType
 
 
@@ -22,8 +23,8 @@ class EntityDescriptionType(NamedType, ObjectType):
     @staticmethod
     def fields() -> list[str]:
         return [
-            "certainty",
-            "note",
+            "source",
+            "source_mention",
             "designators",
             "book",
             "chapter",
@@ -31,7 +32,7 @@ def fields() -> list[str]:
         ] + NamedType.fields()
 
     @staticmethod
-    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> SourceType:
+    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> Source:
         return parent.source
 
     @staticmethod

From 0e8d5e7f0e072a94ed07b496a74daa608133a5fa Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 12:18:36 +0200
Subject: [PATCH 091/565] Simplify abstract types

---
 backend/core/types/AbstractType.py          | 14 +++++++
 backend/core/types/EntityDescriptionType.py | 45 +++------------------
 backend/core/types/NamedType.py             | 25 +++---------
 3 files changed, 26 insertions(+), 58 deletions(-)
 create mode 100644 backend/core/types/AbstractType.py

diff --git a/backend/core/types/AbstractType.py b/backend/core/types/AbstractType.py
new file mode 100644
index 00000000..5149d573
--- /dev/null
+++ b/backend/core/types/AbstractType.py
@@ -0,0 +1,14 @@
+from graphene import ObjectType
+
+
+class AbstractType(ObjectType):
+    """
+    Simple type that allows that returns all fields of a type that inherits it.
+    """
+
+    @classmethod
+    def fields(cls) -> list[str]:
+        """
+        Returns all fields mentioned in the Meta class of the type inheriting AbstractType.
+        """
+        return list(cls._meta.fields.keys())
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index 58dbe404..567c1048 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,28 +1,19 @@
-from graphene import List, ObjectType, ResolveInfo, String, Field
+from graphene_django import DjangoObjectType
 
 from core.models import EntityDescription
-from core.types.GQLSourceMention import GQLSourceMention
+from core.types.AbstractType import AbstractType
 from core.types.NamedType import NamedType
-from source.models import Source
-from source.types.SourceType import SourceType
 
 
-class EntityDescriptionType(NamedType, ObjectType):
+class EntityDescriptionType(NamedType, AbstractType, DjangoObjectType):
     """
     Type for models that extend the EntityDescription model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    source = Field(SourceType, required=True)
-    source_mention = GQLSourceMention()
-    designators = List(String, required=True)
-    book = String()
-    chapter = String()
-    page = String()
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = EntityDescription
+        fields = [
             "source",
             "source_mention",
             "designators",
@@ -30,27 +21,3 @@ def fields() -> list[str]:
             "chapter",
             "page",
         ] + NamedType.fields()
-
-    @staticmethod
-    def resolve_source(parent: EntityDescription, info: ResolveInfo) -> Source:
-        return parent.source
-
-    @staticmethod
-    def resolve_source_mention(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.source_mention
-
-    @staticmethod
-    def resolve_designators(parent: EntityDescription, info: ResolveInfo) -> list[str]:
-        return parent.designators
-
-    @staticmethod
-    def resolve_book(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.book
-
-    @staticmethod
-    def resolve_chapter(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.chapter
-
-    @staticmethod
-    def resolve_page(parent: EntityDescription, info: ResolveInfo) -> str:
-        return parent.page
diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
index ab14f6e5..98dcaaba 100644
--- a/backend/core/types/NamedType.py
+++ b/backend/core/types/NamedType.py
@@ -1,28 +1,15 @@
-from graphene import ObjectType, ResolveInfo, String
+from graphene_django import DjangoObjectType
 
 from core.models import Named
+from core.types.AbstractType import AbstractType
 
 
-class NamedType(ObjectType):
+class NamedType(AbstractType, DjangoObjectType):
     """
     Type for models that extend the Named model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    name = String(required=True)
-    description = String(required=False)
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
-            "name",
-            "description",
-        ]
-
-    @staticmethod
-    def resolve_name(parent: Named, info: ResolveInfo) -> str:
-        return parent.name
-
-    @staticmethod
-    def resolve_description(parent: Named, info: ResolveInfo) -> str:
-        return parent.description
+    class Meta:
+        model = Named
+        fields = ["name", "description"]

From 1351f5d11144e45931d8fd51f47fde334e6f5844 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 12:26:34 +0200
Subject: [PATCH 092/565] AbstractDjangoObjectType

---
 backend/core/types/AbstractDjangoObjectType.py | 17 +++++++++++++++++
 backend/core/types/AbstractType.py             | 14 --------------
 backend/core/types/EntityDescriptionType.py    |  6 ++----
 backend/core/types/HistoricalEntityType.py     | 16 +++++++---------
 backend/core/types/NamedType.py                |  6 ++----
 5 files changed, 28 insertions(+), 31 deletions(-)
 create mode 100644 backend/core/types/AbstractDjangoObjectType.py
 delete mode 100644 backend/core/types/AbstractType.py

diff --git a/backend/core/types/AbstractDjangoObjectType.py b/backend/core/types/AbstractDjangoObjectType.py
new file mode 100644
index 00000000..8e780eac
--- /dev/null
+++ b/backend/core/types/AbstractDjangoObjectType.py
@@ -0,0 +1,17 @@
+from graphene_django import DjangoObjectType
+
+
+class AbstractDjangoObjectType(DjangoObjectType):
+    """
+    Extends DjangoObjectType to include a fields method that returns all fields mentioned in the Meta class.
+    """
+
+    class Meta:
+        abstract = True
+
+    @classmethod
+    def fields(cls) -> list[str]:
+        """
+        Returns all fields mentioned in the Meta class of the inheriting class.
+        """
+        return list(cls._meta.fields.keys())
diff --git a/backend/core/types/AbstractType.py b/backend/core/types/AbstractType.py
deleted file mode 100644
index 5149d573..00000000
--- a/backend/core/types/AbstractType.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from graphene import ObjectType
-
-
-class AbstractType(ObjectType):
-    """
-    Simple type that allows that returns all fields of a type that inherits it.
-    """
-
-    @classmethod
-    def fields(cls) -> list[str]:
-        """
-        Returns all fields mentioned in the Meta class of the type inheriting AbstractType.
-        """
-        return list(cls._meta.fields.keys())
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index 567c1048..296bc5fd 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,11 +1,9 @@
-from graphene_django import DjangoObjectType
-
 from core.models import EntityDescription
-from core.types.AbstractType import AbstractType
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
 
 
-class EntityDescriptionType(NamedType, AbstractType, DjangoObjectType):
+class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
     """
     Type for models that extend the EntityDescription model.
     Should not be queried directly, but should be extended by other types.
diff --git a/backend/core/types/HistoricalEntityType.py b/backend/core/types/HistoricalEntityType.py
index 91df0b87..8e14a7fe 100644
--- a/backend/core/types/HistoricalEntityType.py
+++ b/backend/core/types/HistoricalEntityType.py
@@ -1,20 +1,18 @@
 from graphene import Boolean, ObjectType
 
+from core.models import HistoricalEntity
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
 
 
-class HistoricalEntityType(NamedType, ObjectType):
+class HistoricalEntityType(NamedType, AbstractDjangoObjectType):
     """
     Type for models that extend the HistoricalEntity model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    identifiable = Boolean(required=True)
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
-            "id",
-            "created_at",
-            "updated_at",
+    class Meta:
+        model = HistoricalEntity
+        fields = [
+            "identifiable",
         ] + NamedType.fields()
diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
index 98dcaaba..3588f9dc 100644
--- a/backend/core/types/NamedType.py
+++ b/backend/core/types/NamedType.py
@@ -1,10 +1,8 @@
-from graphene_django import DjangoObjectType
-
 from core.models import Named
-from core.types.AbstractType import AbstractType
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
 
-class NamedType(AbstractType, DjangoObjectType):
+class NamedType(AbstractDjangoObjectType):
     """
     Type for models that extend the Named model.
     Should not be queried directly, but should be extended by other types.

From b6294d63d5c7549a362f24097ba9dcfe0fdc25b7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 16:40:05 +0200
Subject: [PATCH 093/565] Simplify more types

---
 backend/core/types/DateFieldType.py           | 16 ++++--------
 backend/core/types/DescriptionFieldType.py    | 17 ++++---------
 .../types/AgentDescriptionGenderType.py       | 11 +-------
 backend/person/types/AgentDescriptionType.py  | 25 +++++++++++++++++--
 backend/person/types/HistoricalPersonType.py  | 14 +++++++++--
 5 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/backend/core/types/DateFieldType.py b/backend/core/types/DateFieldType.py
index aa8ba00d..3afa4010 100644
--- a/backend/core/types/DateFieldType.py
+++ b/backend/core/types/DateFieldType.py
@@ -1,25 +1,19 @@
-from graphene import ObjectType, ResolveInfo, String
 
 from core.models import LettercraftDate
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
 
-class LettercraftDateType(ObjectType):
+class LettercraftDateType(AbstractDjangoObjectType):
     """
     Type for models that extend the LettercraftDate model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    display_date = String(required=True)
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = LettercraftDate
+        fields = [
             "year_lower",
             "year_upper",
             "year_exact",
             "display_date",
         ]
-
-    @staticmethod
-    def resolve_display_date(parent: LettercraftDate, info: ResolveInfo) -> str:
-        return parent.display_date
diff --git a/backend/core/types/DescriptionFieldType.py b/backend/core/types/DescriptionFieldType.py
index d22e98d5..c2b9a6ff 100644
--- a/backend/core/types/DescriptionFieldType.py
+++ b/backend/core/types/DescriptionFieldType.py
@@ -1,23 +1,16 @@
-from graphene import ObjectType, ResolveInfo
 from core.models import DescriptionField
-from core.types.EntityDescriptionType import GQLSourceMention
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.FieldType import LettercraftFieldType
 
 
-class DescriptionFieldType(LettercraftFieldType, ObjectType):
+class DescriptionFieldType(LettercraftFieldType, AbstractDjangoObjectType):
     """
     Type for models that extend the DescriptionField model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    source_mention = GQLSourceMention()
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = DescriptionField
+        fields = [
             "source_mention",
         ] + LettercraftFieldType.fields()
-
-    @staticmethod
-    def resolve_source_mention(parent: DescriptionField, info: ResolveInfo) -> str:
-        return parent.source_mention
diff --git a/backend/person/types/AgentDescriptionGenderType.py b/backend/person/types/AgentDescriptionGenderType.py
index 95074608..64ef0743 100644
--- a/backend/person/types/AgentDescriptionGenderType.py
+++ b/backend/person/types/AgentDescriptionGenderType.py
@@ -1,14 +1,9 @@
-from graphene import Enum, ResolveInfo
 from graphene_django import DjangoObjectType
 from core.types.DescriptionFieldType import DescriptionFieldType
-from person.models import AgentDescriptionGender, Gender
-
-GQLGender = Enum.from_enum(Gender)
+from person.models import AgentDescriptionGender
 
 
 class AgentDescriptionGenderType(DescriptionFieldType, DjangoObjectType):
-    gender = GQLGender(required=True)
-
     class Meta:
         model = AgentDescriptionGender
         fields = [
@@ -16,7 +11,3 @@ class Meta:
             "agent",
             "gender",
         ] + DescriptionFieldType.fields()
-
-    @staticmethod
-    def resolve_gender(parent: AgentDescriptionGender, info: ResolveInfo) -> str:
-        return parent.gender
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index f9f49f4e..3922edf8 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -1,18 +1,27 @@
-from graphene import ResolveInfo
+from graphene import Field, List, ResolveInfo
 from graphene_django import DjangoObjectType
 
 from django.db.models import QuerySet
 from core.types.EntityDescriptionType import EntityDescriptionType
-from person.models import AgentDescription
+from person.models import AgentDescription, HistoricalPerson, PersonReference
+from person.types.AgentDescriptionGenderType import AgentDescriptionGenderType
+from person.types.HistoricalPersonType import HistoricalPersonType
+from person.types.PersonReferenceType import PersonReferenceType
 
 
 class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
+    describes = List(HistoricalPersonType)
+    person_references = List(PersonReferenceType)
+    gender = Field(AgentDescriptionGenderType)
+
     class Meta:
         model = AgentDescription
         fields = [
             "id",
             "describes",
             "is_group",
+            "person_references",
+            "gender",
         ] + EntityDescriptionType.fields()
 
     @classmethod
@@ -20,3 +29,15 @@ def get_queryset(
         cls, queryset: QuerySet[AgentDescription], info: ResolveInfo
     ) -> QuerySet[AgentDescription]:
         return queryset.all()
+
+    @staticmethod
+    def resolve_describes(
+        parent: AgentDescription, info: ResolveInfo
+    ) -> QuerySet[HistoricalPerson]:
+        return parent.describes.all()
+
+    @staticmethod
+    def resolve_person_references(
+        agent_description: AgentDescription, info: ResolveInfo
+    ) -> QuerySet[PersonReference]:
+        return agent_description.person_references.all()  # type: ignore
diff --git a/backend/person/types/HistoricalPersonType.py b/backend/person/types/HistoricalPersonType.py
index cc66816b..2000193c 100644
--- a/backend/person/types/HistoricalPersonType.py
+++ b/backend/person/types/HistoricalPersonType.py
@@ -1,16 +1,26 @@
+from graphene import Field, ResolveInfo
 from graphene_django import DjangoObjectType
 from core.types.HistoricalEntityType import HistoricalEntityType
 from django.db.models import QuerySet
 from person.models import HistoricalPerson
+from person.types.PersonDateOfBirthType import PersonDateOfBirthType
+from person.types.PersonDateOfDeathType import PersonDateOfDeathType
 
 
 class HistoricalPersonType(HistoricalEntityType, DjangoObjectType):
+    date_of_birth = Field(PersonDateOfBirthType)
+    date_of_death = Field(PersonDateOfDeathType)
+
     class Meta:
         model = HistoricalPerson
-        fields = ["id"] + HistoricalEntityType.fields()
+        fields = [
+            "id",
+            "date_of_birth",
+            "date_of_death",
+        ] + HistoricalEntityType.fields()
 
     @classmethod
     def get_queryset(
-        cls, queryset: QuerySet[HistoricalPerson], info: QuerySet[HistoricalPerson]
+        cls, queryset: QuerySet[HistoricalPerson], info: ResolveInfo
     ) -> QuerySet[HistoricalPerson]:
         return queryset.all()

From 9cb847ba865ecfe9290791e181da51e4b1ee8b2b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 16:40:24 +0200
Subject: [PATCH 094/565] Add related_names on PersonReference

---
 ...er_personreference_description_and_more.py | 32 +++++++++++++++++++
 backend/person/models.py                      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 backend/person/migrations/0018_alter_personreference_description_and_more.py

diff --git a/backend/person/migrations/0018_alter_personreference_description_and_more.py b/backend/person/migrations/0018_alter_personreference_description_and_more.py
new file mode 100644
index 00000000..e991c30a
--- /dev/null
+++ b/backend/person/migrations/0018_alter_personreference_description_and_more.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.7 on 2024-06-22 14:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("person", "0017_delete_agentdescriptionsocialstatus_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="personreference",
+            name="description",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="person_references",
+                to="person.agentdescription",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="personreference",
+            name="person",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="person_references",
+                to="person.historicalperson",
+            ),
+        ),
+    ]
diff --git a/backend/person/models.py b/backend/person/models.py
index 60d34386..00dff057 100644
--- a/backend/person/models.py
+++ b/backend/person/models.py
@@ -57,10 +57,12 @@ class PersonReference(Field, models.Model):
     person = models.ForeignKey(
         to=HistoricalPerson,
         on_delete=models.CASCADE,
+        related_name="person_references",
     )
     description = models.ForeignKey(
         to="AgentDescription",
         on_delete=models.CASCADE,
+        related_name="person_references",
     )
 
 

From f400cddd9916284e30ccfa94924ce51c80debeeb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 16:46:58 +0200
Subject: [PATCH 095/565] Add display_date property field resolver; remove
 unused GQLSourceMention enum

---
 backend/core/models.py                 | 2 +-
 backend/core/types/DateFieldType.py    | 6 ++++++
 backend/core/types/GQLSourceMention.py | 6 ------
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 backend/core/types/GQLSourceMention.py

diff --git a/backend/core/models.py b/backend/core/models.py
index 639ef0f1..70082692 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -61,7 +61,7 @@ class LettercraftDate(models.Model):
     )
 
     @property
-    def display_date(self):
+    def display_date(self) -> str:
         if self.year_exact:
             return str(self.year_exact)
         return f"c. {self.year_lower}–{self.year_upper}"
diff --git a/backend/core/types/DateFieldType.py b/backend/core/types/DateFieldType.py
index 3afa4010..b239da72 100644
--- a/backend/core/types/DateFieldType.py
+++ b/backend/core/types/DateFieldType.py
@@ -1,4 +1,5 @@
 
+from graphene import ResolveInfo, String
 from core.models import LettercraftDate
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
@@ -8,6 +9,7 @@ class LettercraftDateType(AbstractDjangoObjectType):
     Type for models that extend the LettercraftDate model.
     Should not be queried directly, but should be extended by other types.
     """
+    display_date = String(required=True)
 
     class Meta:
         model = LettercraftDate
@@ -17,3 +19,7 @@ class Meta:
             "year_exact",
             "display_date",
         ]
+
+    @staticmethod
+    def resolve_display_date(parent: LettercraftDate, info: ResolveInfo) -> str:
+        return parent.display_date
diff --git a/backend/core/types/GQLSourceMention.py b/backend/core/types/GQLSourceMention.py
deleted file mode 100644
index a0f85b8d..00000000
--- a/backend/core/types/GQLSourceMention.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from graphene import Enum
-
-from core.models import SourceMention
-
-
-GQLSourceMention = Enum.from_enum(SourceMention)

From 24bacf4006d53d9d463c5774c6edbb06a994ecff Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 22 Jun 2024 17:11:14 +0200
Subject: [PATCH 096/565] Update LettercraftFieldType

---
 backend/core/types/FieldType.py | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/backend/core/types/FieldType.py b/backend/core/types/FieldType.py
index b19957f4..ff1596ef 100644
--- a/backend/core/types/FieldType.py
+++ b/backend/core/types/FieldType.py
@@ -1,28 +1,16 @@
-from graphene import ObjectType, Int, ResolveInfo, String
-
 from core.models import Field
+from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
 
-class LettercraftFieldType(ObjectType):
+class LettercraftFieldType(AbstractDjangoObjectType):
     """
     Type for models that extend the Field model.
     Should not be queried directly, but should be extended by other types.
     """
 
-    certainty = Int(required=True)
-    note = String()
-
-    @staticmethod
-    def fields() -> list[str]:
-        return [
+    class Meta:
+        model = Field
+        fields = [
             "certainty",
             "note",
         ]
-
-    @staticmethod
-    def resolve_certainty(parent: Field, info: ResolveInfo) -> int:
-        return parent.certainty
-
-    @staticmethod
-    def resolve_note(parent: Field, info: ResolveInfo) -> str:
-        return parent.note

From b0521d9b26f3af179cf4baedbd9bbf352f4fd2c4 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 27 Jun 2024 09:51:22 +0200
Subject: [PATCH 097/565] Rename Episode to Series

---
 backend/case_study/admin.py                   |  4 ++--
 .../0004_alter_casestudy_episodes.py          | 23 +++++++++++++++++++
 .../0005_rename_episodes_casestudy_series.py  | 18 +++++++++++++++
 backend/case_study/models.py                  | 11 +++++----
 .../management/commands/create_dev_dataset.py |  8 +++----
 backend/event/admin.py                        |  6 ++---
 .../migrations/0018_rename_episode_series.py  | 18 +++++++++++++++
 .../0019_rename_events_series_episodes.py     | 18 +++++++++++++++
 backend/event/models.py                       |  6 ++---
 9 files changed, 95 insertions(+), 17 deletions(-)
 create mode 100644 backend/case_study/migrations/0004_alter_casestudy_episodes.py
 create mode 100644 backend/case_study/migrations/0005_rename_episodes_casestudy_series.py
 create mode 100644 backend/event/migrations/0018_rename_episode_series.py
 create mode 100644 backend/event/migrations/0019_rename_events_series_episodes.py

diff --git a/backend/case_study/admin.py b/backend/case_study/admin.py
index 869136f5..cf5b6a78 100644
--- a/backend/case_study/admin.py
+++ b/backend/case_study/admin.py
@@ -5,5 +5,5 @@
 @admin.register(models.CaseStudy)
 class CaseStudyAdmin(admin.ModelAdmin):
     list_display = ["name", "description"]
-    fields = ["name", "description", "episodes", "key_persons", "key_sites"]
-    filter_horizontal = ["episodes", "key_persons", "key_sites"]
+    fields = ["name", "description", "series", "key_persons", "key_sites"]
+    filter_horizontal = ["series", "key_persons", "key_sites"]
diff --git a/backend/case_study/migrations/0004_alter_casestudy_episodes.py b/backend/case_study/migrations/0004_alter_casestudy_episodes.py
new file mode 100644
index 00000000..fecdb15f
--- /dev/null
+++ b/backend/case_study/migrations/0004_alter_casestudy_episodes.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-06-27 07:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("event", "0017_remove_eventdescriptionagent_source_terminology_and_more"),
+        ("case_study", "0003_casestudy_key_persons_casestudy_key_sites"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="casestudy",
+            name="episodes",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Series involved in this case study",
+                to="event.episode",
+            ),
+        ),
+    ]
diff --git a/backend/case_study/migrations/0005_rename_episodes_casestudy_series.py b/backend/case_study/migrations/0005_rename_episodes_casestudy_series.py
new file mode 100644
index 00000000..40f80442
--- /dev/null
+++ b/backend/case_study/migrations/0005_rename_episodes_casestudy_series.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-06-27 07:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("case_study", "0004_alter_casestudy_episodes"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="casestudy",
+            old_name="episodes",
+            new_name="series",
+        ),
+    ]
diff --git a/backend/case_study/models.py b/backend/case_study/models.py
index d6ac10c0..70756bd2 100644
--- a/backend/case_study/models.py
+++ b/backend/case_study/models.py
@@ -1,22 +1,23 @@
 from django.db import models
 from core.models import Named
-from event.models import Episode
+from event.models import Series
 from person.models import HistoricalPerson
 from space.models import Structure
 
+
 class CaseStudy(Named, models.Model):
     """
-    A case study is an overarching collection of epistolary events, bound together by a common theme, e.g. `The Saga of St. Boniface` or `The  Nun Rebellion of Poitiers`.
+    A case study is an overarching collection of series, bound together by a common theme, e.g. `The Saga of St. Boniface` or `The Nun Rebellion of Poitiers`.
     """
 
     class Meta:
         verbose_name = "case study"
         verbose_name_plural = "case studies"
 
-    episodes = models.ManyToManyField(
-        to=Episode,
+    series = models.ManyToManyField(
+        to=Series,
         blank=True,
-        help_text="Episodes involved in this case study",
+        help_text="Series involved in this case study",
     )
 
     key_persons = models.ManyToManyField(
diff --git a/backend/core/management/commands/create_dev_dataset.py b/backend/core/management/commands/create_dev_dataset.py
index b0dec337..aca2badd 100644
--- a/backend/core/management/commands/create_dev_dataset.py
+++ b/backend/core/management/commands/create_dev_dataset.py
@@ -5,7 +5,7 @@
 from source.models import Source
 
 from case_study.models import CaseStudy
-from event.models import EventDescription, Episode
+from event.models import EventDescription, Series
 from person.models import (
     HistoricalPerson,
     AgentDescription,
@@ -122,9 +122,9 @@ def handle(self, *args, **options):
 
     @track_progress
     def _create_episodes(self, fake: Faker, options, total, model):
-        unique_name = get_unique_name(epistolary_event_names, Episode)
+        unique_name = get_unique_name(epistolary_event_names, Series)
         events = get_random_model_objects(EventDescription, min_amount=1, max_amount=5)
-        Episode.objects.create(
+        Series.objects.create(
             name=unique_name,
             description=fake.text(),
             events=events,
@@ -133,7 +133,7 @@ def _create_episodes(self, fake: Faker, options, total, model):
     @track_progress
     def _create_case_studies(self, fake: Faker, options, total, model):
         unique_name = get_unique_name(case_study_names, CaseStudy)
-        episodes = get_random_model_objects(Episode, min_amount=1, max_amount=5)
+        episodes = get_random_model_objects(Series, min_amount=1, max_amount=5)
         CaseStudy.objects.create(
             name=unique_name,
             episodes=episodes,
diff --git a/backend/event/admin.py b/backend/event/admin.py
index 35a84324..e190f32b 100644
--- a/backend/event/admin.py
+++ b/backend/event/admin.py
@@ -59,6 +59,6 @@ class EventDescriptionAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin)
     ]
 
 
-@admin.register(models.Episode)
-class EpisodeAdmin(admin.ModelAdmin):
-    filter_horizontal = ["events"]
+@admin.register(models.Series)
+class SeriesAdmin(admin.ModelAdmin):
+    filter_horizontal = ["episodes"]
diff --git a/backend/event/migrations/0018_rename_episode_series.py b/backend/event/migrations/0018_rename_episode_series.py
new file mode 100644
index 00000000..502ebf02
--- /dev/null
+++ b/backend/event/migrations/0018_rename_episode_series.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-06-27 07:46
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("case_study", "0004_alter_casestudy_episodes"),
+        ("event", "0017_remove_eventdescriptionagent_source_terminology_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="Episode",
+            new_name="Series",
+        ),
+    ]
diff --git a/backend/event/migrations/0019_rename_events_series_episodes.py b/backend/event/migrations/0019_rename_events_series_episodes.py
new file mode 100644
index 00000000..62267d5d
--- /dev/null
+++ b/backend/event/migrations/0019_rename_events_series_episodes.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-06-27 07:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("event", "0018_rename_episode_series"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="series",
+            old_name="events",
+            new_name="episodes",
+        ),
+    ]
diff --git a/backend/event/models.py b/backend/event/models.py
index c28b2449..bb67788d 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -140,12 +140,12 @@ def __str__(self):
         return f"{self.space.name} / {self.event}"
 
 
-class Episode(Named, models.Model):
+class Series(Named, models.Model):
     """
-    A higher abstraction of events into connected "episodes"
+    A set of connected "episodes".
     """
 
-    events = models.ManyToManyField(
+    episodes = models.ManyToManyField(
         to=EventDescription,
         blank=True,
         help_text="Events that make up this episode",

From 479417a47036ce6979188f3ec7c439fd214ec0c4 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 27 Jun 2024 10:30:11 +0200
Subject: [PATCH 098/565] Rename EventDescription to Episode

---
 backend/conftest.py                           |  6 +++---
 .../management/commands/create_dev_dataset.py | 14 ++++++-------
 backend/core/models.py                        |  2 +-
 backend/event/admin.py                        |  4 ++--
 .../0020_rename_eventdescription_episode.py   | 21 +++++++++++++++++++
 backend/event/models.py                       | 14 ++++++-------
 backend/event/tests/test_event_models.py      |  4 ++--
 7 files changed, 42 insertions(+), 23 deletions(-)
 create mode 100644 backend/event/migrations/0020_rename_eventdescription_episode.py

diff --git a/backend/conftest.py b/backend/conftest.py
index 7b02ed36..7c81d1ee 100644
--- a/backend/conftest.py
+++ b/backend/conftest.py
@@ -6,7 +6,7 @@
 
 from person.models import HistoricalPerson, AgentDescription
 from source.models import Source
-from event.models import EventDescription
+from event.models import Episode
 from user.models import User
 
 
@@ -105,8 +105,8 @@ def agent_group_description(db, source, historical_person, historical_person_2):
 
 
 @pytest.fixture()
-def event_description(db, source, agent_description, agent_description_2):
-    event = EventDescription.objects.create(
+def episode(db, source, agent_description, agent_description_2):
+    event = Episode.objects.create(
         name="Bert writes a letter",
         source=source,
     )
diff --git a/backend/core/management/commands/create_dev_dataset.py b/backend/core/management/commands/create_dev_dataset.py
index aca2badd..22793a28 100644
--- a/backend/core/management/commands/create_dev_dataset.py
+++ b/backend/core/management/commands/create_dev_dataset.py
@@ -5,7 +5,7 @@
 from source.models import Source
 
 from case_study.models import CaseStudy
-from event.models import EventDescription, Series
+from event.models import Episode, Series
 from person.models import (
     HistoricalPerson,
     AgentDescription,
@@ -111,10 +111,8 @@ def handle(self, *args, **options):
             self._create_gift_descriptions(
                 fake, options, total=50, model=GiftDescription
             )
-            self._create_event_descriptions(
-                fake, options, total=50, model=EventDescription
-            )
-            self._create_episodes(fake, options, total=20, model=EventDescription)
+            self._create_event_descriptions(fake, options, total=50, model=Episode)
+            self._create_episodes(fake, options, total=20, model=Episode)
             self._create_case_studies(fake, options, total=10, model=CaseStudy)
 
             print("-" * 80)
@@ -123,7 +121,7 @@ def handle(self, *args, **options):
     @track_progress
     def _create_episodes(self, fake: Faker, options, total, model):
         unique_name = get_unique_name(epistolary_event_names, Series)
-        events = get_random_model_objects(EventDescription, min_amount=1, max_amount=5)
+        events = get_random_model_objects(Episode, min_amount=1, max_amount=5)
         Series.objects.create(
             name=unique_name,
             description=fake.text(),
@@ -141,10 +139,10 @@ def _create_case_studies(self, fake: Faker, options, total, model):
 
     @track_progress
     def _create_event_descriptions(self, fake: Faker, options, total, model):
-        unique_name = get_unique_name(epistolary_event_names, EventDescription)
+        unique_name = get_unique_name(epistolary_event_names, Episode)
         source = get_random_model_object(Source)
 
-        event = EventDescription.objects.create(
+        event = Episode.objects.create(
             source=source, name=unique_name, description=fake.text()
         )
 
diff --git a/backend/core/models.py b/backend/core/models.py
index 70082692..d46e242f 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -116,7 +116,7 @@ class SourceMention(models.TextChoices):
 
 class EntityDescription(Named, models.Model):
     """
-    A description of an entity (person, object, location, event) in a narrative source.
+    A description of an entity (person, object, location, episode) in a narrative source.
 
     Descriptions may refer to HistoricalEntity targets.
     """
diff --git a/backend/event/admin.py b/backend/event/admin.py
index e190f32b..b24e288a 100644
--- a/backend/event/admin.py
+++ b/backend/event/admin.py
@@ -37,8 +37,8 @@ class EventDescriptionSpaceAdmin(admin.StackedInline):
     verbose_name = "involved space"
 
 
-@admin.register(models.EventDescription)
-class EventDescriptionAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
+@admin.register(models.Episode)
+class EpisodeAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
     filter_horizontal = ["categories"]
     list_filter = ["source", "categories"]
     fieldsets = [
diff --git a/backend/event/migrations/0020_rename_eventdescription_episode.py b/backend/event/migrations/0020_rename_eventdescription_episode.py
new file mode 100644
index 00000000..65d0b1c0
--- /dev/null
+++ b/backend/event/migrations/0020_rename_eventdescription_episode.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.7 on 2024-06-27 08:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("letter", "0015_remove_giftdescriptionsender_agent_and_more"),
+        ("source", "0006_source_edition_author_source_edition_title_and_more"),
+        ("space", "0016_settlement_regions"),
+        ("person", "0018_alter_personreference_description_and_more"),
+        ("event", "0019_rename_events_series_episodes"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="EventDescription",
+            new_name="Episode",
+        ),
+    ]
diff --git a/backend/event/models.py b/backend/event/models.py
index bb67788d..a1ed9e7f 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -12,9 +12,9 @@ class Meta:
         verbose_name_plural = "event categories"
 
 
-class EventDescription(EntityDescription, models.Model):
+class Episode(EntityDescription, models.Model):
     """
-    An epistolary event described in as source text
+    An episode described in a source text
     """
 
     summary = models.TextField(
@@ -58,7 +58,7 @@ class EventDescriptionAgent(DescriptionField, models.Model):
     """
 
     event = models.ForeignKey(
-        to=EventDescription,
+        to=Episode,
         on_delete=models.CASCADE,
     )
     agent = models.ForeignKey(
@@ -80,7 +80,7 @@ class EventDescriptionGift(DescriptionField, models.Model):
     """
 
     event = models.ForeignKey(
-        to=EventDescription,
+        to=Episode,
         on_delete=models.CASCADE,
     )
     gift = models.ForeignKey(
@@ -102,7 +102,7 @@ class EventDescriptionLetter(DescriptionField, models.Model):
     """
 
     event = models.ForeignKey(
-        to=EventDescription,
+        to=Episode,
         on_delete=models.CASCADE,
     )
     letter = models.ForeignKey(
@@ -124,7 +124,7 @@ class EventDescriptionSpace(DescriptionField, models.Model):
     """
 
     event = models.ForeignKey(
-        to=EventDescription,
+        to=Episode,
         on_delete=models.CASCADE,
     )
     space = models.ForeignKey(
@@ -146,7 +146,7 @@ class Series(Named, models.Model):
     """
 
     episodes = models.ManyToManyField(
-        to=EventDescription,
+        to=Episode,
         blank=True,
         help_text="Events that make up this episode",
     )
diff --git a/backend/event/tests/test_event_models.py b/backend/event/tests/test_event_models.py
index a5c1b85b..9987ce31 100644
--- a/backend/event/tests/test_event_models.py
+++ b/backend/event/tests/test_event_models.py
@@ -1,2 +1,2 @@
-def test_event_models(event_description, agent_description):
-    assert agent_description in event_description.agents.all()
+def test_event_models(episode, agent_description):
+    assert agent_description in episode.agents.all()

From 9bd4336c2d4c2cd15688f0bb06055188a2e06ac7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 27 Jun 2024 10:44:41 +0200
Subject: [PATCH 099/565] Rename related models

---
 backend/event/admin.py                        |  28 ++--
 ...tdescriptionagent_episodeagent_and_more.py | 122 ++++++++++++++++++
 backend/event/models.py                       |  71 +++++-----
 3 files changed, 173 insertions(+), 48 deletions(-)
 create mode 100644 backend/event/migrations/0021_rename_eventdescriptionagent_episodeagent_and_more.py

diff --git a/backend/event/admin.py b/backend/event/admin.py
index b24e288a..44c80fa1 100644
--- a/backend/event/admin.py
+++ b/backend/event/admin.py
@@ -3,35 +3,35 @@
 from core import admin as core_admin
 
 
-@admin.register(models.EventCategory)
-class EventCategoryAdmin(admin.ModelAdmin):
+@admin.register(models.EpisodeCategory)
+class EpisodeCategoryAdmin(admin.ModelAdmin):
     list_display = ["name", "description"]
     search_fields = ["name", "description"]
 
 
-class EventDescriptionAgentAdmin(admin.StackedInline):
-    model = models.EventDescriptionAgent
+class EpisodeAgentAdmin(admin.StackedInline):
+    model = models.EpisodeAgent
     fields = ["agent"] + core_admin.description_field_fields
     extra = 0
     verbose_name = "involved agent"
 
 
-class EventDescriptionGiftAdmin(admin.StackedInline):
-    model = models.EventDescriptionGift
+class EpisodeGiftAdmin(admin.StackedInline):
+    model = models.EpisodeGift
     fields = ["gift"] + core_admin.description_field_fields
     extra = 0
     verbose_name = "involved gift"
 
 
-class EventDescriptionLetterAdmin(admin.StackedInline):
-    model = models.EventDescriptionLetter
+class EpisodeLetterAdmin(admin.StackedInline):
+    model = models.EpisodeLetter
     fields = ["letter"] + core_admin.description_field_fields
     extra = 0
     verbose_name = "involved letter"
 
 
-class EventDescriptionSpaceAdmin(admin.StackedInline):
-    model = models.EventDescriptionSpace
+class EpisodeSpaceAdmin(admin.StackedInline):
+    model = models.EpisodeSpace
     fields = ["space"] + core_admin.description_field_fields
     extra = 0
     verbose_name = "involved space"
@@ -52,10 +52,10 @@ class EpisodeAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
         ),
     ]
     inlines = [
-        EventDescriptionAgentAdmin,
-        EventDescriptionGiftAdmin,
-        EventDescriptionLetterAdmin,
-        EventDescriptionSpaceAdmin,
+        EpisodeAgentAdmin,
+        EpisodeGiftAdmin,
+        EpisodeLetterAdmin,
+        EpisodeSpaceAdmin,
     ]
 
 
diff --git a/backend/event/migrations/0021_rename_eventdescriptionagent_episodeagent_and_more.py b/backend/event/migrations/0021_rename_eventdescriptionagent_episodeagent_and_more.py
new file mode 100644
index 00000000..c9991101
--- /dev/null
+++ b/backend/event/migrations/0021_rename_eventdescriptionagent_episodeagent_and_more.py
@@ -0,0 +1,122 @@
+# Generated by Django 4.2.7 on 2024-06-27 08:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("letter", "0015_remove_giftdescriptionsender_agent_and_more"),
+        ("space", "0016_settlement_regions"),
+        ("person", "0018_alter_personreference_description_and_more"),
+        ("event", "0020_rename_eventdescription_episode"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="EventDescriptionAgent",
+            new_name="EpisodeAgent",
+        ),
+        migrations.RenameModel(
+            old_name="EventCategory",
+            new_name="EpisodeCategory",
+        ),
+        migrations.RenameModel(
+            old_name="EventDescriptionGift",
+            new_name="EpisodeGift",
+        ),
+        migrations.RenameModel(
+            old_name="EventDescriptionLetter",
+            new_name="EpisodeLetter",
+        ),
+        migrations.RenameModel(
+            old_name="EventDescriptionSpace",
+            new_name="EpisodeSpace",
+        ),
+        migrations.AlterModelOptions(
+            name="episodecategory",
+            options={"verbose_name_plural": "episode categories"},
+        ),
+        migrations.AlterModelOptions(
+            name="series",
+            options={"verbose_name_plural": "series"},
+        ),
+        migrations.RenameField(
+            model_name="episodeagent",
+            old_name="event",
+            new_name="episode",
+        ),
+        migrations.RenameField(
+            model_name="episodegift",
+            old_name="event",
+            new_name="episode",
+        ),
+        migrations.RenameField(
+            model_name="episodeletter",
+            old_name="event",
+            new_name="episode",
+        ),
+        migrations.RenameField(
+            model_name="episodespace",
+            old_name="event",
+            new_name="episode",
+        ),
+        migrations.AlterField(
+            model_name="episode",
+            name="agents",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="agents involved in this episode",
+                through="event.EpisodeAgent",
+                to="person.agentdescription",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="episode",
+            name="categories",
+            field=models.ManyToManyField(
+                help_text="labels assigned to this episode",
+                related_name="episodes",
+                to="event.episodecategory",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="episode",
+            name="gifts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="gifts involved in this episode",
+                through="event.EpisodeGift",
+                to="letter.giftdescription",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="episode",
+            name="letters",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="letters involved in this episode",
+                through="event.EpisodeLetter",
+                to="letter.letterdescription",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="episode",
+            name="spaces",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="locations involved in this episode",
+                through="event.EpisodeSpace",
+                to="space.spacedescription",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="series",
+            name="episodes",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Episodes that make up this series",
+                to="event.episode",
+            ),
+        ),
+    ]
diff --git a/backend/event/models.py b/backend/event/models.py
index a1ed9e7f..2ee0f61a 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -7,9 +7,9 @@
 from space.models import SpaceDescription
 
 
-class EventCategory(Named):
+class EpisodeCategory(Named):
     class Meta:
-        verbose_name_plural = "event categories"
+        verbose_name_plural = "episode categories"
 
 
 class Episode(EntityDescription, models.Model):
@@ -22,42 +22,42 @@ class Episode(EntityDescription, models.Model):
         help_text="full description of the events in the passage",
     )
     categories = models.ManyToManyField(
-        to=EventCategory,
-        related_name="event_descriptions",
-        help_text="labels assigned to this event",
+        to=EpisodeCategory,
+        related_name="episodes",
+        help_text="labels assigned to this episode",
     )
     agents = models.ManyToManyField(
         to=AgentDescription,
-        through="EventDescriptionAgent",
+        through="EpisodeAgent",
         blank=True,
-        help_text="agents involved in this event",
+        help_text="agents involved in this episode",
     )
     gifts = models.ManyToManyField(
         to=GiftDescription,
-        through="EventDescriptionGift",
+        through="EpisodeGift",
         blank=True,
-        help_text="gifts involved in this event",
+        help_text="gifts involved in this episode",
     )
     letters = models.ManyToManyField(
         to=LetterDescription,
-        through="EventDescriptionLetter",
+        through="EpisodeLetter",
         blank=True,
-        help_text="letters involved in this event",
+        help_text="letters involved in this episode",
     )
     spaces = models.ManyToManyField(
         to=SpaceDescription,
-        through="EventDescriptionSpace",
+        through="EpisodeSpace",
         blank=True,
-        help_text="locations involved in this event",
+        help_text="locations involved in this episode",
     )
 
 
-class EventDescriptionAgent(DescriptionField, models.Model):
+class EpisodeAgent(DescriptionField, models.Model):
     """
-    Relationship between an agent and an event described in a source text
+    Relationship between an episode and an agent described in a source text
     """
 
-    event = models.ForeignKey(
+    episode = models.ForeignKey(
         to=Episode,
         on_delete=models.CASCADE,
     )
@@ -67,19 +67,19 @@ class EventDescriptionAgent(DescriptionField, models.Model):
     )
 
     def clean(self):
-        if self.event.source != self.agent.source:
+        if self.episode.source != self.agent.source:
             raise ValidationError("Can only link descriptions in the same source text")
 
     def __str__(self):
-        return f"{self.agent.name} / {self.event}"
+        return f"{self.agent.name} / {self.episode}"
 
 
-class EventDescriptionGift(DescriptionField, models.Model):
+class EpisodeGift(DescriptionField, models.Model):
     """
-    Relationship between an agent and an gift described in a source text
+    Relationship between an episode and a gift described in a source text
     """
 
-    event = models.ForeignKey(
+    episode = models.ForeignKey(
         to=Episode,
         on_delete=models.CASCADE,
     )
@@ -89,19 +89,19 @@ class EventDescriptionGift(DescriptionField, models.Model):
     )
 
     def clean(self):
-        if self.event.source != self.gift.source:
+        if self.episode.source != self.gift.source:
             raise ValidationError("Can only link descriptions in the same source text")
 
     def __str__(self):
-        return f"{self.gift.name} / {self.event}"
+        return f"{self.gift.name} / {self.episode}"
 
 
-class EventDescriptionLetter(DescriptionField, models.Model):
+class EpisodeLetter(DescriptionField, models.Model):
     """
-    Relationship between an agent and a letter described in a source text
+    Relationship between an episode and a letter described in a source text
     """
 
-    event = models.ForeignKey(
+    episode = models.ForeignKey(
         to=Episode,
         on_delete=models.CASCADE,
     )
@@ -111,19 +111,19 @@ class EventDescriptionLetter(DescriptionField, models.Model):
     )
 
     def clean(self):
-        if self.event.source != self.letter.source:
+        if self.episode.source != self.letter.source:
             raise ValidationError("Can only link descriptions in the same source text")
 
     def __str__(self):
-        return f"{self.letter.name} / {self.event}"
+        return f"{self.letter.name} / {self.episode}"
 
 
-class EventDescriptionSpace(DescriptionField, models.Model):
+class EpisodeSpace(DescriptionField, models.Model):
     """
-    Relationship between an agent and a space described in a source text
+    Relationship between an episode and a space described in a source text
     """
 
-    event = models.ForeignKey(
+    episode = models.ForeignKey(
         to=Episode,
         on_delete=models.CASCADE,
     )
@@ -133,11 +133,11 @@ class EventDescriptionSpace(DescriptionField, models.Model):
     )
 
     def clean(self):
-        if self.event.source != self.space.source:
+        if self.episode.source != self.space.source:
             raise ValidationError("Can only link descriptions in the same source text")
 
     def __str__(self):
-        return f"{self.space.name} / {self.event}"
+        return f"{self.space.name} / {self.episode}"
 
 
 class Series(Named, models.Model):
@@ -148,5 +148,8 @@ class Series(Named, models.Model):
     episodes = models.ManyToManyField(
         to=Episode,
         blank=True,
-        help_text="Events that make up this episode",
+        help_text="Episodes that make up this series",
     )
+
+    class Meta:
+        verbose_name_plural = "series"

From 527f1be37a216915f9b2a5ff6eee75295c4f9c87 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 27 Jun 2024 10:52:29 +0200
Subject: [PATCH 100/565] Update error messages

---
 backend/event/models.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/event/models.py b/backend/event/models.py
index 2ee0f61a..f2ff7ef3 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -68,7 +68,7 @@ class EpisodeAgent(DescriptionField, models.Model):
 
     def clean(self):
         if self.episode.source != self.agent.source:
-            raise ValidationError("Can only link descriptions in the same source text")
+            raise ValidationError("Can only link episodes and agents in the same source text")
 
     def __str__(self):
         return f"{self.agent.name} / {self.episode}"
@@ -90,7 +90,7 @@ class EpisodeGift(DescriptionField, models.Model):
 
     def clean(self):
         if self.episode.source != self.gift.source:
-            raise ValidationError("Can only link descriptions in the same source text")
+            raise ValidationError("Can only link episodes and gifts in the same source text")
 
     def __str__(self):
         return f"{self.gift.name} / {self.episode}"
@@ -112,7 +112,7 @@ class EpisodeLetter(DescriptionField, models.Model):
 
     def clean(self):
         if self.episode.source != self.letter.source:
-            raise ValidationError("Can only link descriptions in the same source text")
+            raise ValidationError("Can only link episodes and letters in the same source text")
 
     def __str__(self):
         return f"{self.letter.name} / {self.episode}"
@@ -134,7 +134,7 @@ class EpisodeSpace(DescriptionField, models.Model):
 
     def clean(self):
         if self.episode.source != self.space.source:
-            raise ValidationError("Can only link descriptions in the same source text")
+            raise ValidationError("Can only link episodes and spaces in the same source text")
 
     def __str__(self):
         return f"{self.space.name} / {self.episode}"

From 37f732fc99e4cf7e739d3ea41b2aee7aec968b87 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 27 Jun 2024 10:59:36 +0200
Subject: [PATCH 101/565] Change related_name on PersonReference.person

---
 .../0018_alter_personreference_description_and_more.py        | 4 ++--
 backend/person/models.py                                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/person/migrations/0018_alter_personreference_description_and_more.py b/backend/person/migrations/0018_alter_personreference_description_and_more.py
index e991c30a..11f5c8ca 100644
--- a/backend/person/migrations/0018_alter_personreference_description_and_more.py
+++ b/backend/person/migrations/0018_alter_personreference_description_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2024-06-22 14:13
+# Generated by Django 4.2.7 on 2024-06-27 08:58
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
             name="person",
             field=models.ForeignKey(
                 on_delete=django.db.models.deletion.CASCADE,
-                related_name="person_references",
+                related_name="description_references",
                 to="person.historicalperson",
             ),
         ),
diff --git a/backend/person/models.py b/backend/person/models.py
index 00dff057..e41964d0 100644
--- a/backend/person/models.py
+++ b/backend/person/models.py
@@ -57,7 +57,7 @@ class PersonReference(Field, models.Model):
     person = models.ForeignKey(
         to=HistoricalPerson,
         on_delete=models.CASCADE,
-        related_name="person_references",
+        related_name="description_references",
     )
     description = models.ForeignKey(
         to="AgentDescription",

From b5884e960b4f37d696a2f387c64f93add234b55c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 27 Jun 2024 12:19:22 +0200
Subject: [PATCH 102/565] Added types for Event app

---
 backend/event/queries.py                   | 26 ++++++++++++++++++++
 backend/event/types/EpisodeAgentType.py    | 24 +++++++++++++++++++
 backend/event/types/EpisodeCategoryType.py | 21 ++++++++++++++++
 backend/event/types/EpisodeGiftType.py     | 24 +++++++++++++++++++
 backend/event/types/EpisodeLetterType.py   | 24 +++++++++++++++++++
 backend/event/types/EpisodeSpaceType.py    | 24 +++++++++++++++++++
 backend/event/types/EpisodeType.py         | 28 ++++++++++++++++++++++
 backend/event/types/SeriesType.py          | 22 +++++++++++++++++
 backend/graphql_app/schema.py              |  3 ++-
 9 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 backend/event/queries.py
 create mode 100644 backend/event/types/EpisodeAgentType.py
 create mode 100644 backend/event/types/EpisodeCategoryType.py
 create mode 100644 backend/event/types/EpisodeGiftType.py
 create mode 100644 backend/event/types/EpisodeLetterType.py
 create mode 100644 backend/event/types/EpisodeSpaceType.py
 create mode 100644 backend/event/types/EpisodeType.py
 create mode 100644 backend/event/types/SeriesType.py

diff --git a/backend/event/queries.py b/backend/event/queries.py
new file mode 100644
index 00000000..fbc3947b
--- /dev/null
+++ b/backend/event/queries.py
@@ -0,0 +1,26 @@
+from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
+from django.db.models import QuerySet, Q
+from event.models import Episode
+from event.types.EpisodeType import EpisodeType
+
+
+class EventQueries(ObjectType):
+    episode = Field(EpisodeType, id=ID(required=True))
+    episodes = List(NonNull(EpisodeType), required=True, source_id=ID())
+
+    @staticmethod
+    def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Episode | None:
+        try:
+            return EpisodeType.get_queryset(Episode.objects, info).get(id=id)
+        except Episode.DoesNotExist:
+            return None
+
+    @staticmethod
+    def resolve_episodes(
+        parent: None,
+        info: ResolveInfo,
+        source_id: str | None = None,
+    ) -> QuerySet[Episode]:
+        filters = Q() if source_id is None else Q(source_id=source_id)
+
+        return EpisodeType.get_queryset(Episode.objects, info).filter(filters)
diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
new file mode 100644
index 00000000..1679644b
--- /dev/null
+++ b/backend/event/types/EpisodeAgentType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from django.db.models import QuerySet
+
+from event.models import EpisodeGift
+
+
+class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = EpisodeGift
+        fields = [
+            "id",
+            "episode",
+            "agent",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls,
+        queryset: QuerySet[EpisodeGift],
+        info: ResolveInfo,
+    ) -> QuerySet[EpisodeGift]:
+        return queryset.all()
diff --git a/backend/event/types/EpisodeCategoryType.py b/backend/event/types/EpisodeCategoryType.py
new file mode 100644
index 00000000..30bf6999
--- /dev/null
+++ b/backend/event/types/EpisodeCategoryType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.NamedType import NamedType
+from django.db.models import QuerySet
+from event.models import EpisodeCategory
+
+
+class EpisodeCategoryType(NamedType, DjangoObjectType):
+    class Meta:
+        model = EpisodeCategory
+        fields = [
+            "id",
+        ] + NamedType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls,
+        queryset: QuerySet[EpisodeCategory],
+        info: ResolveInfo,
+    ) -> QuerySet[EpisodeCategory]:
+        return queryset.all()
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
new file mode 100644
index 00000000..47452f81
--- /dev/null
+++ b/backend/event/types/EpisodeGiftType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from django.db.models import QuerySet
+
+from event.models import EpisodeGift
+
+
+class EpisodeGiftType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = EpisodeGift
+        fields = [
+            "id",
+            "episode",
+            "gift",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls,
+        queryset: QuerySet[EpisodeGift],
+        info: ResolveInfo,
+    ) -> QuerySet[EpisodeGift]:
+        return queryset.all()
diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
new file mode 100644
index 00000000..19965cbe
--- /dev/null
+++ b/backend/event/types/EpisodeLetterType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from django.db.models import QuerySet
+
+from event.models import EpisodeLetter
+
+
+class EpisodeLetterType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = EpisodeLetter
+        fields = [
+            "id",
+            "episode",
+            "letter",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls,
+        queryset: QuerySet[EpisodeLetter],
+        info: ResolveInfo,
+    ) -> QuerySet[EpisodeLetter]:
+        return queryset.all()
diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
new file mode 100644
index 00000000..252db2d5
--- /dev/null
+++ b/backend/event/types/EpisodeSpaceType.py
@@ -0,0 +1,24 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.DescriptionFieldType import DescriptionFieldType
+from django.db.models import QuerySet
+
+from event.models import EpisodeSpace
+
+
+class EpisodeSpaceType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = EpisodeSpace
+        fields = [
+            "id",
+            "episode",
+            "space",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls,
+        queryset: QuerySet[EpisodeSpace],
+        info: ResolveInfo,
+    ) -> QuerySet[EpisodeSpace]:
+        return queryset.all()
diff --git a/backend/event/types/EpisodeType.py b/backend/event/types/EpisodeType.py
new file mode 100644
index 00000000..152586f8
--- /dev/null
+++ b/backend/event/types/EpisodeType.py
@@ -0,0 +1,28 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from core.types.EntityDescriptionType import EntityDescriptionType
+from django.db.models import QuerySet
+
+from event.models import Episode
+
+
+class EpisodeType(EntityDescriptionType, DjangoObjectType):
+    class Meta:
+        model = Episode
+        fields = [
+            "id",
+            "summary",
+            "categories",
+            "agents",
+            "gifts",
+            "letters",
+            "spaces",
+        ] + EntityDescriptionType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls,
+        queryset: QuerySet[Episode],
+        info: ResolveInfo,
+    ) -> QuerySet[Episode]:
+        return queryset.all()
diff --git a/backend/event/types/SeriesType.py b/backend/event/types/SeriesType.py
new file mode 100644
index 00000000..757f7407
--- /dev/null
+++ b/backend/event/types/SeriesType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from event.models import Series
+
+
+class SeriesType(DjangoObjectType):
+    class Meta:
+        model = Series
+        fields = [
+            "id",
+            "episodes",
+        ]
+
+    @classmethod
+    def get_queryset(
+        cls,
+        queryset: QuerySet[Series],
+        info: ResolveInfo,
+    ) -> QuerySet[Series]:
+        return queryset.all()
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index ae40c32e..fc0a6d31 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -1,11 +1,12 @@
 from graphene import ObjectType, Schema
 
+from event.queries import EventQueries
 from person.queries import PersonQueries
 from source.queries import SourceQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 
 
-class Query(SourceQueries, PersonQueries, ObjectType):
+class Query(SourceQueries, PersonQueries, EventQueries, ObjectType):
     pass
 
 

From 705c53f2846eea170e52ffa64d627a08fb8c1756 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 27 Jun 2024 22:17:26 +0200
Subject: [PATCH 103/565] Added LoggedOnGuard

---
 .../src/app/shared/logged-on.guard.spec.ts    | 17 +++++++++++++++++
 frontend/src/app/shared/logged-on.guard.ts    | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 frontend/src/app/shared/logged-on.guard.spec.ts
 create mode 100644 frontend/src/app/shared/logged-on.guard.ts

diff --git a/frontend/src/app/shared/logged-on.guard.spec.ts b/frontend/src/app/shared/logged-on.guard.spec.ts
new file mode 100644
index 00000000..67d13be8
--- /dev/null
+++ b/frontend/src/app/shared/logged-on.guard.spec.ts
@@ -0,0 +1,17 @@
+import { TestBed } from "@angular/core/testing";
+import { CanActivateFn } from "@angular/router";
+
+import { LoggedOnGuard } from "./logged-on.guard";
+
+describe("LoggedOnGuard", () => {
+    const executeGuard: CanActivateFn = (...guardParameters) =>
+        TestBed.runInInjectionContext(() => LoggedOnGuard(...guardParameters));
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({});
+    });
+
+    it("should be created", () => {
+        expect(executeGuard).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/shared/logged-on.guard.ts b/frontend/src/app/shared/logged-on.guard.ts
new file mode 100644
index 00000000..d8d5348b
--- /dev/null
+++ b/frontend/src/app/shared/logged-on.guard.ts
@@ -0,0 +1,19 @@
+import { inject } from "@angular/core";
+import { CanActivateFn, Router } from "@angular/router";
+import { AuthService } from "@services/auth.service";
+import { filter, map } from "rxjs";
+
+export const LoggedOnGuard: CanActivateFn = () => {
+    const authService = inject(AuthService);
+    const router = inject(Router);
+    return authService.currentUser$.pipe(
+        filter((user) => user !== undefined),
+        map((user) => {
+            if (user === null) {
+                router.navigate(["/login"]);
+                return false;
+            }
+            return true;
+        })
+    );
+};

From 11585e3bb9959e864de36e0da60bd82f83b735e0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 28 Jun 2024 10:49:52 +0200
Subject: [PATCH 104/565] Add current path to route

---
 .../menu/user-menu/user-menu.component.html    |  7 ++++++-
 .../core/menu/user-menu/user-menu.component.ts | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 0c9d31a2..bb0b436d 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -22,7 +22,12 @@
     </ng-container>
     <ng-container *ngIf="showSignIn$ | async">
         <li class="nav-item">
-            <a [routerLink]="['/login']" routerLinkActive="active" class="nav-link">
+            <a
+                [routerLink]="['/login']"
+                routerLinkActive="active"
+                [queryParams]="{ next: currentPath | async }"
+                class="nav-link"
+            >
                 Sign in
             </a>
         </li>
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index e92c1dd0..a546c76b 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,10 +1,10 @@
 import { Component, DestroyRef, OnInit } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { map } from 'rxjs';
+import { filter, map } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 import { ToastService } from '@services/toast.service';
-import { Router } from '@angular/router';
+import { NavigationEnd, Router } from '@angular/router';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
@@ -19,9 +19,7 @@ export class UserMenuComponent implements OnInit {
 
     public user$ = this.authService.currentUser$;
 
-    public showSignIn$ = this.authService.currentUser$.pipe(
-        map(_.isNull)
-    );
+    public showSignIn$ = this.authService.currentUser$.pipe(map(_.isNull));
 
     public icons = {
         user: faUser,
@@ -29,12 +27,19 @@ export class UserMenuComponent implements OnInit {
 
     public logoutLoading$ = this.authService.logout.loading$;
 
+    public currentPath = this.router.events.pipe(
+        filter(
+            (event): event is NavigationEnd => event instanceof NavigationEnd
+        ),
+        map((event) => event.url)
+    );
+
     constructor(
         private authService: AuthService,
         private toastService: ToastService,
         private router: Router,
         private destroyRef: DestroyRef
-    ) { }
+    ) {}
 
     ngOnInit(): void {
         this.authService.logout.error$
@@ -62,5 +67,4 @@ export class UserMenuComponent implements OnInit {
     public logout(): void {
         this.authService.logout.subject.next();
     }
-
 }

From 4e158761e749816aa11de6c2b4ff04c97f977e6f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 28 Jun 2024 23:45:35 +0200
Subject: [PATCH 105/565] Fix reroute after logging in

---
 .../menu/user-menu/user-menu.component.html   |  2 +-
 .../menu/user-menu/user-menu.component.ts     | 14 ++++----
 frontend/src/app/services/auth.service.ts     | 11 +++---
 .../app/shared/current-path.service.spec.ts   | 16 +++++++++
 .../src/app/shared/current-path.service.ts    | 30 ++++++++++++++++
 frontend/src/app/shared/logged-on.guard.ts    |  7 ++--
 .../src/app/user/login/login.component.ts     | 35 ++++++++++++-------
 7 files changed, 85 insertions(+), 30 deletions(-)
 create mode 100644 frontend/src/app/shared/current-path.service.spec.ts
 create mode 100644 frontend/src/app/shared/current-path.service.ts

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index bb0b436d..cd1c79f0 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -25,7 +25,7 @@
             <a
                 [routerLink]="['/login']"
                 routerLinkActive="active"
-                [queryParams]="{ next: currentPath | async }"
+                [queryParams]="(onLoginPage$ | async) ? null : { next: currentPath$ | async }"
                 class="nav-link"
             >
                 Sign in
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index a546c76b..ec0afce1 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,11 +1,12 @@
 import { Component, DestroyRef, OnInit } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { filter, map } from 'rxjs';
+import { map } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 import { ToastService } from '@services/toast.service';
-import { NavigationEnd, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { CurrentPathService } from '@shared/current-path.service';
 
 @Component({
   selector: 'lc-user-menu',
@@ -27,17 +28,14 @@ export class UserMenuComponent implements OnInit {
 
     public logoutLoading$ = this.authService.logout.loading$;
 
-    public currentPath = this.router.events.pipe(
-        filter(
-            (event): event is NavigationEnd => event instanceof NavigationEnd
-        ),
-        map((event) => event.url)
-    );
+    public currentPath$ = this.currentPath.path$;
+    public onLoginPage$ = this.currentPath.onLoginPage$;
 
     constructor(
         private authService: AuthService,
         private toastService: ToastService,
         private router: Router,
+        private currentPath: CurrentPathService,
         private destroyRef: DestroyRef
     ) {}
 
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index 77418daf..2f38a6a2 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -71,6 +71,7 @@ export class AuthService {
         );
 
     public currentUser$ = merge(
+        this.login.subject.pipe(map(() => undefined)),
         this.logout.result$.pipe(map(() => null)),
         this.backendUser$,
         this.updateSettingsUser$
@@ -80,16 +81,16 @@ export class AuthService {
     );
 
     public isAuthenticated$ = this.currentUser$.pipe(
-        map(_.isObject)
+        map(user => user === undefined ? undefined : _.isObject(user))
     );
 
     constructor(
         private sessionService: SessionService,
-        private http: HttpClient,
+        private http: HttpClient
     ) {
-        this.sessionService.expired.pipe(
-            takeUntilDestroyed()
-        ).subscribe(() => this.logout.subject.next());
+        this.sessionService.expired
+            .pipe(takeUntilDestroyed())
+            .subscribe(() => this.logout.subject.next());
     }
 
     // Keeping track of the latest version of the username
diff --git a/frontend/src/app/shared/current-path.service.spec.ts b/frontend/src/app/shared/current-path.service.spec.ts
new file mode 100644
index 00000000..8b83c473
--- /dev/null
+++ b/frontend/src/app/shared/current-path.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from "@angular/core/testing";
+
+import { CurrentPathService } from "./current-path.service";
+
+describe("CurrentPathService", () => {
+    let service: CurrentPathService;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({});
+        service = TestBed.inject(CurrentPathService);
+    });
+
+    it("should be created", () => {
+        expect(service).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/shared/current-path.service.ts b/frontend/src/app/shared/current-path.service.ts
new file mode 100644
index 00000000..07c904b5
--- /dev/null
+++ b/frontend/src/app/shared/current-path.service.ts
@@ -0,0 +1,30 @@
+import { Injectable } from "@angular/core";
+import { NavigationEnd, Router } from "@angular/router";
+import { filter, map, share, startWith } from "rxjs";
+import { Location } from "@angular/common";
+
+@Injectable({
+    providedIn: "root",
+})
+export class CurrentPathService {
+    /**
+     * Observable stream of the currently navigated-to path, e.g. '/about', '/home'.
+     */
+    public path$ = this.router.events.pipe(
+        filter(
+            (event): event is NavigationEnd => event instanceof NavigationEnd
+        ),
+        map((event) => event.url),
+        startWith(this.location.path()),
+        share()
+    );
+
+    /**
+     * Observable that emits a boolean value whether the user is currently on the "/login" page.
+     */
+    public onLoginPage$ = this.path$.pipe(
+        map((path) => path.startsWith("/login"))
+    );
+
+    constructor(private location: Location, private router: Router) {}
+}
diff --git a/frontend/src/app/shared/logged-on.guard.ts b/frontend/src/app/shared/logged-on.guard.ts
index d8d5348b..2f04b67f 100644
--- a/frontend/src/app/shared/logged-on.guard.ts
+++ b/frontend/src/app/shared/logged-on.guard.ts
@@ -1,16 +1,17 @@
 import { inject } from "@angular/core";
-import { CanActivateFn, Router } from "@angular/router";
+import { ActivatedRouteSnapshot, CanActivateFn, Router } from "@angular/router";
 import { AuthService } from "@services/auth.service";
 import { filter, map } from "rxjs";
 
-export const LoggedOnGuard: CanActivateFn = () => {
+export const LoggedOnGuard: CanActivateFn = (route: ActivatedRouteSnapshot) => {
     const authService = inject(AuthService);
     const router = inject(Router);
+
     return authService.currentUser$.pipe(
         filter((user) => user !== undefined),
         map((user) => {
             if (user === null) {
-                router.navigate(["/login"]);
+                router.navigate(["/login"], { queryParams: { next: route.url } });
                 return false;
             }
             return true;
diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 7d86cc53..0b43d58b 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -10,7 +10,8 @@ import {
 } from "../utils";
 import { ToastService } from "@services/toast.service";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { Router } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
+import { map, withLatestFrom } from "rxjs";
 
 type LoginForm = {
     [key in keyof UserLogin]: FormControl<string>;
@@ -23,11 +24,11 @@ type LoginForm = {
 })
 export class LoginComponent implements OnInit {
     public form = new FormGroup<LoginForm>({
-        username: new FormControl<string>("", {
+        username: new FormControl<string>("Baltus", {
             nonNullable: true,
             validators: [Validators.required],
         }),
-        password: new FormControl<string>("", {
+        password: new FormControl<string>("knerbonius", {
             nonNullable: true,
             validators: [Validators.required],
         }),
@@ -39,24 +40,32 @@ export class LoginComponent implements OnInit {
 
     public loading$ = this.authService.login.loading$;
 
+    private nextParam$ = this.route.queryParamMap.pipe(
+        map((params) => params.get("next"))
+    );
+
     constructor(
         private authService: AuthService,
         private toastService: ToastService,
-        private destroyRef: DestroyRef,
         private router: Router,
+        private route: ActivatedRoute,
+        private destroyRef: DestroyRef
     ) {}
 
     ngOnInit(): void {
-        this.authService.login.success$.pipe(
-            takeUntilDestroyed(this.destroyRef)
-        ).subscribe(() => {
-            this.toastService.show({
-                header: "Sign in successful",
-                body: "You have been successfully signed in.",
-                type: "success",
+        this.authService.login.success$
+            .pipe(
+                withLatestFrom(this.nextParam$),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(([, next]) => {
+                this.toastService.show({
+                    header: "Sign in successful",
+                    body: "You have been successfully signed in.",
+                    type: "success",
+                });
+                this.router.navigate([next || "/"]);
             });
-            this.router.navigate(["/"]);
-        });
 
         this.authService.login.error$
             .pipe(takeUntilDestroyed(this.destroyRef))

From 7f1443953d765645ea01636f6097e8cb42bbe613 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 4 Jul 2024 14:35:40 +0200
Subject: [PATCH 106/565] Cleanup

---
 frontend/src/app/user/login/login.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/user/login/login.component.ts b/frontend/src/app/user/login/login.component.ts
index 0b43d58b..e0c867b1 100644
--- a/frontend/src/app/user/login/login.component.ts
+++ b/frontend/src/app/user/login/login.component.ts
@@ -24,11 +24,11 @@ type LoginForm = {
 })
 export class LoginComponent implements OnInit {
     public form = new FormGroup<LoginForm>({
-        username: new FormControl<string>("Baltus", {
+        username: new FormControl<string>("", {
             nonNullable: true,
             validators: [Validators.required],
         }),
-        password: new FormControl<string>("knerbonius", {
+        password: new FormControl<string>("", {
             nonNullable: true,
             validators: [Validators.required],
         }),

From 423f89caa2063455940e7f2bc3ae7a66a0da4e5e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 5 Jul 2024 15:05:53 +0200
Subject: [PATCH 107/565] Remove superfluous CurrentPathService

---
 .../menu/user-menu/user-menu.component.html   |  3 +-
 .../menu/user-menu/user-menu.component.ts     | 10 +++----
 .../app/shared/current-path.service.spec.ts   | 16 ----------
 .../src/app/shared/current-path.service.ts    | 30 -------------------
 4 files changed, 7 insertions(+), 52 deletions(-)
 delete mode 100644 frontend/src/app/shared/current-path.service.spec.ts
 delete mode 100644 frontend/src/app/shared/current-path.service.ts

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index cd1c79f0..05d86b40 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -23,9 +23,10 @@
     <ng-container *ngIf="showSignIn$ | async">
         <li class="nav-item">
             <a
+                #linkActive="routerLinkActive"
                 [routerLink]="['/login']"
                 routerLinkActive="active"
-                [queryParams]="(onLoginPage$ | async) ? null : { next: currentPath$ | async }"
+                [queryParams]="linkActive.isActive ? null : { next: currentPath$ | async }"
                 class="nav-link"
             >
                 Sign in
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index ec0afce1..5d56ac12 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,12 +1,11 @@
 import { Component, DestroyRef, OnInit } from '@angular/core';
 import { faUser } from '@fortawesome/free-solid-svg-icons';
-import { map } from 'rxjs';
+import { filter, map } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 import { ToastService } from '@services/toast.service';
 import { Router } from '@angular/router';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { CurrentPathService } from '@shared/current-path.service';
 
 @Component({
   selector: 'lc-user-menu',
@@ -28,14 +27,15 @@ export class UserMenuComponent implements OnInit {
 
     public logoutLoading$ = this.authService.logout.loading$;
 
-    public currentPath$ = this.currentPath.path$;
-    public onLoginPage$ = this.currentPath.onLoginPage$;
+    public currentPath$ = this.router.routerState.root.url.pipe(
+        map((url) => url.pop() ?? null),
+        filter(url => url?.toString() !== "")
+    );
 
     constructor(
         private authService: AuthService,
         private toastService: ToastService,
         private router: Router,
-        private currentPath: CurrentPathService,
         private destroyRef: DestroyRef
     ) {}
 
diff --git a/frontend/src/app/shared/current-path.service.spec.ts b/frontend/src/app/shared/current-path.service.spec.ts
deleted file mode 100644
index 8b83c473..00000000
--- a/frontend/src/app/shared/current-path.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from "@angular/core/testing";
-
-import { CurrentPathService } from "./current-path.service";
-
-describe("CurrentPathService", () => {
-    let service: CurrentPathService;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({});
-        service = TestBed.inject(CurrentPathService);
-    });
-
-    it("should be created", () => {
-        expect(service).toBeTruthy();
-    });
-});
diff --git a/frontend/src/app/shared/current-path.service.ts b/frontend/src/app/shared/current-path.service.ts
deleted file mode 100644
index 07c904b5..00000000
--- a/frontend/src/app/shared/current-path.service.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Injectable } from "@angular/core";
-import { NavigationEnd, Router } from "@angular/router";
-import { filter, map, share, startWith } from "rxjs";
-import { Location } from "@angular/common";
-
-@Injectable({
-    providedIn: "root",
-})
-export class CurrentPathService {
-    /**
-     * Observable stream of the currently navigated-to path, e.g. '/about', '/home'.
-     */
-    public path$ = this.router.events.pipe(
-        filter(
-            (event): event is NavigationEnd => event instanceof NavigationEnd
-        ),
-        map((event) => event.url),
-        startWith(this.location.path()),
-        share()
-    );
-
-    /**
-     * Observable that emits a boolean value whether the user is currently on the "/login" page.
-     */
-    public onLoginPage$ = this.path$.pipe(
-        map((path) => path.startsWith("/login"))
-    );
-
-    constructor(private location: Location, private router: Router) {}
-}

From 7ec48138d5c4d57359acae833a6e206962505a4e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 10 Jul 2024 15:43:09 +0200
Subject: [PATCH 108/565] Rename Category to LetterCategory

---
 .../management/commands/create_dev_dataset.py   | 14 +++++++++-----
 backend/letter/admin.py                         |  4 ++--
 .../0016_rename_category_lettercategory.py      | 17 +++++++++++++++++
 backend/letter/models.py                        |  6 +++---
 4 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 backend/letter/migrations/0016_rename_category_lettercategory.py

diff --git a/backend/core/management/commands/create_dev_dataset.py b/backend/core/management/commands/create_dev_dataset.py
index 22793a28..e46760a6 100644
--- a/backend/core/management/commands/create_dev_dataset.py
+++ b/backend/core/management/commands/create_dev_dataset.py
@@ -12,7 +12,7 @@
     HistoricalPerson,
 )
 from letter.models import (
-    Category,
+    LetterCategory,
     GiftDescription,
     LetterDescription,
     LetterDescriptionCategory,
@@ -104,7 +104,9 @@ def handle(self, *args, **options):
             self._create_agent_descriptions(
                 fake, options, total=100, model=AgentDescription
             )
-            self._create_letter_categories(fake, options, total=10, model=Category)
+            self._create_letter_categories(
+                fake, options, total=10, model=LetterCategory
+            )
             self._create_letter_descriptions(
                 fake, options, total=200, model=LetterDescription
             )
@@ -180,9 +182,11 @@ def _create_agent_descriptions(self, fake: Faker, options, total, model):
     @track_progress
     def _create_letter_categories(self, fake: Faker, *args, **kwargs):
         unique_label = get_unique_name(
-            list_of_names=letter_category_names, model=Category, name_field="label"
+            list_of_names=letter_category_names,
+            model=LetterCategory,
+            name_field="label",
         )
-        Category.objects.create(label=unique_label, description=fake.text())
+        LetterCategory.objects.create(label=unique_label, description=fake.text())
 
     @track_progress
     def _create_letter_descriptions(self, fake: Faker, *args, **kwargs):
@@ -197,7 +201,7 @@ def _create_letter_descriptions(self, fake: Faker, *args, **kwargs):
         if random.choice([True, False]):
             LetterDescriptionCategory.objects.create(
                 letter=letter,
-                category=get_random_model_object(Category),
+                category=get_random_model_object(LetterCategory),
                 **self.fake_field_value(fake),
             )
 
diff --git a/backend/letter/admin.py b/backend/letter/admin.py
index e8511f68..e3d73818 100644
--- a/backend/letter/admin.py
+++ b/backend/letter/admin.py
@@ -23,8 +23,8 @@ class GiftDescriptionAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
     ]
 
 
-@admin.register(models.Category)
-class CategoryAdmin(admin.ModelAdmin):
+@admin.register(models.LetterCategory)
+class LetterCategoryAdmin(admin.ModelAdmin):
     fields = ["label", "description"]
 
 
diff --git a/backend/letter/migrations/0016_rename_category_lettercategory.py b/backend/letter/migrations/0016_rename_category_lettercategory.py
new file mode 100644
index 00000000..abe05800
--- /dev/null
+++ b/backend/letter/migrations/0016_rename_category_lettercategory.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-07-10 13:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("letter", "0015_remove_giftdescriptionsender_agent_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="Category",
+            new_name="LetterCategory",
+        ),
+    ]
diff --git a/backend/letter/models.py b/backend/letter/models.py
index fb4a301d..93437d0e 100644
--- a/backend/letter/models.py
+++ b/backend/letter/models.py
@@ -56,14 +56,14 @@ class LetterDescription(EntityDescription, models.Model):
     """
 
     categories = models.ManyToManyField(
-        to="Category",
+        to="LetterCategory",
         through="LetterDescriptionCategory",
         blank=True,
         help_text="categories assigned to the letter",
     )
 
 
-class Category(models.Model):
+class LetterCategory(models.Model):
     label = models.CharField(max_length=200, blank=False, null=False, unique=True)
     description = models.TextField(blank=True, null=False)
 
@@ -85,7 +85,7 @@ class LetterDescriptionCategory(DescriptionField, models.Model):
         on_delete=models.CASCADE,
     )
     category = models.ForeignKey(
-        to=Category,
+        to=LetterCategory,
         on_delete=models.CASCADE,
     )
 

From 5b15cb4d242ff3954ed6e9f653cf118fe591acf0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 10 Jul 2024 15:43:41 +0200
Subject: [PATCH 109/565] Types

---
 backend/letter/types/GiftCategoryType.py      | 18 +++++++++++++++
 .../types/GiftDescriptionCategoryType.py      | 22 ++++++++++++++++++
 backend/letter/types/GiftDescriptionType.py   | 21 +++++++++++++++++
 backend/letter/types/LetterCategoryType.py    | 21 +++++++++++++++++
 .../types/LetterDescriptionCategoryType.py    | 23 +++++++++++++++++++
 backend/letter/types/LetterDescriptionType.py | 21 +++++++++++++++++
 .../letter/types/PreservedLetterRoleType.py   | 22 ++++++++++++++++++
 backend/letter/types/PreservedLetterType.py   | 21 +++++++++++++++++
 8 files changed, 169 insertions(+)
 create mode 100644 backend/letter/types/GiftCategoryType.py
 create mode 100644 backend/letter/types/GiftDescriptionCategoryType.py
 create mode 100644 backend/letter/types/GiftDescriptionType.py
 create mode 100644 backend/letter/types/LetterCategoryType.py
 create mode 100644 backend/letter/types/LetterDescriptionCategoryType.py
 create mode 100644 backend/letter/types/LetterDescriptionType.py
 create mode 100644 backend/letter/types/PreservedLetterRoleType.py
 create mode 100644 backend/letter/types/PreservedLetterType.py

diff --git a/backend/letter/types/GiftCategoryType.py b/backend/letter/types/GiftCategoryType.py
new file mode 100644
index 00000000..0fde8889
--- /dev/null
+++ b/backend/letter/types/GiftCategoryType.py
@@ -0,0 +1,18 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.NamedType import NamedType
+from letter.models import GiftCategory
+
+
+class GiftCategoryType(NamedType, DjangoObjectType):
+    class Meta:
+        model = GiftCategory
+        fields = ["id"] + NamedType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[GiftCategory], info: ResolveInfo
+    ) -> QuerySet[GiftCategory]:
+        return queryset.all()
diff --git a/backend/letter/types/GiftDescriptionCategoryType.py b/backend/letter/types/GiftDescriptionCategoryType.py
new file mode 100644
index 00000000..d32ce439
--- /dev/null
+++ b/backend/letter/types/GiftDescriptionCategoryType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.DescriptionFieldType import DescriptionFieldType
+from letter.models import GiftDescriptionCategory
+
+
+class GiftDescriptionCategoryType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = GiftDescriptionCategory
+        fields = [
+            "id",
+            "gift",
+            "category",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[GiftDescriptionCategory], info: ResolveInfo
+    ) -> QuerySet[GiftDescriptionCategory]:
+        return queryset.all()
diff --git a/backend/letter/types/GiftDescriptionType.py b/backend/letter/types/GiftDescriptionType.py
new file mode 100644
index 00000000..644b0292
--- /dev/null
+++ b/backend/letter/types/GiftDescriptionType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.EntityDescriptionType import EntityDescriptionType
+from letter.models import GiftDescription
+
+
+class GiftDescriptionType(EntityDescriptionType, DjangoObjectType):
+    class Meta:
+        model = GiftDescription
+        fields = [
+            "id",
+            "categories",
+        ] + EntityDescriptionType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[GiftDescription], info: ResolveInfo
+    ) -> QuerySet[GiftDescription]:
+        return queryset.all()
diff --git a/backend/letter/types/LetterCategoryType.py b/backend/letter/types/LetterCategoryType.py
new file mode 100644
index 00000000..bbcd30fc
--- /dev/null
+++ b/backend/letter/types/LetterCategoryType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from letter.models import LetterCategory
+
+
+class LetterCategoryType(DjangoObjectType):
+    class Meta:
+        model = LetterCategory
+        fields = [
+            "id",
+            "label",
+            "description",
+        ]
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[LetterCategory], info: ResolveInfo
+    ) -> QuerySet[LetterCategory]:
+        return queryset.all()
diff --git a/backend/letter/types/LetterDescriptionCategoryType.py b/backend/letter/types/LetterDescriptionCategoryType.py
new file mode 100644
index 00000000..c1d9fbf8
--- /dev/null
+++ b/backend/letter/types/LetterDescriptionCategoryType.py
@@ -0,0 +1,23 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.DescriptionFieldType import DescriptionFieldType
+from letter.models import LetterDescriptionCategory
+
+
+class LetterDescriptionCategoryType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = LetterDescriptionCategory
+        fields = [
+            "id",
+            "letter",
+            "category",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet, info: ResolveInfo
+    ) -> QuerySet[LetterDescriptionCategory]:
+        return queryset.all()
+
diff --git a/backend/letter/types/LetterDescriptionType.py b/backend/letter/types/LetterDescriptionType.py
new file mode 100644
index 00000000..ebdc30f0
--- /dev/null
+++ b/backend/letter/types/LetterDescriptionType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.EntityDescriptionType import EntityDescriptionType
+from letter.models import LetterDescription
+
+
+class LetterDescriptionType(EntityDescriptionType, DjangoObjectType):
+    class Meta:
+        model = LetterDescription
+        fields = [
+            "id",
+            "categories",
+        ] + EntityDescriptionType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[LetterDescription], info: ResolveInfo
+    ) -> QuerySet[LetterDescription]:
+        return queryset.all()
diff --git a/backend/letter/types/PreservedLetterRoleType.py b/backend/letter/types/PreservedLetterRoleType.py
new file mode 100644
index 00000000..2ba3c566
--- /dev/null
+++ b/backend/letter/types/PreservedLetterRoleType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.FieldType import LettercraftFieldType
+from letter.models import PreservedLetterRole
+
+
+class PreservedLetterRoleType(LettercraftFieldType, DjangoObjectType):
+    class Meta:
+        model = PreservedLetterRole
+        fields = [
+            "id",
+            "letter",
+            "person",
+        ] + LettercraftFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[PreservedLetterRole], info: ResolveInfo
+    ) -> QuerySet[PreservedLetterRole]:
+        return queryset.all()
diff --git a/backend/letter/types/PreservedLetterType.py b/backend/letter/types/PreservedLetterType.py
new file mode 100644
index 00000000..8e969166
--- /dev/null
+++ b/backend/letter/types/PreservedLetterType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.HistoricalEntityType import HistoricalEntityType
+from letter.models import PreservedLetter
+
+
+class PreservedLetterType(HistoricalEntityType, DjangoObjectType):
+    class Meta:
+        model = PreservedLetter
+        fields = [
+            "id",
+            "persons_involved",
+        ] + HistoricalEntityType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[PreservedLetter], info: ResolveInfo
+    ) -> QuerySet[PreservedLetter]:
+        return queryset.all()

From 8dd01c9a118d4858fc8c59eb577ff8134aa5d34b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 11 Jul 2024 08:22:35 +0200
Subject: [PATCH 110/565] Add queries

---
 backend/graphql_app/schema.py |  3 +-
 backend/letter/queries.py     | 76 +++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 backend/letter/queries.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index fc0a6d31..bb2c9f6f 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -1,12 +1,13 @@
 from graphene import ObjectType, Schema
 
 from event.queries import EventQueries
+from letter.queries import LetterQueries
 from person.queries import PersonQueries
 from source.queries import SourceQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 
 
-class Query(SourceQueries, PersonQueries, EventQueries, ObjectType):
+class Query(SourceQueries, PersonQueries, EventQueries, LetterQueries, ObjectType):
     pass
 
 
diff --git a/backend/letter/queries.py b/backend/letter/queries.py
new file mode 100644
index 00000000..b4c1ccbb
--- /dev/null
+++ b/backend/letter/queries.py
@@ -0,0 +1,76 @@
+from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
+from django.db.models import QuerySet, Q
+
+from letter.models import GiftDescription, LetterDescription
+from letter.types.GiftDescriptionType import GiftDescriptionType
+from letter.types.LetterDescriptionType import LetterDescriptionType
+
+
+class LetterQueries(ObjectType):
+    letter_description = Field(LetterDescriptionType, id=ID(required=True))
+
+    letter_descriptions = List(
+        NonNull(LetterDescriptionType), required=True, episode_id=ID(), source_id=ID()
+    )
+
+    gift_description = Field(GiftDescriptionType, id=ID(required=True))
+
+    gift_descriptions = List(
+        NonNull(GiftDescriptionType), required=True, episode_id=ID(), source_id=ID()
+    )
+
+    @staticmethod
+    def resolve_letter_description(
+        parent: None, info: ResolveInfo, id: str
+    ) -> LetterDescription | None:
+        try:
+            return LetterDescriptionType.get_queryset(
+                LetterDescription.objects, info
+            ).get(id=id)
+        except LetterDescription.DoesNotExist:
+            return None
+
+    @staticmethod
+    def resolve_letter_descriptions(
+        parent: None,
+        info: ResolveInfo,
+        episode_id: str | None = None,
+        source_id: str | None = None,
+    ) -> QuerySet[LetterDescription]:
+        filters = Q()
+        if episode_id:
+            filters &= Q(episode_id=episode_id)
+        if source_id:
+            filters &= Q(source_id=source_id)
+
+        return LetterDescriptionType.get_queryset(
+            LetterDescription.objects, info
+        ).filter(filters)
+
+    @staticmethod
+    def resolve_gift_description(
+        parent: None, info: ResolveInfo, id: str
+    ) -> GiftDescription | None:
+        try:
+            return GiftDescriptionType.get_queryset(
+                GiftDescription.objects, info
+            ).get(id=id)
+        except GiftDescription.DoesNotExist:
+            return None
+
+    @staticmethod
+    def resolve_gift_descriptions(
+        parent: None,
+        info: ResolveInfo,
+        episode_id: str | None = None,
+        source_id: str | None = None,
+    ) -> QuerySet[GiftDescription]:
+        filters = Q()
+        if episode_id:
+            filters &= Q(episode_id=episode_id)
+        if source_id:
+            filters &= Q(source_id=source_id)
+
+        return GiftDescriptionType.get_queryset(
+            GiftDescription.objects, info
+        ).filter(filters)

From 4ffa539399e23d138bf6ff66d699170b0c029f2a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 11 Jul 2024 08:23:01 +0200
Subject: [PATCH 111/565] Cleanup

---
 backend/person/types/AgentDescriptionType.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index 3922edf8..224519a2 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -38,6 +38,6 @@ def resolve_describes(
 
     @staticmethod
     def resolve_person_references(
-        agent_description: AgentDescription, info: ResolveInfo
+        parent: AgentDescription, info: ResolveInfo
     ) -> QuerySet[PersonReference]:
-        return agent_description.person_references.all()  # type: ignore
+        return parent.person_references.all()  # type: ignore

From 6e402cd8b73068352e0ac29e8455868431284077 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 11 Jul 2024 08:37:17 +0200
Subject: [PATCH 112/565] Add related name for categorisations

---
 ...ftdescriptioncategory_category_and_more.py | 50 +++++++++++++++++++
 backend/letter/models.py                      |  8 ++-
 backend/letter/types/GiftDescriptionType.py   | 23 ++++++++-
 backend/letter/types/LetterDescriptionType.py | 23 ++++++++-
 4 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 backend/letter/migrations/0017_alter_giftdescriptioncategory_category_and_more.py

diff --git a/backend/letter/migrations/0017_alter_giftdescriptioncategory_category_and_more.py b/backend/letter/migrations/0017_alter_giftdescriptioncategory_category_and_more.py
new file mode 100644
index 00000000..9f67da83
--- /dev/null
+++ b/backend/letter/migrations/0017_alter_giftdescriptioncategory_category_and_more.py
@@ -0,0 +1,50 @@
+# Generated by Django 4.2.7 on 2024-07-11 06:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("letter", "0016_rename_category_lettercategory"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="giftdescriptioncategory",
+            name="category",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="categorisations",
+                to="letter.giftcategory",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="giftdescriptioncategory",
+            name="gift",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="categorisations",
+                to="letter.giftdescription",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="letterdescriptioncategory",
+            name="category",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="categorisations",
+                to="letter.lettercategory",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="letterdescriptioncategory",
+            name="letter",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="categorisations",
+                to="letter.letterdescription",
+            ),
+        ),
+    ]
diff --git a/backend/letter/models.py b/backend/letter/models.py
index 93437d0e..0c7aa642 100644
--- a/backend/letter/models.py
+++ b/backend/letter/models.py
@@ -34,16 +34,18 @@ class Meta:
 
 class GiftDescriptionCategory(DescriptionField, models.Model):
     """
-    Categorisation of a gift in an a narrative source.
+    Categorisation of a gift in a narrative source.
     """
 
     gift = models.ForeignKey(
         to=GiftDescription,
         on_delete=models.CASCADE,
+        related_name="categorisations",
     )
     category = models.ForeignKey(
         to=GiftCategory,
         on_delete=models.CASCADE,
+        related_name="categorisations",
     )
 
     def __str__(self) -> str:
@@ -77,16 +79,18 @@ def __str__(self):
 
 class LetterDescriptionCategory(DescriptionField, models.Model):
     """
-    Categorisation of a letter in an a narrative source.
+    Categorisation of a letter in a narrative source.
     """
 
     letter = models.ForeignKey(
         to=LetterDescription,
         on_delete=models.CASCADE,
+        related_name="categorisations",
     )
     category = models.ForeignKey(
         to=LetterCategory,
         on_delete=models.CASCADE,
+        related_name="categorisations",
     )
 
     def __str__(self) -> str:
diff --git a/backend/letter/types/GiftDescriptionType.py b/backend/letter/types/GiftDescriptionType.py
index 644b0292..b80ea8fb 100644
--- a/backend/letter/types/GiftDescriptionType.py
+++ b/backend/letter/types/GiftDescriptionType.py
@@ -1,12 +1,19 @@
-from graphene import ResolveInfo
+from graphene import List, NonNull, ResolveInfo
 from graphene_django import DjangoObjectType
 from django.db.models import QuerySet
 
 from core.types.EntityDescriptionType import EntityDescriptionType
-from letter.models import GiftDescription
+from letter.models import GiftCategory, GiftDescription, GiftDescriptionCategory
+from letter.types import GiftDescriptionCategoryType
+from letter.types.GiftCategoryType import GiftCategoryType
 
 
 class GiftDescriptionType(EntityDescriptionType, DjangoObjectType):
+    # Direct access to foreign key
+    categories = List(NonNull(GiftCategoryType), required=True)
+    # Through model
+    categorisations = List(NonNull(GiftDescriptionCategoryType), required=True)
+
     class Meta:
         model = GiftDescription
         fields = [
@@ -19,3 +26,15 @@ def get_queryset(
         cls, queryset: QuerySet[GiftDescription], info: ResolveInfo
     ) -> QuerySet[GiftDescription]:
         return queryset.all()
+
+    @staticmethod
+    def resolve_categories(
+        parent: GiftDescription, info: ResolveInfo
+    ) -> QuerySet[GiftCategory]:
+        return parent.categories.all()
+
+    @staticmethod
+    def resolve_categorisations(
+        parent: GiftDescription, info: ResolveInfo
+    ) -> QuerySet[GiftDescriptionCategory]:
+        return GiftDescriptionCategory.objects.filter(gift=parent)
diff --git a/backend/letter/types/LetterDescriptionType.py b/backend/letter/types/LetterDescriptionType.py
index ebdc30f0..46007969 100644
--- a/backend/letter/types/LetterDescriptionType.py
+++ b/backend/letter/types/LetterDescriptionType.py
@@ -1,12 +1,19 @@
-from graphene import ResolveInfo
+from graphene import List, NonNull, ResolveInfo
 from graphene_django import DjangoObjectType
 from django.db.models import QuerySet
 
 from core.types.EntityDescriptionType import EntityDescriptionType
-from letter.models import LetterDescription
+from letter.models import LetterCategory, LetterDescription, LetterDescriptionCategory
+from letter.types.LetterCategoryType import LetterCategoryType
+from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
 
 
 class LetterDescriptionType(EntityDescriptionType, DjangoObjectType):
+    # Direct access to foreign key
+    categories = List(NonNull(LetterCategoryType), required=True)
+    # Through model
+    categorisations = List(NonNull(LetterDescriptionCategoryType), required=True)
+
     class Meta:
         model = LetterDescription
         fields = [
@@ -19,3 +26,15 @@ def get_queryset(
         cls, queryset: QuerySet[LetterDescription], info: ResolveInfo
     ) -> QuerySet[LetterDescription]:
         return queryset.all()
+
+    @staticmethod
+    def resolve_categories(
+        parent: LetterDescription, info: ResolveInfo
+    ) -> QuerySet[LetterCategory]:
+        return parent.categories.all()
+
+    @staticmethod
+    def resolve_categorisations(
+        parent: LetterDescription, info: ResolveInfo
+    ) -> QuerySet[LetterDescriptionCategory]:
+        return LetterDescriptionCategory.objects.filter(letter=parent)

From 50c2ade3e6c78fa80b58724783372b8d0005b848 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 11 Jul 2024 09:32:42 +0200
Subject: [PATCH 113/565] Fix import

---
 backend/letter/types/GiftDescriptionType.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/letter/types/GiftDescriptionType.py b/backend/letter/types/GiftDescriptionType.py
index b80ea8fb..dd886463 100644
--- a/backend/letter/types/GiftDescriptionType.py
+++ b/backend/letter/types/GiftDescriptionType.py
@@ -4,7 +4,7 @@
 
 from core.types.EntityDescriptionType import EntityDescriptionType
 from letter.models import GiftCategory, GiftDescription, GiftDescriptionCategory
-from letter.types import GiftDescriptionCategoryType
+from letter.types.GiftDescriptionCategoryType import GiftDescriptionCategoryType
 from letter.types.GiftCategoryType import GiftCategoryType
 
 

From 507dec23491592859cdd1dc6032aa60cebe2b432 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 11 Jul 2024 15:06:30 +0200
Subject: [PATCH 114/565] Space types and queries

---
 backend/graphql_app/schema.py               |  3 +-
 backend/space/queries.py                    | 35 +++++++++
 backend/space/types/RegionFieldType.py      | 22 ++++++
 backend/space/types/RegionType.py           | 21 +++++
 backend/space/types/SettlementFieldType.py  | 18 +++++
 backend/space/types/SettlementType.py       | 21 +++++
 backend/space/types/SpaceDescriptionType.py | 87 +++++++++++++++++++++
 backend/space/types/StructureFieldType.py   | 22 ++++++
 backend/space/types/StructureType.py        | 22 ++++++
 9 files changed, 250 insertions(+), 1 deletion(-)
 create mode 100644 backend/space/queries.py
 create mode 100644 backend/space/types/RegionFieldType.py
 create mode 100644 backend/space/types/RegionType.py
 create mode 100644 backend/space/types/SettlementFieldType.py
 create mode 100644 backend/space/types/SettlementType.py
 create mode 100644 backend/space/types/SpaceDescriptionType.py
 create mode 100644 backend/space/types/StructureFieldType.py
 create mode 100644 backend/space/types/StructureType.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index fc0a6d31..a6a90192 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -3,10 +3,11 @@
 from event.queries import EventQueries
 from person.queries import PersonQueries
 from source.queries import SourceQueries
+from space.queries import SpaceQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 
 
-class Query(SourceQueries, PersonQueries, EventQueries, ObjectType):
+class Query(SourceQueries, PersonQueries, EventQueries, SpaceQueries, ObjectType):
     pass
 
 
diff --git a/backend/space/queries.py b/backend/space/queries.py
new file mode 100644
index 00000000..b8323a8d
--- /dev/null
+++ b/backend/space/queries.py
@@ -0,0 +1,35 @@
+from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
+from django.db.models import Q, QuerySet
+
+from space.models import SpaceDescription
+from space.types.SpaceDescriptionType import SpaceDescriptionType
+
+
+class SpaceQueries(ObjectType):
+    space_description = Field(SpaceDescriptionType, id=ID(required=True))
+    space_descriptions = List(
+        NonNull(SpaceDescriptionType), required=True, source_id=ID()
+    )
+
+    @staticmethod
+    def resolve_space_description(
+        parent: None, info: ResolveInfo, id: str
+    ) -> SpaceDescription | None:
+        try:
+            return SpaceDescriptionType.get_queryset(
+                SpaceDescription.objects, info
+            ).get(id=id)
+        except SpaceDescription.DoesNotExist:
+            return None
+
+    @staticmethod
+    def resolve_space_descriptions(
+        parent: None,
+        info: ResolveInfo,
+        source_id: str | None = None,
+    ) -> QuerySet[SpaceDescription]:
+        filters = Q() if source_id is None else Q(source_id=source_id)
+
+        return SpaceDescriptionType.get_queryset(SpaceDescription.objects, info).filter(
+            filters
+        )
diff --git a/backend/space/types/RegionFieldType.py b/backend/space/types/RegionFieldType.py
new file mode 100644
index 00000000..684e7f67
--- /dev/null
+++ b/backend/space/types/RegionFieldType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django.types import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.DescriptionFieldType import DescriptionFieldType
+from space.models import RegionField
+
+
+class RegionFieldType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = RegionField
+        fields = [
+            "id",
+            "space",
+            "region",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[RegionField], info: ResolveInfo
+    ) -> QuerySet[RegionField]:
+        return queryset.all()
diff --git a/backend/space/types/RegionType.py b/backend/space/types/RegionType.py
new file mode 100644
index 00000000..849a2930
--- /dev/null
+++ b/backend/space/types/RegionType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django.types import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.HistoricalEntityType import HistoricalEntityType
+from space.models import Region
+
+
+class RegionType(HistoricalEntityType, DjangoObjectType):
+    class Meta:
+        model = Region
+        fields = [
+            "id",
+            "type",
+        ] + HistoricalEntityType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[Region], info: ResolveInfo
+    ) -> QuerySet[Region]:
+        return queryset.all()
diff --git a/backend/space/types/SettlementFieldType.py b/backend/space/types/SettlementFieldType.py
new file mode 100644
index 00000000..4853a419
--- /dev/null
+++ b/backend/space/types/SettlementFieldType.py
@@ -0,0 +1,18 @@
+from graphene import ResolveInfo
+from graphene_django.types import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.DescriptionFieldType import DescriptionFieldType
+from space.models import SettlementField
+
+
+class SettlementFieldType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = SettlementField
+        fields = ["id", "space", "settlement"] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[SettlementField], info: ResolveInfo
+    ) -> QuerySet[SettlementField]:
+        return queryset.all()
diff --git a/backend/space/types/SettlementType.py b/backend/space/types/SettlementType.py
new file mode 100644
index 00000000..d4250142
--- /dev/null
+++ b/backend/space/types/SettlementType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django.types import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.HistoricalEntityType import HistoricalEntityType
+from space.models import Settlement
+
+
+class SettlementType(HistoricalEntityType, DjangoObjectType):
+    class Meta:
+        model = Settlement
+        fields = [
+            "id",
+            "regions",
+        ] + HistoricalEntityType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[Settlement], info: ResolveInfo
+    ) -> QuerySet[Settlement]:
+        return queryset.all()
diff --git a/backend/space/types/SpaceDescriptionType.py b/backend/space/types/SpaceDescriptionType.py
new file mode 100644
index 00000000..14a8366d
--- /dev/null
+++ b/backend/space/types/SpaceDescriptionType.py
@@ -0,0 +1,87 @@
+from graphene import List, NonNull, ResolveInfo
+from graphene_django.types import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.EntityDescriptionType import EntityDescriptionType
+from space.models import (
+    Region,
+    RegionField,
+    Settlement,
+    SettlementField,
+    SpaceDescription,
+    Structure,
+    StructureField,
+)
+from space.types.RegionFieldType import RegionFieldType
+from space.types.RegionType import RegionType
+from space.types.SettlementType import SettlementType
+from space.types.StructureType import StructureType
+from space.types.SettlementFieldType import SettlementFieldType
+from space.types.StructureFieldType import StructureFieldType
+
+
+class SpaceDescriptionType(EntityDescriptionType, DjangoObjectType):
+    regions = List(NonNull(RegionType), required=True)
+    settlements = List(NonNull(SettlementType), required=True)
+    structures = List(NonNull(StructureType), required=True)
+
+    region_fields = List(NonNull(RegionFieldType), required=True)
+    settlement_fields = List(NonNull(SettlementFieldType), required=True)
+    structure_fields = List(NonNull(StructureFieldType), required=True)
+
+    class Meta:
+        model = SpaceDescription
+        fields = [
+            "id",
+            "regions",
+            "settlements",
+            "structures",
+        ] + EntityDescriptionType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[SpaceDescription], info: ResolveInfo
+    ) -> QuerySet[SpaceDescription]:
+        return queryset.all()
+
+    @staticmethod
+    def resolve_regions(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> QuerySet[Region]:
+        return parent.regions.all()
+
+    @staticmethod
+    def resolve_settlements(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> QuerySet[Settlement]:
+        return parent.settlements.all()
+
+    @staticmethod
+    def resolve_structures(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> QuerySet[Structure]:
+        return parent.structures.all()
+
+    @staticmethod
+    def resolve_region_fields(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> QuerySet[RegionField]:
+        return RegionFieldType.get_queryset(RegionField.objects, info).filter(
+            space=parent
+        )
+
+    @staticmethod
+    def resolve_settlement_fields(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> QuerySet[SettlementField]:
+        return SettlementFieldType.get_queryset(SettlementField.objects, info).filter(
+            space=parent
+        )
+
+    @staticmethod
+    def resolve_structure_fields(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> QuerySet[StructureField]:
+        return StructureFieldType.get_queryset(StructureField.objects, info).filter(
+            space=parent
+        )
diff --git a/backend/space/types/StructureFieldType.py b/backend/space/types/StructureFieldType.py
new file mode 100644
index 00000000..25e6cf89
--- /dev/null
+++ b/backend/space/types/StructureFieldType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django.types import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.DescriptionFieldType import DescriptionFieldType
+from space.models import StructureField
+
+
+class StructureFieldType(DescriptionFieldType, DjangoObjectType):
+    class Meta:
+        model = StructureField
+        fields = [
+            "id",
+            "space",
+            "structure",
+        ] + DescriptionFieldType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[StructureField], info: ResolveInfo
+    ) -> QuerySet[StructureField]:
+        return queryset.all()
diff --git a/backend/space/types/StructureType.py b/backend/space/types/StructureType.py
new file mode 100644
index 00000000..2f5adb7e
--- /dev/null
+++ b/backend/space/types/StructureType.py
@@ -0,0 +1,22 @@
+from graphene import ResolveInfo
+from graphene_django.types import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.HistoricalEntityType import HistoricalEntityType
+from space.models import Structure
+
+
+class StructureType(HistoricalEntityType, DjangoObjectType):
+    class Meta:
+        model = Structure
+        fields = [
+            "id",
+            "settlement",
+            "level",
+        ] + HistoricalEntityType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[Structure], info: ResolveInfo
+    ) -> QuerySet[Structure]:
+        return queryset.all()

From 0139bd5a9e43c5fef5ac0cafbb6b214ccb2badc7 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 23 Jul 2024 16:25:18 +0200
Subject: [PATCH 115/565] remove functional test suite

---
 bootstrap.py                         |  13 +-
 functional-tests/.gitignore          |  34 ---
 functional-tests/README.md           | 329 ---------------------------
 functional-tests/conftest.py         |  82 -------
 functional-tests/requirements.in     |   2 -
 functional-tests/requirements.txt    |  53 -----
 functional-tests/test_foundations.py |  18 --
 package.json                         |   9 +-
 8 files changed, 7 insertions(+), 533 deletions(-)
 delete mode 100644 functional-tests/.gitignore
 delete mode 100644 functional-tests/README.md
 delete mode 100644 functional-tests/conftest.py
 delete mode 100644 functional-tests/requirements.in
 delete mode 100644 functional-tests/requirements.txt
 delete mode 100644 functional-tests/test_foundations.py

diff --git a/bootstrap.py b/bootstrap.py
index c90ab38f..409c6e90 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -64,11 +64,10 @@ def __str__(self):
 def main(argv):
     already_in_project, cd_into_project = prepare_cwd()
     venv, create_virtualenv, activate_venv = prepare_virtualenv()
-    pip_tools = backpack = funcpack = False
+    pip_tools = backpack = False
     if venv:
         pip_tools = install_pip_tools()
         backpack = install_backend_packages()
-        funcpack = install_functest_packages()
     frontpack = install_frontend_packages()
     db, create_db = prepare_db()
     migrate = superuser = False
@@ -80,13 +79,14 @@ def main(argv):
     gitflow = False
     if main_branch:
         gitflow = setup_gitflow()
-    if not all([gitflow, superuser, frontpack, funcpack, pip_tools]):
+    if not all([gitflow, superuser, frontpack, pip_tools]):
         print('\nPlease read {} for information on failed commands.'.format(LOGFILE_NAME))
     print('\nAlmost ready to go! Just a couple more commands to run:')
     if not already_in_project: print(cd_into_project)
     if not venv: print(create_virtualenv)
     print(activate_venv)
-    if not (pip_tools and backpack and frontpack and funcpack): print(install_all_packages)
+    if not (pip_tools and backpack and frontpack):
+        print(install_all_packages)
     if not db: print(create_db)
     if not migrate: print(run_migrations)
     if not superuser: print(create_superuser)
@@ -174,11 +174,6 @@ def make_create_db_command(psql_cmd):
     ['yarn', 'install-back'],
 )
 
-install_functest_packages = Command(
-    'Install the functional test requirements',
-    ['yarn', 'install-func'],
-)
-
 install_frontend_packages = Command(
     'Install the frontend packages',
     ['yarn', 'fyarn'],
diff --git a/functional-tests/.gitignore b/functional-tests/.gitignore
deleted file mode 100644
index 29b95744..00000000
--- a/functional-tests/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-.coverage
-.coverage.*
-.cache
-coverage.xml
-*.cover
-.pytest_cache/
-
-# pyenv
-.python-version
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# WebDriver logs
-*.log
-
-# Local overrides
-pytest.ini
diff --git a/functional-tests/README.md b/functional-tests/README.md
deleted file mode 100644
index 7cd89a9c..00000000
--- a/functional-tests/README.md
+++ /dev/null
@@ -1,329 +0,0 @@
-# Lettercraft & Epistolary Performance in Medieval Europe functional tests
-
-Lettercraft & Epistolary Performance in Medieval Europe
-
-This is a functional test suite based on [pytest][1] and [Selenium WebDriver][2]. It is designed such that it can test any network-reachable instance of the Lettercraft & Epistolary Performance in Medieval Europe application. While the tests are based on knowledge about the user interface of the application, no knowledge of its implementation is needed.
-
-[1]: https://docs.pytest.org/en/latest/
-[2]: https://www.selenium.dev/documentation/webdriver/
-
-
-## Before you start
-
-You need to install the following software:
-
- - Python >= 3.8, <= 3.10
- - virtualenv
- - WebDriver for at least one browser
-
-You can find links to WebDrivers for the most common browsers [over here][3].
-
-[3]: https://pypi.org/project/selenium/#drivers
-
-
-## How it works
-
-Every test in this suite is a short, automated simulation of the interaction between a user and Lettercraft & Epistolary Performance in Medieval Europe, written in Python. [Selenium][2] provides the programmable web browser interface while [pytest][1] provides administrative support in the form of configuration and fixtures.
-
-A typical test starts by visiting a page of the application. The "user" then interacts with the application by clicking on buttons and links, filling and submitting forms, etcetera. The result is validated by checking that the user ends up at the right page, particular content is present, and so forth. Finally, some cleanup is done in order to not influence the next test.
-
-Each test is written as a single function. Functions are grouped in files, which are in turn grouped in directories. There is a many-to-many relationship between fixtures and tests. Fixtures, like tests, can exist at any level of the directory hierarchy. In principle, it is entirely up to the tester how to organize the tests and fixtures.
-
-The root directory of the suite contains the main `conftest.py` (next to this README). This module handles the configuration of the test suite and also provides fixtures that are available everywhere within the suite.
-
-
-## Running the tests
-
-### Quickstart
-
-Create and activate a virtualenv. To install the packages:
-
-```console
-$ pip install pip-tools
-$ pip-sync
-```
-
-then, to start the suite with default settings:
-
-```console
-$ pytest
-```
-
-This will attempt to run the suite in Firefox and Chrome. It assumes that you have the application running locally on port 4200. In order specify other browsers or another network address, read on.
-
-
-### Configuring the browsers
-
-Suppose that you want to run the suite in Safari. You can configure this once by creating a `pytest.ini` next to this README with the following content:
-
-```ini
-[pytest]
-webdriver =
-    Safari
-```
-
-If you want to run the suite in multiple browsers, put each browser on a separate line. The available browser names are listed below.
-
-You can also override the browser setting for a single run by passing an argument to the `pytest` command line invocation:
-
-```console
-$ pytest -o webdriver=Firefox
-```
-
-You can pass multiple browsers by wrapping the option value in quotes and separating them by newlines:
-
-```console
-$ pytest -o webdriver="Firefox
-> Edge"
-```
-
-
-#### Available WebDriver names
-
-Android
-BlackBerry
-Chrome
-Edge
-Firefox
-Ie
-Opera
-PhantomJS
-Proxy
-Remote
-Safari
-WebKitGTK
-
-
-### Configuring the base address
-
-To run the suite with an instance of the application that runs elsewhere, pass the address of the home page of the application on the command line. The address should include the scheme and the path with a trailing `/`. For example:
-
-```console
-$ pytest --base-address http://localhost:5000/
-$ pytest --base-address https://www.lettercraft.com/app/
-```
-
-If you want the base address to always default to something other than `http://localhost:4200/`, you can also set this in the `pytest.ini`:
-
-```ini
-[pytest]
-webdriver =
-    Safari
-addopts = --base-address http://localhost:5000/
-```
-
-
-## Writing tests
-
-Test functions and modules that contain test functions should always have a name that starts with `test_`. A typical test function looks like this:
-
-```py
-def test_something(browser, base_address):
-    url = base_address + some_path
-    browser.get(url)
-    # more operations on browser
-    assert 'Some String' in browser.title
-    assert browser.some_method() == some_value
-```
-
-`browser`, as you have probably guessed, is the fixture that provides the webdriver instance on which you can simulate user interaction. The elegance of pytest shines here; if you have configured the suite to run with multiple browsers, the test will be run once for every browser, so you can pretend that there is only one browser in your test. The available properties and methods on the `browser` are documented [over here][4]. In some cases, you will need to [wait][5] after an interaction before you can continue your test. There is also a full [API documentation][10] for the Selenium Python bindings.
-
-[4]: https://www.selenium.dev/documentation/webdriver/capabilities/
-[5]: https://www.selenium.dev/documentation/webdriver/waits/
-[10]: https://www.selenium.dev/selenium/docs/api/py/api.html
-
-`base_address` is the main address fixture. It is just a string, containing either whatever you passed as the `--base-address` or the default of `http://localhost:4200/`. There are a couple of derived address fixtures: `api_address`, `api_auth_address` and `admin_address`. Whenever you need to pass an address to the `browser`, make sure to compute this address relative to the `base_address` or one of its derived fixtures; this ensures that all requests in the test suite go to the right instance of the application.
-
-Besides `browser` and the `*_address` fixtures, pytest provides several builtin fixtures that you can use. Especially the [`tmpdir` fixture][6] can be useful if, for example, you want to download files from the application. You can get a full list of available fixtures by running `pytest -q --fixtures`. You can also add your own fixtures; see below.
-
-[6]: https://docs.pytest.org/en/latest/tmpdir.html#the-tmpdir-fixture
-
-
-## Writing fixtures
-
-In a fixture function, you can write approximately the same kind of code as in a test function. Your fixture can depend on other fixtures that it takes as parameters. By extension, you can also use the `browser` fixture with the full [WebDriver API][4]. The main ways in which a fixture is different are the following:
-
- - Fixtures are always decorated with `@pytest.fixture`, so modules that contain fixtures must `import pytest`.
- - Fixtures may either `return` or `yield` a single value. This value is what tests and other fixtures receive when they take the name of a fixture as a parameter.
- - If a fixture contains a `yield` statement, everything after the `yield` is teardown code. The teardown code gets executed when all dependent tests and other fixtures have completed.
- - Fixtures should not behave as generators, i.e., they should not `yield` multiple times. If you want to have multiple variants of a fixture, make it [parametric][8] instead.
-
-Some examples follow below. For further information, the pytest documentation has a [comprehensive overview][7] that adresses (nearly) all aspects of fixtures.
-
-[7]: https://docs.pytest.org/en/latest/fixture.html
-[8]: https://docs.pytest.org/en/latest/fixture.html#parametrizing-fixtures
-
-
-### Example 1: common starting address
-
-Suppose we have a test module in which all tests start on the same page. We have the path to this page (relative to the base address) stored in the global constant `START_PATH`. Naievely, we may simply start every test like this:
-
-```py
-def test_something(browser, base_address):
-    browser.get(base_address + START_PATH)
-    # continue with interactions and assertions
-```
-
-but we would be repeating ourselves. To make this [DRY][9]er, we can move this initial page fetch into a fixture at the top of the module:
-
-[9]: https://en.wikipedia.org/wiki/Don%27t_repeat_yourself
-
-```py
-import pytest
-
-START_PATH = 'some/path/'
-
-@pytest.fixture
-def start_page(browser, base_address):
-    browser.get(base_address + START_PATH)
-    # implicit return
-```
-
-and then use it like this in each test:
-
-```py
-def test_something(browser, start_page):
-    # browser is already on the right page
-    # continue with interactions and assertions
-```
-
-To make this even DRYer, we can factor out the address computation from the `start_page` fixture. After all, we may navigate away from the starting page in some tests and then want to return to it. The top of our module would change into this:
-
-```py
-import pytest
-
-START_PATH = 'some/path/'
-
-@pytest.fixture
-def start_address(base_address):
-    return base_address + START_PATH
-
-@pytest.fixture
-def start_page(browser, start_address):
-    browser.get(start_address)
-    # implicit return
-```
-
-The tests could remain the same after this change, but now we have the option to use `start_address` as an additional fixture in tests that need to return to this page later.
-
-
-### Example 2: being authenticated
-
-For some tests, we may have to log in first. It would be convenient if our tests can have this condition fulfilled by just using a fixture, like this:
-
-```py
-def some_test(browser, base_address, login):
-    # user already authenticated on browser (cookie is set)
-    # continue with interactions and assertions
-```
-
-Since we might want to log in in any test, we will put our `login` fixture in the `conftest.py` in the root of the test suite. Our first throw at it could look like this:
-
-```py
-import pytest
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.expected_conditions import url_changes, title_is
-
-USER_NAME = 'me'
-USER_PASS = '12345'
-
-@pytest.fixture
-def login(browser, api_auth_address):
-    login_address = api_auth_address + 'login/'
-    browser.get(login_address)
-    name_input = browser.find_element_by_name('username')
-    name_input.send_keys(USER_NAME)
-    pass_input = browser.find_element_by_name('password')
-    pass_input.send_keys(USER_PASS)
-    pass_input.submit()
-    WebDriverWait(browser, 2).until(url_changes(login_address))
-    WebDriverWait(browser, 2).until_not(title_is(''))
-    # at this point, the cookie should be set
-    # implicit return
-```
-
-You may wonder why we don't `yield` and then add teardown code after it in which we logout again. The answer is that this isn't necessary, because the teardown code of the `browser` fixture already deletes the cookies after every test.
-
-We can do better than this. The `login` fixture lets us start in an authenticated state, but if we want to log in only halfway during a test, it doesn't help us. We may also sometimes want to use different user credentials. We can enable both by encapsulating users in a class and using this in multiple fixtures:
-
-```py
-import pytest
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.expected_conditions import url_changes, title_is
-
-USER_NAME = 'me'
-USER_PASS = '12345'
-
-class User(object):
-    def __init__(self, username, password, browser=None):
-        self.username = username
-        self.password = password
-        self.browser = browser
-
-    def login(self, login_address, browser=None):
-        driver = browser or self.browser
-        assert driver is not None
-        driver.get(login_address)
-        name_input = driver.find_element_by_name('username')
-        name_input.send_keys(USER_NAME)
-        pass_input = driver.find_element_by_name('password')
-        pass_input.send_keys(USER_PASS)
-        pass_input.submit()
-        WebDriverWait(driver, 2).until(url_changes(login_address))
-        WebDriverWait(driver, 2).until_not(title_is(''))
-        # at this point, the cookie should be set
-
-    def logout(self, logout_address, browser=None):
-        # left as an exercise to the reader
-
-@pytest.fixture
-def default_user(browser):
-    return User(USER_NAME, USER_PASS, browser)
-
-@pytest.fixture
-def login(browser, api_auth_address, default_user):
-    login_address = api_auth_address + 'login/'
-    default_user.login(login_address)
-    # implicit return
-```
-
-Now we have a lot more options. We may login, change our password, logout and try whether we can login with the new password. We may also create new users inside fixtures or during tests and pass the dynamically generated users around in a `User` instance, although this requires the default user to have admin rights.
-
-We may also want to be able to override the username and password from the command line or the `pytest.ini`. This is especially useful if we want our default user to have admin rights. Here's the basic way to do it by adding new entries to the `pytest.ini`:
-
-```py
-import pytest
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support.expected_conditions import url_changes, title_is
-
-USER_NAME = 'me'
-USER_PASS = '12345'
-USER_INI_NAME = 'default_user'
-USER_INI_PASS = 'default_pwd'
-
-def pytest_addoption(parser):
-    # append this to the code that was already there:
-    parser.addini(USER_INI_NAME, 'Name of the default user', default=USER_NAME)
-    parser.addini(USER_INI_PASS, 'Password of the default user', default=USER_PASS)
-
-class User(object):
-    # same as before
-
-@pytest.fixture
-def default_user(browser, pytestconfig):
-    username = pytestconfig.getini(USER_INI_NAME)
-    password = pytestconfig.getini(USER_INI_PASS)
-    return User(username, password, browser)
-
-@pytest.fixture
-def login(browser, api_auth_address, default_user):
-    # same as before
-```
-
-We can now override the username and password by setting them in our `pytest.ini`:
-
-```ini
-[pytest]
-default_user = me_again
-default_pwd = 54321
-```
diff --git a/functional-tests/conftest.py b/functional-tests/conftest.py
deleted file mode 100644
index 3ccc46b7..00000000
--- a/functional-tests/conftest.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import os
-import pytest
-from selenium import webdriver
-
-WEBDRIVER_INI_NAME = 'webdriver'
-BASE_ADDRESS_OPTION_NAME = 'base_address'
-
-
-def pytest_addoption(parser):
-    """ py.test hook where we register configuration options and defaults. """
-    parser.addini(
-        WEBDRIVER_INI_NAME,
-        'Specify browsers in which the tests should run',
-        type='linelist',
-        default=['Chrome' ,'Firefox'],
-    )
-    parser.addoption(
-        '--base-address',
-        default='http://localhost:8000/',
-        help='specifies the base address where the application is running',
-        dest=BASE_ADDRESS_OPTION_NAME,
-    )
-
-
-def pytest_generate_tests(metafunc):
-    """ py.test hook where we inject configurable fixtures. """
-    if 'webdriver_name' in metafunc.fixturenames:
-        names = metafunc.config.getini(WEBDRIVER_INI_NAME)
-        metafunc.parametrize('webdriver_name', names, scope='session')
-
-
-@pytest.fixture(scope='session')
-def webdriver_instance(webdriver_name):
-    """ Provides a WebDriver instance that persists throughout the session.
-
-        Use the `browser` fixture instead; it performs cleanups after each test.
-    """
-    if webdriver_name == 'Chrome':
-        options = webdriver.ChromeOptions()
-        options.add_argument('--headless')
-        options.add_argument('--no-sandbox')
-        options.add_argument('--disable-gpu')
-        options.add_argument('--remote-debugging-port=9222')
-        driver = webdriver.Chrome(options=options)
-    elif webdriver_name == 'Firefox':
-        options = webdriver.FirefoxOptions()
-        options.add_argument('-headless')
-        driver = webdriver.Firefox(options=options)
-    else:
-        factory = getattr(webdriver, webdriver_name)
-        driver = factory()
-    try:
-        yield driver
-    finally:
-        driver.quit()
-
-
-@pytest.fixture
-def browser(webdriver_instance):
-    """ Provides a WebDriver instance and performs some cleanups afterwards. """
-    yield webdriver_instance
-    webdriver_instance.delete_all_cookies()
-
-
-@pytest.fixture(scope='session')
-def base_address(pytestconfig):
-    return pytestconfig.getoption(BASE_ADDRESS_OPTION_NAME)
-
-
-@pytest.fixture
-def api_address(base_address):
-    return base_address + 'api/'
-
-
-@pytest.fixture
-def api_auth_address(base_address):
-    return base_address + 'api-auth/'
-
-
-@pytest.fixture
-def admin_address(base_address):
-    return base_address + 'admin/'
diff --git a/functional-tests/requirements.in b/functional-tests/requirements.in
deleted file mode 100644
index 87732f1f..00000000
--- a/functional-tests/requirements.in
+++ /dev/null
@@ -1,2 +0,0 @@
-selenium
-pytest
diff --git a/functional-tests/requirements.txt b/functional-tests/requirements.txt
deleted file mode 100644
index c5a9a5ec..00000000
--- a/functional-tests/requirements.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.10
-# by the following command:
-#
-#    pip-compile
-#
-attrs==23.1.0
-    # via
-    #   outcome
-    #   trio
-certifi==2023.7.22
-    # via selenium
-exceptiongroup==1.1.3
-    # via
-    #   pytest
-    #   trio
-    #   trio-websocket
-h11==0.14.0
-    # via wsproto
-idna==3.4
-    # via trio
-iniconfig==2.0.0
-    # via pytest
-outcome==1.3.0.post0
-    # via trio
-packaging==23.2
-    # via pytest
-pluggy==1.3.0
-    # via pytest
-pysocks==1.7.1
-    # via urllib3
-pytest==7.4.3
-    # via -r requirements.in
-selenium==4.15.2
-    # via -r requirements.in
-sniffio==1.3.0
-    # via trio
-sortedcontainers==2.4.0
-    # via trio
-tomli==2.0.1
-    # via pytest
-trio==0.23.1
-    # via
-    #   selenium
-    #   trio-websocket
-trio-websocket==0.11.1
-    # via selenium
-urllib3[socks]==2.0.7
-    # via
-    #   selenium
-    #   urllib3
-wsproto==1.2.0
-    # via trio-websocket
diff --git a/functional-tests/test_foundations.py b/functional-tests/test_foundations.py
deleted file mode 100644
index 5915335b..00000000
--- a/functional-tests/test_foundations.py
+++ /dev/null
@@ -1,18 +0,0 @@
-def test_lettercraft_frontend(browser, base_address):
-    browser.get(base_address)
-    assert 'Lettercraft & Epistolary Performance in Medieval Europe' in browser.title
-
-
-def test_lettercraft_admin(browser, admin_address):
-    browser.get(admin_address)
-    assert 'Django' in browser.title
-
-
-def test_lettercraft_api(browser, api_address):
-    browser.get(api_address)
-    assert 'Lettercraft & Epistolary Performance in Medieval Europe' in browser.title
-
-
-def test_lettercraft_api_auth(browser, api_auth_address):
-    browser.get(api_auth_address + 'login/')
-    assert 'Django REST framework' in browser.title
diff --git a/package.json b/package.json
index 89862de0..27703968 100644
--- a/package.json
+++ b/package.json
@@ -9,18 +9,15 @@
     "scripts": {
         "front": "cd frontend && ",
         "back": "cd backend && ",
-        "func": "cd functional-tests && ",
         "fyarn": "yarn front yarn",
         "preinstall": "pip install pip-tools",
         "install-back": "yarn back -- pip install -r requirements.txt",
-        "install-func": "yarn func -- pip install -r requirements.txt",
-        "postinstall": "yarn fyarn && yarn install-back && yarn install-func",
+        "postinstall": "yarn fyarn && yarn install-back",
         "django": "yarn back python manage.py",
         "startapp": "yarn back django-admin startapp --settings lettercraft.settings --pythonpath .",
         "test-front": "yarn front yarn test",
         "test-back": "yarn back python -m pytest && yarn back python manage.py test",
-        "test-func": "yarn func pytest",
-        "test": "yarn test-back && yarn test-front && yarn test-func",
+        "test": "yarn test-back && yarn test-front",
         "start-front": "yarn front yarn serve",
         "start-back": "cd backend && python manage.py runserver --settings glue --pythonpath ..",
         "codegen": "yarn front yarn codegen",
@@ -28,7 +25,7 @@
         "watch-test-front": "yarn front yarn watch-test",
         "watch-test-back": "yarn test-back --looponfail",
         "watch-back": "yarn livereload-back",
-        "start": "yarn start-front & yarn start-back & yarn watch-back",
+        "start": "yarn start-front & yarn start-back & yarn watch-back & yarn codegen",
         "build": "yarn front yarn build",
         "build-p": "yarn build",
         "collectstatic-p": "cd backend && python manage.py collectstatic --noinput -v 0 --settings collect --pythonpath ..",

From ab472c498e5ffbe374f1dc2927e43d072a4fc255 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 23 Jul 2024 16:57:04 +0200
Subject: [PATCH 116/565] update developer docs

---
 CONTRIBUTING.md | 150 +++++++++++++++++++-----------------------------
 1 file changed, 60 insertions(+), 90 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a5733c51..a3e27a5a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,161 +13,131 @@ You need to install the following software:
  - [Visual C++ for Python][1] (Windows only)
  - Node.js >= 16, <= 18
  - Yarn
- - [WebDriver][2] for at least one browser (only for functional testing)
 
 [1]: https://wiki.python.org/moin/WindowsCompilers
-[2]: https://pypi.org/project/selenium/#drivers
 
 
 ## How it works
 
-This project integrates three isolated subprojects, each inside its own subdirectory with its own code, package dependencies and tests:
+This project integrates two isolated subprojects, each inside its own subdirectory with its own code, package dependencies and tests:
 
- - **backend**: the server side web application based on [Django][3] and [DRF][4]
-
- - **frontend**: the client side web application based on [Angular](https://angular.io)
-
- - **functional-tests**: the functional test suite based on [Selenium][6] and [pytest][7]
-
-[3]: https://www.djangoproject.com
-[4]: https://www.django-rest-framework.org
-[6]: https://www.selenium.dev/documentation/webdriver/
-[7]: https://docs.pytest.org/en/latest/
+- **backend**: the server side web application based on [Django](https://www.djangoproject.com)
+- **frontend**: the client side web application based on [Angular](https://angular.io)
 
 Each subproject is configurable from the outside. Integration is achieved using "magic configuration" which is contained inside the root directory together with this document. In this way, the subprojects can stay truly isolated from each other.
 
 If you are reading this document, you'll likely be working with the integrated project as a whole rather than with one of the subprojects in isolation. In this case, this document should be your primary source of information on how to develop or deploy the project. However, we recommend that you also read the "How it works" section in the README of each subproject.
 
-
 ## Development
 
 ### Quickstart
 
 First time after cloning this project:
 
-```console
-$ python bootstrap.py
+```sh
+python bootstrap.py
 ```
 
-Running the application in [development mode](#development-mode-vs-production-mode) (hit ctrl-C to stop):
+This will also activate a Python virtual environment. From within the environment, you can run the application in [development mode](#development-mode-vs-production-mode) (hit ctrl-C to stop):
 
-```console
-$ yarn start
+```sh
+yarn start
 ```
 
-This will run the backend and frontend applications, as well as their unittests, and watch all source files for changes. You can visit the frontend on http://localhost:8000/, the browsable backend API on http://localhost:8000/api/ and the backend admin on http://localhost:8000/admin/. On every change, unittests rerun, frontend code rebuilds and open browser tabs refresh automatically (livereload).
+This will run the backend and frontend applications, and watch all source files for changes. On every change, unittests rerun, frontend code rebuilds and open browser tabs refresh automatically (livereload).
 
+Some useful URLs:
 
-### Recommended order of development
+- https://localhost:8000/ to view the homepage for the frontend
+- https://localhost:8000/admin/ to view the backend admin
+- https://localhost:8000/api/graphql to expore the GraphQL API
+
+### Working with GraphQL
 
-For each new feature, we suggested that you work through the steps listed below. This could be called a back-to-front or "bottom up" order. Of course, you may have reasons to choose otherwise. For example, if very precise specifications are provided, you could move step 8 to the front for a more test-driven approach.
+Lettercraft uses a GraphQL API for research data. (User authentication / management is not handled with GraphQL.)
 
-Steps 1–5 also include updating the unittests. Only functions should be tested, especially critical and nontrivial ones.
+If you have worked on other applications from our lab, working with GraphQL may be new to you. See [Working with GraphQL](https://github.com/CentreForDigitalHumanities/dh-graphql/blob/main/Working%20with%20GraphQL.md) for a detailed guide on working with GraphQL in a Django/Angular project.
 
- 1. Backend model changes including migrations.
- 2. Backend serializer changes and backend admin changes.
- 3. Backend API endpoint changes.
- 4. Frontend model changes.
- 5. Other frontend unit changes (templates, views, routers, FSMs).
- 6. Frontend integration (globals, event bindings).
- 7. Run functional tests, repair broken functionality and broken tests.
- 8. [Add functional tests](/functional-tests/README.md#writing-tests) for the new feature.
- 9. Update technical documentation.
+One notable change from the development workflow in other applications is code generation: frontend types are automatically generated based on the backend definitions. If you are working on the API, make sure to run `yarn codegen` to keep generated types up to date.
 
-For release branches, we suggest the following checklist.
+### Recommended order of development
 
- 1. Bump the version number in the `package.json` next to this document.
- 2. Run the functional tests in production mode, fix bugs if necessary.
- 3. Try using the application in production mode, look for problems that may have escaped the tests.
- 4. Add regression tests (unit or functional) that detect problems from step 3.
- 5. Work on the code until new regression tests from step 4 pass.
- 6. Optionally, repeat steps 2–5 with the application running in a real deployment setup (see [Deployment](#deployment)).
+For new features, it often makes sense to use a "bottom-up" approach, described below. Of course, you may have reasons to choose otherwise.
 
+1. Update backend models, including migrations.
+2. Adjust or add backend functions, including unit tests.
+3. Adjust backend queries and mutations.
+4. Integrate updated queries/mutations in the frontend.
+5. Add new frontend functionality, including unit tests.
+6. Update technical documentation.
 
 ### Commands for common tasks
 
-The `package.json` next to this document defines several shortcut commands to help streamline development. In total, there are over 30 commands. Most may be regarded as implementation details of other commands, although each command could be used directly. Below, we discuss the commands that are most likely to be useful to you. For full details, consult the `package.json`.
+The `package.json` next to this document defines several shortcut commands to help streamline development. Most may be regarded as implementation details of other commands, although each command could be used directly. Below, we discuss the commands that are most likely to be useful to you. For full details, consult the `package.json`.
+
+#### Installation
 
 Install the pinned versions of all package dependencies in all subprojects:
 
-```console
-$ yarn
+```sh
+yarn
 ```
 
-Run backend and frontend in [production mode](#development-mode-vs-production-mode):
+Alternatively, you can use separate commands for the frontend and backend:
 
-```console
-$ yarn start-p
+```sh
+yarn install-back
+yarn install-front
 ```
 
-Run the functional test suite:
+#### Running a development server
 
-```console
-$ yarn test-func [FUNCTIONAL TEST OPTIONS]
-```
+As described above, `yarn start` will start a development server. While it can be useful to start the whole application with a single command, most developers prefer to run each service in a separate terminal while working on the code. This makes the terminal output easier to read.
 
-The functional test suite by default assumes that you have the application running locally in production mode (i.e., on port `4200`). See [Configuring the browsers](/functional-tests/README.md#configuring-the-browsers) and [Configuring the base address](/functional-tests/README.md#configuring-the-base-address) in `functional-tests/README` for options.
+You can do this with the following commands (running each in a separate terminal):
 
-Run *all* tests (mostly useful for continuous integration):
-
-```console
-$ yarn test [FUNCTIONAL TEST OPTIONS]
+```sh
+yarn start-back # start the backend
+yarn start-front # start the frontend
+yarn watch-back # send livereload requests when the backend is updated (optional)
+yarn codegen # run frontend code generation when the backend is updated
 ```
 
-Run an arbitrary command from within the root of a subproject:
+Note: it's not necessary to run `yarn codegen` if you won't be making changes that affect the GraphQL API. (For instance, if you're only working on the frontend.)
 
-```console
-$ yarn back  [ARBITRARY BACKEND COMMAND HERE]
-$ yarn front [ARBITRARY FRONTEND COMMAND HERE]
-$ yarn func  [ARBITRARY FUNCTIONAL TESTS COMMAND HERE]
-```
+#### Running unit tests
 
-For example,
+You can run all unit tests with:
 
-```console
-$ yarn back less README.md
+```sh
+yarn test
 ```
 
-is equivalent to
+Backend tests are run with [pytest](), frontend tests with [jasmine](). For more detailed control over testing, like running a single test, consult the documentation of those libraries.
 
-```console
-$ cd backend
-$ less README.md
-$ cd ..
-```
+#### Running Django commands
 
 Run `python manage.py` within the `backend` directory:
 
-```console
-$ yarn django [SUBCOMMAND] [OPTIONS]
+```sh
+yarn django [SUBCOMMAND] [OPTIONS]
 ```
 
 `yarn django` is a shorthand for `yarn back python manage.py`. This command is useful for managing database migrations, among other things.
 
-Manage the frontend package dependencies:
+### Managing dependencies
 
-```console
-$ yarn fyarn (add|remove|upgrade|...) (PACKAGE ...) [OPTIONS]
-```
+#### Python dependencies
 
+Python dependencies are managed using pip and recorded in [requirements.in](/backend/requirements.in) / [requirements.txt](/backend/requirements.txt). To update dependencies:
 
+- Edit `requirements.in` to describe the new dependencies
+- Run `pip-compile` to update the full manifest in `requirements.txt`.
+- Run `pip install -r requirements.txt` to update your Python environment.
 
-### Notes on Python package dependencies
-
-Both the backend and the functional test suite are Python-based and package versions are pinned using [pip-tools][13] in both subprojects. For ease of development, you most likely want to use the same virtualenv for both and this is also what the `bootstrap.py` assumes.
-
-[13]: https://pypi.org/project/pip-tools/
-
-This comes with a small catch: the subprojects each have their own separate `requirements.txt`. If you run `pip-sync` in one subproject, the dependencies of the other will be uninstalled. In order to avoid this, you run `pip install -r requirements.txt` instead. The `yarn` command does this correctly by default.
-
-Another thing to be aware of, is that `pip-compile` takes the old contents of your `requirements.txt` into account when building the new version based on your `requirements.in`. You can use the following trick to keep the requirements in both projects aligned so the versions of common packages don't conflict:
-
-```console
-$ yarn back pip-compile
-# append contents of backend/requirements.txt to functional-tests/requirements.txt
-$ yarn func pip-compile
-```
+#### Frontend dependencies
 
+Frontend dependencies are managed using [yarn](https://classic.yarnpkg.com/en/). See the [usage guide](https://classic.yarnpkg.com/en/docs/usage) for details.
 
 ### Development mode vs production mode
 

From 1b8b4463262545f56ec678da5869b825648012cc Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 16:59:04 +0200
Subject: [PATCH 117/565] install bootstrap-icons

---
 frontend/package.json | 1 +
 frontend/yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/frontend/package.json b/frontend/package.json
index f21bb6d4..920af1b4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -35,6 +35,7 @@
     "@popperjs/core": "^2.11.6",
     "apollo-angular": "5.0.2",
     "bootstrap": "^5.2.3",
+    "bootstrap-icons": "^1.11.3",
     "colors": "^1.4.0",
     "graphql": "^16",
     "rxjs": "~7.8.0",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 69c80ad0..da396a39 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -4234,6 +4234,11 @@ boolbase@^1.0.0:
   resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+bootstrap-icons@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz#03f9cb754ec005c52f9ee616e2e84a82cab3084b"
+  integrity sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==
+
 bootstrap@^5.2.3:
   version "5.3.2"
   resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz"

From 1bbccd5ee2fed9e38de01376f6abd57618910b44 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 17:13:58 +0200
Subject: [PATCH 118/565] declare icon names

---
 frontend/src/app/shared/icons.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 frontend/src/app/shared/icons.ts

diff --git a/frontend/src/app/shared/icons.ts b/frontend/src/app/shared/icons.ts
new file mode 100644
index 00000000..24012f65
--- /dev/null
+++ b/frontend/src/app/shared/icons.ts
@@ -0,0 +1,24 @@
+export const actionIcons = {
+    add: 'plus-lg',
+    remove: 'x-lg',
+    confirm: 'check-lg',
+    cancel: 'x-lg',
+};
+
+export const authIcons = {
+    user: 'person',
+};
+
+export const dataIcons = {
+    source: 'book',
+    episode: 'bookmark',
+    person: 'person-fill',
+    personUnknown: 'person',
+    group: 'people',
+    location: 'geo-alt',
+    gift: 'gift',
+    letter: 'envelope',
+};
+
+
+

From 2c8501c0abbd40e7a581cc1d4ba239b1cb701362 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 17:20:45 +0200
Subject: [PATCH 119/565] import bootstrap-icons css

---
 frontend/src/styles.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 6b6004e7..daa7bd15 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -1,5 +1,6 @@
 @import 'variables';
 @import 'bootstrap';
+@import 'bootstrap-icons';
 
 @media print {
 

From bb150a182e0cc92b75aa84aef1023b782c6636e9 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 17:21:01 +0200
Subject: [PATCH 120/565] add icon component

---
 .../src/app/shared/icon/icon.component.html   |  1 +
 .../app/shared/icon/icon.component.spec.ts    | 21 +++++++++++++++++++
 .../src/app/shared/icon/icon.component.ts     |  9 ++++++++
 frontend/src/app/shared/shared.module.ts      |  6 +++++-
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/shared/icon/icon.component.html
 create mode 100644 frontend/src/app/shared/icon/icon.component.spec.ts
 create mode 100644 frontend/src/app/shared/icon/icon.component.ts

diff --git a/frontend/src/app/shared/icon/icon.component.html b/frontend/src/app/shared/icon/icon.component.html
new file mode 100644
index 00000000..712d808a
--- /dev/null
+++ b/frontend/src/app/shared/icon/icon.component.html
@@ -0,0 +1 @@
+<i *ngIf="icon" class="bi bi-{{icon}}" aria-hidden="true"></i>
diff --git a/frontend/src/app/shared/icon/icon.component.spec.ts b/frontend/src/app/shared/icon/icon.component.spec.ts
new file mode 100644
index 00000000..c5833074
--- /dev/null
+++ b/frontend/src/app/shared/icon/icon.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { IconComponent } from './icon.component';
+
+describe('IconComponent', () => {
+  let component: IconComponent;
+  let fixture: ComponentFixture<IconComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [IconComponent]
+    });
+    fixture = TestBed.createComponent(IconComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/shared/icon/icon.component.ts b/frontend/src/app/shared/icon/icon.component.ts
new file mode 100644
index 00000000..7344344e
--- /dev/null
+++ b/frontend/src/app/shared/icon/icon.component.ts
@@ -0,0 +1,9 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+    selector: 'lc-icon',
+    templateUrl: './icon.component.html',
+})
+export class IconComponent {
+    @Input() icon: string | undefined;
+}
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 23f85af7..34d6d52b 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -7,11 +7,14 @@ import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { RouterModule } from '@angular/router';
 import { ReactiveFormsModule } from '@angular/forms';
+import { IconComponent } from './icon/icon.component';
 
 
 
 @NgModule({
-    declarations: [],
+    declarations: [
+        IconComponent
+    ],
     imports: [
         CommonModule,
         BrowserModule,
@@ -26,6 +29,7 @@ import { ReactiveFormsModule } from '@angular/forms';
         RouterModule,
         ReactiveFormsModule,
     ], exports: [
+        IconComponent,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,

From d6aaf98f354a718f217b91a48de8b8328b9e3df5 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 17:45:34 +0200
Subject: [PATCH 121/565] implement review suggestions

Co-Authored-By: Xander Vertegaal <73882506+XanderVertegaal@users.noreply.github.com>
---
 CONTRIBUTING.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a3e27a5a..6cb093f1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ You need to install the following software:
 This project integrates two isolated subprojects, each inside its own subdirectory with its own code, package dependencies and tests:
 
 - **backend**: the server side web application based on [Django](https://www.djangoproject.com)
-- **frontend**: the client side web application based on [Angular](https://angular.io)
+- **frontend**: the client side web application based on [Angular](https://angular.dev)
 
 Each subproject is configurable from the outside. Integration is achieved using "magic configuration" which is contained inside the root directory together with this document. In this way, the subprojects can stay truly isolated from each other.
 
@@ -50,7 +50,7 @@ Some useful URLs:
 
 - https://localhost:8000/ to view the homepage for the frontend
 - https://localhost:8000/admin/ to view the backend admin
-- https://localhost:8000/api/graphql to expore the GraphQL API
+- https://localhost:8000/api/graphql to explore the GraphQL API
 
 ### Working with GraphQL
 
@@ -113,7 +113,7 @@ You can run all unit tests with:
 yarn test
 ```
 
-Backend tests are run with [pytest](), frontend tests with [jasmine](). For more detailed control over testing, like running a single test, consult the documentation of those libraries.
+Backend tests are run with [pytest](https://docs.pytest.org), frontend tests with [jasmine](https://jasmine.github.io/). For more detailed control over testing, like running a single test, consult the documentation of those libraries.
 
 #### Running Django commands
 
@@ -131,7 +131,7 @@ yarn django [SUBCOMMAND] [OPTIONS]
 
 Python dependencies are managed using pip and recorded in [requirements.in](/backend/requirements.in) / [requirements.txt](/backend/requirements.txt). To update dependencies:
 
-- Edit `requirements.in` to describe the new dependencies
+- Edit `requirements.in` to describe the new dependencies.
 - Run `pip-compile` to update the full manifest in `requirements.txt`.
 - Run `pip install -r requirements.txt` to update your Python environment.
 

From 4803fbfd47e784be50545253d44063bedd24fb53 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 10:16:54 +0200
Subject: [PATCH 122/565] Add types for ContentsDate and WrittenDate

---
 .../source/types/SourceContentsDateType.py    | 21 +++++++++++++++++++
 backend/source/types/SourceType.py            | 21 ++++++++++++++++++-
 backend/source/types/SourceWrittenDateType.py | 21 +++++++++++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 backend/source/types/SourceContentsDateType.py
 create mode 100644 backend/source/types/SourceWrittenDateType.py

diff --git a/backend/source/types/SourceContentsDateType.py b/backend/source/types/SourceContentsDateType.py
new file mode 100644
index 00000000..51e90084
--- /dev/null
+++ b/backend/source/types/SourceContentsDateType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.DateFieldType import LettercraftDateType
+from source.models import SourceContentsDate
+
+
+class SourceContentsDateType(LettercraftDateType, DjangoObjectType):
+    class Meta:
+        model = SourceContentsDate
+        fields = [
+            "id",
+            "source",
+        ] + LettercraftDateType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[SourceContentsDate], info: ResolveInfo
+    ) -> QuerySet[SourceContentsDate]:
+        return queryset.all()
diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 29d6a029..850ed99b 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -1,15 +1,34 @@
-from graphene import ResolveInfo
+from graphene import Field, Int, ResolveInfo
 from django.db.models import QuerySet
 from graphene_django import DjangoObjectType
+from event.models import Episode
 from source.models import Source
+from source.types.SourceContentsDateType import SourceContentsDateType
+from source.types.SourceWrittenDateType import SourceWrittenDateType
 
 
 class SourceType(DjangoObjectType):
+    num_of_episodes = Int(required=True)
+    written_date = Field(SourceWrittenDateType)
+    contents_date = Field(SourceContentsDateType)
+
     class Meta:
         model = Source
+        fields = [
+            "id",
+            "name",
+            "medieval_title",
+            "medieval_author",
+            "edition_title",
+            "edition_author",
+        ]
 
     @classmethod
     def get_queryset(
         cls, queryset: QuerySet[Source], info: ResolveInfo
     ) -> QuerySet[Source]:
         return queryset.all()
+
+    @staticmethod
+    def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
+        return Episode.objects.filter(source_id=parent.pk).count()
diff --git a/backend/source/types/SourceWrittenDateType.py b/backend/source/types/SourceWrittenDateType.py
new file mode 100644
index 00000000..53d2f754
--- /dev/null
+++ b/backend/source/types/SourceWrittenDateType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+from django.db.models import QuerySet
+
+from core.types.DateFieldType import LettercraftDateType
+from source.models import SourceWrittenDate
+
+
+class SourceWrittenDateType(LettercraftDateType, DjangoObjectType):
+    class Meta:
+        model = SourceWrittenDate
+        fields = [
+            "id",
+            "source",
+        ] + LettercraftDateType.fields()
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[SourceWrittenDate], info: ResolveInfo
+    ) -> QuerySet[SourceWrittenDate]:
+        return queryset.all()

From 22fd240933fb06cea6ea0809a07f6724e2ba89dc Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 17:23:35 +0200
Subject: [PATCH 123/565] replace fa-icon instance

---
 .../src/app/core/menu/user-menu/user-menu.component.html  | 2 +-
 .../src/app/core/menu/user-menu/user-menu.component.ts    | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 05d86b40..88e5518c 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -7,7 +7,7 @@
     <ng-container *ngIf="user$ | async as user">
         <li class="nav-item" ngbDropdown>
             <button class="nav-link" ngbDropdownToggle id="userDropdown">
-                <fa-icon [icon]="icons.user"></fa-icon>
+                <lc-icon [icon]="authIcons.user"></lc-icon>
                 &nbsp;
                 {{user.username}}
             </button>
diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.ts b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
index 5d56ac12..4944950b 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.ts
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.ts
@@ -1,11 +1,11 @@
 import { Component, DestroyRef, OnInit } from '@angular/core';
-import { faUser } from '@fortawesome/free-solid-svg-icons';
 import { filter, map } from 'rxjs';
 import { AuthService } from '@services/auth.service';
 import _ from 'underscore';
 import { ToastService } from '@services/toast.service';
 import { Router } from '@angular/router';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { authIcons } from '@shared/icons';
 
 @Component({
   selector: 'lc-user-menu',
@@ -21,10 +21,6 @@ export class UserMenuComponent implements OnInit {
 
     public showSignIn$ = this.authService.currentUser$.pipe(map(_.isNull));
 
-    public icons = {
-        user: faUser,
-    };
-
     public logoutLoading$ = this.authService.logout.loading$;
 
     public currentPath$ = this.router.routerState.root.url.pipe(
@@ -32,6 +28,8 @@ export class UserMenuComponent implements OnInit {
         filter(url => url?.toString() !== "")
     );
 
+    authIcons = authIcons;
+
     constructor(
         private authService: AuthService,
         private toastService: ToastService,

From 0d052bd506cf6cd2a41bfc49350b48bdc43acf0e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 17:25:16 +0200
Subject: [PATCH 124/565] remove fontawesome

---
 frontend/package.json                         |  3 --
 .../src/app/shared/shared-testing.module.ts   |  3 --
 frontend/src/app/shared/shared.module.ts      |  3 --
 frontend/yarn.lock                            | 28 +------------------
 4 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 920af1b4..5f6cad64 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -26,9 +26,6 @@
     "@angular/platform-browser-dynamic": "^16.2.12",
     "@angular/router": "^16.2.12",
     "@apollo/client": "^3.0.0",
-    "@fortawesome/angular-fontawesome": "^0.13",
-    "@fortawesome/fontawesome-svg-core": "^6.2.1",
-    "@fortawesome/free-solid-svg-icons": "^6.2.1",
     "@ng-bootstrap/ng-bootstrap": "^15.0.0",
     "@ngrx/effects": "^16.0.0",
     "@ngrx/store": "^16.0.0",
diff --git a/frontend/src/app/shared/shared-testing.module.ts b/frontend/src/app/shared/shared-testing.module.ts
index a73d5f14..9cea8929 100644
--- a/frontend/src/app/shared/shared-testing.module.ts
+++ b/frontend/src/app/shared/shared-testing.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { BrowserModule } from '@angular/platform-browser';
@@ -15,7 +14,6 @@ import { ReactiveFormsModule } from '@angular/forms';
     imports: [
         CommonModule,
         BrowserModule,
-        FontAwesomeModule,
         HttpClientTestingModule,
         NgbModule,
         NoopAnimationsModule,
@@ -24,7 +22,6 @@ import { ReactiveFormsModule } from '@angular/forms';
     ], exports: [
         CommonModule,
         BrowserModule,
-        FontAwesomeModule,
         HttpClientTestingModule,
         NgbModule,
         NoopAnimationsModule,
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 34d6d52b..e5eaecd7 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { RouterModule } from '@angular/router';
@@ -19,7 +18,6 @@ import { IconComponent } from './icon/icon.component';
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,
-        FontAwesomeModule,
         HttpClientModule,
         HttpClientXsrfModule.withOptions({
             cookieName: 'csrftoken',
@@ -33,7 +31,6 @@ import { IconComponent } from './icon/icon.component';
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,
-        FontAwesomeModule,
         HttpClientModule,
         HttpClientXsrfModule,
         NgbModule,
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index da396a39..8abc2f49 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2165,32 +2165,6 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@fortawesome/angular-fontawesome@^0.13":
-  version "0.13.0"
-  resolved "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.13.0.tgz"
-  integrity sha512-gzSPRdveOXNO7NIiMgTyB46aiHG0i98KinnAEqHXi8qzraM/kCcHn/0y3f4MhemX6kftwsFli0IU8RyHmtXlSQ==
-  dependencies:
-    tslib "^2.4.1"
-
-"@fortawesome/fontawesome-common-types@6.4.2":
-  version "6.4.2"
-  resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz"
-  integrity sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==
-
-"@fortawesome/fontawesome-svg-core@^6.2.1":
-  version "6.4.2"
-  resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz"
-  integrity sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.4.2"
-
-"@fortawesome/free-solid-svg-icons@^6.2.1":
-  version "6.4.2"
-  resolved "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz"
-  integrity sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==
-  dependencies:
-    "@fortawesome/fontawesome-common-types" "6.4.2"
-
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"
@@ -9481,7 +9455,7 @@ tslib@^1.8.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.4.1:
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0:
   version "2.6.2"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

From 7105aa0d1df9f669468f64abafad86ccb27a4abd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 24 Jul 2024 17:39:41 +0200
Subject: [PATCH 125/565] add docstring

---
 .../src/app/shared/icon/icon.component.ts     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/frontend/src/app/shared/icon/icon.component.ts b/frontend/src/app/shared/icon/icon.component.ts
index 7344344e..2a8c7ca8 100644
--- a/frontend/src/app/shared/icon/icon.component.ts
+++ b/frontend/src/app/shared/icon/icon.component.ts
@@ -1,5 +1,29 @@
 import { Component, Input } from '@angular/core';
 
+/**
+ * Wrapper for bootstrap icons
+ *
+ * See https://icons.getbootstrap.com/ to search the list of icons. Use `icon` input to
+ * set the icon name.
+ *
+ * The contents of the icon are hidden for assistive technologies. If the icon is only
+ * decorative, you can use it like this:
+ *
+ * ```html
+ * <button class="btn">
+ *     <lc-icon icon="pencil"></lc-icon>
+ *     Edit
+ * </button>
+ * ```
+ *
+ * If there is no visible text, set the `title` or `aria-label` attribute:
+ *
+ * ```html
+ * <button class="btn">
+ *     <lc-icon icon="pencil" title="edit"></lc-icon>
+ * </button>
+ * ```
+ */
 @Component({
     selector: 'lc-icon',
     templateUrl: './icon.component.html',

From ce04fd1b2029017d3ee058be302654eead03cdb7 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 25 Jul 2024 10:51:05 +0200
Subject: [PATCH 126/565] adjust shared testing module

---
 frontend/src/app/shared/shared-testing.module.ts | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/shared/shared-testing.module.ts b/frontend/src/app/shared/shared-testing.module.ts
index 9cea8929..52fd3e15 100644
--- a/frontend/src/app/shared/shared-testing.module.ts
+++ b/frontend/src/app/shared/shared-testing.module.ts
@@ -1,32 +1,22 @@
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { BrowserModule } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ReactiveFormsModule } from '@angular/forms';
+import { SharedModule } from './shared.module';
 
 
 
 @NgModule({
-    declarations: [],
     imports: [
-        CommonModule,
-        BrowserModule,
+        SharedModule,
         HttpClientTestingModule,
-        NgbModule,
         NoopAnimationsModule,
         RouterTestingModule,
-        ReactiveFormsModule,
     ], exports: [
-        CommonModule,
-        BrowserModule,
+        SharedModule,
         HttpClientTestingModule,
-        NgbModule,
         NoopAnimationsModule,
         RouterTestingModule,
-        ReactiveFormsModule,
     ]
 })
 export class SharedTestingModule { }

From e3e37bc64fb322876f7c65f0bff4aaf6d6fda112 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 25 Jul 2024 11:03:59 +0200
Subject: [PATCH 127/565] more icons + docstring

---
 frontend/src/app/shared/icons.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frontend/src/app/shared/icons.ts b/frontend/src/app/shared/icons.ts
index 24012f65..254f116b 100644
--- a/frontend/src/app/shared/icons.ts
+++ b/frontend/src/app/shared/icons.ts
@@ -1,8 +1,23 @@
+/**
+ * Declares icons to use.
+ *
+ * Icons are defined with their name in the bootstrap-icons library.
+ * See https://icons.getbootstrap.com/
+ *
+ * Add to this module as needed.
+ */
+
 export const actionIcons = {
     add: 'plus-lg',
     remove: 'x-lg',
+    create: 'plus-lg',
+    delete: 'trash',
+    help: 'question-circle',
     confirm: 'check-lg',
     cancel: 'x-lg',
+    expand: 'caret-down',
+    collapse: 'caret-up',
+    edit: 'pencil',
 };
 
 export const authIcons = {

From 99f573dc7633f40b1a5b8a0db1910cba5439ec18 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 11:53:31 +0200
Subject: [PATCH 128/565] Allow introspection queries in dev mode

---
 backend/graphql_app/middleware.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/backend/graphql_app/middleware.py b/backend/graphql_app/middleware.py
index e4a5504d..6b19dc72 100644
--- a/backend/graphql_app/middleware.py
+++ b/backend/graphql_app/middleware.py
@@ -1,5 +1,21 @@
+import json
+from django.conf import settings
+
+
 class GraphQLAuthMiddleware:
     def resolve(self, next, root, info, **kwargs):
+        request = info.context
+
+        # Allow introspection queries to pass through in development mode.
+        if settings.DEBUG and self.is_introspection_query(request):
+            return next(root, info, **kwargs)
+
         if info.context.user.is_authenticated:
             return next(root, info, **kwargs)
+
         raise Exception("User is not authenticated")
+
+    def is_introspection_query(self, request):
+        data = json.loads(request.body)
+        query = data.get("query")  # type: str
+        return query.startswith("query IntrospectionQuery")

From e0b1a27da75839d97061a33842c64af02d02e5cc Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 11:54:02 +0200
Subject: [PATCH 129/565] Use environment graphqlUrl

---
 frontend/codegen.ts                           | 3 ++-
 frontend/src/environments/environment.prod.ts | 2 +-
 frontend/src/environments/environment.ts      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/codegen.ts b/frontend/codegen.ts
index a6d59f68..a604ac32 100644
--- a/frontend/codegen.ts
+++ b/frontend/codegen.ts
@@ -1,7 +1,8 @@
+import { environment } from './src/environments/environment';
 import type { CodegenConfig } from '@graphql-codegen/cli'
 
 const config: CodegenConfig = {
-    schema: 'http://localhost:8000/api/graphql',
+    schema: `http://localhost:8000${environment.graphqlUrl}`,
     generates: {
         './generated/graphql.ts': {
             plugins: [
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 816a0f47..d7f1d037 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -5,5 +5,5 @@ export const environment = {
     assets: '/static/assets',
     version,
     apiUrl: '/api/',
-    graphqlUrl: '/graphql',
+    graphqlUrl: '/api/graphql',
 };
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
index 31ffaff3..a07eebc0 100644
--- a/frontend/src/environments/environment.ts
+++ b/frontend/src/environments/environment.ts
@@ -9,7 +9,7 @@ export const environment = {
     assets: 'assets',
     version,
     apiUrl: '/api/',
-    graphqlUrl: '/graphql',
+    graphqlUrl: '/api/graphql',
 };
 
 /*

From 62b428f6c127dcde576d137787f75364edfd657a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 11:54:32 +0200
Subject: [PATCH 130/565] Basic breadcrumb component

---
 .../breadcrumb/breadcrumb.component.html      | 12 +++++++++++
 .../breadcrumb/breadcrumb.component.scss      |  0
 .../breadcrumb/breadcrumb.component.spec.ts   | 21 +++++++++++++++++++
 .../shared/breadcrumb/breadcrumb.component.ts | 15 +++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 frontend/src/app/shared/breadcrumb/breadcrumb.component.html
 create mode 100644 frontend/src/app/shared/breadcrumb/breadcrumb.component.scss
 create mode 100644 frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts
 create mode 100644 frontend/src/app/shared/breadcrumb/breadcrumb.component.ts

diff --git a/frontend/src/app/shared/breadcrumb/breadcrumb.component.html b/frontend/src/app/shared/breadcrumb/breadcrumb.component.html
new file mode 100644
index 00000000..f26f6efc
--- /dev/null
+++ b/frontend/src/app/shared/breadcrumb/breadcrumb.component.html
@@ -0,0 +1,12 @@
+<nav>
+    <ol class="breadcrumb">
+        <ng-container *ngFor="let crumb of breadcrumbs; last as isLast">
+            <li *ngIf="!isLast" class="breadcrumb-item">
+                <a [routerLink]="crumb.link">{{ crumb.label }}</a>
+            </li>
+            <li *ngIf="isLast" class="breadcrumb-item">
+                {{ crumb.label }}
+            </li>
+        </ng-container>
+    </ol>
+</nav>
diff --git a/frontend/src/app/shared/breadcrumb/breadcrumb.component.scss b/frontend/src/app/shared/breadcrumb/breadcrumb.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts b/frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts
new file mode 100644
index 00000000..595a13e3
--- /dev/null
+++ b/frontend/src/app/shared/breadcrumb/breadcrumb.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { BreadcrumbComponent } from "./breadcrumb.component";
+
+describe("BreadcrumbComponent", () => {
+    let component: BreadcrumbComponent;
+    let fixture: ComponentFixture<BreadcrumbComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [BreadcrumbComponent],
+        });
+        fixture = TestBed.createComponent(BreadcrumbComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts b/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts
new file mode 100644
index 00000000..0abb4324
--- /dev/null
+++ b/frontend/src/app/shared/breadcrumb/breadcrumb.component.ts
@@ -0,0 +1,15 @@
+import { Component, Input } from "@angular/core";
+
+export interface Breadcrumb {
+    label: string;
+    link: string;
+}
+
+@Component({
+    selector: "lc-breadcrumb",
+    templateUrl: "./breadcrumb.component.html",
+    styleUrls: ["./breadcrumb.component.scss"],
+})
+export class BreadcrumbComponent {
+    @Input() breadcrumbs: Breadcrumb[] = [];
+}

From bb14b2a5fa00285015e2eb808d4c596aa2c6617e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 11:56:52 +0200
Subject: [PATCH 131/565] Simple sources component

---
 frontend/src/app/app.module.ts                |  6 +++-
 .../src/app/core/menu/menu.component.html     |  5 ++++
 .../data-entry/sources/sources.component.html | 21 ++++++++++++++
 .../data-entry/sources/sources.component.scss |  0
 .../sources/sources.component.spec.ts         | 21 ++++++++++++++
 .../data-entry/sources/sources.component.ts   | 28 +++++++++++++++++++
 .../app/data-entry/sources/sources.graphql    | 11 ++++++++
 frontend/src/app/routes.ts                    | 12 ++++++++
 8 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/data-entry/sources/sources.component.html
 create mode 100644 frontend/src/app/data-entry/sources/sources.component.scss
 create mode 100644 frontend/src/app/data-entry/sources/sources.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/sources/sources.component.ts
 create mode 100644 frontend/src/app/data-entry/sources/sources.graphql

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index d6c33feb..d96aee7c 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -9,11 +9,15 @@ import { CoreModule } from './core/core.module';
 import { UserModule } from './user/user.module';
 import { GraphQLModule } from './graphql.module';
 import { HttpClientModule } from '@angular/common/http';
+import { SourcesComponent } from './data-entry/sources/sources.component';
+import { BreadcrumbComponent } from './shared/breadcrumb/breadcrumb.component';
 
 @NgModule({
     declarations: [
         AppComponent,
-        HomeComponent
+        HomeComponent,
+        SourcesComponent,
+        BreadcrumbComponent,
     ],
     imports: [
         AppRoutingModule,
diff --git a/frontend/src/app/core/menu/menu.component.html b/frontend/src/app/core/menu/menu.component.html
index 8f83fd4e..24b3b9bb 100644
--- a/frontend/src/app/core/menu/menu.component.html
+++ b/frontend/src/app/core/menu/menu.component.html
@@ -19,6 +19,11 @@
                         Home
                     </a>
                 </li>
+                <li class="nav-item">
+                    <a [routerLink]="['/data-entry']" routerLinkActive="active" class="nav-link">
+                        Data entry
+                    </a>
+                </li>
             </ul>
             <lc-user-menu></lc-user-menu>
         </div>
diff --git a/frontend/src/app/data-entry/sources/sources.component.html b/frontend/src/app/data-entry/sources/sources.component.html
new file mode 100644
index 00000000..d9dfdefd
--- /dev/null
+++ b/frontend/src/app/data-entry/sources/sources.component.html
@@ -0,0 +1,21 @@
+<lc-breadcrumb [breadcrumbs]="breadcrumbs" />
+
+<h1>Data entry</h1>
+
+<p>Select a source to begin</p>
+
+<div class="list-group">
+    <a
+        *ngFor="let source of sources$ | async"
+        class="list-group-item list-group-item-action"
+        [routerLink]="['source', source.id]"
+    >
+        <h5 class="mb-1">{{ source.name }}</h5>
+        <p class="mb-1">
+            {{ source.medievalAuthor }},
+            <em>{{ source.medievalTitle }}</em>.
+            (Ed. {{ source.editionAuthor }},
+            <em>{{ source.editionTitle }}</em>)
+        </p>
+    </a>
+</div>
diff --git a/frontend/src/app/data-entry/sources/sources.component.scss b/frontend/src/app/data-entry/sources/sources.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/sources/sources.component.spec.ts b/frontend/src/app/data-entry/sources/sources.component.spec.ts
new file mode 100644
index 00000000..1d66b80e
--- /dev/null
+++ b/frontend/src/app/data-entry/sources/sources.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { SourcesComponent } from "./sources.component";
+
+describe("SourcesComponent", () => {
+    let component: SourcesComponent;
+    let fixture: ComponentFixture<SourcesComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [SourcesComponent],
+        });
+        fixture = TestBed.createComponent(SourcesComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/sources/sources.component.ts b/frontend/src/app/data-entry/sources/sources.component.ts
new file mode 100644
index 00000000..60ad48bb
--- /dev/null
+++ b/frontend/src/app/data-entry/sources/sources.component.ts
@@ -0,0 +1,28 @@
+import { Component } from "@angular/core";
+import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
+import { DataEntrySourceListGQL } from "generated/graphql";
+import { map } from "rxjs";
+
+@Component({
+    selector: "lc-sources",
+    templateUrl: "./sources.component.html",
+    styleUrls: ["./sources.component.scss"],
+})
+export class SourcesComponent {
+    public breadcrumbs: Breadcrumb[] = [
+        { label: "Lettercraft", link: "/" },
+        { label: "Data entry", link: "/data-entry" },
+    ];
+
+    public sources$ = this.sourceListQuery
+        .watch()
+        .valueChanges.pipe(
+            map((result) =>
+                result.data.sources.filter(
+                    (source) => source.name !== "MISSING SOURCE"
+                )
+            )
+        );
+
+    constructor(private sourceListQuery: DataEntrySourceListGQL) {}
+}
diff --git a/frontend/src/app/data-entry/sources/sources.graphql b/frontend/src/app/data-entry/sources/sources.graphql
new file mode 100644
index 00000000..bace6674
--- /dev/null
+++ b/frontend/src/app/data-entry/sources/sources.graphql
@@ -0,0 +1,11 @@
+query DataEntrySourceList {
+    sources {
+        id
+        name
+        editionAuthor
+        editionTitle
+        medievalAuthor
+        medievalTitle
+        numOfEpisodes
+    }
+}
diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index cf8bbcf5..1b9ecdb3 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -7,6 +7,8 @@ import { RegisterComponent } from './user/register/register.component';
 import { PasswordForgottenComponent } from './user/password-forgotten/password-forgotten.component';
 import { ResetPasswordComponent } from './user/reset-password/reset-password.component';
 import { UserSettingsComponent } from './user/user-settings/user-settings.component';
+import { LoggedOnGuard } from '@shared/logged-on.guard';
+import { SourcesComponent } from './data-entry/sources/sources.component';
 
 const routes: Routes = [
     {
@@ -37,6 +39,16 @@ const routes: Routes = [
         path: 'user-settings',
         component: UserSettingsComponent
     },
+    {
+        path: 'data-entry',
+        canActivate: [LoggedOnGuard],
+        children: [
+            {
+                path: '',
+                component: SourcesComponent
+            }
+        ]
+    },
     {
         path: '',
         redirectTo: '/home',

From 8325173ed345523b0363debd1406fc7c40f8d726 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 13:04:02 +0200
Subject: [PATCH 132/565] Typo

---
 backend/source/migrations/0005_placeholder_source.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/source/migrations/0005_placeholder_source.py b/backend/source/migrations/0005_placeholder_source.py
index 4824b1c5..e40032f9 100644
--- a/backend/source/migrations/0005_placeholder_source.py
+++ b/backend/source/migrations/0005_placeholder_source.py
@@ -7,7 +7,7 @@ def create_placeholder_source(apps, schema_editor):
     Source = apps.get_model("source", "Source")
     Source.objects.create(
         name="MISSING SOURCE",
-        bibliographical_info="This is a placeholder value for older data that is mising source information",
+        bibliographical_info="This is a placeholder value for older data that is missing source information",
     )
 
 

From afb6787934f56274b905142022bd1798192ef586 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 13:04:20 +0200
Subject: [PATCH 133/565] Fix nullable sources

---
 backend/source/queries.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/source/queries.py b/backend/source/queries.py
index 3d832f4b..617a2e77 100644
--- a/backend/source/queries.py
+++ b/backend/source/queries.py
@@ -1,8 +1,8 @@
-from graphene import ObjectType
+from graphene import NonNull, ObjectType
 from graphene_django import DjangoListField
 
 from source.types.SourceType import SourceType
 
 
 class SourceQueries(ObjectType):
-    sources = DjangoListField(SourceType)
+    sources = DjangoListField(NonNull(SourceType), required=True)

From b1a599041d355146cd841a0196d793bd223747c2 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 13:39:56 +0200
Subject: [PATCH 134/565] Reformat strings; add trackBy

---
 .../data-entry/sources/sources.component.html | 25 +++++++++++--------
 .../data-entry/sources/sources.component.ts   |  6 ++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/data-entry/sources/sources.component.html b/frontend/src/app/data-entry/sources/sources.component.html
index d9dfdefd..fded0d69 100644
--- a/frontend/src/app/data-entry/sources/sources.component.html
+++ b/frontend/src/app/data-entry/sources/sources.component.html
@@ -5,17 +5,22 @@ <h1>Data entry</h1>
 <p>Select a source to begin</p>
 
 <div class="list-group">
-    <a
-        *ngFor="let source of sources$ | async"
-        class="list-group-item list-group-item-action"
-        [routerLink]="['source', source.id]"
-    >
-        <h5 class="mb-1">{{ source.name }}</h5>
+    <a *ngFor="let source of sources$ | async; trackBy: identify"
+       class="list-group-item list-group-item-action"
+       [routerLink]="['source', source.id]">
+        <div class="d-flex align-items-center">
+            <h5 class="mb-1">{{ source.name }}</h5>
+            <small class="text-body-secondary ms-2">
+                ({source.numOfEpisodes, plural, =0 {No episodes} =1 {1 episode} other {{{ source.numOfEpisodes}} episodes}})
+            </small>
+        </div>
         <p class="mb-1">
-            {{ source.medievalAuthor }},
-            <em>{{ source.medievalTitle }}</em>.
-            (Ed. {{ source.editionAuthor }},
-            <em>{{ source.editionTitle }}</em>)
+            <ng-container *ngIf="source.medievalAuthor || source.medievalTitle">
+                {{ source.medievalAuthor }}<ng-container *ngIf="source.medievalAuthor && source.medievalTitle">, </ng-container><em>{{ source.medievalTitle }}</em>.
+            </ng-container>
+            <ng-container *ngIf="source.editionAuthor || source.editionTitle">
+                (Ed. {{ source.editionAuthor }}<ng-container *ngIf="source.editionAuthor && source.editionTitle">, </ng-container><em>{{ source.editionTitle }}</em>.)
+            </ng-container>
         </p>
     </a>
 </div>
diff --git a/frontend/src/app/data-entry/sources/sources.component.ts b/frontend/src/app/data-entry/sources/sources.component.ts
index 60ad48bb..5964d225 100644
--- a/frontend/src/app/data-entry/sources/sources.component.ts
+++ b/frontend/src/app/data-entry/sources/sources.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
-import { DataEntrySourceListGQL } from "generated/graphql";
+import { DataEntrySourceListGQL, SourceType } from "generated/graphql";
 import { map } from "rxjs";
 
 @Component({
@@ -24,5 +24,9 @@ export class SourcesComponent {
             )
         );
 
+    public identify(_index: number, item: Pick<SourceType, "id">): string {
+        return item.id;
+    }
+
     constructor(private sourceListQuery: DataEntrySourceListGQL) {}
 }

From 90faef480e7f8528d53f45f858b7723d83f92a13 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 11:53:31 +0200
Subject: [PATCH 135/565] Allow introspection queries in dev mode

---
 backend/graphql_app/middleware.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/backend/graphql_app/middleware.py b/backend/graphql_app/middleware.py
index e4a5504d..6b19dc72 100644
--- a/backend/graphql_app/middleware.py
+++ b/backend/graphql_app/middleware.py
@@ -1,5 +1,21 @@
+import json
+from django.conf import settings
+
+
 class GraphQLAuthMiddleware:
     def resolve(self, next, root, info, **kwargs):
+        request = info.context
+
+        # Allow introspection queries to pass through in development mode.
+        if settings.DEBUG and self.is_introspection_query(request):
+            return next(root, info, **kwargs)
+
         if info.context.user.is_authenticated:
             return next(root, info, **kwargs)
+
         raise Exception("User is not authenticated")
+
+    def is_introspection_query(self, request):
+        data = json.loads(request.body)
+        query = data.get("query")  # type: str
+        return query.startswith("query IntrospectionQuery")

From 2f11dd8207d25339ac0135e3f4b27cb7ee3e0d83 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 25 Jul 2024 11:54:02 +0200
Subject: [PATCH 136/565] Use environment graphqlUrl

---
 frontend/codegen.ts                           | 3 ++-
 frontend/src/environments/environment.prod.ts | 2 +-
 frontend/src/environments/environment.ts      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/codegen.ts b/frontend/codegen.ts
index a6d59f68..a604ac32 100644
--- a/frontend/codegen.ts
+++ b/frontend/codegen.ts
@@ -1,7 +1,8 @@
+import { environment } from './src/environments/environment';
 import type { CodegenConfig } from '@graphql-codegen/cli'
 
 const config: CodegenConfig = {
-    schema: 'http://localhost:8000/api/graphql',
+    schema: `http://localhost:8000${environment.graphqlUrl}`,
     generates: {
         './generated/graphql.ts': {
             plugins: [
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 816a0f47..d7f1d037 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -5,5 +5,5 @@ export const environment = {
     assets: '/static/assets',
     version,
     apiUrl: '/api/',
-    graphqlUrl: '/graphql',
+    graphqlUrl: '/api/graphql',
 };
diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts
index 31ffaff3..a07eebc0 100644
--- a/frontend/src/environments/environment.ts
+++ b/frontend/src/environments/environment.ts
@@ -9,7 +9,7 @@ export const environment = {
     assets: 'assets',
     version,
     apiUrl: '/api/',
-    graphqlUrl: '/graphql',
+    graphqlUrl: '/api/graphql',
 };
 
 /*

From 4911f1094c6354ec2080ebdfeb8a4d1ecf1fab49 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 29 Jul 2024 12:50:08 +0200
Subject: [PATCH 137/565] review suggestions

- make input required
- use self-closing tags

Co-Authored-By: Xander Vertegaal <73882506+XanderVertegaal@users.noreply.github.com>
---
 .../menu/user-menu/user-menu.component.html   |  2 +-
 .../src/app/shared/icon/icon.component.html   |  2 +-
 .../app/shared/icon/icon.component.spec.ts    | 25 ++++++++++---------
 .../src/app/shared/icon/icon.component.ts     |  6 ++---
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/frontend/src/app/core/menu/user-menu/user-menu.component.html b/frontend/src/app/core/menu/user-menu/user-menu.component.html
index 88e5518c..d6e86c68 100644
--- a/frontend/src/app/core/menu/user-menu/user-menu.component.html
+++ b/frontend/src/app/core/menu/user-menu/user-menu.component.html
@@ -7,7 +7,7 @@
     <ng-container *ngIf="user$ | async as user">
         <li class="nav-item" ngbDropdown>
             <button class="nav-link" ngbDropdownToggle id="userDropdown">
-                <lc-icon [icon]="authIcons.user"></lc-icon>
+                <lc-icon [icon]="authIcons.user" />
                 &nbsp;
                 {{user.username}}
             </button>
diff --git a/frontend/src/app/shared/icon/icon.component.html b/frontend/src/app/shared/icon/icon.component.html
index 712d808a..883d69a2 100644
--- a/frontend/src/app/shared/icon/icon.component.html
+++ b/frontend/src/app/shared/icon/icon.component.html
@@ -1 +1 @@
-<i *ngIf="icon" class="bi bi-{{icon}}" aria-hidden="true"></i>
+<i class="bi bi-{{icon}}" aria-hidden="true"></i>
diff --git a/frontend/src/app/shared/icon/icon.component.spec.ts b/frontend/src/app/shared/icon/icon.component.spec.ts
index c5833074..d8f669b2 100644
--- a/frontend/src/app/shared/icon/icon.component.spec.ts
+++ b/frontend/src/app/shared/icon/icon.component.spec.ts
@@ -3,19 +3,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { IconComponent } from './icon.component';
 
 describe('IconComponent', () => {
-  let component: IconComponent;
-  let fixture: ComponentFixture<IconComponent>;
+    let component: IconComponent;
+    let fixture: ComponentFixture<IconComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [IconComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [IconComponent]
+        });
+        fixture = TestBed.createComponent(IconComponent);
+        component = fixture.componentInstance;
+        component.icon = 'check';
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(IconComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/shared/icon/icon.component.ts b/frontend/src/app/shared/icon/icon.component.ts
index 2a8c7ca8..1dfa0712 100644
--- a/frontend/src/app/shared/icon/icon.component.ts
+++ b/frontend/src/app/shared/icon/icon.component.ts
@@ -11,7 +11,7 @@ import { Component, Input } from '@angular/core';
  *
  * ```html
  * <button class="btn">
- *     <lc-icon icon="pencil"></lc-icon>
+ *     <lc-icon icon="pencil" />
  *     Edit
  * </button>
  * ```
@@ -20,7 +20,7 @@ import { Component, Input } from '@angular/core';
  *
  * ```html
  * <button class="btn">
- *     <lc-icon icon="pencil" title="edit"></lc-icon>
+ *     <lc-icon icon="pencil" title="edit" />
  * </button>
  * ```
  */
@@ -29,5 +29,5 @@ import { Component, Input } from '@angular/core';
     templateUrl: './icon.component.html',
 })
 export class IconComponent {
-    @Input() icon: string | undefined;
+    @Input({ required: true }) icon!: string;
 }

From 2392a14b69c328b4b8bcb35b4e86a4dc20cc58b4 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 14:34:49 +0200
Subject: [PATCH 138/565] Minor cleanup

---
 frontend/src/app/services/auth.service.spec.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/src/app/services/auth.service.spec.ts b/frontend/src/app/services/auth.service.spec.ts
index 2b0fc200..0a19b225 100644
--- a/frontend/src/app/services/auth.service.spec.ts
+++ b/frontend/src/app/services/auth.service.spec.ts
@@ -11,9 +11,7 @@ describe('AuthService', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [HttpClientTestingModule, RouterTestingModule],
-            providers: [
-                SessionService, SessionService,
-            ],
+            providers: [SessionService],
         });
         service = TestBed.inject(AuthService);
     });
@@ -21,5 +19,4 @@ describe('AuthService', () => {
     it('should be created', () => {
         expect(service).toBeTruthy();
     });
-
 });

From 172ead95ec534c9ea6f2de2bfe6c3d3775e082d6 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 14:56:44 +0200
Subject: [PATCH 139/565] Add DataEntryModule

---
 frontend/src/app/app.module.ts                       |  6 ++----
 frontend/src/app/data-entry/data-entry.module.ts     | 10 ++++++++++
 .../app/data-entry/sources/sources.component.spec.ts |  2 ++
 frontend/src/app/shared/shared-testing.module.ts     |  3 ++-
 frontend/src/app/shared/shared.module.ts             | 12 ++++++++----
 5 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/app/data-entry/data-entry.module.ts

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index d96aee7c..0273a042 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -9,15 +9,12 @@ import { CoreModule } from './core/core.module';
 import { UserModule } from './user/user.module';
 import { GraphQLModule } from './graphql.module';
 import { HttpClientModule } from '@angular/common/http';
-import { SourcesComponent } from './data-entry/sources/sources.component';
-import { BreadcrumbComponent } from './shared/breadcrumb/breadcrumb.component';
+import { DataEntryModule } from './data-entry/data-entry.module';
 
 @NgModule({
     declarations: [
         AppComponent,
         HomeComponent,
-        SourcesComponent,
-        BreadcrumbComponent,
     ],
     imports: [
         AppRoutingModule,
@@ -26,6 +23,7 @@ import { BreadcrumbComponent } from './shared/breadcrumb/breadcrumb.component';
         UserModule,
         GraphQLModule,
         HttpClientModule,
+        DataEntryModule,
     ],
     providers: [],
     bootstrap: [AppComponent]
diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
new file mode 100644
index 00000000..00f47651
--- /dev/null
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from "@angular/core";
+import { SharedModule } from "@shared/shared.module";
+import { SourcesComponent } from "./sources/sources.component";
+
+@NgModule({
+    declarations: [SourcesComponent],
+    imports: [SharedModule],
+    exports: [SourcesComponent],
+})
+export class DataEntryModule {}
diff --git a/frontend/src/app/data-entry/sources/sources.component.spec.ts b/frontend/src/app/data-entry/sources/sources.component.spec.ts
index 1d66b80e..f8795789 100644
--- a/frontend/src/app/data-entry/sources/sources.component.spec.ts
+++ b/frontend/src/app/data-entry/sources/sources.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { SourcesComponent } from "./sources.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("SourcesComponent", () => {
     let component: SourcesComponent;
@@ -9,6 +10,7 @@ describe("SourcesComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [SourcesComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(SourcesComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/shared/shared-testing.module.ts b/frontend/src/app/shared/shared-testing.module.ts
index 52fd3e15..36372c0a 100644
--- a/frontend/src/app/shared/shared-testing.module.ts
+++ b/frontend/src/app/shared/shared-testing.module.ts
@@ -3,7 +3,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { SharedModule } from './shared.module';
-
+import { ApolloTestingModule } from 'apollo-angular/testing';
 
 
 @NgModule({
@@ -17,6 +17,7 @@ import { SharedModule } from './shared.module';
         HttpClientTestingModule,
         NoopAnimationsModule,
         RouterTestingModule,
+        ApolloTestingModule,
     ]
 })
 export class SharedTestingModule { }
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index e5eaecd7..dbb0b41e 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -7,12 +7,14 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { RouterModule } from '@angular/router';
 import { ReactiveFormsModule } from '@angular/forms';
 import { IconComponent } from './icon/icon.component';
+import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
 
 
 
 @NgModule({
     declarations: [
-        IconComponent
+        IconComponent,
+        BreadcrumbComponent
     ],
     imports: [
         CommonModule,
@@ -26,8 +28,10 @@ import { IconComponent } from './icon/icon.component';
         NgbModule,
         RouterModule,
         ReactiveFormsModule,
-    ], exports: [
+    ],
+    exports: [
         IconComponent,
+        BreadcrumbComponent,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,
@@ -36,6 +40,6 @@ import { IconComponent } from './icon/icon.component';
         NgbModule,
         RouterModule,
         ReactiveFormsModule,
-    ]
+    ],
 })
-export class SharedModule { }
+export class SharedModule {}

From 57790e8a6158cfcb0eaec60935492fe7c1be72aa Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 15:11:16 +0200
Subject: [PATCH 140/565] Run codegen before tests

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1d932c52..f5c0b1e8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -82,4 +82,5 @@ jobs:
         find static
         yarn start-back-p &
         chromedriver --version
+        yarn front yarn graphql-codegen
         yarn test

From 68f6eff3facfca1fce1da25338494b6cf36385b5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 15:30:45 +0200
Subject: [PATCH 141/565] Move codegen earlier in the workflow

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f5c0b1e8..8499d9e4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,9 +78,9 @@ jobs:
         cat bootstrap_ci.txt | python bootstrap.py
         yarn
         yarn django migrate
+        yarn front yarn graphql-codegen
         yarn static-p
         find static
         yarn start-back-p &
         chromedriver --version
-        yarn front yarn graphql-codegen
         yarn test

From 5da346b29af16085d53d8811d96cfc827b88a330 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 15:30:45 +0200
Subject: [PATCH 142/565] Move codegen earlier in the workflow

---
 .github/workflows/test.yml | 2 +-
 package.json               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f5c0b1e8..8499d9e4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,9 +78,9 @@ jobs:
         cat bootstrap_ci.txt | python bootstrap.py
         yarn
         yarn django migrate
+        yarn front yarn graphql-codegen
         yarn static-p
         find static
         yarn start-back-p &
         chromedriver --version
-        yarn front yarn graphql-codegen
         yarn test
diff --git a/package.json b/package.json
index 27703968..29e3fd88 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "watch-test-back": "yarn test-back --looponfail",
         "watch-back": "yarn livereload-back",
         "start": "yarn start-front & yarn start-back & yarn watch-back & yarn codegen",
-        "build": "yarn front yarn build",
+        "build": "yarn front yarn graphql-codegen && yarn front yarn build",
         "build-p": "yarn build",
         "collectstatic-p": "cd backend && python manage.py collectstatic --noinput -v 0 --settings collect --pythonpath ..",
         "clean-static": "rm -rf static || rd /S /Q static",

From b31c07708856cc1751ffdcad7fa3e52a85c93d8f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 15:57:29 +0200
Subject: [PATCH 143/565] Remove package.json additions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 29e3fd88..27703968 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "watch-test-back": "yarn test-back --looponfail",
         "watch-back": "yarn livereload-back",
         "start": "yarn start-front & yarn start-back & yarn watch-back & yarn codegen",
-        "build": "yarn front yarn graphql-codegen && yarn front yarn build",
+        "build": "yarn front yarn build",
         "build-p": "yarn build",
         "collectstatic-p": "cd backend && python manage.py collectstatic --noinput -v 0 --settings collect --pythonpath ..",
         "clean-static": "rm -rf static || rd /S /Q static",

From f93050c1be2f486c7c43e710bb0edf22723280bb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 16:06:55 +0200
Subject: [PATCH 144/565] Add pretest

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8499d9e4..cd1f43ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,6 +78,7 @@ jobs:
         cat bootstrap_ci.txt | python bootstrap.py
         yarn
         yarn django migrate
+        yarn front yarn pretest
         yarn front yarn graphql-codegen
         yarn static-p
         find static

From e9e005947b0de321f22feabf7c3dc5ddfa9fc24c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 29 Jul 2024 16:13:16 +0200
Subject: [PATCH 145/565] Start dev server

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cd1f43ee..9f0e8a38 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,6 +78,7 @@ jobs:
         cat bootstrap_ci.txt | python bootstrap.py
         yarn
         yarn django migrate
+        yarn start-back
         yarn front yarn pretest
         yarn front yarn graphql-codegen
         yarn static-p

From 692f7e3183d73d8fe0debc621fbcb94d07320f8f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 30 Jul 2024 14:11:09 +0200
Subject: [PATCH 146/565] Remove running dev server from workflow

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f0e8a38..cd1f43ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,7 +78,6 @@ jobs:
         cat bootstrap_ci.txt | python bootstrap.py
         yarn
         yarn django migrate
-        yarn start-back
         yarn front yarn pretest
         yarn front yarn graphql-codegen
         yarn static-p

From c4583e12e76609d97df262d3ef2abd3e784fb80d Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 30 Jul 2024 14:11:51 +0200
Subject: [PATCH 147/565] Added authentication check on primary navbar

---
 frontend/src/app/core/menu/menu.component.html | 2 +-
 frontend/src/app/core/menu/menu.component.ts   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/core/menu/menu.component.html b/frontend/src/app/core/menu/menu.component.html
index 24b3b9bb..90dd5d68 100644
--- a/frontend/src/app/core/menu/menu.component.html
+++ b/frontend/src/app/core/menu/menu.component.html
@@ -19,7 +19,7 @@
                         Home
                     </a>
                 </li>
-                <li class="nav-item">
+                <li *ngIf="isAuthenticated$ | async" class="nav-item">
                     <a [routerLink]="['/data-entry']" routerLinkActive="active" class="nav-link">
                         Data entry
                     </a>
diff --git a/frontend/src/app/core/menu/menu.component.ts b/frontend/src/app/core/menu/menu.component.ts
index daa42b70..ced28885 100644
--- a/frontend/src/app/core/menu/menu.component.ts
+++ b/frontend/src/app/core/menu/menu.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import { AuthService } from '@services/auth.service';
 
 @Component({
     selector: 'lc-menu',
@@ -6,9 +7,12 @@ import { Component } from '@angular/core';
     styleUrls: ['./menu.component.scss']
 })
 export class MenuComponent {
-    burgerActive = false;
+    public burgerActive = false;
+    public isAuthenticated$ = this.authService.isAuthenticated$;
 
-    toggleBurger() {
+    constructor(private authService: AuthService) {}
+
+    toggleBurger(): void {
         this.burgerActive = !this.burgerActive;
     }
 }

From e2a5041b36affaf3e267498386f36d3886498d97 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 30 Jul 2024 14:12:02 +0200
Subject: [PATCH 148/565] Label secondary navigation

---
 frontend/src/app/shared/breadcrumb/breadcrumb.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/shared/breadcrumb/breadcrumb.component.html b/frontend/src/app/shared/breadcrumb/breadcrumb.component.html
index f26f6efc..2e0622eb 100644
--- a/frontend/src/app/shared/breadcrumb/breadcrumb.component.html
+++ b/frontend/src/app/shared/breadcrumb/breadcrumb.component.html
@@ -1,4 +1,4 @@
-<nav>
+<nav aria-label="breadcrumb navigation">
     <ol class="breadcrumb">
         <ng-container *ngFor="let crumb of breadcrumbs; last as isLast">
             <li *ngIf="!isLast" class="breadcrumb-item">

From 6a192f127c76202889196a7aef0ad4768f2d8a28 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 30 Jul 2024 14:12:35 +0200
Subject: [PATCH 149/565] Sources list template semantic upgrade

---
 .../app/data-entry/sources/sources.component.html   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/data-entry/sources/sources.component.html b/frontend/src/app/data-entry/sources/sources.component.html
index fded0d69..40c65b95 100644
--- a/frontend/src/app/data-entry/sources/sources.component.html
+++ b/frontend/src/app/data-entry/sources/sources.component.html
@@ -4,12 +4,11 @@ <h1>Data entry</h1>
 
 <p>Select a source to begin</p>
 
-<div class="list-group">
-    <a *ngFor="let source of sources$ | async; trackBy: identify"
-       class="list-group-item list-group-item-action"
-       [routerLink]="['source', source.id]">
+<ul class="list-group">
+    <li *ngFor="let source of sources$ | async; trackBy: identify"
+       class="list-group-item list-group-item-action">
         <div class="d-flex align-items-center">
-            <h5 class="mb-1">{{ source.name }}</h5>
+            <a [routerLink]="['source', source.id]" class="mb-1 h5 stretched-link">{{ source.name }}</a>
             <small class="text-body-secondary ms-2">
                 ({source.numOfEpisodes, plural, =0 {No episodes} =1 {1 episode} other {{{ source.numOfEpisodes}} episodes}})
             </small>
@@ -22,5 +21,5 @@ <h5 class="mb-1">{{ source.name }}</h5>
                 (Ed. {{ source.editionAuthor }}<ng-container *ngIf="source.editionAuthor && source.editionTitle">, </ng-container><em>{{ source.editionTitle }}</em>.)
             </ng-container>
         </p>
-    </a>
-</div>
+    </li>
+</ul>

From faef18c783230dc4a902c93aff762e31d236acca Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 10:07:35 +0200
Subject: [PATCH 150/565] Add source detail query and episodes subquery

---
 backend/source/queries.py          | 11 ++++++++++-
 backend/source/types/SourceType.py |  8 +++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/backend/source/queries.py b/backend/source/queries.py
index 617a2e77..79667285 100644
--- a/backend/source/queries.py
+++ b/backend/source/queries.py
@@ -1,8 +1,17 @@
-from graphene import NonNull, ObjectType
+from graphene import ID, Field, NonNull, ObjectType, ResolveInfo
 from graphene_django import DjangoListField
 
+from source.models import Source
 from source.types.SourceType import SourceType
 
 
 class SourceQueries(ObjectType):
+    source = Field(NonNull(SourceType), id=ID(required=True))
     sources = DjangoListField(NonNull(SourceType), required=True)
+
+    @staticmethod
+    def resolve_source(root: None, info: ResolveInfo, id: str) -> Source | None:
+        try:
+            return SourceType.get_queryset(Source.objects, info).get(pk=id)
+        except Source.DoesNotExist:
+            return None
diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 850ed99b..fdbbfda8 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -1,13 +1,15 @@
-from graphene import Field, Int, ResolveInfo
+from graphene import Field, Int, List, ResolveInfo
 from django.db.models import QuerySet
 from graphene_django import DjangoObjectType
 from event.models import Episode
 from source.models import Source
+from event.types.EpisodeType import EpisodeType
 from source.types.SourceContentsDateType import SourceContentsDateType
 from source.types.SourceWrittenDateType import SourceWrittenDateType
 
 
 class SourceType(DjangoObjectType):
+    episodes = List(EpisodeType, required=True)
     num_of_episodes = Int(required=True)
     written_date = Field(SourceWrittenDateType)
     contents_date = Field(SourceContentsDateType)
@@ -29,6 +31,10 @@ def get_queryset(
     ) -> QuerySet[Source]:
         return queryset.all()
 
+    @staticmethod
+    def resolve_episodes(parent: Source, info: ResolveInfo) -> QuerySet[Episode]:
+        return Episode.objects.filter(source_id=parent.pk)
+
     @staticmethod
     def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
         return Episode.objects.filter(source_id=parent.pk).count()

From 021c851a7e4cd51ad0df47df1cbb7d360cbd25d2 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 10:35:04 +0200
Subject: [PATCH 151/565] Source component init

---
 .../src/app/data-entry/data-entry.module.ts   |   5 +-
 .../data-entry/source/source.component.html   | 241 ++++++++++++++++++
 .../data-entry/source/source.component.scss   |   0
 .../source/source.component.spec.ts           |  21 ++
 .../app/data-entry/source/source.component.ts |  54 ++++
 .../src/app/data-entry/source/source.graphql  |  14 +
 .../data-entry/sources/sources.component.html |   2 +-
 frontend/src/app/routes.ts                    |  12 +-
 8 files changed, 345 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/app/data-entry/source/source.component.html
 create mode 100644 frontend/src/app/data-entry/source/source.component.scss
 create mode 100644 frontend/src/app/data-entry/source/source.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/source/source.component.ts
 create mode 100644 frontend/src/app/data-entry/source/source.graphql

diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
index 00f47651..0a4e2213 100644
--- a/frontend/src/app/data-entry/data-entry.module.ts
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -1,10 +1,11 @@
 import { NgModule } from "@angular/core";
 import { SharedModule } from "@shared/shared.module";
 import { SourcesComponent } from "./sources/sources.component";
+import { SourceComponent } from './source/source.component';
 
 @NgModule({
-    declarations: [SourcesComponent],
+    declarations: [SourcesComponent, SourceComponent],
     imports: [SharedModule],
-    exports: [SourcesComponent],
+    exports: [SourcesComponent, SourceComponent],
 })
 export class DataEntryModule {}
diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
new file mode 100644
index 00000000..aa33324d
--- /dev/null
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -0,0 +1,241 @@
+<lc-breadcrumb [breadcrumbs]="breadcrumbs()" />
+
+<h1>{{ sourceTitle() }}</h1>
+
+<p>Fill in what agents, places, and objects are described in <i>{{ sourceTitle() }}</i>. Then describe the episodes in the work, and how the agents, places, and objects are involved in these actions.</p>
+
+<div ngbAccordion [closeOthers]="true">
+    <div ngbAccordionItem>
+        <h2 ngbAccordionHeader>
+            <button ngbAccordionButton>Agents</button>
+        </h2>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+                <ng-template>
+                    <p>What people and groups act as agents in the text?</p>
+                    <ul class="list-group mb-4">
+                        <li class="list-group-item"
+                            [routerLink]="['source/', 1]">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="dataIcons.person" />
+                                St. Radegund
+                            </h5>
+                            <p>Founder of the Abbey in Poitiers</p>
+                            <lc-action-button-group [editLink]="['agent', 1]" (deleteAction)="onDelete()"></lc-action-button-group>
+                        </li>
+                        <li class="list-group-item">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="dataIcons.personUnknown" />
+                                Unknown messenger
+                            </h5>
+                            <p>Messenger who delivers the letter to the nuns</p>
+                            <div class="btn-group">
+                                <button class="btn btn-primary" disabled>
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </button>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </li>
+                        <div class="list-group-item">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="dataIcons.group"></lc-icon>
+                                The nuns of Poitiers
+                            </h5>
+                            <p>Nuns in the abbey of Poitiers</p>
+                            <div class="btn-group">
+                                <a class="btn btn-primary" [routerLink]="['agent', 3]">
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </a>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </div>
+                    </ul>
+                    <div class="btn-group mb-4">
+                        <button class="btn btn-primary">
+                            <lc-icon [icon]="actionIcons.create" />
+                            Add a new agent
+                        </button>
+                    </div>
+                </ng-template>
+            </div>
+        </div>
+    </div>
+    <!-- <div ngbAccordionItem>
+        <h2 ngbAccordionHeader>
+            <button ngbAccordionButton>Places</button>
+        </h2>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+                <ng-template>
+                    <p>What locations are described in the text? Where do actions take place?</p>
+                    <div class="list-group mb-4">
+                        <div class="list-group-item"
+                            [routerLink]="['source/', 1]">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="icons.place"></lc-icon>
+                                The Abbey of the Holy Cross
+                            </h5>
+                            <p>Abbey in Poitiers</p>
+                            <div class="btn-group">
+                                <a class="btn btn-primary" [routerLink]="['space', 1]">
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </a>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </div>
+                        <div class="list-group-item">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="icons.place"></lc-icon>
+                                A cave
+                            </h5>
+                            <p>A cave somewhere in France, where Radegund had a vision</p>
+                            <div class="btn-group">
+                                <button class="btn btn-primary" disabled>
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </button>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="btn-group mb-4">
+                        <button class="btn btn-primary" disabled>
+                            <lc-icon [icon]="actionIcons.create"></lc-icon>
+                            Add a new place
+                        </button>
+                    </div>
+                </ng-template>
+            </div>
+        </div>
+    </div> -->
+    <!-- <div ngbAccordionItem>
+        <h2 ngbAccordionHeader>
+            <button ngbAccordionButton>Objects</button>
+        </h2>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+                <ng-template>
+                    <p>What objects are sent and received?</p>
+                    <div class="list-group mb-4">
+                        <div class="list-group-item">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="icons.letter"></lc-icon>
+                                Letter from Radegund
+                            </h5>
+                            <p>A letter written by Radegund describing her vision</p>
+                            <div class="btn-group">
+                                <a class="btn btn-primary"
+                                    [routerLink]="['object/', 1]">
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </a>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </div>
+                        <div class="list-group-item">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="icons.object"></lc-icon>
+                                Hairshirt
+                            </h5>
+                            <p>A penitent gift</p>
+                            <div class="btn-group">
+                                <button class="btn btn-primary" disabled>
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </button>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </div>
+                        <div class="list-group-item">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="icons.letter"></lc-icon>
+                                Letter from Heaven
+                            </h5>
+                            <p>A letter delivered in a vision</p>
+                            <div class="btn-group">
+                                <button class="btn btn-primary" disabled>
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </button>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="btn-group mb-4">
+                        <button class="btn btn-primary" disabled>
+                            <lc-icon [icon]="actionIcons.create"></lc-icon>
+                            Add a new object
+                        </button>
+                    </div>
+                </ng-template>
+            </div>
+        </div>
+    </div> -->
+    <!-- <div ngbAccordionItem>
+        <h2 ngbAccordionHeader>
+            <button ngbAccordionButton>Actions</button>
+        </h2>
+        <div ngbAccordionCollapse>
+            <div ngbAccordionBody>
+                <ng-template>
+                    <p>
+                        Describe the events of the text in singular "actions".
+                        A single letter-exchange often involves several actions; e.g.
+                        the writing, transporting, delivering, and reading of the letter.
+                    </p>
+                    <div class="list-group mb-4">
+                        <div class="list-group-item"
+                            [routerLink]="['source/', 1]">
+                            <h5 class="mb-1">
+                                <lc-icon [icon]="icons.action"></lc-icon>
+                                Delivering of the letter from Radegund
+                            </h5>
+                            <p>An unknown messenger delivers a letter to the nuns of Poitiers.</p>
+                            <div class="btn-group">
+                                <a class="btn btn-primary"
+                                    [routerLink]="['event', '1']">
+                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
+                                    Edit
+                                </a>
+                                <button class="btn btn-danger" disabled>
+                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+                                    Delete
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="btn-group mb-4">
+                        <button class="btn btn-primary" disabled>
+                            <lc-icon [icon]="actionIcons.create"></lc-icon>
+                            Add a new action
+                        </button>
+                    </div>
+                </ng-template>
+            </div>
+        </div>
+    </div> -->
+</div>
diff --git a/frontend/src/app/data-entry/source/source.component.scss b/frontend/src/app/data-entry/source/source.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/source/source.component.spec.ts b/frontend/src/app/data-entry/source/source.component.spec.ts
new file mode 100644
index 00000000..f30c0424
--- /dev/null
+++ b/frontend/src/app/data-entry/source/source.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { SourceComponent } from "./source.component";
+
+describe("SourceComponent", () => {
+    let component: SourceComponent;
+    let fixture: ComponentFixture<SourceComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [SourceComponent],
+        });
+        fixture = TestBed.createComponent(SourceComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
new file mode 100644
index 00000000..66529c64
--- /dev/null
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -0,0 +1,54 @@
+import { Component, computed } from "@angular/core";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { ActivatedRoute } from "@angular/router";
+import { actionIcons, dataIcons } from "@shared/icons";
+import { DataEntrySourceDetailGQL } from "generated/graphql";
+import { map, share, switchMap } from "rxjs";
+
+@Component({
+    selector: "lc-source",
+    templateUrl: "./source.component.html",
+    styleUrls: ["./source.component.scss"],
+})
+export class SourceComponent {
+    public breadcrumbs = computed(() => [
+        {
+            label: "Lettercraft",
+            link: "/",
+        },
+        {
+            label: "Data entry",
+            link: "/data-entry",
+        },
+        {
+            label: this.sourceTitle(),
+            link: "/data-entry/source/1",
+        },
+    ]);
+
+    public source$ = this.route.params.pipe(
+        map((params) => params["id"]),
+        switchMap((id) => this.sourceDetailQuery.watch({ id }).valueChanges),
+        map((result) => result.data.source),
+        share()
+    );
+
+    public sourceTitle = toSignal(
+        this.source$.pipe(
+            map((source) => `${source.medievalAuthor}, ${source.medievalTitle}`)
+        ),
+        { initialValue: "" }
+    );
+
+    public dataIcons = dataIcons;
+    public actionIcons = actionIcons;
+
+    onDelete(): void {
+        console.log("Hey there!");
+    }
+
+    constructor(
+        private route: ActivatedRoute,
+        private sourceDetailQuery: DataEntrySourceDetailGQL
+    ) {}
+}
diff --git a/frontend/src/app/data-entry/source/source.graphql b/frontend/src/app/data-entry/source/source.graphql
new file mode 100644
index 00000000..f8e00582
--- /dev/null
+++ b/frontend/src/app/data-entry/source/source.graphql
@@ -0,0 +1,14 @@
+query DataEntrySourceDetail($id: ID!) {
+    source(id: $id) {
+        id
+        name
+        editionAuthor
+        editionTitle
+        medievalAuthor
+        medievalTitle
+        numOfEpisodes
+        episodes {
+            id
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/sources/sources.component.html b/frontend/src/app/data-entry/sources/sources.component.html
index 40c65b95..c00853b9 100644
--- a/frontend/src/app/data-entry/sources/sources.component.html
+++ b/frontend/src/app/data-entry/sources/sources.component.html
@@ -8,7 +8,7 @@ <h1>Data entry</h1>
     <li *ngFor="let source of sources$ | async; trackBy: identify"
        class="list-group-item list-group-item-action">
         <div class="d-flex align-items-center">
-            <a [routerLink]="['source', source.id]" class="mb-1 h5 stretched-link">{{ source.name }}</a>
+            <a [routerLink]="[source.id]" class="mb-1 h5 stretched-link">{{ source.name }}</a>
             <small class="text-body-secondary ms-2">
                 ({source.numOfEpisodes, plural, =0 {No episodes} =1 {1 episode} other {{{ source.numOfEpisodes}} episodes}})
             </small>
diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 1b9ecdb3..181a11ac 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -9,6 +9,7 @@ import { ResetPasswordComponent } from './user/reset-password/reset-password.com
 import { UserSettingsComponent } from './user/user-settings/user-settings.component';
 import { LoggedOnGuard } from '@shared/logged-on.guard';
 import { SourcesComponent } from './data-entry/sources/sources.component';
+import { SourceComponent } from './data-entry/source/source.component';
 
 const routes: Routes = [
     {
@@ -44,8 +45,17 @@ const routes: Routes = [
         canActivate: [LoggedOnGuard],
         children: [
             {
-                path: '',
+                path: 'source',
                 component: SourcesComponent
+            },
+            {
+                path: 'source/:id',
+                component: SourceComponent
+            },
+            {
+                path: '',
+                pathMatch: 'full',
+                redirectTo: 'source'
             }
         ]
     },

From 0e41418b16315432040cb147f4f3526f6a978629 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 10:35:19 +0200
Subject: [PATCH 152/565] ActionButtonGroup

---
 .../action-button-group.component.html        | 10 +++++++++
 .../action-button-group.component.scss        |  0
 .../action-button-group.component.spec.ts     | 21 +++++++++++++++++++
 .../action-button-group.component.ts          | 21 +++++++++++++++++++
 frontend/src/app/shared/shared.module.ts      |  5 ++++-
 5 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.html
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.scss
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.ts

diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.html b/frontend/src/app/shared/action-button-group/action-button-group.component.html
new file mode 100644
index 00000000..9dd4e3f8
--- /dev/null
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.html
@@ -0,0 +1,10 @@
+<div class="btn-group">
+    <a class="btn btn-primary" [routerLink]="editLink">
+        <lc-icon [icon]="actionIcons.edit" />
+        Edit
+    </a>
+    <button class="btn btn-danger" (click)="onDelete($event)">
+        <lc-icon [icon]="actionIcons.delete" />
+        Delete
+    </button>
+</div>
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.scss b/frontend/src/app/shared/action-button-group/action-button-group.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts b/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
new file mode 100644
index 00000000..7d2851b2
--- /dev/null
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ActionButtonGroupComponent } from './action-button-group.component';
+
+describe('ActionButtonGroupComponent', () => {
+  let component: ActionButtonGroupComponent;
+  let fixture: ComponentFixture<ActionButtonGroupComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ActionButtonGroupComponent]
+    });
+    fixture = TestBed.createComponent(ActionButtonGroupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.ts b/frontend/src/app/shared/action-button-group/action-button-group.component.ts
new file mode 100644
index 00000000..891ba692
--- /dev/null
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.ts
@@ -0,0 +1,21 @@
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { RouterLink } from "@angular/router";
+import { actionIcons } from "@shared/icons";
+
+@Component({
+    selector: "lc-action-button-group",
+    templateUrl: "./action-button-group.component.html",
+    styleUrls: ["./action-button-group.component.scss"],
+})
+export class ActionButtonGroupComponent {
+    @Input({ required: true }) public editLink!: RouterLink["routerLink"];
+    @Output() deleteAction = new EventEmitter<void>();
+
+    public actionIcons = actionIcons;
+
+    public onDelete(event: Event): void {
+        event.preventDefault();
+        event.stopPropagation();
+        this.deleteAction.emit();
+    }
+}
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index dbb0b41e..c49ddc21 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -8,13 +8,15 @@ import { RouterModule } from '@angular/router';
 import { ReactiveFormsModule } from '@angular/forms';
 import { IconComponent } from './icon/icon.component';
 import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
+import { ActionButtonGroupComponent } from './action-button-group/action-button-group.component';
 
 
 
 @NgModule({
     declarations: [
         IconComponent,
-        BreadcrumbComponent
+        BreadcrumbComponent,
+        ActionButtonGroupComponent
     ],
     imports: [
         CommonModule,
@@ -32,6 +34,7 @@ import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
     exports: [
         IconComponent,
         BreadcrumbComponent,
+        ActionButtonGroupComponent,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,

From 1bcdffed7ffc9a1dd6170d6b39796a082109e978 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 10:35:19 +0200
Subject: [PATCH 153/565] ActionButtonGroup

---
 .../action-button-group.component.html        | 10 +++++++++
 .../action-button-group.component.scss        |  0
 .../action-button-group.component.spec.ts     | 21 +++++++++++++++++++
 .../action-button-group.component.ts          | 21 +++++++++++++++++++
 frontend/src/app/shared/shared.module.ts      |  5 ++++-
 5 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.html
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.scss
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
 create mode 100644 frontend/src/app/shared/action-button-group/action-button-group.component.ts

diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.html b/frontend/src/app/shared/action-button-group/action-button-group.component.html
new file mode 100644
index 00000000..9dd4e3f8
--- /dev/null
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.html
@@ -0,0 +1,10 @@
+<div class="btn-group">
+    <a class="btn btn-primary" [routerLink]="editLink">
+        <lc-icon [icon]="actionIcons.edit" />
+        Edit
+    </a>
+    <button class="btn btn-danger" (click)="onDelete($event)">
+        <lc-icon [icon]="actionIcons.delete" />
+        Delete
+    </button>
+</div>
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.scss b/frontend/src/app/shared/action-button-group/action-button-group.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts b/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
new file mode 100644
index 00000000..7d2851b2
--- /dev/null
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ActionButtonGroupComponent } from './action-button-group.component';
+
+describe('ActionButtonGroupComponent', () => {
+  let component: ActionButtonGroupComponent;
+  let fixture: ComponentFixture<ActionButtonGroupComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ActionButtonGroupComponent]
+    });
+    fixture = TestBed.createComponent(ActionButtonGroupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.ts b/frontend/src/app/shared/action-button-group/action-button-group.component.ts
new file mode 100644
index 00000000..891ba692
--- /dev/null
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.ts
@@ -0,0 +1,21 @@
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { RouterLink } from "@angular/router";
+import { actionIcons } from "@shared/icons";
+
+@Component({
+    selector: "lc-action-button-group",
+    templateUrl: "./action-button-group.component.html",
+    styleUrls: ["./action-button-group.component.scss"],
+})
+export class ActionButtonGroupComponent {
+    @Input({ required: true }) public editLink!: RouterLink["routerLink"];
+    @Output() deleteAction = new EventEmitter<void>();
+
+    public actionIcons = actionIcons;
+
+    public onDelete(event: Event): void {
+        event.preventDefault();
+        event.stopPropagation();
+        this.deleteAction.emit();
+    }
+}
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index dbb0b41e..c49ddc21 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -8,13 +8,15 @@ import { RouterModule } from '@angular/router';
 import { ReactiveFormsModule } from '@angular/forms';
 import { IconComponent } from './icon/icon.component';
 import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
+import { ActionButtonGroupComponent } from './action-button-group/action-button-group.component';
 
 
 
 @NgModule({
     declarations: [
         IconComponent,
-        BreadcrumbComponent
+        BreadcrumbComponent,
+        ActionButtonGroupComponent
     ],
     imports: [
         CommonModule,
@@ -32,6 +34,7 @@ import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
     exports: [
         IconComponent,
         BreadcrumbComponent,
+        ActionButtonGroupComponent,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,

From 2dd50b65f5258aa0dbb47440c65886a0235ac6a9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 10:51:22 +0200
Subject: [PATCH 154/565] Cleanup

---
 frontend/src/app/data-entry/data-entry.module.ts         | 2 +-
 frontend/src/app/data-entry/source/source.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
index 0a4e2213..198cd183 100644
--- a/frontend/src/app/data-entry/data-entry.module.ts
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -6,6 +6,6 @@ import { SourceComponent } from './source/source.component';
 @NgModule({
     declarations: [SourcesComponent, SourceComponent],
     imports: [SharedModule],
-    exports: [SourcesComponent, SourceComponent],
+    exports: [SourcesComponent],
 })
 export class DataEntryModule {}
diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index aa33324d..dba191a8 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -21,7 +21,7 @@ <h5 class="mb-1">
                                 St. Radegund
                             </h5>
                             <p>Founder of the Abbey in Poitiers</p>
-                            <lc-action-button-group [editLink]="['agent', 1]" (deleteAction)="onDelete()"></lc-action-button-group>
+                            <lc-action-button-group [editLink]="['agent', 1]" (deleteAction)="onDelete()" />
                         </li>
                         <li class="list-group-item">
                             <h5 class="mb-1">

From ec58fc4029960d8c2a1ca2159b88b297daac6a50 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 11:12:12 +0200
Subject: [PATCH 155/565] Query episodes on source

---
 backend/source/types/SourceType.py            |   4 +-
 .../data-entry/source/source.component.html   | 306 +++++-------------
 .../app/data-entry/source/source.component.ts |   4 +-
 .../src/app/data-entry/source/source.graphql  |   6 +
 4 files changed, 83 insertions(+), 237 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index fdbbfda8..d8771804 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -1,4 +1,4 @@
-from graphene import Field, Int, List, ResolveInfo
+from graphene import Field, Int, List, NonNull, ResolveInfo
 from django.db.models import QuerySet
 from graphene_django import DjangoObjectType
 from event.models import Episode
@@ -9,7 +9,7 @@
 
 
 class SourceType(DjangoObjectType):
-    episodes = List(EpisodeType, required=True)
+    episodes = List(NonNull(EpisodeType), required=True)
     num_of_episodes = Int(required=True)
     written_date = Field(SourceWrittenDateType)
     contents_date = Field(SourceContentsDateType)
diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index dba191a8..c02a7e3d 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -1,241 +1,81 @@
 <lc-breadcrumb [breadcrumbs]="breadcrumbs()" />
 
-<h1>{{ sourceTitle() }}</h1>
+<h1 class="mb-4">
+    <lc-icon [icon]="dataIcons.source" />
+    {{ sourceTitle() }}
+</h1>
 
-<p>Fill in what agents, places, and objects are described in <i>{{ sourceTitle() }}</i>. Then describe the episodes in the work, and how the agents, places, and objects are involved in these actions.</p>
 
-<div ngbAccordion [closeOthers]="true">
-    <div ngbAccordionItem>
-        <h2 ngbAccordionHeader>
-            <button ngbAccordionButton>Agents</button>
-        </h2>
-        <div ngbAccordionCollapse>
-            <div ngbAccordionBody>
-                <ng-template>
-                    <p>What people and groups act as agents in the text?</p>
-                    <ul class="list-group mb-4">
-                        <li class="list-group-item"
-                            [routerLink]="['source/', 1]">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="dataIcons.person" />
-                                St. Radegund
-                            </h5>
-                            <p>Founder of the Abbey in Poitiers</p>
-                            <lc-action-button-group [editLink]="['agent', 1]" (deleteAction)="onDelete()" />
-                        </li>
-                        <li class="list-group-item">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="dataIcons.personUnknown" />
-                                Unknown messenger
-                            </h5>
-                            <p>Messenger who delivers the letter to the nuns</p>
-                            <div class="btn-group">
-                                <button class="btn btn-primary" disabled>
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </button>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </li>
-                        <div class="list-group-item">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="dataIcons.group"></lc-icon>
-                                The nuns of Poitiers
-                            </h5>
-                            <p>Nuns in the abbey of Poitiers</p>
-                            <div class="btn-group">
-                                <a class="btn btn-primary" [routerLink]="['agent', 3]">
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </a>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </div>
-                    </ul>
-                    <div class="btn-group mb-4">
-                        <button class="btn btn-primary">
-                            <lc-icon [icon]="actionIcons.create" />
-                            Add a new agent
-                        </button>
-                    </div>
-                </ng-template>
-            </div>
-        </div>
-    </div>
-    <!-- <div ngbAccordionItem>
-        <h2 ngbAccordionHeader>
-            <button ngbAccordionButton>Places</button>
-        </h2>
-        <div ngbAccordionCollapse>
-            <div ngbAccordionBody>
-                <ng-template>
-                    <p>What locations are described in the text? Where do actions take place?</p>
-                    <div class="list-group mb-4">
-                        <div class="list-group-item"
-                            [routerLink]="['source/', 1]">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="icons.place"></lc-icon>
-                                The Abbey of the Holy Cross
-                            </h5>
-                            <p>Abbey in Poitiers</p>
-                            <div class="btn-group">
-                                <a class="btn btn-primary" [routerLink]="['space', 1]">
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </a>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </div>
-                        <div class="list-group-item">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="icons.place"></lc-icon>
-                                A cave
-                            </h5>
-                            <p>A cave somewhere in France, where Radegund had a vision</p>
-                            <div class="btn-group">
-                                <button class="btn btn-primary" disabled>
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </button>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="btn-group mb-4">
-                        <button class="btn btn-primary" disabled>
-                            <lc-icon [icon]="actionIcons.create"></lc-icon>
-                            Add a new place
-                        </button>
-                    </div>
-                </ng-template>
-            </div>
-        </div>
-    </div> -->
-    <!-- <div ngbAccordionItem>
-        <h2 ngbAccordionHeader>
-            <button ngbAccordionButton>Objects</button>
-        </h2>
-        <div ngbAccordionCollapse>
-            <div ngbAccordionBody>
-                <ng-template>
-                    <p>What objects are sent and received?</p>
-                    <div class="list-group mb-4">
-                        <div class="list-group-item">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="icons.letter"></lc-icon>
-                                Letter from Radegund
-                            </h5>
-                            <p>A letter written by Radegund describing her vision</p>
-                            <div class="btn-group">
-                                <a class="btn btn-primary"
-                                    [routerLink]="['object/', 1]">
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </a>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </div>
-                        <div class="list-group-item">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="icons.object"></lc-icon>
-                                Hairshirt
-                            </h5>
-                            <p>A penitent gift</p>
-                            <div class="btn-group">
-                                <button class="btn btn-primary" disabled>
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </button>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </div>
-                        <div class="list-group-item">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="icons.letter"></lc-icon>
-                                Letter from Heaven
-                            </h5>
-                            <p>A letter delivered in a vision</p>
-                            <div class="btn-group">
-                                <button class="btn btn-primary" disabled>
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </button>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="btn-group mb-4">
-                        <button class="btn btn-primary" disabled>
-                            <lc-icon [icon]="actionIcons.create"></lc-icon>
-                            Add a new object
-                        </button>
-                    </div>
-                </ng-template>
+<h2 class="mb-4">Episodes</h2>
+
+<p>
+    Identify <i>episodes</i> in the narrative that relate to epistolary communication.
+    For each episode, fill in what happens and what agents, objects, and locations are involved.
+</p>
+
+<div class="mb-4" *ngIf="source$ | async as source">
+    <div class="card mb-4"
+        *ngFor="let episode of source.episodes">
+        <div class="card-header">
+            <div class="d-flex justify-content-between">
+                <div>
+                    <lc-icon [icon]="dataIcons.episode" />
+                    &nbsp;
+                    {{episode.name}}
+                    <br>
+                    <small>book 1, chapter 1</small>
+                </div>
+                <lc-action-button-group
+                    [editLink]="['episode', episode.id]"
+                    (delete)="deleteEpisode(episode.id)" />
             </div>
         </div>
-    </div> -->
-    <!-- <div ngbAccordionItem>
-        <h2 ngbAccordionHeader>
-            <button ngbAccordionButton>Actions</button>
-        </h2>
-        <div ngbAccordionCollapse>
-            <div ngbAccordionBody>
-                <ng-template>
-                    <p>
-                        Describe the events of the text in singular "actions".
-                        A single letter-exchange often involves several actions; e.g.
-                        the writing, transporting, delivering, and reading of the letter.
-                    </p>
-                    <div class="list-group mb-4">
-                        <div class="list-group-item"
-                            [routerLink]="['source/', 1]">
-                            <h5 class="mb-1">
-                                <lc-icon [icon]="icons.action"></lc-icon>
-                                Delivering of the letter from Radegund
-                            </h5>
-                            <p>An unknown messenger delivers a letter to the nuns of Poitiers.</p>
-                            <div class="btn-group">
-                                <a class="btn btn-primary"
-                                    [routerLink]="['event', '1']">
-                                    <lc-icon [icon]="actionIcons.edit"></lc-icon>
-                                    Edit
-                                </a>
-                                <button class="btn btn-danger" disabled>
-                                    <lc-icon [icon]="actionIcons.delete"></lc-icon>
-                                    Delete
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="btn-group mb-4">
-                        <button class="btn btn-primary" disabled>
-                            <lc-icon [icon]="actionIcons.create"></lc-icon>
-                            Add a new action
-                        </button>
-                    </div>
-                </ng-template>
-            </div>
+        <div class="card-body">
+            <p>{{episode.summary || '...'}}</p>
+
+            <!-- <dl>
+                <ng-container *ngIf="episode.agents.length">
+                    <dt>Agents</dt>
+                    <dd class="ms-4">
+                        <span *ngFor="let agent of episode.agents; let last = last">
+                            <a [routerLink]="['agent/', agent.id]" class="icon-link">
+                                <i [class]="agentIcon(agent)"></i>
+                                {{agent.name}}
+                            </a><span *ngIf="!last">, &nbsp;</span>
+                        </span>
+                    </dd>
+                </ng-container>
+
+                <ng-container *ngIf="episode.locations.length">
+                    <dt>Locations</dt>
+                    <dd class="ms-4">
+                        <span *ngFor="let location of episode.locations; let last = last">
+                            <a [routerLink]="['location/', location.id]"  class="icon-link">
+                                <i [class]="icons.location"></i>
+                                {{location.name}}
+                            </a><span *ngIf="!last">, &nbsp;</span>
+                        </span>
+                    </dd>
+                </ng-container>
+
+                <ng-container *ngIf="episode.objects.length">
+                    <dt>Objects</dt>
+                    <dd class="ms-4">
+                        <span *ngFor="let object of episode.objects; let last = last">
+                            <a [routerLink]="['object/', object.id]" class="icon-link">
+                                <i [class]="icons.letter"></i>
+                                {{object.name}}
+                            </a><span *ngIf="!last">, &nbsp;</span>
+                        </span>
+                    </dd>
+                </ng-container>
+            </dl> -->
         </div>
-    </div> -->
+    </div>
+</div>
+<div class="btn-group mb-4">
+    <button class="btn btn-primary" disabled>
+        <lc-icon [icon]="actionIcons.create" />
+        Add a new episode
+    </button>
 </div>
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 66529c64..251ab1d3 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -43,8 +43,8 @@ export class SourceComponent {
     public dataIcons = dataIcons;
     public actionIcons = actionIcons;
 
-    onDelete(): void {
-        console.log("Hey there!");
+    deleteEpisode(episodeId: string): void {
+        console.log("Deleting episode with id", episodeId);
     }
 
     constructor(
diff --git a/frontend/src/app/data-entry/source/source.graphql b/frontend/src/app/data-entry/source/source.graphql
index f8e00582..4ab29d53 100644
--- a/frontend/src/app/data-entry/source/source.graphql
+++ b/frontend/src/app/data-entry/source/source.graphql
@@ -9,6 +9,12 @@ query DataEntrySourceDetail($id: ID!) {
         numOfEpisodes
         episodes {
             id
+            name
+            summary
+            agents {
+                id
+            }
+            
         }
     }
 }

From 656359086995a2d36eb06a81cef4efa859f29ebf Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 13:45:27 +0200
Subject: [PATCH 156/565] Fetched agent details

---
 .../data-entry/source/source.component.html   | 139 ++++++++++++------
 .../data-entry/source/source.component.scss   |   4 +
 .../app/data-entry/source/source.component.ts |  25 +++-
 .../src/app/data-entry/source/source.graphql  |  23 ++-
 4 files changed, 138 insertions(+), 53 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index c02a7e3d..d20f241b 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -2,74 +2,121 @@
 
 <h1 class="mb-4">
     <lc-icon [icon]="dataIcons.source" />
-    {{ sourceTitle() }}
+    <span *ngIf="source$ | async as source" class="ms-2">
+        {{ source.medievalAuthor }}, <i>{{ source.medievalTitle }}</i>
+    </span>
 </h1>
 
-
 <h2 class="mb-4">Episodes</h2>
 
 <p>
-    Identify <i>episodes</i> in the narrative that relate to epistolary communication.
-    For each episode, fill in what happens and what agents, objects, and locations are involved.
+    Identify <i>episodes</i> in the narrative that relate to epistolary
+    communication. For each episode, fill in what happens and what agents,
+    objects, and locations are involved.
 </p>
 
 <div class="mb-4" *ngIf="source$ | async as source">
-    <div class="card mb-4"
-        *ngFor="let episode of source.episodes">
+    <div class="card mb-4" *ngFor="let episode of source.episodes">
         <div class="card-header">
             <div class="d-flex justify-content-between">
                 <div>
                     <lc-icon [icon]="dataIcons.episode" />
                     &nbsp;
-                    {{episode.name}}
-                    <br>
-                    <small>book 1, chapter 1</small>
+                    {{ episode.name }}
+                    <br />
+                    <small>
+                        <span>book {{ episode.book }}</span>,
+                        <span>chapter {{ episode.chapter }}</span>
+                    </small>
                 </div>
                 <lc-action-button-group
                     [editLink]="['episode', episode.id]"
-                    (delete)="deleteEpisode(episode.id)" />
+                    (delete)="deleteEpisode(episode.id)"
+                />
             </div>
         </div>
         <div class="card-body">
-            <p>{{episode.summary || '...'}}</p>
+            <p>{{ episode.summary || "..." }}</p>
 
-            <!-- <dl>
-                <ng-container *ngIf="episode.agents.length">
-                    <dt>Agents</dt>
-                    <dd class="ms-4">
-                        <span *ngFor="let agent of episode.agents; let last = last">
-                            <a [routerLink]="['agent/', agent.id]" class="icon-link">
-                                <i [class]="agentIcon(agent)"></i>
-                                {{agent.name}}
-                            </a><span *ngIf="!last">, &nbsp;</span>
-                        </span>
-                    </dd>
-                </ng-container>
+            <dl>
+                <dt>Agents</dt>
+                <dd
+                    *ngIf="episode.agents.length > 0; else noAgents"
+                    class="ms-4"
+                >
+                    <span
+                        *ngFor="let agent of episode.agents"
+                        class="entity-item"
+                    >
+                        <a
+                            [routerLink]="['agent/', agent.id]"
+                            class="icon-link"
+                        >
+                            <lc-icon [icon]="agentIcon(agent)" />
+                            {{ agent.name }}
+                        </a>
+                    </span>
+                </dd>
+                <ng-template #noAgents>
+                    <dd class="ms-4">No agents have been added yet.</dd>
+                </ng-template>
 
-                <ng-container *ngIf="episode.locations.length">
-                    <dt>Locations</dt>
-                    <dd class="ms-4">
-                        <span *ngFor="let location of episode.locations; let last = last">
-                            <a [routerLink]="['location/', location.id]"  class="icon-link">
-                                <i [class]="icons.location"></i>
-                                {{location.name}}
-                            </a><span *ngIf="!last">, &nbsp;</span>
-                        </span>
-                    </dd>
-                </ng-container>
+                <dt>Locations</dt>
+                <dd
+                    *ngIf="episode.spaces.length > 0; else noSpaces"
+                    class="ms-4"
+                >
+                    <span
+                        *ngFor="let space of episode.spaces"
+                        class="entity-item"
+                    >
+                        <a
+                            [routerLink]="['location/', space.id]"
+                            class="icon-link"
+                        >
+                            <lc-icon [icon]="dataIcons.location" />
+                            {{ space.name }}
+                        </a>
+                    </span>
+                </dd>
+                <ng-template #noSpaces>
+                    <dd class="ms-4">No locations have been added yet.</dd>
+                </ng-template>
 
-                <ng-container *ngIf="episode.objects.length">
-                    <dt>Objects</dt>
-                    <dd class="ms-4">
-                        <span *ngFor="let object of episode.objects; let last = last">
-                            <a [routerLink]="['object/', object.id]" class="icon-link">
-                                <i [class]="icons.letter"></i>
-                                {{object.name}}
-                            </a><span *ngIf="!last">, &nbsp;</span>
-                        </span>
-                    </dd>
-                </ng-container>
-            </dl> -->
+                <dt>Objects</dt>
+                <dd
+                    *ngIf="
+                        episode.gifts.length > 0 || episode.letters.length > 0;
+                        else noObjects
+                    "
+                    class="ms-4"
+                >
+                    <span
+                        *ngFor="let gift of episode.gifts"
+                        class="entity-item"
+                    >
+                        <a [routerLink]="['gift/', gift.id]" class="icon-link">
+                            <lc-icon [icon]="dataIcons.gift" />
+                            {{ gift.name }}
+                        </a>
+                    </span>
+                    <span
+                        *ngFor="let letter of episode.letters"
+                        class="entity-item"
+                    >
+                        <a
+                            [routerLink]="['letter/', letter.id]"
+                            class="icon-link"
+                        >
+                            <lc-icon [icon]="dataIcons.letter" />
+                            {{ letter.name }}
+                        </a>
+                    </span>
+                </dd>
+                <ng-template #noObjects>
+                    <dd class="ms-4">No objects have been added yet.</dd>
+                </ng-template>
+            </dl>
         </div>
     </div>
 </div>
diff --git a/frontend/src/app/data-entry/source/source.component.scss b/frontend/src/app/data-entry/source/source.component.scss
index e69de29b..519f75e5 100644
--- a/frontend/src/app/data-entry/source/source.component.scss
+++ b/frontend/src/app/data-entry/source/source.component.scss
@@ -0,0 +1,4 @@
+.entity-item:not(:last-child)::after {
+    // Character \00A0 is a non-breaking space.
+    content: ",\00A0";
+}
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 251ab1d3..78b82f52 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -2,9 +2,11 @@ import { Component, computed } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntrySourceDetailGQL } from "generated/graphql";
+import { DataEntrySourceDetailGQL, DataEntrySourceDetailQuery } from "generated/graphql";
 import { map, share, switchMap } from "rxjs";
 
+type QueriedAgent = NonNullable<DataEntrySourceDetailQuery["source"]["episodes"]>[0]["agents"][0];
+
 @Component({
     selector: "lc-source",
     templateUrl: "./source.component.html",
@@ -43,12 +45,23 @@ export class SourceComponent {
     public dataIcons = dataIcons;
     public actionIcons = actionIcons;
 
-    deleteEpisode(episodeId: string): void {
-        console.log("Deleting episode with id", episodeId);
-    }
-
     constructor(
         private route: ActivatedRoute,
         private sourceDetailQuery: DataEntrySourceDetailGQL
-    ) {}
+    ) { }
+
+
+    public deleteEpisode(episodeId: string): void {
+        console.log("Deleting episode with id", episodeId);
+    }
+
+    public agentIcon(agent: QueriedAgent): string {
+        if (agent.isGroup) {
+            return dataIcons.group;
+        }
+        if (agent.describes?.some(person => person?.identifiable)) {
+            return dataIcons.person;
+        }
+        return dataIcons.personUnknown;
+    }
 }
diff --git a/frontend/src/app/data-entry/source/source.graphql b/frontend/src/app/data-entry/source/source.graphql
index 4ab29d53..612d293a 100644
--- a/frontend/src/app/data-entry/source/source.graphql
+++ b/frontend/src/app/data-entry/source/source.graphql
@@ -10,11 +10,32 @@ query DataEntrySourceDetail($id: ID!) {
         episodes {
             id
             name
+            description
             summary
+            book
+            chapter
+            page
             agents {
                 id
+                name
+                isGroup
+                describes {
+                    id
+                    identifiable
+                }
+            }
+            gifts {
+                id
+                name
+            }
+            letters {
+                id
+                name
+            }
+            spaces {
+                id
+                name
             }
-            
         }
     }
 }

From d8ff8158019453281a3d3a01cd4156001a106174 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 13:45:38 +0200
Subject: [PATCH 157/565] Remove backend type ignore

---
 backend/person/types/AgentDescriptionType.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index 224519a2..d8d9d7d3 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -40,4 +40,4 @@ def resolve_describes(
     def resolve_person_references(
         parent: AgentDescription, info: ResolveInfo
     ) -> QuerySet[PersonReference]:
-        return parent.person_references.all()  # type: ignore
+        return PersonReference.objects.filter(person=parent)

From 8077b96fc85aabb92f9d56f4643682e0aef3a572 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 31 Jul 2024 14:08:17 +0200
Subject: [PATCH 158/565] Hide text on action buttons

---
 frontend/src/app/data-entry/source/source.component.html      | 1 +
 .../action-button-group/action-button-group.component.html    | 4 ++--
 .../action-button-group/action-button-group.component.ts      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index d20f241b..7d872876 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -32,6 +32,7 @@ <h2 class="mb-4">Episodes</h2>
                 <lc-action-button-group
                     [editLink]="['episode', episode.id]"
                     (delete)="deleteEpisode(episode.id)"
+                    [showButtonText]="false"
                 />
             </div>
         </div>
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.html b/frontend/src/app/shared/action-button-group/action-button-group.component.html
index 9dd4e3f8..d3519b6c 100644
--- a/frontend/src/app/shared/action-button-group/action-button-group.component.html
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.html
@@ -1,10 +1,10 @@
 <div class="btn-group">
     <a class="btn btn-primary" [routerLink]="editLink">
         <lc-icon [icon]="actionIcons.edit" />
-        Edit
+        <span *ngIf="showButtonText" class="ms-2">Edit</span>
     </a>
     <button class="btn btn-danger" (click)="onDelete($event)">
         <lc-icon [icon]="actionIcons.delete" />
-        Delete
+        <span *ngIf="showButtonText" class="ms-2">Delete</span>
     </button>
 </div>
diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.ts b/frontend/src/app/shared/action-button-group/action-button-group.component.ts
index 891ba692..26874ce2 100644
--- a/frontend/src/app/shared/action-button-group/action-button-group.component.ts
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.ts
@@ -9,6 +9,7 @@ import { actionIcons } from "@shared/icons";
 })
 export class ActionButtonGroupComponent {
     @Input({ required: true }) public editLink!: RouterLink["routerLink"];
+    @Input() showButtonText = true;
     @Output() deleteAction = new EventEmitter<void>();
 
     public actionIcons = actionIcons;

From 8112e7d8713f314273185efe1026d4215ddcdf2d Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 1 Aug 2024 13:39:08 +0200
Subject: [PATCH 159/565] A11y

---
 .../action-button-group/action-button-group.component.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.html b/frontend/src/app/shared/action-button-group/action-button-group.component.html
index d3519b6c..ac3833b4 100644
--- a/frontend/src/app/shared/action-button-group/action-button-group.component.html
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.html
@@ -1,10 +1,10 @@
 <div class="btn-group">
     <a class="btn btn-primary" [routerLink]="editLink">
-        <lc-icon [icon]="actionIcons.edit" />
+        <lc-icon [icon]="actionIcons.edit" [title]="showButtonText ? undefined : 'Edit'" />
         <span *ngIf="showButtonText" class="ms-2">Edit</span>
     </a>
     <button class="btn btn-danger" (click)="onDelete($event)">
-        <lc-icon [icon]="actionIcons.delete" />
+        <lc-icon [icon]="actionIcons.delete" [title]="showButtonText ? undefined : 'Delete'"/>
         <span *ngIf="showButtonText" class="ms-2">Delete</span>
     </button>
 </div>

From ec6a5f3a1d176ba9f0584b936a19d3ee90ff5bdd Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 1 Aug 2024 13:43:40 +0200
Subject: [PATCH 160/565] Add missing ID param

---
 frontend/src/app/data-entry/source/source.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 78b82f52..d4bfb1da 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -24,7 +24,7 @@ export class SourceComponent {
         },
         {
             label: this.sourceTitle(),
-            link: "/data-entry/source/1",
+            link: "/data-entry/source/" + this.route.snapshot.params["id"],
         },
     ]);
 

From 45afc35a5cec2398342b30b09696e6f0f20a8c2f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 1 Aug 2024 13:48:11 +0200
Subject: [PATCH 161/565] Use get_queryset

---
 backend/source/types/SourceType.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index d8771804..a9c0b18e 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -33,8 +33,8 @@ def get_queryset(
 
     @staticmethod
     def resolve_episodes(parent: Source, info: ResolveInfo) -> QuerySet[Episode]:
-        return Episode.objects.filter(source_id=parent.pk)
+        return EpisodeType.get_queryset(Episode.objects, info).filter(source_id=parent.pk)
 
     @staticmethod
     def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
-        return Episode.objects.filter(source_id=parent.pk).count()
+        return EpisodeType.get_queryset(Episode.objects, info).filter(source_id=parent.pk).count()

From b72a451f469126a43af962712e2c9895db7e7031 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 1 Aug 2024 13:55:16 +0200
Subject: [PATCH 162/565] use shareReplay

---
 frontend/src/app/data-entry/source/source.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index d4bfb1da..01a181e2 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -3,7 +3,7 @@ import { toSignal } from "@angular/core/rxjs-interop";
 import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
 import { DataEntrySourceDetailGQL, DataEntrySourceDetailQuery } from "generated/graphql";
-import { map, share, switchMap } from "rxjs";
+import { map, shareReplay, switchMap } from "rxjs";
 
 type QueriedAgent = NonNullable<DataEntrySourceDetailQuery["source"]["episodes"]>[0]["agents"][0];
 
@@ -32,7 +32,7 @@ export class SourceComponent {
         map((params) => params["id"]),
         switchMap((id) => this.sourceDetailQuery.watch({ id }).valueChanges),
         map((result) => result.data.source),
-        share()
+        shareReplay(1)
     );
 
     public sourceTitle = toSignal(

From 5252431a768b53dc70bb428b02f5ccaf8256113f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 14:11:48 +0200
Subject: [PATCH 163/565] create shared data entry module

---
 frontend/src/app/data-entry/shared/shared.module.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 frontend/src/app/data-entry/shared/shared.module.ts

diff --git a/frontend/src/app/data-entry/shared/shared.module.ts b/frontend/src/app/data-entry/shared/shared.module.ts
new file mode 100644
index 00000000..203e0364
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/shared.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared/shared.module';
+
+
+
+@NgModule({
+    declarations: [],
+    imports: [
+        SharedModule
+    ]
+})
+export class DataEntrySharedModule { }

From 2c7dd6278a70ddca2e6dda9eb3e781f8096acc3e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 14:15:53 +0200
Subject: [PATCH 164/565] generate designators control component

---
 .../designators-control.component.html        |  1 +
 .../designators-control.component.scss        |  0
 .../designators-control.component.spec.ts     | 21 +++++++++++++++++++
 .../designators-control.component.ts          |  9 ++++++++
 .../app/data-entry/shared/shared.module.ts    |  8 ++++++-
 5 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
 create mode 100644 frontend/src/app/data-entry/shared/designators-control/designators-control.component.scss
 create mode 100644 frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
new file mode 100644
index 00000000..e112900a
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -0,0 +1 @@
+<p>designators-control works!</p>
diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.scss b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts
new file mode 100644
index 00000000..818f4b0b
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DesignatorsControlComponent } from './designators-control.component';
+
+describe('DesignatorsControlComponent', () => {
+    let component: DesignatorsControlComponent;
+    let fixture: ComponentFixture<DesignatorsControlComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [DesignatorsControlComponent]
+        });
+        fixture = TestBed.createComponent(DesignatorsControlComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
new file mode 100644
index 00000000..e5484575
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'lc-designators-control',
+    templateUrl: './designators-control.component.html',
+    styleUrls: ['./designators-control.component.scss']
+})
+export class DesignatorsControlComponent {
+}
diff --git a/frontend/src/app/data-entry/shared/shared.module.ts b/frontend/src/app/data-entry/shared/shared.module.ts
index 203e0364..a64bc226 100644
--- a/frontend/src/app/data-entry/shared/shared.module.ts
+++ b/frontend/src/app/data-entry/shared/shared.module.ts
@@ -1,12 +1,18 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared/shared.module';
+import { DesignatorsControlComponent } from './designators-control/designators-control.component';
 
 
 
 @NgModule({
-    declarations: [],
+    declarations: [
+        DesignatorsControlComponent
+    ],
     imports: [
         SharedModule
+    ],
+    exports: [
+        DesignatorsControlComponent,
     ]
 })
 export class DataEntrySharedModule { }

From 85a0b4aa01908b0f5e18fcf0e7eb21d97200d3e8 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 14:18:59 +0200
Subject: [PATCH 165/565] modules magic

---
 .../shared/{shared.module.ts => data-entry-shared.module.ts}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frontend/src/app/data-entry/shared/{shared.module.ts => data-entry-shared.module.ts} (100%)

diff --git a/frontend/src/app/data-entry/shared/shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
similarity index 100%
rename from frontend/src/app/data-entry/shared/shared.module.ts
rename to frontend/src/app/data-entry/shared/data-entry-shared.module.ts

From 40fd9533b924c81b120dff17bc42c4bb3ec38f79 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 16:17:06 +0200
Subject: [PATCH 166/565] draft designators component

---
 .../designators-control.component.html        | 29 +++++++-
 .../designators-control.component.ts          | 72 ++++++++++++++++++-
 2 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index e112900a..e7ba3bcc 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -1 +1,28 @@
-<p>designators-control works!</p>
+<div class="mb-3">
+    <p>Designators</p>
+    <div *ngFor="let designator of designators$.value; let i = index"
+        class="input-group mb-3">
+        <input class="form-control" [value]="designator"
+            [attr.aria-label]="designatorInputLabel(i)"
+            (blur)="blur$.next()">
+        <button class="btn btn-secondary" type="button"
+            (blur)="blur$.next()"
+            (click)="removeDesignator(i)">
+            <lc-icon [icon]="actionIcons.remove"
+                [attr.aria-label]="designatorRemoveLabel(i)" />
+        </button>
+    </div>
+</div>
+
+<form class="" [formGroup]="addForm" (ngSubmit)="onAddFormSubmit()">
+    <label class="form-label" for="input-new-designator">Add a designator</label>
+    <div class="input-group mb-3">
+        <input type="text" class="form-control" id="input-new-designator"
+            [formControl]="addForm.controls.designator"
+            (blur)="blur$.next()">
+        <button class="btn btn-primary" type="submit"
+            (blur)="blur$.next()">
+            <lc-icon [icon]="actionIcons.add" aria-label="add" />
+        </button>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
index e5484575..ac0dd2a2 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
@@ -1,9 +1,75 @@
-import { Component } from '@angular/core';
+import { Component, forwardRef, Input } from '@angular/core';
+import { ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import { actionIcons } from '@shared/icons';
+import { BehaviorSubject, Subject } from 'rxjs';
+import _ from 'underscore';
 
 @Component({
     selector: 'lc-designators-control',
     templateUrl: './designators-control.component.html',
-    styleUrls: ['./designators-control.component.scss']
+    styleUrls: ['./designators-control.component.scss'],
+    providers: [
+        {
+            provide: NG_VALUE_ACCESSOR,
+            useExisting: forwardRef(() => DesignatorsControlComponent),
+            multi: true,
+        }
+    ],
 })
-export class DesignatorsControlComponent {
+export class DesignatorsControlComponent implements ControlValueAccessor {
+    @Input({ required: true }) formControl!: FormControl<string[]>;
+
+    designators$ = new BehaviorSubject<string[]>([]);
+    blur$ = new Subject<void>();
+    disabled = false;
+
+    addForm = new FormGroup({
+        designator: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+                Validators.minLength(1),
+            ]
+        })
+    });
+
+    actionIcons = actionIcons;
+
+    writeValue(obj: string[]): void {
+        this.designators$.next(obj);
+    }
+
+    registerOnChange(fn: (_: any) => void): void {
+        this.designators$.subscribe(fn);
+    }
+
+    registerOnTouched(fn: (_: any) => void): void {
+        this.blur$.subscribe(fn);
+    }
+
+    setDisabledState(isDisabled: boolean): void {
+        this.disabled = isDisabled;
+    }
+
+    onAddFormSubmit() {
+        if (this.addForm.valid) {
+            const designator = this.addForm.controls.designator.value;
+            this.designators$.next(this.designators$.value.concat([designator]));
+            this.addForm.reset({ designator: '' });
+        }
+    }
+
+    removeDesignator(index: number) {
+        const spliced = _.clone(this.designators$.value)
+        spliced.splice(index, 1);
+        this.designators$.next(spliced);
+    }
+
+    designatorInputLabel(i: number): string {
+        return `designator ${i}`;
+    }
+
+    designatorRemoveLabel(i: number): string {
+        return `remove designator ${i}`;
+    }
 }

From 9f21859ae72dd82182f78831da66d163d4f17599 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 16:28:44 +0200
Subject: [PATCH 167/565] handle disabled on designators form

---
 .../designators-control/designators-control.component.html   | 3 +++
 .../designators-control/designators-control.component.ts     | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index e7ba3bcc..1de1910c 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -4,8 +4,10 @@
         class="input-group mb-3">
         <input class="form-control" [value]="designator"
             [attr.aria-label]="designatorInputLabel(i)"
+            [disabled]="disabled"
             (blur)="blur$.next()">
         <button class="btn btn-secondary" type="button"
+            [disabled]="disabled"
             (blur)="blur$.next()"
             (click)="removeDesignator(i)">
             <lc-icon [icon]="actionIcons.remove"
@@ -21,6 +23,7 @@
             [formControl]="addForm.controls.designator"
             (blur)="blur$.next()">
         <button class="btn btn-primary" type="submit"
+            [disabled]="disabled"
             (blur)="blur$.next()">
             <lc-icon [icon]="actionIcons.add" aria-label="add" />
         </button>
diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
index ac0dd2a2..38455bc2 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
@@ -49,6 +49,11 @@ export class DesignatorsControlComponent implements ControlValueAccessor {
 
     setDisabledState(isDisabled: boolean): void {
         this.disabled = isDisabled;
+        if (isDisabled) {
+            this.addForm.disable();
+        } else {
+            this.addForm.enable();
+        }
     }
 
     onAddFormSubmit() {

From 589416c870cabbb4e9e9ea3a411622ad40beb584 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 11:11:48 +0200
Subject: [PATCH 168/565] show message for empty designator

---
 .../designators-control.component.html        | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index 1de1910c..55d3cada 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -1,19 +1,24 @@
 <div class="mb-3">
     <p>Designators</p>
-    <div *ngFor="let designator of designators$.value; let i = index"
-        class="input-group mb-3">
-        <input class="form-control" [value]="designator"
-            [attr.aria-label]="designatorInputLabel(i)"
-            [disabled]="disabled"
-            (blur)="blur$.next()">
-        <button class="btn btn-secondary" type="button"
-            [disabled]="disabled"
-            (blur)="blur$.next()"
-            (click)="removeDesignator(i)">
-            <lc-icon [icon]="actionIcons.remove"
-                [attr.aria-label]="designatorRemoveLabel(i)" />
-        </button>
-    </div>
+    <p *ngIf="designators$.value.length === 0">
+        <i>No designators added.</i>
+    </p>
+    <ul class="list-unstyled">
+        <li *ngFor="let designator of designators$.value; let i = index"
+            class="input-group mb-3">
+            <input class="form-control" [value]="designator"
+                [attr.aria-label]="designatorInputLabel(i)"
+                [disabled]="disabled"
+                (blur)="blur$.next()">
+            <button class="btn btn-secondary" type="button"
+                [disabled]="disabled"
+                (blur)="blur$.next()"
+                (click)="removeDesignator(i)">
+                <lc-icon [icon]="actionIcons.remove"
+                    [attr.aria-label]="designatorRemoveLabel(i)" />
+            </button>
+        </li>
+    </ul>
 </div>
 
 <form class="" [formGroup]="addForm" (ngSubmit)="onAddFormSubmit()">

From f1dd79ae045c1c83289928ffe01f0a7618cb8b12 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 11:38:00 +0200
Subject: [PATCH 169/565] no editing existing designators

---
 .../designators-control.component.html                    | 7 ++-----
 .../designators-control/designators-control.component.ts  | 8 ++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index 55d3cada..65785128 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -6,16 +6,13 @@
     <ul class="list-unstyled">
         <li *ngFor="let designator of designators$.value; let i = index"
             class="input-group mb-3">
-            <input class="form-control" [value]="designator"
-                [attr.aria-label]="designatorInputLabel(i)"
-                [disabled]="disabled"
-                (blur)="blur$.next()">
+            <span class="form-control">{{designator}}</span>
             <button class="btn btn-secondary" type="button"
                 [disabled]="disabled"
                 (blur)="blur$.next()"
                 (click)="removeDesignator(i)">
                 <lc-icon [icon]="actionIcons.remove"
-                    [attr.aria-label]="designatorRemoveLabel(i)" />
+                    [attr.aria-label]="designatorRemoveLabel(designator)" />
             </button>
         </li>
     </ul>
diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
index 38455bc2..f7bf4d4d 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
@@ -70,11 +70,7 @@ export class DesignatorsControlComponent implements ControlValueAccessor {
         this.designators$.next(spliced);
     }
 
-    designatorInputLabel(i: number): string {
-        return `designator ${i}`;
-    }
-
-    designatorRemoveLabel(i: number): string {
-        return `remove designator ${i}`;
+    designatorRemoveLabel(designator: string): string {
+        return `remove designator "${designator}"`;
     }
 }

From 941b37085a283f41ba4c26743c61a6e6c44b9a97 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 11:49:05 +0200
Subject: [PATCH 170/565] cleaner styling

---
 .../designators-control.component.html                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index 65785128..ca955514 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -3,11 +3,11 @@
     <p *ngIf="designators$.value.length === 0">
         <i>No designators added.</i>
     </p>
-    <ul class="list-unstyled">
+    <ul class="list-group">
         <li *ngFor="let designator of designators$.value; let i = index"
-            class="input-group mb-3">
-            <span class="form-control">{{designator}}</span>
-            <button class="btn btn-secondary" type="button"
+            class="list-group-item hstack gap-3">
+            <span>{{designator}}</span>
+            <button class="btn ms-auto" type="button"
                 [disabled]="disabled"
                 (blur)="blur$.next()"
                 (click)="removeDesignator(i)">
@@ -18,7 +18,7 @@
     </ul>
 </div>
 
-<form class="" [formGroup]="addForm" (ngSubmit)="onAddFormSubmit()">
+<form class="mb-3" [formGroup]="addForm" (ngSubmit)="onAddFormSubmit()">
     <label class="form-label" for="input-new-designator">Add a designator</label>
     <div class="input-group mb-3">
         <input type="text" class="form-control" id="input-new-designator"

From 259ce021572a658daeed3caac6f803af05050963 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 12:50:54 +0200
Subject: [PATCH 171/565] make agent location one-to-one

---
 ...19_alter_agentdescriptionlocation_agent.py | 19 +++++++++++++++++++
 backend/person/models.py                      |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 backend/person/migrations/0019_alter_agentdescriptionlocation_agent.py

diff --git a/backend/person/migrations/0019_alter_agentdescriptionlocation_agent.py b/backend/person/migrations/0019_alter_agentdescriptionlocation_agent.py
new file mode 100644
index 00000000..527a9129
--- /dev/null
+++ b/backend/person/migrations/0019_alter_agentdescriptionlocation_agent.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.7 on 2024-08-02 10:50
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0018_alter_personreference_description_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='agentdescriptionlocation',
+            name='agent',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='location', to='person.agentdescription'),
+        ),
+    ]
diff --git a/backend/person/models.py b/backend/person/models.py
index e41964d0..e86bb257 100644
--- a/backend/person/models.py
+++ b/backend/person/models.py
@@ -134,10 +134,10 @@ class AgentDescriptionLocation(DescriptionField, models.Model):
     May be used for groups ("the nuns of Poitiers").
     """
 
-    agent = models.ForeignKey(
+    agent = models.OneToOneField(
         to=AgentDescription,
         on_delete=models.CASCADE,
-        related_name="locations",
+        related_name="location",
     )
     location = models.ForeignKey(
         to=SpaceDescription,

From 70b672a48c470d14abb7352833ec7e72163c54d6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 12:53:14 +0200
Subject: [PATCH 172/565] add agent location to api

---
 backend/person/types/AgentDescriptionLocationType.py | 6 ------
 backend/person/types/AgentDescriptionType.py         | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/backend/person/types/AgentDescriptionLocationType.py b/backend/person/types/AgentDescriptionLocationType.py
index df6b0007..ba04c771 100644
--- a/backend/person/types/AgentDescriptionLocationType.py
+++ b/backend/person/types/AgentDescriptionLocationType.py
@@ -1,4 +1,3 @@
-from graphene import ResolveInfo
 from graphene_django import DjangoObjectType
 from core.types.DescriptionFieldType import DescriptionFieldType
 from person.models import AgentDescriptionLocation
@@ -12,8 +11,3 @@ class Meta:
             "agent",
             "location",
         ] + DescriptionFieldType.fields()
-
-    @staticmethod
-    def resolve_location(parent: AgentDescriptionLocation, info: ResolveInfo) -> str:
-        # TODO: Write SpaceDescriptionType
-        return str(parent.location)
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index 224519a2..910769cd 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -5,6 +5,7 @@
 from core.types.EntityDescriptionType import EntityDescriptionType
 from person.models import AgentDescription, HistoricalPerson, PersonReference
 from person.types.AgentDescriptionGenderType import AgentDescriptionGenderType
+from person.types.AgentDescriptionLocationType import AgentDescriptionLocationType
 from person.types.HistoricalPersonType import HistoricalPersonType
 from person.types.PersonReferenceType import PersonReferenceType
 
@@ -13,6 +14,7 @@ class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
     describes = List(HistoricalPersonType)
     person_references = List(PersonReferenceType)
     gender = Field(AgentDescriptionGenderType)
+    location = Field(AgentDescriptionLocationType)
 
     class Meta:
         model = AgentDescription
@@ -22,6 +24,7 @@ class Meta:
             "is_group",
             "person_references",
             "gender",
+            "location",
         ] + EntityDescriptionType.fields()
 
     @classmethod

From 3d0da0109e499d37c896cefc5d31b7722957e5b4 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 12:39:31 +0200
Subject: [PATCH 173/565] generate graphql types in gh action

---
 .github/workflows/test.yml | 2 +-
 CONTRIBUTING.md            | 6 +++++-
 package.json               | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cd1f43ee..6e310d7c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -79,7 +79,7 @@ jobs:
         yarn
         yarn django migrate
         yarn front yarn pretest
-        yarn front yarn graphql-codegen
+        yarn codegen-once
         yarn static-p
         find static
         yarn start-back-p &
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6cb093f1..34848632 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,7 +58,11 @@ Lettercraft uses a GraphQL API for research data. (User authentication / managem
 
 If you have worked on other applications from our lab, working with GraphQL may be new to you. See [Working with GraphQL](https://github.com/CentreForDigitalHumanities/dh-graphql/blob/main/Working%20with%20GraphQL.md) for a detailed guide on working with GraphQL in a Django/Angular project.
 
-One notable change from the development workflow in other applications is code generation: frontend types are automatically generated based on the backend definitions. If you are working on the API, make sure to run `yarn codegen` to keep generated types up to date.
+One notable change from the development workflow in other applications is code generation: frontend types are automatically generated based on the backend definitions.
+
+While you have a backend development server running, run `yarn codegen` in a separate terminal. This process will watch the frontend and backend for changes to keep generated types up to date.
+
+(Alternatively, you can `yarn codegen-once`. This will start a backend server, run code generation once, and exit. Note that this only works if the backend isn't already running.)
 
 ### Recommended order of development
 
diff --git a/package.json b/package.json
index 27703968..3903efe3 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,9 @@
         "static-p": "yarn build && yarn clean-static && yarn collectstatic-p",
         "watch-front-p": "yarn front yarn watch",
         "start-back-p": "cd backend && python manage.py runserver --settings production --insecure --pythonpath ..",
-        "start-p": "yarn static-p && yarn watch-front-p & yarn start-back-p"
+        "start-p": "yarn static-p && yarn watch-front-p & yarn start-back-p",
+        "stop-back": "kill $(lsof -t -i:8000)",
+        "codegen-once": "yarn start-back & yarn front yarn graphql-codegen && yarn stop-back"
     },
     "devDependencies": {
         "@angular/cli": ">=15 <16"

From 8b4a751216a3a7581585b2e6c81f98c954d77831 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 12:46:21 +0200
Subject: [PATCH 174/565] simplify test job

---
 .github/workflows/test.yml | 29 ++++++++---------------------
 .nvmrc                     |  2 +-
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6e310d7c..8c83c0df 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       # Label used to access the service container
@@ -39,34 +39,23 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
 
-    strategy:
-      matrix:
-        python-version: ['3.10']
-        node-version: ['16.x', '18.x']
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: Use Node.js ${{ matrix.node-version }}
+        python-version: '3.10'
+    - name: Use Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: ${{ matrix.node-version }}
+        node-version: '18'
     - name: Install Python dependencies
       run: |
         cd backend
         python -m pip install --upgrade pip
         pip install virtualenv
         pip install -r requirements.txt
-    - name: Lint with flake8
-      run: |
-        pip install flake8
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Run all tests
+    - name: Bootstrap application
       env:
         # Provide PostgreSQL environment variables in order to default to TCP connection
         PGDATABASE: lettercraft
@@ -80,8 +69,6 @@ jobs:
         yarn django migrate
         yarn front yarn pretest
         yarn codegen-once
-        yarn static-p
-        find static
-        yarn start-back-p &
-        chromedriver --version
+    - name: Run all tests
+      run: |
         yarn test
diff --git a/.nvmrc b/.nvmrc
index eea150f0..60495ee0 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v14.21.2
+v18.19.1

From 53701c4091a2c4d73bfd79ba0969be9f15d22661 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 13:29:34 +0200
Subject: [PATCH 175/565] remove generated types from gitignore

---
 .github/workflows/test.yml        |   3 -
 frontend/.gitignore               |   2 -
 frontend/generated/graphql.ts     | 728 ++++++++++++++++++++++++++++
 frontend/generated/schema.graphql | 756 ++++++++++++++++++++++++++++++
 4 files changed, 1484 insertions(+), 5 deletions(-)
 create mode 100644 frontend/generated/graphql.ts
 create mode 100644 frontend/generated/schema.graphql

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c83c0df..8f6aee4f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,9 +66,6 @@ jobs:
       run: |
         cat bootstrap_ci.txt | python bootstrap.py
         yarn
-        yarn django migrate
-        yarn front yarn pretest
-        yarn codegen-once
     - name: Run all tests
       run: |
         yarn test
diff --git a/frontend/.gitignore b/frontend/.gitignore
index 17b437b7..03923dd3 100644
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -41,5 +41,3 @@ testem.log
 .DS_Store
 Thumbs.db
 
-# Generated files
-/generated/*.*
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
new file mode 100644
index 00000000..f4744c83
--- /dev/null
+++ b/frontend/generated/graphql.ts
@@ -0,0 +1,728 @@
+import { gql } from 'apollo-angular';
+import { Injectable } from '@angular/core';
+import * as Apollo from 'apollo-angular';
+export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };
+export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: { input: string; output: string; }
+  String: { input: string; output: string; }
+  Boolean: { input: boolean; output: boolean; }
+  Int: { input: number; output: number; }
+  Float: { input: number; output: number; }
+};
+
+export type AgentDescriptionGenderType = {
+  __typename?: 'AgentDescriptionGenderType';
+  agent: AgentDescriptionType;
+  /** How certain are you of this value? */
+  certainty: PersonAgentDescriptionGenderCertaintyChoices;
+  /** The gender of this agent. The option Mixed is only applicable for groups. */
+  gender: PersonAgentDescriptionGenderGenderChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
+};
+
+export type AgentDescriptionType = {
+  __typename?: 'AgentDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  gender?: Maybe<AgentDescriptionGenderType>;
+  id: Scalars['ID']['output'];
+  /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
+  isGroup: Scalars['Boolean']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
+};
+
+export type EpisodeType = {
+  __typename?: 'EpisodeType';
+  /** agents involved in this episode */
+  agents: Array<AgentDescriptionType>;
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  /** gifts involved in this episode */
+  gifts: Array<GiftDescriptionType>;
+  id: Scalars['ID']['output'];
+  /** letters involved in this episode */
+  letters: Array<LetterDescriptionType>;
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<EventEpisodeSourceMentionChoices>;
+  /** locations involved in this episode */
+  spaces: Array<SpaceDescriptionType>;
+  /** full description of the events in the passage */
+  summary: Scalars['String']['output'];
+};
+
+/** An enumeration. */
+export enum EventEpisodeSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+export type GiftCategoryType = {
+  __typename?: 'GiftCategoryType';
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+};
+
+export type GiftDescriptionCategoryType = {
+  __typename?: 'GiftDescriptionCategoryType';
+  category: GiftCategoryType;
+  /** How certain are you of this value? */
+  certainty: LetterGiftDescriptionCategoryCertaintyChoices;
+  gift: GiftDescriptionType;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
+};
+
+export type GiftDescriptionType = {
+  __typename?: 'GiftDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  categories: Array<GiftCategoryType>;
+  categorisations: Array<GiftDescriptionCategoryType>;
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<LetterGiftDescriptionSourceMentionChoices>;
+};
+
+export type HistoricalPersonType = {
+  __typename?: 'HistoricalPersonType';
+  dateOfBirth?: Maybe<PersonDateOfBirthType>;
+  dateOfDeath?: Maybe<PersonDateOfDeathType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+};
+
+export type LetterCategoryType = {
+  __typename?: 'LetterCategoryType';
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  label: Scalars['String']['output'];
+};
+
+export type LetterDescriptionCategoryType = {
+  __typename?: 'LetterDescriptionCategoryType';
+  category: LetterCategoryType;
+  /** How certain are you of this value? */
+  certainty: LetterLetterDescriptionCategoryCertaintyChoices;
+  id: Scalars['ID']['output'];
+  letter: LetterDescriptionType;
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
+};
+
+export type LetterDescriptionType = {
+  __typename?: 'LetterDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  categories: Array<LetterCategoryType>;
+  categorisations: Array<LetterDescriptionCategoryType>;
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
+};
+
+/** An enumeration. */
+export enum LetterGiftDescriptionCategoryCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum LetterGiftDescriptionCategorySourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum LetterGiftDescriptionSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum LetterLetterDescriptionCategoryCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum LetterLetterDescriptionCategorySourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum LetterLetterDescriptionSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+export type Mutation = {
+  __typename?: 'Mutation';
+  updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
+};
+
+
+export type MutationUpdateOrCreateSourceArgs = {
+  input: UpdateCreateSourceInput;
+};
+
+/** An enumeration. */
+export enum PersonAgentDescriptionGenderCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum PersonAgentDescriptionGenderGenderChoices {
+  /** Female */
+  Female = 'FEMALE',
+  /** Male */
+  Male = 'MALE',
+  /** Mixed */
+  Mixed = 'MIXED',
+  /** Other */
+  Other = 'OTHER',
+  /** Unknown */
+  Unknown = 'UNKNOWN'
+}
+
+/** An enumeration. */
+export enum PersonAgentDescriptionGenderSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum PersonAgentDescriptionSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+export type PersonDateOfBirthType = {
+  __typename?: 'PersonDateOfBirthType';
+  /** How certain are you of this value? */
+  certainty: PersonPersonDateOfBirthCertaintyChoices;
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** date on which this person was born */
+  person: HistoricalPersonType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
+};
+
+export type PersonDateOfDeathType = {
+  __typename?: 'PersonDateOfDeathType';
+  /** How certain are you of this value? */
+  certainty: PersonPersonDateOfDeathCertaintyChoices;
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** date on which this person died */
+  person: HistoricalPersonType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
+};
+
+/** An enumeration. */
+export enum PersonPersonDateOfBirthCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum PersonPersonDateOfDeathCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum PersonPersonReferenceCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+export type PersonReferenceType = {
+  __typename?: 'PersonReferenceType';
+  /** How certain are you of this value? */
+  certainty: PersonPersonReferenceCertaintyChoices;
+  description: AgentDescriptionType;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  person: HistoricalPersonType;
+};
+
+export type Query = {
+  __typename?: 'Query';
+  agentDescription?: Maybe<AgentDescriptionType>;
+  agentDescriptions: Array<AgentDescriptionType>;
+  episode?: Maybe<EpisodeType>;
+  episodes: Array<EpisodeType>;
+  giftDescription?: Maybe<GiftDescriptionType>;
+  giftDescriptions: Array<GiftDescriptionType>;
+  letterDescription?: Maybe<LetterDescriptionType>;
+  letterDescriptions: Array<LetterDescriptionType>;
+  sources: Array<SourceType>;
+  spaceDescription?: Maybe<SpaceDescriptionType>;
+  spaceDescriptions: Array<SpaceDescriptionType>;
+};
+
+
+export type QueryAgentDescriptionArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type QueryAgentDescriptionsArgs = {
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
+};
+
+
+export type QueryEpisodeArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type QueryEpisodesArgs = {
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
+};
+
+
+export type QueryGiftDescriptionArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type QueryGiftDescriptionsArgs = {
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
+};
+
+
+export type QueryLetterDescriptionArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type QueryLetterDescriptionsArgs = {
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
+};
+
+
+export type QuerySpaceDescriptionArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type QuerySpaceDescriptionsArgs = {
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
+};
+
+export type RegionFieldType = {
+  __typename?: 'RegionFieldType';
+  /** How certain are you of this value? */
+  certainty: SpaceRegionFieldCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  region: RegionType;
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
+  space: SpaceDescriptionType;
+};
+
+export type RegionType = {
+  __typename?: 'RegionType';
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** Kind of region */
+  type: SpaceRegionTypeChoices;
+};
+
+export type SettlementFieldType = {
+  __typename?: 'SettlementFieldType';
+  /** How certain are you of this value? */
+  certainty: SpaceSettlementFieldCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  settlement: SettlementType;
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
+  space: SpaceDescriptionType;
+};
+
+export type SettlementType = {
+  __typename?: 'SettlementType';
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** Surrounding regions of this settlement */
+  regions: Array<RegionType>;
+};
+
+export type SourceContentsDateType = {
+  __typename?: 'SourceContentsDateType';
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** The source whose events took place at this date */
+  source: SourceType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
+};
+
+export type SourceType = {
+  __typename?: 'SourceType';
+  contentsDate?: Maybe<SourceContentsDateType>;
+  /** The name of the author of the edition */
+  editionAuthor: Scalars['String']['output'];
+  /** The title of the edition used for this source */
+  editionTitle: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** The name of the original author of the work, if known */
+  medievalAuthor: Scalars['String']['output'];
+  /** The original title of the work, if known */
+  medievalTitle: Scalars['String']['output'];
+  /** a unique name to identify this source in the database */
+  name: Scalars['String']['output'];
+  numOfEpisodes: Scalars['Int']['output'];
+  writtenDate?: Maybe<SourceWrittenDateType>;
+};
+
+export type SourceWrittenDateType = {
+  __typename?: 'SourceWrittenDateType';
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** The source that was written at this date */
+  source: SourceType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
+};
+
+export type SpaceDescriptionType = {
+  __typename?: 'SpaceDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  regionFields: Array<RegionFieldType>;
+  regions: Array<RegionType>;
+  settlementFields: Array<SettlementFieldType>;
+  settlements: Array<SettlementType>;
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<SpaceSpaceDescriptionSourceMentionChoices>;
+  structureFields: Array<StructureFieldType>;
+  structures: Array<StructureType>;
+};
+
+/** An enumeration. */
+export enum SpaceRegionFieldCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum SpaceRegionFieldSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum SpaceRegionTypeChoices {
+  /** ecclesiastical */
+  Ecclesiastical = 'ECCLESIASTICAL',
+  /** geographical */
+  Geographical = 'GEOGRAPHICAL',
+  /** political */
+  Political = 'POLITICAL'
+}
+
+/** An enumeration. */
+export enum SpaceSettlementFieldCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum SpaceSettlementFieldSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum SpaceSpaceDescriptionSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum SpaceStructureFieldCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum SpaceStructureFieldSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
+/** An enumeration. */
+export enum SpaceStructureLevelChoices {
+  /** road, square, crossroad */
+  A_1 = 'A_1',
+  /** fortification */
+  A_2 = 'A_2',
+  /** building, vessel */
+  A_3 = 'A_3',
+  /** room */
+  A_4 = 'A_4',
+  /** spot, object */
+  A_5 = 'A_5'
+}
+
+export type StructureFieldType = {
+  __typename?: 'StructureFieldType';
+  /** How certain are you of this value? */
+  certainty: SpaceStructureFieldCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
+  space: SpaceDescriptionType;
+  structure: StructureType;
+};
+
+export type StructureType = {
+  __typename?: 'StructureType';
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  level: SpaceStructureLevelChoices;
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The settlement containing this structure */
+  settlement?: Maybe<SettlementType>;
+};
+
+export type UpdateCreateSourceInput = {
+  editionAuthor?: InputMaybe<Scalars['String']['input']>;
+  editionTitle?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  medievalAuthor?: InputMaybe<Scalars['String']['input']>;
+  medievalTitle?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+};
+
+export type UpdateOrCreateSourceMutation = {
+  __typename?: 'UpdateOrCreateSourceMutation';
+  errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  source?: Maybe<SourceType>;
+};
+
+export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
+
+export const DataEntrySourceListDocument = gql`
+    query DataEntrySourceList {
+  sources {
+    id
+    name
+    editionAuthor
+    editionTitle
+    medievalAuthor
+    medievalTitle
+    numOfEpisodes
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
+    override document = DataEntrySourceListDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
\ No newline at end of file
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
new file mode 100644
index 00000000..ff086701
--- /dev/null
+++ b/frontend/generated/schema.graphql
@@ -0,0 +1,756 @@
+type AgentDescriptionGenderType {
+  agent: AgentDescriptionType!
+
+  """How certain are you of this value?"""
+  certainty: PersonAgentDescriptionGenderCertaintyChoices!
+
+  """
+  The gender of this agent. The option Mixed is only applicable for groups.
+  """
+  gender: PersonAgentDescriptionGenderGenderChoices!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+
+  """How is this information presented in the text?"""
+  sourceMention: PersonAgentDescriptionGenderSourceMentionChoices
+}
+
+type AgentDescriptionType {
+  """The book in the source"""
+  book: String!
+
+  """The chapter or chapters in the source"""
+  chapter: String!
+  describes: [HistoricalPersonType]
+
+  """Longer description to help identify this object"""
+  description: String!
+
+  """
+  Relevant (Latin) terminology used to describe this entity in the source text
+  """
+  designators: [String!]!
+  gender: AgentDescriptionGenderType
+  id: ID!
+
+  """Whether this agent is a group of people (e.g. 'the nuns of Poitiers')."""
+  isGroup: Boolean!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """The page number or page range in the source"""
+  page: String!
+  personReferences: [PersonReferenceType]
+
+  """Source text containing this description"""
+  source: SourceType!
+
+  """How is this entity presented in the text?"""
+  sourceMention: PersonAgentDescriptionSourceMentionChoices
+}
+
+type EpisodeType {
+  """agents involved in this episode"""
+  agents: [AgentDescriptionType!]!
+
+  """The book in the source"""
+  book: String!
+
+  """The chapter or chapters in the source"""
+  chapter: String!
+
+  """Longer description to help identify this object"""
+  description: String!
+
+  """
+  Relevant (Latin) terminology used to describe this entity in the source text
+  """
+  designators: [String!]!
+
+  """gifts involved in this episode"""
+  gifts: [GiftDescriptionType!]!
+  id: ID!
+
+  """letters involved in this episode"""
+  letters: [LetterDescriptionType!]!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """The page number or page range in the source"""
+  page: String!
+
+  """Source text containing this description"""
+  source: SourceType!
+
+  """How is this entity presented in the text?"""
+  sourceMention: EventEpisodeSourceMentionChoices
+
+  """locations involved in this episode"""
+  spaces: [SpaceDescriptionType!]!
+
+  """full description of the events in the passage"""
+  summary: String!
+}
+
+"""An enumeration."""
+enum EventEpisodeSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+type GiftCategoryType {
+  """Longer description to help identify this object"""
+  description: String!
+  id: ID!
+
+  """A name to help identify this object"""
+  name: String!
+}
+
+type GiftDescriptionCategoryType {
+  category: GiftCategoryType!
+
+  """How certain are you of this value?"""
+  certainty: LetterGiftDescriptionCategoryCertaintyChoices!
+  gift: GiftDescriptionType!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+
+  """How is this information presented in the text?"""
+  sourceMention: LetterGiftDescriptionCategorySourceMentionChoices
+}
+
+type GiftDescriptionType {
+  """The book in the source"""
+  book: String!
+  categories: [GiftCategoryType!]!
+  categorisations: [GiftDescriptionCategoryType!]!
+
+  """The chapter or chapters in the source"""
+  chapter: String!
+
+  """Longer description to help identify this object"""
+  description: String!
+
+  """
+  Relevant (Latin) terminology used to describe this entity in the source text
+  """
+  designators: [String!]!
+  id: ID!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """The page number or page range in the source"""
+  page: String!
+
+  """Source text containing this description"""
+  source: SourceType!
+
+  """How is this entity presented in the text?"""
+  sourceMention: LetterGiftDescriptionSourceMentionChoices
+}
+
+type HistoricalPersonType {
+  dateOfBirth: PersonDateOfBirthType
+  dateOfDeath: PersonDateOfDeathType
+
+  """Longer description to help identify this object"""
+  description: String!
+  id: ID!
+
+  """
+  Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description
+  """
+  identifiable: Boolean!
+
+  """A name to help identify this object"""
+  name: String!
+}
+
+type LetterCategoryType {
+  description: String!
+  id: ID!
+  label: String!
+}
+
+type LetterDescriptionCategoryType {
+  category: LetterCategoryType!
+
+  """How certain are you of this value?"""
+  certainty: LetterLetterDescriptionCategoryCertaintyChoices!
+  id: ID!
+  letter: LetterDescriptionType!
+
+  """Additional notes"""
+  note: String!
+
+  """How is this information presented in the text?"""
+  sourceMention: LetterLetterDescriptionCategorySourceMentionChoices
+}
+
+type LetterDescriptionType {
+  """The book in the source"""
+  book: String!
+  categories: [LetterCategoryType!]!
+  categorisations: [LetterDescriptionCategoryType!]!
+
+  """The chapter or chapters in the source"""
+  chapter: String!
+
+  """Longer description to help identify this object"""
+  description: String!
+
+  """
+  Relevant (Latin) terminology used to describe this entity in the source text
+  """
+  designators: [String!]!
+  id: ID!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """The page number or page range in the source"""
+  page: String!
+
+  """Source text containing this description"""
+  source: SourceType!
+
+  """How is this entity presented in the text?"""
+  sourceMention: LetterLetterDescriptionSourceMentionChoices
+}
+
+"""An enumeration."""
+enum LetterGiftDescriptionCategoryCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum LetterGiftDescriptionCategorySourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum LetterGiftDescriptionSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum LetterLetterDescriptionCategoryCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum LetterLetterDescriptionCategorySourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum LetterLetterDescriptionSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+type Mutation {
+  updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
+}
+
+"""An enumeration."""
+enum PersonAgentDescriptionGenderCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum PersonAgentDescriptionGenderGenderChoices {
+  """Female"""
+  FEMALE
+
+  """Male"""
+  MALE
+
+  """Mixed"""
+  MIXED
+
+  """Other"""
+  OTHER
+
+  """Unknown"""
+  UNKNOWN
+}
+
+"""An enumeration."""
+enum PersonAgentDescriptionGenderSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum PersonAgentDescriptionSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+type PersonDateOfBirthType {
+  """How certain are you of this value?"""
+  certainty: PersonPersonDateOfBirthCertaintyChoices!
+  displayDate: String!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+
+  """date on which this person was born"""
+  person: HistoricalPersonType!
+
+  """
+  The exact year of the value (if known). This will override the values in the lower and upper bounds fields.
+  """
+  yearExact: Int
+
+  """The earliest possible year for this value"""
+  yearLower: Int!
+
+  """The latest possible year for this value"""
+  yearUpper: Int!
+}
+
+type PersonDateOfDeathType {
+  """How certain are you of this value?"""
+  certainty: PersonPersonDateOfDeathCertaintyChoices!
+  displayDate: String!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+
+  """date on which this person died"""
+  person: HistoricalPersonType!
+
+  """
+  The exact year of the value (if known). This will override the values in the lower and upper bounds fields.
+  """
+  yearExact: Int
+
+  """The earliest possible year for this value"""
+  yearLower: Int!
+
+  """The latest possible year for this value"""
+  yearUpper: Int!
+}
+
+"""An enumeration."""
+enum PersonPersonDateOfBirthCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum PersonPersonDateOfDeathCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum PersonPersonReferenceCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+type PersonReferenceType {
+  """How certain are you of this value?"""
+  certainty: PersonPersonReferenceCertaintyChoices!
+  description: AgentDescriptionType!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+  person: HistoricalPersonType!
+}
+
+type Query {
+  agentDescription(id: ID!): AgentDescriptionType
+  agentDescriptions(episodeId: ID, sourceId: ID): [AgentDescriptionType!]!
+  episode(id: ID!): EpisodeType
+  episodes(sourceId: ID): [EpisodeType!]!
+  giftDescription(id: ID!): GiftDescriptionType
+  giftDescriptions(episodeId: ID, sourceId: ID): [GiftDescriptionType!]!
+  letterDescription(id: ID!): LetterDescriptionType
+  letterDescriptions(episodeId: ID, sourceId: ID): [LetterDescriptionType!]!
+  sources: [SourceType!]!
+  spaceDescription(id: ID!): SpaceDescriptionType
+  spaceDescriptions(sourceId: ID): [SpaceDescriptionType!]!
+}
+
+type RegionFieldType {
+  """How certain are you of this value?"""
+  certainty: SpaceRegionFieldCertaintyChoices!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+  region: RegionType!
+
+  """How is this information presented in the text?"""
+  sourceMention: SpaceRegionFieldSourceMentionChoices
+  space: SpaceDescriptionType!
+}
+
+type RegionType {
+  """Longer description to help identify this object"""
+  description: String!
+  id: ID!
+
+  """
+  Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description
+  """
+  identifiable: Boolean!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """Kind of region"""
+  type: SpaceRegionTypeChoices!
+}
+
+type SettlementFieldType {
+  """How certain are you of this value?"""
+  certainty: SpaceSettlementFieldCertaintyChoices!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+  settlement: SettlementType!
+
+  """How is this information presented in the text?"""
+  sourceMention: SpaceSettlementFieldSourceMentionChoices
+  space: SpaceDescriptionType!
+}
+
+type SettlementType {
+  """Longer description to help identify this object"""
+  description: String!
+  id: ID!
+
+  """
+  Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description
+  """
+  identifiable: Boolean!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """Surrounding regions of this settlement"""
+  regions: [RegionType!]!
+}
+
+type SourceContentsDateType {
+  displayDate: String!
+  id: ID!
+
+  """The source whose events took place at this date"""
+  source: SourceType!
+
+  """
+  The exact year of the value (if known). This will override the values in the lower and upper bounds fields.
+  """
+  yearExact: Int
+
+  """The earliest possible year for this value"""
+  yearLower: Int!
+
+  """The latest possible year for this value"""
+  yearUpper: Int!
+}
+
+type SourceType {
+  contentsDate: SourceContentsDateType
+
+  """The name of the author of the edition"""
+  editionAuthor: String!
+
+  """The title of the edition used for this source"""
+  editionTitle: String!
+  id: ID!
+
+  """The name of the original author of the work, if known"""
+  medievalAuthor: String!
+
+  """The original title of the work, if known"""
+  medievalTitle: String!
+
+  """a unique name to identify this source in the database"""
+  name: String!
+  numOfEpisodes: Int!
+  writtenDate: SourceWrittenDateType
+}
+
+type SourceWrittenDateType {
+  displayDate: String!
+  id: ID!
+
+  """The source that was written at this date"""
+  source: SourceType!
+
+  """
+  The exact year of the value (if known). This will override the values in the lower and upper bounds fields.
+  """
+  yearExact: Int
+
+  """The earliest possible year for this value"""
+  yearLower: Int!
+
+  """The latest possible year for this value"""
+  yearUpper: Int!
+}
+
+type SpaceDescriptionType {
+  """The book in the source"""
+  book: String!
+
+  """The chapter or chapters in the source"""
+  chapter: String!
+
+  """Longer description to help identify this object"""
+  description: String!
+
+  """
+  Relevant (Latin) terminology used to describe this entity in the source text
+  """
+  designators: [String!]!
+  id: ID!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """The page number or page range in the source"""
+  page: String!
+  regionFields: [RegionFieldType!]!
+  regions: [RegionType!]!
+  settlementFields: [SettlementFieldType!]!
+  settlements: [SettlementType!]!
+
+  """Source text containing this description"""
+  source: SourceType!
+
+  """How is this entity presented in the text?"""
+  sourceMention: SpaceSpaceDescriptionSourceMentionChoices
+  structureFields: [StructureFieldType!]!
+  structures: [StructureType!]!
+}
+
+"""An enumeration."""
+enum SpaceRegionFieldCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum SpaceRegionFieldSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum SpaceRegionTypeChoices {
+  """ecclesiastical"""
+  ECCLESIASTICAL
+
+  """geographical"""
+  GEOGRAPHICAL
+
+  """political"""
+  POLITICAL
+}
+
+"""An enumeration."""
+enum SpaceSettlementFieldCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum SpaceSettlementFieldSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum SpaceSpaceDescriptionSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum SpaceStructureFieldCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum SpaceStructureFieldSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
+"""An enumeration."""
+enum SpaceStructureLevelChoices {
+  """road, square, crossroad"""
+  A_1
+
+  """fortification"""
+  A_2
+
+  """building, vessel"""
+  A_3
+
+  """room"""
+  A_4
+
+  """spot, object"""
+  A_5
+}
+
+type StructureFieldType {
+  """How certain are you of this value?"""
+  certainty: SpaceStructureFieldCertaintyChoices!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+
+  """How is this information presented in the text?"""
+  sourceMention: SpaceStructureFieldSourceMentionChoices
+  space: SpaceDescriptionType!
+  structure: StructureType!
+}
+
+type StructureType {
+  """Longer description to help identify this object"""
+  description: String!
+  id: ID!
+
+  """
+  Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description
+  """
+  identifiable: Boolean!
+  level: SpaceStructureLevelChoices!
+
+  """A name to help identify this object"""
+  name: String!
+
+  """The settlement containing this structure"""
+  settlement: SettlementType
+}
+
+input UpdateCreateSourceInput {
+  editionAuthor: String
+  editionTitle: String
+  id: ID
+  medievalAuthor: String
+  medievalTitle: String
+  name: String!
+}
+
+type UpdateOrCreateSourceMutation {
+  errors: [String]
+  source: SourceType
+}
\ No newline at end of file

From aaacb1c3b404c18446d74665ade7ede71d85b758 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 13:50:01 +0200
Subject: [PATCH 176/565] split frontend/backend unit test jobs

---
 .github/workflows/test.yml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8f6aee4f..29171ccf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ on:
       - 'release/**'
 
 jobs:
-  build:
+  test-back:
 
     runs-on: ubuntu-22.04
 
@@ -65,7 +65,23 @@ jobs:
         PGPASSWORD: lettercraft_pwd
       run: |
         cat bootstrap_ci.txt | python bootstrap.py
-        yarn
     - name: Run all tests
       run: |
-        yarn test
+        cd backend
+        pytest
+  test-front:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install dependencies
+        run: |
+          yarn fyarn
+      - name: Run tests
+        run: |
+          yarn test-front

From ac9f3ea8f04cf8c80000c81243b05600e18d657f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 14:01:15 +0200
Subject: [PATCH 177/565] cache dependencies

---
 .github/workflows/test.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 29171ccf..b7034a38 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,15 +40,17 @@ jobs:
           - 5432:5432
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.10'
+        cache: 'pip'
     - name: Use Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
-        node-version: '18'
+        node-version: 18
+        cache: 'npm'
     - name: Install Python dependencies
       run: |
         cd backend
@@ -73,12 +75,12 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
-
+          node-version: 18
+          cache: 'npm'
       - name: Install dependencies
         run: |
           yarn fyarn

From 18d8f6b2dc9fc042245959085fc6eb976d573058 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 15:04:13 +0200
Subject: [PATCH 178/565] fix test module import

---
 .../action-button-group.component.spec.ts     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts b/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
index 7d2851b2..3d298824 100644
--- a/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
+++ b/frontend/src/app/shared/action-button-group/action-button-group.component.spec.ts
@@ -1,21 +1,22 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ActionButtonGroupComponent } from './action-button-group.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('ActionButtonGroupComponent', () => {
-  let component: ActionButtonGroupComponent;
-  let fixture: ComponentFixture<ActionButtonGroupComponent>;
+    let component: ActionButtonGroupComponent;
+    let fixture: ComponentFixture<ActionButtonGroupComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [ActionButtonGroupComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [SharedTestingModule]
+        });
+        fixture = TestBed.createComponent(ActionButtonGroupComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(ActionButtonGroupComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });

From e5975ca57f695d83c3cb2b966a3238ea5f29d583 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 15:42:57 +0200
Subject: [PATCH 179/565] fix test module import

---
 .../designators-control/designators-control.component.spec.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts
index 818f4b0b..89f9e3a0 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DesignatorsControlComponent } from './designators-control.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('DesignatorsControlComponent', () => {
     let component: DesignatorsControlComponent;
@@ -8,7 +9,8 @@ describe('DesignatorsControlComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [DesignatorsControlComponent]
+            declarations: [DesignatorsControlComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(DesignatorsControlComponent);
         component = fixture.componentInstance;

From f44a2525cb2cebba718dd86abe54be96972b8287 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 16:27:41 +0200
Subject: [PATCH 180/565] scaffold location, gift, letter form modules

---
 .../src/app/data-entry/data-entry.module.ts   | 21 ++++++++++++++++---
 .../gift-form/gift-form.component.html        |  1 +
 .../gift-form/gift-form.component.scss        |  0
 .../gift-form/gift-form.component.spec.ts     | 21 +++++++++++++++++++
 .../gift-form/gift-form.component.ts          | 10 +++++++++
 .../data-entry/gift-form/gift-form.module.ts  | 18 ++++++++++++++++
 .../letter-form/letter-form.component.html    |  1 +
 .../letter-form/letter-form.component.scss    |  0
 .../letter-form/letter-form.component.spec.ts | 21 +++++++++++++++++++
 .../letter-form/letter-form.component.ts      | 10 +++++++++
 .../letter-form/letter-form.module.ts         | 18 ++++++++++++++++
 .../location-form.component.html              |  1 +
 .../location-form.component.scss              |  0
 .../location-form.component.spec.ts           | 21 +++++++++++++++++++
 .../location-form/location-form.component.ts  | 10 +++++++++
 .../location-form/location-form.module.ts     | 18 ++++++++++++++++
 16 files changed, 168 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-form.component.html
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-form.component.scss
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-form.component.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-form.module.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-form.component.html
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-form.component.scss
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-form.component.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-form.module.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-form.component.html
 create mode 100644 frontend/src/app/data-entry/location-form/location-form.component.scss
 create mode 100644 frontend/src/app/data-entry/location-form/location-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-form.component.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-form.module.ts

diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
index 00f47651..da007d47 100644
--- a/frontend/src/app/data-entry/data-entry.module.ts
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -1,10 +1,25 @@
 import { NgModule } from "@angular/core";
 import { SharedModule } from "@shared/shared.module";
 import { SourcesComponent } from "./sources/sources.component";
+import { GiftFormModule } from "./gift-form/gift-form.module";
+import { LetterFormModule } from "./letter-form/letter-form.module";
+import { LocationFormModule } from "./location-form/location-form.module";
 
 @NgModule({
-    declarations: [SourcesComponent],
-    imports: [SharedModule],
-    exports: [SourcesComponent],
+    declarations: [
+        SourcesComponent,
+    ],
+    imports: [
+        SharedModule,
+        GiftFormModule,
+        LetterFormModule,
+        LocationFormModule,
+    ],
+    exports: [
+        SourcesComponent,
+        GiftFormModule,
+        LetterFormModule,
+        LocationFormModule,
+    ],
 })
 export class DataEntryModule {}
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
new file mode 100644
index 00000000..89c0c0d0
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -0,0 +1 @@
+<p>gift-form works!</p>
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.scss b/frontend/src/app/data-entry/gift-form/gift-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
new file mode 100644
index 00000000..289bd4cc
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { GiftFormComponent } from './gift-form.component';
+
+describe('GiftFormComponent', () => {
+  let component: GiftFormComponent;
+  let fixture: ComponentFixture<GiftFormComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [GiftFormComponent]
+    });
+    fixture = TestBed.createComponent(GiftFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
new file mode 100644
index 00000000..9f836c39
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'lc-gift-form',
+    templateUrl: './gift-form.component.html',
+    styleUrls: ['./gift-form.component.scss']
+})
+export class GiftFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.module.ts b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
new file mode 100644
index 00000000..e617f982
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared/shared.module';
+import { GiftFormComponent } from './gift-form.component';
+
+
+
+@NgModule({
+    declarations: [
+        GiftFormComponent,
+    ],
+    imports: [
+        SharedModule
+    ],
+    exports: [
+        GiftFormComponent,
+    ]
+})
+export class GiftFormModule { }
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
new file mode 100644
index 00000000..5eb46dd2
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -0,0 +1 @@
+<p>letter-form works!</p>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.scss b/frontend/src/app/data-entry/letter-form/letter-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
new file mode 100644
index 00000000..d56ad76d
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LetterFormComponent } from './letter-form.component';
+
+describe('LetterFormComponent', () => {
+  let component: LetterFormComponent;
+  let fixture: ComponentFixture<LetterFormComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [LetterFormComponent]
+    });
+    fixture = TestBed.createComponent(LetterFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
new file mode 100644
index 00000000..7d7a076b
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'lc-letter-form',
+    templateUrl: './letter-form.component.html',
+    styleUrls: ['./letter-form.component.scss']
+})
+export class LetterFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.module.ts b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
new file mode 100644
index 00000000..7fd7b41e
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared/shared.module';
+import { LetterFormComponent } from './letter-form.component';
+
+
+
+@NgModule({
+    declarations: [
+        LetterFormComponent,
+    ],
+    imports: [
+        SharedModule,
+    ],
+    exports: [
+        LetterFormComponent,
+    ]
+})
+export class LetterFormModule { }
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
new file mode 100644
index 00000000..90d8d0c5
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -0,0 +1 @@
+<p>location-form works!</p>
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.scss b/frontend/src/app/data-entry/location-form/location-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
new file mode 100644
index 00000000..a5699140
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LocationFormComponent } from './location-form.component';
+
+describe('LocationFormComponent', () => {
+  let component: LocationFormComponent;
+  let fixture: ComponentFixture<LocationFormComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [LocationFormComponent]
+    });
+    fixture = TestBed.createComponent(LocationFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
new file mode 100644
index 00000000..e481abb3
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'lc-location-form',
+    templateUrl: './location-form.component.html',
+    styleUrls: ['./location-form.component.scss']
+})
+export class LocationFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/location-form/location-form.module.ts b/frontend/src/app/data-entry/location-form/location-form.module.ts
new file mode 100644
index 00000000..5e82e237
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-form.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '@shared/shared.module';
+import { LocationFormComponent } from './location-form.component';
+
+
+
+@NgModule({
+    declarations: [
+        LocationFormComponent
+    ],
+    imports: [
+        SharedModule
+    ],
+    exports: [
+        LocationFormComponent
+    ]
+})
+export class LocationFormModule { }

From 7344d43cbd9eaa578fce57a35dab4d0372a0412c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 16:29:17 +0200
Subject: [PATCH 181/565] add forms to routes

---
 frontend/src/app/routes.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 1b9ecdb3..9daa99b6 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -9,6 +9,9 @@ import { ResetPasswordComponent } from './user/reset-password/reset-password.com
 import { UserSettingsComponent } from './user/user-settings/user-settings.component';
 import { LoggedOnGuard } from '@shared/logged-on.guard';
 import { SourcesComponent } from './data-entry/sources/sources.component';
+import { LocationFormComponent } from './data-entry/location-form/location-form.component';
+import { GiftFormComponent } from './data-entry/gift-form/gift-form.component';
+import { LetterFormComponent } from './data-entry/letter-form/letter-form.component';
 
 const routes: Routes = [
     {
@@ -43,6 +46,18 @@ const routes: Routes = [
         path: 'data-entry',
         canActivate: [LoggedOnGuard],
         children: [
+            {
+                path: 'gifts/:id',
+                component: GiftFormComponent,
+            },
+            {
+                path: 'letters/:id',
+                component: LetterFormComponent,
+            },
+            {
+                path: 'locations/:id',
+                component: LocationFormComponent,
+            },
             {
                 path: '',
                 component: SourcesComponent

From 119368772e082671ffd181d780d4e185a323b380 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 16:43:26 +0200
Subject: [PATCH 182/565] fetch data in gift form component

---
 .../gift-form/gift-form.component.html        | 20 +++++++++++++-
 .../gift-form/gift-form.component.spec.ts     | 26 ++++++++++---------
 .../gift-form/gift-form.component.ts          | 17 ++++++++++++
 .../src/app/data-entry/gift-form/gift.graphql | 11 ++++++++
 4 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/app/data-entry/gift-form/gift.graphql

diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index 89c0c0d0..dcb05257 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -1 +1,19 @@
-<p>gift-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.giftDescription as giftDescription">
+        <h1 class="mb-4">
+            <lc-icon [icon]="dataIcons.gift"></lc-icon>
+            {{giftDescription.name}}
+            <span class="text-secondary">
+                ({{giftDescription.source.name}})
+            </span>
+        </h1>
+
+        <p class="lead mb-4" *ngIf="giftDescription.description">
+            {{giftDescription.description}}
+        </p>
+
+        <div class="alert alert-warning">
+            This form is not implemented yet!
+        </div>
+    </ng-container>
+</ng-container>
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
index 289bd4cc..1f8f8d1b 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
@@ -1,21 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { GiftFormComponent } from './gift-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('GiftFormComponent', () => {
-  let component: GiftFormComponent;
-  let fixture: ComponentFixture<GiftFormComponent>;
+    let component: GiftFormComponent;
+    let fixture: ComponentFixture<GiftFormComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [GiftFormComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [GiftFormComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(GiftFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(GiftFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
index 9f836c39..2f3aaf81 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
@@ -1,4 +1,8 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { dataIcons } from '@shared/icons';
+import { DataEntryGiftGQL, DataEntryGiftQuery } from 'generated/graphql';
+import { map, Observable, switchMap } from 'rxjs';
 
 @Component({
     selector: 'lc-gift-form',
@@ -6,5 +10,18 @@ import { Component } from '@angular/core';
     styleUrls: ['./gift-form.component.scss']
 })
 export class GiftFormComponent {
+    id$: Observable<string>;
+    data$: Observable<DataEntryGiftQuery>;
 
+    dataIcons = dataIcons;
+
+    constructor(private route: ActivatedRoute, private giftQuery: DataEntryGiftGQL) {
+        this.id$ = this.route.params.pipe(
+            map(params => params['id']),
+        );
+        this.data$ = this.id$.pipe(
+            switchMap(id => this.giftQuery.watch({ id }).valueChanges),
+            map(result => result.data),
+        );
+    }
 }
diff --git a/frontend/src/app/data-entry/gift-form/gift.graphql b/frontend/src/app/data-entry/gift-form/gift.graphql
new file mode 100644
index 00000000..ee855d60
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift.graphql
@@ -0,0 +1,11 @@
+query DataEntryGift($id: ID!) {
+  giftDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}

From f784313644e69c73d4baeb3a78a0ea2853fa5c92 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 16:54:09 +0200
Subject: [PATCH 183/565] show breadcrumbs on gift form

---
 .../gift-form/gift-form.component.html        |  2 ++
 .../gift-form/gift-form.component.ts          | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index dcb05257..a5d52015 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -1,4 +1,6 @@
 <ng-container *ngIf="data$ | async as data">
+    <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)"></lc-breadcrumb>
+
     <ng-container *ngIf="data.giftDescription as giftDescription">
         <h1 class="mb-4">
             <lc-icon [icon]="dataIcons.gift"></lc-icon>
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
index 2f3aaf81..eb24da84 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
 import { dataIcons } from '@shared/icons';
 import { DataEntryGiftGQL, DataEntryGiftQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
@@ -24,4 +25,27 @@ export class GiftFormComponent {
             map(result => result.data),
         );
     }
+
+    getBreadcrumbs(data: DataEntryGiftQuery): Breadcrumb[] {
+        if (data.giftDescription) {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                {
+                    link: `/data-entry/sources/${data.giftDescription.source.id}`,
+                    label: data.giftDescription.source.name
+                },
+                {
+                    link: `/data-entry/gifts/${data.giftDescription.id}`,
+                    label: data.giftDescription.name
+                },
+            ];
+        } else {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                { link: '', label: 'Gift not found' }
+            ]
+        }
+    }
 }

From eb6b63b43a1a86c9657d100343c5ad62b4ce58f3 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 17:00:07 +0200
Subject: [PATCH 184/565] fetch data in letter form component

---
 .../letter-form/letter-form.component.ts       | 18 ++++++++++++++++++
 .../app/data-entry/letter-form/letter.graphql  | 11 +++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 frontend/src/app/data-entry/letter-form/letter.graphql

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 7d7a076b..cd1c4b0f 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -1,4 +1,8 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { dataIcons } from '@shared/icons';
+import { DataEntryLetterGQL, DataEntryLetterQuery } from 'generated/graphql';
+import { map, Observable, switchMap } from 'rxjs';
 
 @Component({
     selector: 'lc-letter-form',
@@ -6,5 +10,19 @@ import { Component } from '@angular/core';
     styleUrls: ['./letter-form.component.scss']
 })
 export class LetterFormComponent {
+    id$: Observable<string>;
+    data$: Observable<DataEntryLetterQuery>;
+
+    dataIcons = dataIcons;
+
+    constructor(private route: ActivatedRoute, private letterQuery: DataEntryLetterGQL) {
+        this.id$ = this.route.params.pipe(
+            map(params => params['id']),
+        );
+        this.data$ = this.id$.pipe(
+            switchMap(id => this.letterQuery.watch({ id }).valueChanges),
+            map(result => result.data),
+        );
+    }
 
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter.graphql b/frontend/src/app/data-entry/letter-form/letter.graphql
new file mode 100644
index 00000000..4f46fb8e
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter.graphql
@@ -0,0 +1,11 @@
+query DataEntryLetter($id: ID!) {
+  letterDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}

From b3735560fb3edcfac73cfaeb0e7bc99a136ffd88 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 17:05:10 +0200
Subject: [PATCH 185/565] scaffold letter form template

---
 .../letter-form/letter-form.component.html    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 5eb46dd2..583ca476 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -1 +1,19 @@
-<p>letter-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.letterDescription as letterDescription">
+        <h1 class="mb-4">
+            <lc-icon [icon]="dataIcons.letter" />
+            {{letterDescription.name}}
+            <span class="text-secondary">
+                ({{letterDescription.source.name}})
+            </span>
+        </h1>
+
+        <p class="lead mb-4" *ngIf="letterDescription.description">
+            {{letterDescription.description}}
+        </p>
+
+        <p class="alert alert-warning">
+            This form is not implemented yet!
+        </p>
+    </ng-container>
+</ng-container>

From 8be37531f3fc87074c844b1f691dc530784428c2 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 17:07:04 +0200
Subject: [PATCH 186/565] add breadcrumbs to letter form

---
 .../letter-form/letter-form.component.html    |  2 ++
 .../letter-form/letter-form.component.ts      | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 583ca476..bc91e625 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -1,4 +1,6 @@
 <ng-container *ngIf="data$ | async as data">
+    <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)" />
+
     <ng-container *ngIf="data.letterDescription as letterDescription">
         <h1 class="mb-4">
             <lc-icon [icon]="dataIcons.letter" />
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index cd1c4b0f..6083ae9e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
 import { dataIcons } from '@shared/icons';
 import { DataEntryLetterGQL, DataEntryLetterQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
@@ -25,4 +26,27 @@ export class LetterFormComponent {
         );
     }
 
+    getBreadcrumbs(data: DataEntryLetterQuery): Breadcrumb[] {
+        if (data.letterDescription) {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                {
+                    link: `/data-entry/sources/${data.letterDescription.source.id}`,
+                    label: data.letterDescription.source.name
+                },
+                {
+                    link: `/data-entry/letters/${data.letterDescription.id}`,
+                    label: data.letterDescription.name
+                },
+            ];
+        } else {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                { link: '', label: 'Letter not found' }
+            ]
+        }
+    }
+
 }

From 0aab1314add0dd6e8b36f17e9f5cf49c42323e1a Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 17:13:50 +0200
Subject: [PATCH 187/565] fetch data in location form

---
 .../location-form/location-form.component.ts  | 20 +++++++++++++++++++
 .../location-form/space-description.graphql   | 11 ++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 frontend/src/app/data-entry/location-form/space-description.graphql

diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
index e481abb3..80c543bd 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -1,4 +1,8 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { dataIcons } from '@shared/icons';
+import { DataEntrySpaceDescriptionGQL, DataEntrySpaceDescriptionQuery } from 'generated/graphql';
+import { map, Observable, switchMap } from 'rxjs';
 
 @Component({
     selector: 'lc-location-form',
@@ -6,5 +10,21 @@ import { Component } from '@angular/core';
     styleUrls: ['./location-form.component.scss']
 })
 export class LocationFormComponent {
+    id$: Observable<string>;
+    data$: Observable<DataEntrySpaceDescriptionQuery>;
+
+    dataIcons = dataIcons;
+
+    constructor(
+        private route: ActivatedRoute, private spaceQuery: DataEntrySpaceDescriptionGQL
+    ) {
+        this.id$ = this.route.params.pipe(
+            map(params => params['id']),
+        );
+        this.data$ = this.id$.pipe(
+            switchMap(id => this.spaceQuery.watch({ id }).valueChanges),
+            map(result => result.data),
+        );
+    }
 
 }
diff --git a/frontend/src/app/data-entry/location-form/space-description.graphql b/frontend/src/app/data-entry/location-form/space-description.graphql
new file mode 100644
index 00000000..e3aea7cf
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/space-description.graphql
@@ -0,0 +1,11 @@
+query DataEntrySpaceDescription($id: ID!) {
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}

From 0dd6815c1b47a6edeb5ea16dd4b6e2ea64f9083f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 17:15:04 +0200
Subject: [PATCH 188/565] scaffold location form template

---
 .../location-form.component.html              | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index 90d8d0c5..8263c582 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -1 +1,19 @@
-<p>location-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.spaceDescription as spaceDescription">
+        <h1 class="mb-4">
+            <lc-icon [icon]="dataIcons.location" />
+            {{spaceDescription.name}}
+            <span class="text-secondary">
+                ({{spaceDescription.source.name}})
+            </span>
+        </h1>
+
+        <p class="lead mb-4" *ngIf="spaceDescription.description">
+            {{spaceDescription.description}}
+        </p>
+
+        <p class="alert alert-warning">
+            This form is not implemented yet!
+        </p>
+    </ng-container>
+</ng-container>

From 68841e4f3e85a92faa0b2d73f290e5dc7d8458a1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 17:17:22 +0200
Subject: [PATCH 189/565] add breadcrumbs to location form

---
 .../location-form.component.html              |  2 ++
 .../location-form/location-form.component.ts  | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index 8263c582..42079d5a 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -1,4 +1,6 @@
 <ng-container *ngIf="data$ | async as data">
+    <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)"></lc-breadcrumb>
+
     <ng-container *ngIf="data.spaceDescription as spaceDescription">
         <h1 class="mb-4">
             <lc-icon [icon]="dataIcons.location" />
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
index 80c543bd..07f623a9 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
 import { dataIcons } from '@shared/icons';
 import { DataEntrySpaceDescriptionGQL, DataEntrySpaceDescriptionQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
@@ -27,4 +28,26 @@ export class LocationFormComponent {
         );
     }
 
+    getBreadcrumbs(data: DataEntrySpaceDescriptionQuery): Breadcrumb[] {
+        if (data.spaceDescription) {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                {
+                    link: `/data-entry/sources/${data.spaceDescription.source.id}`,
+                    label: data.spaceDescription.source.name
+                },
+                {
+                    link: `/data-entry/locations/${data.spaceDescription.id}`,
+                    label: data.spaceDescription.name
+                },
+            ];
+        } else {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                { link: '', label: 'Location not found' }
+            ]
+        }
+    }
 }

From ca21b2109c2ec072c0394ec9f584b46cc9c6f616 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 11:04:14 +0200
Subject: [PATCH 190/565] scaffold agent form component

---
 .../agent-form/agent-form.component.html      |  1 +
 .../agent-form/agent-form.component.scss      |  0
 .../agent-form/agent-form.component.spec.ts   | 23 +++++++++++++++++++
 .../agent-form/agent-form.component.ts        | 10 ++++++++
 .../agent-form/agent-form.module.ts           | 18 +++++++++++++++
 frontend/src/app/routes.ts                    |  5 ++++
 6 files changed, 57 insertions(+)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-form.component.html
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-form.component.scss
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-form.component.ts
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-form.module.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
new file mode 100644
index 00000000..42b03db7
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -0,0 +1 @@
+<p>agent-form works!</p>
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.scss b/frontend/src/app/data-entry/agent-form/agent-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
new file mode 100644
index 00000000..4799339a
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AgentFormComponent } from './agent-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+
+describe('AgentFormComponent', () => {
+    let component: AgentFormComponent;
+    let fixture: ComponentFixture<AgentFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [AgentFormComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(AgentFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
new file mode 100644
index 00000000..b502b7cd
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'lc-agent-form',
+  templateUrl: './agent-form.component.html',
+  styleUrls: ['./agent-form.component.scss']
+})
+export class AgentFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
new file mode 100644
index 00000000..53a458f3
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { AgentFormComponent } from './agent-form.component';
+import { SharedModule } from '@shared/shared.module';
+
+
+
+@NgModule({
+    declarations: [
+        AgentFormComponent
+    ],
+    imports: [
+        SharedModule
+    ],
+    exports: [
+        AgentFormComponent,
+    ]
+})
+export class AgentFormModule { }
diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 9daa99b6..5d0bbf2e 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -12,6 +12,7 @@ import { SourcesComponent } from './data-entry/sources/sources.component';
 import { LocationFormComponent } from './data-entry/location-form/location-form.component';
 import { GiftFormComponent } from './data-entry/gift-form/gift-form.component';
 import { LetterFormComponent } from './data-entry/letter-form/letter-form.component';
+import { AgentFormComponent } from './data-entry/agent-form/agent-form.component';
 
 const routes: Routes = [
     {
@@ -46,6 +47,10 @@ const routes: Routes = [
         path: 'data-entry',
         canActivate: [LoggedOnGuard],
         children: [
+            {
+                path: 'agents/:id',
+                component: AgentFormComponent,
+            },
             {
                 path: 'gifts/:id',
                 component: GiftFormComponent,

From c6b9331b90cf07197ab5de2018511f0b1d6b9178 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 11:06:55 +0200
Subject: [PATCH 191/565] fetch agent data in agent form

---
 .../agent-form/agent-form.component.ts          | 17 +++++++++++++++++
 .../src/app/data-entry/agent-form/agent.graphql | 11 +++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent.graphql

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index b502b7cd..1640d500 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -1,4 +1,8 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { dataIcons } from '@shared/icons';
+import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
+import { map, Observable, switchMap } from 'rxjs';
 
 @Component({
   selector: 'lc-agent-form',
@@ -6,5 +10,18 @@ import { Component } from '@angular/core';
   styleUrls: ['./agent-form.component.scss']
 })
 export class AgentFormComponent {
+    id$: Observable<string>;
+    data$: Observable<DataEntryAgentQuery>;
 
+    dataIcons = dataIcons;
+
+    constructor(private route: ActivatedRoute, private agentQuery: DataEntryAgentGQL) {
+        this.id$ = this.route.params.pipe(
+            map(params => params['id']),
+        );
+        this.data$ = this.id$.pipe(
+            switchMap(id => this.agentQuery.watch({ id }).valueChanges),
+            map(result => result.data),
+        );
+    }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent.graphql b/frontend/src/app/data-entry/agent-form/agent.graphql
new file mode 100644
index 00000000..1a213d6e
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent.graphql
@@ -0,0 +1,11 @@
+query DataEntryAgent($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}

From ff44cf5370a725cc054fce0a9a7292dfa3aa9f79 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 11:42:04 +0200
Subject: [PATCH 192/565] draft agent form template

---
 .../agent-form/agent-form.component.html      | 20 ++++++++++++++++++-
 .../agent-form/agent-form.module.ts           |  2 +-
 .../src/app/data-entry/data-entry.module.ts   |  3 +++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 42b03db7..4b68561f 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -1 +1,19 @@
-<p>agent-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.agentDescription as agentDescription">
+        <h1 class="mb-4">
+            <lc-icon [icon]="dataIcons.person" />
+            {{agentDescription.name}}
+            <span class="text-secondary">
+                ({{agentDescription.source.name}})
+            </span>
+        </h1>
+
+        <p class="lead mb-4" *ngIf="agentDescription.description">
+            {{agentDescription.description}}
+        </p>
+
+        <p class="alert alert-warning">
+            This form is not implemented yet!
+        </p>
+    </ng-container>
+</ng-container>
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index 53a458f3..b1a96fb8 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -9,7 +9,7 @@ import { SharedModule } from '@shared/shared.module';
         AgentFormComponent
     ],
     imports: [
-        SharedModule
+        SharedModule,
     ],
     exports: [
         AgentFormComponent,
diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
index da007d47..855f6130 100644
--- a/frontend/src/app/data-entry/data-entry.module.ts
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -4,6 +4,7 @@ import { SourcesComponent } from "./sources/sources.component";
 import { GiftFormModule } from "./gift-form/gift-form.module";
 import { LetterFormModule } from "./letter-form/letter-form.module";
 import { LocationFormModule } from "./location-form/location-form.module";
+import { AgentFormModule } from "./agent-form/agent-form.module";
 
 @NgModule({
     declarations: [
@@ -11,12 +12,14 @@ import { LocationFormModule } from "./location-form/location-form.module";
     ],
     imports: [
         SharedModule,
+        AgentFormModule,
         GiftFormModule,
         LetterFormModule,
         LocationFormModule,
     ],
     exports: [
         SourcesComponent,
+        AgentFormModule,
         GiftFormModule,
         LetterFormModule,
         LocationFormModule,

From 3303438e1a5368f8bec5ca70323d480908657e03 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 11:44:03 +0200
Subject: [PATCH 193/565] add breadcrumbs to agent component

---
 .../agent-form/agent-form.component.html      |  2 ++
 .../agent-form/agent-form.component.ts        | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 4b68561f..05a6aa78 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -1,4 +1,6 @@
 <ng-container *ngIf="data$ | async as data">
+    <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)"></lc-breadcrumb>
+
     <ng-container *ngIf="data.agentDescription as agentDescription">
         <h1 class="mb-4">
             <lc-icon [icon]="dataIcons.person" />
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index 1640d500..499cc96e 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
 import { dataIcons } from '@shared/icons';
 import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
@@ -24,4 +25,27 @@ export class AgentFormComponent {
             map(result => result.data),
         );
     }
+
+    getBreadcrumbs(data: DataEntryAgentQuery): Breadcrumb[] {
+        if (data.agentDescription) {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                {
+                    link: `/data-entry/sources/${data.agentDescription.source.id}`,
+                    label: data.agentDescription.source.name
+                },
+                {
+                    link: `/data-entry/agents/${data.agentDescription.id}`,
+                    label: data.agentDescription.name
+                },
+            ];
+        } else {
+            return [
+                { link: '/', label: 'Lettercraft' },
+                { link: '/data-entry', label: 'Data entry' },
+                { link: '', label: 'Agent not found' }
+            ]
+        }
+    }
 }

From abbd0d767eac54b189e8c67a9411d641f372f4f5 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 12:02:57 +0200
Subject: [PATCH 194/565] add contributors to database models

---
 backend/core/models.py                        | 14 ++++++++
 .../migrations/0022_episode_contributors.py   | 20 +++++++++++
 ...8_giftdescription_contributors_and_more.py | 30 ++++++++++++++++
 ..._agentdescription_contributors_and_more.py | 25 +++++++++++++
 ...butors_settlement_contributors_and_more.py | 35 +++++++++++++++++++
 5 files changed, 124 insertions(+)
 create mode 100644 backend/event/migrations/0022_episode_contributors.py
 create mode 100644 backend/letter/migrations/0018_giftdescription_contributors_and_more.py
 create mode 100644 backend/person/migrations/0019_agentdescription_contributors_and_more.py
 create mode 100644 backend/space/migrations/0017_region_contributors_settlement_contributors_and_more.py

diff --git a/backend/core/models.py b/backend/core/models.py
index d46e242f..68b62fb5 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -2,6 +2,8 @@
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.contrib.postgres.fields import ArrayField
 
+from user.models import User
+
 
 class Field(models.Model):
     """
@@ -105,6 +107,12 @@ class HistoricalEntity(Named, models.Model):
         help_text="Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description",
     )
 
+    contributors = models.ManyToManyField(
+        to=User,
+        blank=True,
+        help_text="Users who contributed to this entry",
+    )
+
     class Meta:
         abstract = True
 
@@ -162,6 +170,12 @@ class EntityDescription(Named, models.Model):
         help_text="The page number or page range in the source",
     )
 
+    contributors = models.ManyToManyField(
+        to=User,
+        blank=True,
+        help_text="Users who contributed to this entry",
+    )
+
     class Meta:
         abstract = True
 
diff --git a/backend/event/migrations/0022_episode_contributors.py b/backend/event/migrations/0022_episode_contributors.py
new file mode 100644
index 00000000..3ddc641c
--- /dev/null
+++ b/backend/event/migrations/0022_episode_contributors.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.7 on 2024-08-06 10:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('event', '0021_rename_eventdescriptionagent_episodeagent_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='episode',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/backend/letter/migrations/0018_giftdescription_contributors_and_more.py b/backend/letter/migrations/0018_giftdescription_contributors_and_more.py
new file mode 100644
index 00000000..84250c6d
--- /dev/null
+++ b/backend/letter/migrations/0018_giftdescription_contributors_and_more.py
@@ -0,0 +1,30 @@
+# Generated by Django 4.2.7 on 2024-08-06 10:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('letter', '0017_alter_giftdescriptioncategory_category_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='giftdescription',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='letterdescription',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='preservedletter',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/backend/person/migrations/0019_agentdescription_contributors_and_more.py b/backend/person/migrations/0019_agentdescription_contributors_and_more.py
new file mode 100644
index 00000000..f574bf7c
--- /dev/null
+++ b/backend/person/migrations/0019_agentdescription_contributors_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.7 on 2024-08-06 10:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('person', '0018_alter_personreference_description_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='agentdescription',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='historicalperson',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/backend/space/migrations/0017_region_contributors_settlement_contributors_and_more.py b/backend/space/migrations/0017_region_contributors_settlement_contributors_and_more.py
new file mode 100644
index 00000000..6bcec831
--- /dev/null
+++ b/backend/space/migrations/0017_region_contributors_settlement_contributors_and_more.py
@@ -0,0 +1,35 @@
+# Generated by Django 4.2.7 on 2024-08-06 10:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('space', '0016_settlement_regions'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='region',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='settlement',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='spacedescription',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='structure',
+            name='contributors',
+            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

From bb9801d57ef02cab8058fc90ec36ec86742e1fdb Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 12:21:10 +0200
Subject: [PATCH 195/565] add contributors to admin forms

---
 backend/core/admin.py   | 6 +++++-
 backend/letter/admin.py | 3 ++-
 backend/person/admin.py | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/core/admin.py b/backend/core/admin.py
index 4ec47c5e..873c943c 100644
--- a/backend/core/admin.py
+++ b/backend/core/admin.py
@@ -16,6 +16,8 @@
     },
 )
 
+contributions_fieldset = ("Contributors", {"fields": ["contributors"]})
+
 date_fields = ["year_lower", "year_upper", "year_exact"]
 
 field_fields = ["certainty", "note"]
@@ -27,9 +29,11 @@
 
 class EntityDescriptionAdmin(admin.ModelAdmin):
     list_display = ["name", "description", "source"]
-    list_filter = ["source"]
+    list_filter = ["source", "contributors"]
     search_fields = ["name", "description"]
+    filter_horizontal = ["contributors"]
     fieldsets = [
         named_fieldset,
+        contributions_fieldset,
         description_source_fieldset,
     ]
diff --git a/backend/letter/admin.py b/backend/letter/admin.py
index e3d73818..2db964bc 100644
--- a/backend/letter/admin.py
+++ b/backend/letter/admin.py
@@ -52,7 +52,8 @@ class PreservedLetterRoleAdmin(admin.StackedInline):
 @admin.register(models.PreservedLetter)
 class PreservedLetterAdmin(admin.ModelAdmin):
     list_display = ["name", "description"]
-    fields = ["name", "description"]
+    fields = ["name", "description", "contributors"]
+    filter_horizontal = ["contributors"]
     inlines = [
         PreservedLetterRoleAdmin,
     ]
diff --git a/backend/person/admin.py b/backend/person/admin.py
index d065f3b4..33f7ec99 100644
--- a/backend/person/admin.py
+++ b/backend/person/admin.py
@@ -20,8 +20,11 @@ class PersonDateOfDeathAdmin(admin.StackedInline):
 class HistoricalPersonAdmin(admin.ModelAdmin):
     list_display = ["name", "description"]
     search_fields = ["name", "description"]
+    filter_horizontal = ["contributors"]
+    list_filter = ["contributors"]
     fieldsets = [
         core_admin.named_fieldset,
+        core_admin.contributions_fieldset,
     ]
     inlines = [
         PersonDateOfBirthAdmin,
@@ -29,8 +32,6 @@ class HistoricalPersonAdmin(admin.ModelAdmin):
     ]
 
 
-
-
 class AgentDescriptionGenderAdmin(admin.StackedInline):
     model = models.AgentDescriptionGender
     fields = ["gender"] + core_admin.description_field_fields

From e2e6dc6d3d5c4b439cbeba7e2445d78be7232a63 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 13:18:35 +0200
Subject: [PATCH 196/565] add user query to api

---
 backend/graphql_app/schema.py  | 11 ++++++++++-
 backend/user/queries.py        | 29 +++++++++++++++++++++++++++++
 backend/user/types/UserType.py | 21 +++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 backend/user/queries.py
 create mode 100644 backend/user/types/UserType.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 8c0b14b1..c8c949e9 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -5,10 +5,19 @@
 from person.queries import PersonQueries
 from source.queries import SourceQueries
 from space.queries import SpaceQueries
+from user.queries import UserQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 
 
-class Query(SourceQueries, PersonQueries, EventQueries, LetterQueries, SpaceQueries, ObjectType):
+class Query(
+    SourceQueries,
+    PersonQueries,
+    EventQueries,
+    LetterQueries,
+    SpaceQueries,
+    UserQueries,
+    ObjectType,
+):
     pass
 
 
diff --git a/backend/user/queries.py b/backend/user/queries.py
new file mode 100644
index 00000000..7fe69229
--- /dev/null
+++ b/backend/user/queries.py
@@ -0,0 +1,29 @@
+from graphene import Field, List, ResolveInfo
+from graphene_django import DjangoObjectType
+
+from django.db.models import QuerySet
+from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
+from django.db.models import QuerySet, Q
+from user.types.UserType import UserType
+from user.models import User
+
+
+class UserQueries(ObjectType):
+    user_description = Field(UserType, id=ID(required=True))
+    user_descriptions = List(NonNull(UserType), required=True)
+
+    @staticmethod
+    def resolve_user_description(
+        parent: None, info: ResolveInfo, id: str
+    ) -> User | None:
+        try:
+            return UserType.get_queryset(User.objects, info).get(id=id)
+        except User.DoesNotExist:
+            return None
+
+    @staticmethod
+    def resolve_user_descriptions(
+        parent: None,
+        info: ResolveInfo,
+    ) -> QuerySet[User]:
+        return UserType.get_queryset(User.objects, info)
diff --git a/backend/user/types/UserType.py b/backend/user/types/UserType.py
new file mode 100644
index 00000000..978ebc26
--- /dev/null
+++ b/backend/user/types/UserType.py
@@ -0,0 +1,21 @@
+from graphene import ResolveInfo
+from graphene_django import DjangoObjectType
+
+from django.db.models import QuerySet
+from user.models import User
+
+
+class UserType(DjangoObjectType):
+    class Meta:
+        model = User
+        fields = [
+            "id",
+            "first_name",
+            "last_name",
+        ]
+
+    @classmethod
+    def get_queryset(
+        cls, queryset: QuerySet[User], info: ResolveInfo
+    ) -> QuerySet[User]:
+        return queryset.all()

From 6fde15f15b7ece3b075b1b2c62987fe39b2a600d Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 13:29:36 +0200
Subject: [PATCH 197/565] add contributors to entity description queries

---
 backend/core/types/EntityDescriptionType.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index 296bc5fd..06f0e466 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,7 +1,11 @@
 from core.models import EntityDescription
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
+from graphene import List, ResolveInfo
+from django.db.models import QuerySet
 
+from user.models import User
+from user.types.UserType import UserType
 
 class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
     """
@@ -9,6 +13,8 @@ class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
     Should not be queried directly, but should be extended by other types.
     """
 
+    contributors = List(UserType)
+
     class Meta:
         model = EntityDescription
         fields = [
@@ -18,4 +24,11 @@ class Meta:
             "book",
             "chapter",
             "page",
+            "contributors",
         ] + NamedType.fields()
+
+    @staticmethod
+    def resolve_contributors(
+        parent: EntityDescription, info: ResolveInfo
+    ) -> QuerySet[User]:
+        return parent.contributors.all()

From 7a01c5742372bd332478f62710076056171540e2 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 6 Aug 2024 14:13:22 +0200
Subject: [PATCH 198/565] EpisodePreviewComponent

---
 .../episode-preview.component.html            | 110 ++++++++++++++++++
 .../episode-preview.component.scss            |   0
 .../episode-preview.component.spec.ts         |  21 ++++
 .../episode-preview.component.ts              |  30 +++++
 4 files changed, 161 insertions(+)
 create mode 100644 frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
 create mode 100644 frontend/src/app/data-entry/source/episode-preview/episode-preview.component.scss
 create mode 100644 frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
new file mode 100644
index 00000000..b6d276a8
--- /dev/null
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -0,0 +1,110 @@
+<div class="card mb-4">
+    <div class="card-header">
+        <div class="d-flex justify-content-between">
+            <div>
+                <lc-icon [icon]="dataIcons.episode" />
+                &nbsp;
+                {{ episode.name }}
+                <br />
+                <small>
+                    <span>book {{ episode.book }}</span>,
+                    <span>chapter {{ episode.chapter }}</span>
+                </small>
+            </div>
+            <lc-action-button-group
+                [editLink]="['episode', episode.id]"
+                (delete)="deleteEpisode(episode.id)"
+                [showButtonText]="false"
+            />
+        </div>
+    </div>
+    <div class="card-body">
+        <p>{{ episode.summary || "..." }}</p>
+
+        <dl>
+            <dt>Agents</dt>
+            <dd
+                *ngIf="episode.agents.length > 0; else noAgents"
+                class="ms-4"
+            >
+                <ul class="inline-list">
+                    <li
+                        *ngFor="let agent of episode.agents"
+                        class="inline-list-item"
+                    >
+                        <a
+                            [routerLink]="['agent/', agent.id]"
+                            class="icon-link"
+                        >
+                            <lc-icon [icon]="agentIcon(agent)" />
+                            {{ agent.name }}
+                        </a>
+                    </li>
+                </ul>
+            </dd>
+            <ng-template #noAgents>
+                <dd class="ms-4">No agents have been added yet.</dd>
+            </ng-template>
+
+            <dt>Locations</dt>
+            <dd
+                *ngIf="episode.spaces.length > 0; else noSpaces"
+                class="ms-4"
+            >
+                <ul class="inline-list">
+                    <li
+                        *ngFor="let space of episode.spaces"
+                        class="inline-list-item"
+                    >
+                        <a
+                            [routerLink]="['location/', space.id]"
+                            class="icon-link"
+                        >
+                            <lc-icon [icon]="dataIcons.location" />
+                            {{ space.name }}
+                        </a>
+                    </li>
+                </ul>
+            </dd>
+            <ng-template #noSpaces>
+                <dd class="ms-4">No locations have been added yet.</dd>
+            </ng-template>
+
+            <dt>Objects</dt>
+            <dd
+                *ngIf="
+                    episode.gifts.length > 0 || episode.letters.length > 0;
+                    else noObjects
+                "
+                class="ms-4"
+            >
+                <ul class="inline-list">
+                    <li
+                        *ngFor="let gift of episode.gifts"
+                        class="inline-list-item"
+                    >
+                        <a [routerLink]="['gift/', gift.id]" class="icon-link">
+                            <lc-icon [icon]="dataIcons.gift" />
+                            {{ gift.name }}
+                        </a>
+                    </li>
+                    <li
+                        *ngFor="let letter of episode.letters"
+                        class="inline-list-item"
+                    >
+                        <a
+                            [routerLink]="['letter/', letter.id]"
+                            class="icon-link"
+                        >
+                            <lc-icon [icon]="dataIcons.letter" />
+                            {{ letter.name }}
+                        </a>
+                    </li>
+                </ul>
+            </dd>
+            <ng-template #noObjects>
+                <dd class="ms-4">No objects have been added yet.</dd>
+            </ng-template>
+        </dl>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.scss b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
new file mode 100644
index 00000000..fdfcbf14
--- /dev/null
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodePreviewComponent } from "./episode-preview.component";
+
+describe("EpisodePreviewComponent", () => {
+    let component: EpisodePreviewComponent;
+    let fixture: ComponentFixture<EpisodePreviewComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodePreviewComponent],
+        });
+        fixture = TestBed.createComponent(EpisodePreviewComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
new file mode 100644
index 00000000..3a3993c3
--- /dev/null
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
@@ -0,0 +1,30 @@
+import { Component, Input } from "@angular/core";
+import { dataIcons } from "@shared/icons";
+import { DataEntrySourceDetailQuery } from "generated/graphql";
+
+type QueriedEpisode = NonNullable<DataEntrySourceDetailQuery["source"]["episodes"]>[0];
+
+@Component({
+    selector: "lc-episode-preview",
+    templateUrl: "./episode-preview.component.html",
+    styleUrls: ["./episode-preview.component.scss"],
+})
+export class EpisodePreviewComponent {
+    @Input({ required: true })
+    public episode!: QueriedEpisode;
+    public dataIcons = dataIcons;
+
+    public deleteEpisode(episodeId: string): void {
+        console.log("Deleting episode with id", episodeId);
+    }
+
+    public agentIcon(agent: QueriedEpisode["agents"][0]): string {
+        if (agent.isGroup) {
+            return dataIcons.group;
+        }
+        if (agent.describes?.some(person => person?.identifiable)) {
+            return dataIcons.person;
+        }
+        return dataIcons.personUnknown;
+    }
+}

From 60f25af38c48edc06f4cc37d01809de570c16783 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 6 Aug 2024 14:13:38 +0200
Subject: [PATCH 199/565] Added to module declarations

---
 frontend/src/app/data-entry/data-entry.module.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
index 198cd183..00129704 100644
--- a/frontend/src/app/data-entry/data-entry.module.ts
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -2,9 +2,10 @@ import { NgModule } from "@angular/core";
 import { SharedModule } from "@shared/shared.module";
 import { SourcesComponent } from "./sources/sources.component";
 import { SourceComponent } from './source/source.component';
+import { EpisodePreviewComponent } from './source/episode-preview/episode-preview.component';
 
 @NgModule({
-    declarations: [SourcesComponent, SourceComponent],
+    declarations: [SourcesComponent, SourceComponent, EpisodePreviewComponent],
     imports: [SharedModule],
     exports: [SourcesComponent],
 })

From a4bdc27b323a733184554dcb6deff6232deaa2ef Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 6 Aug 2024 14:14:39 +0200
Subject: [PATCH 200/565] Simply SourceComponent

---
 .../data-entry/source/source.component.html   | 105 +-----------------
 .../app/data-entry/source/source.component.ts |  21 +---
 2 files changed, 3 insertions(+), 123 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index 7d872876..a00b973a 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -16,110 +16,7 @@ <h2 class="mb-4">Episodes</h2>
 </p>
 
 <div class="mb-4" *ngIf="source$ | async as source">
-    <div class="card mb-4" *ngFor="let episode of source.episodes">
-        <div class="card-header">
-            <div class="d-flex justify-content-between">
-                <div>
-                    <lc-icon [icon]="dataIcons.episode" />
-                    &nbsp;
-                    {{ episode.name }}
-                    <br />
-                    <small>
-                        <span>book {{ episode.book }}</span>,
-                        <span>chapter {{ episode.chapter }}</span>
-                    </small>
-                </div>
-                <lc-action-button-group
-                    [editLink]="['episode', episode.id]"
-                    (delete)="deleteEpisode(episode.id)"
-                    [showButtonText]="false"
-                />
-            </div>
-        </div>
-        <div class="card-body">
-            <p>{{ episode.summary || "..." }}</p>
-
-            <dl>
-                <dt>Agents</dt>
-                <dd
-                    *ngIf="episode.agents.length > 0; else noAgents"
-                    class="ms-4"
-                >
-                    <span
-                        *ngFor="let agent of episode.agents"
-                        class="entity-item"
-                    >
-                        <a
-                            [routerLink]="['agent/', agent.id]"
-                            class="icon-link"
-                        >
-                            <lc-icon [icon]="agentIcon(agent)" />
-                            {{ agent.name }}
-                        </a>
-                    </span>
-                </dd>
-                <ng-template #noAgents>
-                    <dd class="ms-4">No agents have been added yet.</dd>
-                </ng-template>
-
-                <dt>Locations</dt>
-                <dd
-                    *ngIf="episode.spaces.length > 0; else noSpaces"
-                    class="ms-4"
-                >
-                    <span
-                        *ngFor="let space of episode.spaces"
-                        class="entity-item"
-                    >
-                        <a
-                            [routerLink]="['location/', space.id]"
-                            class="icon-link"
-                        >
-                            <lc-icon [icon]="dataIcons.location" />
-                            {{ space.name }}
-                        </a>
-                    </span>
-                </dd>
-                <ng-template #noSpaces>
-                    <dd class="ms-4">No locations have been added yet.</dd>
-                </ng-template>
-
-                <dt>Objects</dt>
-                <dd
-                    *ngIf="
-                        episode.gifts.length > 0 || episode.letters.length > 0;
-                        else noObjects
-                    "
-                    class="ms-4"
-                >
-                    <span
-                        *ngFor="let gift of episode.gifts"
-                        class="entity-item"
-                    >
-                        <a [routerLink]="['gift/', gift.id]" class="icon-link">
-                            <lc-icon [icon]="dataIcons.gift" />
-                            {{ gift.name }}
-                        </a>
-                    </span>
-                    <span
-                        *ngFor="let letter of episode.letters"
-                        class="entity-item"
-                    >
-                        <a
-                            [routerLink]="['letter/', letter.id]"
-                            class="icon-link"
-                        >
-                            <lc-icon [icon]="dataIcons.letter" />
-                            {{ letter.name }}
-                        </a>
-                    </span>
-                </dd>
-                <ng-template #noObjects>
-                    <dd class="ms-4">No objects have been added yet.</dd>
-                </ng-template>
-            </dl>
-        </div>
-    </div>
+    <lc-episode-preview *ngFor="let episode of source.episodes" [episode]="episode" />
 </div>
 <div class="btn-group mb-4">
     <button class="btn btn-primary" disabled>
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 01a181e2..1443d692 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -2,11 +2,9 @@ import { Component, computed } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntrySourceDetailGQL, DataEntrySourceDetailQuery } from "generated/graphql";
+import { DataEntrySourceDetailGQL } from "generated/graphql";
 import { map, shareReplay, switchMap } from "rxjs";
 
-type QueriedAgent = NonNullable<DataEntrySourceDetailQuery["source"]["episodes"]>[0]["agents"][0];
-
 @Component({
     selector: "lc-source",
     templateUrl: "./source.component.html",
@@ -48,20 +46,5 @@ export class SourceComponent {
     constructor(
         private route: ActivatedRoute,
         private sourceDetailQuery: DataEntrySourceDetailGQL
-    ) { }
-
-
-    public deleteEpisode(episodeId: string): void {
-        console.log("Deleting episode with id", episodeId);
-    }
-
-    public agentIcon(agent: QueriedAgent): string {
-        if (agent.isGroup) {
-            return dataIcons.group;
-        }
-        if (agent.describes?.some(person => person?.identifiable)) {
-            return dataIcons.person;
-        }
-        return dataIcons.personUnknown;
-    }
+    ) {}
 }

From ec8033a4765a8c0286c16c5cb3836731a7bbf45c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 6 Aug 2024 14:14:54 +0200
Subject: [PATCH 201/565] Outfactor inline-list style rules

---
 .../app/data-entry/source/source.component.scss   |  4 ----
 frontend/src/styles.scss                          | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.scss b/frontend/src/app/data-entry/source/source.component.scss
index 519f75e5..e69de29b 100644
--- a/frontend/src/app/data-entry/source/source.component.scss
+++ b/frontend/src/app/data-entry/source/source.component.scss
@@ -1,4 +0,0 @@
-.entity-item:not(:last-child)::after {
-    // Character \00A0 is a non-breaking space.
-    content: ",\00A0";
-}
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index daa7bd15..d07a68e0 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -17,3 +17,18 @@
 .always-block {
     display: block !important;
 }
+
+
+// Adds a comma + non-breaking space (\00A0) after each non-final item in an .inline-list.
+.inline-list {
+    padding-left: 0;
+
+    .inline-list-item {
+        display: inline;
+    }
+
+    & > .inline-list-item:not(:last-child)::after {
+        content: ",\00A0";
+    }
+
+}

From f8f5cc8efabf721e3457860fdc62acd5824d9e4c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 6 Aug 2024 14:15:11 +0200
Subject: [PATCH 202/565] Import SharedTestingModule

---
 frontend/src/app/data-entry/source/source.component.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/app/data-entry/source/source.component.spec.ts b/frontend/src/app/data-entry/source/source.component.spec.ts
index f30c0424..957a2160 100644
--- a/frontend/src/app/data-entry/source/source.component.spec.ts
+++ b/frontend/src/app/data-entry/source/source.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { SourceComponent } from "./source.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("SourceComponent", () => {
     let component: SourceComponent;
@@ -9,6 +10,7 @@ describe("SourceComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [SourceComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(SourceComponent);
         component = fixture.componentInstance;

From 1c2bc3a813d5d309bebac3a5f7d24ca930e8e4c5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 6 Aug 2024 14:17:56 +0200
Subject: [PATCH 203/565] Remove superfluous spaces

---
 frontend/src/styles.scss | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index d07a68e0..c3cf2744 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -1,9 +1,8 @@
-@import 'variables';
-@import 'bootstrap';
-@import 'bootstrap-icons';
+@import "variables";
+@import "bootstrap";
+@import "bootstrap-icons";
 
 @media print {
-
     .is-hidden-print,
     .is-hidden-print * {
         display: none !important;
@@ -18,7 +17,6 @@
     display: block !important;
 }
 
-
 // Adds a comma + non-breaking space (\00A0) after each non-final item in an .inline-list.
 .inline-list {
     padding-left: 0;
@@ -30,5 +28,4 @@
     & > .inline-list-item:not(:last-child)::after {
         content: ",\00A0";
     }
-
 }

From a506faf4588ae8e2428da8a510a2b2fece8e7e2a Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 16:11:04 +0200
Subject: [PATCH 204/565] update documentation

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 34848632..e817688e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,7 +62,7 @@ One notable change from the development workflow in other applications is code g
 
 While you have a backend development server running, run `yarn codegen` in a separate terminal. This process will watch the frontend and backend for changes to keep generated types up to date.
 
-(Alternatively, you can `yarn codegen-once`. This will start a backend server, run code generation once, and exit. Note that this only works if the backend isn't already running.)
+(Alternatively, you can `yarn codegen-once`. This will start a backend server, run code generation once, and exit. Note that this only works if the backend isn't already running, and does not work on Windows.)
 
 ### Recommended order of development
 

From 61274feea2ff3919b63172a6396c0d5911968c39 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 16:26:06 +0200
Subject: [PATCH 205/565] close subscriptions, complete observables

---
 .../designators-control.component.ts          | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
index f7bf4d4d..cd25749f 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.ts
@@ -1,7 +1,7 @@
-import { Component, forwardRef, Input } from '@angular/core';
+import { Component, forwardRef, Input, OnDestroy } from '@angular/core';
 import { ControlValueAccessor, FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
 import { actionIcons } from '@shared/icons';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject, Subject, Subscription } from 'rxjs';
 import _ from 'underscore';
 
 @Component({
@@ -16,7 +16,7 @@ import _ from 'underscore';
         }
     ],
 })
-export class DesignatorsControlComponent implements ControlValueAccessor {
+export class DesignatorsControlComponent implements ControlValueAccessor, OnDestroy {
     @Input({ required: true }) formControl!: FormControl<string[]>;
 
     designators$ = new BehaviorSubject<string[]>([]);
@@ -35,16 +35,26 @@ export class DesignatorsControlComponent implements ControlValueAccessor {
 
     actionIcons = actionIcons;
 
+    private onChangeSubscription?: Subscription;
+    private onTouchedSubscription?: Subscription;
+
     writeValue(obj: string[]): void {
         this.designators$.next(obj);
     }
 
-    registerOnChange(fn: (_: any) => void): void {
-        this.designators$.subscribe(fn);
+    registerOnChange(fn: (_: unknown) => void): void {
+        this.onChangeSubscription?.unsubscribe();
+        this.onChangeSubscription = this.designators$.subscribe(fn);
+    }
+
+    registerOnTouched(fn: (_: unknown) => void): void {
+        this.onTouchedSubscription?.unsubscribe();
+        this.onTouchedSubscription = this.blur$.subscribe(fn);
     }
 
-    registerOnTouched(fn: (_: any) => void): void {
-        this.blur$.subscribe(fn);
+    ngOnDestroy(): void {
+        this.designators$.complete();
+        this.blur$.complete();
     }
 
     setDisabledState(isDisabled: boolean): void {

From 017a5d11751ea6a6ce4f187bf89d958407fa0ec4 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 16:33:04 +0200
Subject: [PATCH 206/565] clarify label

Co-Authored-By: Xander Vertegaal <73882506+XanderVertegaal@users.noreply.github.com>
---
 .../designators-control/designators-control.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index ca955514..af069c8e 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -27,7 +27,7 @@
         <button class="btn btn-primary" type="submit"
             [disabled]="disabled"
             (blur)="blur$.next()">
-            <lc-icon [icon]="actionIcons.add" aria-label="add" />
+            <lc-icon [icon]="actionIcons.add" aria-label="add designator" />
         </button>
     </div>
 </form>

From cfeda0d76734090ec78485f4a01e5d488fc99b18 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 16:49:34 +0200
Subject: [PATCH 207/565] generate types

---
 frontend/generated/graphql.ts     | 68 +++++++++++++++++++++++++++++++
 frontend/generated/schema.graphql |  2 +
 2 files changed, 70 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index f4744c83..59841ff6 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -386,6 +386,7 @@ export type Query = {
   giftDescriptions: Array<GiftDescriptionType>;
   letterDescription?: Maybe<LetterDescriptionType>;
   letterDescriptions: Array<LetterDescriptionType>;
+  source: SourceType;
   sources: Array<SourceType>;
   spaceDescription?: Maybe<SpaceDescriptionType>;
   spaceDescriptions: Array<SpaceDescriptionType>;
@@ -435,6 +436,11 @@ export type QueryLetterDescriptionsArgs = {
 };
 
 
+export type QuerySourceArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type QuerySpaceDescriptionArgs = {
   id: Scalars['ID']['input'];
 };
@@ -517,6 +523,7 @@ export type SourceType = {
   editionAuthor: Scalars['String']['output'];
   /** The title of the edition used for this source */
   editionTitle: Scalars['String']['output'];
+  episodes: Array<EpisodeType>;
   id: Scalars['ID']['output'];
   /** The name of the original author of the work, if known */
   medievalAuthor: Scalars['String']['output'];
@@ -697,11 +704,72 @@ export type UpdateOrCreateSourceMutation = {
   source?: Maybe<SourceType>;
 };
 
+export type DataEntrySourceDetailQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
+
 export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
 
 
 export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
 
+export const DataEntrySourceDetailDocument = gql`
+    query DataEntrySourceDetail($id: ID!) {
+  source(id: $id) {
+    id
+    name
+    editionAuthor
+    editionTitle
+    medievalAuthor
+    medievalTitle
+    numOfEpisodes
+    episodes {
+      id
+      name
+      description
+      summary
+      book
+      chapter
+      page
+      agents {
+        id
+        name
+        isGroup
+        describes {
+          id
+          identifiable
+        }
+      }
+      gifts {
+        id
+        name
+      }
+      letters {
+        id
+        name
+      }
+      spaces {
+        id
+        name
+      }
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
+    override document = DataEntrySourceDetailDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
 export const DataEntrySourceListDocument = gql`
     query DataEntrySourceList {
   sources {
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index ff086701..4aff6493 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -445,6 +445,7 @@ type Query {
   giftDescriptions(episodeId: ID, sourceId: ID): [GiftDescriptionType!]!
   letterDescription(id: ID!): LetterDescriptionType
   letterDescriptions(episodeId: ID, sourceId: ID): [LetterDescriptionType!]!
+  source(id: ID!): SourceType!
   sources: [SourceType!]!
   spaceDescription(id: ID!): SpaceDescriptionType
   spaceDescriptions(sourceId: ID): [SpaceDescriptionType!]!
@@ -539,6 +540,7 @@ type SourceType {
 
   """The title of the edition used for this source"""
   editionTitle: String!
+  episodes: [EpisodeType!]!
   id: ID!
 
   """The name of the original author of the work, if known"""

From 9e2f3f401c85e772e98c732c8fd24051864fc9e7 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 16:49:48 +0200
Subject: [PATCH 208/565] fix episode preview component test

---
 .../episode-preview.component.spec.ts             | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
index fdfcbf14..cddbe7f7 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodePreviewComponent } from "./episode-preview.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("EpisodePreviewComponent", () => {
     let component: EpisodePreviewComponent;
@@ -9,9 +10,23 @@ describe("EpisodePreviewComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodePreviewComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodePreviewComponent);
         component = fixture.componentInstance;
+        component.episode = {
+            id: '1',
+            name: 'Test',
+            description: 'Test episode',
+            summary: '',
+            book: '',
+            chapter: '',
+            page: '',
+            agents: [],
+            gifts: [],
+            letters: [],
+            spaces: [],
+        }
         fixture.detectChanges();
     });
 

From 81fc1765e271d146acf4f3d93a4a30a74364badf Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 16:54:31 +0200
Subject: [PATCH 209/565] generate types

---
 frontend/generated/graphql.ts     | 33 ++++++++++++++++++++++++++
 frontend/generated/schema.graphql | 39 +++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 59841ff6..59993807 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -31,6 +31,20 @@ export type AgentDescriptionGenderType = {
   sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
 };
 
+export type AgentDescriptionLocationType = {
+  __typename?: 'AgentDescriptionLocationType';
+  agent: AgentDescriptionType;
+  /** How certain are you of this value? */
+  certainty: PersonAgentDescriptionLocationCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** location by which the agent is identified */
+  location: SpaceDescriptionType;
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
+};
+
 export type AgentDescriptionType = {
   __typename?: 'AgentDescriptionType';
   /** The book in the source */
@@ -46,6 +60,7 @@ export type AgentDescriptionType = {
   id: Scalars['ID']['output'];
   /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
   isGroup: Scalars['Boolean']['output'];
+  location?: Maybe<AgentDescriptionLocationType>;
   /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
@@ -291,6 +306,24 @@ export enum PersonAgentDescriptionGenderSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
+/** An enumeration. */
+export enum PersonAgentDescriptionLocationCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum PersonAgentDescriptionLocationSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
   /** directly mentioned */
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 4aff6493..888852ba 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -17,6 +17,23 @@ type AgentDescriptionGenderType {
   sourceMention: PersonAgentDescriptionGenderSourceMentionChoices
 }
 
+type AgentDescriptionLocationType {
+  agent: AgentDescriptionType!
+
+  """How certain are you of this value?"""
+  certainty: PersonAgentDescriptionLocationCertaintyChoices!
+  id: ID!
+
+  """location by which the agent is identified"""
+  location: SpaceDescriptionType!
+
+  """Additional notes"""
+  note: String!
+
+  """How is this information presented in the text?"""
+  sourceMention: PersonAgentDescriptionLocationSourceMentionChoices
+}
+
 type AgentDescriptionType {
   """The book in the source"""
   book: String!
@@ -37,6 +54,7 @@ type AgentDescriptionType {
 
   """Whether this agent is a group of people (e.g. 'the nuns of Poitiers')."""
   isGroup: Boolean!
+  location: AgentDescriptionLocationType
 
   """A name to help identify this object"""
   name: String!
@@ -332,6 +350,27 @@ enum PersonAgentDescriptionGenderSourceMentionChoices {
   IMPLIED
 }
 
+"""An enumeration."""
+enum PersonAgentDescriptionLocationCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum PersonAgentDescriptionLocationSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
 """An enumeration."""
 enum PersonAgentDescriptionSourceMentionChoices {
   """directly mentioned"""

From f0aa3e56654b82cd999c1030d3a8be92d82aea00 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 17:01:31 +0200
Subject: [PATCH 210/565] update graphql types

---
 frontend/generated/graphql.ts     | 19 +++++++++++++++++++
 frontend/generated/schema.graphql | 13 +++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 59993807..f813ee97 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -51,6 +51,7 @@ export type AgentDescriptionType = {
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
+  contributors?: Maybe<Array<Maybe<UserType>>>;
   describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
@@ -80,6 +81,7 @@ export type EpisodeType = {
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
+  contributors?: Maybe<Array<Maybe<UserType>>>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
@@ -141,6 +143,7 @@ export type GiftDescriptionType = {
   categorisations: Array<GiftDescriptionCategoryType>;
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
+  contributors?: Maybe<Array<Maybe<UserType>>>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
@@ -197,6 +200,7 @@ export type LetterDescriptionType = {
   categorisations: Array<LetterDescriptionCategoryType>;
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
+  contributors?: Maybe<Array<Maybe<UserType>>>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
@@ -423,6 +427,8 @@ export type Query = {
   sources: Array<SourceType>;
   spaceDescription?: Maybe<SpaceDescriptionType>;
   spaceDescriptions: Array<SpaceDescriptionType>;
+  userDescription?: Maybe<UserType>;
+  userDescriptions: Array<UserType>;
 };
 
 
@@ -483,6 +489,11 @@ export type QuerySpaceDescriptionsArgs = {
   sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
+export type QueryUserDescriptionArgs = {
+  id: Scalars['ID']['input'];
+};
+
 export type RegionFieldType = {
   __typename?: 'RegionFieldType';
   /** How certain are you of this value? */
@@ -588,6 +599,7 @@ export type SpaceDescriptionType = {
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
+  contributors?: Maybe<Array<Maybe<UserType>>>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
@@ -737,6 +749,13 @@ export type UpdateOrCreateSourceMutation = {
   source?: Maybe<SourceType>;
 };
 
+export type UserType = {
+  __typename?: 'UserType';
+  firstName: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  lastName: Scalars['String']['output'];
+};
+
 export type DataEntrySourceDetailQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 888852ba..4ac838bf 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -40,6 +40,7 @@ type AgentDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
+  contributors: [UserType]
   describes: [HistoricalPersonType]
 
   """Longer description to help identify this object"""
@@ -79,6 +80,7 @@ type EpisodeType {
 
   """The chapter or chapters in the source"""
   chapter: String!
+  contributors: [UserType]
 
   """Longer description to help identify this object"""
   description: String!
@@ -155,6 +157,7 @@ type GiftDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
+  contributors: [UserType]
 
   """Longer description to help identify this object"""
   description: String!
@@ -224,6 +227,7 @@ type LetterDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
+  contributors: [UserType]
 
   """Longer description to help identify this object"""
   description: String!
@@ -488,6 +492,8 @@ type Query {
   sources: [SourceType!]!
   spaceDescription(id: ID!): SpaceDescriptionType
   spaceDescriptions(sourceId: ID): [SpaceDescriptionType!]!
+  userDescription(id: ID!): UserType
+  userDescriptions: [UserType!]!
 }
 
 type RegionFieldType {
@@ -619,6 +625,7 @@ type SpaceDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
+  contributors: [UserType]
 
   """Longer description to help identify this object"""
   description: String!
@@ -794,4 +801,10 @@ input UpdateCreateSourceInput {
 type UpdateOrCreateSourceMutation {
   errors: [String]
   source: SourceType
+}
+
+type UserType {
+  firstName: String!
+  id: ID!
+  lastName: String!
 }
\ No newline at end of file

From c80920f2935a2a938f5e15565dbf9a1c4ab07074 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 17:07:19 +0200
Subject: [PATCH 211/565] update graphql types

---
 frontend/generated/graphql.ts | 124 ++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 59993807..0ada9a65 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -737,6 +737,34 @@ export type UpdateOrCreateSourceMutation = {
   source?: Maybe<SourceType>;
 };
 
+export type DataEntryAgentQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type DataEntryGiftQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryGiftQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type DataEntryLetterQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryLetterQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type DataEntrySpaceDescriptionQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
 export type DataEntrySourceDetailQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -749,6 +777,102 @@ export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>
 
 export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
 
+export const DataEntryAgentDocument = gql`
+    query DataEntryAgent($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
+    override document = DataEntryAgentDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryGiftDocument = gql`
+    query DataEntryGift($id: ID!) {
+  giftDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftGQL extends Apollo.Query<DataEntryGiftQuery, DataEntryGiftQueryVariables> {
+    override document = DataEntryGiftDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryLetterDocument = gql`
+    query DataEntryLetter($id: ID!) {
+  letterDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterGQL extends Apollo.Query<DataEntryLetterQuery, DataEntryLetterQueryVariables> {
+    override document = DataEntryLetterDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntrySpaceDescriptionDocument = gql`
+    query DataEntrySpaceDescription($id: ID!) {
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
+    override document = DataEntrySpaceDescriptionDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
 export const DataEntrySourceDetailDocument = gql`
     query DataEntrySourceDetail($id: ID!) {
   source(id: $id) {

From 5edae1a867104290e6b25086bb1734199c4b733b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 17:08:51 +0200
Subject: [PATCH 212/565] fix test modules

---
 .../letter-form/letter-form.component.spec.ts | 26 ++++++++++---------
 .../location-form.component.spec.ts           | 26 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
index d56ad76d..5e1a8467 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
@@ -1,21 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LetterFormComponent } from './letter-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('LetterFormComponent', () => {
-  let component: LetterFormComponent;
-  let fixture: ComponentFixture<LetterFormComponent>;
+    let component: LetterFormComponent;
+    let fixture: ComponentFixture<LetterFormComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [LetterFormComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LetterFormComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(LetterFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(LetterFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
index a5699140..fa5bc31a 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
@@ -1,21 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LocationFormComponent } from './location-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('LocationFormComponent', () => {
-  let component: LocationFormComponent;
-  let fixture: ComponentFixture<LocationFormComponent>;
+    let component: LocationFormComponent;
+    let fixture: ComponentFixture<LocationFormComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [LocationFormComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LocationFormComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(LocationFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(LocationFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });

From 7eac353810b9e99956104e61ade5f4974fa95a4d Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 6 Aug 2024 17:16:07 +0200
Subject: [PATCH 213/565] migration history fix

---
 ..._agentdescription_contributors_and_more.py | 25 --------------
 ..._agentdescription_contributors_and_more.py | 33 +++++++++++++++++++
 2 files changed, 33 insertions(+), 25 deletions(-)
 delete mode 100644 backend/person/migrations/0019_agentdescription_contributors_and_more.py
 create mode 100644 backend/person/migrations/0020_agentdescription_contributors_and_more.py

diff --git a/backend/person/migrations/0019_agentdescription_contributors_and_more.py b/backend/person/migrations/0019_agentdescription_contributors_and_more.py
deleted file mode 100644
index f574bf7c..00000000
--- a/backend/person/migrations/0019_agentdescription_contributors_and_more.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Generated by Django 4.2.7 on 2024-08-06 10:02
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('person', '0018_alter_personreference_description_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='agentdescription',
-            name='contributors',
-            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='historicalperson',
-            name='contributors',
-            field=models.ManyToManyField(blank=True, help_text='Users who contributed to this entry', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/backend/person/migrations/0020_agentdescription_contributors_and_more.py b/backend/person/migrations/0020_agentdescription_contributors_and_more.py
new file mode 100644
index 00000000..0267b27a
--- /dev/null
+++ b/backend/person/migrations/0020_agentdescription_contributors_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.7 on 2024-08-06 10:02
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("person", "0019_alter_agentdescriptionlocation_agent"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="agentdescription",
+            name="contributors",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Users who contributed to this entry",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalperson",
+            name="contributors",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Users who contributed to this entry",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

From 36f4901badcf5d3b56ca699c84cf197c1228a5b1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 31 Jul 2024 12:55:30 +0200
Subject: [PATCH 214/565] draft identification form

---
 frontend/generated/graphql.ts                 |  3 +-
 .../agent-form/agent-form.component.html      | 11 +++--
 .../agent-form/agent-form.module.ts           |  4 +-
 .../agent-identification-form.component.html  | 42 +++++++++++++++++++
 .../agent-identification-form.component.scss  |  0
 ...gent-identification-form.component.spec.ts | 23 ++++++++++
 .../agent-identification-form.component.ts    | 15 +++++++
 .../app/data-entry/agent-form/agent.graphql   |  1 +
 8 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.scss
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 0ada9a65..4c603249 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -742,7 +742,7 @@ export type DataEntryAgentQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryGiftQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -783,6 +783,7 @@ export const DataEntryAgentDocument = gql`
     id
     name
     description
+    isGroup
     source {
       id
       name
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 05a6aa78..05dc1436 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -14,8 +14,13 @@ <h1 class="mb-4">
             {{agentDescription.description}}
         </p>
 
-        <p class="alert alert-warning">
-            This form is not implemented yet!
-        </p>
+        <h2>Identification</h2>
+        <lc-agent-identification-form></lc-agent-identification-form>
+
+        <h2>Description in source text</h2>
+
+        <h2>Episodes</h2>
+
+        <h2>Historical context</h2>
     </ng-container>
 </ng-container>
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index b1a96fb8..2d743ebf 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -1,12 +1,14 @@
 import { NgModule } from '@angular/core';
 import { AgentFormComponent } from './agent-form.component';
 import { SharedModule } from '@shared/shared.module';
+import { AgentIdentificationFormComponent } from './agent-identification-form/agent-identification-form.component';
 
 
 
 @NgModule({
     declarations: [
-        AgentFormComponent
+        AgentFormComponent,
+        AgentIdentificationFormComponent,
     ],
     imports: [
         SharedModule,
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
new file mode 100644
index 00000000..95ea0507
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
@@ -0,0 +1,42 @@
+<form [formGroup]="form">
+    <div class="mb-3">
+        <label class="form-label" for="input-name">
+            Name
+        </label>
+        <input id="input-name" type="text" class="form-control"
+            [formControl]="form.controls.name">
+
+        <p>
+            <small class="text-body-secondary">
+                This is a name to identify the agent in the overview of the source.
+                For example: "Radegund", "messenger from Poitiers", "the citizens of Arles".
+            </small>
+        </p>
+    </div>
+
+    <div class="mb-3">
+        <label class="form-label" for="input-description">
+            Description
+        </label>
+        <input id="input-description" type="text" class="form-control"
+            [formControl]="form.controls.description">
+
+        <p>
+            <small class="text-body-secondary">
+                Add a description to help identify this agent.
+            </small>
+        </p>
+    </div>
+
+    <div class="mb-4">
+        <label class="form-label" for="input-isgroup">
+            Is this agent a person or a group?
+        </label>
+        <select id="input-isgroup" class="form-select"
+            [formControl]="form.controls.isGroup">
+            <option [ngValue]="false">Person</option>
+            <option [ngValue]="true">Group</option>
+        </select>
+    </div>
+</form>
+
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.scss b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
new file mode 100644
index 00000000..2531c1ee
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AgentIdentificationFormComponent } from './agent-identification-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+
+describe('AgentIdentificationFormComponent', () => {
+    let component: AgentIdentificationFormComponent;
+    let fixture: ComponentFixture<AgentIdentificationFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [AgentIdentificationFormComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(AgentIdentificationFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
new file mode 100644
index 00000000..b6bca18a
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { FormControl, FormGroup } from '@angular/forms';
+
+@Component({
+    selector: 'lc-agent-identification-form',
+    templateUrl: './agent-identification-form.component.html',
+    styleUrls: ['./agent-identification-form.component.scss']
+})
+export class AgentIdentificationFormComponent {
+    form = new FormGroup({
+        name: new FormControl<string>(''),
+        description: new FormControl<string>(''),
+        isGroup: new FormControl<boolean>(false),
+    });
+}
diff --git a/frontend/src/app/data-entry/agent-form/agent.graphql b/frontend/src/app/data-entry/agent-form/agent.graphql
index 1a213d6e..3fd81287 100644
--- a/frontend/src/app/data-entry/agent-form/agent.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent.graphql
@@ -3,6 +3,7 @@ query DataEntryAgent($id: ID!) {
     id
     name
     description
+    isGroup
     source {
       id
       name

From 2c4748bc67a3b4f98a251a4b9d98ae03baee7647 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 31 Jul 2024 16:13:30 +0200
Subject: [PATCH 215/565] fetch data in identification form

---
 .../agent-form/agent-form.component.html      |  2 +-
 .../agent-identification-form.component.ts    | 35 +++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 05dc1436..4b690bea 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -15,7 +15,7 @@ <h1 class="mb-4">
         </p>
 
         <h2>Identification</h2>
-        <lc-agent-identification-form></lc-agent-identification-form>
+        <lc-agent-identification-form [id]="id$ | async"></lc-agent-identification-form>
 
         <h2>Description in source text</h2>
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index b6bca18a..729eed3c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,15 +1,46 @@
-import { Component } from '@angular/core';
+import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
+import { map, Subject, switchMap } from 'rxjs';
 
 @Component({
     selector: 'lc-agent-identification-form',
     templateUrl: './agent-identification-form.component.html',
     styleUrls: ['./agent-identification-form.component.scss']
 })
-export class AgentIdentificationFormComponent {
+export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
+    @Input() id?: string;
+
     form = new FormGroup({
         name: new FormControl<string>(''),
         description: new FormControl<string>(''),
         isGroup: new FormControl<boolean>(false),
     });
+
+    private id$ = new Subject<string>();
+
+    constructor(private agentQuery: DataEntryAgentGQL) {
+        this.id$.pipe(
+            switchMap(id => this.agentQuery.watch({ id }).valueChanges),
+            map(result => result.data),
+        ).subscribe(this.updateFormData.bind(this));
+    }
+
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes['id'] && this.id) {
+            this.id$.next(this.id);
+        }
+    }
+
+    ngOnDestroy(): void {
+        this.id$.complete();
+    }
+
+    updateFormData(data: DataEntryAgentQuery) {
+        this.form.setValue({
+            name: data.agentDescription?.name || '',
+            description: data.agentDescription?.description || '',
+            isGroup: data.agentDescription?.isGroup || false,
+        });
+    }
 }

From 29b6373b764b9ad88cbf1e94c7e7cf48daf28deb Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 31 Jul 2024 16:52:47 +0200
Subject: [PATCH 216/565] scaffold agent description form component

---
 .../agent-description-form.component.html     |  1 +
 .../agent-description-form.component.scss     |  0
 .../agent-description-form.component.spec.ts  | 23 +++++++++++++++++++
 .../agent-description-form.component.ts       | 11 +++++++++
 .../agent-form/agent-form.component.html      |  3 ++-
 .../agent-form/agent-form.component.spec.ts   |  8 ++++++-
 .../agent-form/agent-form.module.ts           |  2 ++
 .../agent-identification-form.component.html  |  2 +-
 8 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.scss
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
new file mode 100644
index 00000000..01e9688b
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -0,0 +1 @@
+<p>agent-description-form works!</p>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.scss b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
new file mode 100644
index 00000000..e95060e3
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AgentDescriptionFormComponent } from './agent-description-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+
+describe('AgentDescriptionFormComponent', () => {
+    let component: AgentDescriptionFormComponent;
+    let fixture: ComponentFixture<AgentDescriptionFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [AgentDescriptionFormComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(AgentDescriptionFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
new file mode 100644
index 00000000..220260df
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -0,0 +1,11 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+    selector: 'lc-agent-description-form',
+    templateUrl: './agent-description-form.component.html',
+    styleUrls: ['./agent-description-form.component.scss']
+})
+export class AgentDescriptionFormComponent {
+    @Input() id?: string;
+
+}
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 4b690bea..d587010e 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -15,9 +15,10 @@ <h1 class="mb-4">
         </p>
 
         <h2>Identification</h2>
-        <lc-agent-identification-form [id]="id$ | async"></lc-agent-identification-form>
+        <lc-agent-identification-form *ngIf="id$ | async as id" [id]="id"></lc-agent-identification-form>
 
         <h2>Description in source text</h2>
+        <lc-agent-description-form *ngIf="id$ | async as id" [id]="id"></lc-agent-description-form>
 
         <h2>Episodes</h2>
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
index 4799339a..8fda7dd3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
@@ -2,6 +2,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AgentFormComponent } from './agent-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
+import { AgentIdentificationFormComponent } from './agent-identification-form/agent-identification-form.component';
 
 describe('AgentFormComponent', () => {
     let component: AgentFormComponent;
@@ -10,7 +12,11 @@ describe('AgentFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [AgentFormComponent],
-            imports: [SharedTestingModule],
+            imports: [
+                SharedTestingModule,
+                AgentIdentificationFormComponent,
+                AgentDescriptionFormComponent,
+            ],
         });
         fixture = TestBed.createComponent(AgentFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index 2d743ebf..dbe12ec7 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { AgentFormComponent } from './agent-form.component';
 import { SharedModule } from '@shared/shared.module';
 import { AgentIdentificationFormComponent } from './agent-identification-form/agent-identification-form.component';
+import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
 
 
 
@@ -9,6 +10,7 @@ import { AgentIdentificationFormComponent } from './agent-identification-form/ag
     declarations: [
         AgentFormComponent,
         AgentIdentificationFormComponent,
+        AgentDescriptionFormComponent,
     ],
     imports: [
         SharedModule,
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
index 95ea0507..5b843cd0 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
@@ -1,4 +1,4 @@
-<form [formGroup]="form">
+<form [formGroup]="form" aria-label="identification">
     <div class="mb-3">
         <label class="form-label" for="input-name">
             Name

From c245ada661cde018b2afd9c49c4c225dd1935033 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 12:28:33 +0200
Subject: [PATCH 217/565] add is_group to agent admin

---
 backend/person/admin.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/person/admin.py b/backend/person/admin.py
index d065f3b4..99e5f7e7 100644
--- a/backend/person/admin.py
+++ b/backend/person/admin.py
@@ -29,8 +29,6 @@ class HistoricalPersonAdmin(admin.ModelAdmin):
     ]
 
 
-
-
 class AgentDescriptionGenderAdmin(admin.StackedInline):
     model = models.AgentDescriptionGender
     fields = ["gender"] + core_admin.description_field_fields
@@ -44,6 +42,11 @@ class AgentDescriptionLocationAdmin(admin.StackedInline):
 
 @admin.register(models.AgentDescription)
 class AgentDescriptionAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
+    fieldsets = [
+        core_admin.named_fieldset,
+        ("Person/group", {"fields": ["is_group"]}),
+        core_admin.description_source_fieldset,
+    ]
     inlines = [
         AgentDescriptionGenderAdmin,
         AgentDescriptionLocationAdmin,

From 265b62aa2f170f33292162ac317ac8d1b8203c29 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 12:30:43 +0200
Subject: [PATCH 218/565] scaffold agent description form

---
 .../agent-description-form.component.html     | 71 ++++++++++++++++++-
 .../agent-description-form.component.ts       | 12 ++++
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index 01e9688b..d6c12865 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -1 +1,70 @@
-<p>agent-description-form works!</p>
+<form>
+    <h3>Designators</h3>
+
+    <p>What expressions are used in the text to refer to this agent?</p>
+
+    <div class="mb-4">
+        <p class="form-label">Designators</p>
+    </div>
+
+    <h3>Gender</h3>
+
+    <p>Does the text establish the gender of this agent?</p>
+
+    <div class="mb-4">
+        <label class="form-label" for="input-gender">Gender</label>
+        <select class="form-select" id="input-gender" >
+            <option *ngFor="let option of genderOptions" [value]="option.value">
+                {{option.label}}
+            </option>
+        </select>
+    </div>
+
+    <div class="mb-4">
+        <label class="form-label" for="input-gender-mention">
+            How is this information presented in the text?
+        </label>
+        <select class="form-select" id="input-gender-mention">
+            <option>Implied</option>
+            <option selected>Mentioned</option>
+        </select>
+    </div>
+
+    <div class="mb-4">
+        <label class="form-label" for="input-gender-notes">
+            Additional notes
+        </label>
+        <textarea class="form-control" id="input-gender-notes"></textarea>
+    </div>
+
+    <h3>Location</h3>
+
+    <p>
+        Is the group characterised by their location? (For example, "the citizens of
+        Arles", "the nuns at the abbey in Poitiers".)
+    </p>
+
+
+    <div class="mb-4">
+        <label class="form-label" for="input-location">Location</label>
+        <select class="form-select" id="input-location" >
+        </select>
+    </div>
+
+    <div class="mb-4">
+        <label class="form-label" for="input-location-mention">
+            How is this information presented in the text?
+        </label>
+        <select class="form-select" id="input-location-mention">
+            <option>Implied</option>
+            <option selected>Mentioned</option>
+        </select>
+    </div>
+
+    <div class="mb-4">
+        <label class="form-label" for="input-location-notes">
+            Additional notes
+        </label>
+        <textarea class="form-control" id="input-location-notes"></textarea>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 220260df..a09e596a 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -1,4 +1,8 @@
 import { Component, Input } from '@angular/core';
+import {
+    PersonAgentDescriptionGenderGenderChoices as GenderChoices
+} from 'generated/graphql';
+
 
 @Component({
     selector: 'lc-agent-description-form',
@@ -8,4 +12,12 @@ import { Component, Input } from '@angular/core';
 export class AgentDescriptionFormComponent {
     @Input() id?: string;
 
+    genderOptions: { value: GenderChoices, label: string }[] = [
+        { value: GenderChoices.Female, label: 'Female' },
+        { value: GenderChoices.Male, label: 'Male' },
+        { value: GenderChoices.Other, label: 'Other' },
+        { value: GenderChoices.Mixed, label: 'Mixed (for groups)' },
+        { value: GenderChoices.Unknown, label: 'Unknown' }
+    ];
+
 }

From 4ff59af0350c8edabe59413eb48a0ca4c2b9bf5f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 12:35:53 +0200
Subject: [PATCH 219/565] add locations in source query

---
 .../agent-description-form/locations-in-source.graphql      | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql
new file mode 100644
index 00000000..cc8da4c9
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql
@@ -0,0 +1,6 @@
+query LocationsInSourceList($sourceID: ID!) {
+  spaceDescriptions(sourceId: $sourceID) {
+    id
+    name
+  }
+}

From 18dd9b63105930aeda82f7e6f82764ae460d2e80 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 13:33:38 +0200
Subject: [PATCH 220/565] smaller query for agent identification form

---
 .../agent-identification-form.component.ts                | 6 +++---
 .../agents-identification.graphql                         | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 729eed3c..de7b35b8 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
+import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery } from 'generated/graphql';
 import { map, Subject, switchMap } from 'rxjs';
 
 @Component({
@@ -19,7 +19,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
 
     private id$ = new Subject<string>();
 
-    constructor(private agentQuery: DataEntryAgentGQL) {
+    constructor(private agentQuery: DataEntryAgentIdentificationGQL) {
         this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
@@ -36,7 +36,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         this.id$.complete();
     }
 
-    updateFormData(data: DataEntryAgentQuery) {
+    updateFormData(data: DataEntryAgentIdentificationQuery) {
         this.form.setValue({
             name: data.agentDescription?.name || '',
             description: data.agentDescription?.description || '',
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql b/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
new file mode 100644
index 00000000..fd47a0e3
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
@@ -0,0 +1,8 @@
+query DataEntryAgentIdentification($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    isGroup
+  }
+}

From 21251fb69663f13dc9e44009889605363d415b3c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 13:55:51 +0200
Subject: [PATCH 221/565] fetch data in agent description form

---
 frontend/generated/graphql.ts                 | 90 +++++++++++++++++++
 .../agent-description-form.component.html     | 15 ++--
 .../agent-description-form.component.ts       | 55 +++++++++++-
 .../agent-description.graphql                 | 15 ++++
 4 files changed, 167 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 4c603249..d52b8c53 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -737,6 +737,27 @@ export type UpdateOrCreateSourceMutation = {
   source?: Maybe<SourceType>;
 };
 
+export type DataEntryAgentDescriptionQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null, note: string } | null, source: { __typename?: 'SourceType', id: string } } | null };
+
+export type LocationsInSourceListQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type LocationsInSourceListQuery = { __typename?: 'Query', spaceDescriptions: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> };
+
+export type DataEntryAgentIdentificationQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
+
 export type DataEntryAgentQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -777,6 +798,75 @@ export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>
 
 export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
 
+export const DataEntryAgentDescriptionDocument = gql`
+    query DataEntryAgentDescription($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    isGroup
+    designators
+    gender {
+      id
+      gender
+      sourceMention
+      note
+    }
+    source {
+      id
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
+    override document = DataEntryAgentDescriptionDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const LocationsInSourceListDocument = gql`
+    query LocationsInSourceList($id: ID!) {
+  spaceDescriptions(sourceId: $id) {
+    id
+    name
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
+    override document = LocationsInSourceListDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryAgentIdentificationDocument = gql`
+    query DataEntryAgentIdentification($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    isGroup
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
+    override document = DataEntryAgentIdentificationDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
 export const DataEntryAgentDocument = gql`
     query DataEntryAgent($id: ID!) {
   agentDescription(id: $id) {
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index d6c12865..d7e4f0f7 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -13,7 +13,8 @@ <h3>Gender</h3>
 
     <div class="mb-4">
         <label class="form-label" for="input-gender">Gender</label>
-        <select class="form-select" id="input-gender" >
+        <select class="form-select" id="input-gender"
+            [formControl]="form.controls.gender.controls.gender">
             <option *ngFor="let option of genderOptions" [value]="option.value">
                 {{option.label}}
             </option>
@@ -24,9 +25,11 @@ <h3>Gender</h3>
         <label class="form-label" for="input-gender-mention">
             How is this information presented in the text?
         </label>
-        <select class="form-select" id="input-gender-mention">
-            <option>Implied</option>
-            <option selected>Mentioned</option>
+        <select class="form-select" id="input-gender-mention"
+            [formControl]="form.controls.gender.controls.sourceMention">
+            <option *ngFor="let option of genderSourceMentionOptions" [value]="option.value">
+                {{option.label}}
+            </option>
         </select>
     </div>
 
@@ -34,7 +37,9 @@ <h3>Gender</h3>
         <label class="form-label" for="input-gender-notes">
             Additional notes
         </label>
-        <textarea class="form-control" id="input-gender-notes"></textarea>
+        <textarea class="form-control" id="input-gender-notes"
+            [formControl]="form.controls.gender.controls.note">
+        </textarea>
     </div>
 
     <h3>Location</h3>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index a09e596a..22dbf982 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -1,7 +1,12 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { FormControl, FormGroup } from '@angular/forms';
 import {
-    PersonAgentDescriptionGenderGenderChoices as GenderChoices
+    DataEntryAgentDescriptionGQL,
+    DataEntryAgentDescriptionQuery,
+    PersonAgentDescriptionGenderGenderChoices as GenderChoices,
+    PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices
 } from 'generated/graphql';
+import { map, Subject, switchMap } from 'rxjs';
 
 
 @Component({
@@ -9,7 +14,7 @@ import {
     templateUrl: './agent-description-form.component.html',
     styleUrls: ['./agent-description-form.component.scss']
 })
-export class AgentDescriptionFormComponent {
+export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
     @Input() id?: string;
 
     genderOptions: { value: GenderChoices, label: string }[] = [
@@ -20,4 +25,48 @@ export class AgentDescriptionFormComponent {
         { value: GenderChoices.Unknown, label: 'Unknown' }
     ];
 
+    genderSourceMentionOptions: { value: GenderSourceMentionChoices, label: string }[] = [
+        { value: GenderSourceMentionChoices.Direct, label: 'Mentioned' },
+        { value: GenderSourceMentionChoices.Implied, label: 'Implied' },
+    ];
+
+    form = new FormGroup({
+        designators: new FormControl<string[]>([]),
+        gender: new FormGroup({
+            gender: new FormControl<string>(GenderChoices.Unknown),
+            sourceMention: new FormControl<string>(GenderSourceMentionChoices.Direct),
+            note: new FormControl<string>(''),
+        }),
+    })
+
+    private id$ = new Subject<string>();
+
+    constructor(private agentQuery: DataEntryAgentDescriptionGQL) {
+        this.id$.pipe(
+            switchMap(id => this.agentQuery.watch({ id }).valueChanges),
+            map(result => result.data),
+        ).subscribe(this.updateFormData.bind(this));
+    }
+
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes['id'] && this.id) {
+            this.id$.next(this.id);
+        }
+    }
+
+    ngOnDestroy(): void {
+        this.id$.complete();
+    }
+
+    updateFormData(data: DataEntryAgentDescriptionQuery) {
+        this.form.setValue({
+            designators: data.agentDescription?.designators || [],
+            gender: {
+                gender: data.agentDescription?.gender?.gender || GenderChoices.Unknown,
+                sourceMention: data.agentDescription?.gender?.sourceMention || GenderSourceMentionChoices.Direct,
+                note: data.agentDescription?.gender?.note || '',
+            }
+        });
+    }
+
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
new file mode 100644
index 00000000..279fcffd
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
@@ -0,0 +1,15 @@
+query DataEntryAgentDescription($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    designators
+    gender {
+      id
+      gender
+      sourceMention
+      note
+    }
+    source {
+        id
+    }
+  }
+}

From 25a75aba3150d0fdf9c1e0335fd59a7ed339c110 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 14:01:44 +0200
Subject: [PATCH 222/565] only show location form for groups

---
 .../agent-description-form.component.html     | 52 ++++++++++---------
 .../agent-description-form.component.ts       | 13 +++--
 .../agent-description.graphql                 |  1 +
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index d7e4f0f7..9c8f3f1f 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -42,34 +42,36 @@ <h3>Gender</h3>
         </textarea>
     </div>
 
-    <h3>Location</h3>
+    <ng-container *ngIf="isGroup$ | async">
+        <h3>Location</h3>
 
-    <p>
-        Is the group characterised by their location? (For example, "the citizens of
-        Arles", "the nuns at the abbey in Poitiers".)
-    </p>
+        <p>
+            Is the group characterised by their location? (For example, "the citizens of
+            Arles", "the nuns at the abbey in Poitiers".)
+        </p>
 
 
-    <div class="mb-4">
-        <label class="form-label" for="input-location">Location</label>
-        <select class="form-select" id="input-location" >
-        </select>
-    </div>
+        <div class="mb-4">
+            <label class="form-label" for="input-location">Location</label>
+            <select class="form-select" id="input-location" >
+            </select>
+        </div>
 
-    <div class="mb-4">
-        <label class="form-label" for="input-location-mention">
-            How is this information presented in the text?
-        </label>
-        <select class="form-select" id="input-location-mention">
-            <option>Implied</option>
-            <option selected>Mentioned</option>
-        </select>
-    </div>
+        <div class="mb-4">
+            <label class="form-label" for="input-location-mention">
+                How is this information presented in the text?
+            </label>
+            <select class="form-select" id="input-location-mention">
+                <option>Implied</option>
+                <option selected>Mentioned</option>
+            </select>
+        </div>
 
-    <div class="mb-4">
-        <label class="form-label" for="input-location-notes">
-            Additional notes
-        </label>
-        <textarea class="form-control" id="input-location-notes"></textarea>
-    </div>
+        <div class="mb-4">
+            <label class="form-label" for="input-location-notes">
+                Additional notes
+            </label>
+            <textarea class="form-control" id="input-location-notes"></textarea>
+        </div>
+    </ng-container>
 </form>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 22dbf982..24d724f3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -6,7 +6,7 @@ import {
     PersonAgentDescriptionGenderGenderChoices as GenderChoices,
     PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices
 } from 'generated/graphql';
-import { map, Subject, switchMap } from 'rxjs';
+import { Observable, map, Subject, switchMap } from 'rxjs';
 
 
 @Component({
@@ -39,13 +39,20 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         }),
     })
 
+    isGroup$: Observable<boolean>;
+
     private id$ = new Subject<string>();
+    private data$: Observable<DataEntryAgentDescriptionQuery>;
 
     constructor(private agentQuery: DataEntryAgentDescriptionGQL) {
-        this.id$.pipe(
+        this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
-        ).subscribe(this.updateFormData.bind(this));
+        );
+        this.isGroup$ = this.data$.pipe(
+            map(result => result.agentDescription?.isGroup || false),
+        );
+        this.data$.subscribe(this.updateFormData.bind(this));
     }
 
     ngOnChanges(changes: SimpleChanges): void {
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
index 279fcffd..6ba7798a 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
@@ -1,6 +1,7 @@
 query DataEntryAgentDescription($id: ID!) {
   agentDescription(id: $id) {
     id
+    isGroup
     designators
     gender {
       id

From ab9d1f835ea874af482ec7aa5be17cc83da5b4c4 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 1 Aug 2024 16:17:57 +0200
Subject: [PATCH 223/565] add shareReplay to form data observable

---
 .../agent-description-form/agent-description-form.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 24d724f3..22ff08a8 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -6,7 +6,7 @@ import {
     PersonAgentDescriptionGenderGenderChoices as GenderChoices,
     PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices
 } from 'generated/graphql';
-import { Observable, map, Subject, switchMap } from 'rxjs';
+import { Observable, map, Subject, switchMap, shareReplay } from 'rxjs';
 
 
 @Component({
@@ -48,6 +48,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
+            shareReplay(1),
         );
         this.isGroup$ = this.data$.pipe(
             map(result => result.agentDescription?.isGroup || false),

From ce3becc97893cae39c8b7e96e5d22f17a4abf291 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 11:20:24 +0200
Subject: [PATCH 224/565] load location dropdown

---
 .../agent-description-form.component.html     |  6 ++++++
 .../agent-description-form.component.ts       | 20 ++++++++++++++++---
 .../locations-in-source.graphql               | 10 +++++-----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index 9c8f3f1f..2cdc23f0 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -54,6 +54,12 @@ <h3>Location</h3>
         <div class="mb-4">
             <label class="form-label" for="input-location">Location</label>
             <select class="form-select" id="input-location" >
+                <ng-container *ngIf="locations$ | async as locationData">
+                    <option *ngFor="let location of locationData.spaceDescriptions"
+                        [value]="location.id">
+                        {{location.name}}
+                    </option>
+                </ng-container>
             </select>
         </div>
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 22ff08a8..3b8bfdb2 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -4,9 +4,12 @@ import {
     DataEntryAgentDescriptionGQL,
     DataEntryAgentDescriptionQuery,
     PersonAgentDescriptionGenderGenderChoices as GenderChoices,
-    PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices
+    PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices,
+    LocationsInSourceListGQL,
+    LocationsInSourceListQuery
 } from 'generated/graphql';
-import { Observable, map, Subject, switchMap, shareReplay } from 'rxjs';
+import { Observable, map, Subject, switchMap, shareReplay, filter } from 'rxjs';
+import _ from 'underscore';
 
 
 @Component({
@@ -40,11 +43,15 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
     })
 
     isGroup$: Observable<boolean>;
+    locations$: Observable<LocationsInSourceListQuery>;
 
     private id$ = new Subject<string>();
     private data$: Observable<DataEntryAgentDescriptionQuery>;
 
-    constructor(private agentQuery: DataEntryAgentDescriptionGQL) {
+    constructor(
+        private agentQuery: DataEntryAgentDescriptionGQL,
+        private locationsQuery: LocationsInSourceListGQL,
+    ) {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
@@ -53,6 +60,13 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         this.isGroup$ = this.data$.pipe(
             map(result => result.agentDescription?.isGroup || false),
         );
+        this.locations$ = this.data$.pipe(
+            map(data => data.agentDescription?.source.id),
+            filter(_.negate(_.isUndefined)),
+            switchMap(id => this.locationsQuery.watch({ id }).valueChanges),
+            map(result => result.data),
+            shareReplay(1),
+        );
         this.data$.subscribe(this.updateFormData.bind(this));
     }
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql
index cc8da4c9..a3248d89 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/locations-in-source.graphql
@@ -1,6 +1,6 @@
-query LocationsInSourceList($sourceID: ID!) {
-  spaceDescriptions(sourceId: $sourceID) {
-    id
-    name
-  }
+query LocationsInSourceList($id: ID!) {
+    spaceDescriptions(sourceId: $id) {
+        id
+        name
+    }
 }

From a41f6e43feb387a737554eddf663bbfd66bd3a1a Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 11:58:00 +0200
Subject: [PATCH 225/565] add designators control to description form

---
 .../agent-description-form.component.html                     | 4 +---
 .../agent-description-form.component.spec.ts                  | 3 ++-
 .../agent-description-form.component.ts                       | 4 ++--
 frontend/src/app/data-entry/agent-form/agent-form.module.ts   | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index 2cdc23f0..3ef6fda0 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -3,9 +3,7 @@ <h3>Designators</h3>
 
     <p>What expressions are used in the text to refer to this agent?</p>
 
-    <div class="mb-4">
-        <p class="form-label">Designators</p>
-    </div>
+    <lc-designators-control [formControl]="form.controls.designators"></lc-designators-control>
 
     <h3>Gender</h3>
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
index e95060e3..6ea7499f 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AgentDescriptionFormComponent } from './agent-description-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { DataEntrySharedModule } from '../../shared/data-entry-shared.module';
 
 describe('AgentDescriptionFormComponent', () => {
     let component: AgentDescriptionFormComponent;
@@ -10,7 +11,7 @@ describe('AgentDescriptionFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [AgentDescriptionFormComponent],
-            imports: [SharedTestingModule],
+            imports: [SharedTestingModule, DataEntrySharedModule,],
         });
         fixture = TestBed.createComponent(AgentDescriptionFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 3b8bfdb2..9ba121dd 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -15,7 +15,7 @@ import _ from 'underscore';
 @Component({
     selector: 'lc-agent-description-form',
     templateUrl: './agent-description-form.component.html',
-    styleUrls: ['./agent-description-form.component.scss']
+    styleUrls: ['./agent-description-form.component.scss'],
 })
 export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
     @Input() id?: string;
@@ -34,7 +34,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
     ];
 
     form = new FormGroup({
-        designators: new FormControl<string[]>([]),
+        designators: new FormControl<string[]>([], { nonNullable: true }),
         gender: new FormGroup({
             gender: new FormControl<string>(GenderChoices.Unknown),
             sourceMention: new FormControl<string>(GenderSourceMentionChoices.Direct),
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index dbe12ec7..498f1ca3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -3,6 +3,7 @@ import { AgentFormComponent } from './agent-form.component';
 import { SharedModule } from '@shared/shared.module';
 import { AgentIdentificationFormComponent } from './agent-identification-form/agent-identification-form.component';
 import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
+import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 
 
 
@@ -14,6 +15,7 @@ import { AgentDescriptionFormComponent } from './agent-description-form/agent-de
     ],
     imports: [
         SharedModule,
+        DataEntrySharedModule
     ],
     exports: [
         AgentFormComponent,

From 0fa5c55549d1c9d1365e61fbb9c85dfc94cf44e5 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 13:07:23 +0200
Subject: [PATCH 226/565] fetch location data in form

---
 frontend/generated/graphql.ts                       | 10 +++++++++-
 .../agent-description-form.component.html           | 11 ++++++++---
 .../agent-description-form.component.ts             | 13 ++++++++++++-
 .../agent-description.graphql                       |  8 ++++++++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index d52b8c53..fdcea24b 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -742,7 +742,7 @@ export type DataEntryAgentDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null, note: string } | null, source: { __typename?: 'SourceType', id: string } } | null };
+export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
 
 export type LocationsInSourceListQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -810,6 +810,14 @@ export const DataEntryAgentDescriptionDocument = gql`
       sourceMention
       note
     }
+    location {
+      id
+      sourceMention
+      note
+      location {
+        id
+      }
+    }
     source {
       id
     }
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index 3ef6fda0..d43ebf76 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -51,7 +51,9 @@ <h3>Location</h3>
 
         <div class="mb-4">
             <label class="form-label" for="input-location">Location</label>
-            <select class="form-select" id="input-location" >
+            <select class="form-select" id="input-location"
+                [formControl]="form.controls.location.controls.location">
+                <option [ngValue]="null">This group is not tied to a location</option>
                 <ng-container *ngIf="locations$ | async as locationData">
                     <option *ngFor="let location of locationData.spaceDescriptions"
                         [value]="location.id">
@@ -65,7 +67,8 @@ <h3>Location</h3>
             <label class="form-label" for="input-location-mention">
                 How is this information presented in the text?
             </label>
-            <select class="form-select" id="input-location-mention">
+            <select class="form-select" id="input-location-mention"
+                [formControl]="form.controls.location.controls.sourceMention">
                 <option>Implied</option>
                 <option selected>Mentioned</option>
             </select>
@@ -75,7 +78,9 @@ <h3>Location</h3>
             <label class="form-label" for="input-location-notes">
                 Additional notes
             </label>
-            <textarea class="form-control" id="input-location-notes"></textarea>
+            <textarea class="form-control" id="input-location-notes"
+                [formControl]="form.controls.location.controls.note">
+            </textarea>
         </div>
     </ng-container>
 </form>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 9ba121dd..2517d179 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -6,7 +6,8 @@ import {
     PersonAgentDescriptionGenderGenderChoices as GenderChoices,
     PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices,
     LocationsInSourceListGQL,
-    LocationsInSourceListQuery
+    LocationsInSourceListQuery,
+    PersonAgentDescriptionSourceMentionChoices as LocationSourceMentionChoices,
 } from 'generated/graphql';
 import { Observable, map, Subject, switchMap, shareReplay, filter } from 'rxjs';
 import _ from 'underscore';
@@ -40,6 +41,11 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
             sourceMention: new FormControl<string>(GenderSourceMentionChoices.Direct),
             note: new FormControl<string>(''),
         }),
+        location: new FormGroup({
+            location: new FormControl<string | null>(null),
+            sourceMention: new FormControl<string>(LocationSourceMentionChoices.Direct),
+            note: new FormControl<string>(''),
+        })
     })
 
     isGroup$: Observable<boolean>;
@@ -87,6 +93,11 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
                 gender: data.agentDescription?.gender?.gender || GenderChoices.Unknown,
                 sourceMention: data.agentDescription?.gender?.sourceMention || GenderSourceMentionChoices.Direct,
                 note: data.agentDescription?.gender?.note || '',
+            },
+            location: {
+                location: data.agentDescription?.location?.location.id || null,
+                sourceMention: data.agentDescription?.location?.sourceMention || LocationSourceMentionChoices.Direct,
+                note: data.agentDescription?.location?.note || '',
             }
         });
     }
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
index 6ba7798a..e6bbc399 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
@@ -9,6 +9,14 @@ query DataEntryAgentDescription($id: ID!) {
       sourceMention
       note
     }
+    location {
+        id
+        sourceMention
+        note
+        location {
+            id
+        }
+    }
     source {
         id
     }

From 2e48a0705126f2db58d03f22584436550e0c6e7b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 13:18:02 +0200
Subject: [PATCH 227/565] Clearer form if there is no defining location

---
 .../agent-description-form.component.html     | 78 +++++++++++--------
 .../agent-description-form.component.ts       |  7 ++
 2 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index d43ebf76..7489c3ad 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -43,44 +43,56 @@ <h3>Gender</h3>
     <ng-container *ngIf="isGroup$ | async">
         <h3>Location</h3>
 
-        <p>
-            Is the group characterised by their location? (For example, "the citizens of
-            Arles", "the nuns at the abbey in Poitiers".)
-        </p>
-
-
-        <div class="mb-4">
-            <label class="form-label" for="input-location">Location</label>
-            <select class="form-select" id="input-location"
-                [formControl]="form.controls.location.controls.location">
-                <option [ngValue]="null">This group is not tied to a location</option>
-                <ng-container *ngIf="locations$ | async as locationData">
-                    <option *ngFor="let location of locationData.spaceDescriptions"
-                        [value]="location.id">
-                        {{location.name}}
-                    </option>
-                </ng-container>
-            </select>
-        </div>
-
         <div class="mb-4">
-            <label class="form-label" for="input-location-mention">
-                How is this information presented in the text?
+            <label class="form-label" for="input-has-location">
+                Is the group characterised by their location? (For example, "the citizens of
+                Arles", "the nuns at the abbey in Poitiers".)
             </label>
-            <select class="form-select" id="input-location-mention"
-                [formControl]="form.controls.location.controls.sourceMention">
-                <option>Implied</option>
-                <option selected>Mentioned</option>
+            <select class="form-select" id="input-has-location"
+                [formControl]="form.controls.location.controls.hasLocation">
+                <option [ngValue]="true">Yes</option>
+                <option [ngValue]="false">No</option>
             </select>
         </div>
 
-        <div class="mb-4">
-            <label class="form-label" for="input-location-notes">
-                Additional notes
-            </label>
-            <textarea class="form-control" id="input-location-notes"
-                [formControl]="form.controls.location.controls.note">
-            </textarea>
+        <div [ngbCollapse]="!form.controls.location.controls.hasLocation.value">
+            <div class="mb-4">
+                <label class="form-label" for="input-location">
+                    By which location is the group defined?
+                </label>
+                <select class="form-select" id="input-location"
+                    [formControl]="form.controls.location.controls.location">
+                    <ng-container *ngIf="locations$ | async as locationData">
+                        <option *ngFor="let location of locationData.spaceDescriptions"
+                            [value]="location.id">
+                            {{location.name}}
+                        </option>
+                    </ng-container>
+                </select>
+            </div>
+
+            <div class="mb-4">
+                <label class="form-label" for="input-location-mention">
+                    How is this information presented in the text?
+                </label>
+                <select class="form-select" id="input-location-mention"
+                    [formControl]="form.controls.location.controls.sourceMention">
+                    <option *ngFor="let option of locationSourceMentionOptions"
+                        [value]="option.value">
+                        {{option.label}}
+                    </option>
+                </select>
+            </div>
+
+            <div class="mb-4">
+                <label class="form-label" for="input-location-notes">
+                    Additional notes
+                </label>
+                <textarea class="form-control" id="input-location-notes"
+                    [formControl]="form.controls.location.controls.note">
+                </textarea>
+            </div>
         </div>
+
     </ng-container>
 </form>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 2517d179..3dbf3714 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -34,6 +34,11 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         { value: GenderSourceMentionChoices.Implied, label: 'Implied' },
     ];
 
+    locationSourceMentionOptions: { value: LocationSourceMentionChoices, label: string }[] = [
+        { value: LocationSourceMentionChoices.Direct, label: 'Mentioned' },
+        { value: LocationSourceMentionChoices.Implied, label: 'Implied' },
+    ];
+
     form = new FormGroup({
         designators: new FormControl<string[]>([], { nonNullable: true }),
         gender: new FormGroup({
@@ -42,6 +47,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
             note: new FormControl<string>(''),
         }),
         location: new FormGroup({
+            hasLocation: new FormControl<boolean>(false, { nonNullable: true }),
             location: new FormControl<string | null>(null),
             sourceMention: new FormControl<string>(LocationSourceMentionChoices.Direct),
             note: new FormControl<string>(''),
@@ -95,6 +101,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
                 note: data.agentDescription?.gender?.note || '',
             },
             location: {
+                hasLocation: data.agentDescription?.location !== null,
                 location: data.agentDescription?.location?.location.id || null,
                 sourceMention: data.agentDescription?.location?.sourceMention || LocationSourceMentionChoices.Direct,
                 note: data.agentDescription?.location?.note || '',

From aed8eeccaeed9c5a31bfceb77bfac671d35a1619 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 13:28:08 +0200
Subject: [PATCH 228/565] add "under construction" message

---
 .../data-entry/agent-form/agent-form.component.html    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index d587010e..5e6342c1 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -15,13 +15,17 @@ <h1 class="mb-4">
         </p>
 
         <h2>Identification</h2>
-        <lc-agent-identification-form *ngIf="id$ | async as id" [id]="id"></lc-agent-identification-form>
+        <lc-agent-identification-form *ngIf="id$ | async as id" [id]="id" />
 
         <h2>Description in source text</h2>
-        <lc-agent-description-form *ngIf="id$ | async as id" [id]="id"></lc-agent-description-form>
+        <lc-agent-description-form *ngIf="id$ | async as id" [id]="id" />
 
         <h2>Episodes</h2>
 
+        <p><i>Coming soon!</i></p>
+
         <h2>Historical context</h2>
-    </ng-container>
+
+        <p><i>Coming soon!</i></p>
+
 </ng-container>

From 4bbfad274b1506c21c259027b9bf7ddb5441c041 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 2 Aug 2024 13:31:07 +0200
Subject: [PATCH 229/565] move labels above form inputs

---
 .../agent-identification-form.component.html       | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
index 5b843cd0..c9cebc5f 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
@@ -1,31 +1,29 @@
 <form [formGroup]="form" aria-label="identification">
-    <div class="mb-3">
+    <div class="mb-4">
         <label class="form-label" for="input-name">
             Name
         </label>
-        <input id="input-name" type="text" class="form-control"
-            [formControl]="form.controls.name">
-
         <p>
             <small class="text-body-secondary">
                 This is a name to identify the agent in the overview of the source.
                 For example: "Radegund", "messenger from Poitiers", "the citizens of Arles".
             </small>
         </p>
+        <input id="input-name" type="text" class="form-control"
+            [formControl]="form.controls.name">
     </div>
 
-    <div class="mb-3">
+    <div class="mb-4">
         <label class="form-label" for="input-description">
             Description
         </label>
-        <input id="input-description" type="text" class="form-control"
-            [formControl]="form.controls.description">
-
         <p>
             <small class="text-body-secondary">
                 Add a description to help identify this agent.
             </small>
         </p>
+        <input id="input-description" type="text" class="form-control"
+            [formControl]="form.controls.description">
     </div>
 
     <div class="mb-4">

From 9b782faff73ea5149c544a35d52f14f3b28d0164 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 16:06:23 +0200
Subject: [PATCH 230/565] remove devtools console messages

---
 frontend/src/app/graphql.module.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/graphql.module.ts b/frontend/src/app/graphql.module.ts
index 4b89297d..74b58eb2 100644
--- a/frontend/src/app/graphql.module.ts
+++ b/frontend/src/app/graphql.module.ts
@@ -5,20 +5,21 @@ import { ApolloClientOptions, InMemoryCache } from '@apollo/client/core';
 import { environment } from '@env';
 
 export function createApollo(httpLink: HttpLink): ApolloClientOptions<any> {
-  return {
-    link: httpLink.create({ uri: environment.graphqlUrl }),
-    cache: new InMemoryCache(),
-  };
+    return {
+        link: httpLink.create({ uri: environment.graphqlUrl }),
+        cache: new InMemoryCache(),
+        connectToDevTools: false,
+    };
 }
 
 @NgModule({
-  exports: [ApolloModule],
-  providers: [
-    {
-      provide: APOLLO_OPTIONS,
-      useFactory: createApollo,
-      deps: [HttpLink],
-    },
-  ],
+    exports: [ApolloModule],
+    providers: [
+        {
+            provide: APOLLO_OPTIONS,
+            useFactory: createApollo,
+            deps: [HttpLink],
+        },
+    ],
 })
-export class GraphQLModule {}
+export class GraphQLModule { }

From f6adaadba0c2f851f7beb5b0710fc92e9bcab998 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 5 Aug 2024 16:12:32 +0200
Subject: [PATCH 231/565] show loading and not found indicators

---
 .../agent-form/agent-form.component.html       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 5e6342c1..5ca85210 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -1,7 +1,7 @@
-<ng-container *ngIf="data$ | async as data">
+<ng-container *ngIf="data$ | async as data; else loading">
     <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)"></lc-breadcrumb>
 
-    <ng-container *ngIf="data.agentDescription as agentDescription">
+    <ng-container *ngIf="data.agentDescription as agentDescription; else noAgent">
         <h1 class="mb-4">
             <lc-icon [icon]="dataIcons.person" />
             {{agentDescription.name}}
@@ -27,5 +27,19 @@ <h2>Episodes</h2>
         <h2>Historical context</h2>
 
         <p><i>Coming soon!</i></p>
+    </ng-container>
+
+
+    <ng-template #noAgent>
+        <div class="alert alert-danger" role="alert">
+            Cannot find agent with ID {{id$ | async}}.
+        </div>
+    </ng-template>
 
 </ng-container>
+
+<ng-template #loading>
+    <div class="spinner-border" role="status">
+        <span class="visually-hidden">Loading...</span>
+    </div>
+</ng-template>

From 15e915b8be19c484ecf82c90591780e21cb884f0 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 7 Aug 2024 12:19:51 +0200
Subject: [PATCH 232/565] agent form test module imports

---
 .../data-entry/agent-form/agent-form.component.spec.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
index 8fda7dd3..d09b111c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
@@ -4,6 +4,7 @@ import { AgentFormComponent } from './agent-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
 import { AgentIdentificationFormComponent } from './agent-identification-form/agent-identification-form.component';
+import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
 
 describe('AgentFormComponent', () => {
     let component: AgentFormComponent;
@@ -11,12 +12,15 @@ describe('AgentFormComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [AgentFormComponent],
-            imports: [
-                SharedTestingModule,
+            declarations: [
+                AgentFormComponent,
                 AgentIdentificationFormComponent,
                 AgentDescriptionFormComponent,
             ],
+            imports: [
+                SharedTestingModule,
+                DataEntrySharedModule,
+            ],
         });
         fixture = TestBed.createComponent(AgentFormComponent);
         component = fixture.componentInstance;

From 6adcafaf39792309a705dcfb8b430d26fc6ea99c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 7 Aug 2024 13:27:11 +0200
Subject: [PATCH 233/565] fix double contentinfo landmark

---
 frontend/src/app/app.component.html           |  2 +-
 .../src/app/core/footer/footer.component.html | 38 +++++++++----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html
index 50154d29..b2001590 100644
--- a/frontend/src/app/app.component.html
+++ b/frontend/src/app/app.component.html
@@ -6,5 +6,5 @@
             <router-outlet></router-outlet>
         </div>
     </main>
-    <lc-footer role="contentinfo"></lc-footer>
+    <lc-footer role="contentinfo" class="is-hidden-print text-bg-light p-5" />
 </div>
diff --git a/frontend/src/app/core/footer/footer.component.html b/frontend/src/app/core/footer/footer.component.html
index e2e9a232..4026d6b5 100644
--- a/frontend/src/app/core/footer/footer.component.html
+++ b/frontend/src/app/core/footer/footer.component.html
@@ -1,24 +1,22 @@
-<footer class="is-hidden-print text-bg-light p-5">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg">
-                <p>Lettercraft & Epistolary Performance in Medieval Europe</p>
+<div class="container">
+    <div class="row">
+        <div class="col-lg">
+            <p>Lettercraft & Epistolary Performance in Medieval Europe</p>
 
-                <p>Version: {{environment.version}}</p>
+            <p>Version: {{environment.version}}</p>
 
-                <p>
-                    <a href="https://github.com/CentreForDigitalHumanities/lettercraft"
-                    >Source code</a> (BSD 3-Clause License)
-                </p>
-            </div>
-            <div class="col-lg-auto">
-                <a class="lab-logo image"
-                    href="https://cdh.uu.nl/centre-for-digital-humanities/research-software-lab/">
-                    <img src="{{environment.assets}}/uu-cdh.svg"
-                        alt="Centre for Digital Humanities, Utrecht University"
-                        height="100" />
-                </a>
-            </div>
+            <p>
+                <a href="https://github.com/CentreForDigitalHumanities/lettercraft"
+                >Source code</a> (BSD 3-Clause License)
+            </p>
+        </div>
+        <div class="col-lg-auto">
+            <a class="lab-logo image"
+                href="https://cdh.uu.nl/centre-for-digital-humanities/research-software-lab/">
+                <img src="{{environment.assets}}/uu-cdh.svg"
+                    alt="Centre for Digital Humanities, Utrecht University"
+                    height="100" />
+            </a>
         </div>
     </div>
-</footer>
+</div>

From 4b1acc168de616fe66cd8cc7a374486502faea31 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 11:18:27 +0200
Subject: [PATCH 234/565] MultiselectComponent

---
 .../shared/data-entry-shared.module.ts        | 23 ++----
 .../multiselect/multiselect.component.html    | 27 +++++++
 .../multiselect/multiselect.component.scss    |  0
 .../multiselect/multiselect.component.spec.ts | 21 +++++
 .../multiselect/multiselect.component.ts      | 78 +++++++++++++++++++
 5 files changed, 134 insertions(+), 15 deletions(-)
 create mode 100644 frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
 create mode 100644 frontend/src/app/data-entry/shared/multiselect/multiselect.component.scss
 create mode 100644 frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts

diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index a64bc226..415e3a3f 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -1,18 +1,11 @@
-import { NgModule } from '@angular/core';
-import { SharedModule } from '@shared/shared.module';
-import { DesignatorsControlComponent } from './designators-control/designators-control.component';
-
-
+import { NgModule } from "@angular/core";
+import { SharedModule } from "@shared/shared.module";
+import { DesignatorsControlComponent } from "./designators-control/designators-control.component";
+import { MultiselectComponent } from "./multiselect/multiselect.component";
 
 @NgModule({
-    declarations: [
-        DesignatorsControlComponent
-    ],
-    imports: [
-        SharedModule
-    ],
-    exports: [
-        DesignatorsControlComponent,
-    ]
+    declarations: [DesignatorsControlComponent, MultiselectComponent],
+    imports: [SharedModule],
+    exports: [DesignatorsControlComponent, MultiselectComponent],
 })
-export class DataEntrySharedModule { }
+export class DataEntrySharedModule {}
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
new file mode 100644
index 00000000..eb62d56f
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
@@ -0,0 +1,27 @@
+<select
+    *ngIf="visibleOptions() as options"
+    class="form-select"
+    [title]="placeholderEmpty"
+    aria-multiselectable="true"
+    tabindex="0"
+    [disabled]="disabled"
+>
+    <ng-container *ngIf="options.length > 0; else noOptions">
+        <option class="visually-hidden" [attr.aria-disabled]="true">
+            {{ placeholderEmpty }}
+        </option>
+    </ng-container>
+    <ng-template #noOptions>
+        <option class="visually-hidden" [attr.aria-disabled]="true">
+            {{ noAvailableOptions }}
+        </option>
+    </ng-template>
+    <option
+        *ngFor="let option of options; let i = index; trackBy: trackById"
+        (click)="selectOption(option)"
+        [attr.aria-selected]="selectedOptions().includes(option.id)"
+        tabindex="1"
+    >
+        <span>{{ option.label }}</span>
+    </option>
+</select>
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.scss b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts
new file mode 100644
index 00000000..16082e6c
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MultiselectComponent } from './multiselect.component';
+
+describe('MultiselectComponent', () => {
+  let component: MultiselectComponent;
+  let fixture: ComponentFixture<MultiselectComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [MultiselectComponent]
+    });
+    fixture = TestBed.createComponent(MultiselectComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
new file mode 100644
index 00000000..9d806020
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
@@ -0,0 +1,78 @@
+import { Component, forwardRef, Input, signal, computed } from "@angular/core";
+import { NG_VALUE_ACCESSOR, ControlValueAccessor } from "@angular/forms";
+
+export interface MultiselectOption {
+    id: string;
+    label: string;
+}
+
+@Component({
+    selector: "lc-multiselect",
+    templateUrl: "./multiselect.component.html",
+    styleUrls: ["./multiselect.component.scss"],
+    providers: [
+        {
+            provide: NG_VALUE_ACCESSOR,
+            useExisting: forwardRef(() => MultiselectComponent),
+            multi: true,
+        },
+    ],
+})
+export class MultiselectComponent implements ControlValueAccessor {
+    // All available options to choose from.
+    @Input() options: MultiselectOption[] = [];
+    // Determines whether to show selected options in the list of selectable options.
+    @Input() showSelected = false;
+    // A placeholder to be shown when nothing has been selected.
+    @Input() placeholderEmpty = "Select an option from the list below...";
+    @Input() noAvailableOptions = "No options available";
+
+    public selectedOptions = signal<string[]>([]);
+    public disabled = false;
+    public visibleOptions = computed(() => {
+        return this.options.filter((option) => {
+            if (this.showSelected) {
+                return true;
+            }
+            return !this.selectedOptions().includes(option.id);
+        });
+    });
+
+    private onChange: ((value: string[]) => void) | null = null;
+    private onTouched: (() => void) | null = null;
+
+    public selectOption(option: MultiselectOption): void {
+        const selectedIds: string[] = this.selectedOptions();
+        const index = selectedIds.indexOf(option.id);
+        if (index !== -1) {
+            selectedIds.splice(index, 1);
+        } else {
+            selectedIds.push(option.id);
+        }
+        // Propagate change to form control in view.
+        this.selectedOptions.set(selectedIds);
+        // Propagate change to parent component.
+        this.onChange?.(selectedIds);
+        this.onTouched?.();
+    }
+
+    public trackById(_index: number, option: MultiselectOption): string {
+        return option.id;
+    }
+
+    public writeValue(value: string[]): void {
+        this.selectedOptions.set(value);
+    }
+
+    public registerOnChange(fn: (value: string[]) => void): void {
+        this.onChange = fn;
+    }
+
+    public registerOnTouched(fn: () => void): void {
+        this.onTouched = fn;
+    }
+
+    public setDisabledState?(isDisabled: boolean): void {
+        this.disabled = isDisabled;
+    }
+}

From 5443e646eb46a99a81a0536a94335de57bd823a2 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 11:19:05 +0200
Subject: [PATCH 235/565] LabelSelectComponent

---
 .../shared/data-entry-shared.module.ts        | 13 +++-
 .../label-select/label-select.component.html  | 19 ++++++
 .../label-select/label-select.component.scss  |  0
 .../label-select.component.spec.ts            | 21 ++++++
 .../label-select/label-select.component.ts    | 64 +++++++++++++++++++
 5 files changed, 115 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/app/data-entry/shared/label-select/label-select.component.html
 create mode 100644 frontend/src/app/data-entry/shared/label-select/label-select.component.scss
 create mode 100644 frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/label-select/label-select.component.ts

diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index 415e3a3f..5395a06f 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -2,10 +2,19 @@ import { NgModule } from "@angular/core";
 import { SharedModule } from "@shared/shared.module";
 import { DesignatorsControlComponent } from "./designators-control/designators-control.component";
 import { MultiselectComponent } from "./multiselect/multiselect.component";
+import { LabelSelectComponent } from "./label-select/label-select.component";
 
 @NgModule({
-    declarations: [DesignatorsControlComponent, MultiselectComponent],
+    declarations: [
+        DesignatorsControlComponent,
+        MultiselectComponent,
+        LabelSelectComponent,
+    ],
     imports: [SharedModule],
-    exports: [DesignatorsControlComponent, MultiselectComponent],
+    exports: [
+        DesignatorsControlComponent,
+        MultiselectComponent,
+        LabelSelectComponent,
+    ],
 })
 export class DataEntrySharedModule {}
diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.html b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
new file mode 100644
index 00000000..fa87a6b6
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
@@ -0,0 +1,19 @@
+<p>Selected labels (click to remove):</p>
+<ul class="ps-0">
+    <ng-container *ngIf="selectedLabels().length > 0; else noLabels">
+        <li *ngFor="let label of selectedLabels()" class="badge rounded-pill">
+            <button class="btn text-bg-primary" type="button" (click)="removeLabel(label.id)">
+                <span>{{ label.label }}</span>
+                <lc-icon [icon]="actionIcons.cancel" class="ms-2" />
+            </button>
+        </li>
+    </ng-container>
+    <ng-template #noLabels>
+        <p>No labels selected</p>
+    </ng-template>
+</ul>
+
+<form>
+    <label for="label-select" class="form-label">Pick a label</label>
+    <lc-multiselect id="label-select" [options]="options" [formControl]="control" placeholderEmpty="Select a label from the list below." />
+</form>
diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.scss b/frontend/src/app/data-entry/shared/label-select/label-select.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts b/frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts
new file mode 100644
index 00000000..6c6c4903
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LabelSelectComponent } from './label-select.component';
+
+describe('LabelSelectComponent', () => {
+  let component: LabelSelectComponent;
+  let fixture: ComponentFixture<LabelSelectComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [LabelSelectComponent]
+    });
+    fixture = TestBed.createComponent(LabelSelectComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.ts b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
new file mode 100644
index 00000000..a48e75e5
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
@@ -0,0 +1,64 @@
+import { Component, computed, forwardRef, Input } from "@angular/core";
+import {
+    FormControl,
+    ControlValueAccessor,
+    NG_VALUE_ACCESSOR,
+} from "@angular/forms";
+import { actionIcons } from "@shared/icons";
+import { toSignal } from "@angular/core/rxjs-interop";
+import { MultiselectOption } from "../multiselect/multiselect.component";
+
+@Component({
+    selector: "lc-label-select",
+    templateUrl: "./label-select.component.html",
+    styleUrls: ["./label-select.component.scss"],
+    providers: [
+        {
+            provide: NG_VALUE_ACCESSOR,
+            useExisting: forwardRef(() => LabelSelectComponent),
+            multi: true,
+        },
+    ],
+})
+export class LabelSelectComponent implements ControlValueAccessor {
+    @Input() options: MultiselectOption[] = [];
+
+    public control = new FormControl<string[]>([], { nonNullable: true });
+    public actionIcons = actionIcons;
+
+    public disabled = false;
+
+    private onChange: ((value: string[]) => void) | null = null;
+    private onTouched: (() => void) | null = null;
+
+    public formValue = toSignal<string[]>(this.control.valueChanges);
+    public selectedLabels = computed(() => {
+        const selectedIds = this.formValue();
+        return this.options.filter((item) => selectedIds?.includes(item.id));
+    });
+
+    public removeLabel(labelId: string): void {
+        const selectedIds = this.control.value.filter((id) => id !== labelId);
+        this.control.setValue(selectedIds);
+    }
+
+    public writeValue(value: string[]): void {
+        this.control.setValue(value);
+    }
+
+    public registerOnChange(fn: (value: string[]) => void): void {
+        this.onChange = fn;
+    }
+
+    public registerOnTouched(fn: () => void): void {
+        this.onTouched = fn;
+    }
+
+    public setDisabledState?(isDisabled: boolean): void {
+        if (isDisabled) {
+            this.control.enable();
+        } else {
+            this.control.disable();
+        }
+    }
+}

From e08cdd9b2e14f784918d8789e1bf640564f680fb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 11:25:34 +0200
Subject: [PATCH 236/565] Fix failing tests; sensible renaming

---
 .../label-select/label-select.component.html  |  2 +-
 .../label-select.component.spec.ts            | 33 ++++++++++---------
 .../label-select/label-select.component.ts    |  2 +-
 .../multiselect/multiselect.component.html    |  2 +-
 .../multiselect/multiselect.component.spec.ts | 32 +++++++++---------
 .../multiselect/multiselect.component.ts      | 10 +++---
 6 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.html b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
index fa87a6b6..1cbfdef3 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.html
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
@@ -2,7 +2,7 @@
 <ul class="ps-0">
     <ng-container *ngIf="selectedLabels().length > 0; else noLabels">
         <li *ngFor="let label of selectedLabels()" class="badge rounded-pill">
-            <button class="btn text-bg-primary" type="button" (click)="removeLabel(label.id)">
+            <button class="btn text-bg-primary" type="button" (click)="removeLabel(label.value)">
                 <span>{{ label.label }}</span>
                 <lc-icon [icon]="actionIcons.cancel" class="ms-2" />
             </button>
diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts b/frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts
index 6c6c4903..8618d164 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.spec.ts
@@ -1,21 +1,24 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { LabelSelectComponent } from './label-select.component';
+import { LabelSelectComponent } from "./label-select.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { DataEntrySharedModule } from "../data-entry-shared.module";
 
-describe('LabelSelectComponent', () => {
-  let component: LabelSelectComponent;
-  let fixture: ComponentFixture<LabelSelectComponent>;
+describe("LabelSelectComponent", () => {
+    let component: LabelSelectComponent;
+    let fixture: ComponentFixture<LabelSelectComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [LabelSelectComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LabelSelectComponent],
+            imports: [SharedTestingModule, DataEntrySharedModule],
+        });
+        fixture = TestBed.createComponent(LabelSelectComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(LabelSelectComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.ts b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
index a48e75e5..4afd1c5f 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
@@ -34,7 +34,7 @@ export class LabelSelectComponent implements ControlValueAccessor {
     public formValue = toSignal<string[]>(this.control.valueChanges);
     public selectedLabels = computed(() => {
         const selectedIds = this.formValue();
-        return this.options.filter((item) => selectedIds?.includes(item.id));
+        return this.options.filter((item) => selectedIds?.includes(item.value));
     });
 
     public removeLabel(labelId: string): void {
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
index eb62d56f..f9f7f872 100644
--- a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
@@ -19,7 +19,7 @@
     <option
         *ngFor="let option of options; let i = index; trackBy: trackById"
         (click)="selectOption(option)"
-        [attr.aria-selected]="selectedOptions().includes(option.id)"
+        [attr.aria-selected]="selectedOptions().includes(option.value)"
         tabindex="1"
     >
         <span>{{ option.label }}</span>
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts
index 16082e6c..6e9ffb30 100644
--- a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.spec.ts
@@ -1,21 +1,23 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { MultiselectComponent } from './multiselect.component';
+import { MultiselectComponent } from "./multiselect.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
-describe('MultiselectComponent', () => {
-  let component: MultiselectComponent;
-  let fixture: ComponentFixture<MultiselectComponent>;
+describe("MultiselectComponent", () => {
+    let component: MultiselectComponent;
+    let fixture: ComponentFixture<MultiselectComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [MultiselectComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [MultiselectComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(MultiselectComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(MultiselectComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
index 9d806020..4908381b 100644
--- a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
@@ -2,7 +2,7 @@ import { Component, forwardRef, Input, signal, computed } from "@angular/core";
 import { NG_VALUE_ACCESSOR, ControlValueAccessor } from "@angular/forms";
 
 export interface MultiselectOption {
-    id: string;
+    value: string;
     label: string;
 }
 
@@ -34,7 +34,7 @@ export class MultiselectComponent implements ControlValueAccessor {
             if (this.showSelected) {
                 return true;
             }
-            return !this.selectedOptions().includes(option.id);
+            return !this.selectedOptions().includes(option.value);
         });
     });
 
@@ -43,11 +43,11 @@ export class MultiselectComponent implements ControlValueAccessor {
 
     public selectOption(option: MultiselectOption): void {
         const selectedIds: string[] = this.selectedOptions();
-        const index = selectedIds.indexOf(option.id);
+        const index = selectedIds.indexOf(option.value);
         if (index !== -1) {
             selectedIds.splice(index, 1);
         } else {
-            selectedIds.push(option.id);
+            selectedIds.push(option.value);
         }
         // Propagate change to form control in view.
         this.selectedOptions.set(selectedIds);
@@ -57,7 +57,7 @@ export class MultiselectComponent implements ControlValueAccessor {
     }
 
     public trackById(_index: number, option: MultiselectOption): string {
-        return option.id;
+        return option.value;
     }
 
     public writeValue(value: string[]): void {

From 6ae3553ffe1f02577da2f92d166a5b0db8758ba8 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 15:24:25 +0200
Subject: [PATCH 237/565] EpisodeFormComponent

---
 .../src/app/data-entry/data-entry.module.ts   | 13 ++---
 .../episode-form/episode-form.component.html  | 44 ++++++++++++++
 .../episode-form/episode-form.component.scss  |  0
 .../episode-form.component.spec.ts            | 21 +++++++
 .../episode-form/episode-form.component.ts    | 58 +++++++++++++++++++
 .../episode-form/episode-form.module.ts       | 24 ++++++++
 .../data-entry/episode-form/episode.graphql   | 11 ++++
 .../episode-preview.component.html            |  2 +-
 frontend/src/app/routes.ts                    |  5 ++
 9 files changed, 170 insertions(+), 8 deletions(-)
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-form.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-form.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-form.component.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-form.module.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode.graphql

diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
index 9dd8f300..4e7e3176 100644
--- a/frontend/src/app/data-entry/data-entry.module.ts
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -5,21 +5,19 @@ import { GiftFormModule } from "./gift-form/gift-form.module";
 import { LetterFormModule } from "./letter-form/letter-form.module";
 import { LocationFormModule } from "./location-form/location-form.module";
 import { AgentFormModule } from "./agent-form/agent-form.module";
-import { SourceComponent } from './source/source.component';
-import { EpisodePreviewComponent } from './source/episode-preview/episode-preview.component';
+import { SourceComponent } from "./source/source.component";
+import { EpisodePreviewComponent } from "./source/episode-preview/episode-preview.component";
+import { EpisodeFormModule } from "./episode-form/episode-form.module";
 
 @NgModule({
-    declarations: [
-        SourcesComponent,
-        SourceComponent,
-        EpisodePreviewComponent,
-    ],
+    declarations: [SourcesComponent, SourceComponent, EpisodePreviewComponent],
     imports: [
         SharedModule,
         AgentFormModule,
         GiftFormModule,
         LetterFormModule,
         LocationFormModule,
+        EpisodeFormModule,
     ],
     exports: [
         SourcesComponent,
@@ -27,6 +25,7 @@ import { EpisodePreviewComponent } from './source/episode-preview/episode-previe
         GiftFormModule,
         LetterFormModule,
         LocationFormModule,
+        EpisodeFormModule,
     ],
 })
 export class DataEntryModule {}
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
new file mode 100644
index 00000000..f324a911
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -0,0 +1,44 @@
+<lc-breadcrumb [breadcrumbs]="(breadcrumbs$ | async) ?? []" />
+
+<ng-container *ngIf="isEditMode$ | async; else newEpisodeTitle">
+    <ng-container *ngIf="episode$ | async as episode; else loading">
+        <h1 class="mb-4">
+            <lc-icon [icon]="dataIcons.episode" />
+            <span>{{ episode.name }}</span>
+            <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
+        </h1>
+        <p class="lead mb-4" *ngIf="episode.description">
+            {{ episode.description}}
+        </p>
+    </ng-container>
+</ng-container>
+<ng-template #newEpisodeTitle>
+    <h1 class="mb-4">
+        <lc-icon [icon]="dataIcons.episode" />
+        New episode
+    </h1>
+</ng-template>
+
+<h2>Identification</h2>
+<lc-episode-identification-form />
+
+<h2>Source text</h2>
+<lc-episode-source-text-form />
+
+<h2>Contents</h2>
+<lc-episode-contents-form />
+
+<h2>Agents</h2>
+<lc-episode-agents-form />
+
+<h2>Locations</h2>
+<lc-episode-locations-form />
+
+<h2>Objects</h2>
+<lc-episode-objects-form />
+
+<ng-template #loading>
+    <div class="spinner-border" role="status">
+        <span class="visually-hidden">Loading...</span>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts
new file mode 100644
index 00000000..2eb99e2a
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodeFormComponent } from "./episode-form.component";
+
+describe("EpisodeFormComponent", () => {
+    let component: EpisodeFormComponent;
+    let fixture: ComponentFixture<EpisodeFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeFormComponent],
+        });
+        fixture = TestBed.createComponent(EpisodeFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
new file mode 100644
index 00000000..8f8bb00c
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -0,0 +1,58 @@
+import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { actionIcons, dataIcons } from "@shared/icons";
+import { DataEntryEpisodeDetailGQL } from "generated/graphql";
+import { filter, map, share, switchMap } from "rxjs";
+
+@Component({
+    selector: "lc-episode",
+    templateUrl: "./episode-form.component.html",
+    styleUrls: ["./episode-form.component.scss"],
+})
+export class EpisodeFormComponent {
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
+
+    public isEditMode$ = this.id$.pipe(map((id) => id !== "new"));
+
+    public episode$ = this.id$.pipe(
+        filter((id) => id !== "new"),
+        switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
+        map((result) => result.data.episode),
+        share()
+    );
+
+    public breadcrumbs$ = this.episode$.pipe(
+        filter((episode) => !!episode),
+        map((episode) => {
+            if (!episode) {
+                return [];
+            }
+            return [
+                {
+                    label: "Lettercraft",
+                    link: "/",
+                },
+                {
+                    label: "Data entry",
+                    link: "/data-entry",
+                },
+                {
+                    label: episode.source.name,
+                    link: `/source/${episode.source.id}`,
+                },
+                {
+                    label: episode.name,
+                    link: `/data-entry/episode/${episode.id}`,
+                },
+            ];
+        })
+    );
+
+    public dataIcons = dataIcons;
+    public actionIcons = actionIcons;
+
+    constructor(
+        private route: ActivatedRoute,
+        private episodeQuery: DataEntryEpisodeDetailGQL
+    ) {}
+}
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.module.ts b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
new file mode 100644
index 00000000..72891df9
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { EpisodeIdentificationFormComponent } from "./episode-identification-form/episode-identification-form.component";
+import { EpisodeSourceTextFormComponent } from "./episode-source-text-form/episode-source-text-form.component";
+import { EpisodeContentsFormComponent } from "./episode-contents-form/episode-contents-form.component";
+import { EpisodeAgentsFormComponent } from "./episode-agents-form/episode-agents-form.component";
+import { EpisodeLocationsFormComponent } from "./episode-locations-form/episode-locations-form.component";
+import { EpisodeObjectsFormComponent } from "./episode-objects-form/episode-objects-form.component";
+import { SharedModule } from "@shared/shared.module";
+import { EpisodeFormComponent } from "./episode-form.component";
+
+@NgModule({
+    declarations: [
+        EpisodeFormComponent,
+        EpisodeIdentificationFormComponent,
+        EpisodeSourceTextFormComponent,
+        EpisodeContentsFormComponent,
+        EpisodeAgentsFormComponent,
+        EpisodeLocationsFormComponent,
+        EpisodeObjectsFormComponent,
+    ],
+    imports: [CommonModule, SharedModule],
+})
+export class EpisodeFormModule {}
diff --git a/frontend/src/app/data-entry/episode-form/episode.graphql b/frontend/src/app/data-entry/episode-form/episode.graphql
new file mode 100644
index 00000000..8f1a9ad2
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode.graphql
@@ -0,0 +1,11 @@
+query DataEntryEpisodeDetail($id: ID!) {
+    episode(id: $id) {
+        id
+        name
+        description
+        source {
+            id
+            name
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index b6d276a8..ab68d666 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -12,7 +12,7 @@
                 </small>
             </div>
             <lc-action-button-group
-                [editLink]="['episode', episode.id]"
+                [editLink]="['/', 'data-entry', 'episodes', episode.id]"
                 (delete)="deleteEpisode(episode.id)"
                 [showButtonText]="false"
             />
diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 166c24eb..af8a2515 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -14,6 +14,7 @@ import { GiftFormComponent } from './data-entry/gift-form/gift-form.component';
 import { LetterFormComponent } from './data-entry/letter-form/letter-form.component';
 import { AgentFormComponent } from './data-entry/agent-form/agent-form.component';
 import { SourceComponent } from './data-entry/source/source.component';
+import { EpisodeFormComponent } from './data-entry/episode-form/episode-form.component';
 
 
 const routes: Routes = [
@@ -73,6 +74,10 @@ const routes: Routes = [
                 path: 'sources/:id',
                 component: SourceComponent
             },
+            {
+                path: 'episodes/:id',
+                component: EpisodeFormComponent,
+            },
             {
                 path: '',
                 pathMatch: 'full',

From aa3fab9326e90f069a193fcae2984f36e0fd5bdf Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 20:13:26 +0200
Subject: [PATCH 238/565] LettercraftMutation + LettercraftErrorType

---
 backend/graphql_app/LettercraftMutation.py    | 187 ++++++++++++++++++
 .../graphql_app/types/LettercraftErrorType.py |  13 ++
 2 files changed, 200 insertions(+)
 create mode 100644 backend/graphql_app/LettercraftMutation.py
 create mode 100644 backend/graphql_app/types/LettercraftErrorType.py

diff --git a/backend/graphql_app/LettercraftMutation.py b/backend/graphql_app/LettercraftMutation.py
new file mode 100644
index 00000000..1be48af7
--- /dev/null
+++ b/backend/graphql_app/LettercraftMutation.py
@@ -0,0 +1,187 @@
+from typing import Type
+from dataclasses import dataclass
+from graphene import InputObjectType, Mutation, ResolveInfo
+from django.db.models import Model
+from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
+from graphene_django.types import DjangoObjectType
+from graphene_django.registry import get_global_registry
+
+
+@dataclass
+class RetrievedObject:
+    object: Model
+    created: bool
+
+
+class LettercraftMutation(Mutation):
+    """
+    An extension of Graphene's base Mutation class.
+    """
+
+    django_model: Type[Model] | None = None
+
+    @classmethod
+    def get_or_create_object(
+        cls, info: ResolveInfo, mutation_input: InputObjectType
+    ) -> RetrievedObject:
+        """
+        Retrieves a Django model instance by id. If the instance does not exist, a new instance is created (but not saved to the database). The instance will be empty, i.e. will not have any (obligatory) fields set.
+
+        Any mutation making use of this method should have a class field 'django_model' defined referring to the class of the object that is being mutated.
+
+        Args:
+            - mutation_input (InputObjectType): The mutation input.
+            - info (ResolveInfo): An object containing the request and user information.
+
+        Exceptions:
+            - ImproperlyConfigured is raised in two cases:
+                1. when the mutation class implementing DiappMutation does not have the required class field 'django_model' defined;
+                2. when the corresponding Graphene type cannot be found. This exception should not be caught.
+            - ObjectDoesNotExist is raised when an ID is provided but the corresponding object is not found or inaccessible to the user making the request.
+        """
+
+        if cls.django_model is None:
+            raise ImproperlyConfigured(
+                "Mutation class must have a class field 'django_model' defined."
+            )
+
+        model = cls.django_model
+
+        id = getattr(mutation_input, "id", None)
+
+        # The registry is a global object that holds all the models and types.
+        # It is used to get the corresponding Graphene type for a Django model.
+        registry = get_global_registry()
+        graphene_type = registry.get_type_for_model(model)
+
+        if graphene_type is None:
+            raise ImproperlyConfigured("Graphene type not found for model.")
+
+        if id is None:
+            return RetrievedObject(object=model(), created=True)
+
+        try:
+            retrieved = graphene_type.get_queryset(model.objects, info).get(pk=id)
+        except model.DoesNotExist:
+            raise ObjectDoesNotExist("Object not found.")
+
+        return RetrievedObject(object=retrieved, created=False)
+
+    @staticmethod
+    def mutate_object(
+        input: InputObjectType,
+        object_instance: Model,
+        resolve_info: ResolveInfo,
+        excluded_fields: list[str] = [],
+    ) -> None:
+        """
+        Updates both simple and related fields in a GraphQL mutation.
+
+        Simple fields are simply set on the mutated object.
+
+        For related fields, the corresponding Django models and Graphene types are retrieved,
+        and type.get_queryset() is called to ensure the user has access to those particular models.
+
+        Args:
+            - input (dict): A dictionary containing the updated values for the related fields.
+            object_instance (Model): The Django model instance to be updated.
+            - resolve_info (ResolveInfo): An object containing the request and user information.
+            excluded_fields (List[str]): A list of fields to be excluded from the update.
+
+        Exceptions:
+            - ObjectDoesNotExist is raised when an ID of a ForeignKey field is provided but the corresponding object is not found or inaccessible to the user making the request. This exception exposes the name of the field.
+        """
+
+        # The Graphene registry maps Django models to Graphene types.
+        registry = get_global_registry()
+
+        simple_fields = []
+        one_to_many_fields = []
+        many_to_many_fields = []
+
+        for key, value in input.items():
+            # Skip excluded fields
+            if key in excluded_fields:
+                continue
+
+            field = object_instance._meta.get_field(key)
+
+            # Triage
+            if field.many_to_many is True:
+                many_to_many_fields.append(key)
+            elif field.many_to_one is True:
+                one_to_many_fields.append(key)
+            else:
+                simple_fields.append(key)
+
+        # Update simple fields
+        for key in simple_fields:
+            try:
+                value = getattr(input, key)
+                setattr(object_instance, key, value)
+            except AttributeError:
+                pass
+
+        # Update one-to-many fields.
+        # Only selects existing objects on the 'many' side
+        # of the relationship.
+        for key in one_to_many_fields:
+            try:
+                value = getattr(input, key)
+            except AttributeError:
+                continue
+
+            if value is None or value == "":
+                setattr(object_instance, key, None)
+                continue
+
+            field = object_instance._meta.get_field(key)
+            django_model = field.related_model  # type: Model | None
+
+            if django_model is None:
+                continue
+
+            graphene_type = registry.get_type_for_model(django_model)
+
+            try:
+                accessible_object = graphene_type.get_queryset(
+                    django_model.objects, resolve_info
+                ).get(id=value)
+            except django_model.DoesNotExist:
+                raise ObjectDoesNotExist(key)
+
+            setattr(object_instance, key, accessible_object)
+
+        # Saving the object instance so we can use it for many-to-many fields.
+        object_instance.save()
+
+        # Update many-to-many fields
+        for key in many_to_many_fields:
+            try:
+                value = getattr(input, key)
+            except AttributeError:
+                continue
+
+            if value is None:
+                getattr(object_instance, key).set([])
+                continue
+
+            field = object_instance._meta.get_field(key)
+            django_model = field.related_model
+            graphene_type = registry.get_type_for_model(django_model)
+
+            accessible_objects = graphene_type.get_queryset(
+                django_model.objects, resolve_info
+            )
+
+            new_ids = [
+                item["id"]
+                for item in accessible_objects.filter(id__in=value).values("id")
+            ]
+
+            getattr(object_instance, key).set(new_ids)
+
+    # All subclasses of Mutation must implement the mutate method.
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, *args, **kwargs):
+        cls.mutate(root, info, *args, **kwargs)
diff --git a/backend/graphql_app/types/LettercraftErrorType.py b/backend/graphql_app/types/LettercraftErrorType.py
new file mode 100644
index 00000000..fba92eac
--- /dev/null
+++ b/backend/graphql_app/types/LettercraftErrorType.py
@@ -0,0 +1,13 @@
+from typing import List
+from graphene_django.types import ErrorType
+
+
+class LettercraftErrorType(ErrorType):
+    """
+    A simple wrapper around Graphene-Django's ErrorType with a constructor.
+    """
+
+    def __init__(self, field: str, messages: List[str]):
+        super().__init__()
+        self.field = field
+        self.messages = messages

From 4e412676af519dbd193b32a26ea6fb96aea2b675 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 20:13:39 +0200
Subject: [PATCH 239/565] UpdateCreateEpisodeMutation

---
 .../mutations/UpdateCreateEpisodeMutation.py  | 46 +++++++++++++++++++
 backend/graphql_app/schema.py                 |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 backend/event/mutations/UpdateCreateEpisodeMutation.py

diff --git a/backend/event/mutations/UpdateCreateEpisodeMutation.py b/backend/event/mutations/UpdateCreateEpisodeMutation.py
new file mode 100644
index 00000000..072454f9
--- /dev/null
+++ b/backend/event/mutations/UpdateCreateEpisodeMutation.py
@@ -0,0 +1,46 @@
+from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo, String
+from django.core.exceptions import ObjectDoesNotExist
+from event.models import Episode
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphene_django.types import ErrorType
+
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class UpdateCreateEpisodeMutationInput(InputObjectType):
+    id = ID()
+    name = String(required=True)
+
+
+class UpdateCreateEpisodeMutation(LettercraftMutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType))
+
+    django_model = Episode
+
+    class Arguments:
+        input = UpdateCreateEpisodeMutationInput(required=True)
+
+    @classmethod
+    def mutate(
+        cls, root: None, info: ResolveInfo, input: UpdateCreateEpisodeMutationInput
+    ):
+        try:
+            retrieved_object = cls.get_or_create_object(info, input)
+        except ObjectDoesNotExist as e:
+            error = LettercraftErrorType(field="id", messages=[str(e)])
+            return cls(ok=False, errors=[error]) # type: ignore
+
+        episode = retrieved_object.object
+
+        try:
+            cls.mutate_object(input, episode, info)
+        except ObjectDoesNotExist as field:
+            error = LettercraftErrorType(
+                field=str(field), messages=["Related object cannot be found."]
+            )
+            return cls(ok=False, errors=[error]) # type: ignore
+
+        episode.save()
+
+        return cls(ok=True, errors=[]) # type: ignore
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 8c0b14b1..81dc0dc6 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -6,6 +6,7 @@
 from source.queries import SourceQueries
 from space.queries import SpaceQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
+from event.mutations.UpdateCreateEpisodeMutation import UpdateCreateEpisodeMutation
 
 
 class Query(SourceQueries, PersonQueries, EventQueries, LetterQueries, SpaceQueries, ObjectType):
@@ -14,6 +15,7 @@ class Query(SourceQueries, PersonQueries, EventQueries, LetterQueries, SpaceQuer
 
 class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
+    update_or_create_episode = UpdateCreateEpisodeMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)

From 7c2a8305a8f903a1a26a05e1cf40f2ba6fff250c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 20:31:07 +0200
Subject: [PATCH 240/565] Identification subform

---
 frontend/generated/graphql.ts                 | 110 ++++++++++++++++++
 frontend/generated/schema.graphql             |  19 +++
 ...episode-identification-form.component.html |  20 ++++
 ...episode-identification-form.component.scss |   0
 ...sode-identification-form.component.spec.ts |  21 ++++
 .../episode-identification-form.component.ts  |  87 ++++++++++++++
 .../episode-identification-form.graphql       |  18 +++
 7 files changed, 275 insertions(+)
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 0ada9a65..f4b2c666 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -264,12 +264,25 @@ export enum LetterLetterDescriptionSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
+/** A simple wrapper around Graphene-Django's ErrorType with a constructor. */
+export type LettercraftErrorType = {
+  __typename?: 'LettercraftErrorType';
+  field: Scalars['String']['output'];
+  messages: Array<Scalars['String']['output']>;
+};
+
 export type Mutation = {
   __typename?: 'Mutation';
+  updateOrCreateEpisode?: Maybe<UpdateCreateEpisodeMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
 };
 
 
+export type MutationUpdateOrCreateEpisodeArgs = {
+  input: UpdateCreateEpisodeMutationInput;
+};
+
+
 export type MutationUpdateOrCreateSourceArgs = {
   input: UpdateCreateSourceInput;
 };
@@ -722,6 +735,17 @@ export type StructureType = {
   settlement?: Maybe<SettlementType>;
 };
 
+export type UpdateCreateEpisodeMutation = {
+  __typename?: 'UpdateCreateEpisodeMutation';
+  errors?: Maybe<Array<LettercraftErrorType>>;
+  ok: Scalars['Boolean']['output'];
+};
+
+export type UpdateCreateEpisodeMutationInput = {
+  id?: InputMaybe<Scalars['ID']['input']>;
+  name: Scalars['String']['input'];
+};
+
 export type UpdateCreateSourceInput = {
   editionAuthor?: InputMaybe<Scalars['String']['input']>;
   editionTitle?: InputMaybe<Scalars['String']['input']>;
@@ -744,6 +768,27 @@ export type DataEntryAgentQueryVariables = Exact<{
 
 export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
+export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string } | null };
+
+export type DataEntryUpdateCreateEpisodeIdentificationMutationVariables = Exact<{
+  input: UpdateCreateEpisodeMutationInput;
+}>;
+
+
+export type DataEntryUpdateCreateEpisodeIdentificationMutation = { __typename?: 'Mutation', updateOrCreateEpisode?: { __typename?: 'UpdateCreateEpisodeMutation', ok: boolean, errors?: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> | null } | null };
+
+export type DataEntryEpisodeFormQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
 export type DataEntryGiftQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -797,6 +842,71 @@ export const DataEntryAgentDocument = gql`
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryEpisodeIdentificationDocument = gql`
+    query DataEntryEpisodeIdentification($id: ID!) {
+  episode(id: $id) {
+    id
+    name
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
+    override document = DataEntryEpisodeIdentificationDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryUpdateCreateEpisodeIdentificationDocument = gql`
+    mutation DataEntryUpdateCreateEpisodeIdentification($input: UpdateCreateEpisodeMutationInput!) {
+  updateOrCreateEpisode(input: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateCreateEpisodeIdentificationGQL extends Apollo.Mutation<DataEntryUpdateCreateEpisodeIdentificationMutation, DataEntryUpdateCreateEpisodeIdentificationMutationVariables> {
+    override document = DataEntryUpdateCreateEpisodeIdentificationDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryEpisodeFormDocument = gql`
+    query DataEntryEpisodeForm($id: ID!) {
+  episode(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
+    override document = DataEntryEpisodeFormDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 888852ba..a181e513 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -307,7 +307,16 @@ enum LetterLetterDescriptionSourceMentionChoices {
   IMPLIED
 }
 
+"""
+A simple wrapper around Graphene-Django's ErrorType with a constructor.
+"""
+type LettercraftErrorType {
+  field: String!
+  messages: [String!]!
+}
+
 type Mutation {
+  updateOrCreateEpisode(input: UpdateCreateEpisodeMutationInput!): UpdateCreateEpisodeMutation
   updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
 }
 
@@ -782,6 +791,16 @@ type StructureType {
   settlement: SettlementType
 }
 
+type UpdateCreateEpisodeMutation {
+  errors: [LettercraftErrorType!]
+  ok: Boolean!
+}
+
+input UpdateCreateEpisodeMutationInput {
+  id: ID
+  name: String!
+}
+
 input UpdateCreateSourceInput {
   editionAuthor: String
   editionTitle: String
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
new file mode 100644
index 00000000..207def4f
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
@@ -0,0 +1,20 @@
+<form>
+    <div class="form-group">
+        <label for="episode-name">Name</label>
+        <p class="form-text">
+            This is a name to identify the episode in the overview of the
+            source. For example: "journey to Rome", "Clovis' response",
+            "Radegund asks Germanus for help".
+        </p>
+        <input
+            id="episode-name"
+            type="text"
+            class="form-control"
+            [formControl]="form.controls.name"
+            [class.is-invalid]="
+                form.controls.name.invalid && form.controls.name.touched
+            "
+        />
+        <p class="invalid-feedback">This field is required.</p>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
new file mode 100644
index 00000000..f2f1c129
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodeIdentificationFormComponent } from "./episode-identification-form.component";
+
+describe("EpisodeIdentificationFormComponent", () => {
+    let component: EpisodeIdentificationFormComponent;
+    let fixture: ComponentFixture<EpisodeIdentificationFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeIdentificationFormComponent],
+        });
+        fixture = TestBed.createComponent(EpisodeIdentificationFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
new file mode 100644
index 00000000..043cc2c1
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -0,0 +1,87 @@
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryEpisodeIdentificationGQL,
+    DataEntryUpdateCreateEpisodeIdentificationGQL,
+} from "generated/graphql";
+import {
+    debounceTime,
+    filter,
+    map,
+    Observable,
+    switchMap,
+    withLatestFrom,
+} from "rxjs";
+
+@Component({
+    selector: "lc-episode-identification-form",
+    templateUrl: "./episode-identification-form.component.html",
+    styleUrls: ["./episode-identification-form.component.scss"],
+})
+export class EpisodeIdentificationFormComponent implements OnInit {
+    public id$: Observable<string> = this.route.params.pipe(
+        map((params) => params["id"])
+    );
+
+    public episode$ = this.id$.pipe(
+        switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
+        map((result) => result.data.episode)
+    );
+
+    public form = new FormGroup({
+        name: new FormControl<string>("", {
+            nonNullable: true,
+            validators: [Validators.required],
+        }),
+    });
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private episodeQuery: DataEntryEpisodeIdentificationGQL,
+        private episodeMutation: DataEntryUpdateCreateEpisodeIdentificationGQL
+    ) {}
+
+    public ngOnInit(): void {
+        this.episode$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((episode) => {
+                if (!episode) {
+                    return;
+                }
+                this.form.patchValue(episode);
+            });
+
+        this.form.valueChanges
+            .pipe(
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) =>
+                    this.episodeMutation
+                        .mutate({
+                            input: {
+                                id,
+                                name: episode.name,
+                            },
+                        })
+                        .pipe(takeUntilDestroyed(this.destroyRef))
+                )
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateOrCreateEpisode?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
new file mode 100644
index 00000000..7f837108
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
@@ -0,0 +1,18 @@
+query DataEntryEpisodeIdentification($id: ID!) {
+    episode(id: $id) {
+        id
+        name
+    }
+}
+
+mutation DataEntryUpdateCreateEpisodeIdentification(
+    $input: UpdateCreateEpisodeMutationInput!
+) {
+    updateOrCreateEpisode(input: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From f110b38b94035a29bd3b25f9be74db992f17b6f4 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 20:31:28 +0200
Subject: [PATCH 241/565] Cleanup

---
 frontend/src/app/data-entry/data-entry.module.ts              | 1 -
 .../src/app/data-entry/episode-form/episode-form.component.ts | 4 ++--
 frontend/src/app/data-entry/episode-form/episode.graphql      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/data-entry.module.ts b/frontend/src/app/data-entry/data-entry.module.ts
index 4e7e3176..815915e9 100644
--- a/frontend/src/app/data-entry/data-entry.module.ts
+++ b/frontend/src/app/data-entry/data-entry.module.ts
@@ -20,7 +20,6 @@ import { EpisodeFormModule } from "./episode-form/episode-form.module";
         EpisodeFormModule,
     ],
     exports: [
-        SourcesComponent,
         AgentFormModule,
         GiftFormModule,
         LetterFormModule,
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 8f8bb00c..8f2fbebf 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntryEpisodeDetailGQL } from "generated/graphql";
+import { DataEntryEpisodeFormGQL } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
 
 @Component({
@@ -53,6 +53,6 @@ export class EpisodeFormComponent {
 
     constructor(
         private route: ActivatedRoute,
-        private episodeQuery: DataEntryEpisodeDetailGQL
+        private episodeQuery: DataEntryEpisodeFormGQL
     ) {}
 }
diff --git a/frontend/src/app/data-entry/episode-form/episode.graphql b/frontend/src/app/data-entry/episode-form/episode.graphql
index 8f1a9ad2..e9c4c380 100644
--- a/frontend/src/app/data-entry/episode-form/episode.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode.graphql
@@ -1,4 +1,4 @@
-query DataEntryEpisodeDetail($id: ID!) {
+query DataEntryEpisodeForm($id: ID!) {
     episode(id: $id) {
         id
         name

From 8fbf13d1c81df648957b3b0d0626c3879a21c90c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 21:03:13 +0200
Subject: [PATCH 242/565] Outfactor episode mutation

---
 .../episode-identification-form.component.html       |  2 +-
 .../episode-identification-form.component.ts         |  4 ++--
 .../episode-identification-form.graphql              | 12 ------------
 .../src/app/data-entry/episode-form/episode.graphql  | 12 ++++++++++++
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
index 207def4f..864a6b08 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
@@ -1,6 +1,6 @@
 <form>
     <div class="form-group">
-        <label for="episode-name">Name</label>
+        <label class="form-label" for="episode-name">Name</label>
         <p class="form-text">
             This is a name to identify the episode in the overview of the
             source. For example: "journey to Rome", "Clovis' response",
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 043cc2c1..94b74765 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeIdentificationGQL,
-    DataEntryUpdateCreateEpisodeIdentificationGQL,
+    DataEntryUpdateCreateEpisodeGQL,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -43,7 +43,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeIdentificationGQL,
-        private episodeMutation: DataEntryUpdateCreateEpisodeIdentificationGQL
+        private episodeMutation: DataEntryUpdateCreateEpisodeGQL
     ) {}
 
     public ngOnInit(): void {
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
index 7f837108..4fc6780d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
@@ -4,15 +4,3 @@ query DataEntryEpisodeIdentification($id: ID!) {
         name
     }
 }
-
-mutation DataEntryUpdateCreateEpisodeIdentification(
-    $input: UpdateCreateEpisodeMutationInput!
-) {
-    updateOrCreateEpisode(input: $input) {
-        ok
-        errors {
-            field
-            messages
-        }
-    }
-}
diff --git a/frontend/src/app/data-entry/episode-form/episode.graphql b/frontend/src/app/data-entry/episode-form/episode.graphql
index e9c4c380..8888689e 100644
--- a/frontend/src/app/data-entry/episode-form/episode.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode.graphql
@@ -9,3 +9,15 @@ query DataEntryEpisodeForm($id: ID!) {
         }
     }
 }
+
+mutation DataEntryUpdateCreateEpisode(
+    $input: UpdateCreateEpisodeMutationInput!
+) {
+    updateOrCreateEpisode(input: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From e6bbc151084fd94d881451719195e9f1b9918768 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 21:13:36 +0200
Subject: [PATCH 243/565] SourceText subform

---
 .../mutations/UpdateCreateEpisodeMutation.py  | 14 +--
 .../episode-source-text-form.component.html   | 37 ++++++++
 .../episode-source-text-form.component.scss   |  0
 ...episode-source-text-form.component.spec.ts | 21 +++++
 .../episode-source-text-form.component.ts     | 86 +++++++++++++++++++
 5 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts

diff --git a/backend/event/mutations/UpdateCreateEpisodeMutation.py b/backend/event/mutations/UpdateCreateEpisodeMutation.py
index 072454f9..b7c9c3e0 100644
--- a/backend/event/mutations/UpdateCreateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateCreateEpisodeMutation.py
@@ -2,14 +2,18 @@
 from django.core.exceptions import ObjectDoesNotExist
 from event.models import Episode
 from graphql_app.LettercraftMutation import LettercraftMutation
-from graphene_django.types import ErrorType
 
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
 class UpdateCreateEpisodeMutationInput(InputObjectType):
     id = ID()
-    name = String(required=True)
+    # TODO: figure out how to handle required fields ('name').
+    name = String()
+    book = String()
+    chapter = String()
+    page = String()
+    designators = List(NonNull(String))
 
 
 class UpdateCreateEpisodeMutation(LettercraftMutation):
@@ -29,7 +33,7 @@ def mutate(
             retrieved_object = cls.get_or_create_object(info, input)
         except ObjectDoesNotExist as e:
             error = LettercraftErrorType(field="id", messages=[str(e)])
-            return cls(ok=False, errors=[error]) # type: ignore
+            return cls(ok=False, errors=[error])  # type: ignore
 
         episode = retrieved_object.object
 
@@ -39,8 +43,8 @@ def mutate(
             error = LettercraftErrorType(
                 field=str(field), messages=["Related object cannot be found."]
             )
-            return cls(ok=False, errors=[error]) # type: ignore
+            return cls(ok=False, errors=[error])  # type: ignore
 
         episode.save()
 
-        return cls(ok=True, errors=[]) # type: ignore
+        return cls(ok=True, errors=[])  # type: ignore
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html
new file mode 100644
index 00000000..0dbf5085
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html
@@ -0,0 +1,37 @@
+<form>
+    <lc-designators-control [formControl]="form.controls.designators" />
+
+    <h3>Location</h3>
+    <p class="form-text">
+        Describe the location of this episode in the source text.
+    </p>
+    <div class="row">
+        <div class="form-group col">
+            <label class="form-label" for="book">Book</label>
+            <input
+                id="book"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.book"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="chapter">Chapter</label>
+            <input
+                id="chapter"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.chapter"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="page">Page</label>
+            <input
+                id="page"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.page"
+            />
+        </div>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
new file mode 100644
index 00000000..ed64a26e
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodeSourceTextFormComponent } from "./episode-source-text-form.component";
+
+describe("EpisodeSourceTextFormComponent", () => {
+    let component: EpisodeSourceTextFormComponent;
+    let fixture: ComponentFixture<EpisodeSourceTextFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeSourceTextFormComponent],
+        });
+        fixture = TestBed.createComponent(EpisodeSourceTextFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
new file mode 100644
index 00000000..00a6bb08
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -0,0 +1,86 @@
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryEpisodeSourceTextMentionGQL,
+    DataEntryUpdateCreateEpisodeGQL,
+} from "generated/graphql";
+import {
+    debounce,
+    debounceTime,
+    filter,
+    map,
+    Observable,
+    switchMap,
+    withLatestFrom,
+} from "rxjs";
+
+@Component({
+    selector: "lc-episode-source-text-form",
+    templateUrl: "./episode-source-text-form.component.html",
+    styleUrls: ["./episode-source-text-form.component.scss"],
+})
+export class EpisodeSourceTextFormComponent implements OnInit {
+    public id$: Observable<string> = this.route.params.pipe(
+        map((params) => params["id"])
+    );
+
+    public episode$ = this.id$.pipe(
+        switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
+        map((result) => result.data.episode)
+    );
+
+    public form = new FormGroup({
+        designators: new FormControl<string[]>([], { nonNullable: true }),
+        book: new FormControl<string>("", { nonNullable: true }),
+        chapter: new FormControl<string>("", { nonNullable: true }),
+        page: new FormControl<string>("", { nonNullable: true }),
+    });
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private episodeQuery: DataEntryEpisodeSourceTextMentionGQL,
+        private episodeMutation: DataEntryUpdateCreateEpisodeGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.episode$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((episode) => {
+                if (!episode) {
+                    return;
+                }
+                this.form.patchValue(episode);
+            });
+
+        this.form.valueChanges
+            .pipe(
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) =>
+                    this.episodeMutation.mutate({
+                        input: {
+                            id,
+                            ...episode,
+                        },
+                    })
+                )
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateOrCreateEpisode?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}

From e7e3c0ea9412e055263811a046c421bb520857ee Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 21:13:53 +0200
Subject: [PATCH 244/565] Add DataEntrySharedModule to EpisodeFormModule

---
 .../src/app/data-entry/episode-form/episode-form.module.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.module.ts b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
index 72891df9..06743a84 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.module.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
@@ -8,6 +8,7 @@ import { EpisodeLocationsFormComponent } from "./episode-locations-form/episode-
 import { EpisodeObjectsFormComponent } from "./episode-objects-form/episode-objects-form.component";
 import { SharedModule } from "@shared/shared.module";
 import { EpisodeFormComponent } from "./episode-form.component";
+import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 
 @NgModule({
     declarations: [
@@ -19,6 +20,6 @@ import { EpisodeFormComponent } from "./episode-form.component";
         EpisodeLocationsFormComponent,
         EpisodeObjectsFormComponent,
     ],
-    imports: [CommonModule, SharedModule],
+    imports: [CommonModule, SharedModule, DataEntrySharedModule],
 })
 export class EpisodeFormModule {}

From 8b643c7931506b07a2e6b9095d4d444b4faddbe7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 21:14:18 +0200
Subject: [PATCH 245/565] SourceTextMention query

---
 .../episode-source-text-mention-form.graphql             | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-mention-form.graphql

diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-mention-form.graphql b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-mention-form.graphql
new file mode 100644
index 00000000..bf14a3e4
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-mention-form.graphql
@@ -0,0 +1,9 @@
+query DataEntryEpisodeSourceTextMention($id: ID!) {
+    episode(id: $id) {
+        id
+        designators
+        book
+        chapter
+        page
+    }
+}

From 1ef1c8ede9536dafea4429fbd42186338c310353 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 9 Aug 2024 21:15:29 +0200
Subject: [PATCH 246/565] Add form text to designators control

---
 .../designators-control/designators-control.component.html     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index af069c8e..0033cb05 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -1,5 +1,8 @@
 <div class="mb-3">
     <p>Designators</p>
+    <p class="form-text">
+        What expressions are used in the text to refer to this agent?
+    </p>
     <p *ngIf="designators$.value.length === 0">
         <i>No designators added.</i>
     </p>

From bc5b18313fc846a732a0607df2453e1ffbffe09d Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 10 Aug 2024 13:11:33 +0200
Subject: [PATCH 247/565] EpisodeContentsForm

---
 .../mutations/UpdateCreateEpisodeMutation.py  | 10 ++-
 backend/event/types/EpisodeType.py            | 13 ++-
 .../episode-contents-form.component.html      | 19 ++++
 .../episode-contents-form.component.scss      |  0
 .../episode-contents-form.component.spec.ts   | 21 +++++
 .../episode-contents-form.component.ts        | 90 +++++++++++++++++++
 .../episode-contents-form.graphql             | 10 +++
 .../episode-source-text-form.component.ts     |  3 +-
 8 files changed, 160 insertions(+), 6 deletions(-)
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql

diff --git a/backend/event/mutations/UpdateCreateEpisodeMutation.py b/backend/event/mutations/UpdateCreateEpisodeMutation.py
index b7c9c3e0..d67ffe24 100644
--- a/backend/event/mutations/UpdateCreateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateCreateEpisodeMutation.py
@@ -6,19 +6,25 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
+# TODO: figure out how to handle required fields. Options:
+# - Make optional, rely on frontend validation and raise errors in backend.
+# - Always query in frontend, send along with every mutation.
+
+
 class UpdateCreateEpisodeMutationInput(InputObjectType):
     id = ID()
-    # TODO: figure out how to handle required fields ('name').
     name = String()
     book = String()
     chapter = String()
     page = String()
     designators = List(NonNull(String))
+    summary = String()
+    categories = List(NonNull(ID))
 
 
 class UpdateCreateEpisodeMutation(LettercraftMutation):
     ok = Boolean(required=True)
-    errors = List(NonNull(LettercraftErrorType))
+    errors = List(NonNull(LettercraftErrorType), required=True)
 
     django_model = Episode
 
diff --git a/backend/event/types/EpisodeType.py b/backend/event/types/EpisodeType.py
index 152586f8..3383d6e4 100644
--- a/backend/event/types/EpisodeType.py
+++ b/backend/event/types/EpisodeType.py
@@ -1,12 +1,15 @@
-from graphene import ResolveInfo
+from graphene import List, NonNull, ResolveInfo
 from graphene_django import DjangoObjectType
 from core.types.EntityDescriptionType import EntityDescriptionType
 from django.db.models import QuerySet
 
-from event.models import Episode
+from event.models import Episode, EpisodeCategory
+from event.types.EpisodeCategoryType import EpisodeCategoryType
 
 
 class EpisodeType(EntityDescriptionType, DjangoObjectType):
+    categories = List(NonNull(EpisodeCategoryType), required=True)
+
     class Meta:
         model = Episode
         fields = [
@@ -26,3 +29,9 @@ def get_queryset(
         info: ResolveInfo,
     ) -> QuerySet[Episode]:
         return queryset.all()
+
+    @staticmethod
+    def resolve_categories(
+        parent: Episode, info: ResolveInfo
+    ) -> QuerySet[EpisodeCategory]:
+        return parent.categories.all()
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
new file mode 100644
index 00000000..4e750f0f
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
@@ -0,0 +1,19 @@
+<form>
+    <div class="form-group">
+        <label for="summary" class="form-label">Summary</label>
+        <p class="form-text">Describe the events in this passage.</p>
+        <textarea
+            id="summary"
+            class="form-control"
+            [formControl]="form.controls.summary"
+        ></textarea>
+    </div>
+
+    <div class="form-group">
+        <label for="labels" class="form-label">Labels</label>
+        <p class="form-text">
+            Pick one or more labels that describe this episode.
+        </p>
+        <p>Coming soon!</p>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
new file mode 100644
index 00000000..e8fd358f
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodeContentsFormComponent } from "./episode-contents-form.component";
+
+describe("EpisodeContentsFormComponent", () => {
+    let component: EpisodeContentsFormComponent;
+    let fixture: ComponentFixture<EpisodeContentsFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeContentsFormComponent],
+        });
+        fixture = TestBed.createComponent(EpisodeContentsFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
new file mode 100644
index 00000000..3257dd63
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -0,0 +1,90 @@
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryEpisodeContentsGQL,
+    DataEntryUpdateCreateEpisodeGQL,
+} from "generated/graphql";
+import {
+    debounceTime,
+    filter,
+    map,
+    Observable,
+    switchMap,
+    withLatestFrom,
+} from "rxjs";
+
+@Component({
+    selector: "lc-episode-contents-form",
+    templateUrl: "./episode-contents-form.component.html",
+    styleUrls: ["./episode-contents-form.component.scss"],
+})
+export class EpisodeContentsFormComponent implements OnInit {
+    private id$: Observable<string> = this.route.params.pipe(
+        map((params) => params["id"])
+    );
+
+    private episode$ = this.id$.pipe(
+        switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
+        map((result) => result.data.episode)
+    );
+
+    public form = new FormGroup({
+        summary: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+        categories: new FormControl<string[]>([], {
+            nonNullable: true,
+        }),
+    });
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private episodeQuery: DataEntryEpisodeContentsGQL,
+        private episodeMutation: DataEntryUpdateCreateEpisodeGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.episode$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((episode) => {
+                if (!episode) {
+                    return;
+                }
+                this.form.patchValue({
+                    summary: episode.summary,
+                    categories: episode.categories.map((c) => c.id),
+                });
+            });
+
+        this.form.valueChanges
+            .pipe(
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) =>
+                    this.episodeMutation.mutate({
+                        input: {
+                            id,
+                            ...episode,
+                        },
+                    })
+                )
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateOrCreateEpisode?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
new file mode 100644
index 00000000..0ca2e2a4
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
@@ -0,0 +1,10 @@
+query DataEntryEpisodeContents($id: ID!) {
+    episode(id: $id) {
+        id
+        summary
+        categories {
+            id
+            
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 00a6bb08..215601a8 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -8,7 +8,6 @@ import {
     DataEntryUpdateCreateEpisodeGQL,
 } from "generated/graphql";
 import {
-    debounce,
     debounceTime,
     filter,
     map,
@@ -23,7 +22,7 @@ import {
     styleUrls: ["./episode-source-text-form.component.scss"],
 })
 export class EpisodeSourceTextFormComponent implements OnInit {
-    public id$: Observable<string> = this.route.params.pipe(
+    private id$: Observable<string> = this.route.params.pipe(
         map((params) => params["id"])
     );
 

From c5c277521dd0485d7dd469f6ab12cb29cb6bfbe6 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 10 Aug 2024 13:12:20 +0200
Subject: [PATCH 248/565] Scaffolding for M2M subforms

---
 frontend/generated/graphql.ts                 | 104 +++++++++++++++---
 frontend/generated/schema.graphql             |  20 +++-
 .../episode-agents-form.component.html        |   1 +
 .../episode-agents-form.component.scss        |   0
 .../episode-agents-form.component.spec.ts     |  21 ++++
 .../episode-agents-form.component.ts          |   8 ++
 .../episode-locations-form.component.html     |   1 +
 .../episode-locations-form.component.scss     |   0
 .../episode-locations-form.component.spec.ts  |  21 ++++
 .../episode-locations-form.component.ts       |   8 ++
 .../episode-objects-form.component.html       |   1 +
 .../episode-objects-form.component.scss       |   0
 .../episode-objects-form.component.spec.ts    |  21 ++++
 .../episode-objects-form.component.ts         |   8 ++
 14 files changed, 197 insertions(+), 17 deletions(-)
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index f4b2c666..2fca6a13 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -72,12 +72,22 @@ export type AgentDescriptionType = {
   sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
 };
 
+export type EpisodeCategoryType = {
+  __typename?: 'EpisodeCategoryType';
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+};
+
 export type EpisodeType = {
   __typename?: 'EpisodeType';
   /** agents involved in this episode */
   agents: Array<AgentDescriptionType>;
   /** The book in the source */
   book: Scalars['String']['output'];
+  categories: Array<EpisodeCategoryType>;
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   /** Longer description to help identify this object */
@@ -737,13 +747,19 @@ export type StructureType = {
 
 export type UpdateCreateEpisodeMutation = {
   __typename?: 'UpdateCreateEpisodeMutation';
-  errors?: Maybe<Array<LettercraftErrorType>>;
+  errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateCreateEpisodeMutationInput = {
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
   id?: InputMaybe<Scalars['ID']['input']>;
-  name: Scalars['String']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
+  summary?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateCreateSourceInput = {
@@ -768,6 +784,13 @@ export type DataEntryAgentQueryVariables = Exact<{
 
 export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
+export type DataEntryEpisodeContentsQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
+
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -775,12 +798,12 @@ export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
 
 export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string } | null };
 
-export type DataEntryUpdateCreateEpisodeIdentificationMutationVariables = Exact<{
-  input: UpdateCreateEpisodeMutationInput;
+export type DataEntryEpisodeSourceTextMentionQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
 }>;
 
 
-export type DataEntryUpdateCreateEpisodeIdentificationMutation = { __typename?: 'Mutation', updateOrCreateEpisode?: { __typename?: 'UpdateCreateEpisodeMutation', ok: boolean, errors?: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> | null } | null };
+export type DataEntryEpisodeSourceTextMentionQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryEpisodeFormQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -789,6 +812,13 @@ export type DataEntryEpisodeFormQueryVariables = Exact<{
 
 export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
+export type DataEntryUpdateCreateEpisodeMutationVariables = Exact<{
+  input: UpdateCreateEpisodeMutationInput;
+}>;
+
+
+export type DataEntryUpdateCreateEpisodeMutation = { __typename?: 'Mutation', updateOrCreateEpisode?: { __typename?: 'UpdateCreateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryGiftQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -842,6 +872,28 @@ export const DataEntryAgentDocument = gql`
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryEpisodeContentsDocument = gql`
+    query DataEntryEpisodeContents($id: ID!) {
+  episode(id: $id) {
+    id
+    summary
+    categories {
+      id
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
+    override document = DataEntryEpisodeContentsDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -865,14 +917,14 @@ export const DataEntryEpisodeIdentificationDocument = gql`
       super(apollo);
     }
   }
-export const DataEntryUpdateCreateEpisodeIdentificationDocument = gql`
-    mutation DataEntryUpdateCreateEpisodeIdentification($input: UpdateCreateEpisodeMutationInput!) {
-  updateOrCreateEpisode(input: $input) {
-    ok
-    errors {
-      field
-      messages
-    }
+export const DataEntryEpisodeSourceTextMentionDocument = gql`
+    query DataEntryEpisodeSourceTextMention($id: ID!) {
+  episode(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
   }
 }
     `;
@@ -880,8 +932,8 @@ export const DataEntryUpdateCreateEpisodeIdentificationDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryUpdateCreateEpisodeIdentificationGQL extends Apollo.Mutation<DataEntryUpdateCreateEpisodeIdentificationMutation, DataEntryUpdateCreateEpisodeIdentificationMutationVariables> {
-    override document = DataEntryUpdateCreateEpisodeIdentificationDocument;
+  export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
+    override document = DataEntryEpisodeSourceTextMentionDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
@@ -907,6 +959,28 @@ export const DataEntryEpisodeFormDocument = gql`
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryUpdateCreateEpisodeDocument = gql`
+    mutation DataEntryUpdateCreateEpisode($input: UpdateCreateEpisodeMutationInput!) {
+  updateOrCreateEpisode(input: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateCreateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateCreateEpisodeMutation, DataEntryUpdateCreateEpisodeMutationVariables> {
+    override document = DataEntryUpdateCreateEpisodeDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index a181e513..434a71d2 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -70,12 +70,22 @@ type AgentDescriptionType {
   sourceMention: PersonAgentDescriptionSourceMentionChoices
 }
 
+type EpisodeCategoryType {
+  """Longer description to help identify this object"""
+  description: String!
+  id: ID!
+
+  """A name to help identify this object"""
+  name: String!
+}
+
 type EpisodeType {
   """agents involved in this episode"""
   agents: [AgentDescriptionType!]!
 
   """The book in the source"""
   book: String!
+  categories: [EpisodeCategoryType!]!
 
   """The chapter or chapters in the source"""
   chapter: String!
@@ -792,13 +802,19 @@ type StructureType {
 }
 
 type UpdateCreateEpisodeMutation {
-  errors: [LettercraftErrorType!]
+  errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
 
 input UpdateCreateEpisodeMutationInput {
+  book: String
+  categories: [ID!]
+  chapter: String
+  designators: [String!]
   id: ID
-  name: String!
+  name: String
+  page: String
+  summary: String
 }
 
 input UpdateCreateSourceInput {
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
new file mode 100644
index 00000000..fa1af9a6
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -0,0 +1 @@
+<p>episode-agents-form works!</p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
new file mode 100644
index 00000000..d2e1e89a
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodeAgentsFormComponent } from "./episode-agents-form.component";
+
+describe("EpisodeAgentsFormComponent", () => {
+    let component: EpisodeAgentsFormComponent;
+    let fixture: ComponentFixture<EpisodeAgentsFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeAgentsFormComponent],
+        });
+        fixture = TestBed.createComponent(EpisodeAgentsFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
new file mode 100644
index 00000000..4e157701
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -0,0 +1,8 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "lc-episode-agents-form",
+    templateUrl: "./episode-agents-form.component.html",
+    styleUrls: ["./episode-agents-form.component.scss"],
+})
+export class EpisodeAgentsFormComponent {}
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
new file mode 100644
index 00000000..dd15691d
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
@@ -0,0 +1 @@
+<p>episode-locations-form works!</p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
new file mode 100644
index 00000000..24ca4814
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodeLocationsFormComponent } from "./episode-locations-form.component";
+
+describe("EpisodeLocationsFormComponent", () => {
+    let component: EpisodeLocationsFormComponent;
+    let fixture: ComponentFixture<EpisodeLocationsFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeLocationsFormComponent],
+        });
+        fixture = TestBed.createComponent(EpisodeLocationsFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts
new file mode 100644
index 00000000..78ce037b
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts
@@ -0,0 +1,8 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "lc-episode-locations-form",
+    templateUrl: "./episode-locations-form.component.html",
+    styleUrls: ["./episode-locations-form.component.scss"],
+})
+export class EpisodeLocationsFormComponent {}
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
new file mode 100644
index 00000000..38bae3f4
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
@@ -0,0 +1 @@
+<p>episode-objects-form works!</p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
new file mode 100644
index 00000000..9b573cb7
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EpisodeObjectsFormComponent } from "./episode-objects-form.component";
+
+describe("EpisodeObjectsFormComponent", () => {
+    let component: EpisodeObjectsFormComponent;
+    let fixture: ComponentFixture<EpisodeObjectsFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeObjectsFormComponent],
+        });
+        fixture = TestBed.createComponent(EpisodeObjectsFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts
new file mode 100644
index 00000000..d525c0ff
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts
@@ -0,0 +1,8 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "lc-episode-objects-form",
+    templateUrl: "./episode-objects-form.component.html",
+    styleUrls: ["./episode-objects-form.component.scss"],
+})
+export class EpisodeObjectsFormComponent {}

From ca32fff0377770452defbde98401423e49a6a6b5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 10 Aug 2024 16:58:21 +0200
Subject: [PATCH 249/565] Subform headers

---
 .../episode-agents-form.component.html               |  2 +-
 .../episode-contents-form.component.html             |  2 +-
 .../episode-form/episode-form.component.html         | 12 ++++++------
 .../episode-locations-form.component.html            |  2 +-
 .../episode-objects-form.component.html              |  2 +-
 frontend/src/styles.scss                             |  4 ++++
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index fa1af9a6..ce59c301 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -1 +1 @@
-<p>episode-agents-form works!</p>
+<p><i>Coming soon!</i></p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
index 4e750f0f..b17e1de9 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
@@ -14,6 +14,6 @@
         <p class="form-text">
             Pick one or more labels that describe this episode.
         </p>
-        <p>Coming soon!</p>
+        <p><i>Coming soon!</i></p>
     </div>
 </form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index f324a911..701a9850 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -19,22 +19,22 @@ <h1 class="mb-4">
     </h1>
 </ng-template>
 
-<h2>Identification</h2>
+<h2 class="subform-header">Identification</h2>
 <lc-episode-identification-form />
 
-<h2>Source text</h2>
+<h2 class="subform-header">Source text</h2>
 <lc-episode-source-text-form />
 
-<h2>Contents</h2>
+<h2 class="subform-header">Contents</h2>
 <lc-episode-contents-form />
 
-<h2>Agents</h2>
+<h2 class="subform-header">Agents</h2>
 <lc-episode-agents-form />
 
-<h2>Locations</h2>
+<h2 class="subform-header">Locations</h2>
 <lc-episode-locations-form />
 
-<h2>Objects</h2>
+<h2 class="subform-header">Objects</h2>
 <lc-episode-objects-form />
 
 <ng-template #loading>
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
index dd15691d..ce59c301 100644
--- a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
@@ -1 +1 @@
-<p>episode-locations-form works!</p>
+<p><i>Coming soon!</i></p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
index 38bae3f4..ce59c301 100644
--- a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
@@ -1 +1 @@
-<p>episode-objects-form works!</p>
+<p><i>Coming soon!</i></p>
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index c3cf2744..bc422cf2 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -29,3 +29,7 @@
         content: ",\00A0";
     }
 }
+
+.subform-header {
+    margin-top: 1.5rem;
+}

From 12db3c6b3f806f29dae75c5a65d4d56513e97e85 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 10 Aug 2024 17:27:38 +0200
Subject: [PATCH 250/565] Fix tests

---
 backend/graphql_app/LettercraftMutation.py                     | 2 +-
 .../episode-agents-form/episode-agents-form.component.spec.ts  | 2 ++
 .../episode-contents-form.component.spec.ts                    | 2 ++
 .../app/data-entry/episode-form/episode-form.component.spec.ts | 3 +++
 .../episode-identification-form.component.spec.ts              | 2 ++
 .../episode-locations-form.component.spec.ts                   | 2 ++
 .../episode-objects-form.component.spec.ts                     | 2 ++
 .../episode-source-text-form.component.spec.ts                 | 2 ++
 frontend/src/app/shared/shared-testing.module.ts               | 3 +++
 9 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/backend/graphql_app/LettercraftMutation.py b/backend/graphql_app/LettercraftMutation.py
index 1be48af7..2949cd59 100644
--- a/backend/graphql_app/LettercraftMutation.py
+++ b/backend/graphql_app/LettercraftMutation.py
@@ -35,7 +35,7 @@ def get_or_create_object(
 
         Exceptions:
             - ImproperlyConfigured is raised in two cases:
-                1. when the mutation class implementing DiappMutation does not have the required class field 'django_model' defined;
+                1. when the mutation class implementing LettercraftMutation does not have the required class field 'django_model' defined;
                 2. when the corresponding Graphene type cannot be found. This exception should not be caught.
             - ObjectDoesNotExist is raised when an ID is provided but the corresponding object is not found or inaccessible to the user making the request.
         """
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
index d2e1e89a..18ab6a8b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeAgentsFormComponent } from "./episode-agents-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("EpisodeAgentsFormComponent", () => {
     let component: EpisodeAgentsFormComponent;
@@ -9,6 +10,7 @@ describe("EpisodeAgentsFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeAgentsFormComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodeAgentsFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
index e8fd358f..a37f3965 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeContentsFormComponent } from "./episode-contents-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("EpisodeContentsFormComponent", () => {
     let component: EpisodeContentsFormComponent;
@@ -9,6 +10,7 @@ describe("EpisodeContentsFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeContentsFormComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodeContentsFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts
index 2eb99e2a..cae14fa3 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.spec.ts
@@ -1,6 +1,8 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeFormComponent } from "./episode-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { EpisodeFormModule } from "./episode-form.module";
 
 describe("EpisodeFormComponent", () => {
     let component: EpisodeFormComponent;
@@ -9,6 +11,7 @@ describe("EpisodeFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeFormComponent],
+            imports: [SharedTestingModule, EpisodeFormModule],
         });
         fixture = TestBed.createComponent(EpisodeFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
index f2f1c129..f522e5cd 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeIdentificationFormComponent } from "./episode-identification-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("EpisodeIdentificationFormComponent", () => {
     let component: EpisodeIdentificationFormComponent;
@@ -9,6 +10,7 @@ describe("EpisodeIdentificationFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeIdentificationFormComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodeIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
index 24ca4814..2b27207c 100644
--- a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeLocationsFormComponent } from "./episode-locations-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("EpisodeLocationsFormComponent", () => {
     let component: EpisodeLocationsFormComponent;
@@ -9,6 +10,7 @@ describe("EpisodeLocationsFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeLocationsFormComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodeLocationsFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
index 9b573cb7..78fef072 100644
--- a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeObjectsFormComponent } from "./episode-objects-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("EpisodeObjectsFormComponent", () => {
     let component: EpisodeObjectsFormComponent;
@@ -9,6 +10,7 @@ describe("EpisodeObjectsFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeObjectsFormComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodeObjectsFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
index ed64a26e..cdeea205 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeSourceTextFormComponent } from "./episode-source-text-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("EpisodeSourceTextFormComponent", () => {
     let component: EpisodeSourceTextFormComponent;
@@ -9,6 +10,7 @@ describe("EpisodeSourceTextFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeSourceTextFormComponent],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodeSourceTextFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/shared/shared-testing.module.ts b/frontend/src/app/shared/shared-testing.module.ts
index 36372c0a..a8f7377a 100644
--- a/frontend/src/app/shared/shared-testing.module.ts
+++ b/frontend/src/app/shared/shared-testing.module.ts
@@ -4,6 +4,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { SharedModule } from './shared.module';
 import { ApolloTestingModule } from 'apollo-angular/testing';
+import { DataEntrySharedModule } from '../data-entry/shared/data-entry-shared.module';
 
 
 @NgModule({
@@ -12,12 +13,14 @@ import { ApolloTestingModule } from 'apollo-angular/testing';
         HttpClientTestingModule,
         NoopAnimationsModule,
         RouterTestingModule,
+        DataEntrySharedModule
     ], exports: [
         SharedModule,
         HttpClientTestingModule,
         NoopAnimationsModule,
         RouterTestingModule,
         ApolloTestingModule,
+        DataEntrySharedModule,
     ]
 })
 export class SharedTestingModule { }

From 99a58aac70d5521d09d4761dd24c92ada422ae6e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 10 Aug 2024 17:29:17 +0200
Subject: [PATCH 251/565] Update designators form text

---
 .../designators-control/designators-control.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index 0033cb05..d4b464d4 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -1,7 +1,7 @@
 <div class="mb-3">
     <p>Designators</p>
     <p class="form-text">
-        What expressions are used in the text to refer to this agent?
+        What expressions are used in the text to refer to this entity?
     </p>
     <p *ngIf="designators$.value.length === 0">
         <i>No designators added.</i>

From 7e9e91bcc3db45518d74a5f4f85bc78ffeccc79b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 13 Aug 2024 14:31:39 +0200
Subject: [PATCH 252/565] make contributors list nonnullable

---
 backend/core/types/EntityDescriptionType.py |  4 ++--
 backend/core/types/HistoricalEntityType.py  |  6 +++++-
 backend/user/queries.py                     |  4 +---
 frontend/generated/graphql.ts               | 10 +++++-----
 frontend/generated/schema.graphql           | 10 +++++-----
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index 06f0e466..ec9c2fa8 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,7 +1,7 @@
 from core.models import EntityDescription
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
-from graphene import List, ResolveInfo
+from graphene import List, ResolveInfo, NonNull
 from django.db.models import QuerySet
 
 from user.models import User
@@ -13,7 +13,7 @@ class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
     Should not be queried directly, but should be extended by other types.
     """
 
-    contributors = List(UserType)
+    contributors = List(NonNull(UserType), required=True)
 
     class Meta:
         model = EntityDescription
diff --git a/backend/core/types/HistoricalEntityType.py b/backend/core/types/HistoricalEntityType.py
index 8e14a7fe..ccf1a4e6 100644
--- a/backend/core/types/HistoricalEntityType.py
+++ b/backend/core/types/HistoricalEntityType.py
@@ -1,8 +1,9 @@
-from graphene import Boolean, ObjectType
+from graphene import List, NonNull
 
 from core.models import HistoricalEntity
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
+from user.types.UserType import UserType
 
 
 class HistoricalEntityType(NamedType, AbstractDjangoObjectType):
@@ -11,8 +12,11 @@ class HistoricalEntityType(NamedType, AbstractDjangoObjectType):
     Should not be queried directly, but should be extended by other types.
     """
 
+    contributors = List(NonNull(UserType), required=True)
+
     class Meta:
         model = HistoricalEntity
         fields = [
             "identifiable",
+            "contributors",
         ] + NamedType.fields()
diff --git a/backend/user/queries.py b/backend/user/queries.py
index 7fe69229..6122d999 100644
--- a/backend/user/queries.py
+++ b/backend/user/queries.py
@@ -1,9 +1,7 @@
 from graphene import Field, List, ResolveInfo
-from graphene_django import DjangoObjectType
-
 from django.db.models import QuerySet
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
-from django.db.models import QuerySet, Q
+from django.db.models import QuerySet
 from user.types.UserType import UserType
 from user.models import User
 
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index f813ee97..b21059a2 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -51,7 +51,7 @@ export type AgentDescriptionType = {
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
-  contributors?: Maybe<Array<Maybe<UserType>>>;
+  contributors: Array<UserType>;
   describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
@@ -81,7 +81,7 @@ export type EpisodeType = {
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
-  contributors?: Maybe<Array<Maybe<UserType>>>;
+  contributors: Array<UserType>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
@@ -143,7 +143,7 @@ export type GiftDescriptionType = {
   categorisations: Array<GiftDescriptionCategoryType>;
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
-  contributors?: Maybe<Array<Maybe<UserType>>>;
+  contributors: Array<UserType>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
@@ -200,7 +200,7 @@ export type LetterDescriptionType = {
   categorisations: Array<LetterDescriptionCategoryType>;
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
-  contributors?: Maybe<Array<Maybe<UserType>>>;
+  contributors: Array<UserType>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
@@ -599,7 +599,7 @@ export type SpaceDescriptionType = {
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
-  contributors?: Maybe<Array<Maybe<UserType>>>;
+  contributors: Array<UserType>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 4ac838bf..9da98467 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -40,7 +40,7 @@ type AgentDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
-  contributors: [UserType]
+  contributors: [UserType!]!
   describes: [HistoricalPersonType]
 
   """Longer description to help identify this object"""
@@ -80,7 +80,7 @@ type EpisodeType {
 
   """The chapter or chapters in the source"""
   chapter: String!
-  contributors: [UserType]
+  contributors: [UserType!]!
 
   """Longer description to help identify this object"""
   description: String!
@@ -157,7 +157,7 @@ type GiftDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
-  contributors: [UserType]
+  contributors: [UserType!]!
 
   """Longer description to help identify this object"""
   description: String!
@@ -227,7 +227,7 @@ type LetterDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
-  contributors: [UserType]
+  contributors: [UserType!]!
 
   """Longer description to help identify this object"""
   description: String!
@@ -625,7 +625,7 @@ type SpaceDescriptionType {
 
   """The chapter or chapters in the source"""
   chapter: String!
-  contributors: [UserType]
+  contributors: [UserType!]!
 
   """Longer description to help identify this object"""
   description: String!

From bc7c59f7dcecccb5ec26054243e70029f11a62a7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 14 Aug 2024 14:21:32 +0200
Subject: [PATCH 253/565] Convert UpdateCreateEpisodeMutation to
 UpdateEpisodeMutation

---
 ...deMutation.py => UpdateEpisodeMutation.py} | 15 ++----
 backend/graphql_app/schema.py                 |  8 ++--
 frontend/generated/graphql.ts                 | 46 +++++++++----------
 frontend/generated/schema.graphql             | 24 +++++-----
 .../episode-contents-form.component.ts        |  6 +--
 .../episode-identification-form.component.ts  |  6 +--
 .../episode-source-text-form.component.ts     |  6 +--
 .../data-entry/episode-form/episode.graphql   |  6 +--
 8 files changed, 56 insertions(+), 61 deletions(-)
 rename backend/event/mutations/{UpdateCreateEpisodeMutation.py => UpdateEpisodeMutation.py} (73%)

diff --git a/backend/event/mutations/UpdateCreateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
similarity index 73%
rename from backend/event/mutations/UpdateCreateEpisodeMutation.py
rename to backend/event/mutations/UpdateEpisodeMutation.py
index d67ffe24..02033023 100644
--- a/backend/event/mutations/UpdateCreateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -6,12 +6,7 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
-# TODO: figure out how to handle required fields. Options:
-# - Make optional, rely on frontend validation and raise errors in backend.
-# - Always query in frontend, send along with every mutation.
-
-
-class UpdateCreateEpisodeMutationInput(InputObjectType):
+class UpdateEpisodeMutationInput(InputObjectType):
     id = ID()
     name = String()
     book = String()
@@ -22,19 +17,17 @@ class UpdateCreateEpisodeMutationInput(InputObjectType):
     categories = List(NonNull(ID))
 
 
-class UpdateCreateEpisodeMutation(LettercraftMutation):
+class UpdateEpisodeMutation(LettercraftMutation):
     ok = Boolean(required=True)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     django_model = Episode
 
     class Arguments:
-        input = UpdateCreateEpisodeMutationInput(required=True)
+        input = UpdateEpisodeMutationInput(required=True)
 
     @classmethod
-    def mutate(
-        cls, root: None, info: ResolveInfo, input: UpdateCreateEpisodeMutationInput
-    ):
+    def mutate(cls, root: None, info: ResolveInfo, input: UpdateEpisodeMutationInput):
         try:
             retrieved_object = cls.get_or_create_object(info, input)
         except ObjectDoesNotExist as e:
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 81dc0dc6..6d5cbde7 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -6,16 +6,18 @@
 from source.queries import SourceQueries
 from space.queries import SpaceQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
-from event.mutations.UpdateCreateEpisodeMutation import UpdateCreateEpisodeMutation
+from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
 
 
-class Query(SourceQueries, PersonQueries, EventQueries, LetterQueries, SpaceQueries, ObjectType):
+class Query(
+    SourceQueries, PersonQueries, EventQueries, LetterQueries, SpaceQueries, ObjectType
+):
     pass
 
 
 class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
-    update_or_create_episode = UpdateCreateEpisodeMutation.Field()
+    update_episode = UpdateEpisodeMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 2fca6a13..97267e92 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -283,13 +283,13 @@ export type LettercraftErrorType = {
 
 export type Mutation = {
   __typename?: 'Mutation';
-  updateOrCreateEpisode?: Maybe<UpdateCreateEpisodeMutation>;
+  updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
 };
 
 
-export type MutationUpdateOrCreateEpisodeArgs = {
-  input: UpdateCreateEpisodeMutationInput;
+export type MutationUpdateEpisodeArgs = {
+  input: UpdateEpisodeMutationInput;
 };
 
 
@@ -745,13 +745,22 @@ export type StructureType = {
   settlement?: Maybe<SettlementType>;
 };
 
-export type UpdateCreateEpisodeMutation = {
-  __typename?: 'UpdateCreateEpisodeMutation';
+export type UpdateCreateSourceInput = {
+  editionAuthor?: InputMaybe<Scalars['String']['input']>;
+  editionTitle?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  medievalAuthor?: InputMaybe<Scalars['String']['input']>;
+  medievalTitle?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
+};
+
+export type UpdateEpisodeMutation = {
+  __typename?: 'UpdateEpisodeMutation';
   errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
 
-export type UpdateCreateEpisodeMutationInput = {
+export type UpdateEpisodeMutationInput = {
   book?: InputMaybe<Scalars['String']['input']>;
   categories?: InputMaybe<Array<Scalars['ID']['input']>>;
   chapter?: InputMaybe<Scalars['String']['input']>;
@@ -762,15 +771,6 @@ export type UpdateCreateEpisodeMutationInput = {
   summary?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type UpdateCreateSourceInput = {
-  editionAuthor?: InputMaybe<Scalars['String']['input']>;
-  editionTitle?: InputMaybe<Scalars['String']['input']>;
-  id?: InputMaybe<Scalars['ID']['input']>;
-  medievalAuthor?: InputMaybe<Scalars['String']['input']>;
-  medievalTitle?: InputMaybe<Scalars['String']['input']>;
-  name: Scalars['String']['input'];
-};
-
 export type UpdateOrCreateSourceMutation = {
   __typename?: 'UpdateOrCreateSourceMutation';
   errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
@@ -812,12 +812,12 @@ export type DataEntryEpisodeFormQueryVariables = Exact<{
 
 export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
-export type DataEntryUpdateCreateEpisodeMutationVariables = Exact<{
-  input: UpdateCreateEpisodeMutationInput;
+export type DataEntryUpdateEpisodeMutationVariables = Exact<{
+  input: UpdateEpisodeMutationInput;
 }>;
 
 
-export type DataEntryUpdateCreateEpisodeMutation = { __typename?: 'Mutation', updateOrCreateEpisode?: { __typename?: 'UpdateCreateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateEpisodeMutation = { __typename?: 'Mutation', updateEpisode?: { __typename?: 'UpdateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryGiftQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -963,9 +963,9 @@ export const DataEntryEpisodeFormDocument = gql`
       super(apollo);
     }
   }
-export const DataEntryUpdateCreateEpisodeDocument = gql`
-    mutation DataEntryUpdateCreateEpisode($input: UpdateCreateEpisodeMutationInput!) {
-  updateOrCreateEpisode(input: $input) {
+export const DataEntryUpdateEpisodeDocument = gql`
+    mutation DataEntryUpdateEpisode($input: UpdateEpisodeMutationInput!) {
+  updateEpisode(input: $input) {
     ok
     errors {
       field
@@ -978,8 +978,8 @@ export const DataEntryUpdateCreateEpisodeDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryUpdateCreateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateCreateEpisodeMutation, DataEntryUpdateCreateEpisodeMutationVariables> {
-    override document = DataEntryUpdateCreateEpisodeDocument;
+  export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
+    override document = DataEntryUpdateEpisodeDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 434a71d2..0e1be1b7 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -326,7 +326,7 @@ type LettercraftErrorType {
 }
 
 type Mutation {
-  updateOrCreateEpisode(input: UpdateCreateEpisodeMutationInput!): UpdateCreateEpisodeMutation
+  updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
   updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
 }
 
@@ -801,12 +801,21 @@ type StructureType {
   settlement: SettlementType
 }
 
-type UpdateCreateEpisodeMutation {
+input UpdateCreateSourceInput {
+  editionAuthor: String
+  editionTitle: String
+  id: ID
+  medievalAuthor: String
+  medievalTitle: String
+  name: String!
+}
+
+type UpdateEpisodeMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
 
-input UpdateCreateEpisodeMutationInput {
+input UpdateEpisodeMutationInput {
   book: String
   categories: [ID!]
   chapter: String
@@ -817,15 +826,6 @@ input UpdateCreateEpisodeMutationInput {
   summary: String
 }
 
-input UpdateCreateSourceInput {
-  editionAuthor: String
-  editionTitle: String
-  id: ID
-  medievalAuthor: String
-  medievalTitle: String
-  name: String!
-}
-
 type UpdateOrCreateSourceMutation {
   errors: [String]
   source: SourceType
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index 3257dd63..38f5176a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeContentsGQL,
-    DataEntryUpdateCreateEpisodeGQL,
+    DataEntryUpdateEpisodeGQL,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -45,7 +45,7 @@ export class EpisodeContentsFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeContentsGQL,
-        private episodeMutation: DataEntryUpdateCreateEpisodeGQL
+        private episodeMutation: DataEntryUpdateEpisodeGQL
     ) {}
 
     ngOnInit(): void {
@@ -77,7 +77,7 @@ export class EpisodeContentsFormComponent implements OnInit {
                 )
             )
             .subscribe((result) => {
-                const errors = result.data?.updateOrCreateEpisode?.errors;
+                const errors = result.data?.updateEpisode?.errors;
                 if (errors && errors.length > 0) {
                     this.toastService.show({
                         body: errors.map((error) => error.messages).join("\n"),
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 94b74765..2c8122b2 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeIdentificationGQL,
-    DataEntryUpdateCreateEpisodeGQL,
+    DataEntryUpdateEpisodeGQL,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -43,7 +43,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeIdentificationGQL,
-        private episodeMutation: DataEntryUpdateCreateEpisodeGQL
+        private episodeMutation: DataEntryUpdateEpisodeGQL
     ) {}
 
     public ngOnInit(): void {
@@ -74,7 +74,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 )
             )
             .subscribe((result) => {
-                const errors = result.data?.updateOrCreateEpisode?.errors;
+                const errors = result.data?.updateEpisode?.errors;
                 if (errors && errors.length > 0) {
                     this.toastService.show({
                         body: errors.map((error) => error.messages).join("\n"),
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 215601a8..c645e360 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeSourceTextMentionGQL,
-    DataEntryUpdateCreateEpisodeGQL,
+    DataEntryUpdateEpisodeGQL,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -43,7 +43,7 @@ export class EpisodeSourceTextFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeSourceTextMentionGQL,
-        private episodeMutation: DataEntryUpdateCreateEpisodeGQL
+        private episodeMutation: DataEntryUpdateEpisodeGQL
     ) {}
 
     ngOnInit(): void {
@@ -72,7 +72,7 @@ export class EpisodeSourceTextFormComponent implements OnInit {
                 )
             )
             .subscribe((result) => {
-                const errors = result.data?.updateOrCreateEpisode?.errors;
+                const errors = result.data?.updateEpisode?.errors;
                 if (errors && errors.length > 0) {
                     this.toastService.show({
                         body: errors.map((error) => error.messages).join("\n"),
diff --git a/frontend/src/app/data-entry/episode-form/episode.graphql b/frontend/src/app/data-entry/episode-form/episode.graphql
index 8888689e..a10b0db3 100644
--- a/frontend/src/app/data-entry/episode-form/episode.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode.graphql
@@ -10,10 +10,10 @@ query DataEntryEpisodeForm($id: ID!) {
     }
 }
 
-mutation DataEntryUpdateCreateEpisode(
-    $input: UpdateCreateEpisodeMutationInput!
+mutation DataEntryUpdateEpisode(
+    $input: UpdateEpisodeMutationInput!
 ) {
-    updateOrCreateEpisode(input: $input) {
+    updateEpisode(input: $input) {
         ok
         errors {
             field

From 4bf775d7abfe13df11c7629228bc4559a3566cbb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 14 Aug 2024 14:24:23 +0200
Subject: [PATCH 254/565] Make ID required on update

---
 backend/event/mutations/UpdateEpisodeMutation.py | 2 +-
 frontend/generated/graphql.ts                    | 2 +-
 frontend/generated/schema.graphql                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index 02033023..a3537f39 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -7,7 +7,7 @@
 
 
 class UpdateEpisodeMutationInput(InputObjectType):
-    id = ID()
+    id = ID(required=True)
     name = String()
     book = String()
     chapter = String()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 97267e92..b7cc9120 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -765,7 +765,7 @@ export type UpdateEpisodeMutationInput = {
   categories?: InputMaybe<Array<Scalars['ID']['input']>>;
   chapter?: InputMaybe<Scalars['String']['input']>;
   designators?: InputMaybe<Array<Scalars['String']['input']>>;
-  id?: InputMaybe<Scalars['ID']['input']>;
+  id: Scalars['ID']['input'];
   name?: InputMaybe<Scalars['String']['input']>;
   page?: InputMaybe<Scalars['String']['input']>;
   summary?: InputMaybe<Scalars['String']['input']>;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 0e1be1b7..792811f4 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -820,7 +820,7 @@ input UpdateEpisodeMutationInput {
   categories: [ID!]
   chapter: String
   designators: [String!]
-  id: ID
+  id: ID!
   name: String
   page: String
   summary: String

From 0ca8372fa4ae42c1668dfce240cbfa3221a208d0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 14 Aug 2024 14:45:16 +0200
Subject: [PATCH 255/565] Flip disable and enable

---
 .../data-entry/shared/label-select/label-select.component.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.ts b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
index 4afd1c5f..61892e90 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
@@ -56,9 +56,9 @@ export class LabelSelectComponent implements ControlValueAccessor {
 
     public setDisabledState?(isDisabled: boolean): void {
         if (isDisabled) {
-            this.control.enable();
-        } else {
             this.control.disable();
+        } else {
+            this.control.enable();
         }
     }
 }

From 58578704ac5b4d68227eba33cc876b15c8aad5c0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 14 Aug 2024 15:10:30 +0200
Subject: [PATCH 256/565] Remove click-to-delete

---
 .../label-select/label-select.component.html  | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.html b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
index 1cbfdef3..01370fb0 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.html
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
@@ -1,19 +1,32 @@
-<p>Selected labels (click to remove):</p>
+<p>Selected labels:</p>
 <ul class="ps-0">
     <ng-container *ngIf="selectedLabels().length > 0; else noLabels">
-        <li *ngFor="let label of selectedLabels()" class="badge rounded-pill">
-            <button class="btn text-bg-primary" type="button" (click)="removeLabel(label.value)">
-                <span>{{ label.label }}</span>
-                <lc-icon [icon]="actionIcons.cancel" class="ms-2" />
+        <li
+            *ngFor="let label of selectedLabels()"
+            class="badge rounded-pill text-bg-primary me-2 fs-6 fw-normal d-flex-inline align-items-center"
+        >
+            <span class="ms-1">{{ label.label }}</span>
+            <button
+                class="btn btn-sm btn-primary"
+                type="button"
+                [attr.aria-label]="'remove ' + label.label"
+                (click)="removeLabel(label.value)"
+            >
+                <lc-icon [icon]="actionIcons.cancel" />
             </button>
         </li>
     </ng-container>
     <ng-template #noLabels>
-        <p>No labels selected</p>
+        <p><i>No labels selected</i></p>
     </ng-template>
 </ul>
 
 <form>
     <label for="label-select" class="form-label">Pick a label</label>
-    <lc-multiselect id="label-select" [options]="options" [formControl]="control" placeholderEmpty="Select a label from the list below." />
+    <lc-multiselect
+        id="label-select"
+        [options]="options"
+        [formControl]="control"
+        placeholderEmpty="Select a label from the list below."
+    />
 </form>

From 0340fd82caabc3d9df6eca0e46e4b1bf86c6737b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 14 Aug 2024 16:21:04 +0200
Subject: [PATCH 257/565] Refactor multiselect to ngbDropdown

---
 .../label-select/label-select.component.html  |  5 +-
 .../multiselect/multiselect.component.html    | 56 ++++++++++---------
 .../multiselect/multiselect.component.ts      |  6 +-
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.html b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
index 01370fb0..60ed29f7 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.html
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
@@ -7,7 +7,7 @@
         >
             <span class="ms-1">{{ label.label }}</span>
             <button
-                class="btn btn-sm btn-primary"
+                class="btn btn-sm btn-primary py-0 px-1 ms-1"
                 type="button"
                 [attr.aria-label]="'remove ' + label.label"
                 (click)="removeLabel(label.value)"
@@ -27,6 +27,7 @@
         id="label-select"
         [options]="options"
         [formControl]="control"
-        placeholderEmpty="Select a label from the list below."
+        [showSelected]="true"
+        placeholderEmpty="Select a label"
     />
 </form>
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
index f9f7f872..f8bd9a25 100644
--- a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.html
@@ -1,27 +1,31 @@
-<select
-    *ngIf="visibleOptions() as options"
-    class="form-select"
-    [title]="placeholderEmpty"
-    aria-multiselectable="true"
-    tabindex="0"
-    [disabled]="disabled"
->
-    <ng-container *ngIf="options.length > 0; else noOptions">
-        <option class="visually-hidden" [attr.aria-disabled]="true">
-            {{ placeholderEmpty }}
-        </option>
-    </ng-container>
-    <ng-template #noOptions>
-        <option class="visually-hidden" [attr.aria-disabled]="true">
-            {{ noAvailableOptions }}
-        </option>
-    </ng-template>
-    <option
-        *ngFor="let option of options; let i = index; trackBy: trackById"
-        (click)="selectOption(option)"
-        [attr.aria-selected]="selectedOptions().includes(option.value)"
-        tabindex="1"
+<div *ngIf="visibleOptions() as options" ngbDropdown>
+    <button
+        class="btn btn-primary"
+        id="labels-menu"
+        type="button"
+        ngbDropdownToggle
     >
-        <span>{{ option.label }}</span>
-    </option>
-</select>
+        {{ placeholderEmpty }}
+    </button>
+    <div aria-labelledby="labels-menu" ngbDropdownMenu>
+        <ng-container *ngIf="options.length > 0; else noOptions">
+            <button
+                *ngFor="
+                    let option of options;
+                    let i = index;
+                    trackBy: trackById
+                "
+                (click)="selectOption(option)"
+                [disabled]="selectedOptions().includes(option.value)"
+                ngbDropdownItem
+            >
+                {{ option.label }}
+            </button>
+        </ng-container>
+        <ng-template #noOptions>
+            <button ngbDropdownItem disabled>
+                {{ noAvailableOptions }}
+            </button>
+        </ng-template>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
index 4908381b..6b75cbba 100644
--- a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
@@ -1,5 +1,6 @@
-import { Component, forwardRef, Input, signal, computed } from "@angular/core";
+import { Component, forwardRef, Input, signal, computed, ViewChild, ElementRef } from "@angular/core";
 import { NG_VALUE_ACCESSOR, ControlValueAccessor } from "@angular/forms";
+import { NgbDropdownToggle } from "@ng-bootstrap/ng-bootstrap";
 
 export interface MultiselectOption {
     value: string;
@@ -26,6 +27,7 @@ export class MultiselectComponent implements ControlValueAccessor {
     // A placeholder to be shown when nothing has been selected.
     @Input() placeholderEmpty = "Select an option from the list below...";
     @Input() noAvailableOptions = "No options available";
+    @ViewChild(NgbDropdownToggle) toggler: NgbDropdownToggle | null = null;
 
     public selectedOptions = signal<string[]>([]);
     public disabled = false;
@@ -54,6 +56,8 @@ export class MultiselectComponent implements ControlValueAccessor {
         // Propagate change to parent component.
         this.onChange?.(selectedIds);
         this.onTouched?.();
+        // Keeps the focus on the toggler after selecting an option.
+        this.toggler?.nativeElement.focus();
     }
 
     public trackById(_index: number, option: MultiselectOption): string {

From d56d827dba2b578792e0b8850d457987e1923354 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 15 Aug 2024 08:49:13 +0200
Subject: [PATCH 258/565] Added CreateEpisode mutation

---
 .../event/mutations/CreateEpisodeMutation.py  | 36 +++++++++++++++++++
 backend/graphql_app/schema.py                 |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 backend/event/mutations/CreateEpisodeMutation.py

diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
new file mode 100644
index 00000000..7e97f296
--- /dev/null
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -0,0 +1,36 @@
+from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo, String
+
+from event.models import Episode
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from source.models import Source
+
+
+class CreateEpisodeMutationInput(InputObjectType):
+    name = String(required=True)
+    source = ID(required=True)
+
+
+class CreateEpisodeMutation(LettercraftMutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = Episode
+
+    class Arguments:
+        input = CreateEpisodeMutationInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, input: CreateEpisodeMutationInput):
+        try:
+            source = Source.objects.get(id=getattr(input, "source"))
+        except Source.DoesNotExist:
+            error = LettercraftErrorType(field="source", messages=["Source not found."])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        Episode.objects.create(
+            name=getattr(input, "name"),
+            source=source,
+        )
+
+        return cls(ok=True)  # type: ignore
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 6d5cbde7..623358c4 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -1,5 +1,6 @@
 from graphene import ObjectType, Schema
 
+from event.mutations.CreateEpisodeMutation import CreateEpisodeMutation
 from event.queries import EventQueries
 from letter.queries import LetterQueries
 from person.queries import PersonQueries
@@ -18,6 +19,7 @@ class Query(
 class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
     update_episode = UpdateEpisodeMutation.Field()
+    create_episode = CreateEpisodeMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)

From 9884e3d21a7898bcf0fea61f2416ac3525ff0177 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 15 Aug 2024 08:51:32 +0200
Subject: [PATCH 259/565] Rename update mutations

---
 .../episode-contents-form/episode-contents-form.component.ts  | 4 ++--
 .../episode-identification-form.component.ts                  | 4 ++--
 .../episode-source-text-form.component.ts                     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index 38f5176a..de972527 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -45,7 +45,7 @@ export class EpisodeContentsFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeContentsGQL,
-        private episodeMutation: DataEntryUpdateEpisodeGQL
+        private updateEpisode: DataEntryUpdateEpisodeGQL
     ) {}
 
     ngOnInit(): void {
@@ -68,7 +68,7 @@ export class EpisodeContentsFormComponent implements OnInit {
                 debounceTime(300),
                 withLatestFrom(this.id$),
                 switchMap(([episode, id]) =>
-                    this.episodeMutation.mutate({
+                    this.updateEpisode.mutate({
                         input: {
                             id,
                             ...episode,
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 2c8122b2..675128f8 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -43,7 +43,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeIdentificationGQL,
-        private episodeMutation: DataEntryUpdateEpisodeGQL
+        private updateEpisode: DataEntryUpdateEpisodeGQL
     ) {}
 
     public ngOnInit(): void {
@@ -63,7 +63,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 debounceTime(300),
                 withLatestFrom(this.id$),
                 switchMap(([episode, id]) =>
-                    this.episodeMutation
+                    this.updateEpisode
                         .mutate({
                             input: {
                                 id,
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index c645e360..b65d9033 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -43,7 +43,7 @@ export class EpisodeSourceTextFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeSourceTextMentionGQL,
-        private episodeMutation: DataEntryUpdateEpisodeGQL
+        private updateEpisode: DataEntryUpdateEpisodeGQL
     ) {}
 
     ngOnInit(): void {
@@ -63,7 +63,7 @@ export class EpisodeSourceTextFormComponent implements OnInit {
                 debounceTime(300),
                 withLatestFrom(this.id$),
                 switchMap(([episode, id]) =>
-                    this.episodeMutation.mutate({
+                    this.updateEpisode.mutate({
                         input: {
                             id,
                             ...episode,

From 21d34debcde4e023e169e188d84e7cb54dee5f53 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 15 Aug 2024 08:53:53 +0200
Subject: [PATCH 260/565] NewEpisodeModalComponent

---
 .../episode-form/episode-form.module.ts       |  2 +
 .../new-episode-modal.component.html          | 43 +++++++++++++++++++
 .../new-episode-modal.component.scss          |  0
 .../new-episode-modal.component.spec.ts       | 21 +++++++++
 .../new-episode-modal.component.ts            | 38 ++++++++++++++++
 .../new-episode-modal.graphql                 |  7 +++
 .../shared/data-entry-shared.module.ts        | 22 +++-------
 .../data-entry/source/source.component.html   |  2 +-
 .../app/data-entry/source/source.component.ts |  7 +++
 9 files changed, 126 insertions(+), 16 deletions(-)
 create mode 100644 frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
 create mode 100644 frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.scss
 create mode 100644 frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
 create mode 100644 frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.module.ts b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
index 06743a84..2004996a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.module.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
@@ -9,6 +9,7 @@ import { EpisodeObjectsFormComponent } from "./episode-objects-form/episode-obje
 import { SharedModule } from "@shared/shared.module";
 import { EpisodeFormComponent } from "./episode-form.component";
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
+import { NewEpisodeModalComponent } from './new-episode-modal/new-episode-modal.component';
 
 @NgModule({
     declarations: [
@@ -19,6 +20,7 @@ import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
         EpisodeAgentsFormComponent,
         EpisodeLocationsFormComponent,
         EpisodeObjectsFormComponent,
+        NewEpisodeModalComponent,
     ],
     imports: [CommonModule, SharedModule, DataEntrySharedModule],
 })
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
new file mode 100644
index 00000000..53709f83
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
@@ -0,0 +1,43 @@
+<div class="modal-header">
+    <h4 class="modal-title">Hi there!</h4>
+    <button
+        type="button"
+        class="btn-close"
+        aria-label="Close"
+        (click)="activeModal.dismiss('cross click')"
+    ></button>
+</div>
+<div class="modal-body">
+    <form>
+        <div class="form-group">
+            <label class="form-label" for="episode-name">Name</label>
+            <p class="form-text">
+                This is a name to identify the episode in the overview of the
+                source. For example: "journey to Rome", "Clovis' response",
+                "Radegund asks Germanus for help".
+            </p>
+            <input
+                id="episode-name"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.name"
+                [class.is-invalid]="
+                    form.controls.name.invalid && form.controls.name.touched
+                "
+            />
+            <p class="invalid-feedback">This field is required.</p>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-outline-secondary" (click)="submit()">
+        Save
+    </button>
+    <button
+        type="button"
+        class="btn btn-outline-secondary"
+        (click)="activeModal.close('cancel click')"
+    >
+        Cancel
+    </button>
+</div>
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.scss b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
new file mode 100644
index 00000000..7c0cb0a1
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NewEpisodeModalComponent } from './new-episode-modal.component';
+
+describe('NewEpisodeModalComponent', () => {
+  let component: NewEpisodeModalComponent;
+  let fixture: ComponentFixture<NewEpisodeModalComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [NewEpisodeModalComponent]
+    });
+    fixture = TestBed.createComponent(NewEpisodeModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
new file mode 100644
index 00000000..f561bef6
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
@@ -0,0 +1,38 @@
+import { Component, inject, Input, OnInit } from "@angular/core";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
+import {  } from "generated/graphql";
+
+
+@Component({
+    selector: "lc-new-episode-modal",
+    templateUrl: "./new-episode-modal.component.html",
+    styleUrls: ["./new-episode-modal.component.scss"],
+})
+export class NewEpisodeModalComponent implements OnInit {
+    @Input({ required: true }) sourceId: string | null = null;
+
+    public activeModal = inject(NgbActiveModal);
+    public form = new FormGroup({
+        name: new FormControl<string>("", {
+            nonNullable: true,
+            validators: [Validators.required],
+        }),
+        source: new FormControl<string>("", {
+            nonNullable: true,
+            validators: [Validators.required],
+        }),
+    });
+
+    constructor(private createEpisode: DataEntryCreateEpisodeGQL) { }
+
+    ngOnInit(): void {
+        if (this.sourceId) {
+            this.form.controls.source.setValue(this.sourceId);
+        }
+    }
+
+    public submit(): void {
+        this.activeModal.close("create episode");
+    }
+}
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
new file mode 100644
index 00000000..318df5e9
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
@@ -0,0 +1,7 @@
+mutation DataEntryCreateEpisode(input: CreateEpisodeMutationInput!) {
+    ok
+    errors {
+        field
+        messages
+    }
+}
diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index a64bc226..9f866331 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -1,18 +1,10 @@
-import { NgModule } from '@angular/core';
-import { SharedModule } from '@shared/shared.module';
-import { DesignatorsControlComponent } from './designators-control/designators-control.component';
-
-
+import { NgModule } from "@angular/core";
+import { SharedModule } from "@shared/shared.module";
+import { DesignatorsControlComponent } from "./designators-control/designators-control.component";
 
 @NgModule({
-    declarations: [
-        DesignatorsControlComponent
-    ],
-    imports: [
-        SharedModule
-    ],
-    exports: [
-        DesignatorsControlComponent,
-    ]
+    declarations: [DesignatorsControlComponent],
+    imports: [SharedModule],
+    exports: [DesignatorsControlComponent],
 })
-export class DataEntrySharedModule { }
+export class DataEntrySharedModule {}
diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index a00b973a..b220d6ff 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -19,7 +19,7 @@ <h2 class="mb-4">Episodes</h2>
     <lc-episode-preview *ngFor="let episode of source.episodes" [episode]="episode" />
 </div>
 <div class="btn-group mb-4">
-    <button class="btn btn-primary" disabled>
+    <button class="btn btn-primary" (click)="openNewEpisodeModal()">
         <lc-icon [icon]="actionIcons.create" />
         Add a new episode
     </button>
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 1443d692..c9483117 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -1,9 +1,11 @@
 import { Component, computed } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { ActivatedRoute } from "@angular/router";
+import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 import { actionIcons, dataIcons } from "@shared/icons";
 import { DataEntrySourceDetailGQL } from "generated/graphql";
 import { map, shareReplay, switchMap } from "rxjs";
+import { NewEpisodeModalComponent } from "../episode-form/new-episode-modal/new-episode-modal.component";
 
 @Component({
     selector: "lc-source",
@@ -45,6 +47,11 @@ export class SourceComponent {
 
     constructor(
         private route: ActivatedRoute,
+        private modalService: NgbModal,
         private sourceDetailQuery: DataEntrySourceDetailGQL
     ) {}
+
+    public openNewEpisodeModal(): void {
+        const modal = this.modalService.open(NewEpisodeModalComponent);
+    }
 }

From 41773ce435dd8a342004c38e94bca3a692fc6319 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 15 Aug 2024 10:22:31 +0200
Subject: [PATCH 261/565] Working CreateEpisodeQuery

---
 .../event/mutations/CreateEpisodeMutation.py  |  2 +-
 frontend/generated/schema.graphql             | 11 ++++++
 .../new-episode-modal.component.ts            | 36 ++++++++++++++++---
 .../new-episode-modal.graphql                 | 12 ++++---
 .../data-entry/source/source.component.html   |  4 +--
 .../app/data-entry/source/source.component.ts |  3 +-
 6 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
index 7e97f296..280542c7 100644
--- a/backend/event/mutations/CreateEpisodeMutation.py
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -33,4 +33,4 @@ def mutate(cls, root: None, info: ResolveInfo, input: CreateEpisodeMutationInput
             source=source,
         )
 
-        return cls(ok=True)  # type: ignore
+        return cls(ok=True, errors=[])  # type: ignore
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 792811f4..0387ff2b 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -70,6 +70,16 @@ type AgentDescriptionType {
   sourceMention: PersonAgentDescriptionSourceMentionChoices
 }
 
+type CreateEpisodeMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+input CreateEpisodeMutationInput {
+  name: String!
+  source: ID!
+}
+
 type EpisodeCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -326,6 +336,7 @@ type LettercraftErrorType {
 }
 
 type Mutation {
+  createEpisode(input: CreateEpisodeMutationInput!): CreateEpisodeMutation
   updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
   updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
 }
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
index f561bef6..14d30fb8 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
@@ -1,8 +1,9 @@
-import { Component, inject, Input, OnInit } from "@angular/core";
+import { Component, DestroyRef, inject, Input, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
-import {  } from "generated/graphql";
-
+import { ToastService } from "@services/toast.service";
+import { DataEntryCreateEpisodeGQL } from "generated/graphql";
 
 @Component({
     selector: "lc-new-episode-modal",
@@ -24,7 +25,11 @@ export class NewEpisodeModalComponent implements OnInit {
         }),
     });
 
-    constructor(private createEpisode: DataEntryCreateEpisodeGQL) { }
+    constructor(
+        private destroyRef: DestroyRef,
+        private toastService: ToastService,
+        private updateEpisode: DataEntryCreateEpisodeGQL
+    ) {}
 
     ngOnInit(): void {
         if (this.sourceId) {
@@ -33,6 +38,27 @@ export class NewEpisodeModalComponent implements OnInit {
     }
 
     public submit(): void {
-        this.activeModal.close("create episode");
+        if (this.form.invalid) {
+            return;
+        }
+        this.updateEpisode
+            .mutate({
+                input: {
+                    ...this.form.getRawValue(),
+                },
+            })
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                const errors = result.data?.createEpisode?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                    return;
+                }
+                this.activeModal.close("create episode");
+            });
     }
 }
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
index 318df5e9..ff57ab36 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
@@ -1,7 +1,9 @@
-mutation DataEntryCreateEpisode(input: CreateEpisodeMutationInput!) {
-    ok
-    errors {
-        field
-        messages
+mutation DataEntryCreateEpisode($input: CreateEpisodeMutationInput!) {
+    createEpisode(input: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
     }
 }
diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index b220d6ff..b1cd381e 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -18,8 +18,8 @@ <h2 class="mb-4">Episodes</h2>
 <div class="mb-4" *ngIf="source$ | async as source">
     <lc-episode-preview *ngFor="let episode of source.episodes" [episode]="episode" />
 </div>
-<div class="btn-group mb-4">
-    <button class="btn btn-primary" (click)="openNewEpisodeModal()">
+<div class="btn-group mb-4" *ngIf="source$ | async as source">
+    <button class="btn btn-primary" (click)="openNewEpisodeModal(source.id)">
         <lc-icon [icon]="actionIcons.create" />
         Add a new episode
     </button>
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index c9483117..059a2075 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -51,7 +51,8 @@ export class SourceComponent {
         private sourceDetailQuery: DataEntrySourceDetailGQL
     ) {}
 
-    public openNewEpisodeModal(): void {
+    public openNewEpisodeModal(sourceId: string): void {
         const modal = this.modalService.open(NewEpisodeModalComponent);
+        modal.componentInstance.sourceId = sourceId;
     }
 }

From 2ab11f0ccb669bd6fda232d435b0c8cb149e6438 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 09:30:23 +0200
Subject: [PATCH 262/565] Added DeleteEpisodeMutation

---
 .../event/mutations/CreateEpisodeMutation.py  | 19 +++++++++++----
 .../event/mutations/DeleteEpisodeMutation.py  | 24 +++++++++++++++++++
 backend/graphql_app/schema.py                 |  2 ++
 3 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 backend/event/mutations/DeleteEpisodeMutation.py

diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
index 280542c7..154ee431 100644
--- a/backend/event/mutations/CreateEpisodeMutation.py
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -1,6 +1,15 @@
-from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo, String
+from graphene import (
+    ID,
+    Field,
+    InputObjectType,
+    List,
+    NonNull,
+    ResolveInfo,
+    String,
+)
 
 from event.models import Episode
+from event.types.EpisodeType import EpisodeType
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from source.models import Source
@@ -12,7 +21,7 @@ class CreateEpisodeMutationInput(InputObjectType):
 
 
 class CreateEpisodeMutation(LettercraftMutation):
-    ok = Boolean(required=True)
+    episode = Field(EpisodeType)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     django_model = Episode
@@ -26,11 +35,11 @@ def mutate(cls, root: None, info: ResolveInfo, input: CreateEpisodeMutationInput
             source = Source.objects.get(id=getattr(input, "source"))
         except Source.DoesNotExist:
             error = LettercraftErrorType(field="source", messages=["Source not found."])
-            return cls(ok=False, errors=[error])  # type: ignore
+            return cls(errors=[error])  # type: ignore
 
-        Episode.objects.create(
+        episode = Episode.objects.create(
             name=getattr(input, "name"),
             source=source,
         )
 
-        return cls(ok=True, errors=[])  # type: ignore
+        return cls(episode=episode, errors=[])  # type: ignore
diff --git a/backend/event/mutations/DeleteEpisodeMutation.py b/backend/event/mutations/DeleteEpisodeMutation.py
new file mode 100644
index 00000000..291eb555
--- /dev/null
+++ b/backend/event/mutations/DeleteEpisodeMutation.py
@@ -0,0 +1,24 @@
+from graphene import ID, Boolean, List, Mutation, NonNull, ResolveInfo
+
+from event.models import Episode
+from event.types.EpisodeType import EpisodeType
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class DeleteEpisodeMutation(Mutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, id: str):
+        try:
+            episode = EpisodeType.get_queryset(Episode.objects, info).get(id=id)
+        except Episode.DoesNotExist:
+            error = LettercraftErrorType(field="id", messages=["Episode not found."])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        episode.delete()
+        return cls(ok=True, errors=[])  # type: ignore
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 623358c4..5c7521c4 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -1,6 +1,7 @@
 from graphene import ObjectType, Schema
 
 from event.mutations.CreateEpisodeMutation import CreateEpisodeMutation
+from event.mutations.DeleteEpisodeMutation import DeleteEpisodeMutation
 from event.queries import EventQueries
 from letter.queries import LetterQueries
 from person.queries import PersonQueries
@@ -20,6 +21,7 @@ class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
     update_episode = UpdateEpisodeMutation.Field()
     create_episode = CreateEpisodeMutation.Field()
+    delete_episode = DeleteEpisodeMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)

From 2496cb6603b15a752b5e8e1669c0d10a9f554c2c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 09:33:11 +0200
Subject: [PATCH 263/565] UI tweaks

---
 .../new-episode-modal.component.html          | 15 ++++++-----
 .../new-episode-modal.component.ts            | 27 ++++++++++++++-----
 .../new-episode-modal.graphql                 |  4 ++-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
index 53709f83..2ebfc9cd 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
@@ -1,14 +1,14 @@
 <div class="modal-header">
-    <h4 class="modal-title">Hi there!</h4>
+    <h4>Create new episode</h4>
     <button
         type="button"
         class="btn-close"
         aria-label="Close"
-        (click)="activeModal.dismiss('cross click')"
+        (click)="activeModal.dismiss(null)"
     ></button>
 </div>
 <div class="modal-body">
-    <form>
+    <form [formGroup]="form" (ngSubmit)="submit($event)">
         <div class="form-group">
             <label class="form-label" for="episode-name">Name</label>
             <p class="form-text">
@@ -24,19 +24,20 @@ <h4 class="modal-title">Hi there!</h4>
                 [class.is-invalid]="
                     form.controls.name.invalid && form.controls.name.touched
                 "
+                ngbAutofocus
             />
             <p class="invalid-feedback">This field is required.</p>
         </div>
     </form>
 </div>
 <div class="modal-footer">
-    <button type="button" class="btn btn-outline-secondary" (click)="submit()">
-        Save
+    <button type="button" class="btn btn-primary" (click)="submit($event)">
+        Create
     </button>
     <button
         type="button"
-        class="btn btn-outline-secondary"
-        (click)="activeModal.close('cancel click')"
+        class="btn btn-secondary"
+        (click)="activeModal.close()"
     >
         Cancel
     </button>
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
index 14d30fb8..5d161d63 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
@@ -37,16 +37,22 @@ export class NewEpisodeModalComponent implements OnInit {
         }
     }
 
-    public submit(): void {
+    public submit(event: Event): void {
+        event.preventDefault();
+        event.stopPropagation();
         if (this.form.invalid) {
             return;
         }
+        const input = this.form.getRawValue();
         this.updateEpisode
-            .mutate({
-                input: {
-                    ...this.form.getRawValue(),
-                },
-            })
+            .mutate({ input },
+                {
+                    update: (cache) =>
+                        cache.evict({
+                            fieldName: "source",
+                        }),
+                }
+            )
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((result) => {
                 const errors = result.data?.createEpisode?.errors;
@@ -58,7 +64,14 @@ export class NewEpisodeModalComponent implements OnInit {
                     });
                     return;
                 }
-                this.activeModal.close("create episode");
+                this.toastService.show({
+                    body: "Episode created",
+                    type: "success",
+                    header: "Success",
+                });
+                this.activeModal.close({
+                    id: result.data?.createEpisode?.episode?.id ?? null,
+                });
             });
     }
 }
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
index ff57ab36..7b86e562 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
@@ -1,6 +1,8 @@
 mutation DataEntryCreateEpisode($input: CreateEpisodeMutationInput!) {
     createEpisode(input: $input) {
-        ok
+        episode {
+            id
+        }
         errors {
             field
             messages

From 395041071be67cc24340dd8eb1d8274c82a2b7d7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 09:33:30 +0200
Subject: [PATCH 264/565] Fix memory leak

---
 .../episode-contents-form.component.ts             | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index de972527..39fc92a5 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -68,12 +68,14 @@ export class EpisodeContentsFormComponent implements OnInit {
                 debounceTime(300),
                 withLatestFrom(this.id$),
                 switchMap(([episode, id]) =>
-                    this.updateEpisode.mutate({
-                        input: {
-                            id,
-                            ...episode,
-                        },
-                    })
+                    this.updateEpisode
+                        .mutate({
+                            input: {
+                                id,
+                                ...episode,
+                            },
+                        })
+                        .pipe(takeUntilDestroyed(this.destroyRef))
                 )
             )
             .subscribe((result) => {

From 9dfad77ee6f869b699d421e5365115c341f13c5b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 09:33:53 +0200
Subject: [PATCH 265/565] Navigate to newly created Episode after creation

---
 .../src/app/data-entry/source/source.component.ts  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 059a2075..7c5c706f 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -1,9 +1,11 @@
 import { Component, computed } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntrySourceDetailGQL } from "generated/graphql";
+import {
+    DataEntrySourceDetailGQL,
+} from "generated/graphql";
 import { map, shareReplay, switchMap } from "rxjs";
 import { NewEpisodeModalComponent } from "../episode-form/new-episode-modal/new-episode-modal.component";
 
@@ -47,12 +49,18 @@ export class SourceComponent {
 
     constructor(
         private route: ActivatedRoute,
+        private router: Router,
         private modalService: NgbModal,
-        private sourceDetailQuery: DataEntrySourceDetailGQL
+        private sourceDetailQuery: DataEntrySourceDetailGQL,
     ) {}
 
     public openNewEpisodeModal(sourceId: string): void {
         const modal = this.modalService.open(NewEpisodeModalComponent);
         modal.componentInstance.sourceId = sourceId;
+        modal.result.then((result: {id : string | null } | null) => {
+            if (result && 'id' in result) {
+                this.router.navigate(["/data-entry/episodes", result.id]);
+            }
+        });
     }
 }

From 30b4fa02a6d6cd325519c099f046bb5272adb057 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 09:35:23 +0200
Subject: [PATCH 266/565] Implement confirmation modal

---
 .../src/app/services/modal.service.spec.ts    | 16 +++++++++
 frontend/src/app/services/modal.service.ts    | 33 +++++++++++++++++++
 .../base-modal/base-modal.component.html      | 28 ++++++++++++++++
 .../base-modal/base-modal.component.scss      |  0
 .../base-modal/base-modal.component.spec.ts   | 21 ++++++++++++
 .../shared/base-modal/base-modal.component.ts | 19 +++++++++++
 6 files changed, 117 insertions(+)
 create mode 100644 frontend/src/app/services/modal.service.spec.ts
 create mode 100644 frontend/src/app/services/modal.service.ts
 create mode 100644 frontend/src/app/shared/base-modal/base-modal.component.html
 create mode 100644 frontend/src/app/shared/base-modal/base-modal.component.scss
 create mode 100644 frontend/src/app/shared/base-modal/base-modal.component.spec.ts
 create mode 100644 frontend/src/app/shared/base-modal/base-modal.component.ts

diff --git a/frontend/src/app/services/modal.service.spec.ts b/frontend/src/app/services/modal.service.spec.ts
new file mode 100644
index 00000000..7a5da269
--- /dev/null
+++ b/frontend/src/app/services/modal.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ModalService } from '../shared/services/modal.service';
+
+describe('ModalService', () => {
+  let service: ModalService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ModalService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/services/modal.service.ts b/frontend/src/app/services/modal.service.ts
new file mode 100644
index 00000000..0030a2f4
--- /dev/null
+++ b/frontend/src/app/services/modal.service.ts
@@ -0,0 +1,33 @@
+import { Injectable } from "@angular/core";
+import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
+import { BaseModalComponent } from "@shared/base-modal/base-modal.component";
+
+interface ModalConfig {
+    title: string;
+    message: string;
+    confirmText: string;
+    cancelText: string;
+    confirmValue?: unknown;
+    cancelValue?: unknown;
+    dismissValue?: unknown;
+}
+
+@Injectable({
+    providedIn: "root",
+})
+export class ModalService {
+    constructor(private modal: NgbModal) {}
+
+    public openConfirmationModal(config: ModalConfig): Promise<boolean> {
+        const modal = this.modal.open(BaseModalComponent);
+        const { title, message, confirmText, cancelText } = config;
+        modal.componentInstance.title = title;
+        modal.componentInstance.message = message;
+        modal.componentInstance.confirmText = confirmText;
+        modal.componentInstance.cancelText = cancelText;
+        modal.componentInstance.confirmValue = true;
+        modal.componentInstance.cancelValue = false;
+        modal.componentInstance.dismissValue = false;
+        return modal.result as Promise<boolean>;
+    }
+}
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.html b/frontend/src/app/shared/base-modal/base-modal.component.html
new file mode 100644
index 00000000..c9130763
--- /dev/null
+++ b/frontend/src/app/shared/base-modal/base-modal.component.html
@@ -0,0 +1,28 @@
+<div class="modal-header">
+    <h4>{{ title }}</h4>
+    <button
+        type="button"
+        class="btn-close"
+        aria-label="Close"
+        (click)="activeModal.dismiss(dismissValue)"
+    ></button>
+</div>
+<div class="modal-body">
+    {{ message }}
+</div>
+<div class="modal-footer">
+    <button
+        type="button"
+        class="btn btn-primary"
+        (click)="activeModal.close(confirmValue)"
+    >
+        {{ confirmText }}
+    </button>
+    <button
+        type="button"
+        class="btn btn-secondary"
+        (click)="activeModal.close(cancelValue)"
+    >
+        {{ cancelText }}
+    </button>
+</div>
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.scss b/frontend/src/app/shared/base-modal/base-modal.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.spec.ts b/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
new file mode 100644
index 00000000..0cd641ab
--- /dev/null
+++ b/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { BaseModalComponent } from "./base-modal.component";
+
+describe("BaseModalComponent", () => {
+    let component: BaseModalComponent;
+    let fixture: ComponentFixture<BaseModalComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [BaseModalComponent],
+        });
+        fixture = TestBed.createComponent(BaseModalComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.ts b/frontend/src/app/shared/base-modal/base-modal.component.ts
new file mode 100644
index 00000000..c694de1c
--- /dev/null
+++ b/frontend/src/app/shared/base-modal/base-modal.component.ts
@@ -0,0 +1,19 @@
+import { Component, inject, Input } from "@angular/core";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
+
+@Component({
+    selector: "lc-base-modal",
+    templateUrl: "./base-modal.component.html",
+    styleUrls: ["./base-modal.component.scss"],
+})
+export class BaseModalComponent {
+    @Input() title = "Lettercraft";
+    @Input() message = "";
+    @Input() confirmText = "Ok";
+    @Input() cancelText = "Cancel";
+    @Input() confirmValue = true;
+    @Input() cancelValue = false;
+    @Input() dismissValue = false;
+
+    public activeModal = inject(NgbActiveModal);
+}

From b6dc079fcdb6e30fbb6ace09bdf4db8f9b5b7219 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 09:35:46 +0200
Subject: [PATCH 267/565] Deletion in frontend

---
 .../episode-preview.component.html            |  8 +--
 .../episode-preview.component.ts              | 65 +++++++++++++++++--
 .../episode-preview/episode-preview.graphql   |  9 +++
 frontend/src/app/shared/shared.module.ts      | 32 ++++-----
 4 files changed, 88 insertions(+), 26 deletions(-)
 create mode 100644 frontend/src/app/data-entry/source/episode-preview/episode-preview.graphql

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index ab68d666..dd6e315d 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -6,14 +6,14 @@
                 &nbsp;
                 {{ episode.name }}
                 <br />
-                <small>
-                    <span>book {{ episode.book }}</span>,
-                    <span>chapter {{ episode.chapter }}</span>
+                <small class="inline-list">
+                    <span *ngIf="episode.book" class="inline-list-item">book {{ episode.book }}</span>
+                    <span *ngIf="episode.chapter" class="inline-list-item">chapter {{ episode.chapter }}</span>
                 </small>
             </div>
             <lc-action-button-group
                 [editLink]="['/', 'data-entry', 'episodes', episode.id]"
-                (delete)="deleteEpisode(episode.id)"
+                (deleteAction)="onClickDelete(episode.id)"
                 [showButtonText]="false"
             />
         </div>
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
index 3a3993c3..249fc456 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
@@ -1,8 +1,16 @@
-import { Component, Input } from "@angular/core";
+import { Component, DestroyRef, Input } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ModalService } from "@services/modal.service";
+import { ToastService } from "@services/toast.service";
 import { dataIcons } from "@shared/icons";
-import { DataEntrySourceDetailQuery } from "generated/graphql";
+import {
+    DataEntryDeleteEpisodeGQL,
+    DataEntrySourceDetailQuery,
+} from "generated/graphql";
 
-type QueriedEpisode = NonNullable<DataEntrySourceDetailQuery["source"]["episodes"]>[0];
+type QueriedEpisode = NonNullable<
+    DataEntrySourceDetailQuery["source"]["episodes"]
+>[0];
 
 @Component({
     selector: "lc-episode-preview",
@@ -14,17 +22,62 @@ export class EpisodePreviewComponent {
     public episode!: QueriedEpisode;
     public dataIcons = dataIcons;
 
-    public deleteEpisode(episodeId: string): void {
-        console.log("Deleting episode with id", episodeId);
+    constructor(
+        private destroyRef: DestroyRef,
+        private toastService: ToastService,
+        private modalService: ModalService,
+        private deleteEpisode: DataEntryDeleteEpisodeGQL
+    ) {}
+
+    public onClickDelete(episodeId: string): void {
+        this.modalService
+            .openConfirmationModal({
+                title: "Delete episode",
+                confirmText: "Delete",
+                cancelText: "Cancel",
+                message: `Are you sure you want to delete this episode? (${this.episode.name})`,
+            })
+            .then((result) => {
+                if (result) {
+                    this.performDelete(episodeId);
+                }
+            });
     }
 
     public agentIcon(agent: QueriedEpisode["agents"][0]): string {
         if (agent.isGroup) {
             return dataIcons.group;
         }
-        if (agent.describes?.some(person => person?.identifiable)) {
+        if (agent.describes?.some((person) => person?.identifiable)) {
             return dataIcons.person;
         }
         return dataIcons.personUnknown;
     }
+
+    private performDelete(episodeId: string): void {
+        this.deleteEpisode
+            .mutate(
+                { id: episodeId },
+                {
+                    update: (cache) => cache.evict({ fieldName: "source" }),
+                }
+            )
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                const errors = result.data?.deleteEpisode?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Deletion failed",
+                    });
+                } else {
+                    this.toastService.show({
+                        body: "Episode deleted",
+                        type: "success",
+                        header: "Success",
+                    });
+                }
+            });
+    }
 }
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.graphql b/frontend/src/app/data-entry/source/episode-preview/episode-preview.graphql
new file mode 100644
index 00000000..d85af494
--- /dev/null
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.graphql
@@ -0,0 +1,9 @@
+mutation DataEntryDeleteEpisode($id: ID!) {
+    deleteEpisode(id: $id) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index c49ddc21..b01a3bbf 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -1,22 +1,22 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { RouterModule } from '@angular/router';
-import { ReactiveFormsModule } from '@angular/forms';
-import { IconComponent } from './icon/icon.component';
-import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
-import { ActionButtonGroupComponent } from './action-button-group/action-button-group.component';
-
-
+import { NgModule } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { BrowserModule } from "@angular/platform-browser";
+import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { HttpClientModule, HttpClientXsrfModule } from "@angular/common/http";
+import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
+import { RouterModule } from "@angular/router";
+import { ReactiveFormsModule } from "@angular/forms";
+import { IconComponent } from "./icon/icon.component";
+import { BreadcrumbComponent } from "./breadcrumb/breadcrumb.component";
+import { ActionButtonGroupComponent } from "./action-button-group/action-button-group.component";
+import { BaseModalComponent } from "./base-modal/base-modal.component";
 
 @NgModule({
     declarations: [
         IconComponent,
         BreadcrumbComponent,
-        ActionButtonGroupComponent
+        ActionButtonGroupComponent,
+        BaseModalComponent,
     ],
     imports: [
         CommonModule,
@@ -24,8 +24,8 @@ import { ActionButtonGroupComponent } from './action-button-group/action-button-
         BrowserAnimationsModule,
         HttpClientModule,
         HttpClientXsrfModule.withOptions({
-            cookieName: 'csrftoken',
-            headerName: 'X-CSRFToken'
+            cookieName: "csrftoken",
+            headerName: "X-CSRFToken",
         }),
         NgbModule,
         RouterModule,

From 1b07b5adda59b5e0ec6d3120ec7a91f3295fdd75 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 10:49:32 +0200
Subject: [PATCH 268/565] Add trackBy

---
 frontend/src/app/data-entry/source/source.component.html | 2 +-
 frontend/src/app/data-entry/source/source.component.ts   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index b1cd381e..51b53872 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -16,7 +16,7 @@ <h2 class="mb-4">Episodes</h2>
 </p>
 
 <div class="mb-4" *ngIf="source$ | async as source">
-    <lc-episode-preview *ngFor="let episode of source.episodes" [episode]="episode" />
+    <lc-episode-preview *ngFor="let episode of source.episodes; trackBy: identify" [episode]="episode" />
 </div>
 <div class="btn-group mb-4" *ngIf="source$ | async as source">
     <button class="btn btn-primary" (click)="openNewEpisodeModal(source.id)">
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 7c5c706f..ce47fe24 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -5,6 +5,7 @@ import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
 import { actionIcons, dataIcons } from "@shared/icons";
 import {
     DataEntrySourceDetailGQL,
+    EpisodeType,
 } from "generated/graphql";
 import { map, shareReplay, switchMap } from "rxjs";
 import { NewEpisodeModalComponent } from "../episode-form/new-episode-modal/new-episode-modal.component";
@@ -26,7 +27,7 @@ export class SourceComponent {
         },
         {
             label: this.sourceTitle(),
-            link: "/data-entry/source/" + this.route.snapshot.params["id"],
+            link: "/data-entry/sources/" + this.route.snapshot.params["id"],
         },
     ]);
 
@@ -63,4 +64,9 @@ export class SourceComponent {
             }
         });
     }
+
+    public identify(_index: number, item: Pick<EpisodeType, "id">): string {
+        return item.id;
+    }
+
 }

From 85f372dbd27775745ade7f0e1fde2d349a955df5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 10:49:46 +0200
Subject: [PATCH 269/565] Fix broken breadcrumb URL

---
 .../src/app/data-entry/episode-form/episode-form.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 8f2fbebf..fbd3702f 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -38,7 +38,7 @@ export class EpisodeFormComponent {
                 },
                 {
                     label: episode.source.name,
-                    link: `/source/${episode.source.id}`,
+                    link: `/sources/${episode.source.id}`,
                 },
                 {
                     label: episode.name,

From ecec54df5554ed5318b1f78ef6ce5b66e900b4dc Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 10:58:19 +0200
Subject: [PATCH 270/565] Remove dismiss event

---
 frontend/generated/schema.graphql                         | 8 +++++++-
 .../new-episode-modal/new-episode-modal.component.html    | 2 +-
 .../src/app/shared/base-modal/base-modal.component.html   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 0387ff2b..902a8b78 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -71,8 +71,8 @@ type AgentDescriptionType {
 }
 
 type CreateEpisodeMutation {
+  episode: EpisodeType
   errors: [LettercraftErrorType!]!
-  ok: Boolean!
 }
 
 input CreateEpisodeMutationInput {
@@ -80,6 +80,11 @@ input CreateEpisodeMutationInput {
   source: ID!
 }
 
+type DeleteEpisodeMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type EpisodeCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -337,6 +342,7 @@ type LettercraftErrorType {
 
 type Mutation {
   createEpisode(input: CreateEpisodeMutationInput!): CreateEpisodeMutation
+  deleteEpisode(id: ID!): DeleteEpisodeMutation
   updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
   updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
 }
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
index 2ebfc9cd..bebc9b19 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
@@ -4,7 +4,7 @@ <h4>Create new episode</h4>
         type="button"
         class="btn-close"
         aria-label="Close"
-        (click)="activeModal.dismiss(null)"
+        (click)="activeModal.close(null)"
     ></button>
 </div>
 <div class="modal-body">
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.html b/frontend/src/app/shared/base-modal/base-modal.component.html
index c9130763..d30ef1a9 100644
--- a/frontend/src/app/shared/base-modal/base-modal.component.html
+++ b/frontend/src/app/shared/base-modal/base-modal.component.html
@@ -4,7 +4,7 @@ <h4>{{ title }}</h4>
         type="button"
         class="btn-close"
         aria-label="Close"
-        (click)="activeModal.dismiss(dismissValue)"
+        (click)="activeModal.close(cancelValue)"
     ></button>
 </div>
 <div class="modal-body">

From f83edc8c278f453666d68fb3e6b3f544c388f4d9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 11:15:47 +0200
Subject: [PATCH 271/565] Remove unnecessary isEditMode checks

---
 .../episode-form/episode-form.component.html  | 22 ++++++-------------
 .../episode-form/episode-form.component.ts    |  2 --
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 701a9850..2ff0e8c5 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -1,23 +1,15 @@
 <lc-breadcrumb [breadcrumbs]="(breadcrumbs$ | async) ?? []" />
 
-<ng-container *ngIf="isEditMode$ | async; else newEpisodeTitle">
-    <ng-container *ngIf="episode$ | async as episode; else loading">
-        <h1 class="mb-4">
-            <lc-icon [icon]="dataIcons.episode" />
-            <span>{{ episode.name }}</span>
-            <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
-        </h1>
-        <p class="lead mb-4" *ngIf="episode.description">
-            {{ episode.description}}
-        </p>
-    </ng-container>
-</ng-container>
-<ng-template #newEpisodeTitle>
+<ng-container *ngIf="episode$ | async as episode; else loading">
     <h1 class="mb-4">
         <lc-icon [icon]="dataIcons.episode" />
-        New episode
+        <span>{{ episode.name }}</span>
+        <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
     </h1>
-</ng-template>
+    <p class="lead mb-4" *ngIf="episode.description">
+        {{ episode.description}}
+    </p>
+</ng-container>
 
 <h2 class="subform-header">Identification</h2>
 <lc-episode-identification-form />
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 8f2fbebf..4103ee99 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -12,8 +12,6 @@ import { filter, map, share, switchMap } from "rxjs";
 export class EpisodeFormComponent {
     private id$ = this.route.params.pipe(map((params) => params["id"]));
 
-    public isEditMode$ = this.id$.pipe(map((id) => id !== "new"));
-
     public episode$ = this.id$.pipe(
         filter((id) => id !== "new"),
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),

From 17c952fa382a85c8b441df2ea52bfd44b9feaf7c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 11:24:56 +0200
Subject: [PATCH 272/565] Fix failing tests

---
 .../new-episode-modal.component.spec.ts       | 35 +++++++++++--------
 .../src/app/services/modal.service.spec.ts    |  2 +-
 .../base-modal/base-modal.component.spec.ts   |  2 ++
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
index 7c0cb0a1..ae8c53bb 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
@@ -1,21 +1,26 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { NewEpisodeModalComponent } from './new-episode-modal.component';
+import { NewEpisodeModalComponent } from "./new-episode-modal.component";
+import { DataEntrySharedModule } from "../../shared/data-entry-shared.module";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 
-describe('NewEpisodeModalComponent', () => {
-  let component: NewEpisodeModalComponent;
-  let fixture: ComponentFixture<NewEpisodeModalComponent>;
+describe("NewEpisodeModalComponent", () => {
+    let component: NewEpisodeModalComponent;
+    let fixture: ComponentFixture<NewEpisodeModalComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [NewEpisodeModalComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [NewEpisodeModalComponent],
+            providers: [NgbActiveModal],
+            imports: [DataEntrySharedModule, SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(NewEpisodeModalComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(NewEpisodeModalComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/services/modal.service.spec.ts b/frontend/src/app/services/modal.service.spec.ts
index 7a5da269..c887eed2 100644
--- a/frontend/src/app/services/modal.service.spec.ts
+++ b/frontend/src/app/services/modal.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ModalService } from '../shared/services/modal.service';
+import { ModalService } from '../services/modal.service';
 
 describe('ModalService', () => {
   let service: ModalService;
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.spec.ts b/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
index 0cd641ab..2159b3d3 100644
--- a/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
+++ b/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { BaseModalComponent } from "./base-modal.component";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 
 describe("BaseModalComponent", () => {
     let component: BaseModalComponent;
@@ -9,6 +10,7 @@ describe("BaseModalComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [BaseModalComponent],
+            providers: [NgbActiveModal],
         });
         fixture = TestBed.createComponent(BaseModalComponent);
         component = fixture.componentInstance;

From 845cdea3dbdc438e0d325ac896dffbccd6e35d21 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 11:51:43 +0200
Subject: [PATCH 273/565] Fix ordering

---
 backend/source/types/SourceType.py                             | 2 +-
 .../new-episode-modal/new-episode-modal.component.ts           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index a9c0b18e..b782c989 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -33,7 +33,7 @@ def get_queryset(
 
     @staticmethod
     def resolve_episodes(parent: Source, info: ResolveInfo) -> QuerySet[Episode]:
-        return EpisodeType.get_queryset(Episode.objects, info).filter(source_id=parent.pk)
+        return EpisodeType.get_queryset(Episode.objects, info).filter(source_id=parent.pk).order_by("id")
 
     @staticmethod
     def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
index 5d161d63..6e19c030 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
@@ -45,7 +45,8 @@ export class NewEpisodeModalComponent implements OnInit {
         }
         const input = this.form.getRawValue();
         this.updateEpisode
-            .mutate({ input },
+            .mutate(
+                { input },
                 {
                     update: (cache) =>
                         cache.evict({

From 61c1f3d83322245083382a2684e0fe3d3f232d01 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 11:58:19 +0200
Subject: [PATCH 274/565] Scroll to top on creating a new Episode

---
 frontend/src/app/app-routing.module.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index d7c6a626..ba91a4bd 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -4,7 +4,11 @@ import { RouterModule } from '@angular/router';
 import { routes } from './routes';
 
 @NgModule({
-    imports: [RouterModule.forRoot(routes)],
+    imports: [RouterModule.forRoot(routes, {
+        // Restores previous scroll position on backward navigation.
+        // Scrolls to top on forward navigation (or anchor if provided).
+        scrollPositionRestoration: 'enabled'
+    })],
     exports: [RouterModule]
 })
 export class AppRoutingModule { }

From 47bac8d12acfa97f37b7a06fe02704a9bd87d74e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 12:02:45 +0200
Subject: [PATCH 275/565] More sensible ordering

---
 backend/source/types/SourceType.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index b782c989..8fa58fc2 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -33,8 +33,16 @@ def get_queryset(
 
     @staticmethod
     def resolve_episodes(parent: Source, info: ResolveInfo) -> QuerySet[Episode]:
-        return EpisodeType.get_queryset(Episode.objects, info).filter(source_id=parent.pk).order_by("id")
+        return (
+            EpisodeType.get_queryset(Episode.objects, info)
+            .filter(source_id=parent.pk)
+            .order_by("book", "chapter", "page")
+        )
 
     @staticmethod
     def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
-        return EpisodeType.get_queryset(Episode.objects, info).filter(source_id=parent.pk).count()
+        return (
+            EpisodeType.get_queryset(Episode.objects, info)
+            .filter(source_id=parent.pk)
+            .count()
+        )

From 2a1044cbe36be9bc2f4b09373deb65c524f8f1dc Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 12:03:36 +0200
Subject: [PATCH 276/565] Include generated types

---
 frontend/generated/graphql.ts | 89 +++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index b7cc9120..57a15f96 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -72,6 +72,23 @@ export type AgentDescriptionType = {
   sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
 };
 
+export type CreateEpisodeMutation = {
+  __typename?: 'CreateEpisodeMutation';
+  episode?: Maybe<EpisodeType>;
+  errors: Array<LettercraftErrorType>;
+};
+
+export type CreateEpisodeMutationInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
+export type DeleteEpisodeMutation = {
+  __typename?: 'DeleteEpisodeMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type EpisodeCategoryType = {
   __typename?: 'EpisodeCategoryType';
   /** Longer description to help identify this object */
@@ -283,11 +300,23 @@ export type LettercraftErrorType = {
 
 export type Mutation = {
   __typename?: 'Mutation';
+  createEpisode?: Maybe<CreateEpisodeMutation>;
+  deleteEpisode?: Maybe<DeleteEpisodeMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
 };
 
 
+export type MutationCreateEpisodeArgs = {
+  input: CreateEpisodeMutationInput;
+};
+
+
+export type MutationDeleteEpisodeArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type MutationUpdateEpisodeArgs = {
   input: UpdateEpisodeMutationInput;
 };
@@ -819,6 +848,13 @@ export type DataEntryUpdateEpisodeMutationVariables = Exact<{
 
 export type DataEntryUpdateEpisodeMutation = { __typename?: 'Mutation', updateEpisode?: { __typename?: 'UpdateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryCreateEpisodeMutationVariables = Exact<{
+  input: CreateEpisodeMutationInput;
+}>;
+
+
+export type DataEntryCreateEpisodeMutation = { __typename?: 'Mutation', createEpisode?: { __typename?: 'CreateEpisodeMutation', episode?: { __typename?: 'EpisodeType', id: string } | null, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryGiftQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -840,6 +876,13 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 
 export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
+export type DataEntryDeleteEpisodeMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryDeleteEpisodeMutation = { __typename?: 'Mutation', deleteEpisode?: { __typename?: 'DeleteEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntrySourceDetailQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -981,6 +1024,30 @@ export const DataEntryUpdateEpisodeDocument = gql`
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryCreateEpisodeDocument = gql`
+    mutation DataEntryCreateEpisode($input: CreateEpisodeMutationInput!) {
+  createEpisode(input: $input) {
+    episode {
+      id
+    }
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
+    override document = DataEntryCreateEpisodeDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1053,6 +1120,28 @@ export const DataEntrySpaceDescriptionDocument = gql`
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryDeleteEpisodeDocument = gql`
+    mutation DataEntryDeleteEpisode($id: ID!) {
+  deleteEpisode(id: $id) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
+    override document = DataEntryDeleteEpisodeDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }

From 508b873315ee3ff7b4bab55ffd8d45bbeb40b9f8 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 16 Aug 2024 12:28:50 +0200
Subject: [PATCH 277/565] Correct null sorting; fix URL

---
 backend/source/types/SourceType.py            | 26 +++++++++++++++++--
 .../episode-form/episode-form.component.ts    |  2 +-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 8fa58fc2..00348317 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -1,5 +1,5 @@
 from graphene import Field, Int, List, NonNull, ResolveInfo
-from django.db.models import QuerySet
+from django.db.models import QuerySet, Value, Case, When, F
 from graphene_django import DjangoObjectType
 from event.models import Episode
 from source.models import Source
@@ -33,10 +33,32 @@ def get_queryset(
 
     @staticmethod
     def resolve_episodes(parent: Source, info: ResolveInfo) -> QuerySet[Episode]:
+        # Sort by book, chapter, page.
+        # If any of these fields are null are an empty string, sort them to the end.
+
+        SORT_LAST = Value("ZZZZZZ")
+
         return (
             EpisodeType.get_queryset(Episode.objects, info)
             .filter(source_id=parent.pk)
-            .order_by("book", "chapter", "page")
+            .annotate(
+                book_order=Case(
+                    When(book__isnull=True, then=SORT_LAST),
+                    When(book="", then=SORT_LAST),
+                    default=F("book"),
+                ),
+                chapter_order=Case(
+                    When(chapter__isnull=True, then=SORT_LAST),
+                    When(chapter="", then=SORT_LAST),
+                    default=F("chapter"),
+                ),
+                page_order=Case(
+                    When(page__isnull=True, then=SORT_LAST),
+                    When(page="", then=SORT_LAST),
+                    default=F("page"),
+                ),
+            )
+            .order_by("book_order", "chapter_order", "page_order")
         )
 
     @staticmethod
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index fbd3702f..b9c6e7dd 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -38,7 +38,7 @@ export class EpisodeFormComponent {
                 },
                 {
                     label: episode.source.name,
-                    link: `/sources/${episode.source.id}`,
+                    link: `/data-entry/sources/${episode.source.id}`,
                 },
                 {
                     label: episode.name,

From 59ebd0416a23e1862ff8ff451e98391b74badd9c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 20 Aug 2024 11:27:35 +0200
Subject: [PATCH 278/565] avoid memory leak

---
 .../agent-description-form.component.ts                       | 4 +++-
 .../agent-identification-form.component.ts                    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 3dbf3714..ae7025c3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
 import {
     DataEntryAgentDescriptionGQL,
@@ -52,7 +53,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
             sourceMention: new FormControl<string>(LocationSourceMentionChoices.Direct),
             note: new FormControl<string>(''),
         })
-    })
+    });
 
     isGroup$: Observable<boolean>;
     locations$: Observable<LocationsInSourceListQuery>;
@@ -67,6 +68,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
+            takeUntilDestroyed(),
             shareReplay(1),
         );
         this.isGroup$ = this.data$.pipe(
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index de7b35b8..70e7f1be 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
 import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery } from 'generated/graphql';
 import { map, Subject, switchMap } from 'rxjs';
@@ -23,6 +24,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
+            takeUntilDestroyed(),
         ).subscribe(this.updateFormData.bind(this));
     }
 

From d73cff7be423f3cd9b211047a34cbfe89b18148b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 20 Aug 2024 12:00:17 +0200
Subject: [PATCH 279/565] set basic page titles

---
 frontend/src/app/routes.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index 166c24eb..eba77f93 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -15,34 +15,43 @@ import { LetterFormComponent } from './data-entry/letter-form/letter-form.compon
 import { AgentFormComponent } from './data-entry/agent-form/agent-form.component';
 import { SourceComponent } from './data-entry/source/source.component';
 
+const SITE_NAME = 'Lettercraft & Epistolary Performance in Medieval Europe';
+const pageTitle = (name: string) => `${name} - ${SITE_NAME}`
 
 const routes: Routes = [
     {
         path: 'home',
+        title: SITE_NAME,
         component: HomeComponent,
     },
     {
         path: 'login',
+        title: pageTitle('Sign in'),
         component: LoginComponent,
     },
     {
         path: 'register',
+        title: pageTitle('Registration'),
         component: RegisterComponent,
     },
     {
         path: 'confirm-email/:key',
+        title: pageTitle('Confirm email'),
         component: VerifyEmailComponent,
     },
     {
         path: 'password-forgotten',
+        title: pageTitle('Forgot password'),
         component: PasswordForgottenComponent
     },
     {
         path: 'reset-password/:uid/:token',
+        title: pageTitle('Reset password'),
         component: ResetPasswordComponent
     },
     {
         path: 'user-settings',
+        title: pageTitle('Settings'),
         component: UserSettingsComponent
     },
     {
@@ -51,26 +60,32 @@ const routes: Routes = [
         children: [
             {
                 path: 'agents/:id',
+                title: pageTitle('Edit agent'),
                 component: AgentFormComponent,
             },
             {
                 path: 'gifts/:id',
+                title: pageTitle('Edit gift'),
                 component: GiftFormComponent,
             },
             {
                 path: 'letters/:id',
+                title: pageTitle('Edit letter'),
                 component: LetterFormComponent,
             },
             {
                 path: 'locations/:id',
+                title: pageTitle('Edit location'),
                 component: LocationFormComponent,
             },
             {
                 path: 'sources',
+                title: pageTitle('Sources'),
                 component: SourcesComponent
             },
             {
                 path: 'sources/:id',
+                title: pageTitle('View source'),
                 component: SourceComponent
             },
             {

From cda906e8616e1657d971c20b393a78639a7325ed Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 20 Aug 2024 14:02:37 +0200
Subject: [PATCH 280/565] add query based resolvers

---
 frontend/generated/graphql.ts | 136 ++++++++++++++++++++++++++++++++
 frontend/src/app/routes.ts    |  19 ++---
 frontend/src/app/titles.ts    | 141 ++++++++++++++++++++++++++++++++++
 3 files changed, 287 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/app/titles.ts

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index cec25f5a..38fe9df6 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -800,6 +800,31 @@ export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>
 
 export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
 
+export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SourceTitleQueryQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string } };
+
+export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type AgentTitleQueryQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type LetterTitleQueryQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type GiftTitleQueryQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SpaceTitleQueryQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
 export const DataEntryAgentDocument = gql`
     query DataEntryAgent($id: ID!) {
   agentDescription(id: $id) {
@@ -970,6 +995,117 @@ export const DataEntrySourceListDocument = gql`
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const SourceTitleQueryDocument = gql`
+    query SourceTitleQuery {
+  source(id: "") {
+    id
+    name
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
+    override document = SourceTitleQueryDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const AgentTitleQueryDocument = gql`
+    query AgentTitleQuery {
+  agentDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
+    override document = AgentTitleQueryDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const LetterTitleQueryDocument = gql`
+    query LetterTitleQuery {
+  letterDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
+    override document = LetterTitleQueryDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const GiftTitleQueryDocument = gql`
+    query GiftTitleQuery {
+  giftDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
+    override document = GiftTitleQueryDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const SpaceTitleQueryDocument = gql`
+    query SpaceTitleQuery {
+  spaceDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
+    override document = SpaceTitleQueryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/routes.ts b/frontend/src/app/routes.ts
index eba77f93..0875fd7b 100644
--- a/frontend/src/app/routes.ts
+++ b/frontend/src/app/routes.ts
@@ -14,9 +14,10 @@ import { GiftFormComponent } from './data-entry/gift-form/gift-form.component';
 import { LetterFormComponent } from './data-entry/letter-form/letter-form.component';
 import { AgentFormComponent } from './data-entry/agent-form/agent-form.component';
 import { SourceComponent } from './data-entry/source/source.component';
-
-const SITE_NAME = 'Lettercraft & Epistolary Performance in Medieval Europe';
-const pageTitle = (name: string) => `${name} - ${SITE_NAME}`
+import {
+    agentFormTitleResolver, giftFormTitleResolver, letterFormTitleResolver, pageTitle,
+    SITE_NAME, sourceFormTitleResolver, spaceFormTitleResolver
+} from './titles';
 
 const routes: Routes = [
     {
@@ -60,32 +61,32 @@ const routes: Routes = [
         children: [
             {
                 path: 'agents/:id',
-                title: pageTitle('Edit agent'),
+                title: agentFormTitleResolver,
                 component: AgentFormComponent,
             },
             {
                 path: 'gifts/:id',
-                title: pageTitle('Edit gift'),
+                title: giftFormTitleResolver,
                 component: GiftFormComponent,
             },
             {
                 path: 'letters/:id',
-                title: pageTitle('Edit letter'),
+                title: letterFormTitleResolver,
                 component: LetterFormComponent,
             },
             {
                 path: 'locations/:id',
-                title: pageTitle('Edit location'),
+                title: spaceFormTitleResolver,
                 component: LocationFormComponent,
             },
             {
                 path: 'sources',
-                title: pageTitle('Sources'),
+                title: pageTitle('Data entry'),
                 component: SourcesComponent
             },
             {
                 path: 'sources/:id',
-                title: pageTitle('View source'),
+                title: sourceFormTitleResolver,
                 component: SourceComponent
             },
             {
diff --git a/frontend/src/app/titles.ts b/frontend/src/app/titles.ts
new file mode 100644
index 00000000..a4d3e762
--- /dev/null
+++ b/frontend/src/app/titles.ts
@@ -0,0 +1,141 @@
+import { inject } from "@angular/core";
+import { ActivatedRouteSnapshot, Params, ResolveFn } from "@angular/router";
+import { Apollo, gql, TypedDocumentNode } from "apollo-angular";
+import { map } from "rxjs";
+
+export const SITE_NAME = 'Lettercraft & Epistolary Performance in Medieval Europe';
+export const pageTitle = (name: string) => `${name} - ${SITE_NAME}`;
+
+/**
+ * create a resolver function that relies on a graphQL query
+ *
+ * @param queryFromParams returns a graphQL query based on the route parameters
+ * @param titleFromData transforms the result of the query into a string
+ * @returns a ResolverFn to resolve the title based on the query results
+ */
+const queryTitleResolver = <QueryData>(
+    queryFromParams: (params: Params) => TypedDocumentNode<QueryData, unknown>,
+    titleFromData: (data: QueryData) => string,
+): ResolveFn<string> => {
+    return (route: ActivatedRouteSnapshot) => {
+        const query = queryFromParams(route.params);
+        return inject(Apollo).watchQuery({ query }).valueChanges.pipe(
+            map(result => result.data),
+            map(titleFromData),
+            map(pageTitle),
+        );
+    }
+}
+
+type SourceTitleQueryData = { source?: { name: string } }
+
+const sourceTitleQuery = (params: Params) => gql<SourceTitleQueryData, unknown>(`
+    query SourceTitleQuery {
+        source(id: "${params['id']}") {
+            id
+            name
+        }
+}`);
+
+const sourceFormTitle = (data: SourceTitleQueryData) => `Edit ${data.source?.name}`;
+
+export const sourceFormTitleResolver = queryTitleResolver(
+    sourceTitleQuery, sourceFormTitle);
+
+
+type AgentTitleQueryData = {
+    agentDescription?: { name: string, source: { name: string } }
+};
+
+const agentTitleQuery = (params: Params) => gql<AgentTitleQueryData, unknown>(`
+    query AgentTitleQuery {
+        agentDescription(id: "${params['id']}") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
+}`);
+
+const agentFormTitle = (data: AgentTitleQueryData) => {
+    const agent = data.agentDescription;
+    return `Edit ${agent?.name} (${agent?.source?.name})`
+};
+
+export const agentFormTitleResolver = queryTitleResolver(agentTitleQuery, agentFormTitle);
+
+type LetterTitleQueryData = {
+    letterDescription?: { name: string, source: { name: string } };
+};
+
+const letterTitleQuery = (params: Params) => gql<LetterTitleQueryData, unknown>(`
+    query LetterTitleQuery {
+        letterDescription(id: "${params['id']}") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
+    }
+`);
+
+const letterFormTitle = (data: LetterTitleQueryData) => {
+    const gift = data.letterDescription;
+    return `Edit ${gift?.name} (${gift?.source.name})`;
+}
+
+export const letterFormTitleResolver = queryTitleResolver(
+    letterTitleQuery, letterFormTitle);
+
+
+type GiftTitleQueryData = {
+    giftDescription?: { name: string, source: { name: string } };
+};
+
+const giftTitleQuery = (params: Params) => gql<GiftTitleQueryData, unknown>(`
+    query GiftTitleQuery {
+        giftDescription(id: "${params['id']}") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
+    }
+`);
+
+const giftFormTitle = (data: GiftTitleQueryData) => {
+    const gift = data.giftDescription;
+    return `Edit ${gift?.name} (${gift?.source.name})`;
+}
+
+export const giftFormTitleResolver = queryTitleResolver(giftTitleQuery, giftFormTitle);
+
+type SpaceTitleQueryData = {
+    spaceDescription?: { name: string, source: { name: string } };
+};
+
+const spaceTitleQuery = (params: Params) => gql<SpaceTitleQueryData, unknown>(`
+    query SpaceTitleQuery {
+        spaceDescription(id: "${params['id']}") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
+    }
+`);
+
+const spaceFormTitle = (data: SpaceTitleQueryData) => {
+    const gift = data.spaceDescription;
+    return `Edit ${gift?.name} (${gift?.source.name})`;
+}
+
+export const spaceFormTitleResolver = queryTitleResolver(spaceTitleQuery, spaceFormTitle);

From 173564c8106850f3bb0a5c047d19fecc31b13041 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 20 Aug 2024 14:03:55 +0200
Subject: [PATCH 281/565] parametrised types

---
 frontend/src/app/titles.ts | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/titles.ts b/frontend/src/app/titles.ts
index a4d3e762..915d7e04 100644
--- a/frontend/src/app/titles.ts
+++ b/frontend/src/app/titles.ts
@@ -43,9 +43,10 @@ export const sourceFormTitleResolver = queryTitleResolver(
     sourceTitleQuery, sourceFormTitle);
 
 
-type AgentTitleQueryData = {
-    agentDescription?: { name: string, source: { name: string } }
-};
+type EntityDescriptionTitleQueryData<D extends string> =
+    Record<D, { name: string, source: { name: string } }>;
+
+type AgentTitleQueryData = EntityDescriptionTitleQueryData<'agentDescription'>;
 
 const agentTitleQuery = (params: Params) => gql<AgentTitleQueryData, unknown>(`
     query AgentTitleQuery {
@@ -66,9 +67,7 @@ const agentFormTitle = (data: AgentTitleQueryData) => {
 
 export const agentFormTitleResolver = queryTitleResolver(agentTitleQuery, agentFormTitle);
 
-type LetterTitleQueryData = {
-    letterDescription?: { name: string, source: { name: string } };
-};
+type LetterTitleQueryData = EntityDescriptionTitleQueryData<'letterDescription'>;
 
 const letterTitleQuery = (params: Params) => gql<LetterTitleQueryData, unknown>(`
     query LetterTitleQuery {
@@ -92,9 +91,7 @@ export const letterFormTitleResolver = queryTitleResolver(
     letterTitleQuery, letterFormTitle);
 
 
-type GiftTitleQueryData = {
-    giftDescription?: { name: string, source: { name: string } };
-};
+type GiftTitleQueryData = EntityDescriptionTitleQueryData<'giftDescription'>;
 
 const giftTitleQuery = (params: Params) => gql<GiftTitleQueryData, unknown>(`
     query GiftTitleQuery {
@@ -116,9 +113,7 @@ const giftFormTitle = (data: GiftTitleQueryData) => {
 
 export const giftFormTitleResolver = queryTitleResolver(giftTitleQuery, giftFormTitle);
 
-type SpaceTitleQueryData = {
-    spaceDescription?: { name: string, source: { name: string } };
-};
+type SpaceTitleQueryData = EntityDescriptionTitleQueryData<'spaceDescription'>;
 
 const spaceTitleQuery = (params: Params) => gql<SpaceTitleQueryData, unknown>(`
     query SpaceTitleQuery {

From 7e6b9ebc844d18e22a3c2ecb9e0b338e1f0de9f1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 20 Aug 2024 14:56:53 +0200
Subject: [PATCH 282/565] DRY title formating

---
 frontend/src/app/titles.ts | 65 +++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 40 deletions(-)

diff --git a/frontend/src/app/titles.ts b/frontend/src/app/titles.ts
index 915d7e04..a061870f 100644
--- a/frontend/src/app/titles.ts
+++ b/frontend/src/app/titles.ts
@@ -2,6 +2,7 @@ import { inject } from "@angular/core";
 import { ActivatedRouteSnapshot, Params, ResolveFn } from "@angular/router";
 import { Apollo, gql, TypedDocumentNode } from "apollo-angular";
 import { map } from "rxjs";
+import _ from "underscore";
 
 export const SITE_NAME = 'Lettercraft & Epistolary Performance in Medieval Europe';
 export const pageTitle = (name: string) => `${name} - ${SITE_NAME}`;
@@ -42,9 +43,8 @@ const sourceFormTitle = (data: SourceTitleQueryData) => `Edit ${data.source?.nam
 export const sourceFormTitleResolver = queryTitleResolver(
     sourceTitleQuery, sourceFormTitle);
 
-
-type EntityDescriptionTitleQueryData<D extends string> =
-    Record<D, { name: string, source: { name: string } }>;
+type EntityDescriptionTitleQueryData<Key extends string> =
+    Record<Key, { name: string, source: { name: string } }>;
 
 type AgentTitleQueryData = EntityDescriptionTitleQueryData<'agentDescription'>;
 
@@ -53,19 +53,24 @@ const agentTitleQuery = (params: Params) => gql<AgentTitleQueryData, unknown>(`
         agentDescription(id: "${params['id']}") {
             id
             name
-            source {
-                id
-                name
-            }
+            source { id, name }
         }
 }`);
 
-const agentFormTitle = (data: AgentTitleQueryData) => {
-    const agent = data.agentDescription;
-    return `Edit ${agent?.name} (${agent?.source?.name})`
-};
+const entityDescriptionFormTitle = <Key extends string>(
+    data: EntityDescriptionTitleQueryData<Key>
+) => {
+    const key = _.first(_.keys(data)) as Key;
+    const entity = data[key];
+    if (entity) {
+        return `Edit ${entity.name} (${entity.source.name})`;
+    } else {
+        return 'Not found';
+    }
+}
 
-export const agentFormTitleResolver = queryTitleResolver(agentTitleQuery, agentFormTitle);
+export const agentFormTitleResolver = queryTitleResolver(
+    agentTitleQuery, entityDescriptionFormTitle);
 
 type LetterTitleQueryData = EntityDescriptionTitleQueryData<'letterDescription'>;
 
@@ -74,21 +79,14 @@ const letterTitleQuery = (params: Params) => gql<LetterTitleQueryData, unknown>(
         letterDescription(id: "${params['id']}") {
             id
             name
-            source {
-                id
-                name
-            }
+            source { id, name }
         }
     }
 `);
 
-const letterFormTitle = (data: LetterTitleQueryData) => {
-    const gift = data.letterDescription;
-    return `Edit ${gift?.name} (${gift?.source.name})`;
-}
 
 export const letterFormTitleResolver = queryTitleResolver(
-    letterTitleQuery, letterFormTitle);
+    letterTitleQuery, entityDescriptionFormTitle);
 
 
 type GiftTitleQueryData = EntityDescriptionTitleQueryData<'giftDescription'>;
@@ -98,20 +96,14 @@ const giftTitleQuery = (params: Params) => gql<GiftTitleQueryData, unknown>(`
         giftDescription(id: "${params['id']}") {
             id
             name
-            source {
-                id
-                name
-            }
+            source { id, name }
         }
     }
 `);
 
-const giftFormTitle = (data: GiftTitleQueryData) => {
-    const gift = data.giftDescription;
-    return `Edit ${gift?.name} (${gift?.source.name})`;
-}
 
-export const giftFormTitleResolver = queryTitleResolver(giftTitleQuery, giftFormTitle);
+export const giftFormTitleResolver = queryTitleResolver(
+    giftTitleQuery, entityDescriptionFormTitle);
 
 type SpaceTitleQueryData = EntityDescriptionTitleQueryData<'spaceDescription'>;
 
@@ -120,17 +112,10 @@ const spaceTitleQuery = (params: Params) => gql<SpaceTitleQueryData, unknown>(`
         spaceDescription(id: "${params['id']}") {
             id
             name
-            source {
-                id
-                name
-            }
+            source { id, name }
         }
     }
 `);
 
-const spaceFormTitle = (data: SpaceTitleQueryData) => {
-    const gift = data.spaceDescription;
-    return `Edit ${gift?.name} (${gift?.source.name})`;
-}
-
-export const spaceFormTitleResolver = queryTitleResolver(spaceTitleQuery, spaceFormTitle);
+export const spaceFormTitleResolver = queryTitleResolver(
+    spaceTitleQuery, entityDescriptionFormTitle);

From 5545feb371c5e2cd9f801c915e6d3f01b261d1b0 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 21 Aug 2024 17:21:41 +0200
Subject: [PATCH 283/565] filter admin inline fields

---
 backend/core/admin.py   | 15 +++++++++++++++
 backend/event/admin.py  | 33 +++++++++++++++++++++++++++++++++
 backend/person/admin.py | 13 +++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/backend/core/admin.py b/backend/core/admin.py
index 873c943c..6999f49b 100644
--- a/backend/core/admin.py
+++ b/backend/core/admin.py
@@ -1,4 +1,9 @@
 from django.contrib import admin
+from django.db.models.fields.related import RelatedField
+from django.db.models.query import QuerySet
+from django.http import HttpRequest
+import re
+
 
 named_fieldset = (
     "Name and description",
@@ -37,3 +42,13 @@ class EntityDescriptionAdmin(admin.ModelAdmin):
         contributions_fieldset,
         description_source_fieldset,
     ]
+
+
+def get_queryset_matching_parent_source(
+    admin: admin.StackedInline | admin.TabularInline,
+    db_field: RelatedField,
+    request: HttpRequest,
+) -> QuerySet:
+    parent_id = re.search(f"\d+", request.path).group(0)
+    parent = admin.parent_model.objects.get(id=parent_id)
+    return db_field.remote_field.model.objects.filter(source=parent.source)
diff --git a/backend/event/admin.py b/backend/event/admin.py
index 44c80fa1..0b08f1c1 100644
--- a/backend/event/admin.py
+++ b/backend/event/admin.py
@@ -1,3 +1,4 @@
+from typing import Any
 from django.contrib import admin
 from . import models
 from core import admin as core_admin
@@ -15,6 +16,14 @@ class EpisodeAgentAdmin(admin.StackedInline):
     extra = 0
     verbose_name = "involved agent"
 
+    def get_field_queryset(self, db, db_field, request):
+        if db_field.name == "agent":
+            return core_admin.get_queryset_matching_parent_source(
+                self, db_field, request
+            )
+
+        return super().get_field_queryset(db, db_field, request)
+
 
 class EpisodeGiftAdmin(admin.StackedInline):
     model = models.EpisodeGift
@@ -22,6 +31,14 @@ class EpisodeGiftAdmin(admin.StackedInline):
     extra = 0
     verbose_name = "involved gift"
 
+    def get_field_queryset(self, db, db_field, request):
+        if db_field.name == "gift":
+            return core_admin.get_queryset_matching_parent_source(
+                self, db_field, request
+            )
+
+        return super().get_field_queryset(db, db_field, request)
+
 
 class EpisodeLetterAdmin(admin.StackedInline):
     model = models.EpisodeLetter
@@ -29,6 +46,14 @@ class EpisodeLetterAdmin(admin.StackedInline):
     extra = 0
     verbose_name = "involved letter"
 
+    def get_field_queryset(self, db, db_field, request):
+        if db_field.name == "letter":
+            return core_admin.get_queryset_matching_parent_source(
+                self, db_field, request
+            )
+
+        return super().get_field_queryset(db, db_field, request)
+
 
 class EpisodeSpaceAdmin(admin.StackedInline):
     model = models.EpisodeSpace
@@ -36,6 +61,14 @@ class EpisodeSpaceAdmin(admin.StackedInline):
     extra = 0
     verbose_name = "involved space"
 
+    def get_field_queryset(self, db, db_field, request):
+        if db_field.name == "space":
+            return core_admin.get_queryset_matching_parent_source(
+                self, db_field, request
+            )
+
+        return super().get_field_queryset(db, db_field, request)
+
 
 @admin.register(models.Episode)
 class EpisodeAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
diff --git a/backend/person/admin.py b/backend/person/admin.py
index 33f7ec99..ee9c6e60 100644
--- a/backend/person/admin.py
+++ b/backend/person/admin.py
@@ -1,4 +1,9 @@
+from typing import Any
 from django.contrib import admin
+from django.db.models.fields.related import RelatedField
+from django.db.models.query import QuerySet
+from django.http import HttpRequest
+import re
 
 from . import models
 from core import admin as core_admin
@@ -42,6 +47,14 @@ class AgentDescriptionLocationAdmin(admin.StackedInline):
     fields = ["location"] + core_admin.description_field_fields
     extra = 0
 
+    def get_field_queryset(
+        self, db, db_field: RelatedField, request: HttpRequest
+    ) -> QuerySet:
+        if db_field.name == "location":
+            core_admin.get_queryset_matching_parent_source(self, db_field, request)
+
+        return super().get_field_queryset(db, db_field, request)
+
 
 @admin.register(models.AgentDescription)
 class AgentDescriptionAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):

From 12dd6f5350147deb5f795df0979fb476dbf4fd16 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 22 Aug 2024 14:38:56 +0200
Subject: [PATCH 284/565] Template modal approach

---
 .../new-episode-form.component.html           | 21 +++++++++
 .../new-episode-form.component.scss}          |  0
 .../new-episode-form.component.spec.ts}       | 12 ++---
 .../new-episode-form.component.ts}            | 33 +++++++-------
 .../new-episode-form.graphql}                 |  0
 .../new-episode-modal.component.html          | 44 -------------------
 6 files changed, 45 insertions(+), 65 deletions(-)
 create mode 100644 frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.html
 rename frontend/src/app/data-entry/episode-form/{new-episode-modal/new-episode-modal.component.scss => new-episode-form/new-episode-form.component.scss} (100%)
 rename frontend/src/app/data-entry/episode-form/{new-episode-modal/new-episode-modal.component.spec.ts => new-episode-form/new-episode-form.component.spec.ts} (64%)
 rename frontend/src/app/data-entry/episode-form/{new-episode-modal/new-episode-modal.component.ts => new-episode-form/new-episode-form.component.ts} (70%)
 rename frontend/src/app/data-entry/episode-form/{new-episode-modal/new-episode-modal.graphql => new-episode-form/new-episode-form.graphql} (100%)
 delete mode 100644 frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html

diff --git a/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.html b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.html
new file mode 100644
index 00000000..216e0db7
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.html
@@ -0,0 +1,21 @@
+<form [formGroup]="form" (ngSubmit)="submit()">
+    <div class="form-group">
+        <label class="form-label" for="episode-name">Name</label>
+        <p class="form-text">
+            This is a name to identify the episode in the overview of the
+            source. For example: "journey to Rome", "Clovis' response",
+            "Radegund asks Germanus for help".
+        </p>
+        <input
+            id="episode-name"
+            type="text"
+            class="form-control"
+            [formControl]="form.controls.name"
+            [class.is-invalid]="
+                form.controls.name.invalid && form.controls.name.touched
+            "
+            ngbAutofocus
+        />
+        <p class="invalid-feedback">This field is required.</p>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.scss b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.scss
similarity index 100%
rename from frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.scss
rename to frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.scss
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.spec.ts
similarity index 64%
rename from frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
rename to frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.spec.ts
index ae8c53bb..fddfde92 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.spec.ts
@@ -1,21 +1,21 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { NewEpisodeModalComponent } from "./new-episode-modal.component";
+import { NewEpisodeFormComponent } from "./new-episode-form.component";
 import { DataEntrySharedModule } from "../../shared/data-entry-shared.module";
 import { SharedTestingModule } from "@shared/shared-testing.module";
 import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 
-describe("NewEpisodeModalComponent", () => {
-    let component: NewEpisodeModalComponent;
-    let fixture: ComponentFixture<NewEpisodeModalComponent>;
+describe("NewEpisodeFormComponent", () => {
+    let component: NewEpisodeFormComponent;
+    let fixture: ComponentFixture<NewEpisodeFormComponent>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [NewEpisodeModalComponent],
+            declarations: [NewEpisodeFormComponent],
             providers: [NgbActiveModal],
             imports: [DataEntrySharedModule, SharedTestingModule],
         });
-        fixture = TestBed.createComponent(NewEpisodeModalComponent);
+        fixture = TestBed.createComponent(NewEpisodeFormComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
     });
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
similarity index 70%
rename from frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
rename to frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
index 6e19c030..bcde63ef 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
@@ -1,20 +1,23 @@
-import { Component, DestroyRef, inject, Input, OnInit } from "@angular/core";
+import { Component, DestroyRef, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 import { ToastService } from "@services/toast.service";
-import { DataEntryCreateEpisodeGQL } from "generated/graphql";
+import { CreateEpisodeMutationInput, DataEntryCreateEpisodeGQL } from "generated/graphql";
+
+type NewEpisodeForm = {
+    [key in keyof CreateEpisodeMutationInput]: FormControl<CreateEpisodeMutationInput[key]>;
+};
+
 
 @Component({
-    selector: "lc-new-episode-modal",
-    templateUrl: "./new-episode-modal.component.html",
-    styleUrls: ["./new-episode-modal.component.scss"],
+    selector: "lc-new-episode-form",
+    templateUrl: "./new-episode-form.component.html",
+    styleUrls: ["./new-episode-form.component.scss"],
 })
-export class NewEpisodeModalComponent implements OnInit {
+export class NewEpisodeFormComponent implements OnInit {
     @Input({ required: true }) sourceId: string | null = null;
 
-    public activeModal = inject(NgbActiveModal);
-    public form = new FormGroup({
+    public form = new FormGroup<NewEpisodeForm>({
         name: new FormControl<string>("", {
             nonNullable: true,
             validators: [Validators.required],
@@ -37,9 +40,9 @@ export class NewEpisodeModalComponent implements OnInit {
         }
     }
 
-    public submit(event: Event): void {
-        event.preventDefault();
-        event.stopPropagation();
+    public submit(): void {
+        this.form.updateValueAndValidity();
+        this.form.controls.name.markAsTouched();
         if (this.form.invalid) {
             return;
         }
@@ -70,9 +73,9 @@ export class NewEpisodeModalComponent implements OnInit {
                     type: "success",
                     header: "Success",
                 });
-                this.activeModal.close({
-                    id: result.data?.createEpisode?.episode?.id ?? null,
-                });
+                // this.activeModal.close({
+                //     id: result.data?.createEpisode?.episode?.id ?? null,
+                // });
             });
     }
 }
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.graphql
similarity index 100%
rename from frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.graphql
rename to frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.graphql
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html b/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
deleted file mode 100644
index bebc9b19..00000000
--- a/frontend/src/app/data-entry/episode-form/new-episode-modal/new-episode-modal.component.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<div class="modal-header">
-    <h4>Create new episode</h4>
-    <button
-        type="button"
-        class="btn-close"
-        aria-label="Close"
-        (click)="activeModal.close(null)"
-    ></button>
-</div>
-<div class="modal-body">
-    <form [formGroup]="form" (ngSubmit)="submit($event)">
-        <div class="form-group">
-            <label class="form-label" for="episode-name">Name</label>
-            <p class="form-text">
-                This is a name to identify the episode in the overview of the
-                source. For example: "journey to Rome", "Clovis' response",
-                "Radegund asks Germanus for help".
-            </p>
-            <input
-                id="episode-name"
-                type="text"
-                class="form-control"
-                [formControl]="form.controls.name"
-                [class.is-invalid]="
-                    form.controls.name.invalid && form.controls.name.touched
-                "
-                ngbAutofocus
-            />
-            <p class="invalid-feedback">This field is required.</p>
-        </div>
-    </form>
-</div>
-<div class="modal-footer">
-    <button type="button" class="btn btn-primary" (click)="submit($event)">
-        Create
-    </button>
-    <button
-        type="button"
-        class="btn btn-secondary"
-        (click)="activeModal.close()"
-    >
-        Cancel
-    </button>
-</div>

From 6c739d1151a75010d7deeca863d534abc0e56b92 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 22 Aug 2024 14:40:56 +0200
Subject: [PATCH 285/565] New BaseModal template

---
 .../episode-form/episode-form.module.ts       |  5 ++-
 .../data-entry/source/source.component.html   | 40 ++++++++++++++++++-
 .../app/data-entry/source/source.component.ts | 34 +++++++++-------
 .../base-modal/base-modal.component.html      | 21 ++--------
 .../shared/base-modal/base-modal.component.ts | 14 +++----
 frontend/src/app/shared/shared.module.ts      |  1 +
 6 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.module.ts b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
index 2004996a..2b232e3b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.module.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
@@ -9,7 +9,7 @@ import { EpisodeObjectsFormComponent } from "./episode-objects-form/episode-obje
 import { SharedModule } from "@shared/shared.module";
 import { EpisodeFormComponent } from "./episode-form.component";
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
-import { NewEpisodeModalComponent } from './new-episode-modal/new-episode-modal.component';
+import { NewEpisodeFormComponent } from "./new-episode-form/new-episode-form.component";
 
 @NgModule({
     declarations: [
@@ -20,8 +20,9 @@ import { NewEpisodeModalComponent } from './new-episode-modal/new-episode-modal.
         EpisodeAgentsFormComponent,
         EpisodeLocationsFormComponent,
         EpisodeObjectsFormComponent,
-        NewEpisodeModalComponent,
+        NewEpisodeFormComponent,
     ],
     imports: [CommonModule, SharedModule, DataEntrySharedModule],
+    exports: [NewEpisodeFormComponent],
 })
 export class EpisodeFormModule {}
diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index 51b53872..dd1d53bc 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -16,11 +16,47 @@ <h2 class="mb-4">Episodes</h2>
 </p>
 
 <div class="mb-4" *ngIf="source$ | async as source">
-    <lc-episode-preview *ngFor="let episode of source.episodes; trackBy: identify" [episode]="episode" />
+    <lc-episode-preview
+        *ngFor="let episode of source.episodes; trackBy: identify"
+        [episode]="episode"
+    />
 </div>
 <div class="btn-group mb-4" *ngIf="source$ | async as source">
-    <button class="btn btn-primary" (click)="openNewEpisodeModal(source.id)">
+    <button
+        class="btn btn-primary"
+        (click)="openNewEpisodeModal(newEpisodeModal)"
+    >
         <lc-icon [icon]="actionIcons.create" />
         Add a new episode
     </button>
 </div>
+
+<ng-template #newEpisodeModal>
+    <lc-base-modal (dismiss)="closeModal()" *ngIf="source$ | async as source">
+        <ng-container modal-header>
+            <h4>Create new episode</h4>
+        </ng-container>
+        <ng-container modal-content>
+            <lc-new-episode-form
+                #newEpisodeForm
+                [sourceId]="source.id"
+            ></lc-new-episode-form>
+        </ng-container>
+        <ng-container modal-footer>
+            <button
+                type="button"
+                class="btn btn-primary"
+                (click)="newEpisodeForm.submit()"
+            >
+                Create
+            </button>
+            <button
+                type="button"
+                class="btn btn-secondary"
+                (click)="closeModal()"
+            >
+                Cancel
+            </button>
+        </ng-container>
+    </lc-base-modal>
+</ng-template>
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index ce47fe24..96837455 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -1,14 +1,14 @@
-import { Component, computed } from "@angular/core";
+import {
+    Component,
+    computed,
+    TemplateRef,
+} from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, Router } from "@angular/router";
-import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
+import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap";
 import { actionIcons, dataIcons } from "@shared/icons";
-import {
-    DataEntrySourceDetailGQL,
-    EpisodeType,
-} from "generated/graphql";
+import { DataEntrySourceDetailGQL, EpisodeType } from "generated/graphql";
 import { map, shareReplay, switchMap } from "rxjs";
-import { NewEpisodeModalComponent } from "../episode-form/new-episode-modal/new-episode-modal.component";
 
 @Component({
     selector: "lc-source",
@@ -48,25 +48,31 @@ export class SourceComponent {
     public dataIcons = dataIcons;
     public actionIcons = actionIcons;
 
+    public modal: NgbModalRef | null = null;
+
     constructor(
         private route: ActivatedRoute,
         private router: Router,
         private modalService: NgbModal,
-        private sourceDetailQuery: DataEntrySourceDetailGQL,
+        private sourceDetailQuery: DataEntrySourceDetailGQL
     ) {}
 
-    public openNewEpisodeModal(sourceId: string): void {
-        const modal = this.modalService.open(NewEpisodeModalComponent);
-        modal.componentInstance.sourceId = sourceId;
-        modal.result.then((result: {id : string | null } | null) => {
-            if (result && 'id' in result) {
+    public openNewEpisodeModal(newEpisodeModal: TemplateRef<unknown>): void {
+        this.modal = this.modalService.open(newEpisodeModal);
+        this.modal.result.then((result: { id: string | null; } | null) => {
+            if (result && "id" in result) {
                 this.router.navigate(["/data-entry/episodes", result.id]);
             }
         });
     }
 
+    public closeModal(): void {
+        if (this.modal) {
+            this.modal.close();
+        }
+    }
+
     public identify(_index: number, item: Pick<EpisodeType, "id">): string {
         return item.id;
     }
-
 }
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.html b/frontend/src/app/shared/base-modal/base-modal.component.html
index d30ef1a9..67fc60d5 100644
--- a/frontend/src/app/shared/base-modal/base-modal.component.html
+++ b/frontend/src/app/shared/base-modal/base-modal.component.html
@@ -1,28 +1,15 @@
 <div class="modal-header">
-    <h4>{{ title }}</h4>
+    <ng-content select="[modal-header]" />
     <button
         type="button"
         class="btn-close"
         aria-label="Close"
-        (click)="activeModal.close(cancelValue)"
+        (click)="dismissModal()"
     ></button>
 </div>
 <div class="modal-body">
-    {{ message }}
+    <ng-content select="[modal-content]" />
 </div>
 <div class="modal-footer">
-    <button
-        type="button"
-        class="btn btn-primary"
-        (click)="activeModal.close(confirmValue)"
-    >
-        {{ confirmText }}
-    </button>
-    <button
-        type="button"
-        class="btn btn-secondary"
-        (click)="activeModal.close(cancelValue)"
-    >
-        {{ cancelText }}
-    </button>
+    <ng-content select="[modal-footer]" />
 </div>
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.ts b/frontend/src/app/shared/base-modal/base-modal.component.ts
index c694de1c..6eb6034e 100644
--- a/frontend/src/app/shared/base-modal/base-modal.component.ts
+++ b/frontend/src/app/shared/base-modal/base-modal.component.ts
@@ -1,5 +1,4 @@
-import { Component, inject, Input } from "@angular/core";
-import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
 
 @Component({
     selector: "lc-base-modal",
@@ -8,12 +7,9 @@ import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 })
 export class BaseModalComponent {
     @Input() title = "Lettercraft";
-    @Input() message = "";
-    @Input() confirmText = "Ok";
-    @Input() cancelText = "Cancel";
-    @Input() confirmValue = true;
-    @Input() cancelValue = false;
-    @Input() dismissValue = false;
+    @Output() dismiss = new EventEmitter<void>();
 
-    public activeModal = inject(NgbActiveModal);
+    dismissModal(): void {
+        this.dismiss.emit();
+    }
 }
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index b01a3bbf..46d683c8 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -43,6 +43,7 @@ import { BaseModalComponent } from "./base-modal/base-modal.component";
         NgbModule,
         RouterModule,
         ReactiveFormsModule,
+        BaseModalComponent,
     ],
 })
 export class SharedModule {}

From 0c5c1a44e2ae416504f4e522ddac2484c4fb7044 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 22 Aug 2024 15:36:33 +0200
Subject: [PATCH 286/565] Loading spinner

---
 .../new-episode-form.component.ts             |  7 +--
 .../data-entry/source/source.component.html   |  8 +++-
 .../app/data-entry/source/source.component.ts | 20 ++++----
 frontend/src/app/graphql.module.ts            | 47 ++++++++++++-------
 4 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
index bcde63ef..72c64e43 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
@@ -16,6 +16,8 @@ type NewEpisodeForm = {
 })
 export class NewEpisodeFormComponent implements OnInit {
     @Input({ required: true }) sourceId: string | null = null;
+    @Output() mutationStarted = new EventEmitter<void>();
+    @Output() episodeCreated = new EventEmitter<string | null>();
 
     public form = new FormGroup<NewEpisodeForm>({
         name: new FormControl<string>("", {
@@ -46,6 +48,7 @@ export class NewEpisodeFormComponent implements OnInit {
         if (this.form.invalid) {
             return;
         }
+        this.mutationStarted.emit();
         const input = this.form.getRawValue();
         this.updateEpisode
             .mutate(
@@ -73,9 +76,7 @@ export class NewEpisodeFormComponent implements OnInit {
                     type: "success",
                     header: "Success",
                 });
-                // this.activeModal.close({
-                //     id: result.data?.createEpisode?.episode?.id ?? null,
-                // });
+                this.episodeCreated.emit(result.data?.createEpisode?.episode?.id ?? null);
             });
     }
 }
diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index dd1d53bc..c008649b 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -34,12 +34,14 @@ <h2 class="mb-4">Episodes</h2>
 <ng-template #newEpisodeModal>
     <lc-base-modal (dismiss)="closeModal()" *ngIf="source$ | async as source">
         <ng-container modal-header>
-            <h4>Create new episode</h4>
+            <h4 ngbAutofocus>Create new episode</h4>
         </ng-container>
         <ng-container modal-content>
             <lc-new-episode-form
                 #newEpisodeForm
                 [sourceId]="source.id"
+                (mutationStarted)="mutationInProgress = true"
+                (episodeCreated)="closeAndNavigate($event)"
             ></lc-new-episode-form>
         </ng-container>
         <ng-container modal-footer>
@@ -47,8 +49,12 @@ <h4>Create new episode</h4>
                 type="button"
                 class="btn btn-primary"
                 (click)="newEpisodeForm.submit()"
+
             >
                 Create
+                <div *ngIf="mutationInProgress" class="spinner-border spinner-border-sm">
+                    <span class="visually-hidden">Creating new episode...</span>
+                </div>
             </button>
             <button
                 type="button"
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 96837455..b958bee8 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -1,8 +1,4 @@
-import {
-    Component,
-    computed,
-    TemplateRef,
-} from "@angular/core";
+import { Component, computed, TemplateRef } from "@angular/core";
 import { toSignal } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, Router } from "@angular/router";
 import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap";
@@ -49,6 +45,7 @@ export class SourceComponent {
     public actionIcons = actionIcons;
 
     public modal: NgbModalRef | null = null;
+    public mutationInProgress = false;
 
     constructor(
         private route: ActivatedRoute,
@@ -59,11 +56,6 @@ export class SourceComponent {
 
     public openNewEpisodeModal(newEpisodeModal: TemplateRef<unknown>): void {
         this.modal = this.modalService.open(newEpisodeModal);
-        this.modal.result.then((result: { id: string | null; } | null) => {
-            if (result && "id" in result) {
-                this.router.navigate(["/data-entry/episodes", result.id]);
-            }
-        });
     }
 
     public closeModal(): void {
@@ -72,6 +64,14 @@ export class SourceComponent {
         }
     }
 
+    public closeAndNavigate(episodeId: string | null): void {
+        this.mutationInProgress = false;
+        this.closeModal();
+        if (episodeId) {
+            this.router.navigate(["/data-entry/episodes", episodeId]);
+        }
+    }
+
     public identify(_index: number, item: Pick<EpisodeType, "id">): string {
         return item.id;
     }
diff --git a/frontend/src/app/graphql.module.ts b/frontend/src/app/graphql.module.ts
index 4b89297d..fd844a89 100644
--- a/frontend/src/app/graphql.module.ts
+++ b/frontend/src/app/graphql.module.ts
@@ -1,24 +1,37 @@
-import { APOLLO_OPTIONS, ApolloModule } from 'apollo-angular';
-import { HttpLink } from 'apollo-angular/http';
-import { NgModule } from '@angular/core';
-import { ApolloClientOptions, InMemoryCache } from '@apollo/client/core';
-import { environment } from '@env';
+import { APOLLO_OPTIONS, ApolloModule } from "apollo-angular";
+import { HttpLink } from "apollo-angular/http";
+import { NgModule } from "@angular/core";
+import { ApolloClientOptions, InMemoryCache } from "@apollo/client/core";
+import { environment } from "@env";
 
 export function createApollo(httpLink: HttpLink): ApolloClientOptions<any> {
-  return {
-    link: httpLink.create({ uri: environment.graphqlUrl }),
-    cache: new InMemoryCache(),
-  };
+    return {
+        link: httpLink.create({ uri: environment.graphqlUrl }),
+        cache: new InMemoryCache({
+            typePolicies: {
+                SourceType: {
+                    fields: {
+                        episodes: {
+                            merge(existing, incoming) {
+                                // https://www.apollographql.com/docs/react/caching/cache-field-behavior/#merging-arrays
+                                return incoming;
+                            },
+                        },
+                    },
+                },
+            },
+        }),
+    };
 }
 
 @NgModule({
-  exports: [ApolloModule],
-  providers: [
-    {
-      provide: APOLLO_OPTIONS,
-      useFactory: createApollo,
-      deps: [HttpLink],
-    },
-  ],
+    exports: [ApolloModule],
+    providers: [
+        {
+            provide: APOLLO_OPTIONS,
+            useFactory: createApollo,
+            deps: [HttpLink],
+        },
+    ],
 })
 export class GraphQLModule {}

From 44724ac941208cdec008677db654e5db8ecae70f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 22 Aug 2024 15:37:02 +0200
Subject: [PATCH 287/565] Refactored confirmation modal

---
 frontend/src/app/services/modal.service.ts    | 20 ++++---------
 .../base-modal/base-modal.component.html      | 12 ++++----
 .../confirmation-modal.component.html         | 24 ++++++++++++++++
 .../confirmation-modal.component.scss         |  0
 .../confirmation-modal.component.spec.ts      | 21 ++++++++++++++
 .../confirmation-modal.component.ts           | 28 +++++++++++++++++++
 6 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html
 create mode 100644 frontend/src/app/shared/confirmation-modal/confirmation-modal.component.scss
 create mode 100644 frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
 create mode 100644 frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts

diff --git a/frontend/src/app/services/modal.service.ts b/frontend/src/app/services/modal.service.ts
index 0030a2f4..15c7f56b 100644
--- a/frontend/src/app/services/modal.service.ts
+++ b/frontend/src/app/services/modal.service.ts
@@ -1,15 +1,10 @@
 import { Injectable } from "@angular/core";
 import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
-import { BaseModalComponent } from "@shared/base-modal/base-modal.component";
+import { ConfirmationModalComponent } from "@shared/confirmation-modal/confirmation-modal.component";
 
-interface ModalConfig {
+interface ConfirmationModalConfig {
     title: string;
     message: string;
-    confirmText: string;
-    cancelText: string;
-    confirmValue?: unknown;
-    cancelValue?: unknown;
-    dismissValue?: unknown;
 }
 
 @Injectable({
@@ -18,16 +13,11 @@ interface ModalConfig {
 export class ModalService {
     constructor(private modal: NgbModal) {}
 
-    public openConfirmationModal(config: ModalConfig): Promise<boolean> {
-        const modal = this.modal.open(BaseModalComponent);
-        const { title, message, confirmText, cancelText } = config;
+    public openConfirmationModal(config: ConfirmationModalConfig): Promise<boolean> {
+        const modal = this.modal.open(ConfirmationModalComponent);
+        const { title, message } = config;
         modal.componentInstance.title = title;
         modal.componentInstance.message = message;
-        modal.componentInstance.confirmText = confirmText;
-        modal.componentInstance.cancelText = cancelText;
-        modal.componentInstance.confirmValue = true;
-        modal.componentInstance.cancelValue = false;
-        modal.componentInstance.dismissValue = false;
         return modal.result as Promise<boolean>;
     }
 }
diff --git a/frontend/src/app/shared/base-modal/base-modal.component.html b/frontend/src/app/shared/base-modal/base-modal.component.html
index 67fc60d5..69fef027 100644
--- a/frontend/src/app/shared/base-modal/base-modal.component.html
+++ b/frontend/src/app/shared/base-modal/base-modal.component.html
@@ -1,4 +1,4 @@
-<div class="modal-header">
+<header class="modal-header">
     <ng-content select="[modal-header]" />
     <button
         type="button"
@@ -6,10 +6,10 @@
         aria-label="Close"
         (click)="dismissModal()"
     ></button>
-</div>
-<div class="modal-body">
+</header>
+<section class="modal-body">
     <ng-content select="[modal-content]" />
-</div>
-<div class="modal-footer">
+</section>
+<footer class="modal-footer">
     <ng-content select="[modal-footer]" />
-</div>
+</footer>
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html
new file mode 100644
index 00000000..fd472874
--- /dev/null
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -0,0 +1,24 @@
+<lc-base-modal>
+    <ng-container modal-header>
+        <h4 ngbAutoFocus>{{ title }}</h4>
+    </ng-container>
+    <ng-container modal-content>
+        <p>{{ message }}</p>
+    </ng-container>
+    <ng-container modal-footer>
+        <button
+            type="button"
+            class="btn btn-primary"
+            (click)="confirm()"
+        >
+            Yes
+        </button>
+        <button
+            type="button"
+            class="btn btn-secondary"
+            (click)="cancel()"
+        >
+            No
+        </button>
+    </ng-container>
+</lc-base-modal>
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.scss b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
new file mode 100644
index 00000000..88042d2a
--- /dev/null
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ConfirmationModalComponent } from './confirmation-modal.component';
+
+describe('ConfirmationModalComponent', () => {
+  let component: ConfirmationModalComponent;
+  let fixture: ComponentFixture<ConfirmationModalComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ConfirmationModalComponent]
+    });
+    fixture = TestBed.createComponent(ConfirmationModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
new file mode 100644
index 00000000..3b047092
--- /dev/null
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -0,0 +1,28 @@
+import { Component, Input } from "@angular/core";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
+
+@Component({
+    selector: "lc-confirmation-modal",
+    templateUrl: "./confirmation-modal.component.html",
+    styleUrls: ["./confirmation-modal.component.scss"],
+})
+export class ConfirmationModalComponent {
+    @Input() public title = "Lettercraft";
+    @Input() public message = "Are you sure you want to continue?";
+
+
+    constructor(private activeModal: NgbActiveModal) { }
+
+    public confirm(): void {
+        this.activeModal.close(true);
+    }
+
+    public cancel(): void {
+        this.activeModal.close(false);
+    }
+
+    public dismiss(): void {
+        this.activeModal.dismiss();
+    }
+
+}

From b3383dab0cb99e41c82b39ca6488c2b7990dd47a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 22 Aug 2024 15:37:16 +0200
Subject: [PATCH 288/565] Styling tweaks for empty source data

---
 .../source/episode-preview/episode-preview.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index dd6e315d..0950db8a 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -1,12 +1,12 @@
 <div class="card mb-4">
     <div class="card-header">
-        <div class="d-flex justify-content-between">
+        <div class="d-flex justify-content-between align-items-center">
             <div>
                 <lc-icon [icon]="dataIcons.episode" />
                 &nbsp;
                 {{ episode.name }}
                 <br />
-                <small class="inline-list">
+                <small *ngIf="episode.book || episode.chapter" class="inline-list">
                     <span *ngIf="episode.book" class="inline-list-item">book {{ episode.book }}</span>
                     <span *ngIf="episode.chapter" class="inline-list-item">chapter {{ episode.chapter }}</span>
                 </small>

From c3e2838dc6a79ef502e696df9830ac08a2862077 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 22 Aug 2024 15:37:32 +0200
Subject: [PATCH 289/565] Remove old keys; add modal to module

---
 .../source/episode-preview/episode-preview.component.ts         | 2 --
 frontend/src/app/shared/shared.module.ts                        | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
index 249fc456..54f8c5f3 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
@@ -33,8 +33,6 @@ export class EpisodePreviewComponent {
         this.modalService
             .openConfirmationModal({
                 title: "Delete episode",
-                confirmText: "Delete",
-                cancelText: "Cancel",
                 message: `Are you sure you want to delete this episode? (${this.episode.name})`,
             })
             .then((result) => {
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 46d683c8..ec25ae56 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -10,6 +10,7 @@ import { IconComponent } from "./icon/icon.component";
 import { BreadcrumbComponent } from "./breadcrumb/breadcrumb.component";
 import { ActionButtonGroupComponent } from "./action-button-group/action-button-group.component";
 import { BaseModalComponent } from "./base-modal/base-modal.component";
+import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
 
 @NgModule({
     declarations: [
@@ -17,6 +18,7 @@ import { BaseModalComponent } from "./base-modal/base-modal.component";
         BreadcrumbComponent,
         ActionButtonGroupComponent,
         BaseModalComponent,
+        ConfirmationModalComponent,
     ],
     imports: [
         CommonModule,

From 095ae2bc6568886c6fdf2425a0f8e47583fea0cf Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 22 Aug 2024 15:56:12 +0200
Subject: [PATCH 290/565] Update tests

---
 .../base-modal/base-modal.component.spec.ts   | 15 ++++-
 .../confirmation-modal.component.spec.ts      | 61 ++++++++++++++-----
 .../confirmation-modal.component.ts           |  4 +-
 3 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/frontend/src/app/shared/base-modal/base-modal.component.spec.ts b/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
index 2159b3d3..2b0e6dac 100644
--- a/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
+++ b/frontend/src/app/shared/base-modal/base-modal.component.spec.ts
@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { BaseModalComponent } from "./base-modal.component";
-import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 
 describe("BaseModalComponent", () => {
     let component: BaseModalComponent;
@@ -10,7 +9,6 @@ describe("BaseModalComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [BaseModalComponent],
-            providers: [NgbActiveModal],
         });
         fixture = TestBed.createComponent(BaseModalComponent);
         component = fixture.componentInstance;
@@ -20,4 +18,17 @@ describe("BaseModalComponent", () => {
     it("should create", () => {
         expect(component).toBeTruthy();
     });
+
+    it("should have a default title", () => {
+        expect(component.title).toBe("Lettercraft");
+    });
+
+    it("should emit dismiss event when dismissModal is called", () => {
+        let dismissEventEmitted = false;
+        component.dismiss.subscribe(() => {
+            dismissEventEmitted = true;
+        });
+        component.dismissModal();
+        expect(dismissEventEmitted).toBe(true);
+    });
 });
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
index 88042d2a..7b31b01a 100644
--- a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -1,21 +1,50 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { ConfirmationModalComponent } from './confirmation-modal.component';
+import { ConfirmationModalComponent } from "./confirmation-modal.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 
-describe('ConfirmationModalComponent', () => {
-  let component: ConfirmationModalComponent;
-  let fixture: ComponentFixture<ConfirmationModalComponent>;
+describe("ConfirmationModalComponent", () => {
+    let component: ConfirmationModalComponent;
+    let fixture: ComponentFixture<ConfirmationModalComponent>;
+    let activeModal: NgbActiveModal;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [ConfirmationModalComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [ConfirmationModalComponent],
+            imports: [SharedTestingModule],
+            providers: [NgbActiveModal],
+        });
+        fixture = TestBed.createComponent(ConfirmationModalComponent);
+        component = fixture.componentInstance;
+        activeModal = TestBed.inject(NgbActiveModal);
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+
+    it("should have default title and message", () => {
+        expect(component.title).toBe("Lettercraft");
+        expect(component.message).toBe("Are you sure you want to continue?");
+    });
+
+    it("should close the modal with true when confirm is called", () => {
+        spyOn(activeModal, "close");
+        component.confirm();
+        expect(activeModal.close).toHaveBeenCalledWith(true);
+    });
+
+    it("should close the modal with false when cancel is called", () => {
+        spyOn(activeModal, "close");
+        component.cancel();
+        expect(activeModal.close).toHaveBeenCalledWith(false);
+    });
+
+    it("should dismiss the modal when dismiss is called", () => {
+        spyOn(activeModal, "dismiss");
+        component.dismiss();
+        expect(activeModal.dismiss).toHaveBeenCalled();
     });
-    fixture = TestBed.createComponent(ConfirmationModalComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
 });
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
index 3b047092..379f2ad1 100644
--- a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -10,8 +10,7 @@ export class ConfirmationModalComponent {
     @Input() public title = "Lettercraft";
     @Input() public message = "Are you sure you want to continue?";
 
-
-    constructor(private activeModal: NgbActiveModal) { }
+    constructor(private activeModal: NgbActiveModal) {}
 
     public confirm(): void {
         this.activeModal.close(true);
@@ -24,5 +23,4 @@ export class ConfirmationModalComponent {
     public dismiss(): void {
         this.activeModal.dismiss();
     }
-
 }

From 25879b3f09b8ab3cf0e84ccd5b7ba4f48ef9d547 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 23 Aug 2024 09:28:35 +0200
Subject: [PATCH 291/565] Add user to contributors after mutation

---
 backend/core/types/EntityDescriptionType.py      | 1 +
 backend/event/mutations/UpdateEpisodeMutation.py | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index ec9c2fa8..56af6189 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -7,6 +7,7 @@
 from user.models import User
 from user.types.UserType import UserType
 
+
 class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
     """
     Type for models that extend the EntityDescription model.
diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index a3537f39..e656da95 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -34,7 +34,7 @@ def mutate(cls, root: None, info: ResolveInfo, input: UpdateEpisodeMutationInput
             error = LettercraftErrorType(field="id", messages=[str(e)])
             return cls(ok=False, errors=[error])  # type: ignore
 
-        episode = retrieved_object.object
+        episode: Episode = retrieved_object.object  # type: ignore
 
         try:
             cls.mutate_object(input, episode, info)
@@ -44,6 +44,9 @@ def mutate(cls, root: None, info: ResolveInfo, input: UpdateEpisodeMutationInput
             )
             return cls(ok=False, errors=[error])  # type: ignore
 
+        user = info.context.user
+        episode.contributors.add(user)
+
         episode.save()
 
         return cls(ok=True, errors=[])  # type: ignore

From 7697d22719b309a5704cf6ee62d9264dd8dd4daa Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 23 Aug 2024 09:28:45 +0200
Subject: [PATCH 292/565] Add API tests

---
 backend/core/tests/test_contributors.py | 239 ++++++++++++++++++++++++
 1 file changed, 239 insertions(+)
 create mode 100644 backend/core/tests/test_contributors.py

diff --git a/backend/core/tests/test_contributors.py b/backend/core/tests/test_contributors.py
new file mode 100644
index 00000000..5596d377
--- /dev/null
+++ b/backend/core/tests/test_contributors.py
@@ -0,0 +1,239 @@
+import json
+from graphene_django.utils.testing import GraphQLTestCase
+
+from event.models import Episode
+from source.models import Source
+from user.models import User
+
+
+class ContributorTestCase(GraphQLTestCase):
+    GRAPHQL_URL = "/api/graphql"
+
+    # Any mutation involving a model that inherits EntityDescription will do.
+    # For these tests, we'll use the Episode model.
+
+    UPDATE_EPISODE_MUTATION = """
+        mutation UPDATE_EPISODE($input: UpdateEpisodeMutationInput!) {
+            updateEpisode(input: $input) {
+                ok
+                errors {
+                    field
+                    messages
+                }
+            }
+        }
+    """
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        source = Source.objects.create(name="A New Hope")
+        cls.episode = Episode.objects.create(
+            name="Death Star destroyed", source_id=source.pk
+        )
+        cls.user_1 = User.objects.create(username="Yoda")
+        cls.user_2 = User.objects.create(username="Obi-Wan")
+
+    def test_single_contributor_one_contribution(self):
+        self.client.force_login(self.user_1)
+
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Palpatine"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Palpatine")
+
+        first_contributor = episode.contributors.first()
+
+        if not first_contributor:
+            self.fail("No contributors found after mutation.")
+
+        self.assertEqual(first_contributor.username, "Yoda")
+
+    def test_one_contributor_multiple_contributions(self):
+        self.client.force_login(self.user_1)
+
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Palpatine"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Palpatine")
+        self.assertEqual(len(episode.contributors.all()), 1)
+
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Darth Vader"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Darth Vader")
+        self.assertEqual(
+            len(episode.contributors.all()),
+            1,
+            "Contributors should not increase after multiple contributions.",
+        )
+
+    def test_multiple_contributors_one_contribution(self):
+        self.client.force_login(self.user_1)
+
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Han"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Han")
+        self.assertEqual(len(episode.contributors.all()), 1)
+
+        self.client.force_login(self.user_2)
+
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Leia"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Leia")
+        self.assertEqual(len(episode.contributors.all()), 2)
+
+        first_contributor = episode.contributors.first()
+        second_contributor = episode.contributors.last()
+
+        if not first_contributor or not second_contributor:
+            self.fail("No contributors found after mutation.")
+
+        self.assertEqual(first_contributor.username, "Yoda")
+        self.assertEqual(second_contributor.username, "Obi-Wan")
+
+    def test_multiple_contributors_multiple_contributions(self):
+        self.client.force_login(self.user_1)
+
+        # First contribution by user 1
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Jabba"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Jabba")
+        self.assertEqual(len(episode.contributors.all()), 1)
+
+        self.client.force_login(self.user_2)
+
+        # First contribution by user 2
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Jango"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Jango")
+        self.assertEqual(len(episode.contributors.all()), 2)
+
+        self.client.force_login(self.user_1)
+
+        # Second contribution by user 1
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Luke"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Luke")
+        self.assertEqual(len(episode.contributors.all()), 2)
+
+        self.client.force_login(self.user_2)
+
+        # Second contribution by user 2
+        response = self.query(
+            query=self.UPDATE_EPISODE_MUTATION,
+            input_data={"id": self.episode.pk, "name": "Jar-Jar"},
+        )
+
+        self.assertResponseNoErrors(response)
+
+        content = json.loads(response.content)
+
+        self.assertTrue(content["data"]["updateEpisode"]["ok"])
+        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+
+        episode = Episode.objects.get(id=self.episode.pk)
+
+        self.assertEqual(episode.name, "Jar-Jar")
+        self.assertEqual(len(episode.contributors.all()), 2)
+
+        first_contributor = episode.contributors.first()
+        second_contributor = episode.contributors.last()
+
+        if not first_contributor or not second_contributor:
+            self.fail("No contributors found after mutation.")
+
+        self.assertEqual(first_contributor.username, "Yoda")
+        self.assertEqual(second_contributor.username, "Obi-Wan")

From c966a1d4f444f4add9d132a167c382e00b50cf9a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 23 Aug 2024 10:28:43 +0200
Subject: [PATCH 293/565] Added contributors component

---
 .../episode-preview.component.html            | 16 ++--
 .../episode-preview.component.spec.ts         |  1 +
 .../src/app/data-entry/source/source.graphql  |  4 +
 .../contributors/contributors.component.html  |  8 ++
 .../contributors/contributors.component.scss  |  0
 .../contributors.component.spec.ts            | 74 +++++++++++++++++++
 .../contributors/contributors.component.ts    | 12 +++
 frontend/src/app/shared/shared.module.ts      |  5 +-
 8 files changed, 110 insertions(+), 10 deletions(-)
 create mode 100644 frontend/src/app/shared/contributors/contributors.component.html
 create mode 100644 frontend/src/app/shared/contributors/contributors.component.scss
 create mode 100644 frontend/src/app/shared/contributors/contributors.component.spec.ts
 create mode 100644 frontend/src/app/shared/contributors/contributors.component.ts

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index ab68d666..7f10adb7 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -7,7 +7,8 @@
                 {{ episode.name }}
                 <br />
                 <small>
-                    <span>book {{ episode.book }}</span>,
+                    <span>book {{ episode.book }}</span
+                    >,
                     <span>chapter {{ episode.chapter }}</span>
                 </small>
             </div>
@@ -23,10 +24,7 @@
 
         <dl>
             <dt>Agents</dt>
-            <dd
-                *ngIf="episode.agents.length > 0; else noAgents"
-                class="ms-4"
-            >
+            <dd *ngIf="episode.agents.length > 0; else noAgents" class="ms-4">
                 <ul class="inline-list">
                     <li
                         *ngFor="let agent of episode.agents"
@@ -47,10 +45,7 @@
             </ng-template>
 
             <dt>Locations</dt>
-            <dd
-                *ngIf="episode.spaces.length > 0; else noSpaces"
-                class="ms-4"
-            >
+            <dd *ngIf="episode.spaces.length > 0; else noSpaces" class="ms-4">
                 <ul class="inline-list">
                     <li
                         *ngFor="let space of episode.spaces"
@@ -106,5 +101,8 @@
                 <dd class="ms-4">No objects have been added yet.</dd>
             </ng-template>
         </dl>
+        <div class="d-flex justify-content-end">
+            <lc-contributors [contributors]="episode.contributors" />
+        </div>
     </div>
 </div>
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
index cddbe7f7..70b20337 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.spec.ts
@@ -23,6 +23,7 @@ describe("EpisodePreviewComponent", () => {
             chapter: '',
             page: '',
             agents: [],
+            contributors: [],
             gifts: [],
             letters: [],
             spaces: [],
diff --git a/frontend/src/app/data-entry/source/source.graphql b/frontend/src/app/data-entry/source/source.graphql
index 612d293a..06d2004c 100644
--- a/frontend/src/app/data-entry/source/source.graphql
+++ b/frontend/src/app/data-entry/source/source.graphql
@@ -14,6 +14,10 @@ query DataEntrySourceDetail($id: ID!) {
             summary
             book
             chapter
+            contributors {
+                id
+                fullName
+            }
             page
             agents {
                 id
diff --git a/frontend/src/app/shared/contributors/contributors.component.html b/frontend/src/app/shared/contributors/contributors.component.html
new file mode 100644
index 00000000..86730acc
--- /dev/null
+++ b/frontend/src/app/shared/contributors/contributors.component.html
@@ -0,0 +1,8 @@
+<small class="contributors text-muted">
+    <ng-container *ngIf="contributors.length === 0"
+        >No contributors</ng-container
+    >
+    <ng-container *ngIf="contributors.length === 1">Contributor: {{ contributors[0].fullName }}</ng-container>
+    <ng-container *ngIf="contributors.length === 2">Contributors: {{ contributors[0].fullName }}, {{ contributors[1].fullName }}</ng-container>
+    <ng-container *ngIf="contributors.length > 2">Contributors: {{ contributors[0].fullName }} et al.</ng-container>
+</small>
diff --git a/frontend/src/app/shared/contributors/contributors.component.scss b/frontend/src/app/shared/contributors/contributors.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/shared/contributors/contributors.component.spec.ts b/frontend/src/app/shared/contributors/contributors.component.spec.ts
new file mode 100644
index 00000000..b2c51aaa
--- /dev/null
+++ b/frontend/src/app/shared/contributors/contributors.component.spec.ts
@@ -0,0 +1,74 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { ContributorsComponent } from "./contributors.component";
+import { UserType } from "generated/graphql";
+
+describe("ContributorsComponent", () => {
+    let component: ContributorsComponent;
+    let fixture: ComponentFixture<ContributorsComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [ContributorsComponent],
+        });
+        fixture = TestBed.createComponent(ContributorsComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+
+    it("should have input property 'contributors'", () => {
+        expect(component.contributors).toBeDefined();
+    });
+
+    it("should render no contributors", () => {
+        const contributors: Pick<UserType, "id" | "fullName">[] = [];
+        component.contributors = contributors;
+        fixture.detectChanges();
+        const compiled = fixture.nativeElement;
+        const element: HTMLElement = compiled.querySelector(".contributors");
+        self.expect(element).toBeDefined();
+        self.expect(element.textContent).toBe("No contributors");
+    });
+
+    it("should render one contributor", () => {
+        const contributors: Pick<UserType, "id" | "fullName">[] = [
+            { id: "1", fullName: "Anakin Skywalker" },
+        ];
+        component.contributors = contributors;
+        fixture.detectChanges();
+        const compiled = fixture.nativeElement;
+        const element: HTMLElement = compiled.querySelector(".contributors");
+        self.expect(element).toBeDefined();
+        self.expect(element.textContent).toBe("Contributor: Anakin Skywalker");
+    });
+
+    it("should render two contributors", () => {
+        const contributors: Pick<UserType, "id" | "fullName">[] = [
+            { id: "1", fullName: "Anakin Skywalker" },
+            { id: "2", fullName: "Jabba the Hutt" },
+        ];
+        component.contributors = contributors;
+        fixture.detectChanges();
+        const compiled = fixture.nativeElement;
+        const element: HTMLElement = compiled.querySelector(".contributors");
+        self.expect(element).toBeDefined();
+        self.expect(element.textContent).toBe("Contributors: Anakin Skywalker, Jabba the Hutt");
+    });
+
+    it("should render three contributors", () => {
+        const contributors: Pick<UserType, "id" | "fullName">[] = [
+            { id: "1", fullName: "Anakin Skywalker" },
+            { id: "2", fullName: "Jabba the Hutt" },
+            { id: "3", fullName: "Queen Amidala" },
+        ];
+        component.contributors = contributors;
+        fixture.detectChanges();
+        const compiled = fixture.nativeElement;
+        const element: HTMLElement = compiled.querySelector(".contributors");
+        self.expect(element).toBeDefined();
+        self.expect(element.textContent).toBe("Contributors: Anakin Skywalker et al.");
+    });
+});
diff --git a/frontend/src/app/shared/contributors/contributors.component.ts b/frontend/src/app/shared/contributors/contributors.component.ts
new file mode 100644
index 00000000..3d8647ea
--- /dev/null
+++ b/frontend/src/app/shared/contributors/contributors.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from "@angular/core";
+import { UserType } from "generated/graphql";
+
+@Component({
+    selector: "lc-contributors",
+    templateUrl: "./contributors.component.html",
+    styleUrls: ["./contributors.component.scss"],
+})
+export class ContributorsComponent {
+    @Input({ required: true })
+    public contributors: Pick<UserType, "id" | "fullName">[] = [];
+}
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index c49ddc21..cfccc385 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -9,6 +9,7 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { IconComponent } from './icon/icon.component';
 import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
 import { ActionButtonGroupComponent } from './action-button-group/action-button-group.component';
+import { ContributorsComponent } from './contributors/contributors.component';
 
 
 
@@ -16,7 +17,8 @@ import { ActionButtonGroupComponent } from './action-button-group/action-button-
     declarations: [
         IconComponent,
         BreadcrumbComponent,
-        ActionButtonGroupComponent
+        ActionButtonGroupComponent,
+        ContributorsComponent,
     ],
     imports: [
         CommonModule,
@@ -35,6 +37,7 @@ import { ActionButtonGroupComponent } from './action-button-group/action-button-
         IconComponent,
         BreadcrumbComponent,
         ActionButtonGroupComponent,
+        ContributorsComponent,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,

From da1e2edb264018c1a15b886d2f364a64f336a2c5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 23 Aug 2024 10:29:07 +0200
Subject: [PATCH 294/565] Added fullName property to UserType

---
 backend/user/types/UserType.py    | 8 +++++++-
 frontend/generated/graphql.ts     | 7 ++++++-
 frontend/generated/schema.graphql | 1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/backend/user/types/UserType.py b/backend/user/types/UserType.py
index 978ebc26..6e6d4538 100644
--- a/backend/user/types/UserType.py
+++ b/backend/user/types/UserType.py
@@ -1,4 +1,4 @@
-from graphene import ResolveInfo
+from graphene import ResolveInfo, String
 from graphene_django import DjangoObjectType
 
 from django.db.models import QuerySet
@@ -6,6 +6,8 @@
 
 
 class UserType(DjangoObjectType):
+    full_name = String(required=True)
+
     class Meta:
         model = User
         fields = [
@@ -19,3 +21,7 @@ def get_queryset(
         cls, queryset: QuerySet[User], info: ResolveInfo
     ) -> QuerySet[User]:
         return queryset.all()
+
+    @staticmethod
+    def resolve_full_name(parent: User, info: ResolveInfo) -> str:
+        return f"{parent.first_name} {parent.last_name}"
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 1a6ada2f..7ae8e507 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -796,6 +796,7 @@ export type UpdateOrCreateSourceMutation = {
 export type UserType = {
   __typename?: 'UserType';
   firstName: Scalars['String']['output'];
+  fullName: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   lastName: Scalars['String']['output'];
 };
@@ -889,7 +890,7 @@ export type DataEntrySourceDetailQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
+export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
 
 export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1196,6 +1197,10 @@ export const DataEntrySourceDetailDocument = gql`
       summary
       book
       chapter
+      contributors {
+        id
+        fullName
+      }
       page
       agents {
         id
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 68aa5f19..800871a7 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -847,6 +847,7 @@ type UpdateOrCreateSourceMutation {
 
 type UserType {
   firstName: String!
+  fullName: String!
   id: ID!
   lastName: String!
 }
\ No newline at end of file

From f4a24fbbb9d4f7c7104e34e9ccc5b2a9782a66df Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 8 Aug 2024 11:02:19 +0200
Subject: [PATCH 295/565] draft update agent mutation

---
 backend/conftest.py                           |   8 ++
 backend/core/models.py                        |  12 +-
 backend/graphql_app/schema.py                 |   2 +
 .../person/mutations/UpdateAgentMutation.py   | 125 ++++++++++++++++++
 backend/person/tests/test_person_mutations.py | 113 ++++++++++++++++
 frontend/generated/graphql.ts                 |  19 +++
 frontend/generated/schema.graphql             |  13 ++
 7 files changed, 287 insertions(+), 5 deletions(-)
 create mode 100644 backend/person/mutations/UpdateAgentMutation.py
 create mode 100644 backend/person/tests/test_person_mutations.py

diff --git a/backend/conftest.py b/backend/conftest.py
index 7c81d1ee..aad49ad1 100644
--- a/backend/conftest.py
+++ b/backend/conftest.py
@@ -1,5 +1,6 @@
 from allauth.account.models import EmailAddress
 import pytest
+from graphene.test import Client
 
 from case_study.models import CaseStudy
 from letter.models import LetterDescription
@@ -8,6 +9,7 @@
 from source.models import Source
 from event.models import Episode
 from user.models import User
+from graphql_app.schema import schema
 
 
 @pytest.fixture()
@@ -119,3 +121,9 @@ def episode(db, source, agent_description, agent_description_2):
 def case_study(db):
     case_study = CaseStudy.objects.create(name="Test Case Study")
     return case_study
+
+
+@pytest.fixture()
+def graphql_client():
+    client = Client(schema)
+    return client
diff --git a/backend/core/models.py b/backend/core/models.py
index 68b62fb5..ffa0fb9b 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -5,17 +5,19 @@
 from user.models import User
 
 
+class Certainty(models.IntegerChoices):
+    UNCERTAIN = (0, "uncertain")
+    SOMEWHAT_CERTAIN = (1, "somewhat certain")
+    CERTAIN = (2, "certain")
+
+
 class Field(models.Model):
     """
     A piece of information about an entity.
     """
 
     certainty = models.IntegerField(
-        choices=[
-            (0, "uncertain"),
-            (1, "somewhat certain"),
-            (2, "certain"),
-        ],
+        choices=Certainty.choices,
         default=2,
         help_text="How certain are you of this value?",
     )
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index d96ef993..fd9fd313 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -8,6 +8,7 @@
 from user.queries import UserQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
+from person.mutations.UpdateAgentMutation import UpdateAgentMutation
 
 
 class Query(
@@ -25,6 +26,7 @@ class Query(
 class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
     update_episode = UpdateEpisodeMutation.Field()
+    update_agent = UpdateAgentMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
new file mode 100644
index 00000000..d4ab255f
--- /dev/null
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -0,0 +1,125 @@
+from graphene import (
+    ID,
+    String,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    Field,
+    List,
+    Enum,
+    NonNull,
+)
+
+from person.types.AgentDescriptionType import AgentDescriptionType
+from person.models import (
+    AgentDescription,
+    Gender,
+    AgentDescriptionGender,
+    AgentDescriptionLocation,
+)
+from core.models import SourceMention, Certainty
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Model
+
+
+class UpdateAgentGenderInput(InputObjectType):
+    gender = Enum.from_enum(Gender)()
+    source_mention = Enum.from_enum(SourceMention)()
+    note = String()
+
+
+class UpdateAgentLocationInput(InputObjectType):
+    location = Field(ID)
+    source_mention = Field(Enum.from_enum(SourceMention))
+    note = String()
+
+
+class UpdatePersonReferenceInput(InputObjectType):
+    person = Field(ID)
+    certainty = Field(Enum.from_enum(Certainty))
+    note = String()
+
+
+class UpdateAgentInput(InputObjectType):
+    id = ID(required=True)
+    name = String()
+    description = String()
+    is_group = Boolean()
+    designators = List(String)
+    gender = UpdateAgentGenderInput()
+    location = UpdateAgentLocationInput()
+    person_references = List(NonNull(UpdatePersonReferenceInput))
+
+
+class UpdateAgentMutation(LettercraftMutation):
+    django_model = AgentDescription
+
+    ok = Boolean(required=True)
+    agent = Field(AgentDescriptionType)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        agent_data = UpdateAgentInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, agent_data: UpdateAgentInput):
+        try:
+            retrieved = cls.get_or_create_object(info, agent_data)
+        except AgentDescription.DoesNotExist as e:
+            error = LettercraftErrorType(field="id", messages=[str(e)])
+            return cls(ok=False, error=[error])
+
+        agent = retrieved.object
+
+        try:
+            cls.mutate_object(
+                agent_data, agent, info, excluded_fields=["gender", "location"]
+            )
+            cls.handle_nested_fields(agent, agent_data, info)
+
+        except ObjectDoesNotExist as field:
+            error = LettercraftErrorType(
+                field=str(field), messages=["Related object cannot be found."]
+            )
+            return cls(ok=False, errors=[error], agent=agent)
+
+        # refresh to load related objects if those were updated
+        agent.refresh_from_db()
+
+        return cls(ok=True, errors=[], agent=agent)
+
+    @classmethod
+    def handle_nested_fields(
+        cls, agent: AgentDescription, agent_data: UpdateAgentInput, info: ResolveInfo
+    ):
+        cls.mutate_nested_object(
+            agent, agent_data, info, "gender", AgentDescriptionGender, "agent"
+        )
+        cls.mutate_nested_object(
+            agent, agent_data, info, "location", AgentDescriptionLocation, "agent"
+        )
+
+    @classmethod
+    def mutate_nested_object(
+        cls,
+        agent: AgentDescription,
+        agent_data: UpdateAgentInput,
+        info: ResolveInfo,
+        field_name: str,
+        related_model: Model,
+        related_name: str = "agent",
+    ):
+        if not field_name in agent_data:
+            return
+
+        nested_data = getattr(agent_data, field_name)
+
+        if nested_data is None:
+            related_model.objects.filter(**{related_name: agent}).delete()
+        else:
+            related_obj, _created = related_model.objects.get_or_create(
+                **{related_name: agent}
+            )
+            cls.mutate_object(nested_data, related_obj, info)
diff --git a/backend/person/tests/test_person_mutations.py b/backend/person/tests/test_person_mutations.py
new file mode 100644
index 00000000..6d368c94
--- /dev/null
+++ b/backend/person/tests/test_person_mutations.py
@@ -0,0 +1,113 @@
+def update_agent_body(agent_data: str):
+    return f"""
+    mutation testMutation {{
+        updateAgent(agentData: {{{agent_data}}}) {{
+            ok
+            errors {{
+                field
+                messages
+            }}
+            agent {{
+                id
+                name
+                description
+                gender {{
+                    gender
+                    note
+                }}
+            }}
+        }}
+    }}
+    """
+
+
+def assert_agent_data(result, expected_agent):
+    data = result["data"]["updateAgent"]
+    assert data["ok"] == True
+    assert len(data["errors"]) == 0
+    assert data["agent"] == expected_agent
+
+
+def test_update_agent_description(graphql_client, agent_description):
+    result = graphql_client.execute(
+        update_agent_body(f'id: "{agent_description.pk}", name: "Bertus"')
+    )
+    assert_agent_data(
+        result,
+        {
+            "id": str(agent_description.id),
+            "name": "Bertus",
+            "description": "",
+            "gender": None,
+        },
+    )
+
+    result_2 = graphql_client.execute(
+        update_agent_body(
+            f'id: "{agent_description.pk}", description: "Friend of Ernie"'
+        )
+    )
+    assert_agent_data(
+        result_2,
+        {
+            "id": str(agent_description.id),
+            "name": "Bertus",
+            "description": "Friend of Ernie",
+            "gender": None,
+        },
+    )
+
+    result_3 = graphql_client.execute(
+        update_agent_body(f'id: "{agent_description.pk}", description: ""')
+    )
+    assert_agent_data(
+        result_3,
+        {
+            "id": str(agent_description.id),
+            "name": "Bertus",
+            "description": "",
+            "gender": None,
+        },
+    )
+
+
+def test_update_agent_gender(graphql_client, agent_description):
+    add_gender_result = graphql_client.execute(
+        update_agent_body(f'id: "{agent_description.pk}", gender: {{ gender: MALE}}')
+    )
+    assert_agent_data(
+        add_gender_result,
+        {
+            "id": str(agent_description.id),
+            "name": "Bert",
+            "description": "",
+            "gender": {"gender": "MALE", "note": ""},
+        },
+    )
+    update_gender_note_result = graphql_client.execute(
+        update_agent_body(
+            f'id: "{agent_description.pk}", gender: {{ note: "Blablabla"}}'
+        )
+    )
+    assert_agent_data(
+        update_gender_note_result,
+        {
+            "id": str(agent_description.id),
+            "name": "Bert",
+            "description": "",
+            "gender": {"gender": "MALE", "note": "Blablabla"},
+        },
+    )
+
+    remove_gender_result = graphql_client.execute(
+        update_agent_body(f'id: "{agent_description.pk}", gender: null')
+    )
+    assert_agent_data(
+        remove_gender_result,
+        {
+            "id": str(agent_description.id),
+            "name": "Bert",
+            "description": "",
+            "gender": None,
+        },
+    )
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 1a6ada2f..2ec5696d 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -288,11 +288,17 @@ export type LettercraftErrorType = {
 
 export type Mutation = {
   __typename?: 'Mutation';
+  updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
 };
 
 
+export type MutationUpdateAgentArgs = {
+  agentData: UpdateAgentInput;
+};
+
+
 export type MutationUpdateEpisodeArgs = {
   input: UpdateEpisodeMutationInput;
 };
@@ -761,6 +767,19 @@ export type StructureType = {
   settlement?: Maybe<SettlementType>;
 };
 
+export type UpdateAgentInput = {
+  description?: InputMaybe<Scalars['String']['input']>;
+  id: Scalars['ID']['input'];
+  isGroup?: InputMaybe<Scalars['Boolean']['input']>;
+  name?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdateAgentMutation = {
+  __typename?: 'UpdateAgentMutation';
+  agent?: Maybe<AgentDescriptionType>;
+  error?: Maybe<Scalars['String']['output']>;
+};
+
 export type UpdateCreateSourceInput = {
   editionAuthor?: InputMaybe<Scalars['String']['input']>;
   editionTitle?: InputMaybe<Scalars['String']['input']>;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 68aa5f19..39fe95a5 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -331,6 +331,7 @@ type LettercraftErrorType {
 }
 
 type Mutation {
+  updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
   updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
 }
@@ -815,6 +816,18 @@ type StructureType {
   settlement: SettlementType
 }
 
+input UpdateAgentInput {
+  description: String
+  id: ID!
+  isGroup: Boolean
+  name: String
+}
+
+type UpdateAgentMutation {
+  agent: AgentDescriptionType
+  error: String
+}
+
 input UpdateCreateSourceInput {
   editionAuthor: String
   editionTitle: String

From ce5801c58f077e4e2ea9091e8eb906e4236ddec6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 21 Aug 2024 15:28:16 +0200
Subject: [PATCH 296/565] add person references to admin

---
 backend/person/admin.py  | 8 ++++++++
 backend/person/models.py | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/backend/person/admin.py b/backend/person/admin.py
index 5011ad5f..9bc8fee1 100644
--- a/backend/person/admin.py
+++ b/backend/person/admin.py
@@ -16,6 +16,12 @@ class PersonDateOfDeathAdmin(admin.StackedInline):
     extra = 0
 
 
+class PersonReferenceAdmin(admin.StackedInline):
+    model = models.PersonReference
+    fields = ["person", "description"] + core_admin.field_fields
+    extra = 0
+
+
 @admin.register(models.HistoricalPerson)
 class HistoricalPersonAdmin(admin.ModelAdmin):
     list_display = ["name", "description"]
@@ -29,6 +35,7 @@ class HistoricalPersonAdmin(admin.ModelAdmin):
     inlines = [
         PersonDateOfBirthAdmin,
         PersonDateOfDeathAdmin,
+        PersonReferenceAdmin,
     ]
 
 
@@ -53,4 +60,5 @@ class AgentDescriptionAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin)
     inlines = [
         AgentDescriptionGenderAdmin,
         AgentDescriptionLocationAdmin,
+        PersonReferenceAdmin,
     ]
diff --git a/backend/person/models.py b/backend/person/models.py
index e86bb257..9425c69b 100644
--- a/backend/person/models.py
+++ b/backend/person/models.py
@@ -65,6 +65,9 @@ class PersonReference(Field, models.Model):
         related_name="person_references",
     )
 
+    def __str__(self):
+        return f"{self.description} describes {self.person}"
+
 
 class AgentDescription(EntityDescription, models.Model):
     """

From b4055e996f3e956b6cc9426c29aa2f2ce6e9bf2b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 21 Aug 2024 15:31:21 +0200
Subject: [PATCH 297/565] fix person references queries

---
 backend/person/types/AgentDescriptionType.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index cddf3da8..c37cb639 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -43,4 +43,4 @@ def resolve_describes(
     def resolve_person_references(
         parent: AgentDescription, info: ResolveInfo
     ) -> QuerySet[PersonReference]:
-        return PersonReference.objects.filter(person=parent)
+        return PersonReference.objects.filter(description=parent)

From b606a28ec9f3ee1f10a2594cfcdcec1da859a47d Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 21 Aug 2024 14:25:53 +0200
Subject: [PATCH 298/565] add PersonReference mutations

---
 backend/conftest.py                           |   4 +-
 backend/graphql_app/schema.py                 |   6 +
 .../CreatePersonReferenceMutation.py          |  69 ++++++++++++
 .../DeletePersonReferenceMutation.py          |  36 ++++++
 .../person/mutations/UpdateAgentMutation.py   |  22 ++--
 .../UpdatePersonReferenceMutation.py          |  48 ++++++++
 backend/person/tests/test_person_mutations.py | 105 ++++++++++++++++++
 7 files changed, 273 insertions(+), 17 deletions(-)
 create mode 100644 backend/person/mutations/CreatePersonReferenceMutation.py
 create mode 100644 backend/person/mutations/DeletePersonReferenceMutation.py
 create mode 100644 backend/person/mutations/UpdatePersonReferenceMutation.py

diff --git a/backend/conftest.py b/backend/conftest.py
index aad49ad1..b027ec88 100644
--- a/backend/conftest.py
+++ b/backend/conftest.py
@@ -83,12 +83,12 @@ def agent_description(db, historical_person, source):
 
 
 @pytest.fixture()
-def agent_description_2(db, historical_person, source):
+def agent_description_2(db, historical_person_2, source):
     agent = AgentDescription.objects.create(
         name="Ernie",
         source=source,
     )
-    agent.describes.add(historical_person)
+    agent.describes.add(historical_person_2)
     agent.save()
     return agent
 
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index fd9fd313..ff2017be 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -9,6 +9,9 @@
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
 from person.mutations.UpdateAgentMutation import UpdateAgentMutation
+from person.mutations.CreatePersonReferenceMutation import CreatePersonReferenceMutation
+from person.mutations.UpdatePersonReferenceMutation import UpdatePersonReferenceMutation
+from person.mutations.DeletePersonReferenceMutation import DeletePersonReferenceMutation
 
 
 class Query(
@@ -27,6 +30,9 @@ class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
     update_episode = UpdateEpisodeMutation.Field()
     update_agent = UpdateAgentMutation.Field()
+    create_person_reference = CreatePersonReferenceMutation.Field()
+    update_person_reference = UpdatePersonReferenceMutation.Field()
+    delete_person_reference = DeletePersonReferenceMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)
diff --git a/backend/person/mutations/CreatePersonReferenceMutation.py b/backend/person/mutations/CreatePersonReferenceMutation.py
new file mode 100644
index 00000000..4dcb76ab
--- /dev/null
+++ b/backend/person/mutations/CreatePersonReferenceMutation.py
@@ -0,0 +1,69 @@
+from graphene import (
+    ID,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+)
+
+from person.models import PersonReference, HistoricalPerson, AgentDescription
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from django.core.exceptions import ValidationError
+from django.db import transaction
+
+
+class CreatePersonReferenceInput(InputObjectType):
+    person = ID(required=True)
+    description = ID(required=True)
+
+
+class CreatePersonReferenceMutation(LettercraftMutation):
+    django_model = PersonReference
+
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        reference_data = CreatePersonReferenceInput(required=True)
+
+    @classmethod
+    def mutate(
+        cls, root: None, info: ResolveInfo, reference_data: CreatePersonReferenceInput
+    ):
+
+        if PersonReference.objects.filter(
+            person__id=reference_data.person, description__id=reference_data.description
+        ).exists():
+            return cls(
+                ok=False,
+                errors=[LettercraftErrorType("person", ["Reference already exists"])],
+            )
+
+        try:
+            person = HistoricalPerson.objects.get(id=reference_data.person)
+        except HistoricalPerson.DoesNotExist as e:
+            return cls(
+                ok=False,
+                errors=[LettercraftErrorType("person", [str(e)])],
+            )
+
+        try:
+            description = AgentDescription.objects.get(id=reference_data.description)
+        except AgentDescription.DoesNotExist as e:
+            return cls(
+                ok=False,
+                errors=[LettercraftErrorType("description", [str(e)])],
+            )
+
+        try:
+            with transaction.atomic():
+                description.describes.add(person)
+                description.clean()
+        except ValidationError as e:
+            return cls(
+                ok=False, errors=[LettercraftErrorType("description", e.messages)]
+            )
+
+        return cls(ok=True, errors=[])
diff --git a/backend/person/mutations/DeletePersonReferenceMutation.py b/backend/person/mutations/DeletePersonReferenceMutation.py
new file mode 100644
index 00000000..e03b708f
--- /dev/null
+++ b/backend/person/mutations/DeletePersonReferenceMutation.py
@@ -0,0 +1,36 @@
+from graphene import (
+    ID,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+    Mutation,
+)
+
+from person.models import PersonReference
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class DeletePersonReferenceMutation(Mutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(
+        cls,
+        root: None,
+        info: ResolveInfo,
+        id: ID,
+    ):
+        try:
+            reference = PersonReference.objects.get(id=id)
+        except PersonReference.DoesNotExist:
+            raise LettercraftErrorType("id", "Reference not found")
+
+        reference.delete()
+
+        return cls(ok=True, errors=[])
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index d4ab255f..9235089b 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -15,9 +15,8 @@
     AgentDescription,
     Gender,
     AgentDescriptionGender,
-    AgentDescriptionLocation,
 )
-from core.models import SourceMention, Certainty
+from core.models import SourceMention
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from django.core.exceptions import ObjectDoesNotExist
@@ -31,14 +30,8 @@ class UpdateAgentGenderInput(InputObjectType):
 
 
 class UpdateAgentLocationInput(InputObjectType):
-    location = Field(ID)
-    source_mention = Field(Enum.from_enum(SourceMention))
-    note = String()
-
-
-class UpdatePersonReferenceInput(InputObjectType):
-    person = Field(ID)
-    certainty = Field(Enum.from_enum(Certainty))
+    location = ID()
+    source_mention = Enum.from_enum(SourceMention)()
     note = String()
 
 
@@ -50,7 +43,6 @@ class UpdateAgentInput(InputObjectType):
     designators = List(String)
     gender = UpdateAgentGenderInput()
     location = UpdateAgentLocationInput()
-    person_references = List(NonNull(UpdatePersonReferenceInput))
 
 
 class UpdateAgentMutation(LettercraftMutation):
@@ -75,7 +67,10 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: UpdateAgentInput):
 
         try:
             cls.mutate_object(
-                agent_data, agent, info, excluded_fields=["gender", "location"]
+                agent_data,
+                agent,
+                info,
+                excluded_fields=["gender", "location"],
             )
             cls.handle_nested_fields(agent, agent_data, info)
 
@@ -97,9 +92,6 @@ def handle_nested_fields(
         cls.mutate_nested_object(
             agent, agent_data, info, "gender", AgentDescriptionGender, "agent"
         )
-        cls.mutate_nested_object(
-            agent, agent_data, info, "location", AgentDescriptionLocation, "agent"
-        )
 
     @classmethod
     def mutate_nested_object(
diff --git a/backend/person/mutations/UpdatePersonReferenceMutation.py b/backend/person/mutations/UpdatePersonReferenceMutation.py
new file mode 100644
index 00000000..cc275543
--- /dev/null
+++ b/backend/person/mutations/UpdatePersonReferenceMutation.py
@@ -0,0 +1,48 @@
+from graphene import (
+    ID,
+    String,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+    Enum,
+)
+
+from person.models import (
+    PersonReference,
+)
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from core.models import Certainty
+
+
+class UpdatePersonReferenceInput(InputObjectType):
+    id = ID(required=True)
+    certainty = Enum.from_enum(Certainty)()
+    note = String()
+
+
+class UpdatePersonReferenceMutation(LettercraftMutation):
+    django_model = PersonReference
+
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        reference_data = UpdatePersonReferenceInput(required=True)
+
+    @classmethod
+    def mutate(
+        cls, root: None, info: ResolveInfo, reference_data: UpdatePersonReferenceInput
+    ):
+        try:
+            retrieved = cls.get_or_create_object(info, reference_data)
+        except PersonReference.DoesNotExist as e:
+            error = LettercraftErrorType(field="id", messages=[str(e)])
+            return cls(ok=False, error=[error])
+
+        reference = retrieved.object
+        cls.mutate_object(reference_data, reference, info)
+
+        return cls(ok=True, errors=[])
diff --git a/backend/person/tests/test_person_mutations.py b/backend/person/tests/test_person_mutations.py
index 6d368c94..f577f30f 100644
--- a/backend/person/tests/test_person_mutations.py
+++ b/backend/person/tests/test_person_mutations.py
@@ -1,3 +1,6 @@
+import pytest
+from person.models import PersonReference
+
 def update_agent_body(agent_data: str):
     return f"""
     mutation testMutation {{
@@ -111,3 +114,105 @@ def test_update_agent_gender(graphql_client, agent_description):
             "gender": None,
         },
     )
+
+
+@pytest.fixture()
+def person_reference(graphql_client, agent_description):
+    query_result = graphql_client.execute(
+        f"""
+        query AgentQuery {{
+            agentDescription(id: "{agent_description.id}") {{
+                personReferences {{
+                    id
+                }}
+            }}
+        }}
+        """
+    )
+    reference = PersonReference.objects.get(
+        id=query_result["data"]["agentDescription"]["personReferences"][0]["id"]
+    )
+    return reference
+
+
+def test_update_person_reference_mutation(graphql_client, person_reference):
+    update_result = graphql_client.execute(
+        f"""
+        mutation AddReferenceNote {{
+            updatePersonReference(referenceData: {{
+                id: "{person_reference.id}"
+                note: "?"
+            }}) {{ ok }}
+        }}
+        """
+    )
+    assert update_result["data"]["updatePersonReference"]["ok"]
+
+    person_reference.refresh_from_db()
+    assert person_reference.note == "?"
+
+
+def test_delete_person_reference_mutation(graphql_client, person_reference):
+    delete_result = graphql_client.execute(
+        f"""
+        mutation DeleteReference {{
+            deletePersonReference(id: "{person_reference.id}") {{ ok }}
+        }}
+        """
+    )
+    assert delete_result["data"]["deletePersonReference"]["ok"]
+
+    with pytest.raises(PersonReference.DoesNotExist):
+        person_reference.refresh_from_db()
+
+
+def test_create_person_reference_mutation(
+    graphql_client, agent_description, historical_person, historical_person_2
+):
+    # create a new reference
+    PersonReference.objects.filter(description=agent_description).delete()
+    valid_result = graphql_client.execute(
+        f"""
+        mutation ValidMutation {{
+            createPersonReference(referenceData: {{
+                person: "{historical_person.id}"
+                description: "{agent_description.id}"
+            }}) {{ ok }}
+        }}
+        """
+    )
+    is_ok = lambda result: result["data"]["createPersonReference"]["ok"]
+    assert is_ok(valid_result)
+    assert PersonReference.objects.filter(
+        description=agent_description, person=historical_person
+    ).exists()
+
+    # try creating an existing reference
+    already_exists_result = graphql_client.execute(
+        f"""
+        mutation AlreadyExistsMutation {{
+            createPersonReference(referenceData: {{
+                person: "{historical_person.id}"
+                description: "{agent_description.id}"
+            }}) {{ ok }}
+        }}
+        """
+    )
+
+    assert not is_ok(already_exists_result)
+
+    # try adding a (different) reference to an agent that already has an associated person
+    description_already_has_reference_result = graphql_client.execute(
+        f"""
+        mutation AlreadyReferencedMutation {{
+            createPersonReference(referenceData: {{
+                person: "{historical_person_2.id}"
+                description: "{agent_description.id}"
+            }}) {{ ok, errors {{ field, messages }} }}
+        }}
+        """
+    )
+    assert not is_ok(description_already_has_reference_result)
+    assert not PersonReference.objects.filter(
+        description=agent_description, person=historical_person_2
+    ).exists()

From e66dcb5c865b8884676dfdfb9c990fe142f70d75 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 22 Aug 2024 11:02:11 +0200
Subject: [PATCH 299/565] edit locations in update agent mutation

---
 backend/conftest.py                           |  7 +++++++
 .../person/mutations/UpdateAgentMutation.py   | 19 ++++++++++++++-----
 backend/person/tests/test_person_mutations.py | 13 ++++++++++++-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/backend/conftest.py b/backend/conftest.py
index b027ec88..2af3a8fb 100644
--- a/backend/conftest.py
+++ b/backend/conftest.py
@@ -9,6 +9,7 @@
 from source.models import Source
 from event.models import Episode
 from user.models import User
+from space.models import SpaceDescription
 from graphql_app.schema import schema
 
 
@@ -106,6 +107,12 @@ def agent_group_description(db, source, historical_person, historical_person_2):
     return agent
 
 
+@pytest.fixture()
+def space_description(db, source):
+    space = SpaceDescription.objects.create(name="Sesame street", source=source)
+    return space
+
+
 @pytest.fixture()
 def episode(db, source, agent_description, agent_description_2):
     event = Episode.objects.create(
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 9235089b..9174720a 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -15,6 +15,7 @@
     AgentDescription,
     Gender,
     AgentDescriptionGender,
+    AgentDescriptionLocation,
 )
 from core.models import SourceMention
 from graphql_app.LettercraftMutation import LettercraftMutation
@@ -92,6 +93,9 @@ def handle_nested_fields(
         cls.mutate_nested_object(
             agent, agent_data, info, "gender", AgentDescriptionGender, "agent"
         )
+        cls.mutate_nested_object(
+            agent, agent_data, info, "location", AgentDescriptionLocation, "agent"
+        )
 
     @classmethod
     def mutate_nested_object(
@@ -101,17 +105,22 @@ def mutate_nested_object(
         info: ResolveInfo,
         field_name: str,
         related_model: Model,
-        related_name: str = "agent",
+        related_name: str,
     ):
         if not field_name in agent_data:
             return
 
         nested_data = getattr(agent_data, field_name)
+        relation = {related_name: agent}
 
         if nested_data is None:
-            related_model.objects.filter(**{related_name: agent}).delete()
+            related_model.objects.filter(**relation).delete()
         else:
-            related_obj, _created = related_model.objects.get_or_create(
-                **{related_name: agent}
-            )
+            try:
+                related_obj = related_model.objects.get(**relation)
+            except:
+                # if the object does not exist, construct it but don't yet create in the
+                # database. The model may have non-nullable fields that are specified
+                # in the data
+                related_obj = related_model(**relation)
             cls.mutate_object(nested_data, related_obj, info)
diff --git a/backend/person/tests/test_person_mutations.py b/backend/person/tests/test_person_mutations.py
index f577f30f..17d3542e 100644
--- a/backend/person/tests/test_person_mutations.py
+++ b/backend/person/tests/test_person_mutations.py
@@ -103,7 +103,7 @@ def test_update_agent_gender(graphql_client, agent_description):
     )
 
     remove_gender_result = graphql_client.execute(
-        update_agent_body(f'id: "{agent_description.pk}", gender: null')
+        update_agent_body(f'id: "{agent_description.id}", gender: null')
     )
     assert_agent_data(
         remove_gender_result,
@@ -116,6 +116,17 @@ def test_update_agent_gender(graphql_client, agent_description):
     )
 
 
+def test_update_agent_location(graphql_client, agent_description, space_description):
+    result = graphql_client.execute(
+        update_agent_body(
+            f"""id: "{agent_description.id}"
+            location: {{ location: "{space_description.id}", note: "!" }}"""
+        )
+    )
+    assert agent_description.location.location == space_description
+    assert agent_description.location.note == "!"
+
+
 @pytest.fixture()
 def person_reference(graphql_client, agent_description):
     query_result = graphql_client.execute(

From 11d793755bd8da6a4d51474289e2389544b5b2cb Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 22 Aug 2024 11:37:32 +0200
Subject: [PATCH 300/565] add create/delete agent mutations

---
 backend/graphql_app/schema.py                 |  4 ++
 .../person/mutations/CreateAgentMutation.py   | 49 +++++++++++++++++++
 .../person/mutations/DeleteAgentMutation.py   | 35 +++++++++++++
 .../DeletePersonReferenceMutation.py          |  3 +-
 .../person/mutations/UpdateAgentMutation.py   |  4 +-
 backend/person/tests/test_person_mutations.py | 34 ++++++++++++-
 6 files changed, 123 insertions(+), 6 deletions(-)
 create mode 100644 backend/person/mutations/CreateAgentMutation.py
 create mode 100644 backend/person/mutations/DeleteAgentMutation.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index ff2017be..ce847fff 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -8,7 +8,9 @@
 from user.queries import UserQueries
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
+from person.mutations.CreateAgentMutation import CreateAgentMutation
 from person.mutations.UpdateAgentMutation import UpdateAgentMutation
+from person.mutations.DeleteAgentMutation import DeleteAgentMutation
 from person.mutations.CreatePersonReferenceMutation import CreatePersonReferenceMutation
 from person.mutations.UpdatePersonReferenceMutation import UpdatePersonReferenceMutation
 from person.mutations.DeletePersonReferenceMutation import DeletePersonReferenceMutation
@@ -29,7 +31,9 @@ class Query(
 class Mutation(ObjectType):
     update_or_create_source = UpdateOrCreateSourceMutation.Field()
     update_episode = UpdateEpisodeMutation.Field()
+    create_agent = CreateAgentMutation.Field()
     update_agent = UpdateAgentMutation.Field()
+    delete_agent = DeleteAgentMutation.Field()
     create_person_reference = CreatePersonReferenceMutation.Field()
     update_person_reference = UpdatePersonReferenceMutation.Field()
     delete_person_reference = DeletePersonReferenceMutation.Field()
diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
new file mode 100644
index 00000000..290f8102
--- /dev/null
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -0,0 +1,49 @@
+from graphene import (
+    ID,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+    String,
+    Field,
+)
+
+from person.models import AgentDescription
+from person.types.AgentDescriptionType import AgentDescriptionType
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from django.core.exceptions import ValidationError
+from django.db import transaction
+
+
+class CreateAgentInput(InputObjectType):
+    name = String(required=True)
+    source = ID(required=True)
+
+
+class CreateAgentMutation(LettercraftMutation):
+    django_model = AgentDescription
+
+    ok = Boolean(required=True)
+    agent = Field(AgentDescriptionType)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        agent_data = CreateAgentInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
+        agent = AgentDescription()
+        try:
+            with transaction.atomic():
+                cls.mutate_object(agent_data, agent, info)
+                agent.full_clean()
+        except ValidationError as e:
+            errors = [
+                LettercraftErrorType(field, messages)
+                for field, messages in e.message_dict
+            ]
+            return cls(ok=False, agent=None, errors=errors)
+
+        return cls(ok=True, agent=agent, errors=[])
diff --git a/backend/person/mutations/DeleteAgentMutation.py b/backend/person/mutations/DeleteAgentMutation.py
new file mode 100644
index 00000000..da4b0a17
--- /dev/null
+++ b/backend/person/mutations/DeleteAgentMutation.py
@@ -0,0 +1,35 @@
+from graphene import (
+    ID,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+    Mutation,
+)
+
+from person.models import AgentDescription
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class DeleteAgentMutation(Mutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(
+        cls,
+        root: None,
+        info: ResolveInfo,
+        id: ID,
+    ):
+        try:
+            reference = AgentDescription.objects.get(id=id)
+        except AgentDescription.DoesNotExist:
+            raise LettercraftErrorType("id", ["Agent not found"])
+
+        reference.delete()
+
+        return cls(ok=True, errors=[])
diff --git a/backend/person/mutations/DeletePersonReferenceMutation.py b/backend/person/mutations/DeletePersonReferenceMutation.py
index e03b708f..dc8e1c5e 100644
--- a/backend/person/mutations/DeletePersonReferenceMutation.py
+++ b/backend/person/mutations/DeletePersonReferenceMutation.py
@@ -1,6 +1,5 @@
 from graphene import (
     ID,
-    InputObjectType,
     Boolean,
     ResolveInfo,
     List,
@@ -29,7 +28,7 @@ def mutate(
         try:
             reference = PersonReference.objects.get(id=id)
         except PersonReference.DoesNotExist:
-            raise LettercraftErrorType("id", "Reference not found")
+            raise LettercraftErrorType("id", ["Reference not found"])
 
         reference.delete()
 
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 9174720a..6997da0b 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -59,13 +59,11 @@ class Arguments:
     @classmethod
     def mutate(cls, root: None, info: ResolveInfo, agent_data: UpdateAgentInput):
         try:
-            retrieved = cls.get_or_create_object(info, agent_data)
+            agent = AgentDescription.objects.get(id=agent_data.id)
         except AgentDescription.DoesNotExist as e:
             error = LettercraftErrorType(field="id", messages=[str(e)])
             return cls(ok=False, error=[error])
 
-        agent = retrieved.object
-
         try:
             cls.mutate_object(
                 agent_data,
diff --git a/backend/person/tests/test_person_mutations.py b/backend/person/tests/test_person_mutations.py
index 17d3542e..8ff27238 100644
--- a/backend/person/tests/test_person_mutations.py
+++ b/backend/person/tests/test_person_mutations.py
@@ -1,5 +1,5 @@
 import pytest
-from person.models import PersonReference
+from person.models import PersonReference, AgentDescription
 
 def update_agent_body(agent_data: str):
     return f"""
@@ -127,6 +127,38 @@ def test_update_agent_location(graphql_client, agent_description, space_descript
     assert agent_description.location.note == "!"
 
 
+def test_create_agent_mutations(graphql_client, source):
+    result = graphql_client.execute(
+        f"""
+        mutation CreateAgent {{
+            createAgent(agentData: {{
+                name: "Elmo"
+                source: "{source.id}"
+            }}) {{
+                agent {{ id }}
+            }}
+        }}
+        """
+    )
+    agent_id = result["data"]["createAgent"]["agent"]["id"]
+    agent = AgentDescription.objects.get(id=agent_id)
+    assert agent.name == "Elmo"
+    assert agent.source == source
+
+
+def test_delete_agent_mutations(graphql_client, agent_description):
+    result = graphql_client.execute(
+        f"""
+        mutation DeleteAgent {{
+            deleteAgent(id: "{agent_description.id}") {{ ok }}
+        }}
+        """
+    )
+    assert result["data"]["deleteAgent"]["ok"]
+    with pytest.raises(AgentDescription.DoesNotExist):
+        agent_description.refresh_from_db()
+
+
 @pytest.fixture()
 def person_reference(graphql_client, agent_description):
     query_result = graphql_client.execute(

From a0c519e4b7fb78c5ce072429bd0a7450594f17c5 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 22 Aug 2024 11:55:59 +0200
Subject: [PATCH 301/565] separate get_or_create_object

---
 backend/graphql_app/LettercraftMutation.py    | 78 ++++++++++++++-----
 .../person/mutations/CreateAgentMutation.py   |  2 +-
 .../person/mutations/UpdateAgentMutation.py   |  2 +-
 .../UpdatePersonReferenceMutation.py          |  3 +-
 4 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/backend/graphql_app/LettercraftMutation.py b/backend/graphql_app/LettercraftMutation.py
index 2949cd59..385a274f 100644
--- a/backend/graphql_app/LettercraftMutation.py
+++ b/backend/graphql_app/LettercraftMutation.py
@@ -3,7 +3,6 @@
 from graphene import InputObjectType, Mutation, ResolveInfo
 from django.db.models import Model
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
-from graphene_django.types import DjangoObjectType
 from graphene_django.registry import get_global_registry
 
 
@@ -21,13 +20,12 @@ class LettercraftMutation(Mutation):
     django_model: Type[Model] | None = None
 
     @classmethod
-    def get_or_create_object(
-        cls, info: ResolveInfo, mutation_input: InputObjectType
-    ) -> RetrievedObject:
+    def get_object(cls, info: ResolveInfo, mutation_input: InputObjectType) -> Model:
         """
-        Retrieves a Django model instance by id. If the instance does not exist, a new instance is created (but not saved to the database). The instance will be empty, i.e. will not have any (obligatory) fields set.
+        Retrieves a Django model instance by id.
 
-        Any mutation making use of this method should have a class field 'django_model' defined referring to the class of the object that is being mutated.
+        Any mutation making use of this method should have a class field 'django_model'
+        defined referring to the class of the object that is being mutated.
 
         Args:
             - mutation_input (InputObjectType): The mutation input.
@@ -35,19 +33,17 @@ def get_or_create_object(
 
         Exceptions:
             - ImproperlyConfigured is raised in two cases:
-                1. when the mutation class implementing LettercraftMutation does not have the required class field 'django_model' defined;
-                2. when the corresponding Graphene type cannot be found. This exception should not be caught.
-            - ObjectDoesNotExist is raised when an ID is provided but the corresponding object is not found or inaccessible to the user making the request.
+                1. when the mutation class implementing LettercraftMutation does not have
+                    the required class field 'django_model' defined;
+                2. when the corresponding Graphene type cannot be found. This exception
+                    should not be caught.
+            - ObjectDoesNotExist is raised when an ID is provided but the corresponding
+                object is not found or inaccessible to the user making the request.
         """
 
-        if cls.django_model is None:
-            raise ImproperlyConfigured(
-                "Mutation class must have a class field 'django_model' defined."
-            )
+        model = cls._model()
 
-        model = cls.django_model
-
-        id = getattr(mutation_input, "id", None)
+        id = getattr(mutation_input, "id")
 
         # The registry is a global object that holds all the models and types.
         # It is used to get the corresponding Graphene type for a Django model.
@@ -57,15 +53,41 @@ def get_or_create_object(
         if graphene_type is None:
             raise ImproperlyConfigured("Graphene type not found for model.")
 
-        if id is None:
-            return RetrievedObject(object=model(), created=True)
-
         try:
             retrieved = graphene_type.get_queryset(model.objects, info).get(pk=id)
         except model.DoesNotExist:
             raise ObjectDoesNotExist("Object not found.")
 
-        return RetrievedObject(object=retrieved, created=False)
+        return retrieved
+
+    @classmethod
+    def create_object(cls) -> Model:
+        """
+        Create a new Django model instance.
+
+        The instance will be empty, i.e. will not have any (obligatory) fields set.
+        """
+
+        model = cls._model()
+        return model()
+
+    @classmethod
+    def get_or_create_object(
+        cls, info: ResolveInfo, mutation_input: InputObjectType
+    ) -> RetrievedObject:
+        """
+        Defers to `get_object()` or `create_object()` based on the input.
+
+        If the input specifies an `id`, this will retrieve the matching object. Otherwise,
+        this will construct a new instance.
+        """
+
+        id = getattr(mutation_input, "id", None)
+
+        if id:
+            return RetrievedObject(cls.get_object(info, mutation_input), True)
+        else:
+            return RetrievedObject(cls.create_object(info, mutation_input), False)
 
     @staticmethod
     def mutate_object(
@@ -185,3 +207,19 @@ def mutate_object(
     @classmethod
     def mutate(cls, root: None, info: ResolveInfo, *args, **kwargs):
         cls.mutate(root, info, *args, **kwargs)
+
+    @classmethod
+    def _model(cls):
+        """
+        Returns the Django model for the mutation class
+
+        Raises:
+            ImproperlyConfigured:
+                The mutation class implementing LettercraftMutation does not have
+                    the required class field 'django_model' defined.
+        """
+        if cls.django_model is None:
+            raise ImproperlyConfigured(
+                "Mutation class must have a class field 'django_model' defined."
+            )
+        return cls.django_model
diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index 290f8102..9996d72f 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -34,7 +34,7 @@ class Arguments:
 
     @classmethod
     def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
-        agent = AgentDescription()
+        agent = cls.create_object()
         try:
             with transaction.atomic():
                 cls.mutate_object(agent_data, agent, info)
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 6997da0b..43da17d3 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -59,7 +59,7 @@ class Arguments:
     @classmethod
     def mutate(cls, root: None, info: ResolveInfo, agent_data: UpdateAgentInput):
         try:
-            agent = AgentDescription.objects.get(id=agent_data.id)
+            agent = cls.get_object(info, agent_data)
         except AgentDescription.DoesNotExist as e:
             error = LettercraftErrorType(field="id", messages=[str(e)])
             return cls(ok=False, error=[error])
diff --git a/backend/person/mutations/UpdatePersonReferenceMutation.py b/backend/person/mutations/UpdatePersonReferenceMutation.py
index cc275543..c98b7494 100644
--- a/backend/person/mutations/UpdatePersonReferenceMutation.py
+++ b/backend/person/mutations/UpdatePersonReferenceMutation.py
@@ -37,12 +37,11 @@ def mutate(
         cls, root: None, info: ResolveInfo, reference_data: UpdatePersonReferenceInput
     ):
         try:
-            retrieved = cls.get_or_create_object(info, reference_data)
+            reference = cls.get_object(info, reference_data)
         except PersonReference.DoesNotExist as e:
             error = LettercraftErrorType(field="id", messages=[str(e)])
             return cls(ok=False, error=[error])
 
-        reference = retrieved.object
         cls.mutate_object(reference_data, reference, info)
 
         return cls(ok=True, errors=[])

From 55556bbb6871d1a7fd42155cca3d903edaa068a6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 22 Aug 2024 12:24:29 +0200
Subject: [PATCH 302/565] add validation to update agent mutation

---
 .../person/mutations/UpdateAgentMutation.py   | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 43da17d3..9aac0fa7 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -20,8 +20,9 @@
 from core.models import SourceMention
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db.models import Model
+from django.db import transaction
 
 
 class UpdateAgentGenderInput(InputObjectType):
@@ -65,22 +66,29 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: UpdateAgentInput):
             return cls(ok=False, error=[error])
 
         try:
-            cls.mutate_object(
-                agent_data,
-                agent,
-                info,
-                excluded_fields=["gender", "location"],
-            )
-            cls.handle_nested_fields(agent, agent_data, info)
-
+            with transaction.atomic():
+                cls.mutate_object(
+                    agent_data,
+                    agent,
+                    info,
+                    excluded_fields=["gender", "location"],
+                )
+                cls.handle_nested_fields(agent, agent_data, info)
+                # refresh to load related objects if those were updated through nested
+                # fields
+                agent.refresh_from_db()
+                agent.full_clean()
         except ObjectDoesNotExist as field:
             error = LettercraftErrorType(
                 field=str(field), messages=["Related object cannot be found."]
             )
             return cls(ok=False, errors=[error], agent=agent)
-
-        # refresh to load related objects if those were updated
-        agent.refresh_from_db()
+        except ValidationError as e:
+            errors = [
+                LettercraftErrorType(field, messages)
+                for field, messages in e.message_dict
+            ]
+            return cls(ok=False, agent=None, errors=errors)
 
         return cls(ok=True, errors=[], agent=agent)
 
@@ -122,3 +130,4 @@ def mutate_nested_object(
                 # in the data
                 related_obj = related_model(**relation)
             cls.mutate_object(nested_data, related_obj, info)
+            related_obj.full_clean()

From e4dd0ef358a3d90b89b48157645b411481490dbd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 22 Aug 2024 15:49:22 +0200
Subject: [PATCH 303/565] also handle forward one-to-one field in
 mutate_nested_object

---
 .../person/mutations/UpdateAgentMutation.py   | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 9aac0fa7..66747e73 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -11,19 +11,16 @@
 )
 
 from person.types.AgentDescriptionType import AgentDescriptionType
-from person.models import (
-    AgentDescription,
-    Gender,
-    AgentDescriptionGender,
-    AgentDescriptionLocation,
-)
+from person.models import AgentDescription, Gender
 from core.models import SourceMention
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.db.models import Model
 from django.db import transaction
-
+from django.db.models.fields.related_descriptors import (
+    ReverseOneToOneDescriptor,
+    ForwardOneToOneDescriptor,
+)
 
 class UpdateAgentGenderInput(InputObjectType):
     gender = Enum.from_enum(Gender)()
@@ -97,10 +94,10 @@ def handle_nested_fields(
         cls, agent: AgentDescription, agent_data: UpdateAgentInput, info: ResolveInfo
     ):
         cls.mutate_nested_object(
-            agent, agent_data, info, "gender", AgentDescriptionGender, "agent"
+            agent, agent_data, info, "gender", AgentDescription.gender
         )
         cls.mutate_nested_object(
-            agent, agent_data, info, "location", AgentDescriptionLocation, "agent"
+            agent, agent_data, info, "location", AgentDescription.location
         )
 
     @classmethod
@@ -110,21 +107,28 @@ def mutate_nested_object(
         agent_data: UpdateAgentInput,
         info: ResolveInfo,
         field_name: str,
-        related_model: Model,
-        related_name: str,
+        descriptor: ForwardOneToOneDescriptor | ReverseOneToOneDescriptor,
     ):
+
         if not field_name in agent_data:
             return
 
-        nested_data = getattr(agent_data, field_name)
+        if isinstance(descriptor, ForwardOneToOneDescriptor):
+            related_model = descriptor.field.related_model
+            related_name = descriptor.field.related_query_name()
+        else:
+            related_model = descriptor.related.field.model
+            related_name = descriptor.related.field.name
+
         relation = {related_name: agent}
+        nested_data = getattr(agent_data, field_name)
 
         if nested_data is None:
             related_model.objects.filter(**relation).delete()
         else:
             try:
                 related_obj = related_model.objects.get(**relation)
-            except:
+            except related_model.DoesNotExist:
                 # if the object does not exist, construct it but don't yet create in the
                 # database. The model may have non-nullable fields that are specified
                 # in the data

From db5b6786b9fed71b8571d6e7841ef9037f6ede14 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 24 Aug 2024 10:57:38 +0200
Subject: [PATCH 304/565] Simplify tests

---
 backend/core/tests/test_contributors.py | 125 +++---------------------
 1 file changed, 12 insertions(+), 113 deletions(-)

diff --git a/backend/core/tests/test_contributors.py b/backend/core/tests/test_contributors.py
index 5596d377..fbaf8f03 100644
--- a/backend/core/tests/test_contributors.py
+++ b/backend/core/tests/test_contributors.py
@@ -40,18 +40,10 @@ def test_single_contributor_one_contribution(self):
             query=self.UPDATE_EPISODE_MUTATION,
             input_data={"id": self.episode.pk, "name": "Palpatine"},
         )
-
         self.assertResponseNoErrors(response)
 
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
         episode = Episode.objects.get(id=self.episode.pk)
 
-        self.assertEqual(episode.name, "Palpatine")
-
         first_contributor = episode.contributors.first()
 
         if not first_contributor:
@@ -66,34 +58,16 @@ def test_one_contributor_multiple_contributions(self):
             query=self.UPDATE_EPISODE_MUTATION,
             input_data={"id": self.episode.pk, "name": "Palpatine"},
         )
-
         self.assertResponseNoErrors(response)
 
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
-        episode = Episode.objects.get(id=self.episode.pk)
-
-        self.assertEqual(episode.name, "Palpatine")
-        self.assertEqual(len(episode.contributors.all()), 1)
-
         response = self.query(
             query=self.UPDATE_EPISODE_MUTATION,
             input_data={"id": self.episode.pk, "name": "Darth Vader"},
         )
-
         self.assertResponseNoErrors(response)
 
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
         episode = Episode.objects.get(id=self.episode.pk)
 
-        self.assertEqual(episode.name, "Darth Vader")
         self.assertEqual(
             len(episode.contributors.all()),
             1,
@@ -102,43 +76,21 @@ def test_one_contributor_multiple_contributions(self):
 
     def test_multiple_contributors_one_contribution(self):
         self.client.force_login(self.user_1)
-
         response = self.query(
             query=self.UPDATE_EPISODE_MUTATION,
             input_data={"id": self.episode.pk, "name": "Han"},
         )
-
         self.assertResponseNoErrors(response)
 
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
-        episode = Episode.objects.get(id=self.episode.pk)
-
-        self.assertEqual(episode.name, "Han")
-        self.assertEqual(len(episode.contributors.all()), 1)
-
         self.client.force_login(self.user_2)
-
         response = self.query(
             query=self.UPDATE_EPISODE_MUTATION,
             input_data={"id": self.episode.pk, "name": "Leia"},
         )
-
         self.assertResponseNoErrors(response)
 
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
         episode = Episode.objects.get(id=self.episode.pk)
 
-        self.assertEqual(episode.name, "Leia")
-        self.assertEqual(len(episode.contributors.all()), 2)
-
         first_contributor = episode.contributors.first()
         second_contributor = episode.contributors.last()
 
@@ -150,85 +102,32 @@ def test_multiple_contributors_one_contribution(self):
 
     def test_multiple_contributors_multiple_contributions(self):
         self.client.force_login(self.user_1)
-
-        # First contribution by user 1
-        response = self.query(
+        response_1_1 = self.query(
             query=self.UPDATE_EPISODE_MUTATION,
             input_data={"id": self.episode.pk, "name": "Jabba"},
         )
-
-        self.assertResponseNoErrors(response)
-
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
-        episode = Episode.objects.get(id=self.episode.pk)
-
-        self.assertEqual(episode.name, "Jabba")
-        self.assertEqual(len(episode.contributors.all()), 1)
-
-        self.client.force_login(self.user_2)
-
-        # First contribution by user 2
-        response = self.query(
+        response_1_2 = self.query(
             query=self.UPDATE_EPISODE_MUTATION,
-            input_data={"id": self.episode.pk, "name": "Jango"},
+            input_data={"id": self.episode.pk, "name": "Anakin"},
         )
 
-        self.assertResponseNoErrors(response)
-
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
-        episode = Episode.objects.get(id=self.episode.pk)
-
-        self.assertEqual(episode.name, "Jango")
-        self.assertEqual(len(episode.contributors.all()), 2)
-
-        self.client.force_login(self.user_1)
-
-        # Second contribution by user 1
-        response = self.query(
+        self.client.force_login(self.user_2)
+        response_2_1 = self.query(
             query=self.UPDATE_EPISODE_MUTATION,
-            input_data={"id": self.episode.pk, "name": "Luke"},
+            input_data={"id": self.episode.pk, "name": "Jango"},
         )
-
-        self.assertResponseNoErrors(response)
-
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
-
-        episode = Episode.objects.get(id=self.episode.pk)
-
-        self.assertEqual(episode.name, "Luke")
-        self.assertEqual(len(episode.contributors.all()), 2)
-
-        self.client.force_login(self.user_2)
-
-        # Second contribution by user 2
-        response = self.query(
+        response_2_2 = self.query(
             query=self.UPDATE_EPISODE_MUTATION,
-            input_data={"id": self.episode.pk, "name": "Jar-Jar"},
+            input_data={"id": self.episode.pk, "name": "Boba"},
         )
 
-        self.assertResponseNoErrors(response)
-
-        content = json.loads(response.content)
-
-        self.assertTrue(content["data"]["updateEpisode"]["ok"])
-        self.assertEqual(len(content["data"]["updateEpisode"]["errors"]), 0)
+        self.assertResponseNoErrors(response_1_1)
+        self.assertResponseNoErrors(response_1_2)
+        self.assertResponseNoErrors(response_2_1)
+        self.assertResponseNoErrors(response_2_2)
 
         episode = Episode.objects.get(id=self.episode.pk)
 
-        self.assertEqual(episode.name, "Jar-Jar")
-        self.assertEqual(len(episode.contributors.all()), 2)
-
         first_contributor = episode.contributors.first()
         second_contributor = episode.contributors.last()
 

From 1711b9726cd6d867a6ab63384e10ec883c71d7e5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 28 Aug 2024 10:34:47 +0200
Subject: [PATCH 305/565] Rename input objects

---
 .../event/mutations/CreateEpisodeMutation.py  | 10 +--
 .../event/mutations/UpdateEpisodeMutation.py  | 10 +--
 .../mutations/UpdateOrCreateSourceMutation.py | 10 ++-
 frontend/generated/graphql.ts                 | 76 +++++++++----------
 frontend/generated/schema.graphql             | 30 ++++----
 .../episode-contents-form.component.ts        |  2 +-
 .../episode-identification-form.component.ts  |  2 +-
 .../episode-source-text-form.component.ts     |  2 +-
 .../data-entry/episode-form/episode.graphql   |  6 +-
 .../new-episode-form.component.ts             | 25 ++++--
 .../new-episode-form/new-episode-form.graphql |  4 +-
 11 files changed, 94 insertions(+), 83 deletions(-)

diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
index 154ee431..b4aad202 100644
--- a/backend/event/mutations/CreateEpisodeMutation.py
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -15,7 +15,7 @@
 from source.models import Source
 
 
-class CreateEpisodeMutationInput(InputObjectType):
+class CreateEpisodeInput(InputObjectType):
     name = String(required=True)
     source = ID(required=True)
 
@@ -27,18 +27,18 @@ class CreateEpisodeMutation(LettercraftMutation):
     django_model = Episode
 
     class Arguments:
-        input = CreateEpisodeMutationInput(required=True)
+        episode_data = CreateEpisodeInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, input: CreateEpisodeMutationInput):
+    def mutate(cls, root: None, info: ResolveInfo, episode_data: CreateEpisodeInput):
         try:
-            source = Source.objects.get(id=getattr(input, "source"))
+            source = Source.objects.get(id=getattr(episode_data, "source"))
         except Source.DoesNotExist:
             error = LettercraftErrorType(field="source", messages=["Source not found."])
             return cls(errors=[error])  # type: ignore
 
         episode = Episode.objects.create(
-            name=getattr(input, "name"),
+            name=getattr(episode_data, "name"),
             source=source,
         )
 
diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index a3537f39..2e01ffb8 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -6,7 +6,7 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
-class UpdateEpisodeMutationInput(InputObjectType):
+class UpdateEpisodeInput(InputObjectType):
     id = ID(required=True)
     name = String()
     book = String()
@@ -24,12 +24,12 @@ class UpdateEpisodeMutation(LettercraftMutation):
     django_model = Episode
 
     class Arguments:
-        input = UpdateEpisodeMutationInput(required=True)
+        episode_data = UpdateEpisodeInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, input: UpdateEpisodeMutationInput):
+    def mutate(cls, root: None, info: ResolveInfo, episode_data: UpdateEpisodeInput):
         try:
-            retrieved_object = cls.get_or_create_object(info, input)
+            retrieved_object = cls.get_or_create_object(info, episode_data)
         except ObjectDoesNotExist as e:
             error = LettercraftErrorType(field="id", messages=[str(e)])
             return cls(ok=False, errors=[error])  # type: ignore
@@ -37,7 +37,7 @@ def mutate(cls, root: None, info: ResolveInfo, input: UpdateEpisodeMutationInput
         episode = retrieved_object.object
 
         try:
-            cls.mutate_object(input, episode, info)
+            cls.mutate_object(episode_data, episode, info)
         except ObjectDoesNotExist as field:
             error = LettercraftErrorType(
                 field=str(field), messages=["Related object cannot be found."]
diff --git a/backend/source/mutations/UpdateOrCreateSourceMutation.py b/backend/source/mutations/UpdateOrCreateSourceMutation.py
index 613cffe6..c59f4a9d 100644
--- a/backend/source/mutations/UpdateOrCreateSourceMutation.py
+++ b/backend/source/mutations/UpdateOrCreateSourceMutation.py
@@ -18,11 +18,13 @@ class UpdateOrCreateSourceMutation(Mutation):
     errors = List(String)
 
     class Arguments:
-        input = UpdateCreateSourceInput(required=True)
+        source_data = UpdateCreateSourceInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, input: UpdateCreateSourceInput):
-        source_id = getattr(input, "id", None)
+    def mutate(
+        cls, root: None, info: ResolveInfo, source_data: UpdateCreateSourceInput
+    ):
+        source_id = getattr(source_data, "id", None)
 
         if source_id:
             try:
@@ -32,7 +34,7 @@ def mutate(cls, root: None, info: ResolveInfo, input: UpdateCreateSourceInput):
         else:
             source = Source()
 
-        for field, value in input.items():  # type: ignore
+        for field, value in source_data.items():  # type: ignore
             setattr(source, field, value)
 
         source.save()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index a3cb201b..0ba7bf73 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -73,17 +73,17 @@ export type AgentDescriptionType = {
   sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
 };
 
+export type CreateEpisodeInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
 export type CreateEpisodeMutation = {
   __typename?: 'CreateEpisodeMutation';
   episode?: Maybe<EpisodeType>;
   errors: Array<LettercraftErrorType>;
 };
 
-export type CreateEpisodeMutationInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
-};
-
 export type DeleteEpisodeMutation = {
   __typename?: 'DeleteEpisodeMutation';
   errors: Array<LettercraftErrorType>;
@@ -313,7 +313,7 @@ export type Mutation = {
 
 
 export type MutationCreateEpisodeArgs = {
-  input: CreateEpisodeMutationInput;
+  episodeData: CreateEpisodeInput;
 };
 
 
@@ -323,12 +323,12 @@ export type MutationDeleteEpisodeArgs = {
 
 
 export type MutationUpdateEpisodeArgs = {
-  input: UpdateEpisodeMutationInput;
+  episodeData: UpdateEpisodeInput;
 };
 
 
 export type MutationUpdateOrCreateSourceArgs = {
-  input: UpdateCreateSourceInput;
+  sourceData: UpdateCreateSourceInput;
 };
 
 /** An enumeration. */
@@ -799,13 +799,7 @@ export type UpdateCreateSourceInput = {
   name: Scalars['String']['input'];
 };
 
-export type UpdateEpisodeMutation = {
-  __typename?: 'UpdateEpisodeMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
-};
-
-export type UpdateEpisodeMutationInput = {
+export type UpdateEpisodeInput = {
   book?: InputMaybe<Scalars['String']['input']>;
   categories?: InputMaybe<Array<Scalars['ID']['input']>>;
   chapter?: InputMaybe<Scalars['String']['input']>;
@@ -816,6 +810,12 @@ export type UpdateEpisodeMutationInput = {
   summary?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type UpdateEpisodeMutation = {
+  __typename?: 'UpdateEpisodeMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type UpdateOrCreateSourceMutation = {
   __typename?: 'UpdateOrCreateSourceMutation';
   errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
@@ -886,14 +886,14 @@ export type DataEntryEpisodeFormQueryVariables = Exact<{
 export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeMutationVariables = Exact<{
-  input: UpdateEpisodeMutationInput;
+  episodeData: UpdateEpisodeInput;
 }>;
 
 
 export type DataEntryUpdateEpisodeMutation = { __typename?: 'Mutation', updateEpisode?: { __typename?: 'UpdateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryCreateEpisodeMutationVariables = Exact<{
-  input: CreateEpisodeMutationInput;
+  episodeData: CreateEpisodeInput;
 }>;
 
 
@@ -971,7 +971,7 @@ export const DataEntryAgentDescriptionDocument = gql`
   })
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -990,7 +990,7 @@ export const LocationsInSourceListDocument = gql`
   })
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1011,7 +1011,7 @@ export const DataEntryAgentIdentificationDocument = gql`
   })
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1036,7 +1036,7 @@ export const DataEntryAgentDocument = gql`
   })
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1058,7 +1058,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   })
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1077,7 +1077,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   })
   export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1099,7 +1099,7 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
   })
   export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1123,14 +1123,14 @@ export const DataEntryEpisodeFormDocument = gql`
   })
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
 export const DataEntryUpdateEpisodeDocument = gql`
-    mutation DataEntryUpdateEpisode($input: UpdateEpisodeMutationInput!) {
-  updateEpisode(input: $input) {
+    mutation DataEntryUpdateEpisode($episodeData: UpdateEpisodeInput!) {
+  updateEpisode(episodeData: $episodeData) {
     ok
     errors {
       field
@@ -1145,14 +1145,14 @@ export const DataEntryUpdateEpisodeDocument = gql`
   })
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
 export const DataEntryCreateEpisodeDocument = gql`
-    mutation DataEntryCreateEpisode($input: CreateEpisodeMutationInput!) {
-  createEpisode(input: $input) {
+    mutation DataEntryCreateEpisode($episodeData: CreateEpisodeInput!) {
+  createEpisode(episodeData: $episodeData) {
     episode {
       id
     }
@@ -1169,7 +1169,7 @@ export const DataEntryCreateEpisodeDocument = gql`
   })
   export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1193,7 +1193,7 @@ export const DataEntryGiftDocument = gql`
   })
   export class DataEntryGiftGQL extends Apollo.Query<DataEntryGiftQuery, DataEntryGiftQueryVariables> {
     override document = DataEntryGiftDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1217,7 +1217,7 @@ export const DataEntryLetterDocument = gql`
   })
   export class DataEntryLetterGQL extends Apollo.Query<DataEntryLetterQuery, DataEntryLetterQueryVariables> {
     override document = DataEntryLetterDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1241,7 +1241,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
   })
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1263,7 +1263,7 @@ export const DataEntryDeleteEpisodeDocument = gql`
   })
   export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1317,7 +1317,7 @@ export const DataEntrySourceDetailDocument = gql`
   })
   export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1341,8 +1341,8 @@ export const DataEntrySourceListDocument = gql`
   })
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
-  }
\ No newline at end of file
+  }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 6ea1fd1a..1999b01e 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -71,16 +71,16 @@ type AgentDescriptionType {
   sourceMention: PersonAgentDescriptionSourceMentionChoices
 }
 
+input CreateEpisodeInput {
+  name: String!
+  source: ID!
+}
+
 type CreateEpisodeMutation {
   episode: EpisodeType
   errors: [LettercraftErrorType!]!
 }
 
-input CreateEpisodeMutationInput {
-  name: String!
-  source: ID!
-}
-
 type DeleteEpisodeMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
@@ -346,10 +346,10 @@ type LettercraftErrorType {
 }
 
 type Mutation {
-  createEpisode(input: CreateEpisodeMutationInput!): CreateEpisodeMutation
+  createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
-  updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
-  updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
+  updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
+  updateOrCreateSource(sourceData: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
 }
 
 """An enumeration."""
@@ -841,12 +841,7 @@ input UpdateCreateSourceInput {
   name: String!
 }
 
-type UpdateEpisodeMutation {
-  errors: [LettercraftErrorType!]!
-  ok: Boolean!
-}
-
-input UpdateEpisodeMutationInput {
+input UpdateEpisodeInput {
   book: String
   categories: [ID!]
   chapter: String
@@ -857,6 +852,11 @@ input UpdateEpisodeMutationInput {
   summary: String
 }
 
+type UpdateEpisodeMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type UpdateOrCreateSourceMutation {
   errors: [String]
   source: SourceType
@@ -866,4 +866,4 @@ type UserType {
   firstName: String!
   id: ID!
   lastName: String!
-}
\ No newline at end of file
+}
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index 39fc92a5..c59aec74 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -70,7 +70,7 @@ export class EpisodeContentsFormComponent implements OnInit {
                 switchMap(([episode, id]) =>
                     this.updateEpisode
                         .mutate({
-                            input: {
+                            episodeData: {
                                 id,
                                 ...episode,
                             },
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 675128f8..d49d7527 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -65,7 +65,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 switchMap(([episode, id]) =>
                     this.updateEpisode
                         .mutate({
-                            input: {
+                            episodeData: {
                                 id,
                                 name: episode.name,
                             },
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index b65d9033..634252d5 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -64,7 +64,7 @@ export class EpisodeSourceTextFormComponent implements OnInit {
                 withLatestFrom(this.id$),
                 switchMap(([episode, id]) =>
                     this.updateEpisode.mutate({
-                        input: {
+                        episodeData: {
                             id,
                             ...episode,
                         },
diff --git a/frontend/src/app/data-entry/episode-form/episode.graphql b/frontend/src/app/data-entry/episode-form/episode.graphql
index a10b0db3..4457084b 100644
--- a/frontend/src/app/data-entry/episode-form/episode.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode.graphql
@@ -10,10 +10,8 @@ query DataEntryEpisodeForm($id: ID!) {
     }
 }
 
-mutation DataEntryUpdateEpisode(
-    $input: UpdateEpisodeMutationInput!
-) {
-    updateEpisode(input: $input) {
+mutation DataEntryUpdateEpisode($episodeData: UpdateEpisodeInput!) {
+    updateEpisode(episodeData: $episodeData) {
         ok
         errors {
             field
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
index 72c64e43..285daa9f 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.component.ts
@@ -1,14 +1,23 @@
-import { Component, DestroyRef, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import {
+    Component,
+    DestroyRef,
+    EventEmitter,
+    Input,
+    OnInit,
+    Output,
+} from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ToastService } from "@services/toast.service";
-import { CreateEpisodeMutationInput, DataEntryCreateEpisodeGQL } from "generated/graphql";
+import {
+    CreateEpisodeInput,
+    DataEntryCreateEpisodeGQL,
+} from "generated/graphql";
 
 type NewEpisodeForm = {
-    [key in keyof CreateEpisodeMutationInput]: FormControl<CreateEpisodeMutationInput[key]>;
+    [key in keyof CreateEpisodeInput]: FormControl<CreateEpisodeInput[key]>;
 };
 
-
 @Component({
     selector: "lc-new-episode-form",
     templateUrl: "./new-episode-form.component.html",
@@ -49,10 +58,10 @@ export class NewEpisodeFormComponent implements OnInit {
             return;
         }
         this.mutationStarted.emit();
-        const input = this.form.getRawValue();
+        const episodeData = this.form.getRawValue();
         this.updateEpisode
             .mutate(
-                { input },
+                { episodeData },
                 {
                     update: (cache) =>
                         cache.evict({
@@ -76,7 +85,9 @@ export class NewEpisodeFormComponent implements OnInit {
                     type: "success",
                     header: "Success",
                 });
-                this.episodeCreated.emit(result.data?.createEpisode?.episode?.id ?? null);
+                this.episodeCreated.emit(
+                    result.data?.createEpisode?.episode?.id ?? null
+                );
             });
     }
 }
diff --git a/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.graphql b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.graphql
index 7b86e562..f772e009 100644
--- a/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.graphql
+++ b/frontend/src/app/data-entry/episode-form/new-episode-form/new-episode-form.graphql
@@ -1,5 +1,5 @@
-mutation DataEntryCreateEpisode($input: CreateEpisodeMutationInput!) {
-    createEpisode(input: $input) {
+mutation DataEntryCreateEpisode($episodeData: CreateEpisodeInput!) {
+    createEpisode(episodeData: $episodeData) {
         episode {
             id
         }

From e433e3ec328b8d92c10a37dfcbb6cb35f4549feb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 28 Aug 2024 10:50:30 +0200
Subject: [PATCH 306/565] Fix failing tests

---
 backend/core/tests/__init__.py          |  0
 backend/core/tests/test_contributors.py |  4 +--
 frontend/generated/graphql.ts           | 34 ++++++++++++-------------
 frontend/generated/schema.graphql       |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 backend/core/tests/__init__.py

diff --git a/backend/core/tests/__init__.py b/backend/core/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/core/tests/test_contributors.py b/backend/core/tests/test_contributors.py
index fbaf8f03..3379bb24 100644
--- a/backend/core/tests/test_contributors.py
+++ b/backend/core/tests/test_contributors.py
@@ -13,8 +13,8 @@ class ContributorTestCase(GraphQLTestCase):
     # For these tests, we'll use the Episode model.
 
     UPDATE_EPISODE_MUTATION = """
-        mutation UPDATE_EPISODE($input: UpdateEpisodeMutationInput!) {
-            updateEpisode(input: $input) {
+        mutation UPDATE_EPISODE($input: UpdateEpisodeInput!) {
+            updateEpisode(episodeData: $input) {
                 ok
                 errors {
                     field
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index d3ed2332..4d629176 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -972,7 +972,7 @@ export const DataEntryAgentDescriptionDocument = gql`
   })
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -991,7 +991,7 @@ export const LocationsInSourceListDocument = gql`
   })
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1012,7 +1012,7 @@ export const DataEntryAgentIdentificationDocument = gql`
   })
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1037,7 +1037,7 @@ export const DataEntryAgentDocument = gql`
   })
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1059,7 +1059,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   })
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1078,7 +1078,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   })
   export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1100,7 +1100,7 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
   })
   export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1124,7 +1124,7 @@ export const DataEntryEpisodeFormDocument = gql`
   })
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1146,7 +1146,7 @@ export const DataEntryUpdateEpisodeDocument = gql`
   })
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1170,7 +1170,7 @@ export const DataEntryCreateEpisodeDocument = gql`
   })
   export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1194,7 +1194,7 @@ export const DataEntryGiftDocument = gql`
   })
   export class DataEntryGiftGQL extends Apollo.Query<DataEntryGiftQuery, DataEntryGiftQueryVariables> {
     override document = DataEntryGiftDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1218,7 +1218,7 @@ export const DataEntryLetterDocument = gql`
   })
   export class DataEntryLetterGQL extends Apollo.Query<DataEntryLetterQuery, DataEntryLetterQueryVariables> {
     override document = DataEntryLetterDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1242,7 +1242,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
   })
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1264,7 +1264,7 @@ export const DataEntryDeleteEpisodeDocument = gql`
   })
   export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1322,7 +1322,7 @@ export const DataEntrySourceDetailDocument = gql`
   })
   export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1346,8 +1346,8 @@ export const DataEntrySourceListDocument = gql`
   })
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
-  }
+  }
\ No newline at end of file
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 0010767c..b9b4fc2c 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -867,4 +867,4 @@ type UserType {
   fullName: String!
   id: ID!
   lastName: String!
-}
+}
\ No newline at end of file

From 261ac2282b58a880e73035f58cc54c82cf0831d9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 28 Aug 2024 12:16:48 +0200
Subject: [PATCH 307/565] Add LabelSelect to Episode form

---
 .../episode-contents-form.component.html      |  4 +--
 .../episode-contents-form.component.ts        | 15 ++++++++++
 .../episode-contents-form.graphql             |  9 +++++-
 .../label-select/label-select.component.ts    | 30 ++++++++++++++++---
 .../multiselect/multiselect.component.ts      |  9 +++++-
 5 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
index b17e1de9..e299d492 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
@@ -9,11 +9,11 @@
         ></textarea>
     </div>
 
-    <div class="form-group">
+    <div *ngIf="episodeCategories$ | async as episodeCategories" class="form-group mt-4">
         <label for="labels" class="form-label">Labels</label>
         <p class="form-text">
             Pick one or more labels that describe this episode.
         </p>
-        <p><i>Coming soon!</i></p>
+        <lc-label-select [formControl]="form.controls.categories" [options]="episodeCategories" />
     </div>
 </form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index c59aec74..4a73cfc2 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -4,6 +4,7 @@ import { FormControl, FormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
+    DataEntryEpisodeCategoriesGQL,
     DataEntryEpisodeContentsGQL,
     DataEntryUpdateEpisodeGQL,
 } from "generated/graphql";
@@ -15,6 +16,7 @@ import {
     switchMap,
     withLatestFrom,
 } from "rxjs";
+import { LabelSelectOption } from "../../shared/label-select/label-select.component";
 
 @Component({
     selector: "lc-episode-contents-form",
@@ -40,11 +42,24 @@ export class EpisodeContentsFormComponent implements OnInit {
         }),
     });
 
+    public episodeCategories$: Observable<LabelSelectOption[]> =
+        this.episodeCategoriesQuery.fetch().pipe(
+            map((result) => {
+                const categories = result.data.episodeCategories;
+                return categories.map((category) => ({
+                    value: category.id,
+                    label: category.name,
+                    description: category.description,
+                }));
+            })
+        );
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeContentsGQL,
+        private episodeCategoriesQuery: DataEntryEpisodeCategoriesGQL,
         private updateEpisode: DataEntryUpdateEpisodeGQL
     ) {}
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
index 0ca2e2a4..b1159eb1 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
@@ -4,7 +4,14 @@ query DataEntryEpisodeContents($id: ID!) {
         summary
         categories {
             id
-            
         }
     }
 }
+
+query DataEntryEpisodeCategories {
+    episodeCategories {
+        id
+        name
+        description
+    }
+}
diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.ts b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
index 61892e90..ec278a7e 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.ts
@@ -1,13 +1,24 @@
-import { Component, computed, forwardRef, Input } from "@angular/core";
+import {
+    Component,
+    computed,
+    DestroyRef,
+    forwardRef,
+    Input,
+    OnInit,
+} from "@angular/core";
 import {
     FormControl,
     ControlValueAccessor,
     NG_VALUE_ACCESSOR,
 } from "@angular/forms";
 import { actionIcons } from "@shared/icons";
-import { toSignal } from "@angular/core/rxjs-interop";
+import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
 import { MultiselectOption } from "../multiselect/multiselect.component";
 
+export interface LabelSelectOption extends MultiselectOption {
+    description: string;
+}
+
 @Component({
     selector: "lc-label-select",
     templateUrl: "./label-select.component.html",
@@ -20,8 +31,8 @@ import { MultiselectOption } from "../multiselect/multiselect.component";
         },
     ],
 })
-export class LabelSelectComponent implements ControlValueAccessor {
-    @Input() options: MultiselectOption[] = [];
+export class LabelSelectComponent implements ControlValueAccessor, OnInit {
+    @Input({ required: true }) options: LabelSelectOption[] = [];
 
     public control = new FormControl<string[]>([], { nonNullable: true });
     public actionIcons = actionIcons;
@@ -61,4 +72,15 @@ export class LabelSelectComponent implements ControlValueAccessor {
             this.control.enable();
         }
     }
+
+    constructor(private destroyRef: DestroyRef) {}
+
+    ngOnInit(): void {
+        this.control.valueChanges
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((value) => {
+                this.onTouched && this.onTouched();
+                this.onChange && this.onChange(value);
+            });
+    }
 }
diff --git a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
index 6b75cbba..7fdf12c2 100644
--- a/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
+++ b/frontend/src/app/data-entry/shared/multiselect/multiselect.component.ts
@@ -1,4 +1,11 @@
-import { Component, forwardRef, Input, signal, computed, ViewChild, ElementRef } from "@angular/core";
+import {
+    Component,
+    forwardRef,
+    Input,
+    signal,
+    computed,
+    ViewChild,
+} from "@angular/core";
 import { NG_VALUE_ACCESSOR, ControlValueAccessor } from "@angular/forms";
 import { NgbDropdownToggle } from "@ng-bootstrap/ng-bootstrap";
 

From 3a2caeabf7c067c975a6f66185e13ecd335ff361 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 28 Aug 2024 12:17:09 +0200
Subject: [PATCH 308/565] Add EpisodeCategories query

---
 backend/event/queries.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/event/queries.py b/backend/event/queries.py
index fbc3947b..2d2ac838 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -1,12 +1,14 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
-from event.models import Episode
+from event.models import Episode, EpisodeCategory
+from event.types.EpisodeCategoryType import EpisodeCategoryType
 from event.types.EpisodeType import EpisodeType
 
 
 class EventQueries(ObjectType):
     episode = Field(EpisodeType, id=ID(required=True))
     episodes = List(NonNull(EpisodeType), required=True, source_id=ID())
+    episode_categories = List(NonNull(EpisodeCategoryType), required=True)
 
     @staticmethod
     def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Episode | None:
@@ -24,3 +26,9 @@ def resolve_episodes(
         filters = Q() if source_id is None else Q(source_id=source_id)
 
         return EpisodeType.get_queryset(Episode.objects, info).filter(filters)
+
+    @staticmethod
+    def resolve_episode_categories(
+        parent: None, info: ResolveInfo
+    ) -> QuerySet[EpisodeCategory]:
+        return EpisodeCategoryType.get_queryset(EpisodeCategory.objects, info).all()

From 3d1bd6a044911fffb2bf4b8889b06504156a20b0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 28 Aug 2024 12:17:41 +0200
Subject: [PATCH 309/565] Use correct style class for inline-flex

---
 .../data-entry/shared/label-select/label-select.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/shared/label-select/label-select.component.html b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
index 60ed29f7..c894270f 100644
--- a/frontend/src/app/data-entry/shared/label-select/label-select.component.html
+++ b/frontend/src/app/data-entry/shared/label-select/label-select.component.html
@@ -3,7 +3,7 @@
     <ng-container *ngIf="selectedLabels().length > 0; else noLabels">
         <li
             *ngFor="let label of selectedLabels()"
-            class="badge rounded-pill text-bg-primary me-2 fs-6 fw-normal d-flex-inline align-items-center"
+            class="badge rounded-pill text-bg-primary me-2 fs-6 fw-normal d-inline-flex align-items-center"
         >
             <span class="ms-1">{{ label.label }}</span>
             <button

From 0667fdd71667284b7a0c12dc6e098f65afd46876 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 28 Aug 2024 12:17:55 +0200
Subject: [PATCH 310/565] Generated files

---
 frontend/generated/graphql.ts     | 26 ++++++++++++++++++++++++++
 frontend/generated/schema.graphql |  1 +
 2 files changed, 27 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 4d629176..489f7108 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -471,6 +471,7 @@ export type Query = {
   agentDescription?: Maybe<AgentDescriptionType>;
   agentDescriptions: Array<AgentDescriptionType>;
   episode?: Maybe<EpisodeType>;
+  episodeCategories: Array<EpisodeCategoryType>;
   episodes: Array<EpisodeType>;
   giftDescription?: Maybe<GiftDescriptionType>;
   giftDescriptions: Array<GiftDescriptionType>;
@@ -865,6 +866,11 @@ export type DataEntryEpisodeContentsQueryVariables = Exact<{
 
 export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
 
+export type DataEntryEpisodeCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntryEpisodeCategoriesQuery = { __typename?: 'Query', episodeCategories: Array<{ __typename?: 'EpisodeCategoryType', id: string, name: string, description: string }> };
+
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1060,6 +1066,26 @@ export const DataEntryEpisodeContentsDocument = gql`
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryEpisodeCategoriesDocument = gql`
+    query DataEntryEpisodeCategories {
+  episodeCategories {
+    id
+    name
+    description
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
+    override document = DataEntryEpisodeCategoriesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index b9b4fc2c..41e65894 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -520,6 +520,7 @@ type Query {
   agentDescription(id: ID!): AgentDescriptionType
   agentDescriptions(episodeId: ID, sourceId: ID): [AgentDescriptionType!]!
   episode(id: ID!): EpisodeType
+  episodeCategories: [EpisodeCategoryType!]!
   episodes(sourceId: ID): [EpisodeType!]!
   giftDescription(id: ID!): GiftDescriptionType
   giftDescriptions(episodeId: ID, sourceId: ID): [GiftDescriptionType!]!

From e963369f7f7b26cebfc161b4cf414c8e7d59b7ee Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 28 Aug 2024 14:15:14 +0200
Subject: [PATCH 311/565] code quality

---
 frontend/src/app/titles.ts | 50 +++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/frontend/src/app/titles.ts b/frontend/src/app/titles.ts
index a061870f..a368860d 100644
--- a/frontend/src/app/titles.ts
+++ b/frontend/src/app/titles.ts
@@ -1,6 +1,7 @@
 import { inject } from "@angular/core";
 import { ActivatedRouteSnapshot, Params, ResolveFn } from "@angular/router";
 import { Apollo, gql, TypedDocumentNode } from "apollo-angular";
+import { SourceTitleQueryQuery, SourceTitleQueryQueryVariables } from "generated/graphql";
 import { map } from "rxjs";
 import _ from "underscore";
 
@@ -12,15 +13,21 @@ export const pageTitle = (name: string) => `${name} - ${SITE_NAME}`;
  *
  * @param queryFromParams returns a graphQL query based on the route parameters
  * @param titleFromData transforms the result of the query into a string
+ * @param watchChanges whether to keep watching the query for changes
  * @returns a ResolverFn to resolve the title based on the query results
  */
-const queryTitleResolver = <QueryData>(
-    queryFromParams: (params: Params) => TypedDocumentNode<QueryData, unknown>,
+const queryTitleResolver = <QueryData, QueryVariables>(
+    queryFromParams: (params: Params) => TypedDocumentNode<QueryData, QueryVariables>,
     titleFromData: (data: QueryData) => string,
+    watchChanges = false,
 ): ResolveFn<string> => {
     return (route: ActivatedRouteSnapshot) => {
         const query = queryFromParams(route.params);
-        return inject(Apollo).watchQuery({ query }).valueChanges.pipe(
+        const apollo = inject(Apollo);
+        const query$ = watchChanges ?
+            apollo.watchQuery({ query }).valueChanges :
+            apollo.query({ query });
+        return query$.pipe(
             map(result => result.data),
             map(titleFromData),
             map(pageTitle),
@@ -28,9 +35,8 @@ const queryTitleResolver = <QueryData>(
     }
 }
 
-type SourceTitleQueryData = { source?: { name: string } }
 
-const sourceTitleQuery = (params: Params) => gql<SourceTitleQueryData, unknown>(`
+const sourceTitleQuery = (params: Params) => gql<SourceTitleQueryQuery, SourceTitleQueryQueryVariables>(`
     query SourceTitleQuery {
         source(id: "${params['id']}") {
             id
@@ -38,10 +44,11 @@ const sourceTitleQuery = (params: Params) => gql<SourceTitleQueryData, unknown>(
         }
 }`);
 
-const sourceFormTitle = (data: SourceTitleQueryData) => `Edit ${data.source?.name}`;
+const sourceFormTitle = (data: SourceTitleQueryQuery) => `Edit ${data.source?.name}`;
 
 export const sourceFormTitleResolver = queryTitleResolver(
-    sourceTitleQuery, sourceFormTitle);
+    sourceTitleQuery, sourceFormTitle
+);
 
 type EntityDescriptionTitleQueryData<Key extends string> =
     Record<Key, { name: string, source: { name: string } }>;
@@ -55,12 +62,13 @@ const agentTitleQuery = (params: Params) => gql<AgentTitleQueryData, unknown>(`
             name
             source { id, name }
         }
-}`);
+    }`
+);
 
 const entityDescriptionFormTitle = <Key extends string>(
     data: EntityDescriptionTitleQueryData<Key>
 ) => {
-    const key = _.first(_.keys(data)) as Key;
+    const key = _.first(_.without(_.keys(data), '__typename')) as Key;
     const entity = data[key];
     if (entity) {
         return `Edit ${entity.name} (${entity.source.name})`;
@@ -70,7 +78,8 @@ const entityDescriptionFormTitle = <Key extends string>(
 }
 
 export const agentFormTitleResolver = queryTitleResolver(
-    agentTitleQuery, entityDescriptionFormTitle);
+    agentTitleQuery, entityDescriptionFormTitle, true
+);
 
 type LetterTitleQueryData = EntityDescriptionTitleQueryData<'letterDescription'>;
 
@@ -81,12 +90,13 @@ const letterTitleQuery = (params: Params) => gql<LetterTitleQueryData, unknown>(
             name
             source { id, name }
         }
-    }
-`);
+    }`
+);
 
 
 export const letterFormTitleResolver = queryTitleResolver(
-    letterTitleQuery, entityDescriptionFormTitle);
+    letterTitleQuery, entityDescriptionFormTitle, true
+);
 
 
 type GiftTitleQueryData = EntityDescriptionTitleQueryData<'giftDescription'>;
@@ -98,12 +108,13 @@ const giftTitleQuery = (params: Params) => gql<GiftTitleQueryData, unknown>(`
             name
             source { id, name }
         }
-    }
-`);
+    }`
+);
 
 
 export const giftFormTitleResolver = queryTitleResolver(
-    giftTitleQuery, entityDescriptionFormTitle);
+    giftTitleQuery, entityDescriptionFormTitle, true
+);
 
 type SpaceTitleQueryData = EntityDescriptionTitleQueryData<'spaceDescription'>;
 
@@ -114,8 +125,9 @@ const spaceTitleQuery = (params: Params) => gql<SpaceTitleQueryData, unknown>(`
             name
             source { id, name }
         }
-    }
-`);
+    }`
+);
 
 export const spaceFormTitleResolver = queryTitleResolver(
-    spaceTitleQuery, entityDescriptionFormTitle);
+    spaceTitleQuery, entityDescriptionFormTitle, true
+);

From 8c5186a3bd7eb032216dd8d52e8ac1a9a872ac52 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 28 Aug 2024 14:28:37 +0200
Subject: [PATCH 312/565] fix attribute error; remove unused imports

---
 backend/core/admin.py   | 10 +++++++---
 backend/event/admin.py  |  1 -
 backend/person/admin.py |  8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/backend/core/admin.py b/backend/core/admin.py
index 6999f49b..b3c8ee7f 100644
--- a/backend/core/admin.py
+++ b/backend/core/admin.py
@@ -49,6 +49,10 @@ def get_queryset_matching_parent_source(
     db_field: RelatedField,
     request: HttpRequest,
 ) -> QuerySet:
-    parent_id = re.search(f"\d+", request.path).group(0)
-    parent = admin.parent_model.objects.get(id=parent_id)
-    return db_field.remote_field.model.objects.filter(source=parent.source)
+    id_match = re.search(r"\d+", request.path)
+    if id_match:
+        parent_id = id_match.group(0)
+        parent = admin.parent_model.objects.get(id=parent_id)
+        return db_field.remote_field.model.objects.filter(source=parent.source)
+    else:
+        return db_field.remote_field.model.objects.all()
diff --git a/backend/event/admin.py b/backend/event/admin.py
index 0b08f1c1..40e70d8b 100644
--- a/backend/event/admin.py
+++ b/backend/event/admin.py
@@ -1,4 +1,3 @@
-from typing import Any
 from django.contrib import admin
 from . import models
 from core import admin as core_admin
diff --git a/backend/person/admin.py b/backend/person/admin.py
index ee9c6e60..c47db9b1 100644
--- a/backend/person/admin.py
+++ b/backend/person/admin.py
@@ -1,9 +1,7 @@
-from typing import Any
 from django.contrib import admin
 from django.db.models.fields.related import RelatedField
 from django.db.models.query import QuerySet
 from django.http import HttpRequest
-import re
 
 from . import models
 from core import admin as core_admin
@@ -49,9 +47,11 @@ class AgentDescriptionLocationAdmin(admin.StackedInline):
 
     def get_field_queryset(
         self, db, db_field: RelatedField, request: HttpRequest
-    ) -> QuerySet:
+    ) -> QuerySet | None:
         if db_field.name == "location":
-            core_admin.get_queryset_matching_parent_source(self, db_field, request)
+            return core_admin.get_queryset_matching_parent_source(
+                self, db_field, request
+            )
 
         return super().get_field_queryset(db, db_field, request)
 

From ded2e0eed064686a79dd4ce1049467b9c3c884f0 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 28 Aug 2024 14:29:55 +0200
Subject: [PATCH 313/565] handle request is none

---
 backend/event/admin.py  | 2 +-
 backend/person/admin.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/event/admin.py b/backend/event/admin.py
index 40e70d8b..3c1bd17c 100644
--- a/backend/event/admin.py
+++ b/backend/event/admin.py
@@ -46,7 +46,7 @@ class EpisodeLetterAdmin(admin.StackedInline):
     verbose_name = "involved letter"
 
     def get_field_queryset(self, db, db_field, request):
-        if db_field.name == "letter":
+        if db_field.name == "letter" and request:
             return core_admin.get_queryset_matching_parent_source(
                 self, db_field, request
             )
diff --git a/backend/person/admin.py b/backend/person/admin.py
index c47db9b1..4d883381 100644
--- a/backend/person/admin.py
+++ b/backend/person/admin.py
@@ -46,9 +46,9 @@ class AgentDescriptionLocationAdmin(admin.StackedInline):
     extra = 0
 
     def get_field_queryset(
-        self, db, db_field: RelatedField, request: HttpRequest
+        self, db, db_field: RelatedField, request: HttpRequest | None
     ) -> QuerySet | None:
-        if db_field.name == "location":
+        if db_field.name == "location" and request:
             return core_admin.get_queryset_matching_parent_source(
                 self, db_field, request
             )

From 89c487dbcf7917d80d75dcc3f64922362ecf60c2 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 28 Aug 2024 14:59:51 +0200
Subject: [PATCH 314/565] fix dict iteration

---
 backend/person/mutations/CreateAgentMutation.py | 2 +-
 backend/person/mutations/UpdateAgentMutation.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index 9996d72f..af5acdfc 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -42,7 +42,7 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
         except ValidationError as e:
             errors = [
                 LettercraftErrorType(field, messages)
-                for field, messages in e.message_dict
+                for field, messages in e.message_dict.items()
             ]
             return cls(ok=False, agent=None, errors=errors)
 
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 66747e73..880e1c7a 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -83,7 +83,7 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: UpdateAgentInput):
         except ValidationError as e:
             errors = [
                 LettercraftErrorType(field, messages)
-                for field, messages in e.message_dict
+                for field, messages in e.message_dict.items()
             ]
             return cls(ok=False, agent=None, errors=errors)
 

From 31cdeb5ce5b42d3f2f578bd9ae6a99f18d1b89e0 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 28 Aug 2024 15:05:25 +0200
Subject: [PATCH 315/565] fix error handling

---
 backend/person/mutations/DeleteAgentMutation.py           | 2 +-
 backend/person/mutations/DeletePersonReferenceMutation.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/person/mutations/DeleteAgentMutation.py b/backend/person/mutations/DeleteAgentMutation.py
index da4b0a17..c3981f9b 100644
--- a/backend/person/mutations/DeleteAgentMutation.py
+++ b/backend/person/mutations/DeleteAgentMutation.py
@@ -28,7 +28,7 @@ def mutate(
         try:
             reference = AgentDescription.objects.get(id=id)
         except AgentDescription.DoesNotExist:
-            raise LettercraftErrorType("id", ["Agent not found"])
+            return cls(ok=False, errors=LettercraftErrorType("id", ["Agent not found"]))
 
         reference.delete()
 
diff --git a/backend/person/mutations/DeletePersonReferenceMutation.py b/backend/person/mutations/DeletePersonReferenceMutation.py
index dc8e1c5e..de090ac1 100644
--- a/backend/person/mutations/DeletePersonReferenceMutation.py
+++ b/backend/person/mutations/DeletePersonReferenceMutation.py
@@ -28,7 +28,9 @@ def mutate(
         try:
             reference = PersonReference.objects.get(id=id)
         except PersonReference.DoesNotExist:
-            raise LettercraftErrorType("id", ["Reference not found"])
+            return cls(
+                ok=False, errors=LettercraftErrorType("id", ["Reference not found"])
+            )
 
         reference.delete()
 

From 5e9dd07bd693e6c6c0828f85cf3e5290afe8f716 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 28 Aug 2024 15:05:39 +0200
Subject: [PATCH 316/565] create_object arguments

---
 backend/graphql_app/LettercraftMutation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/graphql_app/LettercraftMutation.py b/backend/graphql_app/LettercraftMutation.py
index 385a274f..5e4d1b14 100644
--- a/backend/graphql_app/LettercraftMutation.py
+++ b/backend/graphql_app/LettercraftMutation.py
@@ -87,7 +87,7 @@ def get_or_create_object(
         if id:
             return RetrievedObject(cls.get_object(info, mutation_input), True)
         else:
-            return RetrievedObject(cls.create_object(info, mutation_input), False)
+            return RetrievedObject(cls.create_object(), False)
 
     @staticmethod
     def mutate_object(

From 8a9b67b0a22bfef267ad75c99982ac2e0d14795b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 29 Aug 2024 13:33:26 +0200
Subject: [PATCH 317/565] Regenerated types

---
 frontend/generated/graphql.ts     | 173 +++++++++++++++++++++++++-----
 frontend/generated/schema.graphql |  93 +++++++++++++++-
 2 files changed, 237 insertions(+), 29 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 88bee175..c69f0ed2 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -73,6 +73,25 @@ export type AgentDescriptionType = {
   sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
 };
 
+/** An enumeration. */
+export enum Certainty {
+  Certain = 'CERTAIN',
+  SomewhatCertain = 'SOMEWHAT_CERTAIN',
+  Uncertain = 'UNCERTAIN'
+}
+
+export type CreateAgentInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
+export type CreateAgentMutation = {
+  __typename?: 'CreateAgentMutation';
+  agent?: Maybe<AgentDescriptionType>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type CreateEpisodeInput = {
   name: Scalars['String']['input'];
   source: Scalars['ID']['input'];
@@ -84,12 +103,35 @@ export type CreateEpisodeMutation = {
   errors: Array<LettercraftErrorType>;
 };
 
+export type CreatePersonReferenceInput = {
+  description: Scalars['ID']['input'];
+  person: Scalars['ID']['input'];
+};
+
+export type CreatePersonReferenceMutation = {
+  __typename?: 'CreatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
+export type DeleteAgentMutation = {
+  __typename?: 'DeleteAgentMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type DeleteEpisodeMutation = {
   __typename?: 'DeleteEpisodeMutation';
   errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
 
+export type DeletePersonReferenceMutation = {
+  __typename?: 'DeletePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type EpisodeCategoryType = {
   __typename?: 'EpisodeCategoryType';
   /** Longer description to help identify this object */
@@ -140,6 +182,15 @@ export enum EventEpisodeSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
+/** An enumeration. */
+export enum Gender {
+  Female = 'FEMALE',
+  Male = 'MALE',
+  Mixed = 'MIXED',
+  Other = 'OTHER',
+  Unknown = 'UNKNOWN'
+}
+
 export type GiftCategoryType = {
   __typename?: 'GiftCategoryType';
   /** Longer description to help identify this object */
@@ -305,11 +356,46 @@ export type LettercraftErrorType = {
 
 export type Mutation = {
   __typename?: 'Mutation';
+  createAgent?: Maybe<CreateAgentMutation>;
   createEpisode?: Maybe<CreateEpisodeMutation>;
+  createPersonReference?: Maybe<CreatePersonReferenceMutation>;
+  deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
+  deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
+  updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
+};
+
+
+export type MutationCreateAgentArgs = {
+  agentData: CreateAgentInput;
+};
+
+
+export type MutationCreateEpisodeArgs = {
+  episodeData: CreateEpisodeInput;
+};
+
+
+export type MutationCreatePersonReferenceArgs = {
+  referenceData: CreatePersonReferenceInput;
+};
+
+
+export type MutationDeleteAgentArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type MutationDeleteEpisodeArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type MutationDeletePersonReferenceArgs = {
+  id: Scalars['ID']['input'];
 };
 
 
@@ -327,6 +413,11 @@ export type MutationUpdateOrCreateSourceArgs = {
   sourceData: UpdateCreateSourceInput;
 };
 
+
+export type MutationUpdatePersonReferenceArgs = {
+  referenceData: UpdatePersonReferenceInput;
+};
+
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderCertaintyChoices {
   /** uncertain */
@@ -612,6 +703,12 @@ export type SourceContentsDateType = {
   yearUpper: Scalars['Int']['output'];
 };
 
+/** An enumeration. */
+export enum SourceMention {
+  Direct = 'DIRECT',
+  Implied = 'IMPLIED'
+}
+
 export type SourceType = {
   __typename?: 'SourceType';
   contentsDate?: Maybe<SourceContentsDateType>;
@@ -787,17 +884,33 @@ export type StructureType = {
   settlement?: Maybe<SettlementType>;
 };
 
+export type UpdateAgentGenderInput = {
+  gender?: InputMaybe<Gender>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
+};
+
 export type UpdateAgentInput = {
   description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  gender?: InputMaybe<UpdateAgentGenderInput>;
   id: Scalars['ID']['input'];
   isGroup?: InputMaybe<Scalars['Boolean']['input']>;
+  location?: InputMaybe<UpdateAgentLocationInput>;
   name?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type UpdateAgentLocationInput = {
+  location?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
+};
+
 export type UpdateAgentMutation = {
   __typename?: 'UpdateAgentMutation';
   agent?: Maybe<AgentDescriptionType>;
-  error?: Maybe<Scalars['String']['output']>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateCreateSourceInput = {
@@ -832,6 +945,18 @@ export type UpdateOrCreateSourceMutation = {
   source?: Maybe<SourceType>;
 };
 
+export type UpdatePersonReferenceInput = {
+  certainty?: InputMaybe<Certainty>;
+  id: Scalars['ID']['input'];
+  note?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdatePersonReferenceMutation = {
+  __typename?: 'UpdatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type UserType = {
   __typename?: 'UserType';
   firstName: Scalars['String']['output'];
@@ -1012,7 +1137,7 @@ export const DataEntryAgentDescriptionDocument = gql`
   })
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1031,7 +1156,7 @@ export const LocationsInSourceListDocument = gql`
   })
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1052,7 +1177,7 @@ export const DataEntryAgentIdentificationDocument = gql`
   })
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1077,7 +1202,7 @@ export const DataEntryAgentDocument = gql`
   })
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1099,7 +1224,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   })
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1119,7 +1244,7 @@ export const DataEntryEpisodeCategoriesDocument = gql`
   })
   export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
     override document = DataEntryEpisodeCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1138,7 +1263,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   })
   export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1160,7 +1285,7 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
   })
   export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1184,7 +1309,7 @@ export const DataEntryEpisodeFormDocument = gql`
   })
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1206,7 +1331,7 @@ export const DataEntryUpdateEpisodeDocument = gql`
   })
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1230,7 +1355,7 @@ export const DataEntryCreateEpisodeDocument = gql`
   })
   export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1254,7 +1379,7 @@ export const DataEntryGiftDocument = gql`
   })
   export class DataEntryGiftGQL extends Apollo.Query<DataEntryGiftQuery, DataEntryGiftQueryVariables> {
     override document = DataEntryGiftDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1278,7 +1403,7 @@ export const DataEntryLetterDocument = gql`
   })
   export class DataEntryLetterGQL extends Apollo.Query<DataEntryLetterQuery, DataEntryLetterQueryVariables> {
     override document = DataEntryLetterDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1302,7 +1427,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
   })
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1324,7 +1449,7 @@ export const DataEntryDeleteEpisodeDocument = gql`
   })
   export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1382,7 +1507,7 @@ export const DataEntrySourceDetailDocument = gql`
   })
   export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1406,7 +1531,7 @@ export const DataEntrySourceListDocument = gql`
   })
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1425,7 +1550,7 @@ export const SourceTitleQueryDocument = gql`
   })
   export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
     override document = SourceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1448,7 +1573,7 @@ export const AgentTitleQueryDocument = gql`
   })
   export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
     override document = AgentTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1471,7 +1596,7 @@ export const LetterTitleQueryDocument = gql`
   })
   export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
     override document = LetterTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1494,7 +1619,7 @@ export const GiftTitleQueryDocument = gql`
   })
   export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
     override document = GiftTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1517,8 +1642,8 @@ export const SpaceTitleQueryDocument = gql`
   })
   export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
     override document = SpaceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
-  }
+  }
\ No newline at end of file
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 219661a9..562c0b15 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -71,6 +71,24 @@ type AgentDescriptionType {
   sourceMention: PersonAgentDescriptionSourceMentionChoices
 }
 
+"""An enumeration."""
+enum Certainty {
+  CERTAIN
+  SOMEWHAT_CERTAIN
+  UNCERTAIN
+}
+
+input CreateAgentInput {
+  name: String!
+  source: ID!
+}
+
+type CreateAgentMutation {
+  agent: AgentDescriptionType
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 input CreateEpisodeInput {
   name: String!
   source: ID!
@@ -81,11 +99,31 @@ type CreateEpisodeMutation {
   errors: [LettercraftErrorType!]!
 }
 
+input CreatePersonReferenceInput {
+  description: ID!
+  person: ID!
+}
+
+type CreatePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+type DeleteAgentMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type DeleteEpisodeMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
 
+type DeletePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type EpisodeCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -150,6 +188,15 @@ enum EventEpisodeSourceMentionChoices {
   IMPLIED
 }
 
+"""An enumeration."""
+enum Gender {
+  FEMALE
+  MALE
+  MIXED
+  OTHER
+  UNKNOWN
+}
+
 type GiftCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -346,13 +393,16 @@ type LettercraftErrorType {
 }
 
 type Mutation {
+  createAgent(agentData: CreateAgentInput!): CreateAgentMutation
   createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
+  createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
+  deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
+  deletePersonReference(id: ID!): DeletePersonReferenceMutation
+  updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
   updateOrCreateSource(sourceData: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
-  updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
-  updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
-  updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
+  updatePersonReference(referenceData: UpdatePersonReferenceInput!): UpdatePersonReferenceMutation
 }
 
 """An enumeration."""
@@ -622,6 +672,12 @@ type SourceContentsDateType {
   yearUpper: Int!
 }
 
+"""An enumeration."""
+enum SourceMention {
+  DIRECT
+  IMPLIED
+}
+
 type SourceType {
   contentsDate: SourceContentsDateType
 
@@ -836,16 +892,32 @@ type StructureType {
   settlement: SettlementType
 }
 
+input UpdateAgentGenderInput {
+  gender: Gender
+  note: String
+  sourceMention: SourceMention
+}
+
 input UpdateAgentInput {
   description: String
+  designators: [String]
+  gender: UpdateAgentGenderInput
   id: ID!
   isGroup: Boolean
+  location: UpdateAgentLocationInput
   name: String
 }
 
+input UpdateAgentLocationInput {
+  location: ID
+  note: String
+  sourceMention: SourceMention
+}
+
 type UpdateAgentMutation {
   agent: AgentDescriptionType
-  error: String
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
 }
 
 input UpdateCreateSourceInput {
@@ -878,9 +950,20 @@ type UpdateOrCreateSourceMutation {
   source: SourceType
 }
 
+input UpdatePersonReferenceInput {
+  certainty: Certainty
+  id: ID!
+  note: String
+}
+
+type UpdatePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type UserType {
   firstName: String!
   fullName: String!
   id: ID!
   lastName: String!
-}
+}
\ No newline at end of file

From 126ddf4da5332f1111033246a0690e142fb63a92 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 13:48:44 +0200
Subject: [PATCH 318/565] generate graphql

---
 frontend/generated/graphql.ts     | 117 +++++++++++++++++++++++++++++-
 frontend/generated/schema.graphql |  87 +++++++++++++++++++++-
 2 files changed, 202 insertions(+), 2 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 2ec5696d..a55daba5 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -73,6 +73,48 @@ export type AgentDescriptionType = {
   sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
 };
 
+/** An enumeration. */
+export enum Certainty {
+  Certain = 'CERTAIN',
+  SomewhatCertain = 'SOMEWHAT_CERTAIN',
+  Uncertain = 'UNCERTAIN'
+}
+
+export type CreateAgentInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
+export type CreateAgentMutation = {
+  __typename?: 'CreateAgentMutation';
+  agent?: Maybe<AgentDescriptionType>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
+export type CreatePersonReferenceInput = {
+  description: Scalars['ID']['input'];
+  person: Scalars['ID']['input'];
+};
+
+export type CreatePersonReferenceMutation = {
+  __typename?: 'CreatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
+export type DeleteAgentMutation = {
+  __typename?: 'DeleteAgentMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
+export type DeletePersonReferenceMutation = {
+  __typename?: 'DeletePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type EpisodeCategoryType = {
   __typename?: 'EpisodeCategoryType';
   /** Longer description to help identify this object */
@@ -123,6 +165,15 @@ export enum EventEpisodeSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
+/** An enumeration. */
+export enum Gender {
+  Female = 'FEMALE',
+  Male = 'MALE',
+  Mixed = 'MIXED',
+  Other = 'OTHER',
+  Unknown = 'UNKNOWN'
+}
+
 export type GiftCategoryType = {
   __typename?: 'GiftCategoryType';
   /** Longer description to help identify this object */
@@ -288,9 +339,34 @@ export type LettercraftErrorType = {
 
 export type Mutation = {
   __typename?: 'Mutation';
+  createAgent?: Maybe<CreateAgentMutation>;
+  createPersonReference?: Maybe<CreatePersonReferenceMutation>;
+  deleteAgent?: Maybe<DeleteAgentMutation>;
+  deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
+  updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
+};
+
+
+export type MutationCreateAgentArgs = {
+  agentData: CreateAgentInput;
+};
+
+
+export type MutationCreatePersonReferenceArgs = {
+  referenceData: CreatePersonReferenceInput;
+};
+
+
+export type MutationDeleteAgentArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type MutationDeletePersonReferenceArgs = {
+  id: Scalars['ID']['input'];
 };
 
 
@@ -308,6 +384,11 @@ export type MutationUpdateOrCreateSourceArgs = {
   input: UpdateCreateSourceInput;
 };
 
+
+export type MutationUpdatePersonReferenceArgs = {
+  referenceData: UpdatePersonReferenceInput;
+};
+
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderCertaintyChoices {
   /** uncertain */
@@ -592,6 +673,12 @@ export type SourceContentsDateType = {
   yearUpper: Scalars['Int']['output'];
 };
 
+/** An enumeration. */
+export enum SourceMention {
+  Direct = 'DIRECT',
+  Implied = 'IMPLIED'
+}
+
 export type SourceType = {
   __typename?: 'SourceType';
   contentsDate?: Maybe<SourceContentsDateType>;
@@ -767,17 +854,33 @@ export type StructureType = {
   settlement?: Maybe<SettlementType>;
 };
 
+export type UpdateAgentGenderInput = {
+  gender?: InputMaybe<Gender>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
+};
+
 export type UpdateAgentInput = {
   description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  gender?: InputMaybe<UpdateAgentGenderInput>;
   id: Scalars['ID']['input'];
   isGroup?: InputMaybe<Scalars['Boolean']['input']>;
+  location?: InputMaybe<UpdateAgentLocationInput>;
   name?: InputMaybe<Scalars['String']['input']>;
 };
 
+export type UpdateAgentLocationInput = {
+  location?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
+};
+
 export type UpdateAgentMutation = {
   __typename?: 'UpdateAgentMutation';
   agent?: Maybe<AgentDescriptionType>;
-  error?: Maybe<Scalars['String']['output']>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateCreateSourceInput = {
@@ -812,6 +915,18 @@ export type UpdateOrCreateSourceMutation = {
   source?: Maybe<SourceType>;
 };
 
+export type UpdatePersonReferenceInput = {
+  certainty?: InputMaybe<Certainty>;
+  id: Scalars['ID']['input'];
+  note?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdatePersonReferenceMutation = {
+  __typename?: 'UpdatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type UserType = {
   __typename?: 'UserType';
   firstName: Scalars['String']['output'];
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 39fe95a5..00815308 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -71,6 +71,44 @@ type AgentDescriptionType {
   sourceMention: PersonAgentDescriptionSourceMentionChoices
 }
 
+"""An enumeration."""
+enum Certainty {
+  CERTAIN
+  SOMEWHAT_CERTAIN
+  UNCERTAIN
+}
+
+input CreateAgentInput {
+  name: String!
+  source: ID!
+}
+
+type CreateAgentMutation {
+  agent: AgentDescriptionType
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+input CreatePersonReferenceInput {
+  description: ID!
+  person: ID!
+}
+
+type CreatePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+type DeleteAgentMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+type DeletePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type EpisodeCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -135,6 +173,15 @@ enum EventEpisodeSourceMentionChoices {
   IMPLIED
 }
 
+"""An enumeration."""
+enum Gender {
+  FEMALE
+  MALE
+  MIXED
+  OTHER
+  UNKNOWN
+}
+
 type GiftCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -331,9 +378,14 @@ type LettercraftErrorType {
 }
 
 type Mutation {
+  createAgent(agentData: CreateAgentInput!): CreateAgentMutation
+  createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
+  deleteAgent(id: ID!): DeleteAgentMutation
+  deletePersonReference(id: ID!): DeletePersonReferenceMutation
   updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
   updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
+  updatePersonReference(referenceData: UpdatePersonReferenceInput!): UpdatePersonReferenceMutation
 }
 
 """An enumeration."""
@@ -602,6 +654,12 @@ type SourceContentsDateType {
   yearUpper: Int!
 }
 
+"""An enumeration."""
+enum SourceMention {
+  DIRECT
+  IMPLIED
+}
+
 type SourceType {
   contentsDate: SourceContentsDateType
 
@@ -816,16 +874,32 @@ type StructureType {
   settlement: SettlementType
 }
 
+input UpdateAgentGenderInput {
+  gender: Gender
+  note: String
+  sourceMention: SourceMention
+}
+
 input UpdateAgentInput {
   description: String
+  designators: [String]
+  gender: UpdateAgentGenderInput
   id: ID!
   isGroup: Boolean
+  location: UpdateAgentLocationInput
   name: String
 }
 
+input UpdateAgentLocationInput {
+  location: ID
+  note: String
+  sourceMention: SourceMention
+}
+
 type UpdateAgentMutation {
   agent: AgentDescriptionType
-  error: String
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
 }
 
 input UpdateCreateSourceInput {
@@ -858,6 +932,17 @@ type UpdateOrCreateSourceMutation {
   source: SourceType
 }
 
+input UpdatePersonReferenceInput {
+  certainty: Certainty
+  id: ID!
+  note: String
+}
+
+type UpdatePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type UserType {
   firstName: String!
   id: ID!

From 022a69be0877e902491cfdeec1cd4868e888288b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 13:48:51 +0200
Subject: [PATCH 319/565] correct links in episode preview

---
 .../source/episode-preview/episode-preview.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index ab68d666..5bceedfd 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -33,7 +33,7 @@
                         class="inline-list-item"
                     >
                         <a
-                            [routerLink]="['agent/', agent.id]"
+                            [routerLink]="['/data-entry', 'agents', agent.id]"
                             class="icon-link"
                         >
                             <lc-icon [icon]="agentIcon(agent)" />
@@ -57,7 +57,7 @@
                         class="inline-list-item"
                     >
                         <a
-                            [routerLink]="['location/', space.id]"
+                            [routerLink]="['/data-entry', 'locations', space.id]"
                             class="icon-link"
                         >
                             <lc-icon [icon]="dataIcons.location" />
@@ -83,7 +83,7 @@
                         *ngFor="let gift of episode.gifts"
                         class="inline-list-item"
                     >
-                        <a [routerLink]="['gift/', gift.id]" class="icon-link">
+                        <a [routerLink]="['/data-entry', 'gifts', gift.id]" class="icon-link">
                             <lc-icon [icon]="dataIcons.gift" />
                             {{ gift.name }}
                         </a>
@@ -93,7 +93,7 @@
                         class="inline-list-item"
                     >
                         <a
-                            [routerLink]="['letter/', letter.id]"
+                            [routerLink]="['/data-entry', 'letters', letter.id]"
                             class="icon-link"
                         >
                             <lc-icon [icon]="dataIcons.letter" />

From 14e165b7872e4b03e2e06abccf473f336bc8a92c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 15:11:13 +0200
Subject: [PATCH 320/565] save agent ID data

---
 frontend/generated/graphql.ts                 | 29 ++++++++++++++
 .../agent-identification-form.component.ts    | 40 ++++++++++++++++---
 .../agents-identification.graphql             | 14 +++++++
 3 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index a55daba5..59dc2c55 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -955,6 +955,13 @@ export type DataEntryAgentIdentificationQueryVariables = Exact<{
 
 export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
 
+export type UpdateAgentIdentificationMutationVariables = Exact<{
+  input: UpdateAgentInput;
+}>;
+
+
+export type UpdateAgentIdentificationMutation = { __typename?: 'Mutation', updateAgent?: { __typename?: 'UpdateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryAgentQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1103,6 +1110,28 @@ export const DataEntryAgentIdentificationDocument = gql`
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const UpdateAgentIdentificationDocument = gql`
+    mutation UpdateAgentIdentification($input: UpdateAgentInput!) {
+  updateAgent(agentData: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class UpdateAgentIdentificationGQL extends Apollo.Mutation<UpdateAgentIdentificationMutation, UpdateAgentIdentificationMutationVariables> {
+    override document = UpdateAgentIdentificationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 70e7f1be..2eed0124 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,8 +1,14 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
-import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery } from 'generated/graphql';
-import { map, Subject, switchMap } from 'rxjs';
+import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery, UpdateAgentIdentificationGQL, UpdateAgentIdentificationMutation, UpdateAgentInput, UpdateAgentMutation } from 'generated/graphql';
+import { map, Subject, switchMap, filter, debounceTime, withLatestFrom } from 'rxjs';
+
+interface FormData {
+    name: string;
+    description: string;
+    isGroup: boolean;
+}
 
 @Component({
     selector: 'lc-agent-identification-form',
@@ -13,19 +19,33 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
     @Input() id?: string;
 
     form = new FormGroup({
-        name: new FormControl<string>(''),
-        description: new FormControl<string>(''),
-        isGroup: new FormControl<boolean>(false),
+        name: new FormControl<string>('', { nonNullable: true }),
+        description: new FormControl<string>('', { nonNullable: true }),
+        isGroup: new FormControl<boolean>(false, { nonNullable: true }),
+    }, {
+        updateOn: 'blur'
     });
 
     private id$ = new Subject<string>();
 
-    constructor(private agentQuery: DataEntryAgentIdentificationGQL) {
+    constructor(
+        private agentQuery: DataEntryAgentIdentificationGQL,
+        private agentMutation: UpdateAgentIdentificationGQL,
+    ) {
         this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
             takeUntilDestroyed(),
         ).subscribe(this.updateFormData.bind(this));
+
+        this.form.valueChanges.pipe(
+            filter(() => this.form.valid),
+            debounceTime(500),
+            withLatestFrom(this.id$),
+            map(this.toMutationInput),
+            switchMap(input => this.agentMutation.mutate({ input })),
+            takeUntilDestroyed(),
+        ).subscribe(this.onMutationResult.bind(this));
     }
 
     ngOnChanges(changes: SimpleChanges): void {
@@ -45,4 +65,12 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
             isGroup: data.agentDescription?.isGroup || false,
         });
     }
+
+    private toMutationInput([data, id]: [Partial<FormData>, string]): UpdateAgentInput {
+        return { id, ...data };
+    }
+
+    private onMutationResult(result: any): void {
+        console.log(result);
+    }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql b/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
index fd47a0e3..69cd2fb4 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
@@ -6,3 +6,17 @@ query DataEntryAgentIdentification($id: ID!) {
     isGroup
   }
 }
+
+mutation UpdateAgentIdentification(
+    $input: UpdateAgentInput!
+) {
+    updateAgent(
+        agentData: $input
+    ) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From bde5968501e1fc28df0fcd9c80c28078c1d7ca86 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 15:27:22 +0200
Subject: [PATCH 321/565] show error messages

---
 .../agent-identification-form.component.ts    | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 2eed0124..d74c386c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,8 +1,10 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
+import { ToastService } from '@services/toast.service';
+import { MutationResult } from 'apollo-angular';
 import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery, UpdateAgentIdentificationGQL, UpdateAgentIdentificationMutation, UpdateAgentInput, UpdateAgentMutation } from 'generated/graphql';
-import { map, Subject, switchMap, filter, debounceTime, withLatestFrom } from 'rxjs';
+import { map, Subject, switchMap, filter, debounceTime, withLatestFrom, catchError } from 'rxjs';
 
 interface FormData {
     name: string;
@@ -31,6 +33,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
     constructor(
         private agentQuery: DataEntryAgentIdentificationGQL,
         private agentMutation: UpdateAgentIdentificationGQL,
+        private toastService: ToastService,
     ) {
         this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
@@ -43,7 +46,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
             debounceTime(500),
             withLatestFrom(this.id$),
             map(this.toMutationInput),
-            switchMap(input => this.agentMutation.mutate({ input })),
+            switchMap(input => this.agentMutation.mutate({ input }, { errorPolicy: 'all' })),
             takeUntilDestroyed(),
         ).subscribe(this.onMutationResult.bind(this));
     }
@@ -70,7 +73,24 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         return { id, ...data };
     }
 
-    private onMutationResult(result: any): void {
-        console.log(result);
+    private onMutationResult(result: MutationResult<UpdateAgentIdentificationMutation>): void {
+        if (result.errors) {
+            const messages = result.errors.map(error => error.message);
+            this.toastService.show({
+                type: 'danger',
+                header: 'Failed to save form',
+                body: messages.join('\n\n'),
+            })
+        }
+        if (result.data?.updateAgent?.errors.length) {
+            const errors = result.data.updateAgent.errors;
+            const messages = errors.map(error => `${error.field}: ${error.messages.join('; ')}`);
+            this.toastService.show({
+                type: 'danger',
+                header: 'Failed to save form',
+                body: messages.join('\n\n'),
+            });
+        }
     }
+
 }

From 4014f7734ce0a20d9394b2e63c1a64e15b719384 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 15:32:27 +0200
Subject: [PATCH 322/565] show validation in form

---
 .../agent-identification-form.component.html   |  5 ++++-
 .../agent-identification-form.component.ts     | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
index c9cebc5f..381f9b63 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
@@ -10,7 +10,10 @@
             </small>
         </p>
         <input id="input-name" type="text" class="form-control"
-            [formControl]="form.controls.name">
+            [formControl]="form.controls.name"
+            [class.is-invalid]="form.controls.name.invalid"
+            aria-required="true"
+            [attr.aria-invalid]="form.controls.name.invalid">
     </div>
 
     <div class="mb-4">
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index d74c386c..3a139963 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormControl, FormGroup } from '@angular/forms';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ToastService } from '@services/toast.service';
 import { MutationResult } from 'apollo-angular';
 import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery, UpdateAgentIdentificationGQL, UpdateAgentIdentificationMutation, UpdateAgentInput, UpdateAgentMutation } from 'generated/graphql';
-import { map, Subject, switchMap, filter, debounceTime, withLatestFrom, catchError } from 'rxjs';
+import { map, Subject, switchMap, filter, debounceTime, withLatestFrom, tap } from 'rxjs';
 
 interface FormData {
     name: string;
@@ -21,7 +21,13 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
     @Input() id?: string;
 
     form = new FormGroup({
-        name: new FormControl<string>('', { nonNullable: true }),
+        name: new FormControl<string>('', {
+            nonNullable: true,
+            validators: [
+                Validators.required,
+                Validators.minLength(3),
+            ]
+        }),
         description: new FormControl<string>('', { nonNullable: true }),
         isGroup: new FormControl<boolean>(false, { nonNullable: true }),
     }, {
@@ -42,8 +48,8 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         ).subscribe(this.updateFormData.bind(this));
 
         this.form.valueChanges.pipe(
-            filter(() => this.form.valid),
             debounceTime(500),
+            filter(this.isValid.bind(this)),
             withLatestFrom(this.id$),
             map(this.toMutationInput),
             switchMap(input => this.agentMutation.mutate({ input }, { errorPolicy: 'all' })),
@@ -69,6 +75,10 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         });
     }
 
+    private isValid(): boolean {
+        return this.form.valid;
+    }
+
     private toMutationInput([data, id]: [Partial<FormData>, string]): UpdateAgentInput {
         return { id, ...data };
     }

From 522d9c0a73ad83b092604ebbf78572e4910f67f5 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 16:09:21 +0200
Subject: [PATCH 323/565] refetch queries

---
 .../agent-identification-form.component.ts     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 3a139963..28261ef4 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -4,7 +4,8 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ToastService } from '@services/toast.service';
 import { MutationResult } from 'apollo-angular';
 import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery, UpdateAgentIdentificationGQL, UpdateAgentIdentificationMutation, UpdateAgentInput, UpdateAgentMutation } from 'generated/graphql';
-import { map, Subject, switchMap, filter, debounceTime, withLatestFrom, tap } from 'rxjs';
+import { map, Subject, switchMap, filter, debounceTime, withLatestFrom, Observable, tap, distinctUntilChanged } from 'rxjs';
+import _ from 'underscore';
 
 interface FormData {
     name: string;
@@ -49,10 +50,11 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
 
         this.form.valueChanges.pipe(
             debounceTime(500),
+            distinctUntilChanged(_.isEqual),
             filter(this.isValid.bind(this)),
             withLatestFrom(this.id$),
             map(this.toMutationInput),
-            switchMap(input => this.agentMutation.mutate({ input }, { errorPolicy: 'all' })),
+            switchMap(this.makeMutation.bind(this)),
             takeUntilDestroyed(),
         ).subscribe(this.onMutationResult.bind(this));
     }
@@ -83,6 +85,18 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         return { id, ...data };
     }
 
+    private makeMutation(input: UpdateAgentInput):
+        Observable<MutationResult<UpdateAgentIdentificationMutation>> {
+        return this.agentMutation.mutate({ input }, {
+            errorPolicy: 'all',
+            refetchQueries: [
+                'DataEntryAgent',
+                'DataEntryAgentIdentification',
+                'DataEntryAgentDescription'
+            ],
+        });
+    }
+
     private onMutationResult(result: MutationResult<UpdateAgentIdentificationMutation>): void {
         if (result.errors) {
             const messages = result.errors.map(error => error.message);

From 905282226154983bda8d2f94122405032e6724b8 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 16:12:05 +0200
Subject: [PATCH 324/565] use filler text if no description

---
 .../app/data-entry/agent-form/agent-form.component.html  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 5ca85210..8983f5f7 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -10,8 +10,13 @@ <h1 class="mb-4">
             </span>
         </h1>
 
-        <p class="lead mb-4" *ngIf="agentDescription.description">
-            {{agentDescription.description}}
+        <p class="lead mb-4">
+            <span *ngIf="agentDescription.description; else noDescription">
+                {{agentDescription.description}}
+            </span>
+            <ng-template #noDescription>
+                <i>(No description)</i>
+            </ng-template>
         </p>
 
         <h2>Identification</h2>

From 06c4d33b6f0ad8eea8f8fc5b5a26e9fe87bea449 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 16:22:41 +0200
Subject: [PATCH 325/565] move mutation definition

---
 frontend/generated/graphql.ts                 | 54 +++++++++----------
 .../agent-identification-form.component.ts    | 16 ++++--
 .../agents-identification.graphql             | 14 -----
 .../app/data-entry/agent-form/agent.graphql   | 14 +++++
 4 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 59dc2c55..dffdcbfa 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -955,19 +955,19 @@ export type DataEntryAgentIdentificationQueryVariables = Exact<{
 
 export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
 
-export type UpdateAgentIdentificationMutationVariables = Exact<{
-  input: UpdateAgentInput;
+export type DataEntryAgentQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
 }>;
 
 
-export type UpdateAgentIdentificationMutation = { __typename?: 'Mutation', updateAgent?: { __typename?: 'UpdateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
-export type DataEntryAgentQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+export type DataEntryUpdateAgentMutationVariables = Exact<{
+  input: UpdateAgentInput;
 }>;
 
 
-export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryUpdateAgentMutation = { __typename?: 'Mutation', updateAgent?: { __typename?: 'UpdateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1114,13 +1114,16 @@ export const DataEntryAgentIdentificationDocument = gql`
       super(apollo);
     }
   }
-export const UpdateAgentIdentificationDocument = gql`
-    mutation UpdateAgentIdentification($input: UpdateAgentInput!) {
-  updateAgent(agentData: $input) {
-    ok
-    errors {
-      field
-      messages
+export const DataEntryAgentDocument = gql`
+    query DataEntryAgent($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    isGroup
+    source {
+      id
+      name
     }
   }
 }
@@ -1129,23 +1132,20 @@ export const UpdateAgentIdentificationDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class UpdateAgentIdentificationGQL extends Apollo.Mutation<UpdateAgentIdentificationMutation, UpdateAgentIdentificationMutationVariables> {
-    override document = UpdateAgentIdentificationDocument;
+  export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
+    override document = DataEntryAgentDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
-export const DataEntryAgentDocument = gql`
-    query DataEntryAgent($id: ID!) {
-  agentDescription(id: $id) {
-    id
-    name
-    description
-    isGroup
-    source {
-      id
-      name
+export const DataEntryUpdateAgentDocument = gql`
+    mutation DataEntryUpdateAgent($input: UpdateAgentInput!) {
+  updateAgent(agentData: $input) {
+    ok
+    errors {
+      field
+      messages
     }
   }
 }
@@ -1154,8 +1154,8 @@ export const DataEntryAgentDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
-    override document = DataEntryAgentDocument;
+  export class DataEntryUpdateAgentGQL extends Apollo.Mutation<DataEntryUpdateAgentMutation, DataEntryUpdateAgentMutationVariables> {
+    override document = DataEntryUpdateAgentDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 28261ef4..3583351a 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -3,8 +3,14 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ToastService } from '@services/toast.service';
 import { MutationResult } from 'apollo-angular';
-import { DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery, UpdateAgentIdentificationGQL, UpdateAgentIdentificationMutation, UpdateAgentInput, UpdateAgentMutation } from 'generated/graphql';
-import { map, Subject, switchMap, filter, debounceTime, withLatestFrom, Observable, tap, distinctUntilChanged } from 'rxjs';
+import {
+    DataEntryAgentIdentificationGQL, DataEntryAgentIdentificationQuery,
+    DataEntryUpdateAgentGQL, DataEntryUpdateAgentMutation, UpdateAgentInput
+} from 'generated/graphql';
+import {
+    map, Subject, switchMap, filter, debounceTime, withLatestFrom, Observable,
+    distinctUntilChanged
+} from 'rxjs';
 import _ from 'underscore';
 
 interface FormData {
@@ -39,7 +45,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
 
     constructor(
         private agentQuery: DataEntryAgentIdentificationGQL,
-        private agentMutation: UpdateAgentIdentificationGQL,
+        private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
     ) {
         this.id$.pipe(
@@ -86,7 +92,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
     }
 
     private makeMutation(input: UpdateAgentInput):
-        Observable<MutationResult<UpdateAgentIdentificationMutation>> {
+        Observable<MutationResult<DataEntryUpdateAgentMutation>> {
         return this.agentMutation.mutate({ input }, {
             errorPolicy: 'all',
             refetchQueries: [
@@ -97,7 +103,7 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         });
     }
 
-    private onMutationResult(result: MutationResult<UpdateAgentIdentificationMutation>): void {
+    private onMutationResult(result: MutationResult<DataEntryUpdateAgentMutation>): void {
         if (result.errors) {
             const messages = result.errors.map(error => error.message);
             this.toastService.show({
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql b/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
index 69cd2fb4..fd47a0e3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agents-identification.graphql
@@ -6,17 +6,3 @@ query DataEntryAgentIdentification($id: ID!) {
     isGroup
   }
 }
-
-mutation UpdateAgentIdentification(
-    $input: UpdateAgentInput!
-) {
-    updateAgent(
-        agentData: $input
-    ) {
-        ok
-        errors {
-            field
-            messages
-        }
-    }
-}
diff --git a/frontend/src/app/data-entry/agent-form/agent.graphql b/frontend/src/app/data-entry/agent-form/agent.graphql
index 3fd81287..b3d56359 100644
--- a/frontend/src/app/data-entry/agent-form/agent.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent.graphql
@@ -10,3 +10,17 @@ query DataEntryAgent($id: ID!) {
     }
   }
 }
+
+mutation DataEntryUpdateAgent(
+    $input: UpdateAgentInput!
+) {
+    updateAgent(
+        agentData: $input
+    ) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From 7c59dbf7a0300fda8bbea048fde4d8ea8b043f49 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 16:52:20 +0200
Subject: [PATCH 326/565] save agent description info

---
 .../agent-description-form.component.ts       | 72 ++++++++++++++++++-
 .../agent-identification-form.component.ts    |  6 +-
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index ae7025c3..e0188288 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -1,16 +1,23 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
+import { ToastService } from '@services/toast.service';
+import { MutationResult } from 'apollo-angular';
 import {
     DataEntryAgentDescriptionGQL,
     DataEntryAgentDescriptionQuery,
+    DataEntryUpdateAgentGQL,
+    DataEntryUpdateAgentMutation,
+    Gender,
     PersonAgentDescriptionGenderGenderChoices as GenderChoices,
     PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices,
     LocationsInSourceListGQL,
     LocationsInSourceListQuery,
     PersonAgentDescriptionSourceMentionChoices as LocationSourceMentionChoices,
+    SourceMention,
+    UpdateAgentInput,
 } from 'generated/graphql';
-import { Observable, map, Subject, switchMap, shareReplay, filter } from 'rxjs';
+import { Observable, map, Subject, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom } from 'rxjs';
 import _ from 'underscore';
 
 
@@ -64,6 +71,8 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
     constructor(
         private agentQuery: DataEntryAgentDescriptionGQL,
         private locationsQuery: LocationsInSourceListGQL,
+        private agentMutation: DataEntryUpdateAgentGQL,
+        private toastService: ToastService,
     ) {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
@@ -82,6 +91,16 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
             shareReplay(1),
         );
         this.data$.subscribe(this.updateFormData.bind(this));
+
+        this.form.valueChanges.pipe(
+            debounceTime(500),
+            distinctUntilChanged(_.isEqual),
+            filter(this.isValid.bind(this)),
+            withLatestFrom(this.id$),
+            map(this.toMutationInput),
+            switchMap(this.makeMutation.bind(this)),
+            takeUntilDestroyed(),
+        ).subscribe(this.onMutationResult.bind(this));
     }
 
     ngOnChanges(changes: SimpleChanges): void {
@@ -111,4 +130,55 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         });
     }
 
+    private isValid(): boolean {
+        return this.form.valid;
+    }
+
+    private toMutationInput([data, id]: [Partial<typeof this.form.value>, string]): UpdateAgentInput {
+        return {
+            id,
+            designators: data.designators,
+            gender: {
+                gender: data.gender?.gender as Gender,
+                sourceMention: data.gender?.sourceMention as SourceMention,
+                note: data.gender?.note,
+            },
+            location: data.location?.hasLocation && data.location.location ? {
+                location: data.location.location,
+                sourceMention: data.location.sourceMention as SourceMention,
+                note: data.location.note,
+            } : null,
+        };
+    }
+
+    private makeMutation(input: UpdateAgentInput):
+        Observable<MutationResult<DataEntryUpdateAgentMutation>> {
+        return this.agentMutation.mutate({ input }, {
+            errorPolicy: 'all',
+            refetchQueries: [
+                'DataEntryAgentDescription'
+            ],
+        });
+    }
+
+    private onMutationResult(result: MutationResult<DataEntryUpdateAgentMutation>): void {
+        if (result.errors?.length) {
+            const messages = result.errors.map(error => error.message);
+            this.toastService.show({
+                type: 'danger',
+                header: 'Failed to save form',
+                body: messages.join('\n\n'),
+            });
+        }
+        if (result.data?.updateAgent?.errors.length) {
+            const errors = result.data.updateAgent.errors;
+            const messages = errors.map(error => `${error.field}: ${error.messages.join('\n')}`);
+            this.toastService.show({
+                type: 'danger',
+                header: 'Failed to save form',
+                body: messages.join('\n\n'),
+            });
+        }
+    }
+
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 3583351a..4547b74c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -104,17 +104,17 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
     }
 
     private onMutationResult(result: MutationResult<DataEntryUpdateAgentMutation>): void {
-        if (result.errors) {
+        if (result.errors?.length) {
             const messages = result.errors.map(error => error.message);
             this.toastService.show({
                 type: 'danger',
                 header: 'Failed to save form',
                 body: messages.join('\n\n'),
-            })
+            });
         }
         if (result.data?.updateAgent?.errors.length) {
             const errors = result.data.updateAgent.errors;
-            const messages = errors.map(error => `${error.field}: ${error.messages.join('; ')}`);
+            const messages = errors.map(error => `${error.field}: ${error.messages.join('\n')}`);
             this.toastService.show({
                 type: 'danger',
                 header: 'Failed to save form',

From 0d213285f7d1c4d2f0e96dcd13334befb5ae2463 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 27 Aug 2024 16:58:06 +0200
Subject: [PATCH 327/565] save on change

---
 .../agent-identification-form.component.ts                      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 4547b74c..7b933593 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -37,8 +37,6 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         }),
         description: new FormControl<string>('', { nonNullable: true }),
         isGroup: new FormControl<boolean>(false, { nonNullable: true }),
-    }, {
-        updateOn: 'blur'
     });
 
     private id$ = new Subject<string>();

From bfd67862264fa9b11054f6670fde71027beb9474 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 10:38:14 +0200
Subject: [PATCH 328/565] add delete button

---
 .../agent-form/agent-form.component.html      |  4 ++++
 .../agent-form/agent-form.component.ts        |  2 +-
 .../agent-form/agent-form.module.ts           |  2 ++
 .../delete-agent/delete-agent.component.html  |  4 ++++
 .../delete-agent/delete-agent.component.scss  |  0
 .../delete-agent.component.spec.ts            | 21 +++++++++++++++++++
 .../delete-agent/delete-agent.component.ts    | 14 +++++++++++++
 7 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
 create mode 100644 frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.scss
 create mode 100644 frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 8983f5f7..159318f2 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -19,6 +19,10 @@ <h1 class="mb-4">
             </ng-template>
         </p>
 
+        <div class="hstack">
+            <lc-delete-agent class="ms-auto" *ngIf="id$ | async as id" [id]="id" />
+        </div>
+
         <h2>Identification</h2>
         <lc-agent-identification-form *ngIf="id$ | async as id" [id]="id" />
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index 499cc96e..cdc7b196 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
-import { dataIcons } from '@shared/icons';
+import { actionIcons, dataIcons } from '@shared/icons';
 import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index 498f1ca3..46c71a58 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -4,6 +4,7 @@ import { SharedModule } from '@shared/shared.module';
 import { AgentIdentificationFormComponent } from './agent-identification-form/agent-identification-form.component';
 import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
+import { DeleteAgentComponent } from './delete-agent/delete-agent.component';
 
 
 
@@ -12,6 +13,7 @@ import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
         AgentFormComponent,
         AgentIdentificationFormComponent,
         AgentDescriptionFormComponent,
+        DeleteAgentComponent,
     ],
     imports: [
         SharedModule,
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
new file mode 100644
index 00000000..4a38cb75
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
@@ -0,0 +1,4 @@
+<button class="btn btn-danger">
+    <lc-icon [icon]="actionIcons.delete"></lc-icon>
+    Delete agent
+</button>
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.scss b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
new file mode 100644
index 00000000..10fdc22d
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteAgentComponent } from './delete-agent.component';
+
+describe('DeleteAgentComponent', () => {
+  let component: DeleteAgentComponent;
+  let fixture: ComponentFixture<DeleteAgentComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [DeleteAgentComponent]
+    });
+    fixture = TestBed.createComponent(DeleteAgentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
new file mode 100644
index 00000000..824022c0
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -0,0 +1,14 @@
+import { Component, Input } from '@angular/core';
+import { actionIcons } from '@shared/icons';
+
+@Component({
+    selector: 'lc-delete-agent',
+    templateUrl: './delete-agent.component.html',
+    styleUrls: ['./delete-agent.component.scss']
+})
+export class DeleteAgentComponent {
+    @Input({ required: true }) id!: string;
+
+    actionIcons = actionIcons;
+
+}

From 4b9771994a692376d4ebc57e219e57012bc4b8ce Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 10:55:31 +0200
Subject: [PATCH 329/565] add confirmation modal

---
 .../delete-agent/delete-agent.component.html  | 25 ++++++++++++++++++-
 .../delete-agent/delete-agent.component.ts    | 17 ++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
index 4a38cb75..9eb4b271 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
@@ -1,4 +1,27 @@
-<button class="btn btn-danger">
+<button class="btn btn-danger" (click)="open(confirmModal)">
     <lc-icon [icon]="actionIcons.delete"></lc-icon>
     Delete agent
 </button>
+
+<ng-template #confirmModal let-modal>
+    <div class="modal-header">
+        <h2 class="modal-title" id="modal-title">Delete agent?</h2>
+        <button type="button" class="btn-close" aria-label="close"
+            (click)="modal.dismiss('cancel')">
+        </button>
+    </div>
+    <div class="modal-body">
+        <p>
+            Delete this agent from this source text? They will be removed from <i>all</i>
+            episodes they are involved in!
+        </p>
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-danger" (click)="modal.close(id)">
+            Delete
+        </button>
+        <button type="button" class="btn btn-secondary" (click)="modal.dismiss('cancel')">
+            Cancel
+        </button>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 824022c0..009a662d 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -1,5 +1,7 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, TemplateRef } from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { actionIcons } from '@shared/icons';
+import _ from 'underscore';
 
 @Component({
     selector: 'lc-delete-agent',
@@ -11,4 +13,17 @@ export class DeleteAgentComponent {
 
     actionIcons = actionIcons;
 
+    constructor(private modalService: NgbModal) { }
+
+    open(content: TemplateRef<any>) {
+        this.modalService.open(content, { ariaLabelledBy: 'modal-title' }).result.then(
+            this.deleteAgent.bind(this),
+            _.constant(undefined),
+        );
+    }
+
+    deleteAgent(id: string) {
+        console.log(id);
+    }
+
 }

From 2ce9355fbad43b12dcdbad4d325acb8e07e1fcea Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 13:32:42 +0200
Subject: [PATCH 330/565] send mutation on delete

---
 frontend/generated/graphql.ts                 | 29 ++++++++++++
 .../agent-form/agent-form.component.html      |  3 +-
 .../agent-form/agent-form.component.ts        |  7 +++
 .../delete-agent/delete-agent.component.ts    | 46 ++++++++++++++++++-
 .../delete-agent/delete-agent.graphql         |  9 ++++
 5 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index dffdcbfa..d2191235 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -969,6 +969,13 @@ export type DataEntryUpdateAgentMutationVariables = Exact<{
 
 export type DataEntryUpdateAgentMutation = { __typename?: 'Mutation', updateAgent?: { __typename?: 'UpdateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryDeleteAgentMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
+
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1157,6 +1164,28 @@ export const DataEntryUpdateAgentDocument = gql`
   export class DataEntryUpdateAgentGQL extends Apollo.Mutation<DataEntryUpdateAgentMutation, DataEntryUpdateAgentMutationVariables> {
     override document = DataEntryUpdateAgentDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryDeleteAgentDocument = gql`
+    mutation DataEntryDeleteAgent($id: ID!) {
+  deleteAgent(id: $id) {
+    ok
+    errors {
+      messages
+      field
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
+    override document = DataEntryDeleteAgentDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 159318f2..ea123edf 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -20,7 +20,8 @@ <h1 class="mb-4">
         </p>
 
         <div class="hstack">
-            <lc-delete-agent class="ms-auto" *ngIf="id$ | async as id" [id]="id" />
+            <lc-delete-agent class="ms-auto" *ngIf="id$ | async as id" [id]="id"
+                [navigateOnDelete]="sourceLink(data)" />
         </div>
 
         <h2>Identification</h2>
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index cdc7b196..7ab6bb2a 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -26,6 +26,13 @@ export class AgentFormComponent {
         );
     }
 
+    sourceLink(data: DataEntryAgentQuery): string[] | undefined {
+        if (data.agentDescription?.source) {
+            return ['/data-entry', 'sources', data.agentDescription.source.id]
+        }
+        return undefined;
+    }
+
     getBreadcrumbs(data: DataEntryAgentQuery): Breadcrumb[] {
         if (data.agentDescription) {
             return [
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 009a662d..aed8eaf6 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -1,6 +1,9 @@
 import { Component, Input, TemplateRef } from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ToastService } from '@services/toast.service';
 import { actionIcons } from '@shared/icons';
+import { DataEntryDeleteAgentGQL, LettercraftErrorType } from 'generated/graphql';
 import _ from 'underscore';
 
 @Component({
@@ -10,10 +13,16 @@ import _ from 'underscore';
 })
 export class DeleteAgentComponent {
     @Input({ required: true }) id!: string;
+    @Input() navigateOnDelete?: any[];
 
     actionIcons = actionIcons;
 
-    constructor(private modalService: NgbModal) { }
+    constructor(
+        private modalService: NgbModal,
+        private deleteMutation: DataEntryDeleteAgentGQL,
+        private toastService: ToastService,
+        private router: Router,
+    ) { }
 
     open(content: TemplateRef<any>) {
         this.modalService.open(content, { ariaLabelledBy: 'modal-title' }).result.then(
@@ -23,7 +32,40 @@ export class DeleteAgentComponent {
     }
 
     deleteAgent(id: string) {
-        console.log(id);
+        this.deleteMutation.mutate({ id }).subscribe({
+            next: (result) => {
+                if (result.data?.deleteAgent?.ok) {
+                    this.onSuccess();
+                } else {
+                    this.onFail(result.data?.deleteAgent?.errors);
+                }
+            },
+            error: (error) => {
+                this.onFail(error);
+            }
+        });
     }
 
+    onSuccess() {
+        this.toastService.show({
+            type: 'success',
+            header: 'Agent deleted',
+            body: 'Agent successfully deleted'
+        })
+        if (this.navigateOnDelete) {
+            this.router.navigate(this.navigateOnDelete);
+        }
+    }
+
+    onFail(errors?: LettercraftErrorType[] | any) {
+        console.error(errors);
+        const messages = errors?.map?.call(
+            (error: any) => error.messages?.join('\n')
+        ) || 'Unexpected error';
+        this.toastService.show({
+            type: 'danger',
+            header: 'Deletion failed',
+            body: `Deleting agent failed:\n${messages}`
+        });
+    }
 }
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.graphql b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.graphql
new file mode 100644
index 00000000..5c2f98a3
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.graphql
@@ -0,0 +1,9 @@
+mutation DataEntryDeleteAgent($id: ID!) {
+    deleteAgent(id: $id) {
+        ok
+        errors {
+            messages
+            field
+        }
+    }
+}

From 105c015995866183a49db4ca10141d81e130d8d1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 13:39:16 +0200
Subject: [PATCH 331/565] refetch source query after deleting agent

---
 .../agent-form/delete-agent/delete-agent.component.ts       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index aed8eaf6..5a34b53a 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -32,7 +32,11 @@ export class DeleteAgentComponent {
     }
 
     deleteAgent(id: string) {
-        this.deleteMutation.mutate({ id }).subscribe({
+        this.deleteMutation.mutate({ id }, {
+            refetchQueries: [
+                'source'
+            ],
+        }).subscribe({
             next: (result) => {
                 if (result.data?.deleteAgent?.ok) {
                     this.onSuccess();

From 76834a53fbdc8b6b80cad088cde87fca4a6a82a6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 13:46:32 +0200
Subject: [PATCH 332/565] use source.name in source overview

---
 frontend/src/app/data-entry/source/source.component.html | 2 +-
 frontend/src/app/data-entry/source/source.component.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/source/source.component.html b/frontend/src/app/data-entry/source/source.component.html
index a00b973a..d247f623 100644
--- a/frontend/src/app/data-entry/source/source.component.html
+++ b/frontend/src/app/data-entry/source/source.component.html
@@ -3,7 +3,7 @@
 <h1 class="mb-4">
     <lc-icon [icon]="dataIcons.source" />
     <span *ngIf="source$ | async as source" class="ms-2">
-        {{ source.medievalAuthor }}, <i>{{ source.medievalTitle }}</i>
+        {{ source.name }}
     </span>
 </h1>
 
diff --git a/frontend/src/app/data-entry/source/source.component.ts b/frontend/src/app/data-entry/source/source.component.ts
index 1443d692..245c3a3f 100644
--- a/frontend/src/app/data-entry/source/source.component.ts
+++ b/frontend/src/app/data-entry/source/source.component.ts
@@ -35,7 +35,7 @@ export class SourceComponent {
 
     public sourceTitle = toSignal(
         this.source$.pipe(
-            map((source) => `${source.medievalAuthor}, ${source.medievalTitle}`)
+            map((source) => source.name)
         ),
         { initialValue: "" }
     );

From c6d4ed6178d7cb356b0f44d96d7a6682acf9e51d Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 14:01:07 +0200
Subject: [PATCH 333/565] add formService

---
 .../agent-description-form.component.ts       | 20 +++++------------
 .../agent-form/agent-form.component.html      |  2 +-
 .../agent-form/agent-form.component.ts        | 21 +++++++++---------
 .../agent-form/agent-form.service.spec.ts     | 16 ++++++++++++++
 .../agent-form/agent-form.service.ts          | 16 ++++++++++++++
 .../agent-identification-form.component.ts    | 22 +++++--------------
 6 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-form.service.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index e0188288..6d0c53d8 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -17,8 +17,9 @@ import {
     SourceMention,
     UpdateAgentInput,
 } from 'generated/graphql';
-import { Observable, map, Subject, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom } from 'rxjs';
+import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom } from 'rxjs';
 import _ from 'underscore';
+import { AgentFormService } from '../agent-form.service';
 
 
 @Component({
@@ -26,9 +27,7 @@ import _ from 'underscore';
     templateUrl: './agent-description-form.component.html',
     styleUrls: ['./agent-description-form.component.scss'],
 })
-export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
-    @Input() id?: string;
-
+export class AgentDescriptionFormComponent {
     genderOptions: { value: GenderChoices, label: string }[] = [
         { value: GenderChoices.Female, label: 'Female' },
         { value: GenderChoices.Male, label: 'Male' },
@@ -65,7 +64,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
     isGroup$: Observable<boolean>;
     locations$: Observable<LocationsInSourceListQuery>;
 
-    private id$ = new Subject<string>();
+    private id$ = this.formService.id$;
     private data$: Observable<DataEntryAgentDescriptionQuery>;
 
     constructor(
@@ -73,6 +72,7 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         private locationsQuery: LocationsInSourceListGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
+        private formService: AgentFormService,
     ) {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
@@ -103,16 +103,6 @@ export class AgentDescriptionFormComponent implements OnChanges, OnDestroy {
         ).subscribe(this.onMutationResult.bind(this));
     }
 
-    ngOnChanges(changes: SimpleChanges): void {
-        if (changes['id'] && this.id) {
-            this.id$.next(this.id);
-        }
-    }
-
-    ngOnDestroy(): void {
-        this.id$.complete();
-    }
-
     updateFormData(data: DataEntryAgentDescriptionQuery) {
         this.form.setValue({
             designators: data.agentDescription?.designators || [],
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index ea123edf..27127c4e 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -28,7 +28,7 @@ <h2>Identification</h2>
         <lc-agent-identification-form *ngIf="id$ | async as id" [id]="id" />
 
         <h2>Description in source text</h2>
-        <lc-agent-description-form *ngIf="id$ | async as id" [id]="id" />
+        <lc-agent-description-form />
 
         <h2>Episodes</h2>
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index 7ab6bb2a..0250c192 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -1,25 +1,26 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
-import { actionIcons, dataIcons } from '@shared/icons';
+import { dataIcons } from '@shared/icons';
 import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
+import { AgentFormService } from './agent-form.service';
 
 @Component({
-  selector: 'lc-agent-form',
-  templateUrl: './agent-form.component.html',
-  styleUrls: ['./agent-form.component.scss']
+    selector: 'lc-agent-form',
+    templateUrl: './agent-form.component.html',
+    styleUrls: ['./agent-form.component.scss'],
+    providers: [AgentFormService],
 })
 export class AgentFormComponent {
-    id$: Observable<string>;
+    id$: Observable<string> = this.formService.id$;
     data$: Observable<DataEntryAgentQuery>;
 
     dataIcons = dataIcons;
 
-    constructor(private route: ActivatedRoute, private agentQuery: DataEntryAgentGQL) {
-        this.id$ = this.route.params.pipe(
-            map(params => params['id']),
-        );
+    constructor(
+        private agentQuery: DataEntryAgentGQL,
+        private formService: AgentFormService,
+    ) {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts b/frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts
new file mode 100644
index 00000000..b9fdfd63
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AgentFormService } from './agent-form.service';
+
+describe('AgentFormService', () => {
+  let service: AgentFormService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(AgentFormService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.service.ts b/frontend/src/app/data-entry/agent-form/agent-form.service.ts
new file mode 100644
index 00000000..4ced1cfe
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-form.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { map, Observable } from 'rxjs';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class AgentFormService {
+    id$: Observable<string>;
+
+    constructor(private route: ActivatedRoute) {
+        this.id$ = this.route.params.pipe(
+            map(params => params['id'])
+        );
+    }
+}
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 7b933593..36aad1af 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { Component } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ToastService } from '@services/toast.service';
@@ -8,10 +8,11 @@ import {
     DataEntryUpdateAgentGQL, DataEntryUpdateAgentMutation, UpdateAgentInput
 } from 'generated/graphql';
 import {
-    map, Subject, switchMap, filter, debounceTime, withLatestFrom, Observable,
+    map, switchMap, filter, debounceTime, withLatestFrom, Observable,
     distinctUntilChanged
 } from 'rxjs';
 import _ from 'underscore';
+import { AgentFormService } from '../agent-form.service';
 
 interface FormData {
     name: string;
@@ -24,9 +25,7 @@ interface FormData {
     templateUrl: './agent-identification-form.component.html',
     styleUrls: ['./agent-identification-form.component.scss']
 })
-export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
-    @Input() id?: string;
-
+export class AgentIdentificationFormComponent {
     form = new FormGroup({
         name: new FormControl<string>('', {
             nonNullable: true,
@@ -39,12 +38,13 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         isGroup: new FormControl<boolean>(false, { nonNullable: true }),
     });
 
-    private id$ = new Subject<string>();
+    private id$ = this.formService.id$;
 
     constructor(
         private agentQuery: DataEntryAgentIdentificationGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
+        private formService: AgentFormService,
     ) {
         this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
@@ -63,16 +63,6 @@ export class AgentIdentificationFormComponent implements OnChanges, OnDestroy {
         ).subscribe(this.onMutationResult.bind(this));
     }
 
-    ngOnChanges(changes: SimpleChanges): void {
-        if (changes['id'] && this.id) {
-            this.id$.next(this.id);
-        }
-    }
-
-    ngOnDestroy(): void {
-        this.id$.complete();
-    }
-
     updateFormData(data: DataEntryAgentIdentificationQuery) {
         this.form.setValue({
             name: data.agentDescription?.name || '',

From 06c2a3c583167019bd3bb9b048d95488b5eb3ad9 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 15:01:54 +0200
Subject: [PATCH 334/565] generate form status component

---
 .../shared/data-entry-shared.module.ts        |  2 ++
 .../form-status/form-status.component.html    |  1 +
 .../form-status/form-status.component.scss    |  0
 .../form-status/form-status.component.spec.ts | 21 +++++++++++++++++++
 .../form-status/form-status.component.ts      | 11 ++++++++++
 frontend/src/app/data-entry/shared/types.d.ts |  1 +
 6 files changed, 36 insertions(+)
 create mode 100644 frontend/src/app/data-entry/shared/form-status/form-status.component.html
 create mode 100644 frontend/src/app/data-entry/shared/form-status/form-status.component.scss
 create mode 100644 frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/form-status/form-status.component.ts
 create mode 100644 frontend/src/app/data-entry/shared/types.d.ts

diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index 5395a06f..fb1b5c28 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -3,12 +3,14 @@ import { SharedModule } from "@shared/shared.module";
 import { DesignatorsControlComponent } from "./designators-control/designators-control.component";
 import { MultiselectComponent } from "./multiselect/multiselect.component";
 import { LabelSelectComponent } from "./label-select/label-select.component";
+import { FormStatusComponent } from './form-status/form-status.component';
 
 @NgModule({
     declarations: [
         DesignatorsControlComponent,
         MultiselectComponent,
         LabelSelectComponent,
+        FormStatusComponent,
     ],
     imports: [SharedModule],
     exports: [
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.html b/frontend/src/app/data-entry/shared/form-status/form-status.component.html
new file mode 100644
index 00000000..d225819e
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.html
@@ -0,0 +1 @@
+<p>{{status}}</p>
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.scss b/frontend/src/app/data-entry/shared/form-status/form-status.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
new file mode 100644
index 00000000..9fcc0c8c
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FormStatusComponent } from './form-status.component';
+
+describe('FormStatusComponent', () => {
+  let component: FormStatusComponent;
+  let fixture: ComponentFixture<FormStatusComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [FormStatusComponent]
+    });
+    fixture = TestBed.createComponent(FormStatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
new file mode 100644
index 00000000..b7e57314
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -0,0 +1,11 @@
+import { Component, Input } from '@angular/core';
+import { FormStatus } from '../types';
+
+@Component({
+    selector: 'lc-form-status',
+    templateUrl: './form-status.component.html',
+    styleUrls: ['./form-status.component.scss']
+})
+export class FormStatusComponent {
+    @Input({ required: true }) status!: FormStatus;
+}
diff --git a/frontend/src/app/data-entry/shared/types.d.ts b/frontend/src/app/data-entry/shared/types.d.ts
new file mode 100644
index 00000000..486e584a
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/types.d.ts
@@ -0,0 +1 @@
+export type FormStatus = 'idle' | 'loading' | 'saved' | 'error';

From 4d84dcdddfa455b6a3d8d10d1558f8bfa60e019c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 15:12:40 +0200
Subject: [PATCH 335/565] show form status in agent form

---
 .../agent-description-form.component.ts       | 21 +++++++++--
 .../agent-form/agent-form.component.html      |  2 +
 .../agent-form/agent-form.component.ts        |  2 +
 .../agent-form/agent-form.service.ts          | 37 ++++++++++++++++++-
 .../agent-identification-form.component.ts    | 27 +++++++++++---
 .../shared/data-entry-shared.module.ts        |  1 +
 .../form-status/form-status.component.html    |  2 +-
 .../form-status/form-status.component.ts      |  3 +-
 8 files changed, 83 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 6d0c53d8..b0222b13 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -17,9 +17,10 @@ import {
     SourceMention,
     UpdateAgentInput,
 } from 'generated/graphql';
-import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom } from 'rxjs';
+import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom, BehaviorSubject, tap } from 'rxjs';
 import _ from 'underscore';
 import { AgentFormService } from '../agent-form.service';
+import { FormStatus } from '../../shared/types';
 
 
 @Component({
@@ -27,7 +28,7 @@ import { AgentFormService } from '../agent-form.service';
     templateUrl: './agent-description-form.component.html',
     styleUrls: ['./agent-description-form.component.scss'],
 })
-export class AgentDescriptionFormComponent {
+export class AgentDescriptionFormComponent implements OnDestroy {
     genderOptions: { value: GenderChoices, label: string }[] = [
         { value: GenderChoices.Female, label: 'Female' },
         { value: GenderChoices.Male, label: 'Male' },
@@ -64,8 +65,11 @@ export class AgentDescriptionFormComponent {
     isGroup$: Observable<boolean>;
     locations$: Observable<LocationsInSourceListQuery>;
 
+    status$ = new BehaviorSubject<FormStatus>('idle');
+
     private id$ = this.formService.id$;
     private data$: Observable<DataEntryAgentDescriptionQuery>;
+    private formName = 'description';
 
     constructor(
         private agentQuery: DataEntryAgentDescriptionGQL,
@@ -74,6 +78,7 @@ export class AgentDescriptionFormComponent {
         private toastService: ToastService,
         private formService: AgentFormService,
     ) {
+        this.formService.attachForm(this.formName, this.status$);
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
@@ -96,6 +101,7 @@ export class AgentDescriptionFormComponent {
             debounceTime(500),
             distinctUntilChanged(_.isEqual),
             filter(this.isValid.bind(this)),
+            tap(() => this.status$.next('loading')),
             withLatestFrom(this.id$),
             map(this.toMutationInput),
             switchMap(this.makeMutation.bind(this)),
@@ -120,6 +126,10 @@ export class AgentDescriptionFormComponent {
         });
     }
 
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
     private isValid(): boolean {
         return this.form.valid;
     }
@@ -153,14 +163,15 @@ export class AgentDescriptionFormComponent {
 
     private onMutationResult(result: MutationResult<DataEntryUpdateAgentMutation>): void {
         if (result.errors?.length) {
+            this.status$.next('error');
             const messages = result.errors.map(error => error.message);
             this.toastService.show({
                 type: 'danger',
                 header: 'Failed to save form',
                 body: messages.join('\n\n'),
             });
-        }
-        if (result.data?.updateAgent?.errors.length) {
+        } else if (result.data?.updateAgent?.errors.length) {
+            this.status$.next('error');
             const errors = result.data.updateAgent.errors;
             const messages = errors.map(error => `${error.field}: ${error.messages.join('\n')}`);
             this.toastService.show({
@@ -168,6 +179,8 @@ export class AgentDescriptionFormComponent {
                 header: 'Failed to save form',
                 body: messages.join('\n\n'),
             });
+        } else {
+            this.status$.next('saved');
         }
     }
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 27127c4e..4af4fd89 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -19,6 +19,8 @@ <h1 class="mb-4">
             </ng-template>
         </p>
 
+        <lc-form-status [status$]="status$" />
+
         <div class="hstack">
             <lc-delete-agent class="ms-auto" *ngIf="id$ | async as id" [id]="id"
                 [navigateOnDelete]="sourceLink(data)" />
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index 0250c192..9e6fa147 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -17,6 +17,8 @@ export class AgentFormComponent {
 
     dataIcons = dataIcons;
 
+    status$ = this.formService.status$;
+
     constructor(
         private agentQuery: DataEntryAgentGQL,
         private formService: AgentFormService,
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.service.ts b/frontend/src/app/data-entry/agent-form/agent-form.service.ts
index 4ced1cfe..5968d6ea 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.service.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.service.ts
@@ -1,6 +1,8 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { map, Observable } from 'rxjs';
+import { BehaviorSubject, combineLatest, map, Observable, shareReplay, switchMap } from 'rxjs';
+import { FormStatus } from '../shared/types';
+import _ from 'underscore';
 
 @Injectable({
     providedIn: 'root'
@@ -8,9 +10,42 @@ import { map, Observable } from 'rxjs';
 export class AgentFormService {
     id$: Observable<string>;
 
+    status$: Observable<FormStatus>;
+
+    private statuses$ = new BehaviorSubject<Record<string, Observable<FormStatus>>>({});
+
     constructor(private route: ActivatedRoute) {
         this.id$ = this.route.params.pipe(
             map(params => params['id'])
         );
+        this.status$ = this.statuses$.pipe(
+            switchMap(statuses => combineLatest(_.values(statuses))),
+            map(this.combinedStatus)
+        );
+    }
+
+    attachForm(name: string, status$: Observable<FormStatus>) {
+        const statuses = this.statuses$.value;
+        if (_.has(statuses, name)) {
+            throw Error(`A form named ${name} is already registered`);
+        }
+        const newValue = _.extend(statuses, { [name]: status$.pipe(shareReplay(1)) })
+        this.statuses$.next(newValue);
+    }
+
+    detachForm(name: string) {
+        const statuses = this.statuses$.value;
+        const newValue = _.omit(statuses, name);
+        this.statuses$.next(newValue);
+    }
+
+    private combinedStatus(statuses: FormStatus[]) {
+        if (_.any(statuses, status => status === 'error')) {
+            return 'error';
+        } else if (_.any(statuses, status => status === 'loading')) {
+            return 'loading';
+        } else {
+            return 'saved';
+        }
     }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 36aad1af..fc30f846 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ToastService } from '@services/toast.service';
@@ -9,10 +9,14 @@ import {
 } from 'generated/graphql';
 import {
     map, switchMap, filter, debounceTime, withLatestFrom, Observable,
-    distinctUntilChanged
+    distinctUntilChanged,
+
+    tap,
+    BehaviorSubject
 } from 'rxjs';
 import _ from 'underscore';
 import { AgentFormService } from '../agent-form.service';
+import { FormStatus } from '../../shared/types';
 
 interface FormData {
     name: string;
@@ -25,7 +29,7 @@ interface FormData {
     templateUrl: './agent-identification-form.component.html',
     styleUrls: ['./agent-identification-form.component.scss']
 })
-export class AgentIdentificationFormComponent {
+export class AgentIdentificationFormComponent implements OnDestroy {
     form = new FormGroup({
         name: new FormControl<string>('', {
             nonNullable: true,
@@ -38,7 +42,10 @@ export class AgentIdentificationFormComponent {
         isGroup: new FormControl<boolean>(false, { nonNullable: true }),
     });
 
+    status$ = new BehaviorSubject<FormStatus>('idle');
+
     private id$ = this.formService.id$;
+    private formName = 'identification';
 
     constructor(
         private agentQuery: DataEntryAgentIdentificationGQL,
@@ -46,6 +53,8 @@ export class AgentIdentificationFormComponent {
         private toastService: ToastService,
         private formService: AgentFormService,
     ) {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
             map(result => result.data),
@@ -56,6 +65,7 @@ export class AgentIdentificationFormComponent {
             debounceTime(500),
             distinctUntilChanged(_.isEqual),
             filter(this.isValid.bind(this)),
+            tap(() => this.status$.next('loading')),
             withLatestFrom(this.id$),
             map(this.toMutationInput),
             switchMap(this.makeMutation.bind(this)),
@@ -63,6 +73,10 @@ export class AgentIdentificationFormComponent {
         ).subscribe(this.onMutationResult.bind(this));
     }
 
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
     updateFormData(data: DataEntryAgentIdentificationQuery) {
         this.form.setValue({
             name: data.agentDescription?.name || '',
@@ -93,14 +107,15 @@ export class AgentIdentificationFormComponent {
 
     private onMutationResult(result: MutationResult<DataEntryUpdateAgentMutation>): void {
         if (result.errors?.length) {
+            this.status$.next('error');
             const messages = result.errors.map(error => error.message);
             this.toastService.show({
                 type: 'danger',
                 header: 'Failed to save form',
                 body: messages.join('\n\n'),
             });
-        }
-        if (result.data?.updateAgent?.errors.length) {
+        } else if (result.data?.updateAgent?.errors.length) {
+            this.status$.next('error');
             const errors = result.data.updateAgent.errors;
             const messages = errors.map(error => `${error.field}: ${error.messages.join('\n')}`);
             this.toastService.show({
@@ -108,6 +123,8 @@ export class AgentIdentificationFormComponent {
                 header: 'Failed to save form',
                 body: messages.join('\n\n'),
             });
+        } else {
+            this.status$.next('saved');
         }
     }
 
diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index fb1b5c28..b333a16a 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -17,6 +17,7 @@ import { FormStatusComponent } from './form-status/form-status.component';
         DesignatorsControlComponent,
         MultiselectComponent,
         LabelSelectComponent,
+        FormStatusComponent,
     ],
 })
 export class DataEntrySharedModule {}
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.html b/frontend/src/app/data-entry/shared/form-status/form-status.component.html
index d225819e..8ef65294 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.html
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.html
@@ -1 +1 @@
-<p>{{status}}</p>
+<p role="status">{{status$ | async}}</p>
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
index b7e57314..568b1c3b 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { FormStatus } from '../types';
+import { Observable } from 'rxjs';
 
 @Component({
     selector: 'lc-form-status',
@@ -7,5 +8,5 @@ import { FormStatus } from '../types';
     styleUrls: ['./form-status.component.scss']
 })
 export class FormStatusComponent {
-    @Input({ required: true }) status!: FormStatus;
+    @Input({ required: true }) status$!: Observable<FormStatus>;
 }

From df1e25b1a05362d0ff2ee43a26f43fe9c618cfc3 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 15:26:43 +0200
Subject: [PATCH 336/565] pretty status message

---
 .../form-status/form-status.component.html      |  5 ++++-
 .../shared/form-status/form-status.component.ts | 17 +++++++++++++++++
 frontend/src/app/shared/icons.ts                |  7 +++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.html b/frontend/src/app/data-entry/shared/form-status/form-status.component.html
index 8ef65294..667f06e3 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.html
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.html
@@ -1 +1,4 @@
-<p role="status">{{status$ | async}}</p>
+<p role="status" *ngIf="status$ | async as status" [className]="classes[status]">
+    <lc-icon [icon]="statusIcons[status]" />
+    {{messages[status]}}
+</p>
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
index 568b1c3b..96193a02 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormStatus } from '../types';
 import { Observable } from 'rxjs';
+import { statusIcons } from '@shared/icons';
 
 @Component({
     selector: 'lc-form-status',
@@ -9,4 +10,20 @@ import { Observable } from 'rxjs';
 })
 export class FormStatusComponent {
     @Input({ required: true }) status$!: Observable<FormStatus>;
+
+    statusIcons = statusIcons;
+
+    messages: Record<FormStatus, string> = {
+        'idle': 'Waiting for input',
+        'loading': 'Loading...',
+        'saved': 'Changes saved',
+        'error': 'Saving failed',
+    };
+
+    classes: Record<FormStatus, string> = {
+        'idle': 'text-secondary',
+        'loading': 'text-secondary',
+        'saved': 'text-success',
+        'error': 'text-danger',
+    };
 }
diff --git a/frontend/src/app/shared/icons.ts b/frontend/src/app/shared/icons.ts
index 254f116b..6bf2d7c8 100644
--- a/frontend/src/app/shared/icons.ts
+++ b/frontend/src/app/shared/icons.ts
@@ -35,5 +35,12 @@ export const dataIcons = {
     letter: 'envelope',
 };
 
+export const statusIcons = {
+    idle: 'pencil',
+    loading: 'hourglass',
+    saved: 'check-lg',
+    error: 'exclamation-circle',
+}
+
 
 

From 7df9abaf78356883a80c03f2b964896e6f4ab9c6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 15:59:37 +0200
Subject: [PATCH 337/565] prevent status flickering

---
 frontend/src/app/data-entry/agent-form/agent-form.service.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.service.ts b/frontend/src/app/data-entry/agent-form/agent-form.service.ts
index 5968d6ea..79159851 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.service.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { BehaviorSubject, combineLatest, map, Observable, shareReplay, switchMap } from 'rxjs';
+import { asyncScheduler, BehaviorSubject, combineLatest, map, Observable, shareReplay, switchMap, throttleTime } from 'rxjs';
 import { FormStatus } from '../shared/types';
 import _ from 'underscore';
 
@@ -20,7 +20,8 @@ export class AgentFormService {
         );
         this.status$ = this.statuses$.pipe(
             switchMap(statuses => combineLatest(_.values(statuses))),
-            map(this.combinedStatus)
+            map(this.combinedStatus),
+            throttleTime(400, asyncScheduler, { trailing: true }),
         );
     }
 

From 5aceee8b92cb6e1289e352ec53e06a4f9300e496 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 16:09:29 +0200
Subject: [PATCH 338/565] use agentFormService in delete component

---
 .../agent-form/agent-form.component.html      |  5 ++--
 .../delete-agent/delete-agent.component.html  |  3 ++-
 .../delete-agent/delete-agent.component.ts    | 24 +++++++++++++++----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 4af4fd89..b16dd437 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -22,12 +22,11 @@ <h1 class="mb-4">
         <lc-form-status [status$]="status$" />
 
         <div class="hstack">
-            <lc-delete-agent class="ms-auto" *ngIf="id$ | async as id" [id]="id"
-                [navigateOnDelete]="sourceLink(data)" />
+            <lc-delete-agent class="ms-auto" [navigateOnDelete]="sourceLink(data)" />
         </div>
 
         <h2>Identification</h2>
-        <lc-agent-identification-form *ngIf="id$ | async as id" [id]="id" />
+        <lc-agent-identification-form />
 
         <h2>Description in source text</h2>
         <lc-agent-description-form />
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
index 9eb4b271..a44b74a6 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
@@ -17,7 +17,8 @@ <h2 class="modal-title" id="modal-title">Delete agent?</h2>
         </p>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-danger" (click)="modal.close(id)">
+        <button type="button" class="btn btn-danger"
+            *ngIf="id$ | async as id" (click)="modal.close(id)">
             Delete
         </button>
         <button type="button" class="btn btn-secondary" (click)="modal.dismiss('cancel')">
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 5a34b53a..0a633a56 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -1,28 +1,41 @@
-import { Component, Input, TemplateRef } from '@angular/core';
+import { Component, Input, OnDestroy, TemplateRef } from '@angular/core';
 import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
 import { actionIcons } from '@shared/icons';
 import { DataEntryDeleteAgentGQL, LettercraftErrorType } from 'generated/graphql';
 import _ from 'underscore';
+import { AgentFormService } from '../agent-form.service';
+import { BehaviorSubject } from 'rxjs';
+import { FormStatus } from '../../shared/types';
 
 @Component({
     selector: 'lc-delete-agent',
     templateUrl: './delete-agent.component.html',
     styleUrls: ['./delete-agent.component.scss']
 })
-export class DeleteAgentComponent {
-    @Input({ required: true }) id!: string;
+export class DeleteAgentComponent implements OnDestroy {
     @Input() navigateOnDelete?: any[];
 
     actionIcons = actionIcons;
 
+    id$ = this.agentFormService.id$;
+    status$ = new BehaviorSubject<FormStatus>('idle');
+    private formName = 'delete';
+
     constructor(
         private modalService: NgbModal,
         private deleteMutation: DataEntryDeleteAgentGQL,
         private toastService: ToastService,
         private router: Router,
-    ) { }
+        private agentFormService: AgentFormService,
+    ) {
+        this.agentFormService.attachForm(this.formName, this.status$);
+    }
+
+    ngOnDestroy(): void {
+        this.agentFormService.detachForm(this.formName);
+    }
 
     open(content: TemplateRef<any>) {
         this.modalService.open(content, { ariaLabelledBy: 'modal-title' }).result.then(
@@ -32,6 +45,7 @@ export class DeleteAgentComponent {
     }
 
     deleteAgent(id: string) {
+        this.status$.next('loading');
         this.deleteMutation.mutate({ id }, {
             refetchQueries: [
                 'source'
@@ -51,6 +65,7 @@ export class DeleteAgentComponent {
     }
 
     onSuccess() {
+        this.status$.next('saved');
         this.toastService.show({
             type: 'success',
             header: 'Agent deleted',
@@ -62,6 +77,7 @@ export class DeleteAgentComponent {
     }
 
     onFail(errors?: LettercraftErrorType[] | any) {
+        this.status$.next('error');
         console.error(errors);
         const messages = errors?.map?.call(
             (error: any) => error.messages?.join('\n')

From 6e0b75509de037c2924c2d2dd553ce0591ec571a Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 16:14:40 +0200
Subject: [PATCH 339/565] AgentFormService -> FormService

---
 .../agent-description-form.component.ts          |  4 ++--
 .../agent-form/agent-form.component.ts           |  6 +++---
 .../agent-form/agent-form.service.spec.ts        | 16 ----------------
 .../agent-identification-form.component.ts       |  4 ++--
 .../delete-agent/delete-agent.component.ts       | 10 +++++-----
 .../app/data-entry/shared/form.service.spec.ts   | 16 ++++++++++++++++
 .../form.service.ts}                             |  8 +++-----
 7 files changed, 31 insertions(+), 33 deletions(-)
 delete mode 100644 frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/form.service.spec.ts
 rename frontend/src/app/data-entry/{agent-form/agent-form.service.ts => shared/form.service.ts} (93%)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index b0222b13..1d7f22a9 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -19,7 +19,7 @@ import {
 } from 'generated/graphql';
 import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom, BehaviorSubject, tap } from 'rxjs';
 import _ from 'underscore';
-import { AgentFormService } from '../agent-form.service';
+import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
 
 
@@ -76,7 +76,7 @@ export class AgentDescriptionFormComponent implements OnDestroy {
         private locationsQuery: LocationsInSourceListGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
-        private formService: AgentFormService,
+        private formService: FormService,
     ) {
         this.formService.attachForm(this.formName, this.status$);
         this.data$ = this.id$.pipe(
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index 9e6fa147..a7bf3d1d 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -3,13 +3,13 @@ import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
 import { dataIcons } from '@shared/icons';
 import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
-import { AgentFormService } from './agent-form.service';
+import { FormService } from '../shared/form.service';
 
 @Component({
     selector: 'lc-agent-form',
     templateUrl: './agent-form.component.html',
     styleUrls: ['./agent-form.component.scss'],
-    providers: [AgentFormService],
+    providers: [FormService],
 })
 export class AgentFormComponent {
     id$: Observable<string> = this.formService.id$;
@@ -21,7 +21,7 @@ export class AgentFormComponent {
 
     constructor(
         private agentQuery: DataEntryAgentGQL,
-        private formService: AgentFormService,
+        private formService: FormService,
     ) {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts b/frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts
deleted file mode 100644
index b9fdfd63..00000000
--- a/frontend/src/app/data-entry/agent-form/agent-form.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { AgentFormService } from './agent-form.service';
-
-describe('AgentFormService', () => {
-  let service: AgentFormService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(AgentFormService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index fc30f846..bc1814c2 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -15,7 +15,7 @@ import {
     BehaviorSubject
 } from 'rxjs';
 import _ from 'underscore';
-import { AgentFormService } from '../agent-form.service';
+import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
 
 interface FormData {
@@ -51,7 +51,7 @@ export class AgentIdentificationFormComponent implements OnDestroy {
         private agentQuery: DataEntryAgentIdentificationGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
-        private formService: AgentFormService,
+        private formService: FormService,
     ) {
         this.formService.attachForm(this.formName, this.status$);
 
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 0a633a56..3322291b 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -5,7 +5,7 @@ import { ToastService } from '@services/toast.service';
 import { actionIcons } from '@shared/icons';
 import { DataEntryDeleteAgentGQL, LettercraftErrorType } from 'generated/graphql';
 import _ from 'underscore';
-import { AgentFormService } from '../agent-form.service';
+import { FormService } from '../../shared/form.service';
 import { BehaviorSubject } from 'rxjs';
 import { FormStatus } from '../../shared/types';
 
@@ -19,7 +19,7 @@ export class DeleteAgentComponent implements OnDestroy {
 
     actionIcons = actionIcons;
 
-    id$ = this.agentFormService.id$;
+    id$ = this.formService.id$;
     status$ = new BehaviorSubject<FormStatus>('idle');
     private formName = 'delete';
 
@@ -28,13 +28,13 @@ export class DeleteAgentComponent implements OnDestroy {
         private deleteMutation: DataEntryDeleteAgentGQL,
         private toastService: ToastService,
         private router: Router,
-        private agentFormService: AgentFormService,
+        private formService: FormService,
     ) {
-        this.agentFormService.attachForm(this.formName, this.status$);
+        this.formService.attachForm(this.formName, this.status$);
     }
 
     ngOnDestroy(): void {
-        this.agentFormService.detachForm(this.formName);
+        this.formService.detachForm(this.formName);
     }
 
     open(content: TemplateRef<any>) {
diff --git a/frontend/src/app/data-entry/shared/form.service.spec.ts b/frontend/src/app/data-entry/shared/form.service.spec.ts
new file mode 100644
index 00000000..dbe605a8
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/form.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FormService } from './form.service';
+
+describe('FormService', () => {
+    let service: FormService;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({});
+        service = TestBed.inject(FormService);
+    });
+
+    it('should be created', () => {
+        expect(service).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.service.ts b/frontend/src/app/data-entry/shared/form.service.ts
similarity index 93%
rename from frontend/src/app/data-entry/agent-form/agent-form.service.ts
rename to frontend/src/app/data-entry/shared/form.service.ts
index 79159851..7fbd9b06 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.service.ts
+++ b/frontend/src/app/data-entry/shared/form.service.ts
@@ -1,13 +1,11 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { asyncScheduler, BehaviorSubject, combineLatest, map, Observable, shareReplay, switchMap, throttleTime } from 'rxjs';
-import { FormStatus } from '../shared/types';
+import { FormStatus } from './types';
 import _ from 'underscore';
 
-@Injectable({
-    providedIn: 'root'
-})
-export class AgentFormService {
+@Injectable()
+export class FormService {
     id$: Observable<string>;
 
     status$: Observable<FormStatus>;

From 1ac11c32b8ad9ac4b9bc1371ef3b090e695b71aa Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 16:29:09 +0200
Subject: [PATCH 340/565] better validation feedback

---
 .../agent-identification-form.component.html      |  3 +++
 .../agent-identification-form.component.ts        | 15 ++++++++++-----
 .../shared/form-status/form-status.component.ts   |  2 ++
 .../src/app/data-entry/shared/form.service.ts     | 10 +++++++---
 frontend/src/app/data-entry/shared/types.d.ts     |  2 +-
 frontend/src/app/shared/icons.ts                  |  1 +
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
index 381f9b63..63e84889 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
@@ -14,6 +14,9 @@
             [class.is-invalid]="form.controls.name.invalid"
             aria-required="true"
             [attr.aria-invalid]="form.controls.name.invalid">
+        <div class="invalid-feedback">
+            This field is required
+        </div>
     </div>
 
     <div class="mb-4">
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index bc1814c2..65ae1693 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -33,10 +33,7 @@ export class AgentIdentificationFormComponent implements OnDestroy {
     form = new FormGroup({
         name: new FormControl<string>('', {
             nonNullable: true,
-            validators: [
-                Validators.required,
-                Validators.minLength(3),
-            ]
+            validators: [Validators.required]
         }),
         description: new FormControl<string>('', { nonNullable: true }),
         isGroup: new FormControl<boolean>(false, { nonNullable: true }),
@@ -61,9 +58,17 @@ export class AgentIdentificationFormComponent implements OnDestroy {
             takeUntilDestroyed(),
         ).subscribe(this.updateFormData.bind(this));
 
-        this.form.valueChanges.pipe(
+        const changes$ = this.form.valueChanges.pipe(
             debounceTime(500),
             distinctUntilChanged(_.isEqual),
+        );
+
+        changes$.pipe(
+            filter(_.negate(this.isValid.bind(this))),
+            takeUntilDestroyed(),
+        ).subscribe(() => this.status$.next('invalid'));
+
+        changes$.pipe(
             filter(this.isValid.bind(this)),
             tap(() => this.status$.next('loading')),
             withLatestFrom(this.id$),
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
index 96193a02..8c0f6f15 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -15,6 +15,7 @@ export class FormStatusComponent {
 
     messages: Record<FormStatus, string> = {
         'idle': 'Waiting for input',
+        'invalid': 'Form contains errors',
         'loading': 'Loading...',
         'saved': 'Changes saved',
         'error': 'Saving failed',
@@ -22,6 +23,7 @@ export class FormStatusComponent {
 
     classes: Record<FormStatus, string> = {
         'idle': 'text-secondary',
+        'invalid': 'text-danger',
         'loading': 'text-secondary',
         'saved': 'text-success',
         'error': 'text-danger',
diff --git a/frontend/src/app/data-entry/shared/form.service.ts b/frontend/src/app/data-entry/shared/form.service.ts
index 7fbd9b06..62f3fd15 100644
--- a/frontend/src/app/data-entry/shared/form.service.ts
+++ b/frontend/src/app/data-entry/shared/form.service.ts
@@ -39,12 +39,16 @@ export class FormService {
     }
 
     private combinedStatus(statuses: FormStatus[]) {
-        if (_.any(statuses, status => status === 'error')) {
+        if (statuses.includes('error')) {
             return 'error';
-        } else if (_.any(statuses, status => status === 'loading')) {
+        } else if (statuses.includes('loading')) {
             return 'loading';
-        } else {
+        } else if (statuses.includes('invalid')) {
+            return 'invalid';
+        } else if (statuses.includes('saved')) {
             return 'saved';
+        } else {
+            return 'idle';
         }
     }
 }
diff --git a/frontend/src/app/data-entry/shared/types.d.ts b/frontend/src/app/data-entry/shared/types.d.ts
index 486e584a..38e67f13 100644
--- a/frontend/src/app/data-entry/shared/types.d.ts
+++ b/frontend/src/app/data-entry/shared/types.d.ts
@@ -1 +1 @@
-export type FormStatus = 'idle' | 'loading' | 'saved' | 'error';
+export type FormStatus = 'idle' | 'invalid' | 'loading' | 'saved' | 'error';
diff --git a/frontend/src/app/shared/icons.ts b/frontend/src/app/shared/icons.ts
index 6bf2d7c8..33ba1cac 100644
--- a/frontend/src/app/shared/icons.ts
+++ b/frontend/src/app/shared/icons.ts
@@ -37,6 +37,7 @@ export const dataIcons = {
 
 export const statusIcons = {
     idle: 'pencil',
+    invalid: 'exclamation-circle',
     loading: 'hourglass',
     saved: 'check-lg',
     error: 'exclamation-circle',

From 023ed2e0f70bf248b61c9ea283df21117b644847 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 29 Aug 2024 16:37:53 +0200
Subject: [PATCH 341/565] no saving on form init

---
 .../agent-description-form.component.ts                       | 3 ++-
 .../agent-identification-form.component.ts                    | 4 +++-
 .../data-entry/shared/form-status/form-status.component.ts    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 1d7f22a9..fde390c6 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -17,7 +17,7 @@ import {
     SourceMention,
     UpdateAgentInput,
 } from 'generated/graphql';
-import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom, BehaviorSubject, tap } from 'rxjs';
+import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom, BehaviorSubject, tap, skip } from 'rxjs';
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
@@ -100,6 +100,7 @@ export class AgentDescriptionFormComponent implements OnDestroy {
         this.form.valueChanges.pipe(
             debounceTime(500),
             distinctUntilChanged(_.isEqual),
+            skip(1),
             filter(this.isValid.bind(this)),
             tap(() => this.status$.next('loading')),
             withLatestFrom(this.id$),
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 65ae1693..c128c36b 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -12,7 +12,8 @@ import {
     distinctUntilChanged,
 
     tap,
-    BehaviorSubject
+    BehaviorSubject,
+    skip
 } from 'rxjs';
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
@@ -61,6 +62,7 @@ export class AgentIdentificationFormComponent implements OnDestroy {
         const changes$ = this.form.valueChanges.pipe(
             debounceTime(500),
             distinctUntilChanged(_.isEqual),
+            skip(1),
         );
 
         changes$.pipe(
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
index 8c0f6f15..869f9a91 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -14,7 +14,7 @@ export class FormStatusComponent {
     statusIcons = statusIcons;
 
     messages: Record<FormStatus, string> = {
-        'idle': 'Waiting for input',
+        'idle': 'No changes made',
         'invalid': 'Form contains errors',
         'loading': 'Loading...',
         'saved': 'Changes saved',

From 222a6b3fe9de8880024b0b74b36ab4807886c0ea Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 30 Aug 2024 13:28:04 +0200
Subject: [PATCH 342/565] fix test modules

---
 .../agent-description-form.component.spec.ts  |  2 ++
 .../agent-form/agent-form.component.spec.ts   |  4 +++
 ...gent-identification-form.component.spec.ts |  2 ++
 .../delete-agent.component.spec.ts            | 28 +++++++++++--------
 .../data-entry/shared/form.service.spec.ts    |  6 +++-
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
index 6ea7499f..dc016b60 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AgentDescriptionFormComponent } from './agent-description-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { DataEntrySharedModule } from '../../shared/data-entry-shared.module';
+import { FormService } from '../../shared/form.service';
 
 describe('AgentDescriptionFormComponent', () => {
     let component: AgentDescriptionFormComponent;
@@ -12,6 +13,7 @@ describe('AgentDescriptionFormComponent', () => {
         TestBed.configureTestingModule({
             declarations: [AgentDescriptionFormComponent],
             imports: [SharedTestingModule, DataEntrySharedModule,],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(AgentDescriptionFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
index d09b111c..2b24a606 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.spec.ts
@@ -5,6 +5,7 @@ import { SharedTestingModule } from '@shared/shared-testing.module';
 import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
 import { AgentIdentificationFormComponent } from './agent-identification-form/agent-identification-form.component';
 import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
+import { FormService } from '../shared/form.service';
 
 describe('AgentFormComponent', () => {
     let component: AgentFormComponent;
@@ -21,6 +22,9 @@ describe('AgentFormComponent', () => {
                 SharedTestingModule,
                 DataEntrySharedModule,
             ],
+            providers: [
+                FormService,
+            ]
         });
         fixture = TestBed.createComponent(AgentFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
index 2531c1ee..877736a1 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AgentIdentificationFormComponent } from './agent-identification-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { FormService } from '../../shared/form.service';
 
 describe('AgentIdentificationFormComponent', () => {
     let component: AgentIdentificationFormComponent;
@@ -11,6 +12,7 @@ describe('AgentIdentificationFormComponent', () => {
         TestBed.configureTestingModule({
             declarations: [AgentIdentificationFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(AgentIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
index 10fdc22d..2729fc7d 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
@@ -1,21 +1,25 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DeleteAgentComponent } from './delete-agent.component';
+import { FormService } from '../../shared/form.service';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('DeleteAgentComponent', () => {
-  let component: DeleteAgentComponent;
-  let fixture: ComponentFixture<DeleteAgentComponent>;
+    let component: DeleteAgentComponent;
+    let fixture: ComponentFixture<DeleteAgentComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [DeleteAgentComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [DeleteAgentComponent],
+            imports: [SharedTestingModule],
+            providers: [FormService],
+        });
+        fixture = TestBed.createComponent(DeleteAgentComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(DeleteAgentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/shared/form.service.spec.ts b/frontend/src/app/data-entry/shared/form.service.spec.ts
index dbe605a8..e084d534 100644
--- a/frontend/src/app/data-entry/shared/form.service.spec.ts
+++ b/frontend/src/app/data-entry/shared/form.service.spec.ts
@@ -1,12 +1,16 @@
 import { TestBed } from '@angular/core/testing';
 
 import { FormService } from './form.service';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('FormService', () => {
     let service: FormService;
 
     beforeEach(() => {
-        TestBed.configureTestingModule({});
+        TestBed.configureTestingModule({
+            providers: [FormService],
+            imports: [SharedTestingModule],
+        });
         service = TestBed.inject(FormService);
     });
 

From 3d29ac1dd9577f378d93ab8e45c0ad0dee81932d Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 14:57:26 +0200
Subject: [PATCH 343/565] Letter CUD mutations

---
 backend/graphql_app/schema.py                 |  7 +++
 .../letter/mutations/CreateLetterMutation.py  | 45 +++++++++++++++++
 .../letter/mutations/DeleteLetterMutation.py  | 26 ++++++++++
 .../letter/mutations/UpdateLetterMutation.py  | 48 +++++++++++++++++++
 4 files changed, 126 insertions(+)
 create mode 100644 backend/letter/mutations/CreateLetterMutation.py
 create mode 100644 backend/letter/mutations/DeleteLetterMutation.py
 create mode 100644 backend/letter/mutations/UpdateLetterMutation.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index ce847fff..d4df80db 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -6,11 +6,15 @@
 from source.queries import SourceQueries
 from space.queries import SpaceQueries
 from user.queries import UserQueries
+
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
 from person.mutations.CreateAgentMutation import CreateAgentMutation
 from person.mutations.UpdateAgentMutation import UpdateAgentMutation
 from person.mutations.DeleteAgentMutation import DeleteAgentMutation
+from letter.mutations.CreateLetterMutation import CreateLetterMutation
+from letter.mutations.DeleteLetterMutation import DeleteLetterMutation
+from letter.mutations.UpdateLetterMutation import UpdateLetterMutation
 from person.mutations.CreatePersonReferenceMutation import CreatePersonReferenceMutation
 from person.mutations.UpdatePersonReferenceMutation import UpdatePersonReferenceMutation
 from person.mutations.DeletePersonReferenceMutation import DeletePersonReferenceMutation
@@ -34,6 +38,9 @@ class Mutation(ObjectType):
     create_agent = CreateAgentMutation.Field()
     update_agent = UpdateAgentMutation.Field()
     delete_agent = DeleteAgentMutation.Field()
+    create_letter = CreateLetterMutation.Field()
+    update_letter = UpdateLetterMutation.Field()
+    delete_letter = DeleteLetterMutation.Field()
     create_person_reference = CreatePersonReferenceMutation.Field()
     update_person_reference = UpdatePersonReferenceMutation.Field()
     delete_person_reference = DeletePersonReferenceMutation.Field()
diff --git a/backend/letter/mutations/CreateLetterMutation.py b/backend/letter/mutations/CreateLetterMutation.py
new file mode 100644
index 00000000..510047c2
--- /dev/null
+++ b/backend/letter/mutations/CreateLetterMutation.py
@@ -0,0 +1,45 @@
+from graphene import (
+    ID,
+    Field,
+    InputObjectType,
+    List,
+    NonNull,
+    ResolveInfo,
+    String,
+)
+
+from letter.models import LetterDescription
+from letter.types.LetterDescriptionType import LetterDescriptionType
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from source.models import Source
+
+
+class CreateLetterInput(InputObjectType):
+    name = String(required=True)
+    source = ID(required=True)
+
+
+class CreateLetterMutation(LettercraftMutation):
+    letter = Field(LetterDescriptionType)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = LetterDescription
+
+    class Arguments:
+        letter_data = CreateLetterInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, Letter_data: CreateLetterInput):
+        try:
+            source = Source.objects.get(id=getattr(Letter_data, "source"))
+        except Source.DoesNotExist:
+            error = LettercraftErrorType(field="source", messages=["Source not found."])
+            return cls(errors=[error])  # type: ignore
+
+        letter = LetterDescription.objects.create(
+            name=getattr(Letter_data, "name"),
+            source=source,
+        )
+
+        return cls(Letter=letter, errors=[])  # type: ignore
diff --git a/backend/letter/mutations/DeleteLetterMutation.py b/backend/letter/mutations/DeleteLetterMutation.py
new file mode 100644
index 00000000..b5083304
--- /dev/null
+++ b/backend/letter/mutations/DeleteLetterMutation.py
@@ -0,0 +1,26 @@
+from graphene import ID, Boolean, List, Mutation, NonNull, ResolveInfo
+
+from letter.models import LetterDescription
+from letter.types.LetterDescriptionType import LetterDescriptionType
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class DeleteLetterMutation(Mutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, id: str):
+        try:
+            letter = LetterDescriptionType.get_queryset(
+                LetterDescription.objects, info
+            ).get(id=id)
+        except LetterDescription.DoesNotExist:
+            error = LettercraftErrorType(field="id", messages=["Letter not found."])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        letter.delete()
+        return cls(ok=True, errors=[])  # type: ignore
diff --git a/backend/letter/mutations/UpdateLetterMutation.py b/backend/letter/mutations/UpdateLetterMutation.py
new file mode 100644
index 00000000..0c434b63
--- /dev/null
+++ b/backend/letter/mutations/UpdateLetterMutation.py
@@ -0,0 +1,48 @@
+from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo
+from django.core.exceptions import ObjectDoesNotExist
+from core.types.input.EntityDescriptionInputType import EntityDescriptionInputType
+from core.types.input.NamedInputType import NamedInputType
+from letter.models import LetterDescription
+from graphql_app.LettercraftMutation import LettercraftMutation
+
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class UpdateLetterInput(NamedInputType, EntityDescriptionInputType, InputObjectType):
+    id = ID(required=True)
+    categories = List(NonNull(ID))
+
+
+class UpdateLetterMutation(LettercraftMutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = LetterDescription
+
+    class Arguments:
+        letter_data = UpdateLetterInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, Letter_data: UpdateLetterInput):
+        try:
+            retrieved_object = cls.get_or_create_object(info, Letter_data)
+        except ObjectDoesNotExist as e:
+            error = LettercraftErrorType(field="id", messages=[str(e)])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        letter: LetterDescription = retrieved_object.object  # type: ignore
+
+        try:
+            cls.mutate_object(Letter_data, letter, info)
+        except ObjectDoesNotExist as field:
+            error = LettercraftErrorType(
+                field=str(field), messages=["Related object cannot be found."]
+            )
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        user = info.context.user
+        letter.contributors.add(user)
+
+        letter.save()
+
+        return cls(ok=True, errors=[])  # type: ignore

From 2f2aa0d12e5b62f858a45e1021b6dd33aa6c1d7f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 14:57:52 +0200
Subject: [PATCH 344/565] Abstract InputTypes

---
 .../core/types/input/EntityDescriptionInputType.py   |  9 +++++++++
 backend/core/types/input/NamedInputType.py           |  5 +++++
 backend/event/mutations/UpdateEpisodeMutation.py     | 12 +++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 backend/core/types/input/EntityDescriptionInputType.py
 create mode 100644 backend/core/types/input/NamedInputType.py

diff --git a/backend/core/types/input/EntityDescriptionInputType.py b/backend/core/types/input/EntityDescriptionInputType.py
new file mode 100644
index 00000000..132f6239
--- /dev/null
+++ b/backend/core/types/input/EntityDescriptionInputType.py
@@ -0,0 +1,9 @@
+from graphene import ID, InputObjectType, List, NonNull, String
+
+
+class EntityDescriptionInputType(InputObjectType):
+    book = String()
+    chapter = String()
+    page = String()
+    designators = List(NonNull(String))
+    categories = List(NonNull(ID))
diff --git a/backend/core/types/input/NamedInputType.py b/backend/core/types/input/NamedInputType.py
new file mode 100644
index 00000000..5901c72c
--- /dev/null
+++ b/backend/core/types/input/NamedInputType.py
@@ -0,0 +1,5 @@
+from graphene import InputObjectType, String
+
+
+class NamedInputType(InputObjectType):
+    name = String()
diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index e656da95..fbd4e02f 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -1,20 +1,18 @@
 from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo, String
 from django.core.exceptions import ObjectDoesNotExist
+from core.types.input.EntityDescriptionInputType import EntityDescriptionInputType
+from core.types.input.NamedInputType import NamedInputType
 from event.models import Episode
 from graphql_app.LettercraftMutation import LettercraftMutation
 
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
-class UpdateEpisodeMutationInput(InputObjectType):
+class UpdateEpisodeMutationInput(
+    NamedInputType, EntityDescriptionInputType, InputObjectType
+):
     id = ID(required=True)
-    name = String()
-    book = String()
-    chapter = String()
-    page = String()
-    designators = List(NonNull(String))
     summary = String()
-    categories = List(NonNull(ID))
 
 
 class UpdateEpisodeMutation(LettercraftMutation):

From d4ed6706f2ab2a18c1b3c40656faa1e1cd808a87 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 14:58:03 +0200
Subject: [PATCH 345/565] LetterCategories query

---
 backend/letter/queries.py | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/backend/letter/queries.py b/backend/letter/queries.py
index b4c1ccbb..fdc57a4c 100644
--- a/backend/letter/queries.py
+++ b/backend/letter/queries.py
@@ -1,7 +1,8 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
 
-from letter.models import GiftDescription, LetterDescription
+from letter.models import GiftDescription, LetterDescription, LetterDescriptionCategory
+from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
 from letter.types.GiftDescriptionType import GiftDescriptionType
 from letter.types.LetterDescriptionType import LetterDescriptionType
 
@@ -13,6 +14,12 @@ class LetterQueries(ObjectType):
         NonNull(LetterDescriptionType), required=True, episode_id=ID(), source_id=ID()
     )
 
+    letter_description_categories = List(
+        NonNull(LetterDescriptionCategoryType),
+        required=True,
+        letter_id=ID(),
+    )
+
     gift_description = Field(GiftDescriptionType, id=ID(required=True))
 
     gift_descriptions = List(
@@ -47,14 +54,28 @@ def resolve_letter_descriptions(
             LetterDescription.objects, info
         ).filter(filters)
 
+    @staticmethod
+    def resolve_letter_description_categories(
+        parent: None,
+        info: ResolveInfo,
+        letter_id: str | None = None,
+    ) -> QuerySet[LetterDescriptionCategory]:
+        filters = Q()
+        if letter_id:
+            filters &= Q(letter_id=letter_id)
+
+        return LetterDescriptionCategoryType.get_queryset(
+            LetterDescriptionCategory.objects, info
+        ).filter(filters)
+
     @staticmethod
     def resolve_gift_description(
         parent: None, info: ResolveInfo, id: str
     ) -> GiftDescription | None:
         try:
-            return GiftDescriptionType.get_queryset(
-                GiftDescription.objects, info
-            ).get(id=id)
+            return GiftDescriptionType.get_queryset(GiftDescription.objects, info).get(
+                id=id
+            )
         except GiftDescription.DoesNotExist:
             return None
 
@@ -71,6 +92,6 @@ def resolve_gift_descriptions(
         if source_id:
             filters &= Q(source_id=source_id)
 
-        return GiftDescriptionType.get_queryset(
-            GiftDescription.objects, info
-        ).filter(filters)
+        return GiftDescriptionType.get_queryset(GiftDescription.objects, info).filter(
+            filters
+        )

From e85974cbf417510ee045634cc979563d176503fb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 14:59:19 +0200
Subject: [PATCH 346/565] Rename episode-source-text-form.graphql

---
 ...text-mention-form.graphql => episode-source-text-form.graphql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frontend/src/app/data-entry/episode-form/episode-source-text-form/{episode-source-text-mention-form.graphql => episode-source-text-form.graphql} (100%)

diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-mention-form.graphql b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.graphql
similarity index 100%
rename from frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-mention-form.graphql
rename to frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.graphql

From 4b5eb4375c298fd6a0ef7bbc3501ddfdedcd39bb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 15:01:35 +0200
Subject: [PATCH 347/565] Created Letter form components

---
 .../letter-categories-form.component.html     |  1 +
 .../letter-categories-form.component.scss     |  0
 .../letter-categories-form.component.spec.ts  | 21 +++++++++++++++
 .../letter-categories-form.component.ts       |  8 ++++++
 .../letter-categories-form.graphql            | 19 ++++++++++++++
 .../letter-form/letter-form.module.ts         | 24 ++++++++---------
 .../letter-identification-form.component.html |  1 +
 .../letter-identification-form.component.scss |  0
 ...tter-identification-form.component.spec.ts | 21 +++++++++++++++
 .../letter-identification-form.component.ts   |  8 ++++++
 .../letter-identification-form.graphql        |  6 +++++
 .../letter-source-text-form.component.html    |  1 +
 .../letter-source-text-form.component.scss    |  0
 .../letter-source-text-form.component.spec.ts | 21 +++++++++++++++
 .../letter-source-text-form.component.ts      |  8 ++++++
 .../letter-source-text-form.graphql           |  9 +++++++
 .../app/data-entry/letter-form/letter.graphql | 26 +++++++++++++------
 17 files changed, 154 insertions(+), 20 deletions(-)
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.scss
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.scss
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.scss
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql

diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
new file mode 100644
index 00000000..7904aafd
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
@@ -0,0 +1 @@
+<p>letter-categories-form works!</p>
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.scss b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
new file mode 100644
index 00000000..13be65d7
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { LetterCategoriesFormComponent } from "./letter-categories-form.component";
+
+describe("LetterCategoriesFormComponent", () => {
+    let component: LetterCategoriesFormComponent;
+    let fixture: ComponentFixture<LetterCategoriesFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LetterCategoriesFormComponent],
+        });
+        fixture = TestBed.createComponent(LetterCategoriesFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
new file mode 100644
index 00000000..2e3f5a3f
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
@@ -0,0 +1,8 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "lc-letter-categories-form",
+    templateUrl: "./letter-categories-form.component.html",
+    styleUrls: ["./letter-categories-form.component.scss"],
+})
+export class LetterCategoriesFormComponent {}
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
new file mode 100644
index 00000000..54bb58ab
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
@@ -0,0 +1,19 @@
+query DataEntryLetterCategories($id: ID!) {
+    letterDescription(id: $id) {
+        id
+        categories {
+            id
+        }
+    }
+}
+
+query DataEntryAllLetterCategories {
+    letterDescriptionCategories {
+        id
+        category {
+            id
+            label
+            description
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.module.ts b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
index 7fd7b41e..e843c48e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.module.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
@@ -1,18 +1,18 @@
-import { NgModule } from '@angular/core';
-import { SharedModule } from '@shared/shared.module';
-import { LetterFormComponent } from './letter-form.component';
-
-
+import { NgModule } from "@angular/core";
+import { SharedModule } from "@shared/shared.module";
+import { LetterFormComponent } from "./letter-form.component";
+import { LetterCategoriesFormComponent } from "./letter-categories-form/letter-categories-form.component";
+import { LetterSourceTextFormComponent } from "./letter-source-text-form/letter-source-text-form.component";
+import { LetterIdentificationFormComponent } from "./letter-identification-form/letter-identification-form.component";
 
 @NgModule({
     declarations: [
         LetterFormComponent,
+        LetterCategoriesFormComponent,
+        LetterSourceTextFormComponent,
+        LetterIdentificationFormComponent,
     ],
-    imports: [
-        SharedModule,
-    ],
-    exports: [
-        LetterFormComponent,
-    ]
+    imports: [SharedModule],
+    exports: [LetterFormComponent],
 })
-export class LetterFormModule { }
+export class LetterFormModule {}
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
new file mode 100644
index 00000000..2f8c17d4
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
@@ -0,0 +1 @@
+<p>letter-identification-form works!</p>
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.scss b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
new file mode 100644
index 00000000..3c6c9ccc
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { LetterIdentificationFormComponent } from "./letter-identification-form.component";
+
+describe("LetterIdentificationFormComponent", () => {
+    let component: LetterIdentificationFormComponent;
+    let fixture: ComponentFixture<LetterIdentificationFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LetterIdentificationFormComponent],
+        });
+        fixture = TestBed.createComponent(LetterIdentificationFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
new file mode 100644
index 00000000..a801a87a
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -0,0 +1,8 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "lc-letter-identification-form",
+    templateUrl: "./letter-identification-form.component.html",
+    styleUrls: ["./letter-identification-form.component.scss"],
+})
+export class LetterIdentificationFormComponent {}
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql
new file mode 100644
index 00000000..89b9ae6f
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql
@@ -0,0 +1,6 @@
+query DataEntryLetterIdentification($id: ID!) {
+    letterDescription(id: $id) {
+        id
+        name
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
new file mode 100644
index 00000000..848634a6
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
@@ -0,0 +1 @@
+<p>letter-source-text-form works!</p>
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.scss b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
new file mode 100644
index 00000000..77f232cc
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { LetterSourceTextFormComponent } from "./letter-source-text-form.component";
+
+describe("LetterSourceTextFormComponent", () => {
+    let component: LetterSourceTextFormComponent;
+    let fixture: ComponentFixture<LetterSourceTextFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LetterSourceTextFormComponent],
+        });
+        fixture = TestBed.createComponent(LetterSourceTextFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
new file mode 100644
index 00000000..5ac5d0a8
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
@@ -0,0 +1,8 @@
+import { Component } from "@angular/core";
+
+@Component({
+    selector: "lc-letter-source-text-form",
+    templateUrl: "./letter-source-text-form.component.html",
+    styleUrls: ["./letter-source-text-form.component.scss"],
+})
+export class LetterSourceTextFormComponent {}
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql
new file mode 100644
index 00000000..3ad3fa1d
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql
@@ -0,0 +1,9 @@
+query DataEntryLetterSourceText($id: ID!) {
+    letterDescription(id: $id) {
+        id
+        designators
+        book
+        chapter
+        page
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter.graphql b/frontend/src/app/data-entry/letter-form/letter.graphql
index 4f46fb8e..2ce99d44 100644
--- a/frontend/src/app/data-entry/letter-form/letter.graphql
+++ b/frontend/src/app/data-entry/letter-form/letter.graphql
@@ -1,11 +1,21 @@
 query DataEntryLetter($id: ID!) {
-  letterDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
+    letterDescription(id: $id) {
+        id
+        name
+        description
+        source {
+            id
+            name
+        }
+    }
+}
+
+mutation DataEntryUpdateLetter($letterData: UpdateLetterInput!) {
+    updateLetter(letterData: $letterData) {
+        ok
+        errors {
+            field
+            messages
+        }
     }
-  }
 }

From 41dded2c8b76facdae9418b28cc333bd4d8e308a Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 16:09:55 +0200
Subject: [PATCH 348/565] Update base letter form

---
 .../letter-form/letter-form.component.html    | 45 ++++++-----
 .../letter-form/letter-form.component.ts      | 80 ++++++++++---------
 .../app/data-entry/letter-form/letter.graphql |  2 +-
 3 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index bc91e625..2cc82f16 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -1,21 +1,30 @@
-<ng-container *ngIf="data$ | async as data">
-    <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)" />
+<lc-breadcrumb [breadcrumbs]="(breadcrumbs$ | async) ?? []" />
 
-    <ng-container *ngIf="data.letterDescription as letterDescription">
-        <h1 class="mb-4">
-            <lc-icon [icon]="dataIcons.letter" />
-            {{letterDescription.name}}
-            <span class="text-secondary">
-                ({{letterDescription.source.name}})
-            </span>
-        </h1>
+<ng-container *ngIf="letter$ | async as letter; else loading">
+    <h1 class="mb-4">
+        <lc-icon [icon]="dataIcons.letter" />
+        <span>{{ letter.name }}</span>
+        <span class="text-secondary">
+            ({{ letter.source.name }})
+        </span>
+    </h1>
 
-        <p class="lead mb-4" *ngIf="letterDescription.description">
-            {{letterDescription.description}}
-        </p>
-
-        <p class="alert alert-warning">
-            This form is not implemented yet!
-        </p>
-    </ng-container>
+    <p class="lead mb-4" *ngIf="letter.description">
+        {{ letter.description }}
+    </p>
 </ng-container>
+
+<h2 class="subform-header">Identification</h2>
+<lc-letter-identification-form />
+
+<h2 class="subform-header">Source text</h2>
+<lc-letter-source-text-form />
+
+<h2 class="subform-header">Categories</h2>
+<lc-letter-categories-form />
+
+<ng-template #loading>
+    <div class="spinner-border" role="status">
+        <span class="visually-hidden">Loading...</span>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 6083ae9e..09db2bf2 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -1,52 +1,56 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
-import { dataIcons } from '@shared/icons';
-import { DataEntryLetterGQL, DataEntryLetterQuery } from 'generated/graphql';
-import { map, Observable, switchMap } from 'rxjs';
+import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
+import { actionIcons, dataIcons } from "@shared/icons";
+import { DataEntryLetterFormGQL } from "generated/graphql";
+import { filter, map, Observable, share, switchMap } from "rxjs";
 
 @Component({
-    selector: 'lc-letter-form',
-    templateUrl: './letter-form.component.html',
-    styleUrls: ['./letter-form.component.scss']
+    selector: "lc-letter-form",
+    templateUrl: "./letter-form.component.html",
+    styleUrls: ["./letter-form.component.scss"],
 })
 export class LetterFormComponent {
-    id$: Observable<string>;
-    data$: Observable<DataEntryLetterQuery>;
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
 
-    dataIcons = dataIcons;
+    public letter$ = this.id$.pipe(
+        switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
+        map((result) => result.data.letterDescription),
+        share()
+    );
 
-    constructor(private route: ActivatedRoute, private letterQuery: DataEntryLetterGQL) {
-        this.id$ = this.route.params.pipe(
-            map(params => params['id']),
-        );
-        this.data$ = this.id$.pipe(
-            switchMap(id => this.letterQuery.watch({ id }).valueChanges),
-            map(result => result.data),
-        );
-    }
-
-    getBreadcrumbs(data: DataEntryLetterQuery): Breadcrumb[] {
-        if (data.letterDescription) {
+    public breadcrumbs$ = this.letter$.pipe(
+        filter((letter) => !!letter),
+        map((letter) => {
+            if (!letter) {
+                return [];
+            }
             return [
-                { link: '/', label: 'Lettercraft' },
-                { link: '/data-entry', label: 'Data entry' },
                 {
-                    link: `/data-entry/sources/${data.letterDescription.source.id}`,
-                    label: data.letterDescription.source.name
+                    label: "Lettercraft",
+                    link: "/",
+                },
+                {
+                    label: "Data entry",
+                    link: "/data-entry",
                 },
                 {
-                    link: `/data-entry/letters/${data.letterDescription.id}`,
-                    label: data.letterDescription.name
+                    label: letter.source.name,
+                    link: `/source/${letter.source.id}`,
+                },
+                {
+                    label: letter.name,
+                    link: `/data-entry/letters/${letter.id}`,
                 },
             ];
-        } else {
-            return [
-                { link: '/', label: 'Lettercraft' },
-                { link: '/data-entry', label: 'Data entry' },
-                { link: '', label: 'Letter not found' }
-            ]
-        }
-    }
+        })
+    );
+
+    public dataIcons = dataIcons;
+    public actionIcons = actionIcons;
 
+    constructor(
+        private route: ActivatedRoute,
+        private letterQuery: DataEntryLetterFormGQL
+    ) {}
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter.graphql b/frontend/src/app/data-entry/letter-form/letter.graphql
index 2ce99d44..9ff63991 100644
--- a/frontend/src/app/data-entry/letter-form/letter.graphql
+++ b/frontend/src/app/data-entry/letter-form/letter.graphql
@@ -1,4 +1,4 @@
-query DataEntryLetter($id: ID!) {
+query DataEntryLetterForm($id: ID!) {
     letterDescription(id: $id) {
         id
         name

From f13cbff730b5ac18fbd03207f9dfa4258a742475 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 16:13:54 +0200
Subject: [PATCH 349/565] Fix routing in bread crumbs

---
 .../src/app/data-entry/episode-form/episode-form.component.ts  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index e5e5f106..18f8377f 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -13,7 +13,6 @@ export class EpisodeFormComponent {
     private id$ = this.route.params.pipe(map((params) => params["id"]));
 
     public episode$ = this.id$.pipe(
-        filter((id) => id !== "new"),
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
         map((result) => result.data.episode),
         share()
@@ -40,7 +39,7 @@ export class EpisodeFormComponent {
                 },
                 {
                     label: episode.name,
-                    link: `/data-entry/episode/${episode.id}`,
+                    link: `/data-entry/episodes/${episode.id}`,
                 },
             ];
         })

From 4b3dd06ae39005824a9209ad8df1f304e37cc122 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 16:57:10 +0200
Subject: [PATCH 350/565] Add description to NamedInputType; fix typos

---
 backend/core/types/input/NamedInputType.py       | 1 +
 backend/letter/mutations/CreateLetterMutation.py | 6 +++---
 backend/letter/mutations/UpdateLetterMutation.py | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/core/types/input/NamedInputType.py b/backend/core/types/input/NamedInputType.py
index 5901c72c..ba3e3eb3 100644
--- a/backend/core/types/input/NamedInputType.py
+++ b/backend/core/types/input/NamedInputType.py
@@ -3,3 +3,4 @@
 
 class NamedInputType(InputObjectType):
     name = String()
+    description = String()
diff --git a/backend/letter/mutations/CreateLetterMutation.py b/backend/letter/mutations/CreateLetterMutation.py
index 510047c2..bf9bc5f8 100644
--- a/backend/letter/mutations/CreateLetterMutation.py
+++ b/backend/letter/mutations/CreateLetterMutation.py
@@ -30,15 +30,15 @@ class Arguments:
         letter_data = CreateLetterInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, Letter_data: CreateLetterInput):
+    def mutate(cls, root: None, info: ResolveInfo, letter_data: CreateLetterInput):
         try:
-            source = Source.objects.get(id=getattr(Letter_data, "source"))
+            source = Source.objects.get(id=getattr(letter_data, "source"))
         except Source.DoesNotExist:
             error = LettercraftErrorType(field="source", messages=["Source not found."])
             return cls(errors=[error])  # type: ignore
 
         letter = LetterDescription.objects.create(
-            name=getattr(Letter_data, "name"),
+            name=getattr(letter_data, "name"),
             source=source,
         )
 
diff --git a/backend/letter/mutations/UpdateLetterMutation.py b/backend/letter/mutations/UpdateLetterMutation.py
index 0c434b63..23e9e59b 100644
--- a/backend/letter/mutations/UpdateLetterMutation.py
+++ b/backend/letter/mutations/UpdateLetterMutation.py
@@ -23,9 +23,9 @@ class Arguments:
         letter_data = UpdateLetterInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, Letter_data: UpdateLetterInput):
+    def mutate(cls, root: None, info: ResolveInfo, letter_data: UpdateLetterInput):
         try:
-            retrieved_object = cls.get_or_create_object(info, Letter_data)
+            retrieved_object = cls.get_or_create_object(info, letter_data)
         except ObjectDoesNotExist as e:
             error = LettercraftErrorType(field="id", messages=[str(e)])
             return cls(ok=False, errors=[error])  # type: ignore
@@ -33,7 +33,7 @@ def mutate(cls, root: None, info: ResolveInfo, Letter_data: UpdateLetterInput):
         letter: LetterDescription = retrieved_object.object  # type: ignore
 
         try:
-            cls.mutate_object(Letter_data, letter, info)
+            cls.mutate_object(letter_data, letter, info)
         except ObjectDoesNotExist as field:
             error = LettercraftErrorType(
                 field=str(field), messages=["Related object cannot be found."]

From 2443b5efbff595c128fa6b9ee569c6fa8192879e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 16:57:42 +0200
Subject: [PATCH 351/565] Fix breadcrumbs; improve icon spacing

---
 .../src/app/data-entry/letter-form/letter-form.component.html   | 2 +-
 .../src/app/data-entry/letter-form/letter-form.component.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 2cc82f16..23c5a774 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -3,7 +3,7 @@
 <ng-container *ngIf="letter$ | async as letter; else loading">
     <h1 class="mb-4">
         <lc-icon [icon]="dataIcons.letter" />
-        <span>{{ letter.name }}</span>
+        <span class="ms-2">{{ letter.name }}</span>
         <span class="text-secondary">
             ({{ letter.source.name }})
         </span>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 09db2bf2..2715a4bb 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -36,7 +36,7 @@ export class LetterFormComponent {
                 },
                 {
                     label: letter.source.name,
-                    link: `/source/${letter.source.id}`,
+                    link: `/data-entry/sources/${letter.source.id}`,
                 },
                 {
                     label: letter.name,

From 4de1e1e6c0a95e04283bbe009e1a31b9eff6be79 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 16:58:02 +0200
Subject: [PATCH 352/565] Identification form

---
 .../letter-identification-form.component.html | 30 ++++++-
 .../letter-identification-form.component.ts   | 83 ++++++++++++++++++-
 .../letter-identification-form.graphql        |  1 +
 .../episode-preview.component.html            |  2 +-
 4 files changed, 112 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
index 2f8c17d4..4a11e68d 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
@@ -1 +1,29 @@
-<p>letter-identification-form works!</p>
+<form>
+    <div class="form-group">
+        <label class="form-label" for="episode-name">Name</label>
+        <p class="form-text">
+            This is a name to identify the object in the overview of the source.
+            For example: "letter from Radegund to Germanus", "Radegund's first
+            letter".
+        </p>
+        <input
+            id="episode-name"
+            type="text"
+            class="form-control"
+            [formControl]="form.controls.name"
+            [class.is-invalid]="
+                form.controls.name.invalid && form.controls.name.touched
+            "
+        />
+        <p class="invalid-feedback">This field is required.</p>
+    </div>
+
+    <div class="form-group mt-4">
+        <div class="form-label">Description</div>
+        <p class="form-text">Add a description to help identify this letter.</p>
+        <textarea
+            class="form-control"
+            [formControl]="form.controls.description">
+        </textarea>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index a801a87a..bcf0a162 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -1,8 +1,87 @@
-import { Component } from "@angular/core";
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryLetterIdentificationGQL,
+    DataEntryUpdateLetterGQL,
+} from "generated/graphql";
+import {
+    debounceTime,
+    filter,
+    map,
+    switchMap,
+    withLatestFrom,
+} from "rxjs/operators";
 
 @Component({
     selector: "lc-letter-identification-form",
     templateUrl: "./letter-identification-form.component.html",
     styleUrls: ["./letter-identification-form.component.scss"],
 })
-export class LetterIdentificationFormComponent {}
+export class LetterIdentificationFormComponent implements OnInit {
+    public id$ = this.route.params.pipe(map((params) => params["id"]));
+
+    public letter$ = this.id$.pipe(
+        switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
+        map((result) => result.data.letterDescription)
+    );
+
+    public form = new FormGroup({
+        name: new FormControl("", {
+            validators: [Validators.required],
+            nonNullable: true,
+        }),
+        description: new FormControl("", {
+            nonNullable: true,
+        }),
+    });
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private letterQuery: DataEntryLetterIdentificationGQL,
+        private updateLetter: DataEntryUpdateLetterGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.letter$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((letter) => {
+                if (!letter) {
+                    return;
+                }
+                this.form.patchValue(letter);
+            });
+
+        this.form.valueChanges
+            .pipe(
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                withLatestFrom(this.id$),
+                switchMap(([letter, id]) =>
+                    this.updateLetter
+                        .mutate({
+                            letterData: {
+                                ...letter,
+                                id,
+                            },
+                        })
+                        .pipe(takeUntilDestroyed(this.destroyRef))
+                )
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateLetter?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((e) => e.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql
index 89b9ae6f..9cfd6c59 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.graphql
@@ -2,5 +2,6 @@ query DataEntryLetterIdentification($id: ID!) {
     letterDescription(id: $id) {
         id
         name
+        description
     }
 }
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index 7f10adb7..26fa8d3d 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -88,7 +88,7 @@
                         class="inline-list-item"
                     >
                         <a
-                            [routerLink]="['letter/', letter.id]"
+                            [routerLink]="['/', 'data-entry', 'letters', letter.id]"
                             class="icon-link"
                         >
                             <lc-icon [icon]="dataIcons.letter" />

From 5e76fe18521789877b0b17cfb9b3916618bb5a7f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 17:28:52 +0200
Subject: [PATCH 353/565] Improved icon spacing

---
 .../src/app/data-entry/episode-form/episode-form.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 2ff0e8c5..348cf041 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -3,7 +3,7 @@
 <ng-container *ngIf="episode$ | async as episode; else loading">
     <h1 class="mb-4">
         <lc-icon [icon]="dataIcons.episode" />
-        <span>{{ episode.name }}</span>
+        <span class="ms-2">{{ episode.name }}</span>
         <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
     </h1>
     <p class="lead mb-4" *ngIf="episode.description">

From 7fe50f6acb093f5706f617fa8f5bf3c1398746ca Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 30 Aug 2024 17:29:36 +0200
Subject: [PATCH 354/565] Added description field and cache eviction

---
 .../event/mutations/UpdateEpisodeMutation.py  |  1 +
 frontend/generated/graphql.ts                 |  4 ++-
 frontend/generated/schema.graphql             |  1 +
 ...episode-identification-form.component.html | 12 +++++++++
 .../episode-identification-form.component.ts  | 25 +++++++++++++++----
 .../episode-identification-form.graphql       |  1 +
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index b19bb9a4..06ac5268 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -9,6 +9,7 @@
 class UpdateEpisodeInput(InputObjectType):
     id = ID(required=True)
     name = String()
+    description = String()
     book = String()
     chapter = String()
     page = String()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index c69f0ed2..d4b0089e 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -926,6 +926,7 @@ export type UpdateEpisodeInput = {
   book?: InputMaybe<Scalars['String']['input']>;
   categories?: InputMaybe<Array<Scalars['ID']['input']>>;
   chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
   designators?: InputMaybe<Array<Scalars['String']['input']>>;
   id: Scalars['ID']['input'];
   name?: InputMaybe<Scalars['String']['input']>;
@@ -1010,7 +1011,7 @@ export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string } | null };
+export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string } | null };
 
 export type DataEntryEpisodeSourceTextMentionQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1254,6 +1255,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   episode(id: $id) {
     id
     name
+    description
   }
 }
     `;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 562c0b15..c432050d 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -933,6 +933,7 @@ input UpdateEpisodeInput {
   book: String
   categories: [ID!]
   chapter: String
+  description: String
   designators: [String!]
   id: ID!
   name: String
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
index 864a6b08..2849f50a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
@@ -17,4 +17,16 @@
         />
         <p class="invalid-feedback">This field is required.</p>
     </div>
+
+    <div class="form-group mt-4">
+        <label for="episode-description" class="form-label">Description</label>
+        <p class="form-text">
+            A longer description to help identify this object in the database.
+        </p>
+        <textarea
+            id="episode-description"
+            class="form-control"
+            [formControl]="form.controls.description"
+        ></textarea>
+    </div>
 </form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index d49d7527..c4db7b40 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -36,6 +36,9 @@ export class EpisodeIdentificationFormComponent implements OnInit {
             nonNullable: true,
             validators: [Validators.required],
         }),
+        description: new FormControl<string>("", {
+            nonNullable: true,
+        }),
     });
 
     constructor(
@@ -64,12 +67,24 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 withLatestFrom(this.id$),
                 switchMap(([episode, id]) =>
                     this.updateEpisode
-                        .mutate({
-                            episodeData: {
-                                id,
-                                name: episode.name,
+                        .mutate(
+                            {
+                                episodeData: {
+                                    ...episode,
+                                    id,
+                                },
                             },
-                        })
+                            {
+                                update: (cache) => {
+                                    const identified = cache.identify({
+                                        __typename: "EpisodeType",
+                                        id,
+                                    });
+                                    cache.evict({ id: identified });
+                                    cache.gc();
+                                },
+                            }
+                        )
                         .pipe(takeUntilDestroyed(this.destroyRef))
                 )
             )
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
index 4fc6780d..ee0a0590 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.graphql
@@ -2,5 +2,6 @@ query DataEntryEpisodeIdentification($id: ID!) {
     episode(id: $id) {
         id
         name
+        description
     }
 }

From ee7a00e10eec1b23d6903661f6db1f80eeba3105 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 31 Aug 2024 11:42:51 +0200
Subject: [PATCH 355/565] Update form labels; add cache eviction

---
 .../letter-identification-form.component.html |  4 ++--
 .../letter-identification-form.component.ts   | 22 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
index 4a11e68d..37e8ba7e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
@@ -2,7 +2,7 @@
     <div class="form-group">
         <label class="form-label" for="episode-name">Name</label>
         <p class="form-text">
-            This is a name to identify the object in the overview of the source.
+            This is a name to identify the letter in the overview of the source.
             For example: "letter from Radegund to Germanus", "Radegund's first
             letter".
         </p>
@@ -20,7 +20,7 @@
 
     <div class="form-group mt-4">
         <div class="form-label">Description</div>
-        <p class="form-text">Add a description to help identify this letter.</p>
+        <p class="form-text">Add a description to help identify this letter in the database.</p>
         <textarea
             class="form-control"
             [formControl]="form.controls.description">
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index bcf0a162..1d64614c 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -43,7 +43,7 @@ export class LetterIdentificationFormComponent implements OnInit {
         private route: ActivatedRoute,
         private toastService: ToastService,
         private letterQuery: DataEntryLetterIdentificationGQL,
-        private updateLetter: DataEntryUpdateLetterGQL
+        private letterMutation: DataEntryUpdateLetterGQL
     ) {}
 
     ngOnInit(): void {
@@ -63,13 +63,21 @@ export class LetterIdentificationFormComponent implements OnInit {
                 debounceTime(300),
                 withLatestFrom(this.id$),
                 switchMap(([letter, id]) =>
-                    this.updateLetter
-                        .mutate({
-                            letterData: {
-                                ...letter,
-                                id,
+                    this.letterMutation
+                        .mutate(
+                            {
+                                letterData: {
+                                    ...letter,
+                                    id,
+                                },
                             },
-                        })
+                            {
+                                update: (cache) =>
+                                    cache.evict({
+                                        id: `LetterDescriptionType:${id}`,
+                                    }),
+                            }
+                        )
                         .pipe(takeUntilDestroyed(this.destroyRef))
                 )
             )

From 1bc5ba628f9064170717d55f9453b8c0f8b79fa9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 31 Aug 2024 11:43:27 +0200
Subject: [PATCH 356/565] SourceText form

---
 .../letter-source-text-form.component.html    | 38 ++++++++-
 .../letter-source-text-form.component.ts      | 80 ++++++++++++++++++-
 2 files changed, 115 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
index 848634a6..6708c3ff 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
@@ -1 +1,37 @@
-<p>letter-source-text-form works!</p>
+<form>
+    <lc-designators-control [formControl]="form.controls.designators" />
+
+    <h3>Location</h3>
+    <p class="form-text">
+        Describe the location of this letter in the source text.
+    </p>
+    <div class="row">
+        <div class="form-group col">
+            <label class="form-label" for="book">Book</label>
+            <input
+                id="book"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.book"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="chapter">Chapter</label>
+            <input
+                id="chapter"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.chapter"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="page">Page</label>
+            <input
+                id="page"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.page"
+            />
+        </div>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
index 5ac5d0a8..3acc6322 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
@@ -1,8 +1,84 @@
-import { Component } from "@angular/core";
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryLetterSourceTextGQL,
+    DataEntryUpdateLetterGQL,
+} from "generated/graphql";
+import { debounceTime, filter, map, switchMap, withLatestFrom } from "rxjs";
 
 @Component({
     selector: "lc-letter-source-text-form",
     templateUrl: "./letter-source-text-form.component.html",
     styleUrls: ["./letter-source-text-form.component.scss"],
 })
-export class LetterSourceTextFormComponent {}
+export class LetterSourceTextFormComponent implements OnInit {
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
+
+    public letter$ = this.id$.pipe(
+        switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
+        map((result) => result.data.letterDescription)
+    );
+
+    public form = new FormGroup({
+        designators: new FormControl<string[]>([], {
+            nonNullable: true,
+        }),
+        book: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+        chapter: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+        page: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+    });
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private letterQuery: DataEntryLetterSourceTextGQL,
+        private letterMutation: DataEntryUpdateLetterGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.letter$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((letter) => {
+                if (!letter) {
+                    return;
+                }
+                this.form.patchValue(letter);
+            });
+
+        this.form.valueChanges
+            .pipe(
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                withLatestFrom(this.id$),
+                switchMap(([letter, id]) =>
+                    this.letterMutation.mutate({
+                        letterData: {
+                            ...letter,
+                            id,
+                        },
+                    })
+                )
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateLetter?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}

From d660cb8ad83439d48d16ee8ac0dfbc9872596518 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 31 Aug 2024 11:43:53 +0200
Subject: [PATCH 357/565] Add DataEntrySharedModule

---
 frontend/src/app/data-entry/letter-form/letter-form.module.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.module.ts b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
index e843c48e..f1fc91a9 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.module.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
@@ -4,6 +4,7 @@ import { LetterFormComponent } from "./letter-form.component";
 import { LetterCategoriesFormComponent } from "./letter-categories-form/letter-categories-form.component";
 import { LetterSourceTextFormComponent } from "./letter-source-text-form/letter-source-text-form.component";
 import { LetterIdentificationFormComponent } from "./letter-identification-form/letter-identification-form.component";
+import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 
 @NgModule({
     declarations: [
@@ -12,7 +13,7 @@ import { LetterIdentificationFormComponent } from "./letter-identification-form/
         LetterSourceTextFormComponent,
         LetterIdentificationFormComponent,
     ],
-    imports: [SharedModule],
+    imports: [SharedModule, DataEntrySharedModule],
     exports: [LetterFormComponent],
 })
 export class LetterFormModule {}

From 65101e9f7f70dea7c3d63519a125679eb82ce4b0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 31 Aug 2024 11:45:07 +0200
Subject: [PATCH 358/565] Add letter_categories query

---
 backend/letter/queries.py | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/backend/letter/queries.py b/backend/letter/queries.py
index fdc57a4c..18260b27 100644
--- a/backend/letter/queries.py
+++ b/backend/letter/queries.py
@@ -1,8 +1,8 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
 
-from letter.models import GiftDescription, LetterDescription, LetterDescriptionCategory
-from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
+from letter.models import GiftDescription, LetterCategory, LetterDescription
+from letter.types.LetterCategoryType import LetterCategoryType
 from letter.types.GiftDescriptionType import GiftDescriptionType
 from letter.types.LetterDescriptionType import LetterDescriptionType
 
@@ -14,10 +14,9 @@ class LetterQueries(ObjectType):
         NonNull(LetterDescriptionType), required=True, episode_id=ID(), source_id=ID()
     )
 
-    letter_description_categories = List(
-        NonNull(LetterDescriptionCategoryType),
+    letter_categories = List(
+        NonNull(LetterCategoryType),
         required=True,
-        letter_id=ID(),
     )
 
     gift_description = Field(GiftDescriptionType, id=ID(required=True))
@@ -55,18 +54,10 @@ def resolve_letter_descriptions(
         ).filter(filters)
 
     @staticmethod
-    def resolve_letter_description_categories(
-        parent: None,
-        info: ResolveInfo,
-        letter_id: str | None = None,
-    ) -> QuerySet[LetterDescriptionCategory]:
-        filters = Q()
-        if letter_id:
-            filters &= Q(letter_id=letter_id)
-
-        return LetterDescriptionCategoryType.get_queryset(
-            LetterDescriptionCategory.objects, info
-        ).filter(filters)
+    def resolve_letter_categories(
+        parent: None, info: ResolveInfo
+    ) -> QuerySet[LetterCategory]:
+        return LetterCategoryType.get_queryset(LetterCategory.objects, info).all()
 
     @staticmethod
     def resolve_gift_description(

From 4f5694d4cc53b12d2b1d3a80dd5993cb53333f90 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 31 Aug 2024 18:08:47 +0200
Subject: [PATCH 359/565] LetterCategories WIP

---
 .../management/commands/create_dev_dataset.py |  2 -
 .../letter-categories-form.component.html     |  7 +-
 .../letter-categories-form.component.ts       | 93 ++++++++++++++++++-
 .../letter-categories-form.graphql            |  5 +-
 4 files changed, 98 insertions(+), 9 deletions(-)

diff --git a/backend/core/management/commands/create_dev_dataset.py b/backend/core/management/commands/create_dev_dataset.py
index e46760a6..02443fff 100644
--- a/backend/core/management/commands/create_dev_dataset.py
+++ b/backend/core/management/commands/create_dev_dataset.py
@@ -19,8 +19,6 @@
 )
 import random
 
-from django.contrib.contenttypes.models import ContentType
-
 from .fixtures import (
     case_study_names,
     gift_names,
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
index 7904aafd..f6fa670b 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
@@ -1 +1,6 @@
-<p>letter-categories-form works!</p>
+<form *ngIf="letterCategories$ | async as letterCategories">
+    <div class="form-group">
+        <p>Select one or more categories that apply to this letter</p>
+        
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
index 2e3f5a3f..6defb691 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
@@ -1,8 +1,97 @@
-import { Component } from "@angular/core";
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import { DataEntryAllLetterCategoriesGQL, DataEntryLetterCategoriesGQL, DataEntryUpdateLetterGQL } from "generated/graphql";
+import {
+    debounceTime,
+    filter,
+    map,
+    Observable,
+    share,
+    switchMap,
+    withLatestFrom,
+} from "rxjs";
+import { MultiselectOption } from "../../shared/multiselect/multiselect.component";
 
 @Component({
     selector: "lc-letter-categories-form",
     templateUrl: "./letter-categories-form.component.html",
     styleUrls: ["./letter-categories-form.component.scss"],
 })
-export class LetterCategoriesFormComponent {}
+export class LetterCategoriesFormComponent implements OnInit {
+    public id$ = this.route.params.pipe(
+        map((params) => params["id"]),
+        share()
+    );
+
+    public letter$ = this.id$.pipe(
+        switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
+        map((result) => result.data.letterDescription)
+    );
+
+    public form = new FormGroup({
+        categories: new FormControl<string[]>([], {
+            nonNullable: true,
+        }),
+    });
+
+    public letterCategories$: Observable<MultiselectOption[]> =
+        this.letterCategoriesQuery.watch().valueChanges.pipe(
+            map((result) => result.data.letterCategories),
+            map(categories => categories.map(category => ({
+                value: category.id,
+                label: category.label
+            })))
+        );
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private letterQuery: DataEntryLetterCategoriesGQL,
+        private letterCategoriesQuery: DataEntryAllLetterCategoriesGQL,
+        private letterMutation: DataEntryUpdateLetterGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.letter$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((letter) => {
+                if (!letter) {
+                    return;
+                }
+                const categoryIds = letter.categories.map(
+                    (category) => category.id
+                );
+                this.form.patchValue({ categories: categoryIds });
+            });
+
+        this.form.valueChanges
+            .pipe(
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                withLatestFrom(this.id$),
+                switchMap(([letter, id]) =>
+                    this.letterMutation.mutate({
+                        letterData: {
+                            ...letter,
+                            id: id,
+                        },
+                    })
+                )
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateLetter?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
index 54bb58ab..c97acfbe 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
@@ -8,12 +8,9 @@ query DataEntryLetterCategories($id: ID!) {
 }
 
 query DataEntryAllLetterCategories {
-    letterDescriptionCategories {
-        id
-        category {
+    letterCategories {
             id
             label
             description
-        }
     }
 }

From d4ffca050861ffd671ec1b4710874ad66deabcf3 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 1 Sep 2024 12:16:35 +0200
Subject: [PATCH 360/565] Avoid unnecessary mutations

---
 .../episode-contents-form.component.ts        | 49 +++++++++------
 .../episode-identification-form.component.ts  | 60 +++++++++++--------
 .../episode-source-text-form.component.ts     | 38 +++++++-----
 3 files changed, 88 insertions(+), 59 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index 4a73cfc2..e46af37a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -13,6 +13,7 @@ import {
     filter,
     map,
     Observable,
+    shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs";
@@ -30,7 +31,8 @@ export class EpisodeContentsFormComponent implements OnInit {
 
     private episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
-        map((result) => result.data.episode)
+        map((result) => result.data.episode),
+        shareReplay(1)
     );
 
     public form = new FormGroup({
@@ -70,27 +72,36 @@ export class EpisodeContentsFormComponent implements OnInit {
                 if (!episode) {
                     return;
                 }
-                this.form.patchValue({
-                    summary: episode.summary,
-                    categories: episode.categories.map((c) => c.id),
-                });
+                this.form.patchValue(
+                    {
+                        summary: episode.summary,
+                        categories: episode.categories.map((c) => c.id),
+                    },
+                    {
+                        emitEvent: false,
+                        onlySelf: true
+                    }
+                );
             });
 
-        this.form.valueChanges
+        this.episode$
             .pipe(
-                map(() => this.form.getRawValue()),
-                filter(() => this.form.valid),
-                debounceTime(300),
-                withLatestFrom(this.id$),
-                switchMap(([episode, id]) =>
-                    this.updateEpisode
-                        .mutate({
-                            episodeData: {
-                                id,
-                                ...episode,
-                            },
-                        })
-                        .pipe(takeUntilDestroyed(this.destroyRef))
+                switchMap(() =>
+                    this.form.valueChanges.pipe(
+                        map(() => this.form.getRawValue()),
+                        filter(() => this.form.valid),
+                        debounceTime(300),
+                        withLatestFrom(this.id$),
+                        switchMap(([episode, id]) =>
+                            this.updateEpisode
+                                .mutate({
+                                    episodeData: {
+                                        id,
+                                        ...episode,
+                                    },
+                                })
+                        )
+                    )
                 )
             )
             .subscribe((result) => {
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index c4db7b40..b76fd35d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -12,6 +12,7 @@ import {
     filter,
     map,
     Observable,
+    shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs";
@@ -28,7 +29,8 @@ export class EpisodeIdentificationFormComponent implements OnInit {
 
     public episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
-        map((result) => result.data.episode)
+        map((result) => result.data.episode),
+        shareReplay(1)
     );
 
     public form = new FormGroup({
@@ -56,36 +58,42 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 if (!episode) {
                     return;
                 }
-                this.form.patchValue(episode);
+                this.form.patchValue(episode, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
             });
 
-        this.form.valueChanges
+        this.episode$
             .pipe(
-                map(() => this.form.getRawValue()),
-                filter(() => this.form.valid),
-                debounceTime(300),
-                withLatestFrom(this.id$),
-                switchMap(([episode, id]) =>
-                    this.updateEpisode
-                        .mutate(
-                            {
-                                episodeData: {
-                                    ...episode,
-                                    id,
-                                },
-                            },
-                            {
-                                update: (cache) => {
-                                    const identified = cache.identify({
-                                        __typename: "EpisodeType",
+                switchMap(() =>
+                    this.form.valueChanges.pipe(
+                        map(() => this.form.getRawValue()),
+                        filter(() => this.form.valid),
+                        debounceTime(300),
+                        withLatestFrom(this.id$),
+                        switchMap(([episode, id]) =>
+                            this.updateEpisode.mutate(
+                                {
+                                    episodeData: {
+                                        ...episode,
                                         id,
-                                    });
-                                    cache.evict({ id: identified });
-                                    cache.gc();
+                                    },
                                 },
-                            }
-                        )
-                        .pipe(takeUntilDestroyed(this.destroyRef))
+                                {
+                                    update: (cache) => {
+                                        const identified = cache.identify({
+                                            __typename: "EpisodeType",
+                                            id,
+                                        });
+                                        cache.evict({ id: identified });
+                                        cache.gc();
+                                    },
+                                }
+                            )
+                        ),
+                        takeUntilDestroyed(this.destroyRef)
+                    )
                 )
             )
             .subscribe((result) => {
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 634252d5..0c257e67 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -12,6 +12,7 @@ import {
     filter,
     map,
     Observable,
+    shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs";
@@ -28,7 +29,8 @@ export class EpisodeSourceTextFormComponent implements OnInit {
 
     public episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
-        map((result) => result.data.episode)
+        map((result) => result.data.episode),
+        shareReplay(1)
     );
 
     public form = new FormGroup({
@@ -53,22 +55,30 @@ export class EpisodeSourceTextFormComponent implements OnInit {
                 if (!episode) {
                     return;
                 }
-                this.form.patchValue(episode);
+                this.form.patchValue(episode, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
             });
 
-        this.form.valueChanges
+        this.episode$
             .pipe(
-                map(() => this.form.getRawValue()),
-                filter(() => this.form.valid),
-                debounceTime(300),
-                withLatestFrom(this.id$),
-                switchMap(([episode, id]) =>
-                    this.updateEpisode.mutate({
-                        episodeData: {
-                            id,
-                            ...episode,
-                        },
-                    })
+                switchMap(() =>
+                    this.form.valueChanges.pipe(
+                        map(() => this.form.getRawValue()),
+                        filter(() => this.form.valid),
+                        debounceTime(300),
+                        withLatestFrom(this.id$),
+                        switchMap(([episode, id]) =>
+                            this.updateEpisode.mutate({
+                                episodeData: {
+                                    id,
+                                    ...episode,
+                                },
+                            })
+                        ),
+                        takeUntilDestroyed(this.destroyRef)
+                    )
                 )
             )
             .subscribe((result) => {

From bc8a1e56b7d96fed833735f5be5001353821af08 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 1 Sep 2024 15:58:11 +0200
Subject: [PATCH 361/565] Cache evict

---
 .../types/input/DescriptionFieldInputType.py  |  7 +++
 .../types/input/EntityDescriptionInputType.py |  4 +-
 backend/core/types/input/FieldInputType.py    |  6 ++
 .../event/mutations/UpdateEpisodeMutation.py  |  5 +-
 .../letter/mutations/UpdateLetterMutation.py  | 16 ++++--
 .../letter-categories-form.graphql            | 15 +++--
 .../letter-identification-form.component.ts   | 56 +++++++++++--------
 .../letter-source-text-form.component.ts      | 48 ++++++++++------
 8 files changed, 104 insertions(+), 53 deletions(-)
 create mode 100644 backend/core/types/input/DescriptionFieldInputType.py
 create mode 100644 backend/core/types/input/FieldInputType.py

diff --git a/backend/core/types/input/DescriptionFieldInputType.py b/backend/core/types/input/DescriptionFieldInputType.py
new file mode 100644
index 00000000..5f0d93a8
--- /dev/null
+++ b/backend/core/types/input/DescriptionFieldInputType.py
@@ -0,0 +1,7 @@
+from graphene import Enum, InputObjectType
+from core.models import SourceMention
+from core.types.input.FieldInputType import FieldInputType
+
+
+class DescriptionFieldInputType(FieldInputType, InputObjectType):
+    source_mention = Enum.from_enum(SourceMention)()
diff --git a/backend/core/types/input/EntityDescriptionInputType.py b/backend/core/types/input/EntityDescriptionInputType.py
index 132f6239..b5026c5a 100644
--- a/backend/core/types/input/EntityDescriptionInputType.py
+++ b/backend/core/types/input/EntityDescriptionInputType.py
@@ -1,7 +1,9 @@
 from graphene import ID, InputObjectType, List, NonNull, String
 
+from core.types.input.NamedInputType import NamedInputType
 
-class EntityDescriptionInputType(InputObjectType):
+
+class EntityDescriptionInputType(NamedInputType, InputObjectType):
     book = String()
     chapter = String()
     page = String()
diff --git a/backend/core/types/input/FieldInputType.py b/backend/core/types/input/FieldInputType.py
new file mode 100644
index 00000000..e831670f
--- /dev/null
+++ b/backend/core/types/input/FieldInputType.py
@@ -0,0 +1,6 @@
+from graphene import InputObjectType, Int, String
+
+
+class FieldInputType(InputObjectType):
+    certainty = String()
+    note = String()
diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index fbd4e02f..ac4aaf4d 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -1,16 +1,13 @@
 from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo, String
 from django.core.exceptions import ObjectDoesNotExist
 from core.types.input.EntityDescriptionInputType import EntityDescriptionInputType
-from core.types.input.NamedInputType import NamedInputType
 from event.models import Episode
 from graphql_app.LettercraftMutation import LettercraftMutation
 
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
-class UpdateEpisodeMutationInput(
-    NamedInputType, EntityDescriptionInputType, InputObjectType
-):
+class UpdateEpisodeMutationInput(EntityDescriptionInputType, InputObjectType):
     id = ID(required=True)
     summary = String()
 
diff --git a/backend/letter/mutations/UpdateLetterMutation.py b/backend/letter/mutations/UpdateLetterMutation.py
index 23e9e59b..c4533bb1 100644
--- a/backend/letter/mutations/UpdateLetterMutation.py
+++ b/backend/letter/mutations/UpdateLetterMutation.py
@@ -1,16 +1,22 @@
 from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo
 from django.core.exceptions import ObjectDoesNotExist
+from core.types.input.DescriptionFieldInputType import DescriptionFieldInputType
 from core.types.input.EntityDescriptionInputType import EntityDescriptionInputType
-from core.types.input.NamedInputType import NamedInputType
-from letter.models import LetterDescription
+from letter.models import LetterDescription, LetterDescriptionCategory
 from graphql_app.LettercraftMutation import LettercraftMutation
 
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
 
 
-class UpdateLetterInput(NamedInputType, EntityDescriptionInputType, InputObjectType):
+class LetterDescriptionCategoryInput(DescriptionFieldInputType, InputObjectType):
+    id = ID()
+    category = ID(required=True)
+
+
+class UpdateLetterInput(EntityDescriptionInputType, InputObjectType):
     id = ID(required=True)
-    categories = List(NonNull(ID))
+    categorisations = List(NonNull(LetterDescriptionCategoryInput))
 
 
 class UpdateLetterMutation(LettercraftMutation):
@@ -33,7 +39,7 @@ def mutate(cls, root: None, info: ResolveInfo, letter_data: UpdateLetterInput):
         letter: LetterDescription = retrieved_object.object  # type: ignore
 
         try:
-            cls.mutate_object(letter_data, letter, info)
+            cls.mutate_object(letter_data, letter, info, ["categorisations"])
         except ObjectDoesNotExist as field:
             error = LettercraftErrorType(
                 field=str(field), messages=["Related object cannot be found."]
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
index c97acfbe..d5a8f05f 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.graphql
@@ -1,16 +1,23 @@
 query DataEntryLetterCategories($id: ID!) {
     letterDescription(id: $id) {
         id
-        categories {
+        categorisations {
             id
+            sourceMention
+            note
+            certainty
+            category {
+                id
+                label
+            }
         }
     }
 }
 
 query DataEntryAllLetterCategories {
     letterCategories {
-            id
-            label
-            description
+        id
+        label
+        description
     }
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index 1d64614c..965ef88a 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -11,6 +11,7 @@ import {
     debounceTime,
     filter,
     map,
+    shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs/operators";
@@ -25,7 +26,8 @@ export class LetterIdentificationFormComponent implements OnInit {
 
     public letter$ = this.id$.pipe(
         switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
-        map((result) => result.data.letterDescription)
+        map((result) => result.data.letterDescription),
+        shareReplay(1)
     );
 
     public form = new FormGroup({
@@ -53,33 +55,41 @@ export class LetterIdentificationFormComponent implements OnInit {
                 if (!letter) {
                     return;
                 }
-                this.form.patchValue(letter);
+                this.form.patchValue(letter, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
             });
 
-        this.form.valueChanges
+        this.letter$
             .pipe(
-                map(() => this.form.getRawValue()),
-                filter(() => this.form.valid),
-                debounceTime(300),
-                withLatestFrom(this.id$),
-                switchMap(([letter, id]) =>
-                    this.letterMutation
-                        .mutate(
-                            {
-                                letterData: {
-                                    ...letter,
-                                    id,
+                switchMap(() =>
+                    this.form.valueChanges.pipe(
+                        map(() => this.form.getRawValue()),
+                        filter(() => this.form.valid),
+                        debounceTime(300),
+                        withLatestFrom(this.id$),
+                        switchMap(([letter, id]) =>
+                            this.letterMutation.mutate(
+                                {
+                                    letterData: {
+                                        ...letter,
+                                        id,
+                                    },
                                 },
-                            },
-                            {
-                                update: (cache) =>
-                                    cache.evict({
-                                        id: `LetterDescriptionType:${id}`,
-                                    }),
-                            }
+                                {
+                                    update: (cache) => {
+                                        cache.evict({
+                                            id: `LetterDescriptionType:${id}`,
+                                        });
+                                        cache.gc();
+                                    },
+                                }
+                            )
                         )
-                        .pipe(takeUntilDestroyed(this.destroyRef))
-                )
+                    )
+                ),
+                takeUntilDestroyed(this.destroyRef)
             )
             .subscribe((result) => {
                 const errors = result.data?.updateLetter?.errors;
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
index 3acc6322..9daaa4ab 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
@@ -7,7 +7,14 @@ import {
     DataEntryLetterSourceTextGQL,
     DataEntryUpdateLetterGQL,
 } from "generated/graphql";
-import { debounceTime, filter, map, switchMap, withLatestFrom } from "rxjs";
+import {
+    debounceTime,
+    filter,
+    map,
+    shareReplay,
+    switchMap,
+    withLatestFrom,
+} from "rxjs";
 
 @Component({
     selector: "lc-letter-source-text-form",
@@ -19,7 +26,8 @@ export class LetterSourceTextFormComponent implements OnInit {
 
     public letter$ = this.id$.pipe(
         switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
-        map((result) => result.data.letterDescription)
+        map((result) => result.data.letterDescription),
+        shareReplay(1)
     );
 
     public form = new FormGroup({
@@ -52,23 +60,31 @@ export class LetterSourceTextFormComponent implements OnInit {
                 if (!letter) {
                     return;
                 }
-                this.form.patchValue(letter);
+                this.form.patchValue(letter, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
             });
 
-        this.form.valueChanges
+        this.letter$
             .pipe(
-                map(() => this.form.getRawValue()),
-                filter(() => this.form.valid),
-                debounceTime(300),
-                withLatestFrom(this.id$),
-                switchMap(([letter, id]) =>
-                    this.letterMutation.mutate({
-                        letterData: {
-                            ...letter,
-                            id,
-                        },
-                    })
-                )
+                switchMap(() =>
+                    this.form.valueChanges.pipe(
+                        map(() => this.form.getRawValue()),
+                        filter(() => this.form.valid),
+                        debounceTime(300),
+                        withLatestFrom(this.id$),
+                        switchMap(([letter, id]) =>
+                            this.letterMutation.mutate({
+                                letterData: {
+                                    ...letter,
+                                    id,
+                                },
+                            })
+                        )
+                    )
+                ),
+                takeUntilDestroyed(this.destroyRef)
             )
             .subscribe((result) => {
                 const errors = result.data?.updateLetter?.errors;

From 4d14096f3e4b16c18c63e8e889b3bc4ed5e5beb5 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 1 Sep 2024 16:05:01 +0200
Subject: [PATCH 362/565] Keep LetterCategories simple for now

---
 .../letter-categories-form.component.html     |  2 +-
 .../letter-categories-form.component.ts       | 44 +------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
index f6fa670b..e50ad001 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.html
@@ -1,6 +1,6 @@
 <form *ngIf="letterCategories$ | async as letterCategories">
     <div class="form-group">
         <p>Select one or more categories that apply to this letter</p>
-        
+        <i>Coming soon!</i>
     </div>
 </form>
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
index 6defb691..34bd3293 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
@@ -20,7 +20,7 @@ import { MultiselectOption } from "../../shared/multiselect/multiselect.componen
     templateUrl: "./letter-categories-form.component.html",
     styleUrls: ["./letter-categories-form.component.scss"],
 })
-export class LetterCategoriesFormComponent implements OnInit {
+export class LetterCategoriesFormComponent {
     public id$ = this.route.params.pipe(
         map((params) => params["id"]),
         share()
@@ -32,7 +32,7 @@ export class LetterCategoriesFormComponent implements OnInit {
     );
 
     public form = new FormGroup({
-        categories: new FormControl<string[]>([], {
+        categorisations: new FormControl<string[]>([], {
             nonNullable: true,
         }),
     });
@@ -54,44 +54,4 @@ export class LetterCategoriesFormComponent implements OnInit {
         private letterCategoriesQuery: DataEntryAllLetterCategoriesGQL,
         private letterMutation: DataEntryUpdateLetterGQL
     ) {}
-
-    ngOnInit(): void {
-        this.letter$
-            .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((letter) => {
-                if (!letter) {
-                    return;
-                }
-                const categoryIds = letter.categories.map(
-                    (category) => category.id
-                );
-                this.form.patchValue({ categories: categoryIds });
-            });
-
-        this.form.valueChanges
-            .pipe(
-                map(() => this.form.getRawValue()),
-                filter(() => this.form.valid),
-                debounceTime(300),
-                withLatestFrom(this.id$),
-                switchMap(([letter, id]) =>
-                    this.letterMutation.mutate({
-                        letterData: {
-                            ...letter,
-                            id: id,
-                        },
-                    })
-                )
-            )
-            .subscribe((result) => {
-                const errors = result.data?.updateLetter?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
-            });
-    }
 }

From be9f6cd5af306a6a6700073e356a8f536617cd35 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 1 Sep 2024 16:21:56 +0200
Subject: [PATCH 363/565] Gift mutations

---
 backend/graphql_app/schema.py                 |  6 +++
 .../letter/mutations/CreateGiftMutation.py    | 45 ++++++++++++++++
 .../letter/mutations/DeleteGiftMutation.py    | 26 +++++++++
 .../letter/mutations/UpdateGiftMutation.py    | 53 +++++++++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 backend/letter/mutations/CreateGiftMutation.py
 create mode 100644 backend/letter/mutations/DeleteGiftMutation.py
 create mode 100644 backend/letter/mutations/UpdateGiftMutation.py

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index d4df80db..841ede55 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -15,6 +15,9 @@
 from letter.mutations.CreateLetterMutation import CreateLetterMutation
 from letter.mutations.DeleteLetterMutation import DeleteLetterMutation
 from letter.mutations.UpdateLetterMutation import UpdateLetterMutation
+from letter.mutations.CreateGiftMutation import CreateGiftMutation
+from letter.mutations.DeleteGiftMutation import DeleteGiftMutation
+from letter.mutations.UpdateGiftMutation import UpdateGiftMutation
 from person.mutations.CreatePersonReferenceMutation import CreatePersonReferenceMutation
 from person.mutations.UpdatePersonReferenceMutation import UpdatePersonReferenceMutation
 from person.mutations.DeletePersonReferenceMutation import DeletePersonReferenceMutation
@@ -41,6 +44,9 @@ class Mutation(ObjectType):
     create_letter = CreateLetterMutation.Field()
     update_letter = UpdateLetterMutation.Field()
     delete_letter = DeleteLetterMutation.Field()
+    create_gift = CreateGiftMutation.Field()
+    update_gift = UpdateGiftMutation.Field()
+    delete_gift = DeleteGiftMutation.Field()
     create_person_reference = CreatePersonReferenceMutation.Field()
     update_person_reference = UpdatePersonReferenceMutation.Field()
     delete_person_reference = DeletePersonReferenceMutation.Field()
diff --git a/backend/letter/mutations/CreateGiftMutation.py b/backend/letter/mutations/CreateGiftMutation.py
new file mode 100644
index 00000000..c06dd9aa
--- /dev/null
+++ b/backend/letter/mutations/CreateGiftMutation.py
@@ -0,0 +1,45 @@
+from graphene import (
+    ID,
+    Field,
+    InputObjectType,
+    List,
+    NonNull,
+    ResolveInfo,
+    String,
+)
+
+from letter.models import GiftDescription
+from letter.types.GiftDescriptionType import GiftDescriptionType
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from source.models import Source
+
+
+class CreateGiftInput(InputObjectType):
+    name = String(required=True)
+    source = ID(required=True)
+
+
+class CreateGiftMutation(LettercraftMutation):
+    gift = Field(GiftDescriptionType)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = GiftDescription
+
+    class Arguments:
+        gift_data = CreateGiftInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, gift_data: CreateGiftInput):
+        try:
+            source = Source.objects.get(id=getattr(gift_data, "source"))
+        except Source.DoesNotExist:
+            error = LettercraftErrorType(field="source", messages=["Source not found."])
+            return cls(errors=[error])  # type: ignore
+
+        letter = GiftDescription.objects.create(
+            name=getattr(gift_data, "name"),
+            source=source,
+        )
+
+        return cls(Letter=letter, errors=[])  # type: ignore
diff --git a/backend/letter/mutations/DeleteGiftMutation.py b/backend/letter/mutations/DeleteGiftMutation.py
new file mode 100644
index 00000000..5a380026
--- /dev/null
+++ b/backend/letter/mutations/DeleteGiftMutation.py
@@ -0,0 +1,26 @@
+from graphene import ID, Boolean, List, Mutation, NonNull, ResolveInfo
+
+from letter.models import GiftDescription
+from letter.types.GiftDescriptionType import GiftDescriptionType
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class DeleteGiftMutation(Mutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, id: str):
+        try:
+            gift = GiftDescriptionType.get_queryset(
+                GiftDescription.objects, info
+            ).get(id=id)
+        except GiftDescription.DoesNotExist:
+            error = LettercraftErrorType(field="id", messages=["Gift not found."])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        gift.delete()
+        return cls(ok=True, errors=[])  # type: ignore
diff --git a/backend/letter/mutations/UpdateGiftMutation.py b/backend/letter/mutations/UpdateGiftMutation.py
new file mode 100644
index 00000000..b5251b71
--- /dev/null
+++ b/backend/letter/mutations/UpdateGiftMutation.py
@@ -0,0 +1,53 @@
+from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo
+from django.core.exceptions import ObjectDoesNotExist
+from core.types.input.DescriptionFieldInputType import DescriptionFieldInputType
+from core.types.input.EntityDescriptionInputType import EntityDescriptionInputType
+from letter.models import GiftDescription
+from graphql_app.LettercraftMutation import LettercraftMutation
+
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class GiftDescriptionCategoryInput(DescriptionFieldInputType, InputObjectType):
+    id = ID()
+    category = ID(required=True)
+
+
+class UpdateGiftInput(EntityDescriptionInputType, InputObjectType):
+    id = ID(required=True)
+    categorisations = List(NonNull(GiftDescriptionCategoryInput))
+
+
+class UpdateGiftMutation(LettercraftMutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = GiftDescription
+
+    class Arguments:
+        gift_data = UpdateGiftInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, gift_data: UpdateGiftInput):
+        try:
+            retrieved_object = cls.get_or_create_object(info, gift_data)
+        except ObjectDoesNotExist as e:
+            error = LettercraftErrorType(field="id", messages=[str(e)])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        gift: GiftDescription = retrieved_object.object  # type: ignore
+
+        try:
+            cls.mutate_object(gift_data, gift, info, ["categorisations"])
+        except ObjectDoesNotExist as field:
+            error = LettercraftErrorType(
+                field=str(field), messages=["Related object cannot be found."]
+            )
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        user = info.context.user
+        gift.contributors.add(user)
+
+        gift.save()
+
+        return cls(ok=True, errors=[])  # type: ignore

From d53d7f353c905feb3232e492e6da6ed0b66cb961 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 1 Sep 2024 16:23:24 +0200
Subject: [PATCH 364/565] Base gift form scaffolding; fixed routing

---
 .../gift-form/gift-form.component.html        | 45 ++++++-----
 .../gift-form/gift-form.component.ts          | 80 ++++++++++---------
 .../data-entry/gift-form/gift-form.module.ts  |  6 ++
 .../src/app/data-entry/gift-form/gift.graphql | 28 ++++---
 .../letter-form/letter-form.component.ts      |  3 +-
 .../episode-preview.component.html            | 12 ++-
 6 files changed, 105 insertions(+), 69 deletions(-)

diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index a5d52015..68979b07 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -1,21 +1,30 @@
-<ng-container *ngIf="data$ | async as data">
-    <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)"></lc-breadcrumb>
+<lc-breadcrumb [breadcrumbs]="(breadcrumbs$ | async) ?? []" />
 
-    <ng-container *ngIf="data.giftDescription as giftDescription">
-        <h1 class="mb-4">
-            <lc-icon [icon]="dataIcons.gift"></lc-icon>
-            {{giftDescription.name}}
-            <span class="text-secondary">
-                ({{giftDescription.source.name}})
-            </span>
-        </h1>
+<ng-container *ngIf="gift$ | async as gift; else loading">
+    <h1 class="mb-4">
+        <lc-icon [icon]="dataIcons.gift" />
+        <span class="ms-2">{{ gift.name }}</span>
+        <span class="text-secondary">
+            ({{ gift.source.name }})
+        </span>
+    </h1>
 
-        <p class="lead mb-4" *ngIf="giftDescription.description">
-            {{giftDescription.description}}
-        </p>
-
-        <div class="alert alert-warning">
-            This form is not implemented yet!
-        </div>
-    </ng-container>
+    <p class="lead mb-4" *ngIf="gift.description">
+        {{ gift.description }}
+    </p>
 </ng-container>
+
+<h2 class="subform-header">Identification</h2>
+<lc-gift-identification-form />
+
+<h2 class="subform-header">Source text</h2>
+<lc-gift-source-text-form />
+
+<h2 class="subform-header">Categories</h2>
+<lc-gift-categories-form />
+
+<ng-template #loading>
+    <div class="spinner-border" role="status">
+        <span class="visually-hidden">Loading...</span>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
index eb24da84..bf090ec8 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
@@ -1,51 +1,55 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
-import { dataIcons } from '@shared/icons';
-import { DataEntryGiftGQL, DataEntryGiftQuery } from 'generated/graphql';
-import { map, Observable, switchMap } from 'rxjs';
+import { Component } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { actionIcons, dataIcons } from "@shared/icons";
+import { DataEntryGiftFormGQL } from "generated/graphql";
+import { filter, map, share, switchMap } from "rxjs";
 
 @Component({
-    selector: 'lc-gift-form',
-    templateUrl: './gift-form.component.html',
-    styleUrls: ['./gift-form.component.scss']
+    selector: "lc-gift-form",
+    templateUrl: "./gift-form.component.html",
+    styleUrls: ["./gift-form.component.scss"],
 })
 export class GiftFormComponent {
-    id$: Observable<string>;
-    data$: Observable<DataEntryGiftQuery>;
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
 
-    dataIcons = dataIcons;
+    public gift$ = this.id$.pipe(
+        switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
+        map((result) => result.data.giftDescription),
+        share()
+    );
 
-    constructor(private route: ActivatedRoute, private giftQuery: DataEntryGiftGQL) {
-        this.id$ = this.route.params.pipe(
-            map(params => params['id']),
-        );
-        this.data$ = this.id$.pipe(
-            switchMap(id => this.giftQuery.watch({ id }).valueChanges),
-            map(result => result.data),
-        );
-    }
-
-    getBreadcrumbs(data: DataEntryGiftQuery): Breadcrumb[] {
-        if (data.giftDescription) {
+    public breadcrumbs$ = this.gift$.pipe(
+        filter((gift) => !!gift),
+        map((gift) => {
+            if (!gift) {
+                return [];
+            }
             return [
-                { link: '/', label: 'Lettercraft' },
-                { link: '/data-entry', label: 'Data entry' },
                 {
-                    link: `/data-entry/sources/${data.giftDescription.source.id}`,
-                    label: data.giftDescription.source.name
+                    label: "Lettercraft",
+                    link: "/",
+                },
+                {
+                    label: "Data entry",
+                    link: "/data-entry",
+                },
+                {
+                    label: gift.source.name,
+                    link: `/data-entry/sources/${gift.source.id}`,
                 },
                 {
-                    link: `/data-entry/gifts/${data.giftDescription.id}`,
-                    label: data.giftDescription.name
+                    label: gift.name,
+                    link: `/data-entry/gifts/${gift.id}`,
                 },
             ];
-        } else {
-            return [
-                { link: '/', label: 'Lettercraft' },
-                { link: '/data-entry', label: 'Data entry' },
-                { link: '', label: 'Gift not found' }
-            ]
-        }
-    }
+        })
+    );
+
+    public dataIcons = dataIcons;
+    public actionIcons = actionIcons;
+
+    constructor(
+        private route: ActivatedRoute,
+        private giftQuery: DataEntryGiftFormGQL
+    ) {}
 }
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.module.ts b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
index e617f982..eefe2e15 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.module.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
@@ -1,12 +1,18 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared/shared.module';
 import { GiftFormComponent } from './gift-form.component';
+import { GiftIdentificationFormComponent } from './gift-identification-form/gift-identification-form.component';
+import { GiftSourceTextFormComponent } from './gift-source-text-form/gift-source-text-form.component';
+import { GiftCategoriesFormComponent } from './gift-categories-form/gift-categories-form.component';
 
 
 
 @NgModule({
     declarations: [
         GiftFormComponent,
+        GiftIdentificationFormComponent,
+        GiftSourceTextFormComponent,
+        GiftCategoriesFormComponent,
     ],
     imports: [
         SharedModule
diff --git a/frontend/src/app/data-entry/gift-form/gift.graphql b/frontend/src/app/data-entry/gift-form/gift.graphql
index ee855d60..48dda6c9 100644
--- a/frontend/src/app/data-entry/gift-form/gift.graphql
+++ b/frontend/src/app/data-entry/gift-form/gift.graphql
@@ -1,11 +1,21 @@
-query DataEntryGift($id: ID!) {
-  giftDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
+query DataEntryGiftForm($id: ID!) {
+    giftDescription(id: $id) {
+        id
+        name
+        description
+        source {
+            id
+            name
+        }
+    }
+}
+
+mutation DataEntryUpdateGift($giftData: UpdateGiftInput!) {
+    updateGift(giftData: $giftData) {
+        ok
+        errors {
+            field
+            messages
+        }
     }
-  }
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 2715a4bb..4dc1dabf 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -1,9 +1,8 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
 import { actionIcons, dataIcons } from "@shared/icons";
 import { DataEntryLetterFormGQL } from "generated/graphql";
-import { filter, map, Observable, share, switchMap } from "rxjs";
+import { filter, map, share, switchMap } from "rxjs";
 
 @Component({
     selector: "lc-letter-form",
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index 26fa8d3d..dc9598e2 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -78,7 +78,10 @@
                         *ngFor="let gift of episode.gifts"
                         class="inline-list-item"
                     >
-                        <a [routerLink]="['gift/', gift.id]" class="icon-link">
+                        <a
+                            [routerLink]="['/', 'data-entry', 'gifts', gift.id]"
+                            class="icon-link"
+                        >
                             <lc-icon [icon]="dataIcons.gift" />
                             {{ gift.name }}
                         </a>
@@ -88,7 +91,12 @@
                         class="inline-list-item"
                     >
                         <a
-                            [routerLink]="['/', 'data-entry', 'letters', letter.id]"
+                            [routerLink]="[
+                                '/',
+                                'data-entry',
+                                'letters',
+                                letter.id
+                            ]"
                             class="icon-link"
                         >
                             <lc-icon [icon]="dataIcons.letter" />

From 5d463662bb592ba8d6e0377c013ddc9959b334dc Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 1 Sep 2024 16:42:52 +0200
Subject: [PATCH 365/565] Added Gift forms

---
 frontend/generated/graphql.ts                 | 2873 +++++++++++------
 frontend/generated/schema.graphql             |  175 +-
 .../gift-categories-form.component.html       |    6 +
 .../gift-categories-form.component.scss       |    0
 .../gift-categories-form.component.spec.ts    |   21 +
 .../gift-categories-form.component.ts         |   54 +
 .../gift-categories-form.graphql              |   23 +
 .../data-entry/gift-form/gift-form.module.ts  |    3 +-
 .../gift-identification-form.component.html   |   31 +
 .../gift-identification-form.component.scss   |    0
 ...gift-identification-form.component.spec.ts |   21 +
 .../gift-identification-form.component.ts     |  105 +
 .../gift-identification-form.graphql          |    7 +
 .../gift-source-text-form.component.html      |   37 +
 .../gift-source-text-form.component.scss      |    0
 .../gift-source-text-form.component.spec.ts   |   21 +
 .../gift-source-text-form.component.ts        |  100 +
 .../gift-source-text-form.graphql             |    9 +
 .../letter-categories-form.component.ts       |   27 +-
 19 files changed, 2513 insertions(+), 1000 deletions(-)
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.html
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.scss
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.graphql
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.scss
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.graphql
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.scss
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index bf8a0738..426a5acf 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1,1419 +1,2326 @@
-import { gql } from 'apollo-angular';
-import { Injectable } from '@angular/core';
-import * as Apollo from 'apollo-angular';
+import { gql } from "apollo-angular";
+import { Injectable } from "@angular/core";
+import * as Apollo from "apollo-angular";
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
-export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
-export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };
-export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
+export type Exact<T extends { [key: string]: unknown }> = {
+    [K in keyof T]: T[K];
+};
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
+    [SubKey in K]?: Maybe<T[SubKey]>;
+};
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
+    [SubKey in K]: Maybe<T[SubKey]>;
+};
+export type MakeEmpty<
+    T extends { [key: string]: unknown },
+    K extends keyof T
+> = { [_ in K]?: never };
+export type Incremental<T> =
+    | T
+    | {
+          [P in keyof T]?: P extends " $fragmentName" | "__typename"
+              ? T[P]
+              : never;
+      };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-  ID: { input: string; output: string; }
-  String: { input: string; output: string; }
-  Boolean: { input: boolean; output: boolean; }
-  Int: { input: number; output: number; }
-  Float: { input: number; output: number; }
+    ID: { input: string; output: string };
+    String: { input: string; output: string };
+    Boolean: { input: boolean; output: boolean };
+    Int: { input: number; output: number };
+    Float: { input: number; output: number };
 };
 
 export type AgentDescriptionGenderType = {
-  __typename?: 'AgentDescriptionGenderType';
-  agent: AgentDescriptionType;
-  /** How certain are you of this value? */
-  certainty: PersonAgentDescriptionGenderCertaintyChoices;
-  /** The gender of this agent. The option Mixed is only applicable for groups. */
-  gender: PersonAgentDescriptionGenderGenderChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
+    __typename?: "AgentDescriptionGenderType";
+    agent: AgentDescriptionType;
+    /** How certain are you of this value? */
+    certainty: PersonAgentDescriptionGenderCertaintyChoices;
+    /** The gender of this agent. The option Mixed is only applicable for groups. */
+    gender: PersonAgentDescriptionGenderGenderChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
 };
 
 export type AgentDescriptionLocationType = {
-  __typename?: 'AgentDescriptionLocationType';
-  agent: AgentDescriptionType;
-  /** How certain are you of this value? */
-  certainty: PersonAgentDescriptionLocationCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** location by which the agent is identified */
-  location: SpaceDescriptionType;
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
+    __typename?: "AgentDescriptionLocationType";
+    agent: AgentDescriptionType;
+    /** How certain are you of this value? */
+    certainty: PersonAgentDescriptionLocationCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** location by which the agent is identified */
+    location: SpaceDescriptionType;
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
 };
 
 export type AgentDescriptionType = {
-  __typename?: 'AgentDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  gender?: Maybe<AgentDescriptionGenderType>;
-  id: Scalars['ID']['output'];
-  /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
-  isGroup: Scalars['Boolean']['output'];
-  location?: Maybe<AgentDescriptionLocationType>;
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
+    __typename?: "AgentDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    gender?: Maybe<AgentDescriptionGenderType>;
+    id: Scalars["ID"]["output"];
+    /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
+    isGroup: Scalars["Boolean"]["output"];
+    location?: Maybe<AgentDescriptionLocationType>;
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
+};
+
+/** An enumeration. */
+export enum Certainty {
+    Certain = "CERTAIN",
+    SomewhatCertain = "SOMEWHAT_CERTAIN",
+    Uncertain = "UNCERTAIN",
+}
+
+export type CreateAgentInput = {
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
+};
+
+export type CreateAgentMutation = {
+    __typename?: "CreateAgentMutation";
+    agent?: Maybe<AgentDescriptionType>;
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
+};
+
+export type CreateGiftInput = {
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
+};
+
+export type CreateGiftMutation = {
+    __typename?: "CreateGiftMutation";
+    errors: Array<LettercraftErrorType>;
+    gift?: Maybe<GiftDescriptionType>;
+};
+
+export type CreateLetterInput = {
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
+};
+
+export type CreateLetterMutation = {
+    __typename?: "CreateLetterMutation";
+    errors: Array<LettercraftErrorType>;
+    letter?: Maybe<LetterDescriptionType>;
+};
+
+export type CreatePersonReferenceInput = {
+    description: Scalars["ID"]["input"];
+    person: Scalars["ID"]["input"];
+};
+
+export type CreatePersonReferenceMutation = {
+    __typename?: "CreatePersonReferenceMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
+};
+
+export type DeleteAgentMutation = {
+    __typename?: "DeleteAgentMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
+};
+
+export type DeleteGiftMutation = {
+    __typename?: "DeleteGiftMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
+};
+
+export type DeleteLetterMutation = {
+    __typename?: "DeleteLetterMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
+};
+
+export type DeletePersonReferenceMutation = {
+    __typename?: "DeletePersonReferenceMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type EpisodeCategoryType = {
-  __typename?: 'EpisodeCategoryType';
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
+    __typename?: "EpisodeCategoryType";
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
 };
 
 export type EpisodeType = {
-  __typename?: 'EpisodeType';
-  /** agents involved in this episode */
-  agents: Array<AgentDescriptionType>;
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  categories: Array<EpisodeCategoryType>;
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  /** gifts involved in this episode */
-  gifts: Array<GiftDescriptionType>;
-  id: Scalars['ID']['output'];
-  /** letters involved in this episode */
-  letters: Array<LetterDescriptionType>;
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<EventEpisodeSourceMentionChoices>;
-  /** locations involved in this episode */
-  spaces: Array<SpaceDescriptionType>;
-  /** full description of the events in the passage */
-  summary: Scalars['String']['output'];
+    __typename?: "EpisodeType";
+    /** agents involved in this episode */
+    agents: Array<AgentDescriptionType>;
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    categories: Array<EpisodeCategoryType>;
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    /** gifts involved in this episode */
+    gifts: Array<GiftDescriptionType>;
+    id: Scalars["ID"]["output"];
+    /** letters involved in this episode */
+    letters: Array<LetterDescriptionType>;
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<EventEpisodeSourceMentionChoices>;
+    /** locations involved in this episode */
+    spaces: Array<SpaceDescriptionType>;
+    /** full description of the events in the passage */
+    summary: Scalars["String"]["output"];
 };
 
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
+}
+
+/** An enumeration. */
+export enum Gender {
+    Female = "FEMALE",
+    Male = "MALE",
+    Mixed = "MIXED",
+    Other = "OTHER",
+    Unknown = "UNKNOWN",
 }
 
 export type GiftCategoryType = {
-  __typename?: 'GiftCategoryType';
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
+    __typename?: "GiftCategoryType";
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+};
+
+export type GiftDescriptionCategoryInput = {
+    category: Scalars["ID"]["input"];
+    certainty?: InputMaybe<Scalars["String"]["input"]>;
+    id?: InputMaybe<Scalars["ID"]["input"]>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type GiftDescriptionCategoryType = {
-  __typename?: 'GiftDescriptionCategoryType';
-  category: GiftCategoryType;
-  /** How certain are you of this value? */
-  certainty: LetterGiftDescriptionCategoryCertaintyChoices;
-  gift: GiftDescriptionType;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
+    __typename?: "GiftDescriptionCategoryType";
+    category: GiftCategoryType;
+    /** How certain are you of this value? */
+    certainty: LetterGiftDescriptionCategoryCertaintyChoices;
+    gift: GiftDescriptionType;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
 };
 
 export type GiftDescriptionType = {
-  __typename?: 'GiftDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  categories: Array<GiftCategoryType>;
-  categorisations: Array<GiftDescriptionCategoryType>;
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<LetterGiftDescriptionSourceMentionChoices>;
+    __typename?: "GiftDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    categories: Array<GiftCategoryType>;
+    categorisations: Array<GiftDescriptionCategoryType>;
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<LetterGiftDescriptionSourceMentionChoices>;
 };
 
 export type HistoricalPersonType = {
-  __typename?: 'HistoricalPersonType';
-  contributors: Array<UserType>;
-  dateOfBirth?: Maybe<PersonDateOfBirthType>;
-  dateOfDeath?: Maybe<PersonDateOfDeathType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
+    __typename?: "HistoricalPersonType";
+    contributors: Array<UserType>;
+    dateOfBirth?: Maybe<PersonDateOfBirthType>;
+    dateOfDeath?: Maybe<PersonDateOfDeathType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
 };
 
 export type LetterCategoryType = {
-  __typename?: 'LetterCategoryType';
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  label: Scalars['String']['output'];
+    __typename?: "LetterCategoryType";
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    label: Scalars["String"]["output"];
+};
+
+export type LetterDescriptionCategoryInput = {
+    category: Scalars["ID"]["input"];
+    certainty?: InputMaybe<Scalars["String"]["input"]>;
+    id?: InputMaybe<Scalars["ID"]["input"]>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type LetterDescriptionCategoryType = {
-  __typename?: 'LetterDescriptionCategoryType';
-  category: LetterCategoryType;
-  /** How certain are you of this value? */
-  certainty: LetterLetterDescriptionCategoryCertaintyChoices;
-  id: Scalars['ID']['output'];
-  letter: LetterDescriptionType;
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
+    __typename?: "LetterDescriptionCategoryType";
+    category: LetterCategoryType;
+    /** How certain are you of this value? */
+    certainty: LetterLetterDescriptionCategoryCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    letter: LetterDescriptionType;
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
 };
 
 export type LetterDescriptionType = {
-  __typename?: 'LetterDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  categories: Array<LetterCategoryType>;
-  categorisations: Array<LetterDescriptionCategoryType>;
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
+    __typename?: "LetterDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    categories: Array<LetterCategoryType>;
+    categorisations: Array<LetterDescriptionCategoryType>;
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
 };
 
 /** An enumeration. */
 export enum LetterGiftDescriptionCategoryCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum LetterGiftDescriptionCategorySourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum LetterGiftDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionCategoryCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionCategorySourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** A simple wrapper around Graphene-Django's ErrorType with a constructor. */
 export type LettercraftErrorType = {
-  __typename?: 'LettercraftErrorType';
-  field: Scalars['String']['output'];
-  messages: Array<Scalars['String']['output']>;
+    __typename?: "LettercraftErrorType";
+    field: Scalars["String"]["output"];
+    messages: Array<Scalars["String"]["output"]>;
 };
 
 export type Mutation = {
-  __typename?: 'Mutation';
-  updateAgent?: Maybe<UpdateAgentMutation>;
-  updateEpisode?: Maybe<UpdateEpisodeMutation>;
-  updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
+    __typename?: "Mutation";
+    createAgent?: Maybe<CreateAgentMutation>;
+    createGift?: Maybe<CreateGiftMutation>;
+    createLetter?: Maybe<CreateLetterMutation>;
+    createPersonReference?: Maybe<CreatePersonReferenceMutation>;
+    deleteAgent?: Maybe<DeleteAgentMutation>;
+    deleteGift?: Maybe<DeleteGiftMutation>;
+    deleteLetter?: Maybe<DeleteLetterMutation>;
+    deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
+    updateAgent?: Maybe<UpdateAgentMutation>;
+    updateEpisode?: Maybe<UpdateEpisodeMutation>;
+    updateGift?: Maybe<UpdateGiftMutation>;
+    updateLetter?: Maybe<UpdateLetterMutation>;
+    updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
+    updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
 };
 
+export type MutationCreateAgentArgs = {
+    agentData: CreateAgentInput;
+};
 
-export type MutationUpdateAgentArgs = {
-  agentData: UpdateAgentInput;
+export type MutationCreateGiftArgs = {
+    giftData: CreateGiftInput;
 };
 
+export type MutationCreateLetterArgs = {
+    letterData: CreateLetterInput;
+};
+
+export type MutationCreatePersonReferenceArgs = {
+    referenceData: CreatePersonReferenceInput;
+};
+
+export type MutationDeleteAgentArgs = {
+    id: Scalars["ID"]["input"];
+};
+
+export type MutationDeleteGiftArgs = {
+    id: Scalars["ID"]["input"];
+};
+
+export type MutationDeleteLetterArgs = {
+    id: Scalars["ID"]["input"];
+};
+
+export type MutationDeletePersonReferenceArgs = {
+    id: Scalars["ID"]["input"];
+};
+
+export type MutationUpdateAgentArgs = {
+    agentData: UpdateAgentInput;
+};
 
 export type MutationUpdateEpisodeArgs = {
-  input: UpdateEpisodeMutationInput;
+    input: UpdateEpisodeMutationInput;
+};
+
+export type MutationUpdateGiftArgs = {
+    giftData: UpdateGiftInput;
 };
 
+export type MutationUpdateLetterArgs = {
+    letterData: UpdateLetterInput;
+};
 
 export type MutationUpdateOrCreateSourceArgs = {
-  input: UpdateCreateSourceInput;
+    input: UpdateCreateSourceInput;
+};
+
+export type MutationUpdatePersonReferenceArgs = {
+    referenceData: UpdatePersonReferenceInput;
 };
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderGenderChoices {
-  /** Female */
-  Female = 'FEMALE',
-  /** Male */
-  Male = 'MALE',
-  /** Mixed */
-  Mixed = 'MIXED',
-  /** Other */
-  Other = 'OTHER',
-  /** Unknown */
-  Unknown = 'UNKNOWN'
+    /** Female */
+    Female = "FEMALE",
+    /** Male */
+    Male = "MALE",
+    /** Mixed */
+    Mixed = "MIXED",
+    /** Other */
+    Other = "OTHER",
+    /** Unknown */
+    Unknown = "UNKNOWN",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionLocationCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionLocationSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 export type PersonDateOfBirthType = {
-  __typename?: 'PersonDateOfBirthType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonDateOfBirthCertaintyChoices;
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** date on which this person was born */
-  person: HistoricalPersonType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "PersonDateOfBirthType";
+    /** How certain are you of this value? */
+    certainty: PersonPersonDateOfBirthCertaintyChoices;
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** date on which this person was born */
+    person: HistoricalPersonType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
 export type PersonDateOfDeathType = {
-  __typename?: 'PersonDateOfDeathType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonDateOfDeathCertaintyChoices;
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** date on which this person died */
-  person: HistoricalPersonType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "PersonDateOfDeathType";
+    /** How certain are you of this value? */
+    certainty: PersonPersonDateOfDeathCertaintyChoices;
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** date on which this person died */
+    person: HistoricalPersonType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
 /** An enumeration. */
 export enum PersonPersonDateOfBirthCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonPersonDateOfDeathCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonPersonReferenceCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 export type PersonReferenceType = {
-  __typename?: 'PersonReferenceType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonReferenceCertaintyChoices;
-  description: AgentDescriptionType;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  person: HistoricalPersonType;
+    __typename?: "PersonReferenceType";
+    /** How certain are you of this value? */
+    certainty: PersonPersonReferenceCertaintyChoices;
+    description: AgentDescriptionType;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    person: HistoricalPersonType;
 };
 
 export type Query = {
-  __typename?: 'Query';
-  agentDescription?: Maybe<AgentDescriptionType>;
-  agentDescriptions: Array<AgentDescriptionType>;
-  episode?: Maybe<EpisodeType>;
-  episodes: Array<EpisodeType>;
-  giftDescription?: Maybe<GiftDescriptionType>;
-  giftDescriptions: Array<GiftDescriptionType>;
-  letterDescription?: Maybe<LetterDescriptionType>;
-  letterDescriptions: Array<LetterDescriptionType>;
-  source: SourceType;
-  sources: Array<SourceType>;
-  spaceDescription?: Maybe<SpaceDescriptionType>;
-  spaceDescriptions: Array<SpaceDescriptionType>;
-  userDescription?: Maybe<UserType>;
-  userDescriptions: Array<UserType>;
+    __typename?: "Query";
+    agentDescription?: Maybe<AgentDescriptionType>;
+    agentDescriptions: Array<AgentDescriptionType>;
+    episode?: Maybe<EpisodeType>;
+    episodes: Array<EpisodeType>;
+    giftDescription?: Maybe<GiftDescriptionType>;
+    giftDescriptions: Array<GiftDescriptionType>;
+    letterCategories: Array<LetterCategoryType>;
+    letterDescription?: Maybe<LetterDescriptionType>;
+    letterDescriptions: Array<LetterDescriptionType>;
+    source: SourceType;
+    sources: Array<SourceType>;
+    spaceDescription?: Maybe<SpaceDescriptionType>;
+    spaceDescriptions: Array<SpaceDescriptionType>;
+    userDescription?: Maybe<UserType>;
+    userDescriptions: Array<UserType>;
 };
 
-
 export type QueryAgentDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryAgentDescriptionsArgs = {
-  episodeId?: InputMaybe<Scalars['ID']['input']>;
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryEpisodeArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryEpisodesArgs = {
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryGiftDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryGiftDescriptionsArgs = {
-  episodeId?: InputMaybe<Scalars['ID']['input']>;
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryLetterDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryLetterDescriptionsArgs = {
-  episodeId?: InputMaybe<Scalars['ID']['input']>;
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QuerySourceArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QuerySpaceDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QuerySpaceDescriptionsArgs = {
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryUserDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
 export type RegionFieldType = {
-  __typename?: 'RegionFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceRegionFieldCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  region: RegionType;
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
-  space: SpaceDescriptionType;
+    __typename?: "RegionFieldType";
+    /** How certain are you of this value? */
+    certainty: SpaceRegionFieldCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    region: RegionType;
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
+    space: SpaceDescriptionType;
 };
 
 export type RegionType = {
-  __typename?: 'RegionType';
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** Kind of region */
-  type: SpaceRegionTypeChoices;
+    __typename?: "RegionType";
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** Kind of region */
+    type: SpaceRegionTypeChoices;
 };
 
 export type SettlementFieldType = {
-  __typename?: 'SettlementFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceSettlementFieldCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  settlement: SettlementType;
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
-  space: SpaceDescriptionType;
+    __typename?: "SettlementFieldType";
+    /** How certain are you of this value? */
+    certainty: SpaceSettlementFieldCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    settlement: SettlementType;
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
+    space: SpaceDescriptionType;
 };
 
 export type SettlementType = {
-  __typename?: 'SettlementType';
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** Surrounding regions of this settlement */
-  regions: Array<RegionType>;
+    __typename?: "SettlementType";
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** Surrounding regions of this settlement */
+    regions: Array<RegionType>;
 };
 
 export type SourceContentsDateType = {
-  __typename?: 'SourceContentsDateType';
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** The source whose events took place at this date */
-  source: SourceType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "SourceContentsDateType";
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** The source whose events took place at this date */
+    source: SourceType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
+/** An enumeration. */
+export enum SourceMention {
+    Direct = "DIRECT",
+    Implied = "IMPLIED",
+}
+
 export type SourceType = {
-  __typename?: 'SourceType';
-  contentsDate?: Maybe<SourceContentsDateType>;
-  /** The name of the author of the edition */
-  editionAuthor: Scalars['String']['output'];
-  /** The title of the edition used for this source */
-  editionTitle: Scalars['String']['output'];
-  episodes: Array<EpisodeType>;
-  id: Scalars['ID']['output'];
-  /** The name of the original author of the work, if known */
-  medievalAuthor: Scalars['String']['output'];
-  /** The original title of the work, if known */
-  medievalTitle: Scalars['String']['output'];
-  /** a unique name to identify this source in the database */
-  name: Scalars['String']['output'];
-  numOfEpisodes: Scalars['Int']['output'];
-  writtenDate?: Maybe<SourceWrittenDateType>;
+    __typename?: "SourceType";
+    contentsDate?: Maybe<SourceContentsDateType>;
+    /** The name of the author of the edition */
+    editionAuthor: Scalars["String"]["output"];
+    /** The title of the edition used for this source */
+    editionTitle: Scalars["String"]["output"];
+    episodes: Array<EpisodeType>;
+    id: Scalars["ID"]["output"];
+    /** The name of the original author of the work, if known */
+    medievalAuthor: Scalars["String"]["output"];
+    /** The original title of the work, if known */
+    medievalTitle: Scalars["String"]["output"];
+    /** a unique name to identify this source in the database */
+    name: Scalars["String"]["output"];
+    numOfEpisodes: Scalars["Int"]["output"];
+    writtenDate?: Maybe<SourceWrittenDateType>;
 };
 
 export type SourceWrittenDateType = {
-  __typename?: 'SourceWrittenDateType';
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** The source that was written at this date */
-  source: SourceType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "SourceWrittenDateType";
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** The source that was written at this date */
+    source: SourceType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
 export type SpaceDescriptionType = {
-  __typename?: 'SpaceDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  regionFields: Array<RegionFieldType>;
-  regions: Array<RegionType>;
-  settlementFields: Array<SettlementFieldType>;
-  settlements: Array<SettlementType>;
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<SpaceSpaceDescriptionSourceMentionChoices>;
-  structureFields: Array<StructureFieldType>;
-  structures: Array<StructureType>;
+    __typename?: "SpaceDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    regionFields: Array<RegionFieldType>;
+    regions: Array<RegionType>;
+    settlementFields: Array<SettlementFieldType>;
+    settlements: Array<SettlementType>;
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<SpaceSpaceDescriptionSourceMentionChoices>;
+    structureFields: Array<StructureFieldType>;
+    structures: Array<StructureType>;
 };
 
 /** An enumeration. */
 export enum SpaceRegionFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum SpaceRegionFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceRegionTypeChoices {
-  /** ecclesiastical */
-  Ecclesiastical = 'ECCLESIASTICAL',
-  /** geographical */
-  Geographical = 'GEOGRAPHICAL',
-  /** political */
-  Political = 'POLITICAL'
+    /** ecclesiastical */
+    Ecclesiastical = "ECCLESIASTICAL",
+    /** geographical */
+    Geographical = "GEOGRAPHICAL",
+    /** political */
+    Political = "POLITICAL",
 }
 
 /** An enumeration. */
 export enum SpaceSettlementFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum SpaceSettlementFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceSpaceDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceStructureFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum SpaceStructureFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceStructureLevelChoices {
-  /** road, square, crossroad */
-  A_1 = 'A_1',
-  /** fortification */
-  A_2 = 'A_2',
-  /** building, vessel */
-  A_3 = 'A_3',
-  /** room */
-  A_4 = 'A_4',
-  /** spot, object */
-  A_5 = 'A_5'
+    /** road, square, crossroad */
+    A_1 = "A_1",
+    /** fortification */
+    A_2 = "A_2",
+    /** building, vessel */
+    A_3 = "A_3",
+    /** room */
+    A_4 = "A_4",
+    /** spot, object */
+    A_5 = "A_5",
 }
 
 export type StructureFieldType = {
-  __typename?: 'StructureFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceStructureFieldCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
-  space: SpaceDescriptionType;
-  structure: StructureType;
+    __typename?: "StructureFieldType";
+    /** How certain are you of this value? */
+    certainty: SpaceStructureFieldCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
+    space: SpaceDescriptionType;
+    structure: StructureType;
 };
 
 export type StructureType = {
-  __typename?: 'StructureType';
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  level: SpaceStructureLevelChoices;
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The settlement containing this structure */
-  settlement?: Maybe<SettlementType>;
+    __typename?: "StructureType";
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    level: SpaceStructureLevelChoices;
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The settlement containing this structure */
+    settlement?: Maybe<SettlementType>;
+};
+
+export type UpdateAgentGenderInput = {
+    gender?: InputMaybe<Gender>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentInput = {
-  description?: InputMaybe<Scalars['String']['input']>;
-  id: Scalars['ID']['input'];
-  isGroup?: InputMaybe<Scalars['Boolean']['input']>;
-  name?: InputMaybe<Scalars['String']['input']>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>;
+    gender?: InputMaybe<UpdateAgentGenderInput>;
+    id: Scalars["ID"]["input"];
+    isGroup?: InputMaybe<Scalars["Boolean"]["input"]>;
+    location?: InputMaybe<UpdateAgentLocationInput>;
+    name?: InputMaybe<Scalars["String"]["input"]>;
+};
+
+export type UpdateAgentLocationInput = {
+    location?: InputMaybe<Scalars["ID"]["input"]>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentMutation = {
-  __typename?: 'UpdateAgentMutation';
-  agent?: Maybe<AgentDescriptionType>;
-  error?: Maybe<Scalars['String']['output']>;
+    __typename?: "UpdateAgentMutation";
+    agent?: Maybe<AgentDescriptionType>;
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateCreateSourceInput = {
-  editionAuthor?: InputMaybe<Scalars['String']['input']>;
-  editionTitle?: InputMaybe<Scalars['String']['input']>;
-  id?: InputMaybe<Scalars['ID']['input']>;
-  medievalAuthor?: InputMaybe<Scalars['String']['input']>;
-  medievalTitle?: InputMaybe<Scalars['String']['input']>;
-  name: Scalars['String']['input'];
+    editionAuthor?: InputMaybe<Scalars["String"]["input"]>;
+    editionTitle?: InputMaybe<Scalars["String"]["input"]>;
+    id?: InputMaybe<Scalars["ID"]["input"]>;
+    medievalAuthor?: InputMaybe<Scalars["String"]["input"]>;
+    medievalTitle?: InputMaybe<Scalars["String"]["input"]>;
+    name: Scalars["String"]["input"];
 };
 
 export type UpdateEpisodeMutation = {
-  __typename?: 'UpdateEpisodeMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "UpdateEpisodeMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateEpisodeMutationInput = {
-  book?: InputMaybe<Scalars['String']['input']>;
-  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
-  chapter?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
-  id: Scalars['ID']['input'];
-  name?: InputMaybe<Scalars['String']['input']>;
-  page?: InputMaybe<Scalars['String']['input']>;
-  summary?: InputMaybe<Scalars['String']['input']>;
+    book?: InputMaybe<Scalars["String"]["input"]>;
+    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+    chapter?: InputMaybe<Scalars["String"]["input"]>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
+    id: Scalars["ID"]["input"];
+    name?: InputMaybe<Scalars["String"]["input"]>;
+    page?: InputMaybe<Scalars["String"]["input"]>;
+    summary?: InputMaybe<Scalars["String"]["input"]>;
+};
+
+export type UpdateGiftInput = {
+    book?: InputMaybe<Scalars["String"]["input"]>;
+    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+    categorisations?: InputMaybe<Array<GiftDescriptionCategoryInput>>;
+    chapter?: InputMaybe<Scalars["String"]["input"]>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
+    id: Scalars["ID"]["input"];
+    name?: InputMaybe<Scalars["String"]["input"]>;
+    page?: InputMaybe<Scalars["String"]["input"]>;
+};
+
+export type UpdateGiftMutation = {
+    __typename?: "UpdateGiftMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
+};
+
+export type UpdateLetterInput = {
+    book?: InputMaybe<Scalars["String"]["input"]>;
+    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+    categorisations?: InputMaybe<Array<LetterDescriptionCategoryInput>>;
+    chapter?: InputMaybe<Scalars["String"]["input"]>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
+    id: Scalars["ID"]["input"];
+    name?: InputMaybe<Scalars["String"]["input"]>;
+    page?: InputMaybe<Scalars["String"]["input"]>;
+};
+
+export type UpdateLetterMutation = {
+    __typename?: "UpdateLetterMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateOrCreateSourceMutation = {
-  __typename?: 'UpdateOrCreateSourceMutation';
-  errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
-  source?: Maybe<SourceType>;
+    __typename?: "UpdateOrCreateSourceMutation";
+    errors?: Maybe<Array<Maybe<Scalars["String"]["output"]>>>;
+    source?: Maybe<SourceType>;
+};
+
+export type UpdatePersonReferenceInput = {
+    certainty?: InputMaybe<Certainty>;
+    id: Scalars["ID"]["input"];
+    note?: InputMaybe<Scalars["String"]["input"]>;
+};
+
+export type UpdatePersonReferenceMutation = {
+    __typename?: "UpdatePersonReferenceMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UserType = {
-  __typename?: 'UserType';
-  firstName: Scalars['String']['output'];
-  fullName: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  lastName: Scalars['String']['output'];
+    __typename?: "UserType";
+    firstName: Scalars["String"]["output"];
+    fullName: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    lastName: Scalars["String"]["output"];
 };
 
 export type DataEntryAgentDescriptionQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
+export type DataEntryAgentDescriptionQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        isGroup: boolean;
+        designators: Array<string>;
+        gender?: {
+            __typename?: "AgentDescriptionGenderType";
+            id: string;
+            gender: PersonAgentDescriptionGenderGenderChoices;
+            sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null;
+            note: string;
+        } | null;
+        location?: {
+            __typename?: "AgentDescriptionLocationType";
+            id: string;
+            sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null;
+            note: string;
+            location: { __typename?: "SpaceDescriptionType"; id: string };
+        } | null;
+        source: { __typename?: "SourceType"; id: string };
+    } | null;
+};
 
 export type LocationsInSourceListQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type LocationsInSourceListQuery = { __typename?: 'Query', spaceDescriptions: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> };
+export type LocationsInSourceListQuery = {
+    __typename?: "Query";
+    spaceDescriptions: Array<{
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+    }>;
+};
 
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
+export type DataEntryAgentIdentificationQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        isGroup: boolean;
+    } | null;
+};
 
 export type DataEntryAgentQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryAgentQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        isGroup: boolean;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
+export type DataEntryEpisodeContentsQuery = {
+    __typename?: "Query";
+    episode?: {
+        __typename?: "EpisodeType";
+        id: string;
+        summary: string;
+        categories: Array<{ __typename?: "EpisodeCategoryType"; id: string }>;
+    } | null;
+};
 
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string } | null };
+export type DataEntryEpisodeIdentificationQuery = {
+    __typename?: "Query";
+    episode?: { __typename?: "EpisodeType"; id: string; name: string } | null;
+};
 
 export type DataEntryEpisodeSourceTextMentionQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryEpisodeSourceTextMentionQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryEpisodeSourceTextMentionQuery = {
+    __typename?: "Query";
+    episode?: {
+        __typename?: "EpisodeType";
+        id: string;
+        designators: Array<string>;
+        book: string;
+        chapter: string;
+        page: string;
+    } | null;
+};
 
 export type DataEntryEpisodeFormQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryEpisodeFormQuery = {
+    __typename?: "Query";
+    episode?: {
+        __typename?: "EpisodeType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryUpdateEpisodeMutationVariables = Exact<{
-  input: UpdateEpisodeMutationInput;
+    input: UpdateEpisodeMutationInput;
 }>;
 
+export type DataEntryUpdateEpisodeMutation = {
+    __typename?: "Mutation";
+    updateEpisode?: {
+        __typename?: "UpdateEpisodeMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
-export type DataEntryUpdateEpisodeMutation = { __typename?: 'Mutation', updateEpisode?: { __typename?: 'UpdateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryGiftCategoriesQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
+
+export type DataEntryGiftCategoriesQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        categorisations: Array<{
+            __typename?: "GiftDescriptionCategoryType";
+            id: string;
+            sourceMention?: LetterGiftDescriptionCategorySourceMentionChoices | null;
+            note: string;
+            certainty: LetterGiftDescriptionCategoryCertaintyChoices;
+            category: {
+                __typename?: "GiftCategoryType";
+                id: string;
+                name: string;
+            };
+        }>;
+    } | null;
+};
 
-export type DataEntryGiftQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+export type DataEntryAllGiftCategoriesQueryVariables = Exact<{
+    [key: string]: never;
 }>;
 
+export type DataEntryAllGiftCategoriesQuery = {
+    __typename?: "Query";
+    letterCategories: Array<{
+        __typename?: "LetterCategoryType";
+        id: string;
+        label: string;
+        description: string;
+    }>;
+};
 
-export type DataEntryGiftQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryGiftIdentificationQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
-export type DataEntryLetterQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+export type DataEntryGiftIdentificationQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+    } | null;
+};
+
+export type DataEntryGiftSourceTextQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
 }>;
 
+export type DataEntryGiftSourceTextQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        designators: Array<string>;
+        book: string;
+        chapter: string;
+        page: string;
+    } | null;
+};
 
-export type DataEntryLetterQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryGiftFormQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
-export type DataEntrySpaceDescriptionQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+export type DataEntryGiftFormQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
+
+export type DataEntryUpdateGiftMutationVariables = Exact<{
+    giftData: UpdateGiftInput;
 }>;
 
+export type DataEntryUpdateGiftMutation = {
+    __typename?: "Mutation";
+    updateGift?: {
+        __typename?: "UpdateGiftMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
-export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryLetterCategoriesQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
-export type DataEntrySourceDetailQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+export type DataEntryLetterCategoriesQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        categorisations: Array<{
+            __typename?: "LetterDescriptionCategoryType";
+            id: string;
+            sourceMention?: LetterLetterDescriptionCategorySourceMentionChoices | null;
+            note: string;
+            certainty: LetterLetterDescriptionCategoryCertaintyChoices;
+            category: {
+                __typename?: "LetterCategoryType";
+                id: string;
+                label: string;
+            };
+        }>;
+    } | null;
+};
+
+export type DataEntryAllLetterCategoriesQueryVariables = Exact<{
+    [key: string]: never;
 }>;
 
+export type DataEntryAllLetterCategoriesQuery = {
+    __typename?: "Query";
+    letterCategories: Array<{
+        __typename?: "LetterCategoryType";
+        id: string;
+        label: string;
+        description: string;
+    }>;
+};
 
-export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
+export type DataEntryLetterIdentificationQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
-export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
+export type DataEntryLetterIdentificationQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+    } | null;
+};
 
+export type DataEntryLetterSourceTextQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
-export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
+export type DataEntryLetterSourceTextQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        designators: Array<string>;
+        book: string;
+        chapter: string;
+        page: string;
+    } | null;
+};
 
-export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+export type DataEntryLetterFormQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
+export type DataEntryLetterFormQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
-export type SourceTitleQueryQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string } };
+export type DataEntryUpdateLetterMutationVariables = Exact<{
+    letterData: UpdateLetterInput;
+}>;
 
-export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+export type DataEntryUpdateLetterMutation = {
+    __typename?: "Mutation";
+    updateLetter?: {
+        __typename?: "UpdateLetterMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
+export type DataEntrySpaceDescriptionQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
-export type AgentTitleQueryQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntrySpaceDescriptionQuery = {
+    __typename?: "Query";
+    spaceDescription?: {
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
-export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+export type DataEntrySourceDetailQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
+export type DataEntrySourceDetailQuery = {
+    __typename?: "Query";
+    source: {
+        __typename?: "SourceType";
+        id: string;
+        name: string;
+        editionAuthor: string;
+        editionTitle: string;
+        medievalAuthor: string;
+        medievalTitle: string;
+        numOfEpisodes: number;
+        episodes: Array<{
+            __typename?: "EpisodeType";
+            id: string;
+            name: string;
+            description: string;
+            summary: string;
+            book: string;
+            chapter: string;
+            page: string;
+            contributors: Array<{
+                __typename?: "UserType";
+                id: string;
+                fullName: string;
+            }>;
+            agents: Array<{
+                __typename?: "AgentDescriptionType";
+                id: string;
+                name: string;
+                isGroup: boolean;
+                describes?: Array<{
+                    __typename?: "HistoricalPersonType";
+                    id: string;
+                    identifiable: boolean;
+                } | null> | null;
+            }>;
+            gifts: Array<{
+                __typename?: "GiftDescriptionType";
+                id: string;
+                name: string;
+            }>;
+            letters: Array<{
+                __typename?: "LetterDescriptionType";
+                id: string;
+                name: string;
+            }>;
+            spaces: Array<{
+                __typename?: "SpaceDescriptionType";
+                id: string;
+                name: string;
+            }>;
+        }>;
+    };
+};
 
-export type LetterTitleQueryQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DataEntrySourceListQuery = {
+    __typename?: "Query";
+    sources: Array<{
+        __typename?: "SourceType";
+        id: string;
+        name: string;
+        editionAuthor: string;
+        editionTitle: string;
+        medievalAuthor: string;
+        medievalTitle: string;
+        numOfEpisodes: number;
+    }>;
+};
+
+export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SourceTitleQueryQuery = {
+    __typename?: "Query";
+    source: { __typename?: "SourceType"; id: string; name: string };
+};
+
+export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+export type AgentTitleQueryQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
+export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GiftTitleQueryQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type LetterTitleQueryQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
-export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
 
+export type GiftTitleQueryQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
-export type SpaceTitleQueryQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SpaceTitleQueryQuery = {
+    __typename?: "Query";
+    spaceDescription?: {
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export const DataEntryAgentDescriptionDocument = gql`
     query DataEntryAgentDescription($id: ID!) {
-  agentDescription(id: $id) {
-    id
-    isGroup
-    designators
-    gender {
-      id
-      gender
-      sourceMention
-      note
-    }
-    location {
-      id
-      sourceMention
-      note
-      location {
-        id
-      }
-    }
-    source {
-      id
+        agentDescription(id: $id) {
+            id
+            isGroup
+            designators
+            gender {
+                id
+                gender
+                sourceMention
+                note
+            }
+            location {
+                id
+                sourceMention
+                note
+                location {
+                    id
+                }
+            }
+            source {
+                id
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAgentDescriptionGQL extends Apollo.Query<
+    DataEntryAgentDescriptionQuery,
+    DataEntryAgentDescriptionQueryVariables
+> {
     override document = DataEntryAgentDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const LocationsInSourceListDocument = gql`
     query LocationsInSourceList($id: ID!) {
-  spaceDescriptions(sourceId: $id) {
-    id
-    name
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
+        spaceDescriptions(sourceId: $id) {
+            id
+            name
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class LocationsInSourceListGQL extends Apollo.Query<
+    LocationsInSourceListQuery,
+    LocationsInSourceListQueryVariables
+> {
     override document = LocationsInSourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryAgentIdentificationDocument = gql`
     query DataEntryAgentIdentification($id: ID!) {
-  agentDescription(id: $id) {
-    id
-    name
-    description
-    isGroup
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
+        agentDescription(id: $id) {
+            id
+            name
+            description
+            isGroup
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAgentIdentificationGQL extends Apollo.Query<
+    DataEntryAgentIdentificationQuery,
+    DataEntryAgentIdentificationQueryVariables
+> {
     override document = DataEntryAgentIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryAgentDocument = gql`
     query DataEntryAgent($id: ID!) {
-  agentDescription(id: $id) {
-    id
-    name
-    description
-    isGroup
-    source {
-      id
-      name
+        agentDescription(id: $id) {
+            id
+            name
+            description
+            isGroup
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAgentGQL extends Apollo.Query<
+    DataEntryAgentQuery,
+    DataEntryAgentQueryVariables
+> {
     override document = DataEntryAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeContentsDocument = gql`
     query DataEntryEpisodeContents($id: ID!) {
-  episode(id: $id) {
-    id
-    summary
-    categories {
-      id
+        episode(id: $id) {
+            id
+            summary
+            categories {
+                id
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeContentsGQL extends Apollo.Query<
+    DataEntryEpisodeContentsQuery,
+    DataEntryEpisodeContentsQueryVariables
+> {
     override document = DataEntryEpisodeContentsDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeIdentificationDocument = gql`
     query DataEntryEpisodeIdentification($id: ID!) {
-  episode(id: $id) {
-    id
-    name
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
+        episode(id: $id) {
+            id
+            name
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<
+    DataEntryEpisodeIdentificationQuery,
+    DataEntryEpisodeIdentificationQueryVariables
+> {
     override document = DataEntryEpisodeIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeSourceTextMentionDocument = gql`
     query DataEntryEpisodeSourceTextMention($id: ID!) {
-  episode(id: $id) {
-    id
-    designators
-    book
-    chapter
-    page
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
+        episode(id: $id) {
+            id
+            designators
+            book
+            chapter
+            page
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<
+    DataEntryEpisodeSourceTextMentionQuery,
+    DataEntryEpisodeSourceTextMentionQueryVariables
+> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeFormDocument = gql`
     query DataEntryEpisodeForm($id: ID!) {
-  episode(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
+        episode(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeFormGQL extends Apollo.Query<
+    DataEntryEpisodeFormQuery,
+    DataEntryEpisodeFormQueryVariables
+> {
     override document = DataEntryEpisodeFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryUpdateEpisodeDocument = gql`
     mutation DataEntryUpdateEpisode($input: UpdateEpisodeMutationInput!) {
-  updateEpisode(input: $input) {
-    ok
-    errors {
-      field
-      messages
+        updateEpisode(input: $input) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<
+    DataEntryUpdateEpisodeMutation,
+    DataEntryUpdateEpisodeMutationVariables
+> {
+    override document = DataEntryUpdateEpisodeDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
     }
-  }
 }
-    `;
+export const DataEntryGiftCategoriesDocument = gql`
+    query DataEntryGiftCategories($id: ID!) {
+        giftDescription(id: $id) {
+            id
+            categorisations {
+                id
+                sourceMention
+                note
+                certainty
+                category {
+                    id
+                    name
+                }
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftCategoriesGQL extends Apollo.Query<
+    DataEntryGiftCategoriesQuery,
+    DataEntryGiftCategoriesQueryVariables
+> {
+    override document = DataEntryGiftCategoriesDocument;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
-    override document = DataEntryUpdateEpisodeDocument;
-    
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
-export const DataEntryGiftDocument = gql`
-    query DataEntryGift($id: ID!) {
-  giftDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
+}
+export const DataEntryAllGiftCategoriesDocument = gql`
+    query DataEntryAllGiftCategories {
+        letterCategories {
+            id
+            label
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<
+    DataEntryAllGiftCategoriesQuery,
+    DataEntryAllGiftCategoriesQueryVariables
+> {
+    override document = DataEntryAllGiftCategoriesDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
     }
-  }
 }
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryGiftGQL extends Apollo.Query<DataEntryGiftQuery, DataEntryGiftQueryVariables> {
-    override document = DataEntryGiftDocument;
-    
+export const DataEntryGiftIdentificationDocument = gql`
+    query DataEntryGiftIdentification($id: ID!) {
+        giftDescription(id: $id) {
+            id
+            name
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftIdentificationGQL extends Apollo.Query<
+    DataEntryGiftIdentificationQuery,
+    DataEntryGiftIdentificationQueryVariables
+> {
+    override document = DataEntryGiftIdentificationDocument;
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
-export const DataEntryLetterDocument = gql`
-    query DataEntryLetter($id: ID!) {
-  letterDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
+}
+export const DataEntryGiftSourceTextDocument = gql`
+    query DataEntryGiftSourceText($id: ID!) {
+        giftDescription(id: $id) {
+            id
+            designators
+            book
+            chapter
+            page
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftSourceTextGQL extends Apollo.Query<
+    DataEntryGiftSourceTextQuery,
+    DataEntryGiftSourceTextQueryVariables
+> {
+    override document = DataEntryGiftSourceTextDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
     }
-  }
 }
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryLetterGQL extends Apollo.Query<DataEntryLetterQuery, DataEntryLetterQueryVariables> {
-    override document = DataEntryLetterDocument;
-    
+export const DataEntryGiftFormDocument = gql`
+    query DataEntryGiftForm($id: ID!) {
+        giftDescription(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftFormGQL extends Apollo.Query<
+    DataEntryGiftFormQuery,
+    DataEntryGiftFormQueryVariables
+> {
+    override document = DataEntryGiftFormDocument;
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
-export const DataEntrySpaceDescriptionDocument = gql`
-    query DataEntrySpaceDescription($id: ID!) {
-  spaceDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
+}
+export const DataEntryUpdateGiftDocument = gql`
+    mutation DataEntryUpdateGift($giftData: UpdateGiftInput!) {
+        updateGift(giftData: $giftData) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateGiftGQL extends Apollo.Mutation<
+    DataEntryUpdateGiftMutation,
+    DataEntryUpdateGiftMutationVariables
+> {
+    override document = DataEntryUpdateGiftDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
     }
-  }
 }
-    `;
+export const DataEntryLetterCategoriesDocument = gql`
+    query DataEntryLetterCategories($id: ID!) {
+        letterDescription(id: $id) {
+            id
+            categorisations {
+                id
+                sourceMention
+                note
+                certainty
+                category {
+                    id
+                    label
+                }
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterCategoriesGQL extends Apollo.Query<
+    DataEntryLetterCategoriesQuery,
+    DataEntryLetterCategoriesQueryVariables
+> {
+    override document = DataEntryLetterCategoriesDocument;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntryAllLetterCategoriesDocument = gql`
+    query DataEntryAllLetterCategories {
+        letterCategories {
+            id
+            label
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<
+    DataEntryAllLetterCategoriesQuery,
+    DataEntryAllLetterCategoriesQueryVariables
+> {
+    override document = DataEntryAllLetterCategoriesDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntryLetterIdentificationDocument = gql`
+    query DataEntryLetterIdentification($id: ID!) {
+        letterDescription(id: $id) {
+            id
+            name
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterIdentificationGQL extends Apollo.Query<
+    DataEntryLetterIdentificationQuery,
+    DataEntryLetterIdentificationQueryVariables
+> {
+    override document = DataEntryLetterIdentificationDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntryLetterSourceTextDocument = gql`
+    query DataEntryLetterSourceText($id: ID!) {
+        letterDescription(id: $id) {
+            id
+            designators
+            book
+            chapter
+            page
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterSourceTextGQL extends Apollo.Query<
+    DataEntryLetterSourceTextQuery,
+    DataEntryLetterSourceTextQueryVariables
+> {
+    override document = DataEntryLetterSourceTextDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntryLetterFormDocument = gql`
+    query DataEntryLetterForm($id: ID!) {
+        letterDescription(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterFormGQL extends Apollo.Query<
+    DataEntryLetterFormQuery,
+    DataEntryLetterFormQueryVariables
+> {
+    override document = DataEntryLetterFormDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntryUpdateLetterDocument = gql`
+    mutation DataEntryUpdateLetter($letterData: UpdateLetterInput!) {
+        updateLetter(letterData: $letterData) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateLetterGQL extends Apollo.Mutation<
+    DataEntryUpdateLetterMutation,
+    DataEntryUpdateLetterMutationVariables
+> {
+    override document = DataEntryUpdateLetterDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntrySpaceDescriptionDocument = gql`
+    query DataEntrySpaceDescription($id: ID!) {
+        spaceDescription(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntrySpaceDescriptionGQL extends Apollo.Query<
+    DataEntrySpaceDescriptionQuery,
+    DataEntrySpaceDescriptionQueryVariables
+> {
     override document = DataEntrySpaceDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntrySourceDetailDocument = gql`
     query DataEntrySourceDetail($id: ID!) {
-  source(id: $id) {
-    id
-    name
-    editionAuthor
-    editionTitle
-    medievalAuthor
-    medievalTitle
-    numOfEpisodes
-    episodes {
-      id
-      name
-      description
-      summary
-      book
-      chapter
-      contributors {
-        id
-        fullName
-      }
-      page
-      agents {
-        id
-        name
-        isGroup
-        describes {
-          id
-          identifiable
+        source(id: $id) {
+            id
+            name
+            editionAuthor
+            editionTitle
+            medievalAuthor
+            medievalTitle
+            numOfEpisodes
+            episodes {
+                id
+                name
+                description
+                summary
+                book
+                chapter
+                contributors {
+                    id
+                    fullName
+                }
+                page
+                agents {
+                    id
+                    name
+                    isGroup
+                    describes {
+                        id
+                        identifiable
+                    }
+                }
+                gifts {
+                    id
+                    name
+                }
+                letters {
+                    id
+                    name
+                }
+                spaces {
+                    id
+                    name
+                }
+            }
         }
-      }
-      gifts {
-        id
-        name
-      }
-      letters {
-        id
-        name
-      }
-      spaces {
-        id
-        name
-      }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntrySourceDetailGQL extends Apollo.Query<
+    DataEntrySourceDetailQuery,
+    DataEntrySourceDetailQueryVariables
+> {
     override document = DataEntrySourceDetailDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntrySourceListDocument = gql`
     query DataEntrySourceList {
-  sources {
-    id
-    name
-    editionAuthor
-    editionTitle
-    medievalAuthor
-    medievalTitle
-    numOfEpisodes
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
+        sources {
+            id
+            name
+            editionAuthor
+            editionTitle
+            medievalAuthor
+            medievalTitle
+            numOfEpisodes
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntrySourceListGQL extends Apollo.Query<
+    DataEntrySourceListQuery,
+    DataEntrySourceListQueryVariables
+> {
     override document = DataEntrySourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const SourceTitleQueryDocument = gql`
     query SourceTitleQuery {
-  source(id: "") {
-    id
-    name
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
+        source(id: "") {
+            id
+            name
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class SourceTitleQueryGQL extends Apollo.Query<
+    SourceTitleQueryQuery,
+    SourceTitleQueryQueryVariables
+> {
     override document = SourceTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const AgentTitleQueryDocument = gql`
     query AgentTitleQuery {
-  agentDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        agentDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class AgentTitleQueryGQL extends Apollo.Query<
+    AgentTitleQueryQuery,
+    AgentTitleQueryQueryVariables
+> {
     override document = AgentTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const LetterTitleQueryDocument = gql`
     query LetterTitleQuery {
-  letterDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        letterDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class LetterTitleQueryGQL extends Apollo.Query<
+    LetterTitleQueryQuery,
+    LetterTitleQueryQueryVariables
+> {
     override document = LetterTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const GiftTitleQueryDocument = gql`
     query GiftTitleQuery {
-  giftDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        giftDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class GiftTitleQueryGQL extends Apollo.Query<
+    GiftTitleQueryQuery,
+    GiftTitleQueryQueryVariables
+> {
     override document = GiftTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const SpaceTitleQueryDocument = gql`
     query SpaceTitleQuery {
-  spaceDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        spaceDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class SpaceTitleQueryGQL extends Apollo.Query<
+    SpaceTitleQueryQuery,
+    SpaceTitleQueryQueryVariables
+> {
     override document = SpaceTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
\ No newline at end of file
+}
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 2c81d7b3..3ef68673 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -71,6 +71,74 @@ type AgentDescriptionType {
   sourceMention: PersonAgentDescriptionSourceMentionChoices
 }
 
+"""An enumeration."""
+enum Certainty {
+  CERTAIN
+  SOMEWHAT_CERTAIN
+  UNCERTAIN
+}
+
+input CreateAgentInput {
+  name: String!
+  source: ID!
+}
+
+type CreateAgentMutation {
+  agent: AgentDescriptionType
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+input CreateGiftInput {
+  name: String!
+  source: ID!
+}
+
+type CreateGiftMutation {
+  errors: [LettercraftErrorType!]!
+  gift: GiftDescriptionType
+}
+
+input CreateLetterInput {
+  name: String!
+  source: ID!
+}
+
+type CreateLetterMutation {
+  errors: [LettercraftErrorType!]!
+  letter: LetterDescriptionType
+}
+
+input CreatePersonReferenceInput {
+  description: ID!
+  person: ID!
+}
+
+type CreatePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+type DeleteAgentMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+type DeleteGiftMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+type DeleteLetterMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+type DeletePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type EpisodeCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -135,6 +203,15 @@ enum EventEpisodeSourceMentionChoices {
   IMPLIED
 }
 
+"""An enumeration."""
+enum Gender {
+  FEMALE
+  MALE
+  MIXED
+  OTHER
+  UNKNOWN
+}
+
 type GiftCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -144,6 +221,14 @@ type GiftCategoryType {
   name: String!
 }
 
+input GiftDescriptionCategoryInput {
+  category: ID!
+  certainty: String
+  id: ID
+  note: String
+  sourceMention: SourceMention
+}
+
 type GiftDescriptionCategoryType {
   category: GiftCategoryType!
 
@@ -215,6 +300,14 @@ type LetterCategoryType {
   label: String!
 }
 
+input LetterDescriptionCategoryInput {
+  category: ID!
+  certainty: String
+  id: ID
+  note: String
+  sourceMention: SourceMention
+}
+
 type LetterDescriptionCategoryType {
   category: LetterCategoryType!
 
@@ -331,9 +424,20 @@ type LettercraftErrorType {
 }
 
 type Mutation {
+  createAgent(agentData: CreateAgentInput!): CreateAgentMutation
+  createGift(giftData: CreateGiftInput!): CreateGiftMutation
+  createLetter(letterData: CreateLetterInput!): CreateLetterMutation
+  createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
+  deleteAgent(id: ID!): DeleteAgentMutation
+  deleteGift(id: ID!): DeleteGiftMutation
+  deleteLetter(id: ID!): DeleteLetterMutation
+  deletePersonReference(id: ID!): DeletePersonReferenceMutation
   updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
+  updateGift(giftData: UpdateGiftInput!): UpdateGiftMutation
+  updateLetter(letterData: UpdateLetterInput!): UpdateLetterMutation
   updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
+  updatePersonReference(referenceData: UpdatePersonReferenceInput!): UpdatePersonReferenceMutation
 }
 
 """An enumeration."""
@@ -507,6 +611,7 @@ type Query {
   episodes(sourceId: ID): [EpisodeType!]!
   giftDescription(id: ID!): GiftDescriptionType
   giftDescriptions(episodeId: ID, sourceId: ID): [GiftDescriptionType!]!
+  letterCategories: [LetterCategoryType!]!
   letterDescription(id: ID!): LetterDescriptionType
   letterDescriptions(episodeId: ID, sourceId: ID): [LetterDescriptionType!]!
   source(id: ID!): SourceType!
@@ -602,6 +707,12 @@ type SourceContentsDateType {
   yearUpper: Int!
 }
 
+"""An enumeration."""
+enum SourceMention {
+  DIRECT
+  IMPLIED
+}
+
 type SourceType {
   contentsDate: SourceContentsDateType
 
@@ -816,16 +927,32 @@ type StructureType {
   settlement: SettlementType
 }
 
+input UpdateAgentGenderInput {
+  gender: Gender
+  note: String
+  sourceMention: SourceMention
+}
+
 input UpdateAgentInput {
   description: String
+  designators: [String]
+  gender: UpdateAgentGenderInput
   id: ID!
   isGroup: Boolean
+  location: UpdateAgentLocationInput
   name: String
 }
 
+input UpdateAgentLocationInput {
+  location: ID
+  note: String
+  sourceMention: SourceMention
+}
+
 type UpdateAgentMutation {
   agent: AgentDescriptionType
-  error: String
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
 }
 
 input UpdateCreateSourceInput {
@@ -846,6 +973,7 @@ input UpdateEpisodeMutationInput {
   book: String
   categories: [ID!]
   chapter: String
+  description: String
   designators: [String!]
   id: ID!
   name: String
@@ -853,11 +981,56 @@ input UpdateEpisodeMutationInput {
   summary: String
 }
 
+input UpdateGiftInput {
+  book: String
+  categories: [ID!]
+  categorisations: [GiftDescriptionCategoryInput!]
+  chapter: String
+  description: String
+  designators: [String!]
+  id: ID!
+  name: String
+  page: String
+}
+
+type UpdateGiftMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
+input UpdateLetterInput {
+  book: String
+  categories: [ID!]
+  categorisations: [LetterDescriptionCategoryInput!]
+  chapter: String
+  description: String
+  designators: [String!]
+  id: ID!
+  name: String
+  page: String
+}
+
+type UpdateLetterMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type UpdateOrCreateSourceMutation {
   errors: [String]
   source: SourceType
 }
 
+input UpdatePersonReferenceInput {
+  certainty: Certainty
+  id: ID!
+  note: String
+}
+
+type UpdatePersonReferenceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type UserType {
   firstName: String!
   fullName: String!
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.html b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.html
new file mode 100644
index 00000000..ccafaf90
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.html
@@ -0,0 +1,6 @@
+<form *ngIf="giftCategories$ | async as giftCategories">
+    <div class="form-group">
+        <p>Select one or more categories that apply to this letter</p>
+        <i>Coming soon!</i>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.scss b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
new file mode 100644
index 00000000..4a6378ee
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { GiftCategoriesFormComponent } from "./gift-categories-form.component";
+
+describe("GiftCategoriesFormComponent", () => {
+    let component: GiftCategoriesFormComponent;
+    let fixture: ComponentFixture<GiftCategoriesFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [GiftCategoriesFormComponent],
+        });
+        fixture = TestBed.createComponent(GiftCategoriesFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
new file mode 100644
index 00000000..60061838
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
@@ -0,0 +1,54 @@
+import { Component, DestroyRef } from "@angular/core";
+import { FormGroup, FormControl } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryGiftCategoriesGQL,
+    DataEntryAllGiftCategoriesGQL,
+    DataEntryUpdateGiftGQL,
+} from "generated/graphql";
+import { map, share, switchMap, Observable } from "rxjs";
+import { MultiselectOption } from "../../shared/multiselect/multiselect.component";
+
+@Component({
+    selector: "lc-gift-categories-form",
+    templateUrl: "./gift-categories-form.component.html",
+    styleUrls: ["./gift-categories-form.component.scss"],
+})
+export class GiftCategoriesFormComponent {
+    public id$ = this.route.params.pipe(
+        map((params) => params["id"]),
+        share()
+    );
+
+    public letter$ = this.id$.pipe(
+        switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
+        map((result) => result.data.giftDescription)
+    );
+
+    public form = new FormGroup({
+        categorisations: new FormControl<string[]>([], {
+            nonNullable: true,
+        }),
+    });
+
+    public giftCategories$: Observable<MultiselectOption[]> =
+        this.giftCategoriesQuery.watch().valueChanges.pipe(
+            map((result) => result.data.letterCategories),
+            map((categories) =>
+                categories.map((category) => ({
+                    value: category.id,
+                    label: category.label,
+                }))
+            )
+        );
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private giftQuery: DataEntryGiftCategoriesGQL,
+        private giftCategoriesQuery: DataEntryAllGiftCategoriesGQL,
+        private giftMutation: DataEntryUpdateGiftGQL
+    ) {}
+}
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.graphql b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.graphql
new file mode 100644
index 00000000..5e3e5760
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.graphql
@@ -0,0 +1,23 @@
+query DataEntryGiftCategories($id: ID!) {
+    giftDescription(id: $id) {
+        id
+        categorisations {
+            id
+            sourceMention
+            note
+            certainty
+            category {
+                id
+                name
+            }
+        }
+    }
+}
+
+query DataEntryAllGiftCategories {
+    letterCategories {
+        id
+        label
+        description
+    }
+}
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.module.ts b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
index eefe2e15..784a8128 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.module.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
@@ -4,6 +4,7 @@ import { GiftFormComponent } from './gift-form.component';
 import { GiftIdentificationFormComponent } from './gift-identification-form/gift-identification-form.component';
 import { GiftSourceTextFormComponent } from './gift-source-text-form/gift-source-text-form.component';
 import { GiftCategoriesFormComponent } from './gift-categories-form/gift-categories-form.component';
+import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
 
 
 
@@ -15,7 +16,7 @@ import { GiftCategoriesFormComponent } from './gift-categories-form/gift-categor
         GiftCategoriesFormComponent,
     ],
     imports: [
-        SharedModule
+        SharedModule, DataEntrySharedModule
     ],
     exports: [
         GiftFormComponent,
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html
new file mode 100644
index 00000000..139ec834
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html
@@ -0,0 +1,31 @@
+<form>
+    <div class="form-group">
+        <label class="form-label" for="episode-name">Name</label>
+        <p class="form-text">
+            This is a name to identify the gift in the overview of the source.
+            For example: "golden cup", "hair shirt".
+        </p>
+        <input
+            id="episode-name"
+            type="text"
+            class="form-control"
+            [formControl]="form.controls.name"
+            [class.is-invalid]="
+                form.controls.name.invalid && form.controls.name.touched
+            "
+        />
+        <p class="invalid-feedback">This field is required.</p>
+    </div>
+
+    <div class="form-group mt-4">
+        <div class="form-label">Description</div>
+        <p class="form-text">
+            Add a description to help identify this gift in the database.
+        </p>
+        <textarea
+            class="form-control"
+            [formControl]="form.controls.description"
+        >
+        </textarea>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.scss b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
new file mode 100644
index 00000000..684f25e8
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { GiftIdentificationFormComponent } from "./gift-identification-form.component";
+
+describe("GiftIdentificationFormComponent", () => {
+    let component: GiftIdentificationFormComponent;
+    let fixture: ComponentFixture<GiftIdentificationFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [GiftIdentificationFormComponent],
+        });
+        fixture = TestBed.createComponent(GiftIdentificationFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
new file mode 100644
index 00000000..f90deb93
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -0,0 +1,105 @@
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormGroup, FormControl, Validators } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryGiftIdentificationGQL,
+    DataEntryUpdateGiftGQL,
+} from "generated/graphql";
+import {
+    map,
+    switchMap,
+    shareReplay,
+    filter,
+    debounceTime,
+    withLatestFrom,
+} from "rxjs";
+
+@Component({
+    selector: "lc-gift-identification-form",
+    templateUrl: "./gift-identification-form.component.html",
+    styleUrls: ["./gift-identification-form.component.scss"],
+})
+export class GiftIdentificationFormComponent implements OnInit {
+    public id$ = this.route.params.pipe(map((params) => params["id"]));
+
+    public gift$ = this.id$.pipe(
+        switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
+        map((result) => result.data.giftDescription),
+        shareReplay(1)
+    );
+
+    public form = new FormGroup({
+        name: new FormControl("", {
+            validators: [Validators.required],
+            nonNullable: true,
+        }),
+        description: new FormControl("", {
+            nonNullable: true,
+        }),
+    });
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private giftQuery: DataEntryGiftIdentificationGQL,
+        private giftMutation: DataEntryUpdateGiftGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.gift$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((gift) => {
+                if (!gift) {
+                    return;
+                }
+                this.form.patchValue(gift, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
+            });
+
+        this.gift$
+            .pipe(
+                switchMap(() =>
+                    this.form.valueChanges.pipe(
+                        map(() => this.form.getRawValue()),
+                        filter(() => this.form.valid),
+                        debounceTime(300),
+                        withLatestFrom(this.id$),
+                        switchMap(([gift, id]) =>
+                            this.giftMutation.mutate(
+                                {
+                                    giftData: {
+                                        ...gift,
+                                        id,
+                                    },
+                                },
+                                {
+                                    update: (cache) => {
+                                        cache.evict({
+                                            id: `GiftDescriptionType:${id}`,
+                                        });
+                                        cache.gc();
+                                    },
+                                }
+                            )
+                        )
+                    )
+                ),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateGift?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((e) => e.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.graphql b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.graphql
new file mode 100644
index 00000000..0fad590f
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.graphql
@@ -0,0 +1,7 @@
+query DataEntryGiftIdentification($id: ID!) {
+    giftDescription(id: $id) {
+        id
+        name
+        description
+    }
+}
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html
new file mode 100644
index 00000000..819d7cc9
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html
@@ -0,0 +1,37 @@
+<form>
+    <lc-designators-control [formControl]="form.controls.designators" />
+
+    <h3>Location</h3>
+    <p class="form-text">
+        Describe the location of this gift in the source text.
+    </p>
+    <div class="row">
+        <div class="form-group col">
+            <label class="form-label" for="book">Book</label>
+            <input
+                id="book"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.book"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="chapter">Chapter</label>
+            <input
+                id="chapter"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.chapter"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="page">Page</label>
+            <input
+                id="page"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.page"
+            />
+        </div>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.scss b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
new file mode 100644
index 00000000..8f77afa3
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { GiftSourceTextFormComponent } from "./gift-source-text-form.component";
+
+describe("GiftSourceTextFormComponent", () => {
+    let component: GiftSourceTextFormComponent;
+    let fixture: ComponentFixture<GiftSourceTextFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [GiftSourceTextFormComponent],
+        });
+        fixture = TestBed.createComponent(GiftSourceTextFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
new file mode 100644
index 00000000..484d793e
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
@@ -0,0 +1,100 @@
+import { Component, DestroyRef, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormGroup, FormControl } from "@angular/forms";
+import { ActivatedRoute } from "@angular/router";
+import { ToastService } from "@services/toast.service";
+import {
+    DataEntryGiftSourceTextGQL,
+    DataEntryUpdateGiftGQL,
+} from "generated/graphql";
+import {
+    map,
+    switchMap,
+    shareReplay,
+    filter,
+    debounceTime,
+    withLatestFrom,
+} from "rxjs";
+
+@Component({
+    selector: "lc-gift-source-text-form",
+    templateUrl: "./gift-source-text-form.component.html",
+    styleUrls: ["./gift-source-text-form.component.scss"],
+})
+export class GiftSourceTextFormComponent implements OnInit {
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
+
+    public gift$ = this.id$.pipe(
+        switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
+        map((result) => result.data.giftDescription),
+        shareReplay(1)
+    );
+
+    public form = new FormGroup({
+        designators: new FormControl<string[]>([], {
+            nonNullable: true,
+        }),
+        book: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+        chapter: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+        page: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+    });
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private route: ActivatedRoute,
+        private toastService: ToastService,
+        private giftQuery: DataEntryGiftSourceTextGQL,
+        private giftMutation: DataEntryUpdateGiftGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.gift$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((gift) => {
+                if (!gift) {
+                    return;
+                }
+                this.form.patchValue(gift, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
+            });
+
+        this.gift$
+            .pipe(
+                switchMap(() =>
+                    this.form.valueChanges.pipe(
+                        map(() => this.form.getRawValue()),
+                        filter(() => this.form.valid),
+                        debounceTime(300),
+                        withLatestFrom(this.id$),
+                        switchMap(([gift, id]) =>
+                            this.giftMutation.mutate({
+                                giftData: {
+                                    ...gift,
+                                    id,
+                                },
+                            })
+                        )
+                    )
+                ),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => {
+                const errors = result.data?.updateGift?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Update failed",
+                    });
+                }
+            });
+    }
+}
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql
new file mode 100644
index 00000000..cba21288
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql
@@ -0,0 +1,9 @@
+query DataEntryGiftSourceText($id: ID!) {
+    giftDescription(id: $id) {
+        id
+        designators
+        book
+        chapter
+        page
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
index 34bd3293..a38b0fb5 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
@@ -1,18 +1,13 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { Component, DestroyRef } from "@angular/core";
 import { FormControl, FormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
-import { DataEntryAllLetterCategoriesGQL, DataEntryLetterCategoriesGQL, DataEntryUpdateLetterGQL } from "generated/graphql";
 import {
-    debounceTime,
-    filter,
-    map,
-    Observable,
-    share,
-    switchMap,
-    withLatestFrom,
-} from "rxjs";
+    DataEntryAllLetterCategoriesGQL,
+    DataEntryLetterCategoriesGQL,
+    DataEntryUpdateLetterGQL,
+} from "generated/graphql";
+import { map, Observable, share, switchMap } from "rxjs";
 import { MultiselectOption } from "../../shared/multiselect/multiselect.component";
 
 @Component({
@@ -40,10 +35,12 @@ export class LetterCategoriesFormComponent {
     public letterCategories$: Observable<MultiselectOption[]> =
         this.letterCategoriesQuery.watch().valueChanges.pipe(
             map((result) => result.data.letterCategories),
-            map(categories => categories.map(category => ({
-                value: category.id,
-                label: category.label
-            })))
+            map((categories) =>
+                categories.map((category) => ({
+                    value: category.id,
+                    label: category.label,
+                }))
+            )
         );
 
     constructor(

From b063a347d1067e232192a7e76199e0c526f5f8a2 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 3 Sep 2024 11:59:47 +0200
Subject: [PATCH 366/565] Rename through model

---
 backend/letter/mutations/UpdateGiftMutation.py   | 6 ++++--
 backend/letter/mutations/UpdateLetterMutation.py | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/backend/letter/mutations/UpdateGiftMutation.py b/backend/letter/mutations/UpdateGiftMutation.py
index b5251b71..ffac7f22 100644
--- a/backend/letter/mutations/UpdateGiftMutation.py
+++ b/backend/letter/mutations/UpdateGiftMutation.py
@@ -8,14 +8,14 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
-class GiftDescriptionCategoryInput(DescriptionFieldInputType, InputObjectType):
+class GiftCategorisationInput(DescriptionFieldInputType, InputObjectType):
     id = ID()
     category = ID(required=True)
 
 
 class UpdateGiftInput(EntityDescriptionInputType, InputObjectType):
     id = ID(required=True)
-    categorisations = List(NonNull(GiftDescriptionCategoryInput))
+    categorisations = List(NonNull(GiftCategorisationInput))
 
 
 class UpdateGiftMutation(LettercraftMutation):
@@ -45,6 +45,8 @@ def mutate(cls, root: None, info: ResolveInfo, gift_data: UpdateGiftInput):
             )
             return cls(ok=False, errors=[error])  # type: ignore
 
+        # TODO: resolve categorisations
+
         user = info.context.user
         gift.contributors.add(user)
 
diff --git a/backend/letter/mutations/UpdateLetterMutation.py b/backend/letter/mutations/UpdateLetterMutation.py
index c4533bb1..12484215 100644
--- a/backend/letter/mutations/UpdateLetterMutation.py
+++ b/backend/letter/mutations/UpdateLetterMutation.py
@@ -2,21 +2,20 @@
 from django.core.exceptions import ObjectDoesNotExist
 from core.types.input.DescriptionFieldInputType import DescriptionFieldInputType
 from core.types.input.EntityDescriptionInputType import EntityDescriptionInputType
-from letter.models import LetterDescription, LetterDescriptionCategory
+from letter.models import LetterDescription
 from graphql_app.LettercraftMutation import LettercraftMutation
 
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
-from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
 
 
-class LetterDescriptionCategoryInput(DescriptionFieldInputType, InputObjectType):
+class LetterCategorisationInput(DescriptionFieldInputType, InputObjectType):
     id = ID()
     category = ID(required=True)
 
 
 class UpdateLetterInput(EntityDescriptionInputType, InputObjectType):
     id = ID(required=True)
-    categorisations = List(NonNull(LetterDescriptionCategoryInput))
+    categorisations = List(NonNull(LetterCategorisationInput))
 
 
 class UpdateLetterMutation(LettercraftMutation):
@@ -46,6 +45,8 @@ def mutate(cls, root: None, info: ResolveInfo, letter_data: UpdateLetterInput):
             )
             return cls(ok=False, errors=[error])  # type: ignore
 
+        # TODO: resolve categorisations
+
         user = info.context.user
         letter.contributors.add(user)
 

From 08a477551f698b9f0747e8a06662bfdeb7116e18 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 3 Sep 2024 12:05:32 +0200
Subject: [PATCH 367/565] Fix tests

---
 frontend/generated/graphql.ts                 | 3050 ++++++++---------
 frontend/generated/schema.graphql             |   34 +-
 .../gift-categories-form.component.spec.ts    |    2 +
 .../gift-form/gift-form.component.spec.ts     |    3 +-
 ...gift-identification-form.component.spec.ts |    2 +
 .../gift-source-text-form.component.spec.ts   |    2 +
 .../letter-categories-form.component.spec.ts  |    2 +
 .../letter-form/letter-form.component.spec.ts |    3 +-
 ...tter-identification-form.component.spec.ts |    2 +
 .../letter-source-text-form.component.spec.ts |    2 +
 10 files changed, 1369 insertions(+), 1733 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 426a5acf..0fbd9967 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1,2326 +1,1948 @@
-import { gql } from "apollo-angular";
-import { Injectable } from "@angular/core";
-import * as Apollo from "apollo-angular";
+import { gql } from 'apollo-angular';
+import { Injectable } from '@angular/core';
+import * as Apollo from 'apollo-angular';
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
-export type Exact<T extends { [key: string]: unknown }> = {
-    [K in keyof T]: T[K];
-};
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
-    [SubKey in K]?: Maybe<T[SubKey]>;
-};
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
-    [SubKey in K]: Maybe<T[SubKey]>;
-};
-export type MakeEmpty<
-    T extends { [key: string]: unknown },
-    K extends keyof T
-> = { [_ in K]?: never };
-export type Incremental<T> =
-    | T
-    | {
-          [P in keyof T]?: P extends " $fragmentName" | "__typename"
-              ? T[P]
-              : never;
-      };
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };
+export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-    ID: { input: string; output: string };
-    String: { input: string; output: string };
-    Boolean: { input: boolean; output: boolean };
-    Int: { input: number; output: number };
-    Float: { input: number; output: number };
+  ID: { input: string; output: string; }
+  String: { input: string; output: string; }
+  Boolean: { input: boolean; output: boolean; }
+  Int: { input: number; output: number; }
+  Float: { input: number; output: number; }
 };
 
 export type AgentDescriptionGenderType = {
-    __typename?: "AgentDescriptionGenderType";
-    agent: AgentDescriptionType;
-    /** How certain are you of this value? */
-    certainty: PersonAgentDescriptionGenderCertaintyChoices;
-    /** The gender of this agent. The option Mixed is only applicable for groups. */
-    gender: PersonAgentDescriptionGenderGenderChoices;
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    /** How is this information presented in the text? */
-    sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
+  __typename?: 'AgentDescriptionGenderType';
+  agent: AgentDescriptionType;
+  /** How certain are you of this value? */
+  certainty: PersonAgentDescriptionGenderCertaintyChoices;
+  /** The gender of this agent. The option Mixed is only applicable for groups. */
+  gender: PersonAgentDescriptionGenderGenderChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
 };
 
 export type AgentDescriptionLocationType = {
-    __typename?: "AgentDescriptionLocationType";
-    agent: AgentDescriptionType;
-    /** How certain are you of this value? */
-    certainty: PersonAgentDescriptionLocationCertaintyChoices;
-    id: Scalars["ID"]["output"];
-    /** location by which the agent is identified */
-    location: SpaceDescriptionType;
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    /** How is this information presented in the text? */
-    sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
+  __typename?: 'AgentDescriptionLocationType';
+  agent: AgentDescriptionType;
+  /** How certain are you of this value? */
+  certainty: PersonAgentDescriptionLocationCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** location by which the agent is identified */
+  location: SpaceDescriptionType;
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
 };
 
 export type AgentDescriptionType = {
-    __typename?: "AgentDescriptionType";
-    /** The book in the source */
-    book: Scalars["String"]["output"];
-    /** The chapter or chapters in the source */
-    chapter: Scalars["String"]["output"];
-    contributors: Array<UserType>;
-    describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    /** Relevant (Latin) terminology used to describe this entity in the source text */
-    designators: Array<Scalars["String"]["output"]>;
-    gender?: Maybe<AgentDescriptionGenderType>;
-    id: Scalars["ID"]["output"];
-    /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
-    isGroup: Scalars["Boolean"]["output"];
-    location?: Maybe<AgentDescriptionLocationType>;
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** The page number or page range in the source */
-    page: Scalars["String"]["output"];
-    personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
-    /** Source text containing this description */
-    source: SourceType;
-    /** How is this entity presented in the text? */
-    sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
+  __typename?: 'AgentDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  contributors: Array<UserType>;
+  describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  gender?: Maybe<AgentDescriptionGenderType>;
+  id: Scalars['ID']['output'];
+  /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
+  isGroup: Scalars['Boolean']['output'];
+  location?: Maybe<AgentDescriptionLocationType>;
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
 };
 
 /** An enumeration. */
 export enum Certainty {
-    Certain = "CERTAIN",
-    SomewhatCertain = "SOMEWHAT_CERTAIN",
-    Uncertain = "UNCERTAIN",
+  Certain = 'CERTAIN',
+  SomewhatCertain = 'SOMEWHAT_CERTAIN',
+  Uncertain = 'UNCERTAIN'
 }
 
 export type CreateAgentInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateAgentMutation = {
-    __typename?: "CreateAgentMutation";
-    agent?: Maybe<AgentDescriptionType>;
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'CreateAgentMutation';
+  agent?: Maybe<AgentDescriptionType>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type CreateGiftInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateGiftMutation = {
-    __typename?: "CreateGiftMutation";
-    errors: Array<LettercraftErrorType>;
-    gift?: Maybe<GiftDescriptionType>;
+  __typename?: 'CreateGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  gift?: Maybe<GiftDescriptionType>;
 };
 
 export type CreateLetterInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateLetterMutation = {
-    __typename?: "CreateLetterMutation";
-    errors: Array<LettercraftErrorType>;
-    letter?: Maybe<LetterDescriptionType>;
+  __typename?: 'CreateLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  letter?: Maybe<LetterDescriptionType>;
 };
 
 export type CreatePersonReferenceInput = {
-    description: Scalars["ID"]["input"];
-    person: Scalars["ID"]["input"];
+  description: Scalars['ID']['input'];
+  person: Scalars['ID']['input'];
 };
 
 export type CreatePersonReferenceMutation = {
-    __typename?: "CreatePersonReferenceMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'CreatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteAgentMutation = {
-    __typename?: "DeleteAgentMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteAgentMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteGiftMutation = {
-    __typename?: "DeleteGiftMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteLetterMutation = {
-    __typename?: "DeleteLetterMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeletePersonReferenceMutation = {
-    __typename?: "DeletePersonReferenceMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeletePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type EpisodeCategoryType = {
-    __typename?: "EpisodeCategoryType";
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
+  __typename?: 'EpisodeCategoryType';
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
 };
 
 export type EpisodeType = {
-    __typename?: "EpisodeType";
-    /** agents involved in this episode */
-    agents: Array<AgentDescriptionType>;
-    /** The book in the source */
-    book: Scalars["String"]["output"];
-    categories: Array<EpisodeCategoryType>;
-    /** The chapter or chapters in the source */
-    chapter: Scalars["String"]["output"];
-    contributors: Array<UserType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    /** Relevant (Latin) terminology used to describe this entity in the source text */
-    designators: Array<Scalars["String"]["output"]>;
-    /** gifts involved in this episode */
-    gifts: Array<GiftDescriptionType>;
-    id: Scalars["ID"]["output"];
-    /** letters involved in this episode */
-    letters: Array<LetterDescriptionType>;
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** The page number or page range in the source */
-    page: Scalars["String"]["output"];
-    /** Source text containing this description */
-    source: SourceType;
-    /** How is this entity presented in the text? */
-    sourceMention?: Maybe<EventEpisodeSourceMentionChoices>;
-    /** locations involved in this episode */
-    spaces: Array<SpaceDescriptionType>;
-    /** full description of the events in the passage */
-    summary: Scalars["String"]["output"];
+  __typename?: 'EpisodeType';
+  /** agents involved in this episode */
+  agents: Array<AgentDescriptionType>;
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  categories: Array<EpisodeCategoryType>;
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  contributors: Array<UserType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  /** gifts involved in this episode */
+  gifts: Array<GiftDescriptionType>;
+  id: Scalars['ID']['output'];
+  /** letters involved in this episode */
+  letters: Array<LetterDescriptionType>;
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<EventEpisodeSourceMentionChoices>;
+  /** locations involved in this episode */
+  spaces: Array<SpaceDescriptionType>;
+  /** full description of the events in the passage */
+  summary: Scalars['String']['output'];
 };
 
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum Gender {
-    Female = "FEMALE",
-    Male = "MALE",
-    Mixed = "MIXED",
-    Other = "OTHER",
-    Unknown = "UNKNOWN",
+  Female = 'FEMALE',
+  Male = 'MALE',
+  Mixed = 'MIXED',
+  Other = 'OTHER',
+  Unknown = 'UNKNOWN'
 }
 
-export type GiftCategoryType = {
-    __typename?: "GiftCategoryType";
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
+export type GiftCategorisationInput = {
+  category: Scalars['ID']['input'];
+  certainty?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
-export type GiftDescriptionCategoryInput = {
-    category: Scalars["ID"]["input"];
-    certainty?: InputMaybe<Scalars["String"]["input"]>;
-    id?: InputMaybe<Scalars["ID"]["input"]>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+export type GiftCategoryType = {
+  __typename?: 'GiftCategoryType';
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
 };
 
 export type GiftDescriptionCategoryType = {
-    __typename?: "GiftDescriptionCategoryType";
-    category: GiftCategoryType;
-    /** How certain are you of this value? */
-    certainty: LetterGiftDescriptionCategoryCertaintyChoices;
-    gift: GiftDescriptionType;
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    /** How is this information presented in the text? */
-    sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
+  __typename?: 'GiftDescriptionCategoryType';
+  category: GiftCategoryType;
+  /** How certain are you of this value? */
+  certainty: LetterGiftDescriptionCategoryCertaintyChoices;
+  gift: GiftDescriptionType;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
 };
 
 export type GiftDescriptionType = {
-    __typename?: "GiftDescriptionType";
-    /** The book in the source */
-    book: Scalars["String"]["output"];
-    categories: Array<GiftCategoryType>;
-    categorisations: Array<GiftDescriptionCategoryType>;
-    /** The chapter or chapters in the source */
-    chapter: Scalars["String"]["output"];
-    contributors: Array<UserType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    /** Relevant (Latin) terminology used to describe this entity in the source text */
-    designators: Array<Scalars["String"]["output"]>;
-    id: Scalars["ID"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** The page number or page range in the source */
-    page: Scalars["String"]["output"];
-    /** Source text containing this description */
-    source: SourceType;
-    /** How is this entity presented in the text? */
-    sourceMention?: Maybe<LetterGiftDescriptionSourceMentionChoices>;
+  __typename?: 'GiftDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  categories: Array<GiftCategoryType>;
+  categorisations: Array<GiftDescriptionCategoryType>;
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  contributors: Array<UserType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<LetterGiftDescriptionSourceMentionChoices>;
 };
 
 export type HistoricalPersonType = {
-    __typename?: "HistoricalPersonType";
-    contributors: Array<UserType>;
-    dateOfBirth?: Maybe<PersonDateOfBirthType>;
-    dateOfDeath?: Maybe<PersonDateOfDeathType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-    identifiable: Scalars["Boolean"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
+  __typename?: 'HistoricalPersonType';
+  contributors: Array<UserType>;
+  dateOfBirth?: Maybe<PersonDateOfBirthType>;
+  dateOfDeath?: Maybe<PersonDateOfDeathType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+};
+
+export type LetterCategorisationInput = {
+  category: Scalars['ID']['input'];
+  certainty?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type LetterCategoryType = {
-    __typename?: "LetterCategoryType";
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    label: Scalars["String"]["output"];
-};
-
-export type LetterDescriptionCategoryInput = {
-    category: Scalars["ID"]["input"];
-    certainty?: InputMaybe<Scalars["String"]["input"]>;
-    id?: InputMaybe<Scalars["ID"]["input"]>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+  __typename?: 'LetterCategoryType';
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  label: Scalars['String']['output'];
 };
 
 export type LetterDescriptionCategoryType = {
-    __typename?: "LetterDescriptionCategoryType";
-    category: LetterCategoryType;
-    /** How certain are you of this value? */
-    certainty: LetterLetterDescriptionCategoryCertaintyChoices;
-    id: Scalars["ID"]["output"];
-    letter: LetterDescriptionType;
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    /** How is this information presented in the text? */
-    sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
+  __typename?: 'LetterDescriptionCategoryType';
+  category: LetterCategoryType;
+  /** How certain are you of this value? */
+  certainty: LetterLetterDescriptionCategoryCertaintyChoices;
+  id: Scalars['ID']['output'];
+  letter: LetterDescriptionType;
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
 };
 
 export type LetterDescriptionType = {
-    __typename?: "LetterDescriptionType";
-    /** The book in the source */
-    book: Scalars["String"]["output"];
-    categories: Array<LetterCategoryType>;
-    categorisations: Array<LetterDescriptionCategoryType>;
-    /** The chapter or chapters in the source */
-    chapter: Scalars["String"]["output"];
-    contributors: Array<UserType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    /** Relevant (Latin) terminology used to describe this entity in the source text */
-    designators: Array<Scalars["String"]["output"]>;
-    id: Scalars["ID"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** The page number or page range in the source */
-    page: Scalars["String"]["output"];
-    /** Source text containing this description */
-    source: SourceType;
-    /** How is this entity presented in the text? */
-    sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
+  __typename?: 'LetterDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  categories: Array<LetterCategoryType>;
+  categorisations: Array<LetterDescriptionCategoryType>;
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  contributors: Array<UserType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
 };
 
 /** An enumeration. */
 export enum LetterGiftDescriptionCategoryCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum LetterGiftDescriptionCategorySourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum LetterGiftDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionCategoryCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionCategorySourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** A simple wrapper around Graphene-Django's ErrorType with a constructor. */
 export type LettercraftErrorType = {
-    __typename?: "LettercraftErrorType";
-    field: Scalars["String"]["output"];
-    messages: Array<Scalars["String"]["output"]>;
+  __typename?: 'LettercraftErrorType';
+  field: Scalars['String']['output'];
+  messages: Array<Scalars['String']['output']>;
 };
 
 export type Mutation = {
-    __typename?: "Mutation";
-    createAgent?: Maybe<CreateAgentMutation>;
-    createGift?: Maybe<CreateGiftMutation>;
-    createLetter?: Maybe<CreateLetterMutation>;
-    createPersonReference?: Maybe<CreatePersonReferenceMutation>;
-    deleteAgent?: Maybe<DeleteAgentMutation>;
-    deleteGift?: Maybe<DeleteGiftMutation>;
-    deleteLetter?: Maybe<DeleteLetterMutation>;
-    deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
-    updateAgent?: Maybe<UpdateAgentMutation>;
-    updateEpisode?: Maybe<UpdateEpisodeMutation>;
-    updateGift?: Maybe<UpdateGiftMutation>;
-    updateLetter?: Maybe<UpdateLetterMutation>;
-    updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
-    updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
+  __typename?: 'Mutation';
+  createAgent?: Maybe<CreateAgentMutation>;
+  createGift?: Maybe<CreateGiftMutation>;
+  createLetter?: Maybe<CreateLetterMutation>;
+  createPersonReference?: Maybe<CreatePersonReferenceMutation>;
+  deleteAgent?: Maybe<DeleteAgentMutation>;
+  deleteGift?: Maybe<DeleteGiftMutation>;
+  deleteLetter?: Maybe<DeleteLetterMutation>;
+  deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
+  updateAgent?: Maybe<UpdateAgentMutation>;
+  updateEpisode?: Maybe<UpdateEpisodeMutation>;
+  updateGift?: Maybe<UpdateGiftMutation>;
+  updateLetter?: Maybe<UpdateLetterMutation>;
+  updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
+  updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
 };
 
+
 export type MutationCreateAgentArgs = {
-    agentData: CreateAgentInput;
+  agentData: CreateAgentInput;
 };
 
+
 export type MutationCreateGiftArgs = {
-    giftData: CreateGiftInput;
+  giftData: CreateGiftInput;
 };
 
+
 export type MutationCreateLetterArgs = {
-    letterData: CreateLetterInput;
+  letterData: CreateLetterInput;
 };
 
+
 export type MutationCreatePersonReferenceArgs = {
-    referenceData: CreatePersonReferenceInput;
+  referenceData: CreatePersonReferenceInput;
 };
 
+
 export type MutationDeleteAgentArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationDeleteGiftArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationDeleteLetterArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationDeletePersonReferenceArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationUpdateAgentArgs = {
-    agentData: UpdateAgentInput;
+  agentData: UpdateAgentInput;
 };
 
+
 export type MutationUpdateEpisodeArgs = {
-    input: UpdateEpisodeMutationInput;
+  input: UpdateEpisodeMutationInput;
 };
 
+
 export type MutationUpdateGiftArgs = {
-    giftData: UpdateGiftInput;
+  giftData: UpdateGiftInput;
 };
 
+
 export type MutationUpdateLetterArgs = {
-    letterData: UpdateLetterInput;
+  letterData: UpdateLetterInput;
 };
 
+
 export type MutationUpdateOrCreateSourceArgs = {
-    input: UpdateCreateSourceInput;
+  input: UpdateCreateSourceInput;
 };
 
+
 export type MutationUpdatePersonReferenceArgs = {
-    referenceData: UpdatePersonReferenceInput;
+  referenceData: UpdatePersonReferenceInput;
 };
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderGenderChoices {
-    /** Female */
-    Female = "FEMALE",
-    /** Male */
-    Male = "MALE",
-    /** Mixed */
-    Mixed = "MIXED",
-    /** Other */
-    Other = "OTHER",
-    /** Unknown */
-    Unknown = "UNKNOWN",
+  /** Female */
+  Female = 'FEMALE',
+  /** Male */
+  Male = 'MALE',
+  /** Mixed */
+  Mixed = 'MIXED',
+  /** Other */
+  Other = 'OTHER',
+  /** Unknown */
+  Unknown = 'UNKNOWN'
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionLocationCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionLocationSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 export type PersonDateOfBirthType = {
-    __typename?: "PersonDateOfBirthType";
-    /** How certain are you of this value? */
-    certainty: PersonPersonDateOfBirthCertaintyChoices;
-    displayDate: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    /** date on which this person was born */
-    person: HistoricalPersonType;
-    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-    yearExact?: Maybe<Scalars["Int"]["output"]>;
-    /** The earliest possible year for this value */
-    yearLower: Scalars["Int"]["output"];
-    /** The latest possible year for this value */
-    yearUpper: Scalars["Int"]["output"];
+  __typename?: 'PersonDateOfBirthType';
+  /** How certain are you of this value? */
+  certainty: PersonPersonDateOfBirthCertaintyChoices;
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** date on which this person was born */
+  person: HistoricalPersonType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
 };
 
 export type PersonDateOfDeathType = {
-    __typename?: "PersonDateOfDeathType";
-    /** How certain are you of this value? */
-    certainty: PersonPersonDateOfDeathCertaintyChoices;
-    displayDate: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    /** date on which this person died */
-    person: HistoricalPersonType;
-    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-    yearExact?: Maybe<Scalars["Int"]["output"]>;
-    /** The earliest possible year for this value */
-    yearLower: Scalars["Int"]["output"];
-    /** The latest possible year for this value */
-    yearUpper: Scalars["Int"]["output"];
+  __typename?: 'PersonDateOfDeathType';
+  /** How certain are you of this value? */
+  certainty: PersonPersonDateOfDeathCertaintyChoices;
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** date on which this person died */
+  person: HistoricalPersonType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
 };
 
 /** An enumeration. */
 export enum PersonPersonDateOfBirthCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum PersonPersonDateOfDeathCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum PersonPersonReferenceCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 export type PersonReferenceType = {
-    __typename?: "PersonReferenceType";
-    /** How certain are you of this value? */
-    certainty: PersonPersonReferenceCertaintyChoices;
-    description: AgentDescriptionType;
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    person: HistoricalPersonType;
+  __typename?: 'PersonReferenceType';
+  /** How certain are you of this value? */
+  certainty: PersonPersonReferenceCertaintyChoices;
+  description: AgentDescriptionType;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  person: HistoricalPersonType;
 };
 
 export type Query = {
-    __typename?: "Query";
-    agentDescription?: Maybe<AgentDescriptionType>;
-    agentDescriptions: Array<AgentDescriptionType>;
-    episode?: Maybe<EpisodeType>;
-    episodes: Array<EpisodeType>;
-    giftDescription?: Maybe<GiftDescriptionType>;
-    giftDescriptions: Array<GiftDescriptionType>;
-    letterCategories: Array<LetterCategoryType>;
-    letterDescription?: Maybe<LetterDescriptionType>;
-    letterDescriptions: Array<LetterDescriptionType>;
-    source: SourceType;
-    sources: Array<SourceType>;
-    spaceDescription?: Maybe<SpaceDescriptionType>;
-    spaceDescriptions: Array<SpaceDescriptionType>;
-    userDescription?: Maybe<UserType>;
-    userDescriptions: Array<UserType>;
+  __typename?: 'Query';
+  agentDescription?: Maybe<AgentDescriptionType>;
+  agentDescriptions: Array<AgentDescriptionType>;
+  episode?: Maybe<EpisodeType>;
+  episodes: Array<EpisodeType>;
+  giftDescription?: Maybe<GiftDescriptionType>;
+  giftDescriptions: Array<GiftDescriptionType>;
+  letterCategories: Array<LetterCategoryType>;
+  letterDescription?: Maybe<LetterDescriptionType>;
+  letterDescriptions: Array<LetterDescriptionType>;
+  source: SourceType;
+  sources: Array<SourceType>;
+  spaceDescription?: Maybe<SpaceDescriptionType>;
+  spaceDescriptions: Array<SpaceDescriptionType>;
+  userDescription?: Maybe<UserType>;
+  userDescriptions: Array<UserType>;
 };
 
+
 export type QueryAgentDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QueryAgentDescriptionsArgs = {
-    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryEpisodeArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QueryEpisodesArgs = {
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryGiftDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QueryGiftDescriptionsArgs = {
-    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryLetterDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QueryLetterDescriptionsArgs = {
-    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QuerySourceArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QuerySpaceDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QuerySpaceDescriptionsArgs = {
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryUserDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
 export type RegionFieldType = {
-    __typename?: "RegionFieldType";
-    /** How certain are you of this value? */
-    certainty: SpaceRegionFieldCertaintyChoices;
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    region: RegionType;
-    /** How is this information presented in the text? */
-    sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
-    space: SpaceDescriptionType;
+  __typename?: 'RegionFieldType';
+  /** How certain are you of this value? */
+  certainty: SpaceRegionFieldCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  region: RegionType;
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
+  space: SpaceDescriptionType;
 };
 
 export type RegionType = {
-    __typename?: "RegionType";
-    contributors: Array<UserType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-    identifiable: Scalars["Boolean"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** Kind of region */
-    type: SpaceRegionTypeChoices;
+  __typename?: 'RegionType';
+  contributors: Array<UserType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** Kind of region */
+  type: SpaceRegionTypeChoices;
 };
 
 export type SettlementFieldType = {
-    __typename?: "SettlementFieldType";
-    /** How certain are you of this value? */
-    certainty: SpaceSettlementFieldCertaintyChoices;
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    settlement: SettlementType;
-    /** How is this information presented in the text? */
-    sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
-    space: SpaceDescriptionType;
+  __typename?: 'SettlementFieldType';
+  /** How certain are you of this value? */
+  certainty: SpaceSettlementFieldCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  settlement: SettlementType;
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
+  space: SpaceDescriptionType;
 };
 
 export type SettlementType = {
-    __typename?: "SettlementType";
-    contributors: Array<UserType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-    identifiable: Scalars["Boolean"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** Surrounding regions of this settlement */
-    regions: Array<RegionType>;
+  __typename?: 'SettlementType';
+  contributors: Array<UserType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** Surrounding regions of this settlement */
+  regions: Array<RegionType>;
 };
 
 export type SourceContentsDateType = {
-    __typename?: "SourceContentsDateType";
-    displayDate: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** The source whose events took place at this date */
-    source: SourceType;
-    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-    yearExact?: Maybe<Scalars["Int"]["output"]>;
-    /** The earliest possible year for this value */
-    yearLower: Scalars["Int"]["output"];
-    /** The latest possible year for this value */
-    yearUpper: Scalars["Int"]["output"];
+  __typename?: 'SourceContentsDateType';
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** The source whose events took place at this date */
+  source: SourceType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
 };
 
 /** An enumeration. */
 export enum SourceMention {
-    Direct = "DIRECT",
-    Implied = "IMPLIED",
+  Direct = 'DIRECT',
+  Implied = 'IMPLIED'
 }
 
 export type SourceType = {
-    __typename?: "SourceType";
-    contentsDate?: Maybe<SourceContentsDateType>;
-    /** The name of the author of the edition */
-    editionAuthor: Scalars["String"]["output"];
-    /** The title of the edition used for this source */
-    editionTitle: Scalars["String"]["output"];
-    episodes: Array<EpisodeType>;
-    id: Scalars["ID"]["output"];
-    /** The name of the original author of the work, if known */
-    medievalAuthor: Scalars["String"]["output"];
-    /** The original title of the work, if known */
-    medievalTitle: Scalars["String"]["output"];
-    /** a unique name to identify this source in the database */
-    name: Scalars["String"]["output"];
-    numOfEpisodes: Scalars["Int"]["output"];
-    writtenDate?: Maybe<SourceWrittenDateType>;
+  __typename?: 'SourceType';
+  contentsDate?: Maybe<SourceContentsDateType>;
+  /** The name of the author of the edition */
+  editionAuthor: Scalars['String']['output'];
+  /** The title of the edition used for this source */
+  editionTitle: Scalars['String']['output'];
+  episodes: Array<EpisodeType>;
+  id: Scalars['ID']['output'];
+  /** The name of the original author of the work, if known */
+  medievalAuthor: Scalars['String']['output'];
+  /** The original title of the work, if known */
+  medievalTitle: Scalars['String']['output'];
+  /** a unique name to identify this source in the database */
+  name: Scalars['String']['output'];
+  numOfEpisodes: Scalars['Int']['output'];
+  writtenDate?: Maybe<SourceWrittenDateType>;
 };
 
 export type SourceWrittenDateType = {
-    __typename?: "SourceWrittenDateType";
-    displayDate: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** The source that was written at this date */
-    source: SourceType;
-    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-    yearExact?: Maybe<Scalars["Int"]["output"]>;
-    /** The earliest possible year for this value */
-    yearLower: Scalars["Int"]["output"];
-    /** The latest possible year for this value */
-    yearUpper: Scalars["Int"]["output"];
+  __typename?: 'SourceWrittenDateType';
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** The source that was written at this date */
+  source: SourceType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
 };
 
 export type SpaceDescriptionType = {
-    __typename?: "SpaceDescriptionType";
-    /** The book in the source */
-    book: Scalars["String"]["output"];
-    /** The chapter or chapters in the source */
-    chapter: Scalars["String"]["output"];
-    contributors: Array<UserType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    /** Relevant (Latin) terminology used to describe this entity in the source text */
-    designators: Array<Scalars["String"]["output"]>;
-    id: Scalars["ID"]["output"];
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** The page number or page range in the source */
-    page: Scalars["String"]["output"];
-    regionFields: Array<RegionFieldType>;
-    regions: Array<RegionType>;
-    settlementFields: Array<SettlementFieldType>;
-    settlements: Array<SettlementType>;
-    /** Source text containing this description */
-    source: SourceType;
-    /** How is this entity presented in the text? */
-    sourceMention?: Maybe<SpaceSpaceDescriptionSourceMentionChoices>;
-    structureFields: Array<StructureFieldType>;
-    structures: Array<StructureType>;
+  __typename?: 'SpaceDescriptionType';
+  /** The book in the source */
+  book: Scalars['String']['output'];
+  /** The chapter or chapters in the source */
+  chapter: Scalars['String']['output'];
+  contributors: Array<UserType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  designators: Array<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The page number or page range in the source */
+  page: Scalars['String']['output'];
+  regionFields: Array<RegionFieldType>;
+  regions: Array<RegionType>;
+  settlementFields: Array<SettlementFieldType>;
+  settlements: Array<SettlementType>;
+  /** Source text containing this description */
+  source: SourceType;
+  /** How is this entity presented in the text? */
+  sourceMention?: Maybe<SpaceSpaceDescriptionSourceMentionChoices>;
+  structureFields: Array<StructureFieldType>;
+  structures: Array<StructureType>;
 };
 
 /** An enumeration. */
 export enum SpaceRegionFieldCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum SpaceRegionFieldSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum SpaceRegionTypeChoices {
-    /** ecclesiastical */
-    Ecclesiastical = "ECCLESIASTICAL",
-    /** geographical */
-    Geographical = "GEOGRAPHICAL",
-    /** political */
-    Political = "POLITICAL",
+  /** ecclesiastical */
+  Ecclesiastical = 'ECCLESIASTICAL',
+  /** geographical */
+  Geographical = 'GEOGRAPHICAL',
+  /** political */
+  Political = 'POLITICAL'
 }
 
 /** An enumeration. */
 export enum SpaceSettlementFieldCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum SpaceSettlementFieldSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum SpaceSpaceDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum SpaceStructureFieldCertaintyChoices {
-    /** uncertain */
-    A_0 = "A_0",
-    /** somewhat certain */
-    A_1 = "A_1",
-    /** certain */
-    A_2 = "A_2",
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
 }
 
 /** An enumeration. */
 export enum SpaceStructureFieldSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum SpaceStructureLevelChoices {
-    /** road, square, crossroad */
-    A_1 = "A_1",
-    /** fortification */
-    A_2 = "A_2",
-    /** building, vessel */
-    A_3 = "A_3",
-    /** room */
-    A_4 = "A_4",
-    /** spot, object */
-    A_5 = "A_5",
+  /** road, square, crossroad */
+  A_1 = 'A_1',
+  /** fortification */
+  A_2 = 'A_2',
+  /** building, vessel */
+  A_3 = 'A_3',
+  /** room */
+  A_4 = 'A_4',
+  /** spot, object */
+  A_5 = 'A_5'
 }
 
 export type StructureFieldType = {
-    __typename?: "StructureFieldType";
-    /** How certain are you of this value? */
-    certainty: SpaceStructureFieldCertaintyChoices;
-    id: Scalars["ID"]["output"];
-    /** Additional notes */
-    note: Scalars["String"]["output"];
-    /** How is this information presented in the text? */
-    sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
-    space: SpaceDescriptionType;
-    structure: StructureType;
+  __typename?: 'StructureFieldType';
+  /** How certain are you of this value? */
+  certainty: SpaceStructureFieldCertaintyChoices;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
+  space: SpaceDescriptionType;
+  structure: StructureType;
 };
 
 export type StructureType = {
-    __typename?: "StructureType";
-    contributors: Array<UserType>;
-    /** Longer description to help identify this object */
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-    identifiable: Scalars["Boolean"]["output"];
-    level: SpaceStructureLevelChoices;
-    /** A name to help identify this object */
-    name: Scalars["String"]["output"];
-    /** The settlement containing this structure */
-    settlement?: Maybe<SettlementType>;
+  __typename?: 'StructureType';
+  contributors: Array<UserType>;
+  /** Longer description to help identify this object */
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+  identifiable: Scalars['Boolean']['output'];
+  level: SpaceStructureLevelChoices;
+  /** A name to help identify this object */
+  name: Scalars['String']['output'];
+  /** The settlement containing this structure */
+  settlement?: Maybe<SettlementType>;
 };
 
 export type UpdateAgentGenderInput = {
-    gender?: InputMaybe<Gender>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+  gender?: InputMaybe<Gender>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentInput = {
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>;
-    gender?: InputMaybe<UpdateAgentGenderInput>;
-    id: Scalars["ID"]["input"];
-    isGroup?: InputMaybe<Scalars["Boolean"]["input"]>;
-    location?: InputMaybe<UpdateAgentLocationInput>;
-    name?: InputMaybe<Scalars["String"]["input"]>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  gender?: InputMaybe<UpdateAgentGenderInput>;
+  id: Scalars['ID']['input'];
+  isGroup?: InputMaybe<Scalars['Boolean']['input']>;
+  location?: InputMaybe<UpdateAgentLocationInput>;
+  name?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateAgentLocationInput = {
-    location?: InputMaybe<Scalars["ID"]["input"]>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+  location?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentMutation = {
-    __typename?: "UpdateAgentMutation";
-    agent?: Maybe<AgentDescriptionType>;
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateAgentMutation';
+  agent?: Maybe<AgentDescriptionType>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateCreateSourceInput = {
-    editionAuthor?: InputMaybe<Scalars["String"]["input"]>;
-    editionTitle?: InputMaybe<Scalars["String"]["input"]>;
-    id?: InputMaybe<Scalars["ID"]["input"]>;
-    medievalAuthor?: InputMaybe<Scalars["String"]["input"]>;
-    medievalTitle?: InputMaybe<Scalars["String"]["input"]>;
-    name: Scalars["String"]["input"];
+  editionAuthor?: InputMaybe<Scalars['String']['input']>;
+  editionTitle?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  medievalAuthor?: InputMaybe<Scalars['String']['input']>;
+  medievalTitle?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
 };
 
 export type UpdateEpisodeMutation = {
-    __typename?: "UpdateEpisodeMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateEpisodeMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateEpisodeMutationInput = {
-    book?: InputMaybe<Scalars["String"]["input"]>;
-    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-    chapter?: InputMaybe<Scalars["String"]["input"]>;
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
-    id: Scalars["ID"]["input"];
-    name?: InputMaybe<Scalars["String"]["input"]>;
-    page?: InputMaybe<Scalars["String"]["input"]>;
-    summary?: InputMaybe<Scalars["String"]["input"]>;
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
+  summary?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateGiftInput = {
-    book?: InputMaybe<Scalars["String"]["input"]>;
-    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-    categorisations?: InputMaybe<Array<GiftDescriptionCategoryInput>>;
-    chapter?: InputMaybe<Scalars["String"]["input"]>;
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
-    id: Scalars["ID"]["input"];
-    name?: InputMaybe<Scalars["String"]["input"]>;
-    page?: InputMaybe<Scalars["String"]["input"]>;
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  categorisations?: InputMaybe<Array<GiftCategorisationInput>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateGiftMutation = {
-    __typename?: "UpdateGiftMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateLetterInput = {
-    book?: InputMaybe<Scalars["String"]["input"]>;
-    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-    categorisations?: InputMaybe<Array<LetterDescriptionCategoryInput>>;
-    chapter?: InputMaybe<Scalars["String"]["input"]>;
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
-    id: Scalars["ID"]["input"];
-    name?: InputMaybe<Scalars["String"]["input"]>;
-    page?: InputMaybe<Scalars["String"]["input"]>;
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  categorisations?: InputMaybe<Array<LetterCategorisationInput>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateLetterMutation = {
-    __typename?: "UpdateLetterMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateOrCreateSourceMutation = {
-    __typename?: "UpdateOrCreateSourceMutation";
-    errors?: Maybe<Array<Maybe<Scalars["String"]["output"]>>>;
-    source?: Maybe<SourceType>;
+  __typename?: 'UpdateOrCreateSourceMutation';
+  errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  source?: Maybe<SourceType>;
 };
 
 export type UpdatePersonReferenceInput = {
-    certainty?: InputMaybe<Certainty>;
-    id: Scalars["ID"]["input"];
-    note?: InputMaybe<Scalars["String"]["input"]>;
+  certainty?: InputMaybe<Certainty>;
+  id: Scalars['ID']['input'];
+  note?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdatePersonReferenceMutation = {
-    __typename?: "UpdatePersonReferenceMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UserType = {
-    __typename?: "UserType";
-    firstName: Scalars["String"]["output"];
-    fullName: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    lastName: Scalars["String"]["output"];
+  __typename?: 'UserType';
+  firstName: Scalars['String']['output'];
+  fullName: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  lastName: Scalars['String']['output'];
 };
 
 export type DataEntryAgentDescriptionQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryAgentDescriptionQuery = {
-    __typename?: "Query";
-    agentDescription?: {
-        __typename?: "AgentDescriptionType";
-        id: string;
-        isGroup: boolean;
-        designators: Array<string>;
-        gender?: {
-            __typename?: "AgentDescriptionGenderType";
-            id: string;
-            gender: PersonAgentDescriptionGenderGenderChoices;
-            sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null;
-            note: string;
-        } | null;
-        location?: {
-            __typename?: "AgentDescriptionLocationType";
-            id: string;
-            sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null;
-            note: string;
-            location: { __typename?: "SpaceDescriptionType"; id: string };
-        } | null;
-        source: { __typename?: "SourceType"; id: string };
-    } | null;
-};
+
+export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
 
 export type LocationsInSourceListQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type LocationsInSourceListQuery = {
-    __typename?: "Query";
-    spaceDescriptions: Array<{
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-    }>;
-};
+
+export type LocationsInSourceListQuery = { __typename?: 'Query', spaceDescriptions: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> };
 
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryAgentIdentificationQuery = {
-    __typename?: "Query";
-    agentDescription?: {
-        __typename?: "AgentDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        isGroup: boolean;
-    } | null;
-};
+
+export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
 
 export type DataEntryAgentQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryAgentQuery = {
-    __typename?: "Query";
-    agentDescription?: {
-        __typename?: "AgentDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        isGroup: boolean;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryEpisodeContentsQuery = {
-    __typename?: "Query";
-    episode?: {
-        __typename?: "EpisodeType";
-        id: string;
-        summary: string;
-        categories: Array<{ __typename?: "EpisodeCategoryType"; id: string }>;
-    } | null;
-};
+
+export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
 
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryEpisodeIdentificationQuery = {
-    __typename?: "Query";
-    episode?: { __typename?: "EpisodeType"; id: string; name: string } | null;
-};
+
+export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string } | null };
 
 export type DataEntryEpisodeSourceTextMentionQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryEpisodeSourceTextMentionQuery = {
-    __typename?: "Query";
-    episode?: {
-        __typename?: "EpisodeType";
-        id: string;
-        designators: Array<string>;
-        book: string;
-        chapter: string;
-        page: string;
-    } | null;
-};
+
+export type DataEntryEpisodeSourceTextMentionQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryEpisodeFormQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryEpisodeFormQuery = {
-    __typename?: "Query";
-    episode?: {
-        __typename?: "EpisodeType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeMutationVariables = Exact<{
-    input: UpdateEpisodeMutationInput;
+  input: UpdateEpisodeMutationInput;
 }>;
 
-export type DataEntryUpdateEpisodeMutation = {
-    __typename?: "Mutation";
-    updateEpisode?: {
-        __typename?: "UpdateEpisodeMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateEpisodeMutation = { __typename?: 'Mutation', updateEpisode?: { __typename?: 'UpdateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryGiftCategoriesQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftCategoriesQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        categorisations: Array<{
-            __typename?: "GiftDescriptionCategoryType";
-            id: string;
-            sourceMention?: LetterGiftDescriptionCategorySourceMentionChoices | null;
-            note: string;
-            certainty: LetterGiftDescriptionCategoryCertaintyChoices;
-            category: {
-                __typename?: "GiftCategoryType";
-                id: string;
-                name: string;
-            };
-        }>;
-    } | null;
-};
-
-export type DataEntryAllGiftCategoriesQueryVariables = Exact<{
-    [key: string]: never;
-}>;
 
-export type DataEntryAllGiftCategoriesQuery = {
-    __typename?: "Query";
-    letterCategories: Array<{
-        __typename?: "LetterCategoryType";
-        id: string;
-        label: string;
-        description: string;
-    }>;
-};
+export type DataEntryGiftCategoriesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, categorisations: Array<{ __typename?: 'GiftDescriptionCategoryType', id: string, sourceMention?: LetterGiftDescriptionCategorySourceMentionChoices | null, note: string, certainty: LetterGiftDescriptionCategoryCertaintyChoices, category: { __typename?: 'GiftCategoryType', id: string, name: string } }> } | null };
+
+export type DataEntryAllGiftCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntryAllGiftCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
 
 export type DataEntryGiftIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftIdentificationQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-    } | null;
-};
+
+export type DataEntryGiftIdentificationQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string } | null };
 
 export type DataEntryGiftSourceTextQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftSourceTextQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        designators: Array<string>;
-        book: string;
-        chapter: string;
-        page: string;
-    } | null;
-};
+
+export type DataEntryGiftSourceTextQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryGiftFormQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftFormQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryGiftFormQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateGiftMutationVariables = Exact<{
-    giftData: UpdateGiftInput;
+  giftData: UpdateGiftInput;
 }>;
 
-export type DataEntryUpdateGiftMutation = {
-    __typename?: "Mutation";
-    updateGift?: {
-        __typename?: "UpdateGiftMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateGiftMutation = { __typename?: 'Mutation', updateGift?: { __typename?: 'UpdateGiftMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryLetterCategoriesQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterCategoriesQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        categorisations: Array<{
-            __typename?: "LetterDescriptionCategoryType";
-            id: string;
-            sourceMention?: LetterLetterDescriptionCategorySourceMentionChoices | null;
-            note: string;
-            certainty: LetterLetterDescriptionCategoryCertaintyChoices;
-            category: {
-                __typename?: "LetterCategoryType";
-                id: string;
-                label: string;
-            };
-        }>;
-    } | null;
-};
-
-export type DataEntryAllLetterCategoriesQueryVariables = Exact<{
-    [key: string]: never;
-}>;
 
-export type DataEntryAllLetterCategoriesQuery = {
-    __typename?: "Query";
-    letterCategories: Array<{
-        __typename?: "LetterCategoryType";
-        id: string;
-        label: string;
-        description: string;
-    }>;
-};
+export type DataEntryLetterCategoriesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, categorisations: Array<{ __typename?: 'LetterDescriptionCategoryType', id: string, sourceMention?: LetterLetterDescriptionCategorySourceMentionChoices | null, note: string, certainty: LetterLetterDescriptionCategoryCertaintyChoices, category: { __typename?: 'LetterCategoryType', id: string, label: string } }> } | null };
+
+export type DataEntryAllLetterCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntryAllLetterCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
 
 export type DataEntryLetterIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterIdentificationQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-    } | null;
-};
+
+export type DataEntryLetterIdentificationQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string } | null };
 
 export type DataEntryLetterSourceTextQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterSourceTextQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        designators: Array<string>;
-        book: string;
-        chapter: string;
-        page: string;
-    } | null;
-};
+
+export type DataEntryLetterSourceTextQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryLetterFormQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterFormQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryLetterFormQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateLetterMutationVariables = Exact<{
-    letterData: UpdateLetterInput;
+  letterData: UpdateLetterInput;
 }>;
 
-export type DataEntryUpdateLetterMutation = {
-    __typename?: "Mutation";
-    updateLetter?: {
-        __typename?: "UpdateLetterMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateLetterMutation = { __typename?: 'Mutation', updateLetter?: { __typename?: 'UpdateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntrySpaceDescriptionQuery = {
-    __typename?: "Query";
-    spaceDescription?: {
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntrySourceDetailQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntrySourceDetailQuery = {
-    __typename?: "Query";
-    source: {
-        __typename?: "SourceType";
-        id: string;
-        name: string;
-        editionAuthor: string;
-        editionTitle: string;
-        medievalAuthor: string;
-        medievalTitle: string;
-        numOfEpisodes: number;
-        episodes: Array<{
-            __typename?: "EpisodeType";
-            id: string;
-            name: string;
-            description: string;
-            summary: string;
-            book: string;
-            chapter: string;
-            page: string;
-            contributors: Array<{
-                __typename?: "UserType";
-                id: string;
-                fullName: string;
-            }>;
-            agents: Array<{
-                __typename?: "AgentDescriptionType";
-                id: string;
-                name: string;
-                isGroup: boolean;
-                describes?: Array<{
-                    __typename?: "HistoricalPersonType";
-                    id: string;
-                    identifiable: boolean;
-                } | null> | null;
-            }>;
-            gifts: Array<{
-                __typename?: "GiftDescriptionType";
-                id: string;
-                name: string;
-            }>;
-            letters: Array<{
-                __typename?: "LetterDescriptionType";
-                id: string;
-                name: string;
-            }>;
-            spaces: Array<{
-                __typename?: "SpaceDescriptionType";
-                id: string;
-                name: string;
-            }>;
-        }>;
-    };
-};
-
-export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never }>;
-
-export type DataEntrySourceListQuery = {
-    __typename?: "Query";
-    sources: Array<{
-        __typename?: "SourceType";
-        id: string;
-        name: string;
-        editionAuthor: string;
-        editionTitle: string;
-        medievalAuthor: string;
-        medievalTitle: string;
-        numOfEpisodes: number;
-    }>;
-};
-
-export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
-
-export type SourceTitleQueryQuery = {
-    __typename?: "Query";
-    source: { __typename?: "SourceType"; id: string; name: string };
-};
-
-export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
-
-export type AgentTitleQueryQuery = {
-    __typename?: "Query";
-    agentDescription?: {
-        __typename?: "AgentDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
-
-export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
-
-export type LetterTitleQueryQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
-
-export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
-
-export type GiftTitleQueryQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
-
-export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
-
-export type SpaceTitleQueryQuery = {
-    __typename?: "Query";
-    spaceDescription?: {
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
+
+export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
+
+export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SourceTitleQueryQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string } };
+
+export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type AgentTitleQueryQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type LetterTitleQueryQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type GiftTitleQueryQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SpaceTitleQueryQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export const DataEntryAgentDescriptionDocument = gql`
     query DataEntryAgentDescription($id: ID!) {
-        agentDescription(id: $id) {
-            id
-            isGroup
-            designators
-            gender {
-                id
-                gender
-                sourceMention
-                note
-            }
-            location {
-                id
-                sourceMention
-                note
-                location {
-                    id
-                }
-            }
-            source {
-                id
-            }
-        }
+  agentDescription(id: $id) {
+    id
+    isGroup
+    designators
+    gender {
+      id
+      gender
+      sourceMention
+      note
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAgentDescriptionGQL extends Apollo.Query<
-    DataEntryAgentDescriptionQuery,
-    DataEntryAgentDescriptionQueryVariables
-> {
-    override document = DataEntryAgentDescriptionDocument;
+    location {
+      id
+      sourceMention
+      note
+      location {
+        id
+      }
+    }
+    source {
+      id
+    }
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
+    override document = DataEntryAgentDescriptionDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const LocationsInSourceListDocument = gql`
     query LocationsInSourceList($id: ID!) {
-        spaceDescriptions(sourceId: $id) {
-            id
-            name
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class LocationsInSourceListGQL extends Apollo.Query<
-    LocationsInSourceListQuery,
-    LocationsInSourceListQueryVariables
-> {
-    override document = LocationsInSourceListDocument;
+  spaceDescriptions(sourceId: $id) {
+    id
+    name
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
+    override document = LocationsInSourceListDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryAgentIdentificationDocument = gql`
     query DataEntryAgentIdentification($id: ID!) {
-        agentDescription(id: $id) {
-            id
-            name
-            description
-            isGroup
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAgentIdentificationGQL extends Apollo.Query<
-    DataEntryAgentIdentificationQuery,
-    DataEntryAgentIdentificationQueryVariables
-> {
-    override document = DataEntryAgentIdentificationDocument;
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    isGroup
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
+    override document = DataEntryAgentIdentificationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryAgentDocument = gql`
     query DataEntryAgent($id: ID!) {
-        agentDescription(id: $id) {
-            id
-            name
-            description
-            isGroup
-            source {
-                id
-                name
-            }
-        }
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    isGroup
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAgentGQL extends Apollo.Query<
-    DataEntryAgentQuery,
-    DataEntryAgentQueryVariables
-> {
-    override document = DataEntryAgentDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
+    override document = DataEntryAgentDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeContentsDocument = gql`
     query DataEntryEpisodeContents($id: ID!) {
-        episode(id: $id) {
-            id
-            summary
-            categories {
-                id
-            }
-        }
+  episode(id: $id) {
+    id
+    summary
+    categories {
+      id
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeContentsGQL extends Apollo.Query<
-    DataEntryEpisodeContentsQuery,
-    DataEntryEpisodeContentsQueryVariables
-> {
-    override document = DataEntryEpisodeContentsDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
+    override document = DataEntryEpisodeContentsDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeIdentificationDocument = gql`
     query DataEntryEpisodeIdentification($id: ID!) {
-        episode(id: $id) {
-            id
-            name
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<
-    DataEntryEpisodeIdentificationQuery,
-    DataEntryEpisodeIdentificationQueryVariables
-> {
-    override document = DataEntryEpisodeIdentificationDocument;
+  episode(id: $id) {
+    id
+    name
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
+    override document = DataEntryEpisodeIdentificationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeSourceTextMentionDocument = gql`
     query DataEntryEpisodeSourceTextMention($id: ID!) {
-        episode(id: $id) {
-            id
-            designators
-            book
-            chapter
-            page
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<
-    DataEntryEpisodeSourceTextMentionQuery,
-    DataEntryEpisodeSourceTextMentionQueryVariables
-> {
-    override document = DataEntryEpisodeSourceTextMentionDocument;
+  episode(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
+    override document = DataEntryEpisodeSourceTextMentionDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeFormDocument = gql`
     query DataEntryEpisodeForm($id: ID!) {
-        episode(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  episode(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeFormGQL extends Apollo.Query<
-    DataEntryEpisodeFormQuery,
-    DataEntryEpisodeFormQueryVariables
-> {
-    override document = DataEntryEpisodeFormDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
+    override document = DataEntryEpisodeFormDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateEpisodeDocument = gql`
     mutation DataEntryUpdateEpisode($input: UpdateEpisodeMutationInput!) {
-        updateEpisode(input: $input) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateEpisode(input: $input) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<
-    DataEntryUpdateEpisodeMutation,
-    DataEntryUpdateEpisodeMutationVariables
-> {
-    override document = DataEntryUpdateEpisodeDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
+    override document = DataEntryUpdateEpisodeDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftCategoriesDocument = gql`
     query DataEntryGiftCategories($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            categorisations {
-                id
-                sourceMention
-                note
-                certainty
-                category {
-                    id
-                    name
-                }
-            }
-        }
+  giftDescription(id: $id) {
+    id
+    categorisations {
+      id
+      sourceMention
+      note
+      certainty
+      category {
+        id
+        name
+      }
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftCategoriesGQL extends Apollo.Query<
-    DataEntryGiftCategoriesQuery,
-    DataEntryGiftCategoriesQueryVariables
-> {
-    override document = DataEntryGiftCategoriesDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftCategoriesGQL extends Apollo.Query<DataEntryGiftCategoriesQuery, DataEntryGiftCategoriesQueryVariables> {
+    override document = DataEntryGiftCategoriesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryAllGiftCategoriesDocument = gql`
     query DataEntryAllGiftCategories {
-        letterCategories {
-            id
-            label
-            description
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<
-    DataEntryAllGiftCategoriesQuery,
-    DataEntryAllGiftCategoriesQueryVariables
-> {
-    override document = DataEntryAllGiftCategoriesDocument;
+  letterCategories {
+    id
+    label
+    description
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
+    override document = DataEntryAllGiftCategoriesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftIdentificationDocument = gql`
     query DataEntryGiftIdentification($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            name
-            description
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftIdentificationGQL extends Apollo.Query<
-    DataEntryGiftIdentificationQuery,
-    DataEntryGiftIdentificationQueryVariables
-> {
-    override document = DataEntryGiftIdentificationDocument;
+  giftDescription(id: $id) {
+    id
+    name
+    description
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftIdentificationGQL extends Apollo.Query<DataEntryGiftIdentificationQuery, DataEntryGiftIdentificationQueryVariables> {
+    override document = DataEntryGiftIdentificationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftSourceTextDocument = gql`
     query DataEntryGiftSourceText($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            designators
-            book
-            chapter
-            page
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftSourceTextGQL extends Apollo.Query<
-    DataEntryGiftSourceTextQuery,
-    DataEntryGiftSourceTextQueryVariables
-> {
-    override document = DataEntryGiftSourceTextDocument;
+  giftDescription(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftSourceTextGQL extends Apollo.Query<DataEntryGiftSourceTextQuery, DataEntryGiftSourceTextQueryVariables> {
+    override document = DataEntryGiftSourceTextDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftFormDocument = gql`
     query DataEntryGiftForm($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  giftDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftFormGQL extends Apollo.Query<
-    DataEntryGiftFormQuery,
-    DataEntryGiftFormQueryVariables
-> {
-    override document = DataEntryGiftFormDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftFormGQL extends Apollo.Query<DataEntryGiftFormQuery, DataEntryGiftFormQueryVariables> {
+    override document = DataEntryGiftFormDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateGiftDocument = gql`
     mutation DataEntryUpdateGift($giftData: UpdateGiftInput!) {
-        updateGift(giftData: $giftData) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateGift(giftData: $giftData) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateGiftGQL extends Apollo.Mutation<
-    DataEntryUpdateGiftMutation,
-    DataEntryUpdateGiftMutationVariables
-> {
-    override document = DataEntryUpdateGiftDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
+    override document = DataEntryUpdateGiftDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterCategoriesDocument = gql`
     query DataEntryLetterCategories($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            categorisations {
-                id
-                sourceMention
-                note
-                certainty
-                category {
-                    id
-                    label
-                }
-            }
-        }
+  letterDescription(id: $id) {
+    id
+    categorisations {
+      id
+      sourceMention
+      note
+      certainty
+      category {
+        id
+        label
+      }
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterCategoriesGQL extends Apollo.Query<
-    DataEntryLetterCategoriesQuery,
-    DataEntryLetterCategoriesQueryVariables
-> {
-    override document = DataEntryLetterCategoriesDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterCategoriesGQL extends Apollo.Query<DataEntryLetterCategoriesQuery, DataEntryLetterCategoriesQueryVariables> {
+    override document = DataEntryLetterCategoriesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryAllLetterCategoriesDocument = gql`
     query DataEntryAllLetterCategories {
-        letterCategories {
-            id
-            label
-            description
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<
-    DataEntryAllLetterCategoriesQuery,
-    DataEntryAllLetterCategoriesQueryVariables
-> {
-    override document = DataEntryAllLetterCategoriesDocument;
+  letterCategories {
+    id
+    label
+    description
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
+    override document = DataEntryAllLetterCategoriesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterIdentificationDocument = gql`
     query DataEntryLetterIdentification($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            name
-            description
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterIdentificationGQL extends Apollo.Query<
-    DataEntryLetterIdentificationQuery,
-    DataEntryLetterIdentificationQueryVariables
-> {
-    override document = DataEntryLetterIdentificationDocument;
+  letterDescription(id: $id) {
+    id
+    name
+    description
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterIdentificationGQL extends Apollo.Query<DataEntryLetterIdentificationQuery, DataEntryLetterIdentificationQueryVariables> {
+    override document = DataEntryLetterIdentificationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterSourceTextDocument = gql`
     query DataEntryLetterSourceText($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            designators
-            book
-            chapter
-            page
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterSourceTextGQL extends Apollo.Query<
-    DataEntryLetterSourceTextQuery,
-    DataEntryLetterSourceTextQueryVariables
-> {
-    override document = DataEntryLetterSourceTextDocument;
+  letterDescription(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterSourceTextGQL extends Apollo.Query<DataEntryLetterSourceTextQuery, DataEntryLetterSourceTextQueryVariables> {
+    override document = DataEntryLetterSourceTextDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterFormDocument = gql`
     query DataEntryLetterForm($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  letterDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterFormGQL extends Apollo.Query<
-    DataEntryLetterFormQuery,
-    DataEntryLetterFormQueryVariables
-> {
-    override document = DataEntryLetterFormDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterFormGQL extends Apollo.Query<DataEntryLetterFormQuery, DataEntryLetterFormQueryVariables> {
+    override document = DataEntryLetterFormDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateLetterDocument = gql`
     mutation DataEntryUpdateLetter($letterData: UpdateLetterInput!) {
-        updateLetter(letterData: $letterData) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateLetter(letterData: $letterData) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateLetterGQL extends Apollo.Mutation<
-    DataEntryUpdateLetterMutation,
-    DataEntryUpdateLetterMutationVariables
-> {
-    override document = DataEntryUpdateLetterDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
+    override document = DataEntryUpdateLetterDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntrySpaceDescriptionDocument = gql`
     query DataEntrySpaceDescription($id: ID!) {
-        spaceDescription(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntrySpaceDescriptionGQL extends Apollo.Query<
-    DataEntrySpaceDescriptionQuery,
-    DataEntrySpaceDescriptionQueryVariables
-> {
-    override document = DataEntrySpaceDescriptionDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
+    override document = DataEntrySpaceDescriptionDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntrySourceDetailDocument = gql`
     query DataEntrySourceDetail($id: ID!) {
-        source(id: $id) {
-            id
-            name
-            editionAuthor
-            editionTitle
-            medievalAuthor
-            medievalTitle
-            numOfEpisodes
-            episodes {
-                id
-                name
-                description
-                summary
-                book
-                chapter
-                contributors {
-                    id
-                    fullName
-                }
-                page
-                agents {
-                    id
-                    name
-                    isGroup
-                    describes {
-                        id
-                        identifiable
-                    }
-                }
-                gifts {
-                    id
-                    name
-                }
-                letters {
-                    id
-                    name
-                }
-                spaces {
-                    id
-                    name
-                }
-            }
+  source(id: $id) {
+    id
+    name
+    editionAuthor
+    editionTitle
+    medievalAuthor
+    medievalTitle
+    numOfEpisodes
+    episodes {
+      id
+      name
+      description
+      summary
+      book
+      chapter
+      contributors {
+        id
+        fullName
+      }
+      page
+      agents {
+        id
+        name
+        isGroup
+        describes {
+          id
+          identifiable
         }
+      }
+      gifts {
+        id
+        name
+      }
+      letters {
+        id
+        name
+      }
+      spaces {
+        id
+        name
+      }
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntrySourceDetailGQL extends Apollo.Query<
-    DataEntrySourceDetailQuery,
-    DataEntrySourceDetailQueryVariables
-> {
-    override document = DataEntrySourceDetailDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
+    override document = DataEntrySourceDetailDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntrySourceListDocument = gql`
     query DataEntrySourceList {
-        sources {
-            id
-            name
-            editionAuthor
-            editionTitle
-            medievalAuthor
-            medievalTitle
-            numOfEpisodes
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntrySourceListGQL extends Apollo.Query<
-    DataEntrySourceListQuery,
-    DataEntrySourceListQueryVariables
-> {
-    override document = DataEntrySourceListDocument;
+  sources {
+    id
+    name
+    editionAuthor
+    editionTitle
+    medievalAuthor
+    medievalTitle
+    numOfEpisodes
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
+    override document = DataEntrySourceListDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const SourceTitleQueryDocument = gql`
     query SourceTitleQuery {
-        source(id: "") {
-            id
-            name
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class SourceTitleQueryGQL extends Apollo.Query<
-    SourceTitleQueryQuery,
-    SourceTitleQueryQueryVariables
-> {
-    override document = SourceTitleQueryDocument;
+  source(id: "") {
+    id
+    name
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
+    override document = SourceTitleQueryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const AgentTitleQueryDocument = gql`
     query AgentTitleQuery {
-        agentDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  agentDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class AgentTitleQueryGQL extends Apollo.Query<
-    AgentTitleQueryQuery,
-    AgentTitleQueryQueryVariables
-> {
-    override document = AgentTitleQueryDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
+    override document = AgentTitleQueryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const LetterTitleQueryDocument = gql`
     query LetterTitleQuery {
-        letterDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  letterDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class LetterTitleQueryGQL extends Apollo.Query<
-    LetterTitleQueryQuery,
-    LetterTitleQueryQueryVariables
-> {
-    override document = LetterTitleQueryDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
+    override document = LetterTitleQueryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const GiftTitleQueryDocument = gql`
     query GiftTitleQuery {
-        giftDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  giftDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class GiftTitleQueryGQL extends Apollo.Query<
-    GiftTitleQueryQuery,
-    GiftTitleQueryQueryVariables
-> {
-    override document = GiftTitleQueryDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
+    override document = GiftTitleQueryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const SpaceTitleQueryDocument = gql`
     query SpaceTitleQuery {
-        spaceDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  spaceDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class SpaceTitleQueryGQL extends Apollo.Query<
-    SpaceTitleQueryQuery,
-    SpaceTitleQueryQueryVariables
-> {
-    override document = SpaceTitleQueryDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
+    override document = SpaceTitleQueryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
\ No newline at end of file
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 3ef68673..c77d9b0f 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -212,6 +212,14 @@ enum Gender {
   UNKNOWN
 }
 
+input GiftCategorisationInput {
+  category: ID!
+  certainty: String
+  id: ID
+  note: String
+  sourceMention: SourceMention
+}
+
 type GiftCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -221,14 +229,6 @@ type GiftCategoryType {
   name: String!
 }
 
-input GiftDescriptionCategoryInput {
-  category: ID!
-  certainty: String
-  id: ID
-  note: String
-  sourceMention: SourceMention
-}
-
 type GiftDescriptionCategoryType {
   category: GiftCategoryType!
 
@@ -294,13 +294,7 @@ type HistoricalPersonType {
   name: String!
 }
 
-type LetterCategoryType {
-  description: String!
-  id: ID!
-  label: String!
-}
-
-input LetterDescriptionCategoryInput {
+input LetterCategorisationInput {
   category: ID!
   certainty: String
   id: ID
@@ -308,6 +302,12 @@ input LetterDescriptionCategoryInput {
   sourceMention: SourceMention
 }
 
+type LetterCategoryType {
+  description: String!
+  id: ID!
+  label: String!
+}
+
 type LetterDescriptionCategoryType {
   category: LetterCategoryType!
 
@@ -984,7 +984,7 @@ input UpdateEpisodeMutationInput {
 input UpdateGiftInput {
   book: String
   categories: [ID!]
-  categorisations: [GiftDescriptionCategoryInput!]
+  categorisations: [GiftCategorisationInput!]
   chapter: String
   description: String
   designators: [String!]
@@ -1001,7 +1001,7 @@ type UpdateGiftMutation {
 input UpdateLetterInput {
   book: String
   categories: [ID!]
-  categorisations: [LetterDescriptionCategoryInput!]
+  categorisations: [LetterCategorisationInput!]
   chapter: String
   description: String
   designators: [String!]
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
index 4a6378ee..e59eb802 100644
--- a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { GiftCategoriesFormComponent } from "./gift-categories-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("GiftCategoriesFormComponent", () => {
     let component: GiftCategoriesFormComponent;
@@ -9,6 +10,7 @@ describe("GiftCategoriesFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [GiftCategoriesFormComponent],
+            imports: [SharedTestingModule]
         });
         fixture = TestBed.createComponent(GiftCategoriesFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
index 1f8f8d1b..37b564f5 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { GiftFormComponent } from './gift-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { GiftFormModule } from './gift-form.module';
 
 describe('GiftFormComponent', () => {
     let component: GiftFormComponent;
@@ -10,7 +11,7 @@ describe('GiftFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [GiftFormComponent],
-            imports: [SharedTestingModule],
+            imports: [GiftFormModule, SharedTestingModule],
         });
         fixture = TestBed.createComponent(GiftFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
index 684f25e8..e1bc216c 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { GiftIdentificationFormComponent } from "./gift-identification-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("GiftIdentificationFormComponent", () => {
     let component: GiftIdentificationFormComponent;
@@ -9,6 +10,7 @@ describe("GiftIdentificationFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [GiftIdentificationFormComponent],
+            imports: [SharedTestingModule]
         });
         fixture = TestBed.createComponent(GiftIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
index 8f77afa3..357f0177 100644
--- a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { GiftSourceTextFormComponent } from "./gift-source-text-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("GiftSourceTextFormComponent", () => {
     let component: GiftSourceTextFormComponent;
@@ -9,6 +10,7 @@ describe("GiftSourceTextFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [GiftSourceTextFormComponent],
+            imports: [SharedTestingModule]
         });
         fixture = TestBed.createComponent(GiftSourceTextFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
index 13be65d7..103285a1 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LetterCategoriesFormComponent } from "./letter-categories-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("LetterCategoriesFormComponent", () => {
     let component: LetterCategoriesFormComponent;
@@ -9,6 +10,7 @@ describe("LetterCategoriesFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LetterCategoriesFormComponent],
+            imports: [SharedTestingModule]
         });
         fixture = TestBed.createComponent(LetterCategoriesFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
index 5e1a8467..fd346a13 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LetterFormComponent } from './letter-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { LetterFormModule } from './letter-form.module';
 
 describe('LetterFormComponent', () => {
     let component: LetterFormComponent;
@@ -10,7 +11,7 @@ describe('LetterFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LetterFormComponent],
-            imports: [SharedTestingModule],
+            imports: [LetterFormModule, SharedTestingModule],
         });
         fixture = TestBed.createComponent(LetterFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
index 3c6c9ccc..88253157 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LetterIdentificationFormComponent } from "./letter-identification-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("LetterIdentificationFormComponent", () => {
     let component: LetterIdentificationFormComponent;
@@ -9,6 +10,7 @@ describe("LetterIdentificationFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LetterIdentificationFormComponent],
+            imports: [SharedTestingModule]
         });
         fixture = TestBed.createComponent(LetterIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
index 77f232cc..4a740170 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LetterSourceTextFormComponent } from "./letter-source-text-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("LetterSourceTextFormComponent", () => {
     let component: LetterSourceTextFormComponent;
@@ -9,6 +10,7 @@ describe("LetterSourceTextFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LetterSourceTextFormComponent],
+            imports: [SharedTestingModule]
         });
         fixture = TestBed.createComponent(LetterSourceTextFormComponent);
         component = fixture.componentInstance;

From 509b92cd18bac49f0c2c1260bb840ca2305cc3f0 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:15:09 +0200
Subject: [PATCH 368/565] Add user to contributors on episode creation

---
 backend/event/mutations/CreateEpisodeMutation.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
index b4aad202..22b029c6 100644
--- a/backend/event/mutations/CreateEpisodeMutation.py
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -42,4 +42,7 @@ def mutate(cls, root: None, info: ResolveInfo, episode_data: CreateEpisodeInput)
             source=source,
         )
 
+        user = info.context.user
+        episode.contributors.add(user)
+
         return cls(episode=episode, errors=[])  # type: ignore

From ca03ec86d2a64310dca4d3c12a90e148ff5c1232 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:15:28 +0200
Subject: [PATCH 369/565] Remove buggy episode sorting

---
 backend/source/types/SourceType.py | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 00348317..234699d8 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -33,32 +33,9 @@ def get_queryset(
 
     @staticmethod
     def resolve_episodes(parent: Source, info: ResolveInfo) -> QuerySet[Episode]:
-        # Sort by book, chapter, page.
-        # If any of these fields are null are an empty string, sort them to the end.
-
-        SORT_LAST = Value("ZZZZZZ")
-
         return (
             EpisodeType.get_queryset(Episode.objects, info)
             .filter(source_id=parent.pk)
-            .annotate(
-                book_order=Case(
-                    When(book__isnull=True, then=SORT_LAST),
-                    When(book="", then=SORT_LAST),
-                    default=F("book"),
-                ),
-                chapter_order=Case(
-                    When(chapter__isnull=True, then=SORT_LAST),
-                    When(chapter="", then=SORT_LAST),
-                    default=F("chapter"),
-                ),
-                page_order=Case(
-                    When(page__isnull=True, then=SORT_LAST),
-                    When(page="", then=SORT_LAST),
-                    default=F("page"),
-                ),
-            )
-            .order_by("book_order", "chapter_order", "page_order")
         )
 
     @staticmethod

From 51f908e7716068c4ac5c6d144fb5ffea8acd570e Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:16:31 +0200
Subject: [PATCH 370/565] Correct comment

---
 frontend/src/app/app-routing.module.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index ba91a4bd..40d93dfb 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -6,7 +6,7 @@ import { routes } from './routes';
 @NgModule({
     imports: [RouterModule.forRoot(routes, {
         // Restores previous scroll position on backward navigation.
-        // Scrolls to top on forward navigation (or anchor if provided).
+        // Scrolls to top on forward navigation.
         scrollPositionRestoration: 'enabled'
     })],
     exports: [RouterModule]

From 533924ea874a2afd929d87162d887d921cd3a32d Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:16:57 +0200
Subject: [PATCH 371/565] Outfactor mutation logic

---
 .../episode-identification-form.component.ts  | 59 +++++++++++++------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index b76fd35d..3511800f 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -2,10 +2,13 @@ import { Component, DestroyRef, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
+import { ApolloCache } from "@apollo/client/core";
 import { ToastService } from "@services/toast.service";
+import { MutationResult } from "apollo-angular";
 import {
     DataEntryEpisodeIdentificationGQL,
     DataEntryUpdateEpisodeGQL,
+    DataEntryUpdateEpisodeMutation,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -17,6 +20,15 @@ import {
     withLatestFrom,
 } from "rxjs";
 
+interface EpisodeIdentification {
+    name: string;
+    description: string;
+}
+
+type EpisodeIdentificationForm = {
+    [key in keyof EpisodeIdentification]: FormControl<string>;
+};
+
 @Component({
     selector: "lc-episode-identification-form",
     templateUrl: "./episode-identification-form.component.html",
@@ -33,7 +45,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         shareReplay(1)
     );
 
-    public form = new FormGroup({
+    public form = new FormGroup<EpisodeIdentificationForm>({
         name: new FormControl<string>("", {
             nonNullable: true,
             validators: [Validators.required],
@@ -73,24 +85,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                         debounceTime(300),
                         withLatestFrom(this.id$),
                         switchMap(([episode, id]) =>
-                            this.updateEpisode.mutate(
-                                {
-                                    episodeData: {
-                                        ...episode,
-                                        id,
-                                    },
-                                },
-                                {
-                                    update: (cache) => {
-                                        const identified = cache.identify({
-                                            __typename: "EpisodeType",
-                                            id,
-                                        });
-                                        cache.evict({ id: identified });
-                                        cache.gc();
-                                    },
-                                }
-                            )
+                            this.performMutation(episode, id)
                         ),
                         takeUntilDestroyed(this.destroyRef)
                     )
@@ -107,4 +102,30 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 }
             });
     }
+
+    private performMutation(
+        episode: EpisodeIdentification,
+        id: string
+    ): Observable<MutationResult<DataEntryUpdateEpisodeMutation>> {
+        return this.updateEpisode.mutate(
+            {
+                episodeData: {
+                    ...episode,
+                    id,
+                },
+            },
+            {
+                update: cache => this.updateCache(cache, id),
+            }
+        );
+    }
+
+    private updateCache(cache: ApolloCache<unknown>, id: string): void {
+        const identified = cache.identify({
+            __typename: "EpisodeType",
+            id,
+        });
+        cache.evict({ id: identified });
+        cache.gc();
+    }
 }

From 557ed998c561a753a007a2fb17e28f77ef319626 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:17:42 +0200
Subject: [PATCH 372/565] Handle modal dismissal event

---
 .../source/episode-preview/episode-preview.component.ts   | 8 ++++----
 frontend/src/app/services/modal.service.ts                | 4 ++--
 .../confirmation-modal/confirmation-modal.component.html  | 2 +-
 .../confirmation-modal/confirmation-modal.component.ts    | 6 +-----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
index 54f8c5f3..3ced9df0 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
@@ -35,10 +35,10 @@ export class EpisodePreviewComponent {
                 title: "Delete episode",
                 message: `Are you sure you want to delete this episode? (${this.episode.name})`,
             })
-            .then((result) => {
-                if (result) {
-                    this.performDelete(episodeId);
-                }
+            .then(() => {
+                this.performDelete(episodeId);
+            }).catch(() => {
+                // Do nothing on cancel / dismissal.
             });
     }
 
diff --git a/frontend/src/app/services/modal.service.ts b/frontend/src/app/services/modal.service.ts
index 15c7f56b..7f9c313e 100644
--- a/frontend/src/app/services/modal.service.ts
+++ b/frontend/src/app/services/modal.service.ts
@@ -13,11 +13,11 @@ interface ConfirmationModalConfig {
 export class ModalService {
     constructor(private modal: NgbModal) {}
 
-    public openConfirmationModal(config: ConfirmationModalConfig): Promise<boolean> {
+    public openConfirmationModal(config: ConfirmationModalConfig): Promise<void> {
         const modal = this.modal.open(ConfirmationModalComponent);
         const { title, message } = config;
         modal.componentInstance.title = title;
         modal.componentInstance.message = message;
-        return modal.result as Promise<boolean>;
+        return modal.result;
     }
 }
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html
index fd472874..ce2af7b4 100644
--- a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -1,4 +1,4 @@
-<lc-base-modal>
+<lc-base-modal (dismiss)="cancel()">
     <ng-container modal-header>
         <h4 ngbAutoFocus>{{ title }}</h4>
     </ng-container>
diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
index 379f2ad1..1ef2fe27 100644
--- a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -13,14 +13,10 @@ export class ConfirmationModalComponent {
     constructor(private activeModal: NgbActiveModal) {}
 
     public confirm(): void {
-        this.activeModal.close(true);
+        this.activeModal.close();
     }
 
     public cancel(): void {
-        this.activeModal.close(false);
-    }
-
-    public dismiss(): void {
         this.activeModal.dismiss();
     }
 }

From d2084bca66871ea770afd7e440bec8da9dd7c83f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:18:03 +0200
Subject: [PATCH 373/565] Required confirmation modal title

---
 .../shared/confirmation-modal/confirmation-modal.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
index 1ef2fe27..f4ffe227 100644
--- a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -7,7 +7,7 @@ import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
     styleUrls: ["./confirmation-modal.component.scss"],
 })
 export class ConfirmationModalComponent {
-    @Input() public title = "Lettercraft";
+    @Input({ required: true }) public title = "";
     @Input() public message = "Are you sure you want to continue?";
 
     constructor(private activeModal: NgbActiveModal) {}

From a41147e938245160877ade85019a54745eead507 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:18:16 +0200
Subject: [PATCH 374/565] Add .prettierrc

---
 frontend/.prettierrc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 frontend/.prettierrc

diff --git a/frontend/.prettierrc b/frontend/.prettierrc
new file mode 100644
index 00000000..e69de29b

From f9dc3339e13fb9df425fac2776f25eca4a044f54 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 17 Sep 2024 12:22:21 +0200
Subject: [PATCH 375/565] Fix failing tests

---
 .../confirmation-modal.component.spec.ts          | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
index 7b31b01a..415120cf 100644
--- a/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
+++ b/frontend/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -25,26 +25,19 @@ describe("ConfirmationModalComponent", () => {
         expect(component).toBeTruthy();
     });
 
-    it("should have default title and message", () => {
-        expect(component.title).toBe("Lettercraft");
+    it("should have a default message", () => {
         expect(component.message).toBe("Are you sure you want to continue?");
     });
 
     it("should close the modal with true when confirm is called", () => {
         spyOn(activeModal, "close");
         component.confirm();
-        expect(activeModal.close).toHaveBeenCalledWith(true);
+        expect(activeModal.close).toHaveBeenCalled();
     });
 
-    it("should close the modal with false when cancel is called", () => {
-        spyOn(activeModal, "close");
-        component.cancel();
-        expect(activeModal.close).toHaveBeenCalledWith(false);
-    });
-
-    it("should dismiss the modal when dismiss is called", () => {
+    it("should close the modal when cancel is called", () => {
         spyOn(activeModal, "dismiss");
-        component.dismiss();
+        component.cancel();
         expect(activeModal.dismiss).toHaveBeenCalled();
     });
 });

From 8b81617941106b187d98ed60eaf4c489f985c3c7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 10:24:33 +0200
Subject: [PATCH 376/565] Outfactor mutation

---
 .../gift-identification-form.component.ts     | 56 +++++++++++++------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index f90deb93..2ea4fa95 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -2,10 +2,13 @@ import { Component, DestroyRef, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormGroup, FormControl, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
+import { ApolloCache } from "@apollo/client";
 import { ToastService } from "@services/toast.service";
+import { MutationResult } from "apollo-angular";
 import {
     DataEntryGiftIdentificationGQL,
     DataEntryUpdateGiftGQL,
+    DataEntryUpdateGiftMutation,
 } from "generated/graphql";
 import {
     map,
@@ -14,8 +17,18 @@ import {
     filter,
     debounceTime,
     withLatestFrom,
+    Observable,
 } from "rxjs";
 
+interface GiftIdentification {
+    name: string;
+    description: string;
+}
+
+type GiftIdentificationForm = {
+    [key in keyof GiftIdentification]: FormControl<string>;
+};
+
 @Component({
     selector: "lc-gift-identification-form",
     templateUrl: "./gift-identification-form.component.html",
@@ -30,7 +43,7 @@ export class GiftIdentificationFormComponent implements OnInit {
         shareReplay(1)
     );
 
-    public form = new FormGroup({
+    public form = new FormGroup<GiftIdentificationForm>({
         name: new FormControl("", {
             validators: [Validators.required],
             nonNullable: true,
@@ -70,22 +83,7 @@ export class GiftIdentificationFormComponent implements OnInit {
                         debounceTime(300),
                         withLatestFrom(this.id$),
                         switchMap(([gift, id]) =>
-                            this.giftMutation.mutate(
-                                {
-                                    giftData: {
-                                        ...gift,
-                                        id,
-                                    },
-                                },
-                                {
-                                    update: (cache) => {
-                                        cache.evict({
-                                            id: `GiftDescriptionType:${id}`,
-                                        });
-                                        cache.gc();
-                                    },
-                                }
-                            )
+                            this.performMutation(gift, id)
                         )
                     )
                 ),
@@ -102,4 +100,28 @@ export class GiftIdentificationFormComponent implements OnInit {
                 }
             });
     }
+
+    private performMutation(
+        gift: GiftIdentification,
+        id: string
+    ): Observable<MutationResult<DataEntryUpdateGiftMutation>> {
+        return this.giftMutation.mutate(
+            {
+                giftData: {
+                    ...gift,
+                    id,
+                },
+            },
+            {
+                update: (cache) => this.updateCache(cache, id),
+            }
+        );
+    }
+
+    private updateCache(cache: ApolloCache<unknown>, id: string): void {
+        cache.evict({
+            id: `GiftDescriptionType:${id}`,
+        });
+        cache.gc();
+    }
 }

From 081ca82520d5fdadd1d1da48f699a32b19cfd242 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 10:24:41 +0200
Subject: [PATCH 377/565] Update generated types

---
 frontend/generated/graphql.ts     | 259 +++++++++++++++++++++++++-----
 frontend/generated/schema.graphql |  56 +++----
 2 files changed, 246 insertions(+), 69 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 80dc5373..7910ea5a 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -103,6 +103,28 @@ export type CreateEpisodeMutation = {
   errors: Array<LettercraftErrorType>;
 };
 
+export type CreateGiftInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
+export type CreateGiftMutation = {
+  __typename?: 'CreateGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  gift?: Maybe<GiftDescriptionType>;
+};
+
+export type CreateLetterInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
+export type CreateLetterMutation = {
+  __typename?: 'CreateLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  letter?: Maybe<LetterDescriptionType>;
+};
+
 export type CreatePersonReferenceInput = {
   description: Scalars['ID']['input'];
   person: Scalars['ID']['input'];
@@ -126,6 +148,18 @@ export type DeleteEpisodeMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type DeleteGiftMutation = {
+  __typename?: 'DeleteGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
+export type DeleteLetterMutation = {
+  __typename?: 'DeleteLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type DeletePersonReferenceMutation = {
   __typename?: 'DeletePersonReferenceMutation';
   errors: Array<LettercraftErrorType>;
@@ -191,6 +225,14 @@ export enum Gender {
   Unknown = 'UNKNOWN'
 }
 
+export type GiftCategorisationInput = {
+  category: Scalars['ID']['input'];
+  certainty?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
+};
+
 export type GiftCategoryType = {
   __typename?: 'GiftCategoryType';
   /** Longer description to help identify this object */
@@ -366,9 +408,13 @@ export type Mutation = {
   __typename?: 'Mutation';
   createAgent?: Maybe<CreateAgentMutation>;
   createEpisode?: Maybe<CreateEpisodeMutation>;
+  createGift?: Maybe<CreateGiftMutation>;
+  createLetter?: Maybe<CreateLetterMutation>;
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
   deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
+  deleteGift?: Maybe<DeleteGiftMutation>;
+  deleteLetter?: Maybe<DeleteLetterMutation>;
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
@@ -389,6 +435,16 @@ export type MutationCreateEpisodeArgs = {
 };
 
 
+export type MutationCreateGiftArgs = {
+  giftData: CreateGiftInput;
+};
+
+
+export type MutationCreateLetterArgs = {
+  letterData: CreateLetterInput;
+};
+
+
 export type MutationCreatePersonReferenceArgs = {
   referenceData: CreatePersonReferenceInput;
 };
@@ -404,6 +460,16 @@ export type MutationDeleteEpisodeArgs = {
 };
 
 
+export type MutationDeleteGiftArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
+export type MutationDeleteLetterArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type MutationDeletePersonReferenceArgs = {
   id: Scalars['ID']['input'];
 };
@@ -434,11 +500,6 @@ export type MutationUpdateOrCreateSourceArgs = {
 };
 
 
-export type MutationUpdatePersonReferenceArgs = {
-  referenceData: UpdatePersonReferenceInput;
-};
-
-
 export type MutationUpdatePersonReferenceArgs = {
   referenceData: UpdatePersonReferenceInput;
 };
@@ -966,6 +1027,42 @@ export type UpdateEpisodeMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type UpdateGiftInput = {
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  categorisations?: InputMaybe<Array<GiftCategorisationInput>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdateGiftMutation = {
+  __typename?: 'UpdateGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
+export type UpdateLetterInput = {
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  categorisations?: InputMaybe<Array<LetterCategorisationInput>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdateLetterMutation = {
+  __typename?: 'UpdateLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type UpdateOrCreateSourceMutation = {
   __typename?: 'UpdateOrCreateSourceMutation';
   errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
@@ -1067,7 +1164,7 @@ export type DataEntryCreateEpisodeMutationVariables = Exact<{
 
 export type DataEntryCreateEpisodeMutation = { __typename?: 'Mutation', createEpisode?: { __typename?: 'CreateEpisodeMutation', episode?: { __typename?: 'EpisodeType', id: string } | null, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
-export type DataEntryGiftQueryVariables = Exact<{
+export type DataEntryGiftCategoriesQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
@@ -1230,7 +1327,7 @@ export const DataEntryAgentDescriptionDocument = gql`
   })
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1249,7 +1346,7 @@ export const LocationsInSourceListDocument = gql`
   })
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1270,7 +1367,7 @@ export const DataEntryAgentIdentificationDocument = gql`
   })
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1295,7 +1392,7 @@ export const DataEntryAgentDocument = gql`
   })
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1317,7 +1414,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   })
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1337,7 +1434,7 @@ export const DataEntryEpisodeCategoriesDocument = gql`
   })
   export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
     override document = DataEntryEpisodeCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1357,7 +1454,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   })
   export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1379,7 +1476,7 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
   })
   export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1403,7 +1500,7 @@ export const DataEntryEpisodeFormDocument = gql`
   })
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1425,7 +1522,7 @@ export const DataEntryUpdateEpisodeDocument = gql`
   })
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1449,13 +1546,103 @@ export const DataEntryCreateEpisodeDocument = gql`
   })
   export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryGiftCategoriesDocument = gql`
+    query DataEntryGiftCategories($id: ID!) {
+  giftDescription(id: $id) {
+    id
+    categorisations {
+      id
+      sourceMention
+      note
+      certainty
+      category {
+        id
+        name
+      }
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftCategoriesGQL extends Apollo.Query<DataEntryGiftCategoriesQuery, DataEntryGiftCategoriesQueryVariables> {
+    override document = DataEntryGiftCategoriesDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryAllGiftCategoriesDocument = gql`
+    query DataEntryAllGiftCategories {
+  letterCategories {
+    id
+    label
+    description
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
+    override document = DataEntryAllGiftCategoriesDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryGiftIdentificationDocument = gql`
+    query DataEntryGiftIdentification($id: ID!) {
+  giftDescription(id: $id) {
+    id
+    name
+    description
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftIdentificationGQL extends Apollo.Query<DataEntryGiftIdentificationQuery, DataEntryGiftIdentificationQueryVariables> {
+    override document = DataEntryGiftIdentificationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
-export const DataEntryGiftDocument = gql`
-    query DataEntryGift($id: ID!) {
+export const DataEntryGiftSourceTextDocument = gql`
+    query DataEntryGiftSourceText($id: ID!) {
+  giftDescription(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftSourceTextGQL extends Apollo.Query<DataEntryGiftSourceTextQuery, DataEntryGiftSourceTextQueryVariables> {
+    override document = DataEntryGiftSourceTextDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryGiftFormDocument = gql`
+    query DataEntryGiftForm($id: ID!) {
   giftDescription(id: $id) {
     id
     name
@@ -1473,7 +1660,7 @@ export const DataEntryGiftDocument = gql`
   })
   export class DataEntryGiftFormGQL extends Apollo.Query<DataEntryGiftFormQuery, DataEntryGiftFormQueryVariables> {
     override document = DataEntryGiftFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1495,7 +1682,7 @@ export const DataEntryUpdateGiftDocument = gql`
   })
   export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
     override document = DataEntryUpdateGiftDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1523,7 +1710,7 @@ export const DataEntryLetterCategoriesDocument = gql`
   })
   export class DataEntryLetterCategoriesGQL extends Apollo.Query<DataEntryLetterCategoriesQuery, DataEntryLetterCategoriesQueryVariables> {
     override document = DataEntryLetterCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1543,7 +1730,7 @@ export const DataEntryAllLetterCategoriesDocument = gql`
   })
   export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
     override document = DataEntryAllLetterCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1563,7 +1750,7 @@ export const DataEntryLetterIdentificationDocument = gql`
   })
   export class DataEntryLetterIdentificationGQL extends Apollo.Query<DataEntryLetterIdentificationQuery, DataEntryLetterIdentificationQueryVariables> {
     override document = DataEntryLetterIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1585,7 +1772,7 @@ export const DataEntryLetterSourceTextDocument = gql`
   })
   export class DataEntryLetterSourceTextGQL extends Apollo.Query<DataEntryLetterSourceTextQuery, DataEntryLetterSourceTextQueryVariables> {
     override document = DataEntryLetterSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1609,7 +1796,7 @@ export const DataEntryLetterFormDocument = gql`
   })
   export class DataEntryLetterFormGQL extends Apollo.Query<DataEntryLetterFormQuery, DataEntryLetterFormQueryVariables> {
     override document = DataEntryLetterFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1631,7 +1818,7 @@ export const DataEntryUpdateLetterDocument = gql`
   })
   export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
     override document = DataEntryUpdateLetterDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1655,7 +1842,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
   })
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1677,7 +1864,7 @@ export const DataEntryDeleteEpisodeDocument = gql`
   })
   export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1735,7 +1922,7 @@ export const DataEntrySourceDetailDocument = gql`
   })
   export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1759,7 +1946,7 @@ export const DataEntrySourceListDocument = gql`
   })
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1778,7 +1965,7 @@ export const SourceTitleQueryDocument = gql`
   })
   export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
     override document = SourceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1801,7 +1988,7 @@ export const AgentTitleQueryDocument = gql`
   })
   export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
     override document = AgentTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1824,7 +2011,7 @@ export const LetterTitleQueryDocument = gql`
   })
   export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
     override document = LetterTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1847,7 +2034,7 @@ export const GiftTitleQueryDocument = gql`
   })
   export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
     override document = GiftTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1870,8 +2057,8 @@ export const SpaceTitleQueryDocument = gql`
   })
   export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
     override document = SpaceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
-  }
+  }
\ No newline at end of file
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 061feb69..85b8da4c 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -89,16 +89,21 @@ type CreateAgentMutation {
   ok: Boolean!
 }
 
-<<<<<<< HEAD
-input CreateGiftInput {
-=======
 input CreateEpisodeInput {
->>>>>>> develop
   name: String!
   source: ID!
 }
 
-<<<<<<< HEAD
+type CreateEpisodeMutation {
+  episode: EpisodeType
+  errors: [LettercraftErrorType!]!
+}
+
+input CreateGiftInput {
+  name: String!
+  source: ID!
+}
+
 type CreateGiftMutation {
   errors: [LettercraftErrorType!]!
   gift: GiftDescriptionType
@@ -112,11 +117,6 @@ input CreateLetterInput {
 type CreateLetterMutation {
   errors: [LettercraftErrorType!]!
   letter: LetterDescriptionType
-=======
-type CreateEpisodeMutation {
-  episode: EpisodeType
-  errors: [LettercraftErrorType!]!
->>>>>>> develop
 }
 
 input CreatePersonReferenceInput {
@@ -134,16 +134,17 @@ type DeleteAgentMutation {
   ok: Boolean!
 }
 
-<<<<<<< HEAD
+type DeleteEpisodeMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type DeleteGiftMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
 
 type DeleteLetterMutation {
-=======
-type DeleteEpisodeMutation {
->>>>>>> develop
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
@@ -226,7 +227,6 @@ enum Gender {
   UNKNOWN
 }
 
-<<<<<<< HEAD
 input GiftCategorisationInput {
   category: ID!
   certainty: String
@@ -235,8 +235,6 @@ input GiftCategorisationInput {
   sourceMention: SourceMention
 }
 
-=======
->>>>>>> develop
 type GiftCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -442,29 +440,20 @@ type LettercraftErrorType {
 
 type Mutation {
   createAgent(agentData: CreateAgentInput!): CreateAgentMutation
-<<<<<<< HEAD
+  createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
   createGift(giftData: CreateGiftInput!): CreateGiftMutation
   createLetter(letterData: CreateLetterInput!): CreateLetterMutation
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
+  deleteEpisode(id: ID!): DeleteEpisodeMutation
   deleteGift(id: ID!): DeleteGiftMutation
   deleteLetter(id: ID!): DeleteLetterMutation
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
   updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
-  updateEpisode(input: UpdateEpisodeMutationInput!): UpdateEpisodeMutation
+  updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
   updateGift(giftData: UpdateGiftInput!): UpdateGiftMutation
   updateLetter(letterData: UpdateLetterInput!): UpdateLetterMutation
-  updateOrCreateSource(input: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
-=======
-  createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
-  createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
-  deleteAgent(id: ID!): DeleteAgentMutation
-  deleteEpisode(id: ID!): DeleteEpisodeMutation
-  deletePersonReference(id: ID!): DeletePersonReferenceMutation
-  updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
-  updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
   updateOrCreateSource(sourceData: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
->>>>>>> develop
   updatePersonReference(referenceData: UpdatePersonReferenceInput!): UpdatePersonReferenceMutation
 }
 
@@ -1005,7 +994,11 @@ input UpdateEpisodeInput {
   summary: String
 }
 
-<<<<<<< HEAD
+type UpdateEpisodeMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 input UpdateGiftInput {
   book: String
   categories: [ID!]
@@ -1036,9 +1029,6 @@ input UpdateLetterInput {
 }
 
 type UpdateLetterMutation {
-=======
-type UpdateEpisodeMutation {
->>>>>>> develop
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }

From 54317d9a37b7d2bd832ca702c054d57d330ffbfd Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 10:30:59 +0200
Subject: [PATCH 378/565] Use correct import

---
 .../gift-identification-form.component.ts                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index 2ea4fa95..886ed7c3 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -2,7 +2,7 @@ import { Component, DestroyRef, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormGroup, FormControl, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
-import { ApolloCache } from "@apollo/client";
+import { ApolloCache } from "@apollo/client/core";
 import { ToastService } from "@services/toast.service";
 import { MutationResult } from "apollo-angular";
 import {

From 05859a943f4203465635fca4052b8108d07089de Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 13:50:07 +0200
Subject: [PATCH 379/565] Reusable entity-description-lead

---
 .../episode-form/episode-form.component.html  |  4 +---
 .../gift-form/gift-form.component.html        |  4 +---
 .../letter-form/letter-form.component.html    | 11 +++++++---
 .../shared/data-entry-shared.module.ts        |  3 +++
 .../entity-description-lead.component.html    |  8 +++++++
 .../entity-description-lead.component.scss    |  0
 .../entity-description-lead.component.spec.ts | 21 +++++++++++++++++++
 .../entity-description-lead.component.ts      | 14 +++++++++++++
 8 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.html
 create mode 100644 frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.scss
 create mode 100644 frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.ts

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 348cf041..04a27f98 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -6,9 +6,7 @@ <h1 class="mb-4">
         <span class="ms-2">{{ episode.name }}</span>
         <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
     </h1>
-    <p class="lead mb-4" *ngIf="episode.description">
-        {{ episode.description}}
-    </p>
+    <lc-entity-description-lead [entity]="episode" />
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index 68979b07..d6059f5c 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -9,9 +9,7 @@ <h1 class="mb-4">
         </span>
     </h1>
 
-    <p class="lead mb-4" *ngIf="gift.description">
-        {{ gift.description }}
-    </p>
+    <lc-entity-description-lead [entity]="gift" />
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 23c5a774..cd730128 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -9,9 +9,14 @@ <h1 class="mb-4">
         </span>
     </h1>
 
-    <p class="lead mb-4" *ngIf="letter.description">
-        {{ letter.description }}
-    </p>
+    <lc-entity-description-lead [entity]="letter" />
+
+    <div class="hstack">
+        <button class="btn btn-danger ms-auto" (click)="onClickDelete(letter.id, letter.name)">
+            <lc-icon [icon]="actionIcons.delete" />
+            Delete letter
+        </button>
+    </div>
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>
diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index 5395a06f..a10856d6 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -3,18 +3,21 @@ import { SharedModule } from "@shared/shared.module";
 import { DesignatorsControlComponent } from "./designators-control/designators-control.component";
 import { MultiselectComponent } from "./multiselect/multiselect.component";
 import { LabelSelectComponent } from "./label-select/label-select.component";
+import { EntityDescriptionLeadComponent } from "./entity-description-lead/entity-description-lead.component";
 
 @NgModule({
     declarations: [
         DesignatorsControlComponent,
         MultiselectComponent,
         LabelSelectComponent,
+        EntityDescriptionLeadComponent,
     ],
     imports: [SharedModule],
     exports: [
         DesignatorsControlComponent,
         MultiselectComponent,
         LabelSelectComponent,
+        EntityDescriptionLeadComponent,
     ],
 })
 export class DataEntrySharedModule {}
diff --git a/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.html b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.html
new file mode 100644
index 00000000..7703f7fb
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.html
@@ -0,0 +1,8 @@
+<p class="lead mb-4">
+    <span *ngIf="entity.description; else noDescription">
+        {{entity.description}}
+    </span>
+    <ng-template #noDescription>
+        <i>(No description)</i>
+    </ng-template>
+</p>
diff --git a/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.scss b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts
new file mode 100644
index 00000000..e882ad2a
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { EntityDescriptionLeadComponent } from "./entity-description-lead.component";
+
+describe("EntityDescriptionLeadComponent", () => {
+    let component: EntityDescriptionLeadComponent;
+    let fixture: ComponentFixture<EntityDescriptionLeadComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EntityDescriptionLeadComponent],
+        });
+        fixture = TestBed.createComponent(EntityDescriptionLeadComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.ts b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.ts
new file mode 100644
index 00000000..0fd39bb3
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.ts
@@ -0,0 +1,14 @@
+import { Component, Input } from "@angular/core";
+
+interface Entity {
+    description?: string;
+}
+
+@Component({
+    selector: "lc-entity-description-lead",
+    templateUrl: "./entity-description-lead.component.html",
+    styleUrls: ["./entity-description-lead.component.scss"],
+})
+export class EntityDescriptionLeadComponent {
+    @Input({ required: true }) entity!: Entity;
+}

From 692edc822e81783f1e34b71ce983c74bec12d381 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 13:50:29 +0200
Subject: [PATCH 380/565] Delete letter button

---
 frontend/generated/graphql.ts                 | 29 ++++++++++
 .../letter-form/letter-form.component.ts      | 58 ++++++++++++++++++-
 .../app/data-entry/letter-form/letter.graphql | 10 ++++
 3 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 7910ea5a..44bb1ee8 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1244,6 +1244,13 @@ export type DataEntryUpdateLetterMutationVariables = Exact<{
 
 export type DataEntryUpdateLetterMutation = { __typename?: 'Mutation', updateLetter?: { __typename?: 'UpdateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryDeleteLetterMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryDeleteLetterMutation = { __typename?: 'Mutation', deleteLetter?: { __typename?: 'DeleteLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1819,6 +1826,28 @@ export const DataEntryUpdateLetterDocument = gql`
   export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
     override document = DataEntryUpdateLetterDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryDeleteLetterDocument = gql`
+    mutation DataEntryDeleteLetter($id: ID!) {
+  deleteLetter(id: $id) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteLetterGQL extends Apollo.Mutation<DataEntryDeleteLetterMutation, DataEntryDeleteLetterMutationVariables> {
+    override document = DataEntryDeleteLetterDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 4dc1dabf..8e55f918 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -1,7 +1,14 @@
-import { Component } from "@angular/core";
+import { Component, DestroyRef } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute } from "@angular/router";
+import { ModalService } from "@services/modal.service";
+import { ToastService } from "@services/toast.service";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntryLetterFormGQL } from "generated/graphql";
+import {
+    DataEntryDeleteLetterGQL,
+    DataEntryLetterFormGQL,
+    DataEntryUpdateLetterGQL,
+} from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
 
 @Component({
@@ -49,7 +56,52 @@ export class LetterFormComponent {
     public actionIcons = actionIcons;
 
     constructor(
+        private destroyRef: DestroyRef,
         private route: ActivatedRoute,
-        private letterQuery: DataEntryLetterFormGQL
+        private toastService: ToastService,
+        private modalService: ModalService,
+        private letterQuery: DataEntryLetterFormGQL,
+        private deleteLetter: DataEntryDeleteLetterGQL
     ) {}
+
+    public onClickDelete(letterId: string, letterName: string): void {
+        this.modalService
+            .openConfirmationModal({
+                title: "Delete letter",
+                message: `Are you sure you want to delete this letter? (${letterName})`,
+            })
+            .then(() => this.performDelete(letterId))
+            .catch(() => {
+                // Do nothing on cancel / dismissal.
+            });
+    }
+
+    private performDelete(letterId: string): void {
+        this.deleteLetter
+            .mutate(
+                {
+                    id: letterId,
+                },
+                {
+                    update: (cache) => cache.evict({ fieldName: "letter" }),
+                }
+            )
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                const errors = result.data?.deleteLetter?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Deletion failed",
+                    });
+                } else {
+                    this.toastService.show({
+                        body: "Letter deleted",
+                        type: "success",
+                        header: "Success",
+                    });
+                }
+            });
+    }
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter.graphql b/frontend/src/app/data-entry/letter-form/letter.graphql
index 9ff63991..f9f9dd77 100644
--- a/frontend/src/app/data-entry/letter-form/letter.graphql
+++ b/frontend/src/app/data-entry/letter-form/letter.graphql
@@ -19,3 +19,13 @@ mutation DataEntryUpdateLetter($letterData: UpdateLetterInput!) {
         }
     }
 }
+
+mutation DataEntryDeleteLetter($id: ID!) {
+    deleteLetter(id: $id) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From 295f7f0c1b68e33892546f2dea42f50a3df19bb9 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 18 Sep 2024 15:26:54 +0200
Subject: [PATCH 381/565] remove unused query elements

---
 frontend/generated/graphql.ts                     | 7 +------
 frontend/src/app/data-entry/source/source.graphql | 5 -----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index d2191235..3be44d2e 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1037,7 +1037,7 @@ export type DataEntrySourceDetailQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
+export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
 
 export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1376,11 +1376,6 @@ export const DataEntrySourceDetailDocument = gql`
   source(id: $id) {
     id
     name
-    editionAuthor
-    editionTitle
-    medievalAuthor
-    medievalTitle
-    numOfEpisodes
     episodes {
       id
       name
diff --git a/frontend/src/app/data-entry/source/source.graphql b/frontend/src/app/data-entry/source/source.graphql
index 612d293a..3f049fab 100644
--- a/frontend/src/app/data-entry/source/source.graphql
+++ b/frontend/src/app/data-entry/source/source.graphql
@@ -2,11 +2,6 @@ query DataEntrySourceDetail($id: ID!) {
     source(id: $id) {
         id
         name
-        editionAuthor
-        editionTitle
-        medievalAuthor
-        medievalTitle
-        numOfEpisodes
         episodes {
             id
             name

From 7f241b40ffb1a8b22ac5b1662bede7ddd11ad932 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 18 Sep 2024 15:40:38 +0200
Subject: [PATCH 382/565] code formatting

---
 .../agent-description-form.component.ts         |  2 +-
 .../agent-identification-form.component.ts      | 17 ++++++++---------
 .../delete-agent/delete-agent.component.ts      |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index fde390c6..9704d1a2 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
 import { ToastService } from '@services/toast.service';
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index c128c36b..de8efdba 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -10,7 +10,6 @@ import {
 import {
     map, switchMap, filter, debounceTime, withLatestFrom, Observable,
     distinctUntilChanged,
-
     tap,
     BehaviorSubject,
     skip
@@ -59,18 +58,18 @@ export class AgentIdentificationFormComponent implements OnDestroy {
             takeUntilDestroyed(),
         ).subscribe(this.updateFormData.bind(this));
 
-        const changes$ = this.form.valueChanges.pipe(
-            debounceTime(500),
-            distinctUntilChanged(_.isEqual),
-            skip(1),
-        );
 
-        changes$.pipe(
-            filter(_.negate(this.isValid.bind(this))),
+
+
+        this.form.statusChanges.pipe(
+            filter(status => status == 'INVALID'),
             takeUntilDestroyed(),
         ).subscribe(() => this.status$.next('invalid'));
 
-        changes$.pipe(
+        this.form.valueChanges.pipe(
+            debounceTime(500),
+            distinctUntilChanged(_.isEqual),
+            skip(1),
             filter(this.isValid.bind(this)),
             tap(() => this.status$.next('loading')),
             withLatestFrom(this.id$),
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 3322291b..68e15142 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -37,10 +37,10 @@ export class DeleteAgentComponent implements OnDestroy {
         this.formService.detachForm(this.formName);
     }
 
-    open(content: TemplateRef<any>) {
+    open(content: TemplateRef<unknown>) {
         this.modalService.open(content, { ariaLabelledBy: 'modal-title' }).result.then(
             this.deleteAgent.bind(this),
-            _.constant(undefined),
+            _.constant(undefined), // do nothing on dismiss
         );
     }
 

From e90bfb15d7556a6a6cb65ab7bc7e1eff87cb6eae Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 16:04:23 +0200
Subject: [PATCH 383/565] Loading indicator on delete button

---
 .../letter-form/letter-form.component.html    | 10 ++++--
 .../letter-form/letter-form.component.ts      | 32 +++++++++++++++----
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index cd730128..52c78d7e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -12,8 +12,8 @@ <h1 class="mb-4">
     <lc-entity-description-lead [entity]="letter" />
 
     <div class="hstack">
-        <button class="btn btn-danger ms-auto" (click)="onClickDelete(letter.id, letter.name)">
-            <lc-icon [icon]="actionIcons.delete" />
+        <button class="btn btn-danger ms-auto" (click)="onClickDelete(letter)">
+            <lc-icon *ngIf="!deletingInProgress; else deleting" [icon]="actionIcons.delete" />
             Delete letter
         </button>
     </div>
@@ -33,3 +33,9 @@ <h2 class="subform-header">Categories</h2>
         <span class="visually-hidden">Loading...</span>
     </div>
 </ng-template>
+
+<ng-template #deleting>
+    <div class="spinner-border spinner-border-sm" role="status">
+        <span class="visually-hidden">Deleting...</span>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 8e55f918..06c6af5c 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -1,16 +1,19 @@
 import { Component, DestroyRef } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
+import { ApolloCache } from "@apollo/client/core";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
 import { actionIcons, dataIcons } from "@shared/icons";
 import {
     DataEntryDeleteLetterGQL,
     DataEntryLetterFormGQL,
-    DataEntryUpdateLetterGQL,
+    DataEntryLetterFormQuery,
 } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
 
+type QueriedLetter = NonNullable<DataEntryLetterFormQuery["letterDescription"]>;
+
 @Component({
     selector: "lc-letter-form",
     templateUrl: "./letter-form.component.html",
@@ -55,39 +58,44 @@ export class LetterFormComponent {
     public dataIcons = dataIcons;
     public actionIcons = actionIcons;
 
+    public deletingInProgress = false;
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private router: Router,
         private toastService: ToastService,
         private modalService: ModalService,
         private letterQuery: DataEntryLetterFormGQL,
         private deleteLetter: DataEntryDeleteLetterGQL
     ) {}
 
-    public onClickDelete(letterId: string, letterName: string): void {
+    public onClickDelete(letter: QueriedLetter): void {
         this.modalService
             .openConfirmationModal({
                 title: "Delete letter",
-                message: `Are you sure you want to delete this letter? (${letterName})`,
+                message: `Are you sure you want to delete this letter? (${letter.name})`,
             })
-            .then(() => this.performDelete(letterId))
+            .then(() => this.performDelete(letter.id, letter.source.id))
             .catch(() => {
                 // Do nothing on cancel / dismissal.
             });
     }
 
-    private performDelete(letterId: string): void {
+    private performDelete(letterId: string, sourceId: string): void {
+        this.deletingInProgress = true;
         this.deleteLetter
             .mutate(
                 {
                     id: letterId,
                 },
                 {
-                    update: (cache) => cache.evict({ fieldName: "letter" }),
+                    update: (cache) => this.updateCache(cache, letterId),
                 }
             )
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((result) => {
+                this.deletingInProgress = false;
                 const errors = result.data?.deleteLetter?.errors;
                 if (errors && errors.length > 0) {
                     this.toastService.show({
@@ -102,6 +110,16 @@ export class LetterFormComponent {
                         header: "Success",
                     });
                 }
+                this.router.navigate([`/data-entry/sources/${sourceId}`]);
             });
     }
+
+    private updateCache(cache: ApolloCache<unknown>, letterId: string): void {
+        const identified = cache.identify({
+            __typename: "LetterDescriptionType",
+            id: letterId,
+        });
+        cache.evict({ id: identified });
+        cache.gc();
+    }
 }

From e609df8f22c81615e437454e4661aac8e0af254a Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 30 Aug 2024 12:18:07 +0200
Subject: [PATCH 384/565] generate agent episodes form

include agent episodes form in agent form
---
 .../agent-episodes-form.component.html        |  1 +
 .../agent-episodes-form.component.scss        |  0
 .../agent-episodes-form.component.spec.ts     | 21 +++++++++++++++++++
 .../agent-episodes-form.component.ts          | 10 +++++++++
 .../agent-form/agent-form.component.html      |  2 +-
 .../agent-form/agent-form.module.ts           |  2 ++
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.scss
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
new file mode 100644
index 00000000..8bca4b27
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -0,0 +1 @@
+<p>agent-episodes-form works!</p>
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.scss b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts
new file mode 100644
index 00000000..800eb107
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AgentEpisodesFormComponent } from './agent-episodes-form.component';
+
+describe('AgentEpisodesFormComponent', () => {
+  let component: AgentEpisodesFormComponent;
+  let fixture: ComponentFixture<AgentEpisodesFormComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [AgentEpisodesFormComponent]
+    });
+    fixture = TestBed.createComponent(AgentEpisodesFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
new file mode 100644
index 00000000..f6028913
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'lc-agent-episodes-form',
+  templateUrl: './agent-episodes-form.component.html',
+  styleUrls: ['./agent-episodes-form.component.scss']
+})
+export class AgentEpisodesFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index b16dd437..f9fb8d49 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -33,7 +33,7 @@ <h2>Description in source text</h2>
 
         <h2>Episodes</h2>
 
-        <p><i>Coming soon!</i></p>
+        <lc-agent-episodes-form />
 
         <h2>Historical context</h2>
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index 46c71a58..9a9de65c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -5,6 +5,7 @@ import { AgentIdentificationFormComponent } from './agent-identification-form/ag
 import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 import { DeleteAgentComponent } from './delete-agent/delete-agent.component';
+import { AgentEpisodesFormComponent } from './agent-episodes-form/agent-episodes-form.component';
 
 
 
@@ -14,6 +15,7 @@ import { DeleteAgentComponent } from './delete-agent/delete-agent.component';
         AgentIdentificationFormComponent,
         AgentDescriptionFormComponent,
         DeleteAgentComponent,
+        AgentEpisodesFormComponent,
     ],
     imports: [
         SharedModule,

From 1847abd9d2088f4921c48e612739ae2c46bbafcd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 7 Aug 2024 15:59:28 +0200
Subject: [PATCH 385/565] allow blank episode categories in admin

---
 .../0023_alter_episode_categories.py          | 23 +++++++++++++++++++
 backend/event/models.py                       |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 backend/event/migrations/0023_alter_episode_categories.py

diff --git a/backend/event/migrations/0023_alter_episode_categories.py b/backend/event/migrations/0023_alter_episode_categories.py
new file mode 100644
index 00000000..38c7f9d3
--- /dev/null
+++ b/backend/event/migrations/0023_alter_episode_categories.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-08-07 13:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("event", "0022_episode_contributors"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="episode",
+            name="categories",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="labels assigned to this episode",
+                related_name="episodes",
+                to="event.episodecategory",
+            ),
+        ),
+    ]
diff --git a/backend/event/models.py b/backend/event/models.py
index f2ff7ef3..62535c83 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -25,6 +25,7 @@ class Episode(EntityDescription, models.Model):
         to=EpisodeCategory,
         related_name="episodes",
         help_text="labels assigned to this episode",
+        blank=True,
     )
     agents = models.ManyToManyField(
         to=AgentDescription,

From 8e8dbc164be15519060cf42c3676d23c690e1bbc Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 7 Aug 2024 16:07:39 +0200
Subject: [PATCH 386/565] add episodes to agent description query

---
 backend/event/types/EpisodeAgentType.py      |  8 ++--
 backend/person/types/AgentDescriptionType.py | 16 ++++++--
 frontend/generated/graphql.ts                | 38 ++++++++++++++++--
 frontend/generated/schema.graphql            | 41 +++++++++++++++++++-
 4 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
index 1679644b..93420d4b 100644
--- a/backend/event/types/EpisodeAgentType.py
+++ b/backend/event/types/EpisodeAgentType.py
@@ -3,12 +3,12 @@
 from core.types.DescriptionFieldType import DescriptionFieldType
 from django.db.models import QuerySet
 
-from event.models import EpisodeGift
+from event.models import EpisodeAgent
 
 
 class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
     class Meta:
-        model = EpisodeGift
+        model = EpisodeAgent
         fields = [
             "id",
             "episode",
@@ -18,7 +18,7 @@ class Meta:
     @classmethod
     def get_queryset(
         cls,
-        queryset: QuerySet[EpisodeGift],
+        queryset: QuerySet[EpisodeAgent],
         info: ResolveInfo,
-    ) -> QuerySet[EpisodeGift]:
+    ) -> QuerySet[EpisodeAgent]:
         return queryset.all()
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index c37cb639..a34f4082 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -1,4 +1,4 @@
-from graphene import Field, List, ResolveInfo
+from graphene import Field, List, ResolveInfo, NonNull
 from graphene_django import DjangoObjectType
 
 from django.db.models import QuerySet
@@ -8,13 +8,16 @@
 from person.types.AgentDescriptionLocationType import AgentDescriptionLocationType
 from person.types.HistoricalPersonType import HistoricalPersonType
 from person.types.PersonReferenceType import PersonReferenceType
+from event.types.EpisodeAgentType import EpisodeAgentType
+from event.models import EpisodeAgent
 
 
 class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
-    describes = List(HistoricalPersonType)
-    person_references = List(PersonReferenceType)
+    describes = List(NonNull(HistoricalPersonType), required=True)
+    person_references = List(NonNull(PersonReferenceType), required=True)
     gender = Field(AgentDescriptionGenderType)
     location = Field(AgentDescriptionLocationType)
+    episodes = List(NonNull(EpisodeAgentType), required=True)
 
     class Meta:
         model = AgentDescription
@@ -25,6 +28,7 @@ class Meta:
             "person_references",
             "gender",
             "location",
+            "episodes",
         ] + EntityDescriptionType.fields()
 
     @classmethod
@@ -44,3 +48,9 @@ def resolve_person_references(
         parent: AgentDescription, info: ResolveInfo
     ) -> QuerySet[PersonReference]:
         return PersonReference.objects.filter(description=parent)
+
+    @staticmethod
+    def resolve_episodes(
+        parent: AgentDescription, info: ResolveInfo
+    ) -> QuerySet[EpisodeAgent]:
+        return EpisodeAgent.objects.filter(agent=parent)
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 7765a056..3adf9cef 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -52,11 +52,12 @@ export type AgentDescriptionType = {
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
+  describes: Array<HistoricalPersonType>;
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
+  episodes: Array<EpisodeAgentType>;
   gender?: Maybe<AgentDescriptionGenderType>;
   id: Scalars['ID']['output'];
   /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
@@ -66,7 +67,7 @@ export type AgentDescriptionType = {
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
   page: Scalars['String']['output'];
-  personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
+  personReferences: Array<PersonReferenceType>;
   /** Source text containing this description */
   source: SourceType;
   /** How is this entity presented in the text? */
@@ -166,6 +167,19 @@ export type DeletePersonReferenceMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type EpisodeAgentType = {
+  __typename?: 'EpisodeAgentType';
+  agent: AgentDescriptionType;
+  /** How certain are you of this value? */
+  certainty: EventEpisodeAgentCertaintyChoices;
+  episode: EpisodeType;
+  id: Scalars['ID']['output'];
+  /** Additional notes */
+  note: Scalars['String']['output'];
+  /** How is this information presented in the text? */
+  sourceMention?: Maybe<EventEpisodeAgentSourceMentionChoices>;
+};
+
 export type EpisodeCategoryType = {
   __typename?: 'EpisodeCategoryType';
   /** Longer description to help identify this object */
@@ -208,6 +222,24 @@ export type EpisodeType = {
   summary: Scalars['String']['output'];
 };
 
+/** An enumeration. */
+export enum EventEpisodeAgentCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum EventEpisodeAgentSourceMentionChoices {
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
+}
+
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
   /** directly mentioned */
@@ -1277,7 +1309,7 @@ export type DataEntrySourceDetailQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
+export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean }> }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
 
 export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
 
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 85b8da4c..85239e37 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -41,7 +41,7 @@ type AgentDescriptionType {
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-  describes: [HistoricalPersonType]
+  describes: [HistoricalPersonType!]!
 
   """Longer description to help identify this object"""
   description: String!
@@ -50,6 +50,7 @@ type AgentDescriptionType {
   Relevant (Latin) terminology used to describe this entity in the source text
   """
   designators: [String!]!
+  episodes: [EpisodeAgentType!]!
   gender: AgentDescriptionGenderType
   id: ID!
 
@@ -62,7 +63,7 @@ type AgentDescriptionType {
 
   """The page number or page range in the source"""
   page: String!
-  personReferences: [PersonReferenceType]
+  personReferences: [PersonReferenceType!]!
 
   """Source text containing this description"""
   source: SourceType!
@@ -154,6 +155,21 @@ type DeletePersonReferenceMutation {
   ok: Boolean!
 }
 
+type EpisodeAgentType {
+  agent: AgentDescriptionType!
+
+  """How certain are you of this value?"""
+  certainty: EventEpisodeAgentCertaintyChoices!
+  episode: EpisodeType!
+  id: ID!
+
+  """Additional notes"""
+  note: String!
+
+  """How is this information presented in the text?"""
+  sourceMention: EventEpisodeAgentSourceMentionChoices
+}
+
 type EpisodeCategoryType {
   """Longer description to help identify this object"""
   description: String!
@@ -209,6 +225,27 @@ type EpisodeType {
   summary: String!
 }
 
+"""An enumeration."""
+enum EventEpisodeAgentCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum EventEpisodeAgentSourceMentionChoices {
+  """directly mentioned"""
+  DIRECT
+
+  """implied"""
+  IMPLIED
+}
+
 """An enumeration."""
 enum EventEpisodeSourceMentionChoices {
   """directly mentioned"""

From ef99fd99bb90869a761775a76a0096677148a0db Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 30 Aug 2024 12:29:24 +0200
Subject: [PATCH 387/565] fetch data in agent episodes form

---
 frontend/generated/graphql.ts                 | 35 +++++++++++++++++++
 .../agent-episodes-form.component.html        |  8 ++++-
 .../agent-episodes-form.component.ts          | 15 ++++++++
 .../agent-episodes.graphql                    | 15 ++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 3adf9cef..15a04527 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1135,6 +1135,13 @@ export type LocationsInSourceListQueryVariables = Exact<{
 
 export type LocationsInSourceListQuery = { __typename?: 'Query', spaceDescriptions: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> };
 
+export type DataEntryAgentEpisodesQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes?: Array<{ __typename?: 'EpisodeAgentType', id: string } | null> | null } | null };
+
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1393,6 +1400,34 @@ export const LocationsInSourceListDocument = gql`
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryAgentEpisodesDocument = gql`
+    query DataEntryAgentEpisodes($id: ID!) {
+  agentDescription(id: $id) {
+    id
+    source {
+      id
+      episodes {
+        id
+        name
+      }
+    }
+    episodes {
+      id
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentEpisodesGQL extends Apollo.Query<DataEntryAgentEpisodesQuery, DataEntryAgentEpisodesQueryVariables> {
+    override document = DataEntryAgentEpisodesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 8bca4b27..132936cf 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -1 +1,7 @@
-<p>agent-episodes-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ul>
+        <li *ngFor="let item of data.agentDescription?.episodes">
+            {{item.id}}
+        </li>
+    </ul>
+</ng-container>
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index f6028913..98c8e305 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -1,4 +1,8 @@
 import { Component } from '@angular/core';
+import { FormService } from '../../shared/form.service';
+import { DataEntryAgentEpisodesGQL, DataEntryAgentEpisodesQuery } from 'generated/graphql';
+import { map, Observable, switchMap } from 'rxjs';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'lc-agent-episodes-form',
@@ -6,5 +10,16 @@ import { Component } from '@angular/core';
   styleUrls: ['./agent-episodes-form.component.scss']
 })
 export class AgentEpisodesFormComponent {
+    data$: Observable<DataEntryAgentEpisodesQuery>;
 
+    constructor(
+        private formService: FormService,
+        private query: DataEntryAgentEpisodesGQL,
+    ) {
+        this.data$ = this.formService.id$.pipe(
+            switchMap(id => this.query.watch({ id }).valueChanges),
+            map(result => result.data),
+            takeUntilDestroyed(),
+        );
+    }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
new file mode 100644
index 00000000..794a582e
--- /dev/null
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -0,0 +1,15 @@
+query DataEntryAgentEpisodes($id: ID!) {
+    agentDescription(id: $id) {
+        id
+        source {
+            id
+            episodes {
+                id
+                name
+            }
+        }
+        episodes {
+            id
+        }
+    }
+}

From a61cdb944c593704d8229547335fd6482359173f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 30 Aug 2024 13:05:37 +0200
Subject: [PATCH 388/565] get available episodes

---
 .../agent-episodes-form.component.ts                 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 98c8e305..ce667df3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -11,6 +11,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 })
 export class AgentEpisodesFormComponent {
     data$: Observable<DataEntryAgentEpisodesQuery>;
+    availableEpisodes$: Observable<{ name: string, id: string }[]>;
 
     constructor(
         private formService: FormService,
@@ -21,5 +22,16 @@ export class AgentEpisodesFormComponent {
             map(result => result.data),
             takeUntilDestroyed(),
         );
+        this.availableEpisodes$ = this.data$.pipe(
+            map(this.availableEpisodes)
+        );
+    }
+
+    private availableEpisodes(
+        data: DataEntryAgentEpisodesQuery
+    ): { name: string, id: string }[] {
+        const allEpisodes = data.agentDescription?.source.episodes || [];
+        const linkedEpisodeIDs = data.agentDescription?.episodes.map(ep => ep.id) || [];
+        return allEpisodes.filter(episode => !linkedEpisodeIDs.includes(episode.id));
     }
 }

From 45fdf455e70b251e4babfc202eca002d3807f839 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 30 Aug 2024 15:17:46 +0200
Subject: [PATCH 389/565] scaffold episode dropdown

---
 .../agent-episodes-form.component.html         | 18 ++++++++++++++++++
 .../agent-episodes-form.component.ts           |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 132936cf..f22cb598 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -1,7 +1,25 @@
 <ng-container *ngIf="data$ | async as data">
+    <p>This agent is involved in the following episodes:</p>
     <ul>
         <li *ngFor="let item of data.agentDescription?.episodes">
             {{item.id}}
         </li>
     </ul>
 </ng-container>
+
+<div ngbDropdown class="mb-4">
+    <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
+        ngbDropdownToggle>
+        Add episode
+    </button>
+    <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
+        <button *ngFor="let episode of (availableEpisodes$ | async)"
+            ngbDropdownItem>
+            {{episode.name}}
+        </button>
+        <button ngbDropdownItem>
+            <lc-icon [icon]="actionIcons.create" />
+            Create new episode
+        </button>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index ce667df3..7f55769b 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -3,6 +3,7 @@ import { FormService } from '../../shared/form.service';
 import { DataEntryAgentEpisodesGQL, DataEntryAgentEpisodesQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { actionIcons } from '@shared/icons';
 
 @Component({
   selector: 'lc-agent-episodes-form',
@@ -13,6 +14,8 @@ export class AgentEpisodesFormComponent {
     data$: Observable<DataEntryAgentEpisodesQuery>;
     availableEpisodes$: Observable<{ name: string, id: string }[]>;
 
+    actionIcons = actionIcons;
+
     constructor(
         private formService: FormService,
         private query: DataEntryAgentEpisodesGQL,

From 2bb5b049c16a6d35782d18e798758cf3cf213e62 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 30 Aug 2024 15:21:57 +0200
Subject: [PATCH 390/565] scaffold episode link form components

---
 .../agent-episodes-form.component.html        |  1 +
 .../shared/data-entry-shared.module.ts        |  3 ++
 .../episode-link-form.component.html          | 33 +++++++++++++++++++
 .../episode-link-form.component.scss          |  0
 .../episode-link-form.component.spec.ts       | 26 +++++++++++++++
 .../episode-link-form.component.ts            | 11 +++++++
 6 files changed, 74 insertions(+)
 create mode 100644 frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
 create mode 100644 frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.scss
 create mode 100644 frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index f22cb598..315ca44e 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -2,6 +2,7 @@
     <p>This agent is involved in the following episodes:</p>
     <ul>
         <li *ngFor="let item of data.agentDescription?.episodes">
+            <lc-episode-link-form />
             {{item.id}}
         </li>
     </ul>
diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index b333a16a..5cd191a6 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -4,6 +4,7 @@ import { DesignatorsControlComponent } from "./designators-control/designators-c
 import { MultiselectComponent } from "./multiselect/multiselect.component";
 import { LabelSelectComponent } from "./label-select/label-select.component";
 import { FormStatusComponent } from './form-status/form-status.component';
+import { EpisodeLinkFormComponent } from './episode-link-form/episode-link-form.component';
 
 @NgModule({
     declarations: [
@@ -11,6 +12,7 @@ import { FormStatusComponent } from './form-status/form-status.component';
         MultiselectComponent,
         LabelSelectComponent,
         FormStatusComponent,
+        EpisodeLinkFormComponent,
     ],
     imports: [SharedModule],
     exports: [
@@ -18,6 +20,7 @@ import { FormStatusComponent } from './form-status/form-status.component';
         MultiselectComponent,
         LabelSelectComponent,
         FormStatusComponent,
+        EpisodeLinkFormComponent,
     ],
 })
 export class DataEntrySharedModule {}
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
new file mode 100644
index 00000000..52188d68
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -0,0 +1,33 @@
+<div class="card">
+    <div class="card-header">
+        <div class="hstack gap-2">
+            <span class="card-title">
+                Title
+            </span>
+            <button class="btn btn-secondary ms-auto" aria-label="hide extra options">
+                <lc-icon [icon]="actionIcons.collapse" />
+            </button>
+            <button class="btn btn-primary" aria-label="edit episode">
+                <lc-icon [icon]="actionIcons.edit" />
+            </button>
+            <button class="btn btn-danger" aria-label="remove episode">
+                <lc-icon [icon]="actionIcons.remove" />
+            </button>
+        </div>
+    </div>
+    <div class="card-body">
+        <div class="mb-3">
+            <label [htmlFor]="sourceMentionInput" class="form-label">
+                How is this agent's involvement in the episode represented?
+            </label>
+            <select #sourceMentionInput class="form-select">
+                <option>Directly mentioned</option>
+                <option>Implied</option>
+            </select>
+        </div>
+        <div class="mb-3">
+            <label [htmlFor]="notesInput" class="form-label">Notes</label>
+            <textarea #notesInput class="form-control"></textarea>
+        </div>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.scss b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.spec.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.spec.ts
new file mode 100644
index 00000000..c5722b0c
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.spec.ts
@@ -0,0 +1,26 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EpisodeLinkFormComponent } from './episode-link-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+import { DataEntrySharedModule } from '../data-entry-shared.module';
+import { FormService } from '../form.service';
+
+describe('EpisodeLinkFormComponent', () => {
+    let component: EpisodeLinkFormComponent;
+    let fixture: ComponentFixture<EpisodeLinkFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [EpisodeLinkFormComponent],
+            imports: [SharedTestingModule, DataEntrySharedModule],
+            providers: [FormService]
+        });
+        fixture = TestBed.createComponent(EpisodeLinkFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
new file mode 100644
index 00000000..0bd4b61b
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { actionIcons } from '@shared/icons';
+
+@Component({
+    selector: 'lc-episode-link-form',
+    templateUrl: './episode-link-form.component.html',
+    styleUrls: ['./episode-link-form.component.scss']
+})
+export class EpisodeLinkFormComponent {
+    actionIcons = actionIcons;
+}

From 429a2ee27fbd9cabb399d00e36b40a624004f8c3 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 11:39:38 +0200
Subject: [PATCH 391/565] add episode agent links query

---
 backend/event/queries.py          | 14 ++++++++++++--
 frontend/generated/graphql.ts     |  6 ++++++
 frontend/generated/schema.graphql |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/backend/event/queries.py b/backend/event/queries.py
index 2d2ac838..0f5dda08 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -1,14 +1,15 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
-from event.models import Episode, EpisodeCategory
+from event.models import Episode, EpisodeCategory, EpisodeAgent
 from event.types.EpisodeCategoryType import EpisodeCategoryType
 from event.types.EpisodeType import EpisodeType
-
+from event.types.EpisodeAgentType import EpisodeAgentType
 
 class EventQueries(ObjectType):
     episode = Field(EpisodeType, id=ID(required=True))
     episodes = List(NonNull(EpisodeType), required=True, source_id=ID())
     episode_categories = List(NonNull(EpisodeCategoryType), required=True)
+    episode_agent_link = Field(EpisodeAgentType, id=ID(required=True))
 
     @staticmethod
     def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Episode | None:
@@ -32,3 +33,12 @@ def resolve_episode_categories(
         parent: None, info: ResolveInfo
     ) -> QuerySet[EpisodeCategory]:
         return EpisodeCategoryType.get_queryset(EpisodeCategory.objects, info).all()
+
+    @staticmethod
+    def resolve_episode_agent_link(
+        parent: None, info: ResolveInfo, id: str
+    ) -> EpisodeAgent | None:
+        try:
+            return EpisodeAgentType.get_queryset(EpisodeAgent.objects, info).get(id=id)
+        except EpisodeAgent.DoesNotExist:
+            return None
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 15a04527..59b9e32e 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -676,6 +676,7 @@ export type Query = {
   agentDescription?: Maybe<AgentDescriptionType>;
   agentDescriptions: Array<AgentDescriptionType>;
   episode?: Maybe<EpisodeType>;
+  episodeAgentLink?: Maybe<EpisodeAgentType>;
   episodeCategories: Array<EpisodeCategoryType>;
   episodes: Array<EpisodeType>;
   giftDescription?: Maybe<GiftDescriptionType>;
@@ -708,6 +709,11 @@ export type QueryEpisodeArgs = {
 };
 
 
+export type QueryEpisodeAgentLinkArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type QueryEpisodesArgs = {
   sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 85239e37..3566960b 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -662,6 +662,7 @@ type Query {
   agentDescription(id: ID!): AgentDescriptionType
   agentDescriptions(episodeId: ID, sourceId: ID): [AgentDescriptionType!]!
   episode(id: ID!): EpisodeType
+  episodeAgentLink(id: ID!): EpisodeAgentType
   episodeCategories: [EpisodeCategoryType!]!
   episodes(sourceId: ID): [EpisodeType!]!
   giftDescription(id: ID!): GiftDescriptionType

From f545a21c4a1c3aa91f7032996a03e9f38539d3b2 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 12:01:27 +0200
Subject: [PATCH 392/565] fetch data in episode link component

---
 frontend/generated/graphql.ts                 | 33 ++++++++++
 .../agent-episodes-form.component.html        |  3 +-
 .../episode-agent-link.graphql                | 13 ++++
 .../episode-link-form.component.ts            | 60 ++++++++++++++++++-
 frontend/src/app/data-entry/shared/types.d.ts |  2 +
 5 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 59b9e32e..a18b0bbc 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1310,6 +1310,13 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 
 export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
+export type EpisodeAgentQueryQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type EpisodeAgentQueryQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: EventEpisodeAgentSourceMentionChoices | null, episode: { __typename?: 'EpisodeType', id: string }, agent: { __typename?: 'AgentDescriptionType', id: string } } | null };
+
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1974,6 +1981,32 @@ export const DataEntrySpaceDescriptionDocument = gql`
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const EpisodeAgentQueryDocument = gql`
+    query EpisodeAgentQuery($id: ID!) {
+  episodeAgentLink(id: $id) {
+    id
+    note
+    sourceMention
+    episode {
+      id
+    }
+    agent {
+      id
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class EpisodeAgentQueryGQL extends Apollo.Query<EpisodeAgentQueryQuery, EpisodeAgentQueryQueryVariables> {
+    override document = EpisodeAgentQueryDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 315ca44e..217a4672 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -2,8 +2,7 @@
     <p>This agent is involved in the following episodes:</p>
     <ul>
         <li *ngFor="let item of data.agentDescription?.episodes">
-            <lc-episode-link-form />
-            {{item.id}}
+            <lc-episode-link-form [id]="item.id" entityType="agent" />
         </li>
     </ul>
 </ng-container>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql
new file mode 100644
index 00000000..f49db219
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql
@@ -0,0 +1,13 @@
+query EpisodeAgentQuery($id: ID!) {
+    episodeAgentLink(id: $id) {
+        id
+        note
+        sourceMention
+        episode {
+            id
+        }
+        agent {
+            id
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 0bd4b61b..9df1a245 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,11 +1,67 @@
-import { Component } from '@angular/core';
+import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { EntityType } from '../types';
+import { combineLatest, map, Observable, shareReplay, Subject, switchMap } from 'rxjs';
 import { actionIcons } from '@shared/icons';
+import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery } from 'generated/graphql';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+
+// const EPISODE_LINK_QUERIES: Record<EntityType, typeof EpisodeAgentQueryGQL> = {
+//     agent: EpisodeAgentQueryGQL,
+// };
 
 @Component({
     selector: 'lc-episode-link-form',
     templateUrl: './episode-link-form.component.html',
     styleUrls: ['./episode-link-form.component.scss']
 })
-export class EpisodeLinkFormComponent {
+export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
+    /** ID of the connection object (e.g. EpisodeAgent) */
+    @Input({ required: true }) id!: string;
+
+    /** Type of entity (agent, letter, etc.) */
+    @Input({ required: true }) entityType!: EntityType;
+
+    /** Describes the direction of the link in the document.
+     *
+     * The header will show the model that is being linked *to*; the model being linked
+     * *from* should be clear from the context.
+     */
+    @Input() linkTo: 'episode' | 'entity' = 'episode';
+
+    data$: Observable<EpisodeAgentQueryQuery | undefined>;
+
+    private entityQueries: Record<EntityType, EpisodeAgentQueryGQL>;
+    private query$ = new Subject<EpisodeAgentQueryGQL>();
+    private id$ = new Subject<string>;
+
     actionIcons = actionIcons;
+
+    constructor(
+        private agentQuery: EpisodeAgentQueryGQL,
+    ) {
+        this.entityQueries = {
+            agent: agentQuery,
+        };
+        this.data$ = combineLatest([this.query$, this.id$]).pipe(
+            switchMap(([query, id]) => query.watch({ id }).valueChanges),
+            map(result => result.data),
+            shareReplay(1),
+            takeUntilDestroyed(),
+        );
+        this.data$.subscribe();
+    }
+
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes['entityType']) {
+            this.query$.next(this.entityQueries[this.entityType]);
+        }
+        if (changes['id']) {
+            this.id$.next(this.id);
+        }
+    }
+
+    ngOnDestroy(): void {
+        this.query$.complete();
+        this.id$.complete();
+    }
 }
diff --git a/frontend/src/app/data-entry/shared/types.d.ts b/frontend/src/app/data-entry/shared/types.d.ts
index 38e67f13..c4d6000e 100644
--- a/frontend/src/app/data-entry/shared/types.d.ts
+++ b/frontend/src/app/data-entry/shared/types.d.ts
@@ -1 +1,3 @@
 export type FormStatus = 'idle' | 'invalid' | 'loading' | 'saved' | 'error';
+
+export type EntityType = 'agent';

From edb0751c81f44ed8d798f2f4093a6d9b6643445f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 12:05:39 +0200
Subject: [PATCH 393/565] show name in card

---
 frontend/generated/graphql.ts                            | 4 +++-
 .../shared/episode-link-form/episode-agent-link.graphql  | 2 ++
 .../episode-link-form/episode-link-form.component.html   | 9 +++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index a18b0bbc..679ce088 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1315,7 +1315,7 @@ export type EpisodeAgentQueryQueryVariables = Exact<{
 }>;
 
 
-export type EpisodeAgentQueryQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: EventEpisodeAgentSourceMentionChoices | null, episode: { __typename?: 'EpisodeType', id: string }, agent: { __typename?: 'AgentDescriptionType', id: string } } | null };
+export type EpisodeAgentQueryQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: EventEpisodeAgentSourceMentionChoices | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, agent: { __typename?: 'AgentDescriptionType', id: string, name: string } } | null };
 
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1993,9 +1993,11 @@ export const EpisodeAgentQueryDocument = gql`
     sourceMention
     episode {
       id
+      name
     }
     agent {
       id
+      name
     }
   }
 }
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql
index f49db219..63a449d7 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql
@@ -5,9 +5,11 @@ query EpisodeAgentQuery($id: ID!) {
         sourceMention
         episode {
             id
+            name
         }
         agent {
             id
+            name
         }
     }
 }
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 52188d68..ebf98aa3 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -1,8 +1,13 @@
-<div class="card">
+<div class="card" *ngIf="data$ | async as data">
     <div class="card-header">
         <div class="hstack gap-2">
             <span class="card-title">
-                Title
+                <span *ngIf="linkTo === 'episode'; else entityName">
+                    {{ data.episodeAgentLink?.episode?.name }}
+                </span>
+                <ng-template #entityName>
+                    {{ data.episodeAgentLink?.agent?.name }}
+                </ng-template>
             </span>
             <button class="btn btn-secondary ms-auto" aria-label="hide extra options">
                 <lc-icon [icon]="actionIcons.collapse" />

From fb4f3a5b8b657dc34b094ef2ae80debb926128f7 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 12:16:04 +0200
Subject: [PATCH 394/565] add related form link

---
 .../episode-link-form.component.html          | 16 +++++++-------
 .../episode-link-form.component.ts            | 21 +++++++++++++++----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index ebf98aa3..63fda734 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -2,19 +2,19 @@
     <div class="card-header">
         <div class="hstack gap-2">
             <span class="card-title">
-                <span *ngIf="linkTo === 'episode'; else entityName">
-                    {{ data.episodeAgentLink?.episode?.name }}
-                </span>
-                <ng-template #entityName>
-                    {{ data.episodeAgentLink?.agent?.name }}
-                </ng-template>
+                {{ linkedObject(linkTo, data)?.name }}
             </span>
             <button class="btn btn-secondary ms-auto" aria-label="hide extra options">
                 <lc-icon [icon]="actionIcons.collapse" />
             </button>
-            <button class="btn btn-primary" aria-label="edit episode">
+            <a class="btn btn-primary" aria-label="edit episode"
+                [routerLink]="[
+                    '/data-entry',
+                    formUrl(linkTo, entityType),
+                    linkedObject(linkTo, data)?.id
+                ]">
                 <lc-icon [icon]="actionIcons.edit" />
-            </button>
+            </a>
             <button class="btn btn-danger" aria-label="remove episode">
                 <lc-icon [icon]="actionIcons.remove" />
             </button>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 9df1a245..4f22091b 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -5,9 +5,7 @@ import { actionIcons } from '@shared/icons';
 import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
-// const EPISODE_LINK_QUERIES: Record<EntityType, typeof EpisodeAgentQueryGQL> = {
-//     agent: EpisodeAgentQueryGQL,
-// };
+type LinkTo = 'episode' | 'agent';
 
 @Component({
     selector: 'lc-episode-link-form',
@@ -26,7 +24,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
      * The header will show the model that is being linked *to*; the model being linked
      * *from* should be clear from the context.
      */
-    @Input() linkTo: 'episode' | 'entity' = 'episode';
+    @Input() linkTo: LinkTo = 'episode';
 
     data$: Observable<EpisodeAgentQueryQuery | undefined>;
 
@@ -64,4 +62,19 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         this.query$.complete();
         this.id$.complete();
     }
+
+    formUrl(linkTo: LinkTo, entityType: EntityType): string {
+        if (linkTo == 'episode') {
+            return 'episodes';
+        }
+        return 'agents';
+    }
+
+    linkedObject(linkTo: LinkTo, data: EpisodeAgentQueryQuery) {
+        if (linkTo === 'episode') {
+            return data.episodeAgentLink?.episode;
+        } else {
+            return data.episodeAgentLink?.agent;
+        }
+    }
 }

From a1ef259e3c0cd05b87ac42407e37774bf40dcace Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 13:14:13 +0200
Subject: [PATCH 395/565] fetch form data

---
 .../episode-link-form.component.html          | 17 ++++++++-----
 .../episode-link-form.component.ts            | 24 ++++++++++++++++---
 frontend/src/app/data-entry/shared/types.d.ts |  2 ++
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 63fda734..1dbd77e7 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -20,19 +20,24 @@
             </button>
         </div>
     </div>
-    <div class="card-body">
+    <form class="card-body" [formGroup]="form">
         <div class="mb-3">
             <label [htmlFor]="sourceMentionInput" class="form-label">
                 How is this agent's involvement in the episode represented?
             </label>
-            <select #sourceMentionInput class="form-select">
-                <option>Directly mentioned</option>
-                <option>Implied</option>
+            <select #sourceMentionInput class="form-select"
+                [formControl]="form.controls.sourceMention">
+                <option *ngFor="let option of sourceMentionOptions"
+                    [ngValue]="option.value">
+                    {{ option.label }}
+                </option>
             </select>
         </div>
         <div class="mb-3">
             <label [htmlFor]="notesInput" class="form-label">Notes</label>
-            <textarea #notesInput class="form-control"></textarea>
+            <textarea #notesInput class="form-control"
+                [formControl]="form.controls.note">
+            </textarea>
         </div>
-    </div>
+    </form>
 </div>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 4f22091b..ea608ed8 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,9 +1,11 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
-import { EntityType } from '../types';
+import { EntityType, SelectOptions } from '../types';
 import { combineLatest, map, Observable, shareReplay, Subject, switchMap } from 'rxjs';
 import { actionIcons } from '@shared/icons';
-import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery } from 'generated/graphql';
+import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery, EventEpisodeAgentSourceMentionChoices } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { FormControl, FormGroup } from '@angular/forms';
+
 
 type LinkTo = 'episode' | 'agent';
 
@@ -27,6 +29,15 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     @Input() linkTo: LinkTo = 'episode';
 
     data$: Observable<EpisodeAgentQueryQuery | undefined>;
+    form = new FormGroup({
+        sourceMention: new FormControl<EventEpisodeAgentSourceMentionChoices>(EventEpisodeAgentSourceMentionChoices.Direct),
+        note: new FormControl<string>('', { nonNullable: true }),
+    });
+
+    sourceMentionOptions: SelectOptions<EventEpisodeAgentSourceMentionChoices> = [
+        { value: EventEpisodeAgentSourceMentionChoices.Direct, label: 'Directly mentioned' },
+        { value: EventEpisodeAgentSourceMentionChoices.Implied, label: 'Implied' }
+    ];
 
     private entityQueries: Record<EntityType, EpisodeAgentQueryGQL>;
     private query$ = new Subject<EpisodeAgentQueryGQL>();
@@ -46,7 +57,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
             shareReplay(1),
             takeUntilDestroyed(),
         );
-        this.data$.subscribe();
+        this.data$.subscribe(this.updateFormValues.bind(this));
     }
 
     ngOnChanges(changes: SimpleChanges): void {
@@ -77,4 +88,11 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
             return data.episodeAgentLink?.agent;
         }
     }
+
+    private updateFormValues(data?: EpisodeAgentQueryQuery): void {
+        this.form.setValue({
+            sourceMention: data?.episodeAgentLink?.sourceMention || EventEpisodeAgentSourceMentionChoices.Direct,
+            note: data?.episodeAgentLink?.note || '',
+        });
+    }
 }
diff --git a/frontend/src/app/data-entry/shared/types.d.ts b/frontend/src/app/data-entry/shared/types.d.ts
index c4d6000e..cd94fb8d 100644
--- a/frontend/src/app/data-entry/shared/types.d.ts
+++ b/frontend/src/app/data-entry/shared/types.d.ts
@@ -1,3 +1,5 @@
 export type FormStatus = 'idle' | 'invalid' | 'loading' | 'saved' | 'error';
 
 export type EntityType = 'agent';
+
+export type SelectOptions<T> = { value: T, label: string }[];

From 6a2814b4144df437ffd55b23899bd487d31fc11d Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 13:51:33 +0200
Subject: [PATCH 396/565] add css class, rename graphql file

---
 .../agent-episodes-form/agent-episodes-form.component.html      | 2 +-
 .../{episode-agent-link.graphql => episode-link.graphql}        | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename frontend/src/app/data-entry/shared/episode-link-form/{episode-agent-link.graphql => episode-link.graphql} (100%)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 217a4672..a92081de 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="data$ | async as data">
     <p>This agent is involved in the following episodes:</p>
-    <ul>
+    <ul class="list-unstyled">
         <li *ngFor="let item of data.agentDescription?.episodes">
             <lc-episode-link-form [id]="item.id" entityType="agent" />
         </li>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
similarity index 100%
rename from frontend/src/app/data-entry/shared/episode-link-form/episode-agent-link.graphql
rename to frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql

From 36fc19753a6e6352cbf37d0a122fcd81711b4c56 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 13:58:25 +0200
Subject: [PATCH 397/565] add collapse function

---
 .../episode-link-form/episode-link-form.component.html    | 8 +++++---
 .../episode-link-form/episode-link-form.component.ts      | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 1dbd77e7..2f79142f 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -4,8 +4,10 @@
             <span class="card-title">
                 {{ linkedObject(linkTo, data)?.name }}
             </span>
-            <button class="btn btn-secondary ms-auto" aria-label="hide extra options">
-                <lc-icon [icon]="actionIcons.collapse" />
+            <button class="btn btn-secondary ms-auto"
+                [attr.aria-label]="(collapsed ? 'show' : 'hide') + ' additional questions'"
+                (click)="collapsed = !collapsed">
+                <lc-icon [icon]="collapsed ? actionIcons.expand : actionIcons.collapse" />
             </button>
             <a class="btn btn-primary" aria-label="edit episode"
                 [routerLink]="[
@@ -20,7 +22,7 @@
             </button>
         </div>
     </div>
-    <form class="card-body" [formGroup]="form">
+    <form class="card-body" [formGroup]="form" [ngbCollapse]="collapsed">
         <div class="mb-3">
             <label [htmlFor]="sourceMentionInput" class="form-label">
                 How is this agent's involvement in the episode represented?
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index ea608ed8..09d11f23 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -28,6 +28,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
      */
     @Input() linkTo: LinkTo = 'episode';
 
+    collapsed = true;
     data$: Observable<EpisodeAgentQueryQuery | undefined>;
     form = new FormGroup({
         sourceMention: new FormControl<EventEpisodeAgentSourceMentionChoices>(EventEpisodeAgentSourceMentionChoices.Direct),

From 9f4410cf90ccbcddd072ef212f6e17d78dd29ec4 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 14:07:28 +0200
Subject: [PATCH 398/565] cards styling

---
 .../agent-episodes-form/agent-episodes-form.component.html   | 2 +-
 .../episode-link-form/episode-link-form.component.html       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index a92081de..76ba26c3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngIf="data$ | async as data">
     <p>This agent is involved in the following episodes:</p>
-    <ul class="list-unstyled">
+    <ul class="list-unstyled vstack gap-4">
         <li *ngFor="let item of data.agentDescription?.episodes">
             <lc-episode-link-form [id]="item.id" entityType="agent" />
         </li>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 2f79142f..15429293 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -1,7 +1,8 @@
 <div class="card" *ngIf="data$ | async as data">
-    <div class="card-header">
+    <div class="card-header"
+        [class.border-bottom-0]="collapsed">
         <div class="hstack gap-2">
-            <span class="card-title">
+            <span>
                 {{ linkedObject(linkTo, data)?.name }}
             </span>
             <button class="btn btn-secondary ms-auto"

From c7da5b56bb24443e97c84ed075a0568cdc93e793 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 14:12:40 +0200
Subject: [PATCH 399/565] fix episode filter

---
 frontend/generated/graphql.ts                                | 5 ++++-
 .../agent-episodes-form/agent-episodes-form.component.ts     | 2 +-
 .../agent-form/agent-episodes-form/agent-episodes.graphql    | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 679ce088..aeb51aad 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1146,7 +1146,7 @@ export type DataEntryAgentEpisodesQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes?: Array<{ __typename?: 'EpisodeAgentType', id: string } | null> | null } | null };
+export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeAgentType', id: string, episode: { __typename?: 'EpisodeType', id: string } }> } | null };
 
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1430,6 +1430,9 @@ export const DataEntryAgentEpisodesDocument = gql`
     }
     episodes {
       id
+      episode {
+        id
+      }
     }
   }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 7f55769b..27e5d473 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -34,7 +34,7 @@ export class AgentEpisodesFormComponent {
         data: DataEntryAgentEpisodesQuery
     ): { name: string, id: string }[] {
         const allEpisodes = data.agentDescription?.source.episodes || [];
-        const linkedEpisodeIDs = data.agentDescription?.episodes.map(ep => ep.id) || [];
+        const linkedEpisodeIDs = data.agentDescription?.episodes.map(ep => ep.episode.id) || [];
         return allEpisodes.filter(episode => !linkedEpisodeIDs.includes(episode.id));
     }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
index 794a582e..39fc2555 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -10,6 +10,9 @@ query DataEntryAgentEpisodes($id: ID!) {
         }
         episodes {
             id
+            episode {
+                id
+            }
         }
     }
 }

From 5319f0684fff2b0ff1169fbfdb09b82d4f94347e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 15:16:16 +0200
Subject: [PATCH 400/565] source mention enum outfactor

---
 backend/core/models.py                        |   2 +-
 backend/core/types/DescriptionFieldType.py    |   6 +-
 ...er_episodeagent_source_mention_and_more.py |  33 ++++++
 ...riptioncategory_source_mention_and_more.py |  23 ++++
 ...scriptiongender_source_mention_and_more.py |  23 ++++
 .../person/mutations/UpdateAgentMutation.py   |   5 +-
 ...ter_regionfield_source_mention_and_more.py |  28 +++++
 frontend/generated/graphql.ts                 |  92 ++--------------
 frontend/generated/schema.graphql             | 104 ++----------------
 .../agent-description-form.component.ts       |  24 ++--
 .../episode-link-form.component.ts            |  12 +-
 .../shared/{types.d.ts => types.ts}           |   0
 12 files changed, 151 insertions(+), 201 deletions(-)
 create mode 100644 backend/event/migrations/0024_alter_episodeagent_source_mention_and_more.py
 create mode 100644 backend/letter/migrations/0019_alter_giftdescriptioncategory_source_mention_and_more.py
 create mode 100644 backend/person/migrations/0021_alter_agentdescriptiongender_source_mention_and_more.py
 create mode 100644 backend/space/migrations/0018_alter_regionfield_source_mention_and_more.py
 rename frontend/src/app/data-entry/shared/{types.d.ts => types.ts} (100%)

diff --git a/backend/core/models.py b/backend/core/models.py
index ffa0fb9b..dae5a447 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -195,8 +195,8 @@ class DescriptionField(Field, models.Model):
 
     source_mention = models.CharField(
         max_length=32,
-        blank=True,
         choices=SourceMention.choices,
+        default=SourceMention.DIRECT,
         help_text="How is this information presented in the text?",
     )
 
diff --git a/backend/core/types/DescriptionFieldType.py b/backend/core/types/DescriptionFieldType.py
index c2b9a6ff..d173c58c 100644
--- a/backend/core/types/DescriptionFieldType.py
+++ b/backend/core/types/DescriptionFieldType.py
@@ -1,7 +1,9 @@
-from core.models import DescriptionField
+from core.models import DescriptionField, SourceMention
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.FieldType import LettercraftFieldType
+from graphene import Enum
 
+SourceMentionEnum = Enum.from_enum(SourceMention)
 
 class DescriptionFieldType(LettercraftFieldType, AbstractDjangoObjectType):
     """
@@ -9,6 +11,8 @@ class DescriptionFieldType(LettercraftFieldType, AbstractDjangoObjectType):
     Should not be queried directly, but should be extended by other types.
     """
 
+    source_mention = SourceMentionEnum()
+
     class Meta:
         model = DescriptionField
         fields = [
diff --git a/backend/event/migrations/0024_alter_episodeagent_source_mention_and_more.py b/backend/event/migrations/0024_alter_episodeagent_source_mention_and_more.py
new file mode 100644
index 00000000..afb0269f
--- /dev/null
+++ b/backend/event/migrations/0024_alter_episodeagent_source_mention_and_more.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2.7 on 2024-09-03 13:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('event', '0023_alter_episode_categories'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='episodeagent',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='episodegift',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='episodeletter',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='episodespace',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+    ]
diff --git a/backend/letter/migrations/0019_alter_giftdescriptioncategory_source_mention_and_more.py b/backend/letter/migrations/0019_alter_giftdescriptioncategory_source_mention_and_more.py
new file mode 100644
index 00000000..b1d690a1
--- /dev/null
+++ b/backend/letter/migrations/0019_alter_giftdescriptioncategory_source_mention_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-09-03 13:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('letter', '0018_giftdescription_contributors_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='giftdescriptioncategory',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='letterdescriptioncategory',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+    ]
diff --git a/backend/person/migrations/0021_alter_agentdescriptiongender_source_mention_and_more.py b/backend/person/migrations/0021_alter_agentdescriptiongender_source_mention_and_more.py
new file mode 100644
index 00000000..c2f8d4f0
--- /dev/null
+++ b/backend/person/migrations/0021_alter_agentdescriptiongender_source_mention_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-09-03 13:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0020_agentdescription_contributors_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='agentdescriptiongender',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='agentdescriptionlocation',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+    ]
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 880e1c7a..19abaf9d 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -21,16 +21,17 @@
     ReverseOneToOneDescriptor,
     ForwardOneToOneDescriptor,
 )
+from core.types.DescriptionFieldType import SourceMentionEnum
 
 class UpdateAgentGenderInput(InputObjectType):
     gender = Enum.from_enum(Gender)()
-    source_mention = Enum.from_enum(SourceMention)()
+    source_mention = SourceMentionEnum()
     note = String()
 
 
 class UpdateAgentLocationInput(InputObjectType):
     location = ID()
-    source_mention = Enum.from_enum(SourceMention)()
+    source_mention = SourceMentionEnum()
     note = String()
 
 
diff --git a/backend/space/migrations/0018_alter_regionfield_source_mention_and_more.py b/backend/space/migrations/0018_alter_regionfield_source_mention_and_more.py
new file mode 100644
index 00000000..238b0ef2
--- /dev/null
+++ b/backend/space/migrations/0018_alter_regionfield_source_mention_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.7 on 2024-09-03 13:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('space', '0017_region_contributors_settlement_contributors_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='regionfield',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='settlementfield',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='structurefield',
+            name='source_mention',
+            field=models.CharField(choices=[('direct', 'directly mentioned'), ('implied', 'implied')], default='direct', help_text='How is this information presented in the text?', max_length=32),
+        ),
+    ]
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index aeb51aad..52801c68 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -27,8 +27,7 @@ export type AgentDescriptionGenderType = {
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
 };
 
 export type AgentDescriptionLocationType = {
@@ -41,8 +40,7 @@ export type AgentDescriptionLocationType = {
   location: SpaceDescriptionType;
   /** Additional notes */
   note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
 };
 
 export type AgentDescriptionType = {
@@ -176,8 +174,7 @@ export type EpisodeAgentType = {
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<EventEpisodeAgentSourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
 };
 
 export type EpisodeCategoryType = {
@@ -232,14 +229,6 @@ export enum EventEpisodeAgentCertaintyChoices {
   A_2 = 'A_2'
 }
 
-/** An enumeration. */
-export enum EventEpisodeAgentSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
   /** directly mentioned */
@@ -283,8 +272,7 @@ export type GiftDescriptionCategoryType = {
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
 };
 
 export type GiftDescriptionType = {
@@ -349,8 +337,7 @@ export type LetterDescriptionCategoryType = {
   letter: LetterDescriptionType;
   /** Additional notes */
   note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
 };
 
 export type LetterDescriptionType = {
@@ -387,14 +374,6 @@ export enum LetterGiftDescriptionCategoryCertaintyChoices {
   A_2 = 'A_2'
 }
 
-/** An enumeration. */
-export enum LetterGiftDescriptionCategorySourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum LetterGiftDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -413,14 +392,6 @@ export enum LetterLetterDescriptionCategoryCertaintyChoices {
   A_2 = 'A_2'
 }
 
-/** An enumeration. */
-export enum LetterLetterDescriptionCategorySourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum LetterLetterDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -560,14 +531,6 @@ export enum PersonAgentDescriptionGenderGenderChoices {
   Unknown = 'UNKNOWN'
 }
 
-/** An enumeration. */
-export enum PersonAgentDescriptionGenderSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum PersonAgentDescriptionLocationCertaintyChoices {
   /** uncertain */
@@ -578,14 +541,6 @@ export enum PersonAgentDescriptionLocationCertaintyChoices {
   A_2 = 'A_2'
 }
 
-/** An enumeration. */
-export enum PersonAgentDescriptionLocationSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -768,8 +723,7 @@ export type RegionFieldType = {
   /** Additional notes */
   note: Scalars['String']['output'];
   region: RegionType;
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
   space: SpaceDescriptionType;
 };
 
@@ -795,8 +749,7 @@ export type SettlementFieldType = {
   /** Additional notes */
   note: Scalars['String']['output'];
   settlement: SettlementType;
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
   space: SpaceDescriptionType;
 };
 
@@ -905,14 +858,6 @@ export enum SpaceRegionFieldCertaintyChoices {
   A_2 = 'A_2'
 }
 
-/** An enumeration. */
-export enum SpaceRegionFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum SpaceRegionTypeChoices {
   /** ecclesiastical */
@@ -933,14 +878,6 @@ export enum SpaceSettlementFieldCertaintyChoices {
   A_2 = 'A_2'
 }
 
-/** An enumeration. */
-export enum SpaceSettlementFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum SpaceSpaceDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -959,14 +896,6 @@ export enum SpaceStructureFieldCertaintyChoices {
   A_2 = 'A_2'
 }
 
-/** An enumeration. */
-export enum SpaceStructureFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
-}
-
 /** An enumeration. */
 export enum SpaceStructureLevelChoices {
   /** road, square, crossroad */
@@ -988,8 +917,7 @@ export type StructureFieldType = {
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
+  sourceMention?: Maybe<SourceMention>;
   space: SpaceDescriptionType;
   structure: StructureType;
 };
@@ -1132,7 +1060,7 @@ export type DataEntryAgentDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
+export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: SourceMention | null, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention?: SourceMention | null, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
 
 export type LocationsInSourceListQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1315,7 +1243,7 @@ export type EpisodeAgentQueryQueryVariables = Exact<{
 }>;
 
 
-export type EpisodeAgentQueryQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: EventEpisodeAgentSourceMentionChoices | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, agent: { __typename?: 'AgentDescriptionType', id: string, name: string } } | null };
+export type EpisodeAgentQueryQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: SourceMention | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, agent: { __typename?: 'AgentDescriptionType', id: string, name: string } } | null };
 
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
   id: Scalars['ID']['input'];
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 3566960b..b0c7dad5 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -12,9 +12,7 @@ type AgentDescriptionGenderType {
 
   """Additional notes"""
   note: String!
-
-  """How is this information presented in the text?"""
-  sourceMention: PersonAgentDescriptionGenderSourceMentionChoices
+  sourceMention: SourceMention
 }
 
 type AgentDescriptionLocationType {
@@ -29,9 +27,7 @@ type AgentDescriptionLocationType {
 
   """Additional notes"""
   note: String!
-
-  """How is this information presented in the text?"""
-  sourceMention: PersonAgentDescriptionLocationSourceMentionChoices
+  sourceMention: SourceMention
 }
 
 type AgentDescriptionType {
@@ -165,9 +161,7 @@ type EpisodeAgentType {
 
   """Additional notes"""
   note: String!
-
-  """How is this information presented in the text?"""
-  sourceMention: EventEpisodeAgentSourceMentionChoices
+  sourceMention: SourceMention
 }
 
 type EpisodeCategoryType {
@@ -237,15 +231,6 @@ enum EventEpisodeAgentCertaintyChoices {
   A_2
 }
 
-"""An enumeration."""
-enum EventEpisodeAgentSourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum EventEpisodeSourceMentionChoices {
   """directly mentioned"""
@@ -291,9 +276,7 @@ type GiftDescriptionCategoryType {
 
   """Additional notes"""
   note: String!
-
-  """How is this information presented in the text?"""
-  sourceMention: LetterGiftDescriptionCategorySourceMentionChoices
+  sourceMention: SourceMention
 }
 
 type GiftDescriptionType {
@@ -370,9 +353,7 @@ type LetterDescriptionCategoryType {
 
   """Additional notes"""
   note: String!
-
-  """How is this information presented in the text?"""
-  sourceMention: LetterLetterDescriptionCategorySourceMentionChoices
+  sourceMention: SourceMention
 }
 
 type LetterDescriptionType {
@@ -419,15 +400,6 @@ enum LetterGiftDescriptionCategoryCertaintyChoices {
   A_2
 }
 
-"""An enumeration."""
-enum LetterGiftDescriptionCategorySourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum LetterGiftDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -449,15 +421,6 @@ enum LetterLetterDescriptionCategoryCertaintyChoices {
   A_2
 }
 
-"""An enumeration."""
-enum LetterLetterDescriptionCategorySourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum LetterLetterDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -524,15 +487,6 @@ enum PersonAgentDescriptionGenderGenderChoices {
   UNKNOWN
 }
 
-"""An enumeration."""
-enum PersonAgentDescriptionGenderSourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum PersonAgentDescriptionLocationCertaintyChoices {
   """uncertain"""
@@ -545,15 +499,6 @@ enum PersonAgentDescriptionLocationCertaintyChoices {
   A_2
 }
 
-"""An enumeration."""
-enum PersonAgentDescriptionLocationSourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum PersonAgentDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -686,9 +631,7 @@ type RegionFieldType {
   """Additional notes"""
   note: String!
   region: RegionType!
-
-  """How is this information presented in the text?"""
-  sourceMention: SpaceRegionFieldSourceMentionChoices
+  sourceMention: SourceMention
   space: SpaceDescriptionType!
 }
 
@@ -719,9 +662,7 @@ type SettlementFieldType {
   """Additional notes"""
   note: String!
   settlement: SettlementType!
-
-  """How is this information presented in the text?"""
-  sourceMention: SpaceSettlementFieldSourceMentionChoices
+  sourceMention: SourceMention
   space: SpaceDescriptionType!
 }
 
@@ -859,15 +800,6 @@ enum SpaceRegionFieldCertaintyChoices {
   A_2
 }
 
-"""An enumeration."""
-enum SpaceRegionFieldSourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum SpaceRegionTypeChoices {
   """ecclesiastical"""
@@ -892,15 +824,6 @@ enum SpaceSettlementFieldCertaintyChoices {
   A_2
 }
 
-"""An enumeration."""
-enum SpaceSettlementFieldSourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum SpaceSpaceDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -922,15 +845,6 @@ enum SpaceStructureFieldCertaintyChoices {
   A_2
 }
 
-"""An enumeration."""
-enum SpaceStructureFieldSourceMentionChoices {
-  """directly mentioned"""
-  DIRECT
-
-  """implied"""
-  IMPLIED
-}
-
 """An enumeration."""
 enum SpaceStructureLevelChoices {
   """road, square, crossroad"""
@@ -956,9 +870,7 @@ type StructureFieldType {
 
   """Additional notes"""
   note: String!
-
-  """How is this information presented in the text?"""
-  sourceMention: SpaceStructureFieldSourceMentionChoices
+  sourceMention: SourceMention
   space: SpaceDescriptionType!
   structure: StructureType!
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 9704d1a2..1c44b50a 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -10,11 +10,9 @@ import {
     DataEntryUpdateAgentMutation,
     Gender,
     PersonAgentDescriptionGenderGenderChoices as GenderChoices,
-    PersonAgentDescriptionGenderSourceMentionChoices as GenderSourceMentionChoices,
+    SourceMention,
     LocationsInSourceListGQL,
     LocationsInSourceListQuery,
-    PersonAgentDescriptionSourceMentionChoices as LocationSourceMentionChoices,
-    SourceMention,
     UpdateAgentInput,
 } from 'generated/graphql';
 import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinctUntilChanged, withLatestFrom, BehaviorSubject, tap, skip } from 'rxjs';
@@ -37,27 +35,27 @@ export class AgentDescriptionFormComponent implements OnDestroy {
         { value: GenderChoices.Unknown, label: 'Unknown' }
     ];
 
-    genderSourceMentionOptions: { value: GenderSourceMentionChoices, label: string }[] = [
-        { value: GenderSourceMentionChoices.Direct, label: 'Mentioned' },
-        { value: GenderSourceMentionChoices.Implied, label: 'Implied' },
+    genderSourceMentionOptions: { value: SourceMention, label: string }[] = [
+        { value: SourceMention.Direct, label: 'Mentioned' },
+        { value: SourceMention.Implied, label: 'Implied' },
     ];
 
-    locationSourceMentionOptions: { value: LocationSourceMentionChoices, label: string }[] = [
-        { value: LocationSourceMentionChoices.Direct, label: 'Mentioned' },
-        { value: LocationSourceMentionChoices.Implied, label: 'Implied' },
+    locationSourceMentionOptions: { value: SourceMention, label: string }[] = [
+        { value: SourceMention.Direct, label: 'Mentioned' },
+        { value: SourceMention.Implied, label: 'Implied' },
     ];
 
     form = new FormGroup({
         designators: new FormControl<string[]>([], { nonNullable: true }),
         gender: new FormGroup({
             gender: new FormControl<string>(GenderChoices.Unknown),
-            sourceMention: new FormControl<string>(GenderSourceMentionChoices.Direct),
+            sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
             note: new FormControl<string>(''),
         }),
         location: new FormGroup({
             hasLocation: new FormControl<boolean>(false, { nonNullable: true }),
             location: new FormControl<string | null>(null),
-            sourceMention: new FormControl<string>(LocationSourceMentionChoices.Direct),
+            sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
             note: new FormControl<string>(''),
         })
     });
@@ -115,13 +113,13 @@ export class AgentDescriptionFormComponent implements OnDestroy {
             designators: data.agentDescription?.designators || [],
             gender: {
                 gender: data.agentDescription?.gender?.gender || GenderChoices.Unknown,
-                sourceMention: data.agentDescription?.gender?.sourceMention || GenderSourceMentionChoices.Direct,
+                sourceMention: data.agentDescription?.gender?.sourceMention || SourceMention.Direct,
                 note: data.agentDescription?.gender?.note || '',
             },
             location: {
                 hasLocation: data.agentDescription?.location !== null,
                 location: data.agentDescription?.location?.location.id || null,
-                sourceMention: data.agentDescription?.location?.sourceMention || LocationSourceMentionChoices.Direct,
+                sourceMention: data.agentDescription?.location?.sourceMention || SourceMention.Direct,
                 note: data.agentDescription?.location?.note || '',
             }
         });
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 09d11f23..82c1d0fb 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/
 import { EntityType, SelectOptions } from '../types';
 import { combineLatest, map, Observable, shareReplay, Subject, switchMap } from 'rxjs';
 import { actionIcons } from '@shared/icons';
-import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery, EventEpisodeAgentSourceMentionChoices } from 'generated/graphql';
+import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery, SourceMention } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
 
@@ -31,13 +31,13 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     collapsed = true;
     data$: Observable<EpisodeAgentQueryQuery | undefined>;
     form = new FormGroup({
-        sourceMention: new FormControl<EventEpisodeAgentSourceMentionChoices>(EventEpisodeAgentSourceMentionChoices.Direct),
+        sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
         note: new FormControl<string>('', { nonNullable: true }),
     });
 
-    sourceMentionOptions: SelectOptions<EventEpisodeAgentSourceMentionChoices> = [
-        { value: EventEpisodeAgentSourceMentionChoices.Direct, label: 'Directly mentioned' },
-        { value: EventEpisodeAgentSourceMentionChoices.Implied, label: 'Implied' }
+    sourceMentionOptions: SelectOptions<SourceMention> = [
+        { value: SourceMention.Direct, label: 'Directly mentioned' },
+        { value: SourceMention.Implied, label: 'Implied' }
     ];
 
     private entityQueries: Record<EntityType, EpisodeAgentQueryGQL>;
@@ -92,7 +92,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
 
     private updateFormValues(data?: EpisodeAgentQueryQuery): void {
         this.form.setValue({
-            sourceMention: data?.episodeAgentLink?.sourceMention || EventEpisodeAgentSourceMentionChoices.Direct,
+            sourceMention: data?.episodeAgentLink?.sourceMention || SourceMention.Direct,
             note: data?.episodeAgentLink?.note || '',
         });
     }
diff --git a/frontend/src/app/data-entry/shared/types.d.ts b/frontend/src/app/data-entry/shared/types.ts
similarity index 100%
rename from frontend/src/app/data-entry/shared/types.d.ts
rename to frontend/src/app/data-entry/shared/types.ts

From 6c728e8c400916a5c99b5a1ac32498f4f2cc3768 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 15:35:07 +0200
Subject: [PATCH 401/565] data migration

---
 .../0025_fill_in_blank_sourcemention.py       | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 backend/event/migrations/0025_fill_in_blank_sourcemention.py

diff --git a/backend/event/migrations/0025_fill_in_blank_sourcemention.py b/backend/event/migrations/0025_fill_in_blank_sourcemention.py
new file mode 100644
index 00000000..c30fdeb4
--- /dev/null
+++ b/backend/event/migrations/0025_fill_in_blank_sourcemention.py
@@ -0,0 +1,40 @@
+# Generated by Django 4.2.7 on 2024-09-03 13:19
+
+from django.db import migrations
+from typing import Type
+from core.models import DescriptionField, SourceMention
+
+
+def fill_in_blank_source_mention(Model: Type[DescriptionField]):
+    Model.objects.filter(source_mention="").update(source_mention=SourceMention.DIRECT)
+
+
+def fill_in_source_mention_defaults(apps, schema_editor):
+    models = [
+        apps.get_model("event", "EpisodeAgent"),
+        apps.get_model("event", "EpisodeLetter"),
+        apps.get_model("event", "EpisodeGift"),
+        apps.get_model("event", "EpisodeSpace"),
+        apps.get_model("person", "AgentDescriptionGender"),
+        apps.get_model("person", "AgentDescriptionLocation"),
+        apps.get_model("letter", "LetterDescriptionCategory"),
+        apps.get_model("letter", "GiftDescriptionCategory"),
+    ]
+
+    for Model in models:
+        fill_in_blank_source_mention(Model)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("event", "0024_alter_episodeagent_source_mention_and_more"),
+        ("person", "0021_alter_agentdescriptiongender_source_mention_and_more"),
+        ("letter", "0019_alter_giftdescriptioncategory_source_mention_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            fill_in_source_mention_defaults, migrations.RunPython.noop
+        ),
+    ]

From bf165ab487294ebbd68598023f6ae98f720415a4 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 16:08:20 +0200
Subject: [PATCH 402/565] add mutations

---
 .../mutations/CreateEpisodeAgentMutation.py   | 70 +++++++++++++++++++
 .../mutations/DeleteEpisodeAgentMutation.py   | 37 ++++++++++
 backend/graphql_app/schema.py                 |  4 ++
 3 files changed, 111 insertions(+)
 create mode 100644 backend/event/mutations/CreateEpisodeAgentMutation.py
 create mode 100644 backend/event/mutations/DeleteEpisodeAgentMutation.py

diff --git a/backend/event/mutations/CreateEpisodeAgentMutation.py b/backend/event/mutations/CreateEpisodeAgentMutation.py
new file mode 100644
index 00000000..12b8df01
--- /dev/null
+++ b/backend/event/mutations/CreateEpisodeAgentMutation.py
@@ -0,0 +1,70 @@
+from graphene import (
+    ID,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+)
+
+from person.models import AgentDescription
+from event.models import Episode, EpisodeAgent
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from django.core.exceptions import ValidationError
+from django.db import transaction
+
+
+class CreateEpisodeAgentInput(InputObjectType):
+    agent = ID(required=True)
+    episode = ID(required=True)
+
+
+class CreateEpisodeAgentMutation(LettercraftMutation):
+    django_model = EpisodeAgent
+
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        data = CreateEpisodeAgentInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, data: CreateEpisodeAgentInput):
+
+        if EpisodeAgent.objects.filter(
+            agent__id=data.agent, episode__id=data.episode
+        ).exists():
+            return cls(
+                ok=False,
+                errors=[LettercraftErrorType("agent", ["Link already exists"])],
+            )
+
+        try:
+            episode = Episode.objects.get(id=data.episode)
+        except Episode.DoesNotExist as e:
+            return cls(
+                ok=False,
+                errors=[LettercraftErrorType("episode", [str(e)])],
+            )
+
+        try:
+            agent = AgentDescription.objects.get(id=data.agent)
+        except AgentDescription.DoesNotExist as e:
+            return cls(
+                ok=False,
+                errors=[LettercraftErrorType("agent", [str(e)])],
+            )
+
+        try:
+            with transaction.atomic():
+                obj = EpisodeAgent.objects.create(agent=agent, episode=episode)
+                obj.clean()
+        except ValidationError as e:
+            errors = [
+                LettercraftErrorType(field, messages)
+                for field, messages in e.message_dict.items()
+            ]
+            return cls(ok=False, agent=None, errors=errors)
+
+        return cls(ok=True, errors=[])
diff --git a/backend/event/mutations/DeleteEpisodeAgentMutation.py b/backend/event/mutations/DeleteEpisodeAgentMutation.py
new file mode 100644
index 00000000..d67a70e6
--- /dev/null
+++ b/backend/event/mutations/DeleteEpisodeAgentMutation.py
@@ -0,0 +1,37 @@
+from graphene import (
+    ID,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+    Mutation,
+)
+
+from event.models import EpisodeAgent
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class DeleteEpisodeAgentMutation(Mutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(
+        cls,
+        root: None,
+        info: ResolveInfo,
+        id: ID,
+    ):
+        try:
+            obj = EpisodeAgent.objects.get(id=id)
+        except EpisodeAgent.DoesNotExist:
+            return cls(
+                ok=False, errors=LettercraftErrorType("id", ["Object not found"])
+            )
+
+        obj.delete()
+
+        return cls(ok=True, errors=[])
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 1ade2fe6..662ea91c 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -11,6 +11,8 @@
 
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
+from event.mutations.CreateEpisodeAgentMutation import CreateEpisodeAgentMutation
+from event.mutations.DeleteEpisodeAgentMutation import DeleteEpisodeAgentMutation
 from person.mutations.CreateAgentMutation import CreateAgentMutation
 from person.mutations.UpdateAgentMutation import UpdateAgentMutation
 from person.mutations.DeleteAgentMutation import DeleteAgentMutation
@@ -42,6 +44,8 @@ class Mutation(ObjectType):
     update_episode = UpdateEpisodeMutation.Field()
     create_episode = CreateEpisodeMutation.Field()
     delete_episode = DeleteEpisodeMutation.Field()
+    create_episode_agent = CreateEpisodeAgentMutation.Field()
+    delete_episode_agent = DeleteEpisodeAgentMutation.Field()
     create_agent = CreateAgentMutation.Field()
     update_agent = UpdateAgentMutation.Field()
     delete_agent = DeleteAgentMutation.Field()

From ff167be09ecae1b917296c7460d96e27402b320b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 3 Sep 2024 16:30:01 +0200
Subject: [PATCH 403/565] add episodes

---
 frontend/generated/graphql.ts                 | 91 ++++++++++++++++++-
 frontend/generated/schema.graphql             | 17 ++++
 .../agent-episodes-form.component.html        |  2 +-
 .../agent-episodes-form.component.ts          | 48 +++++++++-
 .../agent-episodes.graphql                    | 20 ++++
 5 files changed, 171 insertions(+), 7 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 52801c68..bd288850 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -91,6 +91,17 @@ export type CreateAgentMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type CreateEpisodeAgentInput = {
+  agent: Scalars['ID']['input'];
+  episode: Scalars['ID']['input'];
+};
+
+export type CreateEpisodeAgentMutation = {
+  __typename?: 'CreateEpisodeAgentMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type CreateEpisodeInput = {
   name: Scalars['String']['input'];
   source: Scalars['ID']['input'];
@@ -141,6 +152,12 @@ export type DeleteAgentMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type DeleteEpisodeAgentMutation = {
+  __typename?: 'DeleteEpisodeAgentMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type DeleteEpisodeMutation = {
   __typename?: 'DeleteEpisodeMutation';
   errors: Array<LettercraftErrorType>;
@@ -411,11 +428,13 @@ export type Mutation = {
   __typename?: 'Mutation';
   createAgent?: Maybe<CreateAgentMutation>;
   createEpisode?: Maybe<CreateEpisodeMutation>;
+  createEpisodeAgent?: Maybe<CreateEpisodeAgentMutation>;
   createGift?: Maybe<CreateGiftMutation>;
   createLetter?: Maybe<CreateLetterMutation>;
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
   deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
+  deleteEpisodeAgent?: Maybe<DeleteEpisodeAgentMutation>;
   deleteGift?: Maybe<DeleteGiftMutation>;
   deleteLetter?: Maybe<DeleteLetterMutation>;
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
@@ -438,6 +457,11 @@ export type MutationCreateEpisodeArgs = {
 };
 
 
+export type MutationCreateEpisodeAgentArgs = {
+  data: CreateEpisodeAgentInput;
+};
+
+
 export type MutationCreateGiftArgs = {
   giftData: CreateGiftInput;
 };
@@ -463,6 +487,11 @@ export type MutationDeleteEpisodeArgs = {
 };
 
 
+export type MutationDeleteEpisodeAgentArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type MutationDeleteGiftArgs = {
   id: Scalars['ID']['input'];
 };
@@ -1076,6 +1105,20 @@ export type DataEntryAgentEpisodesQueryVariables = Exact<{
 
 export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeAgentType', id: string, episode: { __typename?: 'EpisodeType', id: string } }> } | null };
 
+export type DataEntryCreateAgentEpisodeMutationMutationVariables = Exact<{
+  data: CreateEpisodeAgentInput;
+}>;
+
+
+export type DataEntryCreateAgentEpisodeMutationMutation = { __typename?: 'Mutation', createEpisodeAgent?: { __typename?: 'CreateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
+export type DateEntryDeleteAgentEpisodeMutationMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DateEntryDeleteAgentEpisodeMutationMutation = { __typename?: 'Mutation', deleteEpisodeAgent?: { __typename?: 'DeleteEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1156,7 +1199,7 @@ export type DataEntryGiftCategoriesQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryGiftCategoriesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, categorisations: Array<{ __typename?: 'GiftDescriptionCategoryType', id: string, sourceMention?: LetterGiftDescriptionCategorySourceMentionChoices | null, note: string, certainty: LetterGiftDescriptionCategoryCertaintyChoices, category: { __typename?: 'GiftCategoryType', id: string, name: string } }> } | null };
+export type DataEntryGiftCategoriesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, categorisations: Array<{ __typename?: 'GiftDescriptionCategoryType', id: string, sourceMention?: SourceMention | null, note: string, certainty: LetterGiftDescriptionCategoryCertaintyChoices, category: { __typename?: 'GiftCategoryType', id: string, name: string } }> } | null };
 
 export type DataEntryAllGiftCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1196,7 +1239,7 @@ export type DataEntryLetterCategoriesQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLetterCategoriesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, categorisations: Array<{ __typename?: 'LetterDescriptionCategoryType', id: string, sourceMention?: LetterLetterDescriptionCategorySourceMentionChoices | null, note: string, certainty: LetterLetterDescriptionCategoryCertaintyChoices, category: { __typename?: 'LetterCategoryType', id: string, label: string } }> } | null };
+export type DataEntryLetterCategoriesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, categorisations: Array<{ __typename?: 'LetterDescriptionCategoryType', id: string, sourceMention?: SourceMention | null, note: string, certainty: LetterLetterDescriptionCategoryCertaintyChoices, category: { __typename?: 'LetterCategoryType', id: string, label: string } }> } | null };
 
 export type DataEntryAllLetterCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1372,6 +1415,50 @@ export const DataEntryAgentEpisodesDocument = gql`
   export class DataEntryAgentEpisodesGQL extends Apollo.Query<DataEntryAgentEpisodesQuery, DataEntryAgentEpisodesQueryVariables> {
     override document = DataEntryAgentEpisodesDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryCreateAgentEpisodeMutationDocument = gql`
+    mutation DataEntryCreateAgentEpisodeMutation($data: CreateEpisodeAgentInput!) {
+  createEpisodeAgent(data: $data) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryCreateAgentEpisodeMutationGQL extends Apollo.Mutation<DataEntryCreateAgentEpisodeMutationMutation, DataEntryCreateAgentEpisodeMutationMutationVariables> {
+    override document = DataEntryCreateAgentEpisodeMutationDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DateEntryDeleteAgentEpisodeMutationDocument = gql`
+    mutation DateEntryDeleteAgentEpisodeMutation($id: ID!) {
+  deleteEpisodeAgent(id: $id) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DateEntryDeleteAgentEpisodeMutationGQL extends Apollo.Mutation<DateEntryDeleteAgentEpisodeMutationMutation, DateEntryDeleteAgentEpisodeMutationMutationVariables> {
+    override document = DateEntryDeleteAgentEpisodeMutationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index b0c7dad5..ed7367ad 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -86,6 +86,16 @@ type CreateAgentMutation {
   ok: Boolean!
 }
 
+input CreateEpisodeAgentInput {
+  agent: ID!
+  episode: ID!
+}
+
+type CreateEpisodeAgentMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 input CreateEpisodeInput {
   name: String!
   source: ID!
@@ -131,6 +141,11 @@ type DeleteAgentMutation {
   ok: Boolean!
 }
 
+type DeleteEpisodeAgentMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type DeleteEpisodeMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
@@ -441,11 +456,13 @@ type LettercraftErrorType {
 type Mutation {
   createAgent(agentData: CreateAgentInput!): CreateAgentMutation
   createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
+  createEpisodeAgent(data: CreateEpisodeAgentInput!): CreateEpisodeAgentMutation
   createGift(giftData: CreateGiftInput!): CreateGiftMutation
   createLetter(letterData: CreateLetterInput!): CreateLetterMutation
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
+  deleteEpisodeAgent(id: ID!): DeleteEpisodeAgentMutation
   deleteGift(id: ID!): DeleteGiftMutation
   deleteLetter(id: ID!): DeleteLetterMutation
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 76ba26c3..f3e9414c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -14,7 +14,7 @@
     </button>
     <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
         <button *ngFor="let episode of (availableEpisodes$ | async)"
-            ngbDropdownItem>
+            ngbDropdownItem (click)="addEpisode$.next(episode.id)">
             {{episode.name}}
         </button>
         <button ngbDropdownItem>
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 27e5d473..f58af6f4 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -1,25 +1,35 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { FormService } from '../../shared/form.service';
-import { DataEntryAgentEpisodesGQL, DataEntryAgentEpisodesQuery } from 'generated/graphql';
-import { map, Observable, switchMap } from 'rxjs';
+import {
+    CreateEpisodeAgentInput, DataEntryAgentEpisodesGQL, DataEntryAgentEpisodesQuery,
+    DataEntryCreateAgentEpisodeMutationGQL,
+} from 'generated/graphql';
+import { map, Observable, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { actionIcons } from '@shared/icons';
+import { FormStatus } from '../../shared/types';
 
 @Component({
   selector: 'lc-agent-episodes-form',
   templateUrl: './agent-episodes-form.component.html',
   styleUrls: ['./agent-episodes-form.component.scss']
 })
-export class AgentEpisodesFormComponent {
+export class AgentEpisodesFormComponent implements OnDestroy {
     data$: Observable<DataEntryAgentEpisodesQuery>;
     availableEpisodes$: Observable<{ name: string, id: string }[]>;
 
+    addEpisode$ = new Subject<string>();
     actionIcons = actionIcons;
+    status$ = new Subject<FormStatus>();
+    formName = 'episodes';
 
     constructor(
         private formService: FormService,
         private query: DataEntryAgentEpisodesGQL,
+        private addMutation: DataEntryCreateAgentEpisodeMutationGQL,
     ) {
+        this.formService.attachForm(this.formName, this.status$);
+        this.status$.next('idle');
         this.data$ = this.formService.id$.pipe(
             switchMap(id => this.query.watch({ id }).valueChanges),
             map(result => result.data),
@@ -28,6 +38,36 @@ export class AgentEpisodesFormComponent {
         this.availableEpisodes$ = this.data$.pipe(
             map(this.availableEpisodes)
         );
+        this.addEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(([episodeID, agentID]) =>
+            this.addEpisode(episodeID, agentID)
+        );
+    }
+
+    ngOnDestroy(): void {
+        this.status$.complete();
+        this.addEpisode$.complete();
+        this.formService.detachForm(this.formName);
+    }
+
+    addEpisode(episodeID: string, agentID: string): void {
+        const data: CreateEpisodeAgentInput = {
+            agent: agentID,
+            episode: episodeID,
+        };
+        this.addMutation.mutate({ data }, {
+            refetchQueries: ['DataEntryAgentEpisodes'],
+        }).pipe(
+            tap(() => this.status$.next('loading'))
+        ).subscribe({
+            next: () => this.status$.next('saved'),
+            error: (err) => {
+                console.error(err);
+                this.status$.next('error');
+            }
+        });
     }
 
     private availableEpisodes(
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
index 39fc2555..557e5d40 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -16,3 +16,23 @@ query DataEntryAgentEpisodes($id: ID!) {
         }
     }
 }
+
+mutation DataEntryCreateAgentEpisodeMutation($data: CreateEpisodeAgentInput!) {
+    createEpisodeAgent(data: $data) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}
+
+mutation DateEntryDeleteAgentEpisodeMutation($id: ID!) {
+    deleteEpisodeAgent(id: $id) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From 4bb72e2db2a47437d12b3d3b628c0ab7f11ef283 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 13:14:35 +0200
Subject: [PATCH 404/565] remove episodes

---
 frontend/generated/graphql.ts                 | 12 +++---
 .../agent-episodes-form.component.html        |  3 +-
 .../agent-episodes-form.component.ts          | 41 +++++++++++++++----
 .../agent-episodes.graphql                    |  2 +-
 .../episode-link-form.component.html          |  3 +-
 .../episode-link-form.component.ts            |  4 +-
 6 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index bd288850..6780b67e 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1112,12 +1112,12 @@ export type DataEntryCreateAgentEpisodeMutationMutationVariables = Exact<{
 
 export type DataEntryCreateAgentEpisodeMutationMutation = { __typename?: 'Mutation', createEpisodeAgent?: { __typename?: 'CreateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
-export type DateEntryDeleteAgentEpisodeMutationMutationVariables = Exact<{
+export type DataEntryDeleteAgentEpisodeMutationMutationVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type DateEntryDeleteAgentEpisodeMutationMutation = { __typename?: 'Mutation', deleteEpisodeAgent?: { __typename?: 'DeleteEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryDeleteAgentEpisodeMutationMutation = { __typename?: 'Mutation', deleteEpisodeAgent?: { __typename?: 'DeleteEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1441,8 +1441,8 @@ export const DataEntryCreateAgentEpisodeMutationDocument = gql`
       super(apollo);
     }
   }
-export const DateEntryDeleteAgentEpisodeMutationDocument = gql`
-    mutation DateEntryDeleteAgentEpisodeMutation($id: ID!) {
+export const DataEntryDeleteAgentEpisodeMutationDocument = gql`
+    mutation DataEntryDeleteAgentEpisodeMutation($id: ID!) {
   deleteEpisodeAgent(id: $id) {
     ok
     errors {
@@ -1456,8 +1456,8 @@ export const DateEntryDeleteAgentEpisodeMutationDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DateEntryDeleteAgentEpisodeMutationGQL extends Apollo.Mutation<DateEntryDeleteAgentEpisodeMutationMutation, DateEntryDeleteAgentEpisodeMutationMutationVariables> {
-    override document = DateEntryDeleteAgentEpisodeMutationDocument;
+  export class DataEntryDeleteAgentEpisodeMutationGQL extends Apollo.Mutation<DataEntryDeleteAgentEpisodeMutationMutation, DataEntryDeleteAgentEpisodeMutationMutationVariables> {
+    override document = DataEntryDeleteAgentEpisodeMutationDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index f3e9414c..023106bd 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -2,7 +2,8 @@
     <p>This agent is involved in the following episodes:</p>
     <ul class="list-unstyled vstack gap-4">
         <li *ngFor="let item of data.agentDescription?.episodes">
-            <lc-episode-link-form [id]="item.id" entityType="agent" />
+            <lc-episode-link-form [id]="item.id" entityType="agent"
+                (delete)="removeEpisode$.next(item.id)" />
         </li>
     </ul>
 </ng-container>
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index f58af6f4..31efb19e 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -3,11 +3,15 @@ import { FormService } from '../../shared/form.service';
 import {
     CreateEpisodeAgentInput, DataEntryAgentEpisodesGQL, DataEntryAgentEpisodesQuery,
     DataEntryCreateAgentEpisodeMutationGQL,
+    DataEntryDeleteAgentEpisodeMutationGQL,
 } from 'generated/graphql';
-import { map, Observable, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
+import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { actionIcons } from '@shared/icons';
 import { FormStatus } from '../../shared/types';
+import { MutationResult } from 'apollo-angular';
+
+const REFETCH_QUERIES = ['DataEntryAgentEpisodes'];
 
 @Component({
   selector: 'lc-agent-episodes-form',
@@ -19,14 +23,21 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     availableEpisodes$: Observable<{ name: string, id: string }[]>;
 
     addEpisode$ = new Subject<string>();
+    removeEpisode$ = new Subject<string>();
     actionIcons = actionIcons;
     status$ = new Subject<FormStatus>();
     formName = 'episodes';
 
+    private mutationObserver: Partial<Observer<MutationResult>> = {
+        next: this.onSuccess.bind(this),
+        error: this.onError.bind(this),
+    };
+
     constructor(
         private formService: FormService,
         private query: DataEntryAgentEpisodesGQL,
         private addMutation: DataEntryCreateAgentEpisodeMutationGQL,
+        private removeMutation: DataEntryDeleteAgentEpisodeMutationGQL,
     ) {
         this.formService.attachForm(this.formName, this.status$);
         this.status$.next('idle');
@@ -44,11 +55,13 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         ).subscribe(([episodeID, agentID]) =>
             this.addEpisode(episodeID, agentID)
         );
+        this.removeEpisode$.subscribe(this.removeEpisode.bind(this));
     }
 
     ngOnDestroy(): void {
         this.status$.complete();
         this.addEpisode$.complete();
+        this.removeEpisode$.complete();
         this.formService.detachForm(this.formName);
     }
 
@@ -58,16 +71,26 @@ export class AgentEpisodesFormComponent implements OnDestroy {
             episode: episodeID,
         };
         this.addMutation.mutate({ data }, {
-            refetchQueries: ['DataEntryAgentEpisodes'],
+            refetchQueries: REFETCH_QUERIES,
         }).pipe(
             tap(() => this.status$.next('loading'))
-        ).subscribe({
-            next: () => this.status$.next('saved'),
-            error: (err) => {
-                console.error(err);
-                this.status$.next('error');
-            }
-        });
+        ).subscribe(this.mutationObserver);
+    }
+
+    removeEpisode(linkID: string): void {
+        const data = { id: linkID };
+        this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
+            tap(() => this.status$.next('loading'))
+        ).subscribe(this.mutationObserver)
+    }
+
+    onSuccess() {
+        this.status$.next('saved');
+    }
+
+    onError(error: any) {
+        console.error(error);
+        this.status$.next('error');
     }
 
     private availableEpisodes(
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
index 557e5d40..c46f53de 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -27,7 +27,7 @@ mutation DataEntryCreateAgentEpisodeMutation($data: CreateEpisodeAgentInput!) {
     }
 }
 
-mutation DateEntryDeleteAgentEpisodeMutation($id: ID!) {
+mutation DataEntryDeleteAgentEpisodeMutation($id: ID!) {
     deleteEpisodeAgent(id: $id) {
         ok
         errors {
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 15429293..10e1f0b6 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -18,7 +18,8 @@
                 ]">
                 <lc-icon [icon]="actionIcons.edit" />
             </a>
-            <button class="btn btn-danger" aria-label="remove episode">
+            <button class="btn btn-danger" aria-label="remove episode"
+                (click)="delete.emit()">
                 <lc-icon [icon]="actionIcons.remove" />
             </button>
         </div>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 82c1d0fb..43d008d3 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output, SimpleChanges } from '@angular/core';
 import { EntityType, SelectOptions } from '../types';
 import { combineLatest, map, Observable, shareReplay, Subject, switchMap } from 'rxjs';
 import { actionIcons } from '@shared/icons';
@@ -27,8 +27,10 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
      * *from* should be clear from the context.
      */
     @Input() linkTo: LinkTo = 'episode';
+    @Output() delete = new EventEmitter<void>();
 
     collapsed = true;
+
     data$: Observable<EpisodeAgentQueryQuery | undefined>;
     form = new FormGroup({
         sourceMention: new FormControl<SourceMention>(SourceMention.Direct),

From 478c10d7d07e8b5b9e681e44932e63f87749580c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 13:19:51 +0200
Subject: [PATCH 405/565] fix form status

simplify delete control
---
 .../agent-episodes-form.component.html                    | 8 ++++++--
 .../agent-episodes-form/agent-episodes-form.component.ts  | 5 ++---
 .../episode-link-form/episode-link-form.component.html    | 5 +----
 .../episode-link-form/episode-link-form.component.ts      | 3 +--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 023106bd..3e72d38b 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -2,8 +2,12 @@
     <p>This agent is involved in the following episodes:</p>
     <ul class="list-unstyled vstack gap-4">
         <li *ngFor="let item of data.agentDescription?.episodes">
-            <lc-episode-link-form [id]="item.id" entityType="agent"
-                (delete)="removeEpisode$.next(item.id)" />
+            <lc-episode-link-form [id]="item.id" entityType="agent">
+                <button removeControl class="btn btn-danger" aria-label="remove episode"
+                    (click)="removeEpisode$.next(item.id)">
+                    <lc-icon [icon]="actionIcons.remove" />
+                </button>
+            </lc-episode-link-form>
         </li>
     </ul>
 </ng-container>
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 31efb19e..85586bb3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -5,7 +5,7 @@ import {
     DataEntryCreateAgentEpisodeMutationGQL,
     DataEntryDeleteAgentEpisodeMutationGQL,
 } from 'generated/graphql';
-import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
+import { BehaviorSubject, map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { actionIcons } from '@shared/icons';
 import { FormStatus } from '../../shared/types';
@@ -25,7 +25,7 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     addEpisode$ = new Subject<string>();
     removeEpisode$ = new Subject<string>();
     actionIcons = actionIcons;
-    status$ = new Subject<FormStatus>();
+    status$ = new BehaviorSubject<FormStatus>('idle');
     formName = 'episodes';
 
     private mutationObserver: Partial<Observer<MutationResult>> = {
@@ -40,7 +40,6 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         private removeMutation: DataEntryDeleteAgentEpisodeMutationGQL,
     ) {
         this.formService.attachForm(this.formName, this.status$);
-        this.status$.next('idle');
         this.data$ = this.formService.id$.pipe(
             switchMap(id => this.query.watch({ id }).valueChanges),
             map(result => result.data),
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 10e1f0b6..2bb3841d 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -18,10 +18,7 @@
                 ]">
                 <lc-icon [icon]="actionIcons.edit" />
             </a>
-            <button class="btn btn-danger" aria-label="remove episode"
-                (click)="delete.emit()">
-                <lc-icon [icon]="actionIcons.remove" />
-            </button>
+            <ng-content select="[removeControl]"></ng-content>
         </div>
     </div>
     <form class="card-body" [formGroup]="form" [ngbCollapse]="collapsed">
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 43d008d3..792d7481 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output, SimpleChanges } from '@angular/core';
+import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { EntityType, SelectOptions } from '../types';
 import { combineLatest, map, Observable, shareReplay, Subject, switchMap } from 'rxjs';
 import { actionIcons } from '@shared/icons';
@@ -27,7 +27,6 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
      * *from* should be clear from the context.
      */
     @Input() linkTo: LinkTo = 'episode';
-    @Output() delete = new EventEmitter<void>();
 
     collapsed = true;
 

From 37ad35eae1dc23ae6aa12a6b7ba8b6015faca940 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 13:40:56 +0200
Subject: [PATCH 406/565] collapse button accessibility

---
 .../episode-link-form/episode-link-form.component.html       | 5 ++++-
 .../shared/episode-link-form/episode-link-form.component.ts  | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 2bb3841d..0e0875d3 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -7,6 +7,8 @@
             </span>
             <button class="btn btn-secondary ms-auto"
                 [attr.aria-label]="(collapsed ? 'show' : 'hide') + ' additional questions'"
+                [attr.aria-expanded]="!collapsed"
+                [attr.aria-controls]="formElementID"
                 (click)="collapsed = !collapsed">
                 <lc-icon [icon]="collapsed ? actionIcons.expand : actionIcons.collapse" />
             </button>
@@ -21,7 +23,8 @@
             <ng-content select="[removeControl]"></ng-content>
         </div>
     </div>
-    <form class="card-body" [formGroup]="form" [ngbCollapse]="collapsed">
+    <form class="card-body" [id]="formElementID"
+        [formGroup]="form" [ngbCollapse]="collapsed">
         <div class="mb-3">
             <label [htmlFor]="sourceMentionInput" class="form-label">
                 How is this agent's involvement in the episode represented?
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 792d7481..a7d601a5 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -62,6 +62,11 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         this.data$.subscribe(this.updateFormValues.bind(this));
     }
 
+
+    get formElementID(): string {
+        return `form-${this.linkTo}-link-${this.id}`;
+    }
+
     ngOnChanges(changes: SimpleChanges): void {
         if (changes['entityType']) {
             this.query$.next(this.entityQueries[this.entityType]);

From 3ca73c51978caafe7abeda2fba02ac2e21baf8f0 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 13:46:40 +0200
Subject: [PATCH 407/565] outfactor source mention options

---
 .../agent-description-form.component.html             |  4 ++--
 .../agent-description-form.component.ts               | 11 ++---------
 .../episode-link-form/episode-link-form.component.ts  |  6 ++----
 frontend/src/app/data-entry/shared/utils.ts           |  7 +++++++
 4 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 frontend/src/app/data-entry/shared/utils.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index 7489c3ad..34dd3882 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -25,7 +25,7 @@ <h3>Gender</h3>
         </label>
         <select class="form-select" id="input-gender-mention"
             [formControl]="form.controls.gender.controls.sourceMention">
-            <option *ngFor="let option of genderSourceMentionOptions" [value]="option.value">
+            <option *ngFor="let option of sourceMentionOptions" [value]="option.value">
                 {{option.label}}
             </option>
         </select>
@@ -77,7 +77,7 @@ <h3>Location</h3>
                 </label>
                 <select class="form-select" id="input-location-mention"
                     [formControl]="form.controls.location.controls.sourceMention">
-                    <option *ngFor="let option of locationSourceMentionOptions"
+                    <option *ngFor="let option of sourceMentionOptions"
                         [value]="option.value">
                         {{option.label}}
                     </option>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 1c44b50a..b1fd6360 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -19,6 +19,7 @@ import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinct
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
+import { sourceMentionSelectOptions } from '../../shared/utils';
 
 
 @Component({
@@ -35,15 +36,7 @@ export class AgentDescriptionFormComponent implements OnDestroy {
         { value: GenderChoices.Unknown, label: 'Unknown' }
     ];
 
-    genderSourceMentionOptions: { value: SourceMention, label: string }[] = [
-        { value: SourceMention.Direct, label: 'Mentioned' },
-        { value: SourceMention.Implied, label: 'Implied' },
-    ];
-
-    locationSourceMentionOptions: { value: SourceMention, label: string }[] = [
-        { value: SourceMention.Direct, label: 'Mentioned' },
-        { value: SourceMention.Implied, label: 'Implied' },
-    ];
+    sourceMentionOptions = sourceMentionSelectOptions();
 
     form = new FormGroup({
         designators: new FormControl<string[]>([], { nonNullable: true }),
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index a7d601a5..4a7b1921 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -5,6 +5,7 @@ import { actionIcons } from '@shared/icons';
 import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery, SourceMention } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
+import { sourceMentionSelectOptions } from '../utils';
 
 
 type LinkTo = 'episode' | 'agent';
@@ -36,10 +37,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         note: new FormControl<string>('', { nonNullable: true }),
     });
 
-    sourceMentionOptions: SelectOptions<SourceMention> = [
-        { value: SourceMention.Direct, label: 'Directly mentioned' },
-        { value: SourceMention.Implied, label: 'Implied' }
-    ];
+    sourceMentionOptions: SelectOptions<SourceMention> = sourceMentionSelectOptions();
 
     private entityQueries: Record<EntityType, EpisodeAgentQueryGQL>;
     private query$ = new Subject<EpisodeAgentQueryGQL>();
diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
new file mode 100644
index 00000000..c352be7e
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -0,0 +1,7 @@
+import { SourceMention } from "generated/graphql";
+import { SelectOptions } from "./types";
+
+export const sourceMentionSelectOptions = (): SelectOptions<SourceMention> => [
+    { value: SourceMention.Direct, label: 'Directly mentioned' },
+    { value: SourceMention.Implied, label: 'Implied' }
+];

From 959c347ec5bcf66999e4ea8fd9dc8bf45c847fa4 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 14:31:24 +0200
Subject: [PATCH 408/565] outfactor collapsible card component

---
 .../episode-link-form.component.html          | 44 +++++++------------
 .../episode-link-form.component.ts            |  7 ---
 .../collapsible-card.component.html           | 17 +++++++
 .../collapsible-card.component.scss           |  0
 .../collapsible-card.component.spec.ts        | 21 +++++++++
 .../collapsible-card.component.ts             | 18 ++++++++
 frontend/src/app/shared/shared.module.ts      |  6 ++-
 7 files changed, 77 insertions(+), 36 deletions(-)
 create mode 100644 frontend/src/app/shared/collapsible-card/collapsible-card.component.html
 create mode 100644 frontend/src/app/shared/collapsible-card/collapsible-card.component.scss
 create mode 100644 frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
 create mode 100644 frontend/src/app/shared/collapsible-card/collapsible-card.component.ts

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 0e0875d3..31b13e8d 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -1,30 +1,18 @@
-<div class="card" *ngIf="data$ | async as data">
-    <div class="card-header"
-        [class.border-bottom-0]="collapsed">
-        <div class="hstack gap-2">
-            <span>
-                {{ linkedObject(linkTo, data)?.name }}
-            </span>
-            <button class="btn btn-secondary ms-auto"
-                [attr.aria-label]="(collapsed ? 'show' : 'hide') + ' additional questions'"
-                [attr.aria-expanded]="!collapsed"
-                [attr.aria-controls]="formElementID"
-                (click)="collapsed = !collapsed">
-                <lc-icon [icon]="collapsed ? actionIcons.expand : actionIcons.collapse" />
-            </button>
-            <a class="btn btn-primary" aria-label="edit episode"
-                [routerLink]="[
-                    '/data-entry',
-                    formUrl(linkTo, entityType),
-                    linkedObject(linkTo, data)?.id
-                ]">
-                <lc-icon [icon]="actionIcons.edit" />
-            </a>
-            <ng-content select="[removeControl]"></ng-content>
-        </div>
-    </div>
-    <form class="card-body" [id]="formElementID"
-        [formGroup]="form" [ngbCollapse]="collapsed">
+<lc-collapsible-card *ngIf="data$ | async as data"
+    contentDescription="additional questions">
+    <span cardTitle>
+        {{ linkedObject(linkTo, data)?.name }}
+    </span>
+    <a cardControl class="btn btn-primary" aria-label="edit episode"
+        [routerLink]="[
+            '/data-entry',
+            formUrl(linkTo, entityType),
+            linkedObject(linkTo, data)?.id
+        ]">
+        <lc-icon [icon]="actionIcons.edit" />
+    </a>
+    <ng-content cardControl select="[removeControl]"></ng-content>
+    <form cardBody [formGroup]="form">
         <div class="mb-3">
             <label [htmlFor]="sourceMentionInput" class="form-label">
                 How is this agent's involvement in the episode represented?
@@ -44,4 +32,4 @@
             </textarea>
         </div>
     </form>
-</div>
+</lc-collapsible-card>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 4a7b1921..70b8e63b 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -29,8 +29,6 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
      */
     @Input() linkTo: LinkTo = 'episode';
 
-    collapsed = true;
-
     data$: Observable<EpisodeAgentQueryQuery | undefined>;
     form = new FormGroup({
         sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
@@ -60,11 +58,6 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         this.data$.subscribe(this.updateFormValues.bind(this));
     }
 
-
-    get formElementID(): string {
-        return `form-${this.linkTo}-link-${this.id}`;
-    }
-
     ngOnChanges(changes: SimpleChanges): void {
         if (changes['entityType']) {
             this.query$.next(this.entityQueries[this.entityType]);
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
new file mode 100644
index 00000000..0abc663e
--- /dev/null
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
@@ -0,0 +1,17 @@
+<div class="card-header"
+    [class.border-bottom-0]="collapsed">
+    <div class="hstack gap-2">
+        <ng-content select="[cardTitle]" />
+        <button class="btn btn-secondary ms-auto"
+            ariaLabel="{{ collapsed ? 'show' : 'hide' }} {{contentDescription}}"
+            [attr.aria-expanded]="!collapsed"
+            [attr.aria-controls]="bodyID"
+            (click)="collapsed = !collapsed">
+            <lc-icon [icon]="collapsed ? actionIcons.expand : actionIcons.collapse" />
+        </button>
+        <ng-content select="[cardControl]" />
+    </div>
+</div>
+<div class="card-body" [id]="bodyID" [ngbCollapse]="collapsed">
+    <ng-content select="[cardBody]" />
+</div>
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.scss b/frontend/src/app/shared/collapsible-card/collapsible-card.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
new file mode 100644
index 00000000..20a04183
--- /dev/null
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CollapsibleCardComponent } from './collapsible-card.component';
+
+describe('CollapsibleCardComponent', () => {
+  let component: CollapsibleCardComponent;
+  let fixture: ComponentFixture<CollapsibleCardComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [CollapsibleCardComponent]
+    });
+    fixture = TestBed.createComponent(CollapsibleCardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts b/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
new file mode 100644
index 00000000..9f2a6cae
--- /dev/null
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
@@ -0,0 +1,18 @@
+import { Component, HostBinding, Input } from '@angular/core';
+import { actionIcons } from '@shared/icons';
+
+@Component({
+    selector: 'lc-collapsible-card',
+    templateUrl: './collapsible-card.component.html',
+    styleUrls: ['./collapsible-card.component.scss']
+})
+export class CollapsibleCardComponent {
+    /** text description of the content; used to render label for the collapse button */
+    @Input() contentDescription = 'content';
+
+    collapsed = true;
+
+    @HostBinding('class.card') card = true;
+    bodyID = crypto.randomUUID();
+    actionIcons = actionIcons;
+}
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index da697151..03a3079d 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -12,6 +12,7 @@ import { ActionButtonGroupComponent } from './action-button-group/action-button-
 import { BaseModalComponent } from "./base-modal/base-modal.component";
 import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
 import { ContributorsComponent } from './contributors/contributors.component';
+import { CollapsibleCardComponent } from './collapsible-card/collapsible-card.component';
 
 
 
@@ -23,6 +24,7 @@ import { ContributorsComponent } from './contributors/contributors.component';
         BaseModalComponent,
         ConfirmationModalComponent,
         ContributorsComponent,
+        CollapsibleCardComponent,
     ],
     imports: [
         CommonModule,
@@ -40,8 +42,11 @@ import { ContributorsComponent } from './contributors/contributors.component';
     exports: [
         IconComponent,
         BreadcrumbComponent,
+        BaseModalComponent,
+        ConfirmationModalComponent,
         ActionButtonGroupComponent,
         ContributorsComponent,
+        CollapsibleCardComponent,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,
@@ -50,7 +55,6 @@ import { ContributorsComponent } from './contributors/contributors.component';
         NgbModule,
         RouterModule,
         ReactiveFormsModule,
-        BaseModalComponent,
     ],
 })
 export class SharedModule {}

From eb13b9431fddf3abeb41f83e9834b59578cf8c53 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 14:55:06 +0200
Subject: [PATCH 409/565] add update EpisodeAgent mutation in backend

---
 .../mutations/UpdateEpisodeAgentMutation.py   | 42 +++++++++++++++++++
 backend/graphql_app/schema.py                 |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 backend/event/mutations/UpdateEpisodeAgentMutation.py

diff --git a/backend/event/mutations/UpdateEpisodeAgentMutation.py b/backend/event/mutations/UpdateEpisodeAgentMutation.py
new file mode 100644
index 00000000..2886c232
--- /dev/null
+++ b/backend/event/mutations/UpdateEpisodeAgentMutation.py
@@ -0,0 +1,42 @@
+from graphene import (
+    ID,
+    String,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+)
+
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from core.types.DescriptionFieldType import SourceMentionEnum
+from event.models import EpisodeAgent
+
+
+class UpdateEpisodeAgentInput(InputObjectType):
+    id = ID(required=True)
+    source_mention = SourceMentionEnum
+    note = String()
+
+
+class UpdateEpisodeAgentMutation(LettercraftMutation):
+    django_model = EpisodeAgent
+
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        data = UpdateEpisodeAgentInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, data: UpdateEpisodeAgentInput):
+        try:
+            reference = cls.get_object(info, data)
+        except EpisodeAgent.DoesNotExist as e:
+            error = LettercraftErrorType(field="id", messages=[str(e)])
+            return cls(ok=False, error=[error])
+
+        cls.mutate_object(data, reference, info)
+
+        return cls(ok=True, errors=[])
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 662ea91c..879ef6b6 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -13,6 +13,7 @@
 from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
 from event.mutations.CreateEpisodeAgentMutation import CreateEpisodeAgentMutation
 from event.mutations.DeleteEpisodeAgentMutation import DeleteEpisodeAgentMutation
+from event.mutations.UpdateEpisodeAgentMutation import UpdateEpisodeAgentMutation
 from person.mutations.CreateAgentMutation import CreateAgentMutation
 from person.mutations.UpdateAgentMutation import UpdateAgentMutation
 from person.mutations.DeleteAgentMutation import DeleteAgentMutation
@@ -45,6 +46,7 @@ class Mutation(ObjectType):
     create_episode = CreateEpisodeMutation.Field()
     delete_episode = DeleteEpisodeMutation.Field()
     create_episode_agent = CreateEpisodeAgentMutation.Field()
+    update_episode_agent = UpdateEpisodeAgentMutation.Field()
     delete_episode_agent = DeleteEpisodeAgentMutation.Field()
     create_agent = CreateAgentMutation.Field()
     update_agent = UpdateAgentMutation.Field()

From 6ac8e02e69c895bae457b17b9d684108867e8dfc Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 15:03:16 +0200
Subject: [PATCH 410/565] add frontent mutation

---
 frontend/generated/graphql.ts                 | 46 +++++++++++++++++++
 frontend/generated/schema.graphql             | 11 +++++
 .../episode-link-form/episode-link.graphql    | 10 ++++
 3 files changed, 67 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 6780b67e..53e0c9fc 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -440,6 +440,7 @@ export type Mutation = {
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
+  updateEpisodeAgent?: Maybe<UpdateEpisodeAgentMutation>;
   updateGift?: Maybe<UpdateGiftMutation>;
   updateLetter?: Maybe<UpdateLetterMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
@@ -517,6 +518,11 @@ export type MutationUpdateEpisodeArgs = {
 };
 
 
+export type MutationUpdateEpisodeAgentArgs = {
+  data: UpdateEpisodeAgentInput;
+};
+
+
 export type MutationUpdateGiftArgs = {
   giftData: UpdateGiftInput;
 };
@@ -1004,6 +1010,17 @@ export type UpdateCreateSourceInput = {
   name: Scalars['String']['input'];
 };
 
+export type UpdateEpisodeAgentInput = {
+  id: Scalars['ID']['input'];
+  note?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdateEpisodeAgentMutation = {
+  __typename?: 'UpdateEpisodeAgentMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type UpdateEpisodeInput = {
   book?: InputMaybe<Scalars['String']['input']>;
   categories?: InputMaybe<Array<Scalars['ID']['input']>>;
@@ -1288,6 +1305,13 @@ export type EpisodeAgentQueryQueryVariables = Exact<{
 
 export type EpisodeAgentQueryQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: SourceMention | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, agent: { __typename?: 'AgentDescriptionType', id: string, name: string } } | null };
 
+export type DataEntryUpdateEpisodeAgentMutationMutationVariables = Exact<{
+  input: UpdateEpisodeAgentInput;
+}>;
+
+
+export type DataEntryUpdateEpisodeAgentMutationMutation = { __typename?: 'Mutation', updateEpisodeAgent?: { __typename?: 'UpdateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -2027,6 +2051,28 @@ export const EpisodeAgentQueryDocument = gql`
   export class EpisodeAgentQueryGQL extends Apollo.Query<EpisodeAgentQueryQuery, EpisodeAgentQueryQueryVariables> {
     override document = EpisodeAgentQueryDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryUpdateEpisodeAgentMutationDocument = gql`
+    mutation DataEntryUpdateEpisodeAgentMutation($input: UpdateEpisodeAgentInput!) {
+  updateEpisodeAgent(data: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateEpisodeAgentMutationGQL extends Apollo.Mutation<DataEntryUpdateEpisodeAgentMutationMutation, DataEntryUpdateEpisodeAgentMutationMutationVariables> {
+    override document = DataEntryUpdateEpisodeAgentMutationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index ed7367ad..53c3a79f 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -468,6 +468,7 @@ type Mutation {
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
   updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
+  updateEpisodeAgent(data: UpdateEpisodeAgentInput!): UpdateEpisodeAgentMutation
   updateGift(giftData: UpdateGiftInput!): UpdateGiftMutation
   updateLetter(letterData: UpdateLetterInput!): UpdateLetterMutation
   updateOrCreateSource(sourceData: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
@@ -949,6 +950,16 @@ input UpdateCreateSourceInput {
   name: String!
 }
 
+input UpdateEpisodeAgentInput {
+  id: ID!
+  note: String
+}
+
+type UpdateEpisodeAgentMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 input UpdateEpisodeInput {
   book: String
   categories: [ID!]
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
index 63a449d7..194eaba6 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
@@ -13,3 +13,13 @@ query EpisodeAgentQuery($id: ID!) {
         }
     }
 }
+
+mutation DataEntryUpdateEpisodeAgentMutation($input:UpdateEpisodeAgentInput!) {
+    updateEpisodeAgent(data: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From 90bdac95fab6706cc6e636666e128ec0d4246e9e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 15:17:39 +0200
Subject: [PATCH 411/565] save form data

---
 .../mutations/UpdateEpisodeAgentMutation.py   |  2 +-
 frontend/generated/graphql.ts                 | 25 +++++----
 frontend/generated/schema.graphql             |  1 +
 .../episode-link-form.component.ts            | 55 ++++++++++++++++---
 .../episode-link-form/episode-link.graphql    |  4 +-
 5 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/backend/event/mutations/UpdateEpisodeAgentMutation.py b/backend/event/mutations/UpdateEpisodeAgentMutation.py
index 2886c232..647e6766 100644
--- a/backend/event/mutations/UpdateEpisodeAgentMutation.py
+++ b/backend/event/mutations/UpdateEpisodeAgentMutation.py
@@ -16,7 +16,7 @@
 
 class UpdateEpisodeAgentInput(InputObjectType):
     id = ID(required=True)
-    source_mention = SourceMentionEnum
+    source_mention = SourceMentionEnum()
     note = String()
 
 
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 53e0c9fc..15455dae 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1013,6 +1013,7 @@ export type UpdateCreateSourceInput = {
 export type UpdateEpisodeAgentInput = {
   id: Scalars['ID']['input'];
   note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateEpisodeAgentMutation = {
@@ -1298,19 +1299,19 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 
 export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
-export type EpisodeAgentQueryQueryVariables = Exact<{
+export type DataEntryEpisodeAgentQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type EpisodeAgentQueryQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: SourceMention | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, agent: { __typename?: 'AgentDescriptionType', id: string, name: string } } | null };
+export type DataEntryEpisodeAgentQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: SourceMention | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, agent: { __typename?: 'AgentDescriptionType', id: string, name: string } } | null };
 
-export type DataEntryUpdateEpisodeAgentMutationMutationVariables = Exact<{
+export type DataEntryUpdateEpisodeAgentMutationVariables = Exact<{
   input: UpdateEpisodeAgentInput;
 }>;
 
 
-export type DataEntryUpdateEpisodeAgentMutationMutation = { __typename?: 'Mutation', updateEpisodeAgent?: { __typename?: 'UpdateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateEpisodeAgentMutation = { __typename?: 'Mutation', updateEpisodeAgent?: { __typename?: 'UpdateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -2027,8 +2028,8 @@ export const DataEntrySpaceDescriptionDocument = gql`
       super(apollo);
     }
   }
-export const EpisodeAgentQueryDocument = gql`
-    query EpisodeAgentQuery($id: ID!) {
+export const DataEntryEpisodeAgentDocument = gql`
+    query DataEntryEpisodeAgent($id: ID!) {
   episodeAgentLink(id: $id) {
     id
     note
@@ -2048,15 +2049,15 @@ export const EpisodeAgentQueryDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class EpisodeAgentQueryGQL extends Apollo.Query<EpisodeAgentQueryQuery, EpisodeAgentQueryQueryVariables> {
-    override document = EpisodeAgentQueryDocument;
+  export class DataEntryEpisodeAgentGQL extends Apollo.Query<DataEntryEpisodeAgentQuery, DataEntryEpisodeAgentQueryVariables> {
+    override document = DataEntryEpisodeAgentDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
-export const DataEntryUpdateEpisodeAgentMutationDocument = gql`
-    mutation DataEntryUpdateEpisodeAgentMutation($input: UpdateEpisodeAgentInput!) {
+export const DataEntryUpdateEpisodeAgentDocument = gql`
+    mutation DataEntryUpdateEpisodeAgent($input: UpdateEpisodeAgentInput!) {
   updateEpisodeAgent(data: $input) {
     ok
     errors {
@@ -2070,8 +2071,8 @@ export const DataEntryUpdateEpisodeAgentMutationDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryUpdateEpisodeAgentMutationGQL extends Apollo.Mutation<DataEntryUpdateEpisodeAgentMutationMutation, DataEntryUpdateEpisodeAgentMutationMutationVariables> {
-    override document = DataEntryUpdateEpisodeAgentMutationDocument;
+  export class DataEntryUpdateEpisodeAgentGQL extends Apollo.Mutation<DataEntryUpdateEpisodeAgentMutation, DataEntryUpdateEpisodeAgentMutationVariables> {
+    override document = DataEntryUpdateEpisodeAgentDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 53c3a79f..db8d7f01 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -953,6 +953,7 @@ input UpdateCreateSourceInput {
 input UpdateEpisodeAgentInput {
   id: ID!
   note: String
+  sourceMention: SourceMention
 }
 
 type UpdateEpisodeAgentMutation {
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 70b8e63b..26a65727 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,11 +1,17 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { EntityType, SelectOptions } from '../types';
-import { combineLatest, map, Observable, shareReplay, Subject, switchMap } from 'rxjs';
+import { combineLatest, debounceTime, distinctUntilChanged, map, Observable, shareReplay, skip, Subject, switchMap, withLatestFrom } from 'rxjs';
 import { actionIcons } from '@shared/icons';
-import { EpisodeAgentQueryGQL, EpisodeAgentQueryQuery, SourceMention } from 'generated/graphql';
+import {
+    DataEntryUpdateEpisodeAgentGQL, DataEntryUpdateEpisodeAgentMutationVariables,
+    DataEntryEpisodeAgentGQL, DataEntryEpisodeAgentQuery, SourceMention,
+    DataEntryUpdateEpisodeMutation
+} from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
 import { sourceMentionSelectOptions } from '../utils';
+import _ from 'underscore';
+import { MutationResult } from 'apollo-angular';
 
 
 type LinkTo = 'episode' | 'agent';
@@ -29,7 +35,8 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
      */
     @Input() linkTo: LinkTo = 'episode';
 
-    data$: Observable<EpisodeAgentQueryQuery | undefined>;
+
+    data$: Observable<DataEntryEpisodeAgentQuery | undefined>;
     form = new FormGroup({
         sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
         note: new FormControl<string>('', { nonNullable: true }),
@@ -37,14 +44,15 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
 
     sourceMentionOptions: SelectOptions<SourceMention> = sourceMentionSelectOptions();
 
-    private entityQueries: Record<EntityType, EpisodeAgentQueryGQL>;
-    private query$ = new Subject<EpisodeAgentQueryGQL>();
+    private entityQueries: Record<EntityType, DataEntryEpisodeAgentGQL>;
+    private query$ = new Subject<DataEntryEpisodeAgentGQL>();
     private id$ = new Subject<string>;
 
     actionIcons = actionIcons;
 
     constructor(
-        private agentQuery: EpisodeAgentQueryGQL,
+        private agentQuery: DataEntryEpisodeAgentGQL,
+        private agentMutation: DataEntryUpdateEpisodeAgentGQL,
     ) {
         this.entityQueries = {
             agent: agentQuery,
@@ -56,6 +64,16 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
             takeUntilDestroyed(),
         );
         this.data$.subscribe(this.updateFormValues.bind(this));
+        this.form.valueChanges.pipe(
+            debounceTime(500),
+            distinctUntilChanged(_.isEqual),
+            skip(1),
+            // tap(() => this.status$.next('loading')),
+            withLatestFrom(this.id$),
+            map(this.toMutationInput),
+            switchMap(this.makeMutation.bind(this)),
+            takeUntilDestroyed(),
+        ).subscribe(this.onMutationResult);
     }
 
     ngOnChanges(changes: SimpleChanges): void {
@@ -79,7 +97,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         return 'agents';
     }
 
-    linkedObject(linkTo: LinkTo, data: EpisodeAgentQueryQuery) {
+    linkedObject(linkTo: LinkTo, data: DataEntryEpisodeAgentQuery) {
         if (linkTo === 'episode') {
             return data.episodeAgentLink?.episode;
         } else {
@@ -87,10 +105,31 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         }
     }
 
-    private updateFormValues(data?: EpisodeAgentQueryQuery): void {
+    private updateFormValues(data?: DataEntryEpisodeAgentQuery): void {
         this.form.setValue({
             sourceMention: data?.episodeAgentLink?.sourceMention || SourceMention.Direct,
             note: data?.episodeAgentLink?.note || '',
         });
     }
+
+    private toMutationInput([values, id]: [typeof this.form.value, string]): DataEntryUpdateEpisodeAgentMutationVariables {
+        return { input: { id, ...values } };
+    }
+
+    private makeMutation(mutationInput: DataEntryUpdateEpisodeAgentMutationVariables) {
+        return this.agentMutation.mutate(mutationInput, {
+            errorPolicy: 'all',
+            refetchQueries: [
+                'DataEntryEpisodeAgent',
+            ],
+        })
+    }
+
+    private onMutationResult(result: MutationResult<DataEntryUpdateEpisodeMutation>) {
+        if (result.errors) {
+            console.error(result.errors);
+        } else if (result.data?.updateEpisode?.errors) {
+            console.error(result.data.updateEpisode.errors);
+        }
+    }
 }
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
index 194eaba6..5b425c03 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
@@ -1,4 +1,4 @@
-query EpisodeAgentQuery($id: ID!) {
+query DataEntryEpisodeAgent($id: ID!) {
     episodeAgentLink(id: $id) {
         id
         note
@@ -14,7 +14,7 @@ query EpisodeAgentQuery($id: ID!) {
     }
 }
 
-mutation DataEntryUpdateEpisodeAgentMutation($input:UpdateEpisodeAgentInput!) {
+mutation DataEntryUpdateEpisodeAgent($input:UpdateEpisodeAgentInput!) {
     updateEpisodeAgent(data: $input) {
         ok
         errors {

From 59aeda81184c966eb1f5ea7d62b935eac188d9a3 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 15:22:09 +0200
Subject: [PATCH 412/565] disable create new option

---
 .../agent-episodes-form/agent-episodes-form.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 3e72d38b..6517fc5f 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -22,7 +22,7 @@
             ngbDropdownItem (click)="addEpisode$.next(episode.id)">
             {{episode.name}}
         </button>
-        <button ngbDropdownItem>
+        <button ngbDropdownItem disabled>
             <lc-icon [icon]="actionIcons.create" />
             Create new episode
         </button>

From 83c28ad7d2921bc5be00f419f1e4f0ce81773082 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 15:32:58 +0200
Subject: [PATCH 413/565] sync form status of episode-link forms

---
 .../episode-link-form.component.ts            | 19 +++++++++++++++----
 frontend/src/app/data-entry/shared/utils.ts   |  5 ++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 26a65727..88514c88 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { EntityType, SelectOptions } from '../types';
-import { combineLatest, debounceTime, distinctUntilChanged, map, Observable, shareReplay, skip, Subject, switchMap, withLatestFrom } from 'rxjs';
+import { combineLatest, debounceTime, distinctUntilChanged, map, Observable, shareReplay, skip, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { actionIcons } from '@shared/icons';
 import {
     DataEntryUpdateEpisodeAgentGQL, DataEntryUpdateEpisodeAgentMutationVariables,
@@ -9,9 +9,10 @@ import {
 } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
-import { sourceMentionSelectOptions } from '../utils';
+import { formStatusSubject, sourceMentionSelectOptions } from '../utils';
 import _ from 'underscore';
 import { MutationResult } from 'apollo-angular';
+import { FormService } from '../form.service';
 
 
 type LinkTo = 'episode' | 'agent';
@@ -47,13 +48,17 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     private entityQueries: Record<EntityType, DataEntryEpisodeAgentGQL>;
     private query$ = new Subject<DataEntryEpisodeAgentGQL>();
     private id$ = new Subject<string>;
+    private status$ = formStatusSubject();
+    private formName = 'episode-link-' + crypto.randomUUID();
 
     actionIcons = actionIcons;
 
     constructor(
         private agentQuery: DataEntryEpisodeAgentGQL,
         private agentMutation: DataEntryUpdateEpisodeAgentGQL,
+        private formService: FormService,
     ) {
+        this.formService.attachForm(this.formName, this.status$);
         this.entityQueries = {
             agent: agentQuery,
         };
@@ -68,12 +73,12 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
             debounceTime(500),
             distinctUntilChanged(_.isEqual),
             skip(1),
-            // tap(() => this.status$.next('loading')),
+            tap(() => this.status$.next('loading')),
             withLatestFrom(this.id$),
             map(this.toMutationInput),
             switchMap(this.makeMutation.bind(this)),
             takeUntilDestroyed(),
-        ).subscribe(this.onMutationResult);
+        ).subscribe(this.onMutationResult.bind(this));
     }
 
     ngOnChanges(changes: SimpleChanges): void {
@@ -88,6 +93,8 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     ngOnDestroy(): void {
         this.query$.complete();
         this.id$.complete();
+        this.status$.complete();
+        this.formService.detachForm(this.formName);
     }
 
     formUrl(linkTo: LinkTo, entityType: EntityType): string {
@@ -128,8 +135,12 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     private onMutationResult(result: MutationResult<DataEntryUpdateEpisodeMutation>) {
         if (result.errors) {
             console.error(result.errors);
+            this.status$.next('error');
         } else if (result.data?.updateEpisode?.errors) {
             console.error(result.data.updateEpisode.errors);
+            this.status$.next('error');
+        } else {
+            this.status$.next('saved');
         }
     }
 }
diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
index c352be7e..569315d4 100644
--- a/frontend/src/app/data-entry/shared/utils.ts
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -1,7 +1,10 @@
 import { SourceMention } from "generated/graphql";
-import { SelectOptions } from "./types";
+import { FormStatus, SelectOptions } from "./types";
+import { BehaviorSubject } from "rxjs";
 
 export const sourceMentionSelectOptions = (): SelectOptions<SourceMention> => [
     { value: SourceMention.Direct, label: 'Directly mentioned' },
     { value: SourceMention.Implied, label: 'Implied' }
 ];
+
+export const formStatusSubject = () => new BehaviorSubject<FormStatus>('idle');

From 4de8afc30c924c4a79deeced7402c1d0f9dab190 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 16:05:12 +0200
Subject: [PATCH 414/565] change variables for m2m mutations/queries

---
 .../mutations/DeleteEpisodeAgentMutation.py   | 13 ++++++---
 .../mutations/UpdateEpisodeAgentMutation.py   | 11 +++++---
 backend/event/queries.py                      | 13 ++++++---
 frontend/generated/graphql.ts                 | 23 +++++++++-------
 frontend/generated/schema.graphql             |  7 ++---
 .../agent-episodes-form.component.html        | 26 ++++++++++--------
 .../agent-episodes-form.component.ts          | 17 +++++++++---
 .../agent-episodes.graphql                    |  4 +--
 .../episode-link-form.component.ts            | 27 +++++++++++--------
 .../episode-link-form/episode-link.graphql    |  4 +--
 10 files changed, 93 insertions(+), 52 deletions(-)

diff --git a/backend/event/mutations/DeleteEpisodeAgentMutation.py b/backend/event/mutations/DeleteEpisodeAgentMutation.py
index d67a70e6..1484c12b 100644
--- a/backend/event/mutations/DeleteEpisodeAgentMutation.py
+++ b/backend/event/mutations/DeleteEpisodeAgentMutation.py
@@ -16,20 +16,25 @@ class DeleteEpisodeAgentMutation(Mutation):
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     class Arguments:
-        id = ID(required=True)
+        agent = ID(required=True)
+        episode = ID(required=True)
 
     @classmethod
     def mutate(
         cls,
         root: None,
         info: ResolveInfo,
-        id: ID,
+        agent: ID,
+        episode: ID,
     ):
         try:
-            obj = EpisodeAgent.objects.get(id=id)
+            obj = EpisodeAgent.objects.get(agent__id=agent, episode__id=episode)
         except EpisodeAgent.DoesNotExist:
             return cls(
-                ok=False, errors=LettercraftErrorType("id", ["Object not found"])
+                ok=False,
+                errors=LettercraftErrorType(
+                    "agent__id", ["Relation object does not exist"]
+                ),
             )
 
         obj.delete()
diff --git a/backend/event/mutations/UpdateEpisodeAgentMutation.py b/backend/event/mutations/UpdateEpisodeAgentMutation.py
index 647e6766..648aac8f 100644
--- a/backend/event/mutations/UpdateEpisodeAgentMutation.py
+++ b/backend/event/mutations/UpdateEpisodeAgentMutation.py
@@ -15,7 +15,8 @@
 
 
 class UpdateEpisodeAgentInput(InputObjectType):
-    id = ID(required=True)
+    agent = ID(required=True)
+    episode = ID(required=True)
     source_mention = SourceMentionEnum()
     note = String()
 
@@ -32,11 +33,13 @@ class Arguments:
     @classmethod
     def mutate(cls, root: None, info: ResolveInfo, data: UpdateEpisodeAgentInput):
         try:
-            reference = cls.get_object(info, data)
+            obj = EpisodeAgent.objects.get(
+                agent__id=data.agent, episode__id=data.episode
+            )
         except EpisodeAgent.DoesNotExist as e:
-            error = LettercraftErrorType(field="id", messages=[str(e)])
+            error = LettercraftErrorType(field="agent", messages=[str(e)])
             return cls(ok=False, error=[error])
 
-        cls.mutate_object(data, reference, info)
+        cls.mutate_object(data, obj, info)
 
         return cls(ok=True, errors=[])
diff --git a/backend/event/queries.py b/backend/event/queries.py
index 0f5dda08..4e626b70 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -9,7 +9,9 @@ class EventQueries(ObjectType):
     episode = Field(EpisodeType, id=ID(required=True))
     episodes = List(NonNull(EpisodeType), required=True, source_id=ID())
     episode_categories = List(NonNull(EpisodeCategoryType), required=True)
-    episode_agent_link = Field(EpisodeAgentType, id=ID(required=True))
+    episode_agent_link = Field(
+        EpisodeAgentType, agent=ID(required=True), episode=ID(required=True)
+    )
 
     @staticmethod
     def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Episode | None:
@@ -36,9 +38,14 @@ def resolve_episode_categories(
 
     @staticmethod
     def resolve_episode_agent_link(
-        parent: None, info: ResolveInfo, id: str
+        parent: None,
+        info: ResolveInfo,
+        agent: str,
+        episode: str,
     ) -> EpisodeAgent | None:
         try:
-            return EpisodeAgentType.get_queryset(EpisodeAgent.objects, info).get(id=id)
+            return EpisodeAgentType.get_queryset(EpisodeAgent.objects, info).get(
+                agent__id=agent, episode__id=episode
+            )
         except EpisodeAgent.DoesNotExist:
             return None
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 15455dae..7cf3846c 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -489,7 +489,8 @@ export type MutationDeleteEpisodeArgs = {
 
 
 export type MutationDeleteEpisodeAgentArgs = {
-  id: Scalars['ID']['input'];
+  agent: Scalars['ID']['input'];
+  episode: Scalars['ID']['input'];
 };
 
 
@@ -700,7 +701,8 @@ export type QueryEpisodeArgs = {
 
 
 export type QueryEpisodeAgentLinkArgs = {
-  id: Scalars['ID']['input'];
+  agent: Scalars['ID']['input'];
+  episode: Scalars['ID']['input'];
 };
 
 
@@ -1011,7 +1013,8 @@ export type UpdateCreateSourceInput = {
 };
 
 export type UpdateEpisodeAgentInput = {
-  id: Scalars['ID']['input'];
+  agent: Scalars['ID']['input'];
+  episode: Scalars['ID']['input'];
   note?: InputMaybe<Scalars['String']['input']>;
   sourceMention?: InputMaybe<SourceMention>;
 };
@@ -1131,7 +1134,8 @@ export type DataEntryCreateAgentEpisodeMutationMutationVariables = Exact<{
 export type DataEntryCreateAgentEpisodeMutationMutation = { __typename?: 'Mutation', createEpisodeAgent?: { __typename?: 'CreateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteAgentEpisodeMutationMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
+  agent: Scalars['ID']['input'];
+  episode: Scalars['ID']['input'];
 }>;
 
 
@@ -1300,7 +1304,8 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryEpisodeAgentQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+  agent: Scalars['ID']['input'];
+  episode: Scalars['ID']['input'];
 }>;
 
 
@@ -1467,8 +1472,8 @@ export const DataEntryCreateAgentEpisodeMutationDocument = gql`
     }
   }
 export const DataEntryDeleteAgentEpisodeMutationDocument = gql`
-    mutation DataEntryDeleteAgentEpisodeMutation($id: ID!) {
-  deleteEpisodeAgent(id: $id) {
+    mutation DataEntryDeleteAgentEpisodeMutation($agent: ID!, $episode: ID!) {
+  deleteEpisodeAgent(agent: $agent, episode: $episode) {
     ok
     errors {
       field
@@ -2029,8 +2034,8 @@ export const DataEntrySpaceDescriptionDocument = gql`
     }
   }
 export const DataEntryEpisodeAgentDocument = gql`
-    query DataEntryEpisodeAgent($id: ID!) {
-  episodeAgentLink(id: $id) {
+    query DataEntryEpisodeAgent($agent: ID!, $episode: ID!) {
+  episodeAgentLink(agent: $agent, episode: $episode) {
     id
     note
     sourceMention
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index db8d7f01..6e68d1e9 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -462,7 +462,7 @@ type Mutation {
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
-  deleteEpisodeAgent(id: ID!): DeleteEpisodeAgentMutation
+  deleteEpisodeAgent(agent: ID!, episode: ID!): DeleteEpisodeAgentMutation
   deleteGift(id: ID!): DeleteGiftMutation
   deleteLetter(id: ID!): DeleteLetterMutation
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
@@ -625,7 +625,7 @@ type Query {
   agentDescription(id: ID!): AgentDescriptionType
   agentDescriptions(episodeId: ID, sourceId: ID): [AgentDescriptionType!]!
   episode(id: ID!): EpisodeType
-  episodeAgentLink(id: ID!): EpisodeAgentType
+  episodeAgentLink(agent: ID!, episode: ID!): EpisodeAgentType
   episodeCategories: [EpisodeCategoryType!]!
   episodes(sourceId: ID): [EpisodeType!]!
   giftDescription(id: ID!): GiftDescriptionType
@@ -951,7 +951,8 @@ input UpdateCreateSourceInput {
 }
 
 input UpdateEpisodeAgentInput {
-  id: ID!
+  agent: ID!
+  episode: ID!
   note: String
   sourceMention: SourceMention
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 6517fc5f..c07b696d 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -1,15 +1,19 @@
 <ng-container *ngIf="data$ | async as data">
-    <p>This agent is involved in the following episodes:</p>
-    <ul class="list-unstyled vstack gap-4">
-        <li *ngFor="let item of data.agentDescription?.episodes">
-            <lc-episode-link-form [id]="item.id" entityType="agent">
-                <button removeControl class="btn btn-danger" aria-label="remove episode"
-                    (click)="removeEpisode$.next(item.id)">
-                    <lc-icon [icon]="actionIcons.remove" />
-                </button>
-            </lc-episode-link-form>
-        </li>
-    </ul>
+    <ng-container *ngIf="data.agentDescription">
+        <p>This agent is involved in the following episodes:</p>
+        <ul class="list-unstyled vstack gap-4">
+            <li *ngFor="let item of data.agentDescription.episodes">
+                <lc-episode-link-form entityType="agent"
+                        [entityID]="data.agentDescription.id"
+                        [episodeID]="item.episode.id">
+                    <button removeControl class="btn btn-danger" aria-label="remove episode"
+                        (click)="removeEpisode$.next(item.episode.id)">
+                        <lc-icon [icon]="actionIcons.remove" />
+                    </button>
+                </lc-episode-link-form>
+            </li>
+        </ul>
+    </ng-container>
 </ng-container>
 
 <div ngbDropdown class="mb-4">
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 85586bb3..08570f23 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -4,6 +4,7 @@ import {
     CreateEpisodeAgentInput, DataEntryAgentEpisodesGQL, DataEntryAgentEpisodesQuery,
     DataEntryCreateAgentEpisodeMutationGQL,
     DataEntryDeleteAgentEpisodeMutationGQL,
+    DataEntryDeleteAgentEpisodeMutationMutationVariables,
 } from 'generated/graphql';
 import { BehaviorSubject, map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -48,13 +49,20 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         this.availableEpisodes$ = this.data$.pipe(
             map(this.availableEpisodes)
         );
+
         this.addEpisode$.pipe(
             withLatestFrom(this.formService.id$),
             takeUntilDestroyed(),
         ).subscribe(([episodeID, agentID]) =>
             this.addEpisode(episodeID, agentID)
         );
-        this.removeEpisode$.subscribe(this.removeEpisode.bind(this));
+
+        this.removeEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(([episodeID, agentID]) =>
+            this.removeEpisode(episodeID, agentID)
+        );
     }
 
     ngOnDestroy(): void {
@@ -76,8 +84,11 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         ).subscribe(this.mutationObserver);
     }
 
-    removeEpisode(linkID: string): void {
-        const data = { id: linkID };
+    removeEpisode(episodeID: string, agentID: string): void {
+        const data: DataEntryDeleteAgentEpisodeMutationMutationVariables = {
+            agent: agentID,
+            episode: episodeID,
+        };
         this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
             tap(() => this.status$.next('loading'))
         ).subscribe(this.mutationObserver)
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
index c46f53de..cba8089b 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -27,8 +27,8 @@ mutation DataEntryCreateAgentEpisodeMutation($data: CreateEpisodeAgentInput!) {
     }
 }
 
-mutation DataEntryDeleteAgentEpisodeMutation($id: ID!) {
-    deleteEpisodeAgent(id: $id) {
+mutation DataEntryDeleteAgentEpisodeMutation($agent: ID!, $episode: ID!) {
+    deleteEpisodeAgent(agent: $agent, episode: $episode) {
         ok
         errors {
             field
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 88514c88..e5862d30 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -24,7 +24,8 @@ type LinkTo = 'episode' | 'agent';
 })
 export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     /** ID of the connection object (e.g. EpisodeAgent) */
-    @Input({ required: true }) id!: string;
+    @Input({ required: true }) entityID!: string;
+    @Input({ required: true }) episodeID!: string;
 
     /** Type of entity (agent, letter, etc.) */
     @Input({ required: true }) entityType!: EntityType;
@@ -47,14 +48,14 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
 
     private entityQueries: Record<EntityType, DataEntryEpisodeAgentGQL>;
     private query$ = new Subject<DataEntryEpisodeAgentGQL>();
-    private id$ = new Subject<string>;
+    private link$ = new Subject<{ entity: string, episode: string }>();
     private status$ = formStatusSubject();
     private formName = 'episode-link-' + crypto.randomUUID();
 
     actionIcons = actionIcons;
 
     constructor(
-        private agentQuery: DataEntryEpisodeAgentGQL,
+        agentQuery: DataEntryEpisodeAgentGQL,
         private agentMutation: DataEntryUpdateEpisodeAgentGQL,
         private formService: FormService,
     ) {
@@ -62,8 +63,10 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         this.entityQueries = {
             agent: agentQuery,
         };
-        this.data$ = combineLatest([this.query$, this.id$]).pipe(
-            switchMap(([query, id]) => query.watch({ id }).valueChanges),
+        this.data$ = combineLatest([this.query$, this.link$]).pipe(
+            switchMap(([query, link]) => query.watch({
+                agent: link.entity, episode: link.episode
+            }).valueChanges),
             map(result => result.data),
             shareReplay(1),
             takeUntilDestroyed(),
@@ -74,7 +77,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
             distinctUntilChanged(_.isEqual),
             skip(1),
             tap(() => this.status$.next('loading')),
-            withLatestFrom(this.id$),
+            withLatestFrom(this.link$),
             map(this.toMutationInput),
             switchMap(this.makeMutation.bind(this)),
             takeUntilDestroyed(),
@@ -85,14 +88,14 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         if (changes['entityType']) {
             this.query$.next(this.entityQueries[this.entityType]);
         }
-        if (changes['id']) {
-            this.id$.next(this.id);
+        if (changes['entityID'] || changes['episodeID']) {
+            this.link$.next({ entity: this.entityID, episode: this.episodeID });
         }
     }
 
     ngOnDestroy(): void {
         this.query$.complete();
-        this.id$.complete();
+        this.link$.complete();
         this.status$.complete();
         this.formService.detachForm(this.formName);
     }
@@ -119,8 +122,10 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         });
     }
 
-    private toMutationInput([values, id]: [typeof this.form.value, string]): DataEntryUpdateEpisodeAgentMutationVariables {
-        return { input: { id, ...values } };
+    private toMutationInput(
+        [values, link]: [typeof this.form.value, { entity: string, episode: string }]
+    ): DataEntryUpdateEpisodeAgentMutationVariables {
+        return { input: { agent: link.entity, episode: link.episode, ...values } };
     }
 
     private makeMutation(mutationInput: DataEntryUpdateEpisodeAgentMutationVariables) {
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
index 5b425c03..019bb8be 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
@@ -1,5 +1,5 @@
-query DataEntryEpisodeAgent($id: ID!) {
-    episodeAgentLink(id: $id) {
+query DataEntryEpisodeAgent($agent: ID!, $episode: ID!) {
+    episodeAgentLink(agent: $agent, episode: $episode) {
         id
         note
         sourceMention

From 8305e69235fd064b5cc9526d7c7beb90d2291d21 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 16:07:32 +0200
Subject: [PATCH 415/565] draft episode agents query

---
 frontend/generated/graphql.ts                 | 31 +++++++++++++++++++
 .../episode-agents.graphql                    | 11 +++++++
 2 files changed, 42 insertions(+)
 create mode 100644 frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 7cf3846c..6fee05b8 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1169,6 +1169,13 @@ export type DataEntryDeleteAgentMutationVariables = Exact<{
 
 export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
 
+export type DataEntryEpisodeAgentsQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryEpisodeAgentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }> } | null };
+
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1579,6 +1586,30 @@ export const DataEntryDeleteAgentDocument = gql`
   export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
     override document = DataEntryDeleteAgentDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryEpisodeAgentsDocument = gql`
+    query DataEntryEpisodeAgents($id: ID!) {
+  episode(id: $id) {
+    id
+    source {
+      id
+    }
+    agents {
+      id
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeAgentsGQL extends Apollo.Query<DataEntryEpisodeAgentsQuery, DataEntryEpisodeAgentsQueryVariables> {
+    override document = DataEntryEpisodeAgentsDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
new file mode 100644
index 00000000..e6bcf2c2
--- /dev/null
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
@@ -0,0 +1,11 @@
+query DataEntryEpisodeAgents($id:ID!) {
+    episode(id: $id) {
+        id
+        source {
+            id
+        }
+        agents {
+            id
+        }
+    }
+}

From a7bf263d3d0efd64205a113b43f4d3682b6ee8bd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 16:20:37 +0200
Subject: [PATCH 416/565] allow querying agents in source type

---
 backend/source/types/SourceType.py                     | 10 +++++++++-
 frontend/generated/graphql.ts                          |  7 ++++++-
 frontend/generated/schema.graphql                      |  1 +
 .../episode-agents-form/episode-agents.graphql         |  4 ++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 234699d8..5f78c0b7 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -6,13 +6,15 @@
 from event.types.EpisodeType import EpisodeType
 from source.types.SourceContentsDateType import SourceContentsDateType
 from source.types.SourceWrittenDateType import SourceWrittenDateType
-
+from person.models import AgentDescription
+from person.types.AgentDescriptionType import AgentDescriptionType
 
 class SourceType(DjangoObjectType):
     episodes = List(NonNull(EpisodeType), required=True)
     num_of_episodes = Int(required=True)
     written_date = Field(SourceWrittenDateType)
     contents_date = Field(SourceContentsDateType)
+    agents = List(NonNull(AgentDescriptionType), required=True)
 
     class Meta:
         model = Source
@@ -45,3 +47,9 @@ def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
             .filter(source_id=parent.pk)
             .count()
         )
+
+    @staticmethod
+    def resolve_agents(parent: Source, info: ResolveInfo) -> QuerySet[AgentDescription]:
+        return AgentDescriptionType.get_queryset(AgentDescription.objects, info).filter(
+            source__id=parent.pk
+        )
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 6fee05b8..30ef7104 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -826,6 +826,7 @@ export enum SourceMention {
 
 export type SourceType = {
   __typename?: 'SourceType';
+  agents: Array<AgentDescriptionType>;
   contentsDate?: Maybe<SourceContentsDateType>;
   /** The name of the author of the edition */
   editionAuthor: Scalars['String']['output'];
@@ -1174,7 +1175,7 @@ export type DataEntryEpisodeAgentsQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeAgentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }> } | null };
+export type DataEntryEpisodeAgentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }> } | null };
 
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1596,6 +1597,10 @@ export const DataEntryEpisodeAgentsDocument = gql`
     id
     source {
       id
+      agents {
+        id
+        name
+      }
     }
     agents {
       id
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 6e68d1e9..5c43d7fa 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -729,6 +729,7 @@ enum SourceMention {
 }
 
 type SourceType {
+  agents: [AgentDescriptionType!]!
   contentsDate: SourceContentsDateType
 
   """The name of the author of the edition"""
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
index e6bcf2c2..d975d1d0 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
@@ -3,6 +3,10 @@ query DataEntryEpisodeAgents($id:ID!) {
         id
         source {
             id
+            agents {
+                id
+                name
+            }
         }
         agents {
             id

From 0c4f4b8ff1615616c3a727d605880a669b261fd1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 16:16:30 +0200
Subject: [PATCH 417/565] implement episode-agents form

---
 .../episode-agents-form.component.html        |  35 +++++-
 .../episode-agents-form.component.ts          | 108 +++++++++++++++++-
 .../episode-form/episode-form.component.ts    |   2 +
 .../episode-link-form.component.ts            |   2 +-
 4 files changed, 143 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index ce59c301..7a47ff4a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -1 +1,34 @@
-<p><i>Coming soon!</i></p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.episode">
+        <p>The following agents are involved in this episode:</p>
+        <ul class="list-unstyled vstack gap-4">
+            <li *ngFor="let agent of data.episode.agents">
+                <lc-episode-link-form entityType="agent" linkTo="entity"
+                        [entityID]="agent.id"
+                        [episodeID]="data.episode.id">
+                    <button removeControl class="btn btn-danger" aria-label="remove episode"
+                        (click)="removeAgent$.next(agent.id)">
+                        <lc-icon [icon]="actionIcons.remove" />
+                    </button>
+                </lc-episode-link-form>
+            </li>
+        </ul>
+    </ng-container>
+</ng-container>
+
+<div ngbDropdown class="mb-4">
+    <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
+        ngbDropdownToggle>
+        Add agent
+    </button>
+    <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
+        <button *ngFor="let agent of (availableAgents$ | async)"
+            ngbDropdownItem (click)="addAgent$.next(agent.id)">
+            {{agent.name}}
+        </button>
+        <button ngbDropdownItem disabled>
+            <lc-icon [icon]="actionIcons.create" />
+            Create new agent
+        </button>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index 4e157701..38e09020 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -1,8 +1,112 @@
-import { Component } from "@angular/core";
+import { Component, OnDestroy } from "@angular/core";
+import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from "rxjs";
+import { formStatusSubject } from "../../shared/utils";
+import { actionIcons } from "@shared/icons";
+import { MutationResult } from "apollo-angular";
+import { FormService } from "../../shared/form.service";
+import {
+    CreateEpisodeAgentInput, DataEntryCreateAgentEpisodeMutationGQL,
+    DataEntryDeleteAgentEpisodeMutationGQL, DataEntryEpisodeAgentsGQL,
+    DataEntryEpisodeAgentsQuery
+} from "generated/graphql";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+
+const REFETCH_QUERIES = ['DataEntryEpisodeAgents'];
 
 @Component({
     selector: "lc-episode-agents-form",
     templateUrl: "./episode-agents-form.component.html",
     styleUrls: ["./episode-agents-form.component.scss"],
 })
-export class EpisodeAgentsFormComponent {}
+export class EpisodeAgentsFormComponent implements OnDestroy {
+    data$: Observable<DataEntryEpisodeAgentsQuery>;
+    availableAgents$: Observable<{ name: string, id: string }[]>;
+
+    addAgent$ = new Subject<string>();
+    removeAgent$ = new Subject<string>();
+    actionIcons = actionIcons;
+    status$ = formStatusSubject();
+    formName = 'agents';
+
+    private mutationObserver: Partial<Observer<MutationResult>> = {
+        next: this.onSuccess.bind(this),
+        error: this.onError.bind(this),
+    };
+
+    constructor(
+        private formService: FormService,
+        private query: DataEntryEpisodeAgentsGQL,
+        private addMutation: DataEntryCreateAgentEpisodeMutationGQL,
+        private removeMutation: DataEntryDeleteAgentEpisodeMutationGQL,
+    ) {
+        this.formService.attachForm(this.formName, this.status$);
+        this.data$ = this.formService.id$.pipe(
+            switchMap(id => this.query.watch({ id }).valueChanges),
+            map(result => result.data),
+            takeUntilDestroyed(),
+        );
+        this.availableAgents$ = this.data$.pipe(
+            map(this.availableAgents)
+        );
+
+        this.addAgent$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(([episodeID, agentID]) =>
+            this.addAgent(episodeID, agentID)
+        );
+
+        this.removeAgent$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(([episodeID, agentID]) =>
+            this.removeAgent(episodeID, agentID)
+        );
+    }
+
+    ngOnDestroy(): void {
+        this.status$.complete();
+        this.addAgent$.complete();
+        this.removeAgent$.complete();
+        this.formService.detachForm(this.formName);
+    }
+
+    addAgent(agentID: string, episodeID: string): void {
+        const data: CreateEpisodeAgentInput = {
+            agent: agentID,
+            episode: episodeID,
+        };
+        this.addMutation.mutate({ data }, {
+            refetchQueries: REFETCH_QUERIES,
+        }).pipe(
+            tap(() => this.status$.next('loading'))
+        ).subscribe(this.mutationObserver);
+    }
+
+    removeAgent(agentID: string, episodeID: string): void {
+        const data = {
+            agent: agentID,
+            episode: episodeID,
+        };
+        this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
+            tap(() => this.status$.next('loading'))
+        ).subscribe(this.mutationObserver)
+    }
+
+    onSuccess() {
+        this.status$.next('saved');
+    }
+
+    onError(error: any) {
+        console.error(error);
+        this.status$.next('error');
+    }
+
+    private availableAgents(
+        data: DataEntryEpisodeAgentsQuery
+    ): { name: string, id: string }[] {
+        const allAgents = data.episode?.source.agents || [];
+        const linkedAgentIDs = data.episode?.agents.map(agent => agent.id) || [];
+        return allAgents.filter(agent => !linkedAgentIDs.includes(agent.id));
+    }
+}
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 18f8377f..58d65068 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -3,11 +3,13 @@ import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
 import { DataEntryEpisodeFormGQL } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
+import { FormService } from "../shared/form.service";
 
 @Component({
     selector: "lc-episode",
     templateUrl: "./episode-form.component.html",
     styleUrls: ["./episode-form.component.scss"],
+    providers: [FormService],
 })
 export class EpisodeFormComponent {
     private id$ = this.route.params.pipe(map((params) => params["id"]));
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index e5862d30..e644e443 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -15,7 +15,7 @@ import { MutationResult } from 'apollo-angular';
 import { FormService } from '../form.service';
 
 
-type LinkTo = 'episode' | 'agent';
+type LinkTo = 'episode' | 'entity';
 
 @Component({
     selector: 'lc-episode-link-form',

From 59d639be88e76d3bd7cdb3263891dee6277490fd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 16:54:28 +0200
Subject: [PATCH 418/565] outfactor differenceBy

---
 .../agent-episodes-form.component.ts          |  5 +++--
 .../episode-agents-form.component.ts          |  6 +++---
 .../src/app/data-entry/shared/utils.spec.ts   | 17 +++++++++++++++
 frontend/src/app/data-entry/shared/utils.ts   | 21 +++++++++++++++++++
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/app/data-entry/shared/utils.spec.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 08570f23..b3ae070e 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -11,6 +11,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { actionIcons } from '@shared/icons';
 import { FormStatus } from '../../shared/types';
 import { MutationResult } from 'apollo-angular';
+import { differencyBy } from '../../shared/utils';
 
 const REFETCH_QUERIES = ['DataEntryAgentEpisodes'];
 
@@ -107,7 +108,7 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         data: DataEntryAgentEpisodesQuery
     ): { name: string, id: string }[] {
         const allEpisodes = data.agentDescription?.source.episodes || [];
-        const linkedEpisodeIDs = data.agentDescription?.episodes.map(ep => ep.episode.id) || [];
-        return allEpisodes.filter(episode => !linkedEpisodeIDs.includes(episode.id));
+        const linkedEpisodes = data.agentDescription?.episodes || [];
+        return differencyBy(allEpisodes, linkedEpisodes, 'id');
     }
 }
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index 38e09020..f442a567 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from "@angular/core";
 import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from "rxjs";
-import { formStatusSubject } from "../../shared/utils";
+import { differencyBy, formStatusSubject } from "../../shared/utils";
 import { actionIcons } from "@shared/icons";
 import { MutationResult } from "apollo-angular";
 import { FormService } from "../../shared/form.service";
@@ -106,7 +106,7 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         data: DataEntryEpisodeAgentsQuery
     ): { name: string, id: string }[] {
         const allAgents = data.episode?.source.agents || [];
-        const linkedAgentIDs = data.episode?.agents.map(agent => agent.id) || [];
-        return allAgents.filter(agent => !linkedAgentIDs.includes(agent.id));
+        const linkedAgents = data.episode?.agents || [];
+        return differencyBy(allAgents, linkedAgents, 'id');
     }
 }
diff --git a/frontend/src/app/data-entry/shared/utils.spec.ts b/frontend/src/app/data-entry/shared/utils.spec.ts
new file mode 100644
index 00000000..ed08973b
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/utils.spec.ts
@@ -0,0 +1,17 @@
+import { differencyBy } from "./utils";
+
+describe('differenceBy', () => {
+    it('should compare lists', () => {
+        const a = [
+            { id: '1', name: 'Bert' },
+            { id: '2', name: 'Ernie' },
+            { id: '3', name: 'Elmo' },
+            { id: '4', name: 'Big Bird' },
+        ];
+        const b = [
+            { id: '2' },
+            { id: '4' },
+        ];
+        expect(differencyBy(a, b, 'id')).toEqual([a[0], a[2]]);
+    });
+});
diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
index 569315d4..587eba58 100644
--- a/frontend/src/app/data-entry/shared/utils.ts
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -1,6 +1,7 @@
 import { SourceMention } from "generated/graphql";
 import { FormStatus, SelectOptions } from "./types";
 import { BehaviorSubject } from "rxjs";
+import _ from "underscore";
 
 export const sourceMentionSelectOptions = (): SelectOptions<SourceMention> => [
     { value: SourceMention.Direct, label: 'Directly mentioned' },
@@ -8,3 +9,23 @@ export const sourceMentionSelectOptions = (): SelectOptions<SourceMention> => [
 ];
 
 export const formStatusSubject = () => new BehaviorSubject<FormStatus>('idle');
+
+/**
+ * Exclude all values from a list that have a matching value in another list, based
+ * on the specified property.
+ *
+ * Similar to _.difference, but compares on a specified key.
+ *
+ * @param list The starting list
+ * @param others The list with values to excluded
+ * @param key The property by which to compare objects
+ * @returns The contents of `list` for which no value in `others` matches the `key`
+ * property.
+ */
+export const differencyBy = <T extends object>(
+    list: T[], others: object[], key: string
+): T[] => {
+    const getValue = (obj: object) => _.get(obj, key, undefined);
+    const excludeValues = others.map(getValue);
+    return list.filter(item => !excludeValues.includes(getValue(item)));
+}

From 57fd742e9e6f711d93890140982a6b9abc36c654 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 4 Sep 2024 17:03:33 +0200
Subject: [PATCH 419/565] polish templates

---
 .../agent-episodes-form.component.html        | 29 ++++++++++---------
 .../episode-agents-form.component.html        | 28 +++++++++---------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index c07b696d..2dbaf5d7 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -16,19 +16,22 @@
     </ng-container>
 </ng-container>
 
-<div ngbDropdown class="mb-4">
-    <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
-        ngbDropdownToggle>
-        Add episode
-    </button>
-    <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
-        <button *ngFor="let episode of (availableEpisodes$ | async)"
-            ngbDropdownItem (click)="addEpisode$.next(episode.id)">
-            {{episode.name}}
-        </button>
-        <button ngbDropdownItem disabled>
-            <lc-icon [icon]="actionIcons.create" />
-            Create new episode
+
+<div class="mt-4 mb-4">
+    <div ngbDropdown>
+        <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
+            ngbDropdownToggle>
+            Add episode
         </button>
+        <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
+            <button *ngFor="let episode of (availableEpisodes$ | async)"
+                ngbDropdownItem (click)="addEpisode$.next(episode.id)">
+                {{episode.name}}
+            </button>
+            <button ngbDropdownItem disabled>
+                <lc-icon [icon]="actionIcons.create" />
+                Create new episode
+            </button>
+        </div>
     </div>
 </div>
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index 7a47ff4a..db48448d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -16,19 +16,21 @@
     </ng-container>
 </ng-container>
 
-<div ngbDropdown class="mb-4">
-    <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
-        ngbDropdownToggle>
-        Add agent
-    </button>
-    <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
-        <button *ngFor="let agent of (availableAgents$ | async)"
-            ngbDropdownItem (click)="addAgent$.next(agent.id)">
-            {{agent.name}}
-        </button>
-        <button ngbDropdownItem disabled>
-            <lc-icon [icon]="actionIcons.create" />
-            Create new agent
+<div class="mt-4 mb-4">
+    <div ngbDropdown>
+        <button type="button" class="btn btn-primary" id="add-agent-dropdown-trigger"
+            ngbDropdownToggle>
+            Add agent
         </button>
+        <div ngbDropdownMenu aria-labelledby="add-agent-dropdown-trigger">
+            <button *ngFor="let agent of (availableAgents$ | async)"
+                ngbDropdownItem (click)="addAgent$.next(agent.id)">
+                {{agent.name}}
+            </button>
+            <button ngbDropdownItem disabled>
+                <lc-icon [icon]="actionIcons.create" />
+                Create new agent
+            </button>
+        </div>
     </div>
 </div>

From 7a77bca2223f8da39b82ab5614a2fd9ca84ac6be Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 5 Sep 2024 16:01:41 +0200
Subject: [PATCH 420/565] generalise episode entity query

---
 backend/event/models.py                       | 87 +++++++++----------
 backend/event/queries.py                      | 30 ++++++-
 backend/event/types/EpisodeEntityType.py      | 39 +++++++++
 frontend/generated/graphql.ts                 | 51 +++++++++--
 frontend/generated/schema.graphql             | 23 +++++
 .../agent-episodes-form.component.html        |  2 +-
 .../agent-episodes-form.component.ts          |  2 +
 .../episode-agents-form.component.html        |  2 +-
 .../episode-agents-form.component.ts          |  4 +-
 .../episode-link-form.component.ts            | 58 ++++++-------
 .../episode-link-form/episode-link.graphql    |  6 +-
 11 files changed, 213 insertions(+), 91 deletions(-)
 create mode 100644 backend/event/types/EpisodeEntityType.py

diff --git a/backend/event/models.py b/backend/event/models.py
index 62535c83..c4e202cf 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -1,6 +1,5 @@
 from django.db import models
 from django.core.exceptions import ValidationError
-
 from core.models import EntityDescription, DescriptionField, Named
 from person.models import AgentDescription
 from letter.models import GiftDescription, LetterDescription
@@ -53,93 +52,91 @@ class Episode(EntityDescription, models.Model):
     )
 
 
-class EpisodeAgent(DescriptionField, models.Model):
+class EpisodeEntity(DescriptionField, models.Model):
     """
-    Relationship between an episode and an agent described in a source text
+    Relationship between an episode and an entity described in a source text
+
+    Child classes should set:
+    - a ForeignKey relation to AgentDescription/GiftDescription/etc
+    - `entity_field` with the name of this field in the model class
     """
 
+    class Meta:
+        abstract = True
+
+    entity_field = None
+
     episode = models.ForeignKey(
         to=Episode,
         on_delete=models.CASCADE,
     )
-    agent = models.ForeignKey(
-        to=AgentDescription,
-        on_delete=models.CASCADE,
-    )
+
+    @property
+    def entity(self) -> EntityDescription:
+        entity_field = getattr(self, "entity_field")
+        return getattr(self, entity_field)
 
     def clean(self):
-        if self.episode.source != self.agent.source:
-            raise ValidationError("Can only link episodes and agents in the same source text")
+        if self.episode.source != self.entity.source:
+            raise ValidationError(
+                "Can only link episodes and entities in the same source text"
+            )
 
     def __str__(self):
-        return f"{self.agent.name} / {self.episode}"
+        return f"{self.entity.name} / {self.episode}"
 
 
-class EpisodeGift(DescriptionField, models.Model):
+class EpisodeAgent(EpisodeEntity, models.Model):
     """
-    Relationship between an episode and a gift described in a source text
+    Relationship between an episode and an agent described in a source text
     """
 
-    episode = models.ForeignKey(
-        to=Episode,
+    entity_field = "agent"
+
+    agent = models.ForeignKey(
+        to=AgentDescription,
         on_delete=models.CASCADE,
     )
+
+
+class EpisodeGift(EpisodeEntity, models.Model):
+    """
+    Relationship between an episode and a gift described in a source text
+    """
+
+    entity_field = "gift"
+
     gift = models.ForeignKey(
         to=GiftDescription,
         on_delete=models.CASCADE,
     )
 
-    def clean(self):
-        if self.episode.source != self.gift.source:
-            raise ValidationError("Can only link episodes and gifts in the same source text")
-
-    def __str__(self):
-        return f"{self.gift.name} / {self.episode}"
-
 
-class EpisodeLetter(DescriptionField, models.Model):
+class EpisodeLetter(EpisodeEntity, models.Model):
     """
     Relationship between an episode and a letter described in a source text
     """
 
-    episode = models.ForeignKey(
-        to=Episode,
-        on_delete=models.CASCADE,
-    )
+    entity_field = "letter"
+
     letter = models.ForeignKey(
         to=LetterDescription,
         on_delete=models.CASCADE,
     )
 
-    def clean(self):
-        if self.episode.source != self.letter.source:
-            raise ValidationError("Can only link episodes and letters in the same source text")
 
-    def __str__(self):
-        return f"{self.letter.name} / {self.episode}"
-
-
-class EpisodeSpace(DescriptionField, models.Model):
+class EpisodeSpace(EpisodeEntity, models.Model):
     """
     Relationship between an episode and a space described in a source text
     """
 
-    episode = models.ForeignKey(
-        to=Episode,
-        on_delete=models.CASCADE,
-    )
+    entity_field = "space"
+
     space = models.ForeignKey(
         to=SpaceDescription,
         on_delete=models.CASCADE,
     )
 
-    def clean(self):
-        if self.episode.source != self.space.source:
-            raise ValidationError("Can only link episodes and spaces in the same source text")
-
-    def __str__(self):
-        return f"{self.space.name} / {self.episode}"
-
 
 class Series(Named, models.Model):
     """
diff --git a/backend/event/queries.py b/backend/event/queries.py
index 4e626b70..40509123 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -1,9 +1,11 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
-from event.models import Episode, EpisodeCategory, EpisodeAgent
+from event.models import Episode, EpisodeCategory, EpisodeEntity, EpisodeAgent
 from event.types.EpisodeCategoryType import EpisodeCategoryType
 from event.types.EpisodeType import EpisodeType
 from event.types.EpisodeAgentType import EpisodeAgentType
+from event.types.EpisodeEntityType import EpisodeEntityLinkType, Entity, ENTITY_MODELS
+from typing import Type
 
 class EventQueries(ObjectType):
     episode = Field(EpisodeType, id=ID(required=True))
@@ -12,6 +14,12 @@ class EventQueries(ObjectType):
     episode_agent_link = Field(
         EpisodeAgentType, agent=ID(required=True), episode=ID(required=True)
     )
+    episode_entity_link = Field(
+        EpisodeEntityLinkType,
+        entity=ID(required=True),
+        episode=ID(required=True),
+        entity_type=Entity(required=True),
+    )
 
     @staticmethod
     def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Episode | None:
@@ -49,3 +57,23 @@ def resolve_episode_agent_link(
             )
         except EpisodeAgent.DoesNotExist:
             return None
+
+    @staticmethod
+    def resolve_episode_entity_link(
+        parent: None,
+        info: ResolveInfo,
+        entity: str,
+        episode: str,
+        entity_type: Entity,
+    ) -> EpisodeEntityLinkType:
+        Model: Type[EpisodeEntity] = ENTITY_MODELS[entity_type]
+        query = {Model.entity_field: entity, "episode": episode}
+        obj: EpisodeEntity = Model.objects.get(**query)
+        return EpisodeEntityLinkType(
+            id=obj.pk,
+            episode=obj.episode,
+            entity_type=obj.__class__.entity_field,
+            entity=obj.entity,
+            source_mention=obj.source_mention,
+            note=obj.note,
+        )
diff --git a/backend/event/types/EpisodeEntityType.py b/backend/event/types/EpisodeEntityType.py
new file mode 100644
index 00000000..c141f040
--- /dev/null
+++ b/backend/event/types/EpisodeEntityType.py
@@ -0,0 +1,39 @@
+from graphene import Enum, ID, NonNull, ObjectType, String
+from core.types.DescriptionFieldType import SourceMentionEnum
+from event.models import (
+    EpisodeAgent,
+    EpisodeSpace,
+    EpisodeLetter,
+    EpisodeGift,
+)
+from event.types.EpisodeType import EpisodeType
+
+
+class Entity(Enum):
+    AGENT = "agent"
+    GIFT = "gift"
+    LETTER = "letter"
+    SPACE = "space"
+
+
+ENTITY_MODELS = {
+    Entity.AGENT: EpisodeAgent,
+    Entity.SPACE: EpisodeSpace,
+    Entity.LETTER: EpisodeLetter,
+    Entity.GIFT: EpisodeGift,
+}
+
+
+class EntityType(ObjectType):
+    id = NonNull(ID)
+    name = String()
+    description = String()
+
+
+class EpisodeEntityLinkType(ObjectType):
+    id = NonNull(ID)
+    episode = NonNull(EpisodeType)
+    entity_type = NonNull(Entity)
+    entity = NonNull(EntityType)
+    source_mention = NonNull(SourceMentionEnum)
+    note = String()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 30ef7104..f617c2fc 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -182,6 +182,20 @@ export type DeletePersonReferenceMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export enum Entity {
+  Agent = 'AGENT',
+  Gift = 'GIFT',
+  Letter = 'LETTER',
+  Space = 'SPACE'
+}
+
+export type EntityType = {
+  __typename?: 'EntityType';
+  description?: Maybe<Scalars['String']['output']>;
+  id: Scalars['ID']['output'];
+  name?: Maybe<Scalars['String']['output']>;
+};
+
 export type EpisodeAgentType = {
   __typename?: 'EpisodeAgentType';
   agent: AgentDescriptionType;
@@ -203,6 +217,16 @@ export type EpisodeCategoryType = {
   name: Scalars['String']['output'];
 };
 
+export type EpisodeEntityLinkType = {
+  __typename?: 'EpisodeEntityLinkType';
+  entity: EntityType;
+  entityType: Entity;
+  episode: EpisodeType;
+  id: Scalars['ID']['output'];
+  note?: Maybe<Scalars['String']['output']>;
+  sourceMention: SourceMention;
+};
+
 export type EpisodeType = {
   __typename?: 'EpisodeType';
   /** agents involved in this episode */
@@ -669,6 +693,7 @@ export type Query = {
   episode?: Maybe<EpisodeType>;
   episodeAgentLink?: Maybe<EpisodeAgentType>;
   episodeCategories: Array<EpisodeCategoryType>;
+  episodeEntityLink?: Maybe<EpisodeEntityLinkType>;
   episodes: Array<EpisodeType>;
   giftDescription?: Maybe<GiftDescriptionType>;
   giftDescriptions: Array<GiftDescriptionType>;
@@ -706,6 +731,13 @@ export type QueryEpisodeAgentLinkArgs = {
 };
 
 
+export type QueryEpisodeEntityLinkArgs = {
+  entity: Scalars['ID']['input'];
+  entityType: Entity;
+  episode: Scalars['ID']['input'];
+};
+
+
 export type QueryEpisodesArgs = {
   sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
@@ -1311,13 +1343,14 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 
 export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
-export type DataEntryEpisodeAgentQueryVariables = Exact<{
-  agent: Scalars['ID']['input'];
+export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
+  entity: Scalars['ID']['input'];
   episode: Scalars['ID']['input'];
+  entityType: Entity;
 }>;
 
 
-export type DataEntryEpisodeAgentQuery = { __typename?: 'Query', episodeAgentLink?: { __typename?: 'EpisodeAgentType', id: string, note: string, sourceMention?: SourceMention | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, agent: { __typename?: 'AgentDescriptionType', id: string, name: string } } | null };
+export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeEntityLinkType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'EntityType', id: string, name?: string | null } } | null };
 
 export type DataEntryUpdateEpisodeAgentMutationVariables = Exact<{
   input: UpdateEpisodeAgentInput;
@@ -2069,9 +2102,9 @@ export const DataEntrySpaceDescriptionDocument = gql`
       super(apollo);
     }
   }
-export const DataEntryEpisodeAgentDocument = gql`
-    query DataEntryEpisodeAgent($agent: ID!, $episode: ID!) {
-  episodeAgentLink(agent: $agent, episode: $episode) {
+export const DataEntryEpisodeEntityLinkDocument = gql`
+    query DataEntryEpisodeEntityLink($entity: ID!, $episode: ID!, $entityType: Entity!) {
+  episodeEntityLink(entity: $entity, episode: $episode, entityType: $entityType) {
     id
     note
     sourceMention
@@ -2079,7 +2112,7 @@ export const DataEntryEpisodeAgentDocument = gql`
       id
       name
     }
-    agent {
+    entity {
       id
       name
     }
@@ -2090,8 +2123,8 @@ export const DataEntryEpisodeAgentDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryEpisodeAgentGQL extends Apollo.Query<DataEntryEpisodeAgentQuery, DataEntryEpisodeAgentQueryVariables> {
-    override document = DataEntryEpisodeAgentDocument;
+  export class DataEntryEpisodeEntityLinkGQL extends Apollo.Query<DataEntryEpisodeEntityLinkQuery, DataEntryEpisodeEntityLinkQueryVariables> {
+    override document = DataEntryEpisodeEntityLinkDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 5c43d7fa..ba928fba 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -166,6 +166,19 @@ type DeletePersonReferenceMutation {
   ok: Boolean!
 }
 
+enum Entity {
+  AGENT
+  GIFT
+  LETTER
+  SPACE
+}
+
+type EntityType {
+  description: String
+  id: ID!
+  name: String
+}
+
 type EpisodeAgentType {
   agent: AgentDescriptionType!
 
@@ -188,6 +201,15 @@ type EpisodeCategoryType {
   name: String!
 }
 
+type EpisodeEntityLinkType {
+  entity: EntityType!
+  entityType: Entity!
+  episode: EpisodeType!
+  id: ID!
+  note: String
+  sourceMention: SourceMention!
+}
+
 type EpisodeType {
   """agents involved in this episode"""
   agents: [AgentDescriptionType!]!
@@ -627,6 +649,7 @@ type Query {
   episode(id: ID!): EpisodeType
   episodeAgentLink(agent: ID!, episode: ID!): EpisodeAgentType
   episodeCategories: [EpisodeCategoryType!]!
+  episodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): EpisodeEntityLinkType
   episodes(sourceId: ID): [EpisodeType!]!
   giftDescription(id: ID!): GiftDescriptionType
   giftDescriptions(episodeId: ID, sourceId: ID): [GiftDescriptionType!]!
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 2dbaf5d7..77e7e8e1 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -3,7 +3,7 @@
         <p>This agent is involved in the following episodes:</p>
         <ul class="list-unstyled vstack gap-4">
             <li *ngFor="let item of data.agentDescription.episodes">
-                <lc-episode-link-form entityType="agent"
+                <lc-episode-link-form [entityType]="entityType"
                         [entityID]="data.agentDescription.id"
                         [episodeID]="item.episode.id">
                     <button removeControl class="btn btn-danger" aria-label="remove episode"
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index b3ae070e..2436cbf6 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -5,6 +5,7 @@ import {
     DataEntryCreateAgentEpisodeMutationGQL,
     DataEntryDeleteAgentEpisodeMutationGQL,
     DataEntryDeleteAgentEpisodeMutationMutationVariables,
+    Entity,
 } from 'generated/graphql';
 import { BehaviorSubject, map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -29,6 +30,7 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     actionIcons = actionIcons;
     status$ = new BehaviorSubject<FormStatus>('idle');
     formName = 'episodes';
+    entityType = Entity.Agent;
 
     private mutationObserver: Partial<Observer<MutationResult>> = {
         next: this.onSuccess.bind(this),
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index db48448d..82372a71 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -3,7 +3,7 @@
         <p>The following agents are involved in this episode:</p>
         <ul class="list-unstyled vstack gap-4">
             <li *ngFor="let agent of data.episode.agents">
-                <lc-episode-link-form entityType="agent" linkTo="entity"
+                <lc-episode-link-form [entityType]="entityType" linkTo="entity"
                         [entityID]="agent.id"
                         [episodeID]="data.episode.id">
                     <button removeControl class="btn btn-danger" aria-label="remove episode"
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index f442a567..970422c9 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -7,7 +7,8 @@ import { FormService } from "../../shared/form.service";
 import {
     CreateEpisodeAgentInput, DataEntryCreateAgentEpisodeMutationGQL,
     DataEntryDeleteAgentEpisodeMutationGQL, DataEntryEpisodeAgentsGQL,
-    DataEntryEpisodeAgentsQuery
+    DataEntryEpisodeAgentsQuery,
+    Entity
 } from "generated/graphql";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 
@@ -27,6 +28,7 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
     actionIcons = actionIcons;
     status$ = formStatusSubject();
     formName = 'agents';
+    entityType = Entity.Agent;
 
     private mutationObserver: Partial<Observer<MutationResult>> = {
         next: this.onSuccess.bind(this),
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index e644e443..5eac08fe 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,11 +1,14 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 import { EntityType, SelectOptions } from '../types';
-import { combineLatest, debounceTime, distinctUntilChanged, map, Observable, shareReplay, skip, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
+import { debounceTime, distinctUntilChanged, map, Observable, shareReplay, skip, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { actionIcons } from '@shared/icons';
 import {
     DataEntryUpdateEpisodeAgentGQL, DataEntryUpdateEpisodeAgentMutationVariables,
-    DataEntryEpisodeAgentGQL, DataEntryEpisodeAgentQuery, SourceMention,
-    DataEntryUpdateEpisodeMutation
+    SourceMention,
+    DataEntryUpdateEpisodeMutation,
+    DataEntryEpisodeEntityLinkGQL,
+    Entity,
+    DataEntryEpisodeEntityLinkQuery
 } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
@@ -28,7 +31,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     @Input({ required: true }) episodeID!: string;
 
     /** Type of entity (agent, letter, etc.) */
-    @Input({ required: true }) entityType!: EntityType;
+    @Input({ required: true }) entityType!: Entity;
 
     /** Describes the direction of the link in the document.
      *
@@ -38,7 +41,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     @Input() linkTo: LinkTo = 'episode';
 
 
-    data$: Observable<DataEntryEpisodeAgentQuery | undefined>;
+    data$: Observable<DataEntryEpisodeEntityLinkQuery | undefined>;
     form = new FormGroup({
         sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
         note: new FormControl<string>('', { nonNullable: true }),
@@ -46,32 +49,27 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
 
     sourceMentionOptions: SelectOptions<SourceMention> = sourceMentionSelectOptions();
 
-    private entityQueries: Record<EntityType, DataEntryEpisodeAgentGQL>;
-    private query$ = new Subject<DataEntryEpisodeAgentGQL>();
-    private link$ = new Subject<{ entity: string, episode: string }>();
+    private link$ = new Subject<{ entity: string, episode: string, entityType: Entity }>();
     private status$ = formStatusSubject();
     private formName = 'episode-link-' + crypto.randomUUID();
 
     actionIcons = actionIcons;
 
     constructor(
-        agentQuery: DataEntryEpisodeAgentGQL,
+        query: DataEntryEpisodeEntityLinkGQL,
         private agentMutation: DataEntryUpdateEpisodeAgentGQL,
         private formService: FormService,
     ) {
         this.formService.attachForm(this.formName, this.status$);
-        this.entityQueries = {
-            agent: agentQuery,
-        };
-        this.data$ = combineLatest([this.query$, this.link$]).pipe(
-            switchMap(([query, link]) => query.watch({
-                agent: link.entity, episode: link.episode
-            }).valueChanges),
+
+        this.data$ = this.link$.pipe(
+            switchMap((link) => query.watch(link).valueChanges),
             map(result => result.data),
             shareReplay(1),
             takeUntilDestroyed(),
         );
         this.data$.subscribe(this.updateFormValues.bind(this));
+
         this.form.valueChanges.pipe(
             debounceTime(500),
             distinctUntilChanged(_.isEqual),
@@ -85,40 +83,40 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     }
 
     ngOnChanges(changes: SimpleChanges): void {
-        if (changes['entityType']) {
-            this.query$.next(this.entityQueries[this.entityType]);
-        }
-        if (changes['entityID'] || changes['episodeID']) {
-            this.link$.next({ entity: this.entityID, episode: this.episodeID });
+        if (changes['entityID'] || changes['episodeID'] || changes['entityType']) {
+            this.link$.next({
+                entity: this.entityID,
+                episode: this.episodeID,
+                entityType: this.entityType,
+            });
         }
     }
 
     ngOnDestroy(): void {
-        this.query$.complete();
         this.link$.complete();
         this.status$.complete();
         this.formService.detachForm(this.formName);
     }
 
-    formUrl(linkTo: LinkTo, entityType: EntityType): string {
+    formUrl(linkTo: LinkTo, entityType: Entity): string {
         if (linkTo == 'episode') {
             return 'episodes';
         }
         return 'agents';
     }
 
-    linkedObject(linkTo: LinkTo, data: DataEntryEpisodeAgentQuery) {
+    linkedObject(linkTo: LinkTo, data: DataEntryEpisodeEntityLinkQuery) {
         if (linkTo === 'episode') {
-            return data.episodeAgentLink?.episode;
+            return data.episodeEntityLink?.episode;
         } else {
-            return data.episodeAgentLink?.agent;
+            return data.episodeEntityLink?.entity;
         }
     }
 
-    private updateFormValues(data?: DataEntryEpisodeAgentQuery): void {
+    private updateFormValues(data?: DataEntryEpisodeEntityLinkQuery): void {
         this.form.setValue({
-            sourceMention: data?.episodeAgentLink?.sourceMention || SourceMention.Direct,
-            note: data?.episodeAgentLink?.note || '',
+            sourceMention: data?.episodeEntityLink?.sourceMention || SourceMention.Direct,
+            note: data?.episodeEntityLink?.note || '',
         });
     }
 
@@ -132,7 +130,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         return this.agentMutation.mutate(mutationInput, {
             errorPolicy: 'all',
             refetchQueries: [
-                'DataEntryEpisodeAgent',
+                'DataEntryEpisodeEntity',
             ],
         })
     }
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
index 019bb8be..ce23d812 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
@@ -1,5 +1,5 @@
-query DataEntryEpisodeAgent($agent: ID!, $episode: ID!) {
-    episodeAgentLink(agent: $agent, episode: $episode) {
+query DataEntryEpisodeEntityLink($entity: ID!, $episode: ID!, $entityType: Entity!) {
+    episodeEntityLink(entity: $entity, episode: $episode, entityType: $entityType) {
         id
         note
         sourceMention
@@ -7,7 +7,7 @@ query DataEntryEpisodeAgent($agent: ID!, $episode: ID!) {
             id
             name
         }
-        agent {
+        entity {
             id
             name
         }

From 14748222a7b13f16a61094e6bc04e7cc5086e270 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 10:59:33 +0200
Subject: [PATCH 421/565] generalise create episode entity link mutation

---
 ....py => CreateEpisodeEntityLinkMutation.py} | 39 +++++++++++--------
 backend/event/queries.py                      |  4 +-
 backend/event/types/EpisodeEntityType.py      |  4 +-
 backend/graphql_app/schema.py                 |  6 ++-
 frontend/generated/graphql.ts                 | 31 ++++++++-------
 frontend/generated/schema.graphql             |  9 +++--
 .../agent-episodes-form.component.ts          | 14 ++++---
 .../agent-episodes.graphql                    |  4 +-
 .../episode-agents-form.component.ts          | 11 +++---
 9 files changed, 68 insertions(+), 54 deletions(-)
 rename backend/event/mutations/{CreateEpisodeAgentMutation.py => CreateEpisodeEntityLinkMutation.py} (52%)

diff --git a/backend/event/mutations/CreateEpisodeAgentMutation.py b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
similarity index 52%
rename from backend/event/mutations/CreateEpisodeAgentMutation.py
rename to backend/event/mutations/CreateEpisodeEntityLinkMutation.py
index 12b8df01..5ecdb0b1 100644
--- a/backend/event/mutations/CreateEpisodeAgentMutation.py
+++ b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
@@ -7,37 +7,38 @@
     NonNull,
 )
 
-from person.models import AgentDescription
-from event.models import Episode, EpisodeAgent
+from event.models import Episode, EpisodeEntity
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from django.core.exceptions import ValidationError
 from django.db import transaction
+from event.types.EpisodeEntityType import Entity, ENTITY_MODELS
 
 
-class CreateEpisodeAgentInput(InputObjectType):
-    agent = ID(required=True)
+class CreateEpisodeEntityLinkInput(InputObjectType):
+    entity = ID(required=True)
     episode = ID(required=True)
+    entity_type = Entity(required=True)
 
 
-class CreateEpisodeAgentMutation(LettercraftMutation):
-    django_model = EpisodeAgent
+class CreateEpisodeEntityLinkMutation(LettercraftMutation):
+    django_model = EpisodeEntity
 
     ok = Boolean(required=True)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     class Arguments:
-        data = CreateEpisodeAgentInput(required=True)
+        data = CreateEpisodeEntityLinkInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, data: CreateEpisodeAgentInput):
+    def mutate(cls, root: None, info: ResolveInfo, data: CreateEpisodeEntityLinkInput):
+        LinkModel = ENTITY_MODELS[data.entity_type]
+        link_data = {data.entity_type.value: data.entity, "episode": data.episode}
 
-        if EpisodeAgent.objects.filter(
-            agent__id=data.agent, episode__id=data.episode
-        ).exists():
+        if LinkModel.objects.filter(**link_data).exists():
             return cls(
                 ok=False,
-                errors=[LettercraftErrorType("agent", ["Link already exists"])],
+                errors=[LettercraftErrorType("entity", ["Link already exists"])],
             )
 
         try:
@@ -48,23 +49,27 @@ def mutate(cls, root: None, info: ResolveInfo, data: CreateEpisodeAgentInput):
                 errors=[LettercraftErrorType("episode", [str(e)])],
             )
 
+        EntityModel = getattr(LinkModel, LinkModel.entity_field).field.related_model
+
         try:
-            agent = AgentDescription.objects.get(id=data.agent)
-        except AgentDescription.DoesNotExist as e:
+            entity = EntityModel.objects.get(id=data.entity)
+        except EntityModel.DoesNotExist as e:
             return cls(
                 ok=False,
-                errors=[LettercraftErrorType("agent", [str(e)])],
+                errors=[LettercraftErrorType("entity", [str(e)])],
             )
 
         try:
             with transaction.atomic():
-                obj = EpisodeAgent.objects.create(agent=agent, episode=episode)
+                obj = LinkModel.objects.create(
+                    **{"episode": episode, LinkModel.entity_field: entity}
+                )
                 obj.clean()
         except ValidationError as e:
             errors = [
                 LettercraftErrorType(field, messages)
                 for field, messages in e.message_dict.items()
             ]
-            return cls(ok=False, agent=None, errors=errors)
+            return cls(ok=False, errors=errors)
 
         return cls(ok=True, errors=[])
diff --git a/backend/event/queries.py b/backend/event/queries.py
index 40509123..2b8a8d74 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -5,7 +5,7 @@
 from event.types.EpisodeType import EpisodeType
 from event.types.EpisodeAgentType import EpisodeAgentType
 from event.types.EpisodeEntityType import EpisodeEntityLinkType, Entity, ENTITY_MODELS
-from typing import Type
+
 
 class EventQueries(ObjectType):
     episode = Field(EpisodeType, id=ID(required=True))
@@ -66,7 +66,7 @@ def resolve_episode_entity_link(
         episode: str,
         entity_type: Entity,
     ) -> EpisodeEntityLinkType:
-        Model: Type[EpisodeEntity] = ENTITY_MODELS[entity_type]
+        Model = ENTITY_MODELS[entity_type]
         query = {Model.entity_field: entity, "episode": episode}
         obj: EpisodeEntity = Model.objects.get(**query)
         return EpisodeEntityLinkType(
diff --git a/backend/event/types/EpisodeEntityType.py b/backend/event/types/EpisodeEntityType.py
index c141f040..eeb19a3c 100644
--- a/backend/event/types/EpisodeEntityType.py
+++ b/backend/event/types/EpisodeEntityType.py
@@ -5,8 +5,10 @@
     EpisodeSpace,
     EpisodeLetter,
     EpisodeGift,
+    EpisodeEntity,
 )
 from event.types.EpisodeType import EpisodeType
+from typing import Dict, Type
 
 
 class Entity(Enum):
@@ -16,7 +18,7 @@ class Entity(Enum):
     SPACE = "space"
 
 
-ENTITY_MODELS = {
+ENTITY_MODELS: Dict[str, Type[EpisodeEntity]] = {
     Entity.AGENT: EpisodeAgent,
     Entity.SPACE: EpisodeSpace,
     Entity.LETTER: EpisodeLetter,
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 879ef6b6..f5296465 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -11,7 +11,9 @@
 
 from source.mutations.UpdateOrCreateSourceMutation import UpdateOrCreateSourceMutation
 from event.mutations.UpdateEpisodeMutation import UpdateEpisodeMutation
-from event.mutations.CreateEpisodeAgentMutation import CreateEpisodeAgentMutation
+from event.mutations.CreateEpisodeEntityLinkMutation import (
+    CreateEpisodeEntityLinkMutation,
+)
 from event.mutations.DeleteEpisodeAgentMutation import DeleteEpisodeAgentMutation
 from event.mutations.UpdateEpisodeAgentMutation import UpdateEpisodeAgentMutation
 from person.mutations.CreateAgentMutation import CreateAgentMutation
@@ -45,7 +47,7 @@ class Mutation(ObjectType):
     update_episode = UpdateEpisodeMutation.Field()
     create_episode = CreateEpisodeMutation.Field()
     delete_episode = DeleteEpisodeMutation.Field()
-    create_episode_agent = CreateEpisodeAgentMutation.Field()
+    create_episode_entity_link = CreateEpisodeEntityLinkMutation.Field()
     update_episode_agent = UpdateEpisodeAgentMutation.Field()
     delete_episode_agent = DeleteEpisodeAgentMutation.Field()
     create_agent = CreateAgentMutation.Field()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index f617c2fc..201794f6 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -91,13 +91,14 @@ export type CreateAgentMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
-export type CreateEpisodeAgentInput = {
-  agent: Scalars['ID']['input'];
+export type CreateEpisodeEntityLinkInput = {
+  entity: Scalars['ID']['input'];
+  entityType: Entity;
   episode: Scalars['ID']['input'];
 };
 
-export type CreateEpisodeAgentMutation = {
-  __typename?: 'CreateEpisodeAgentMutation';
+export type CreateEpisodeEntityLinkMutation = {
+  __typename?: 'CreateEpisodeEntityLinkMutation';
   errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
@@ -452,7 +453,7 @@ export type Mutation = {
   __typename?: 'Mutation';
   createAgent?: Maybe<CreateAgentMutation>;
   createEpisode?: Maybe<CreateEpisodeMutation>;
-  createEpisodeAgent?: Maybe<CreateEpisodeAgentMutation>;
+  createEpisodeEntityLink?: Maybe<CreateEpisodeEntityLinkMutation>;
   createGift?: Maybe<CreateGiftMutation>;
   createLetter?: Maybe<CreateLetterMutation>;
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
@@ -482,8 +483,8 @@ export type MutationCreateEpisodeArgs = {
 };
 
 
-export type MutationCreateEpisodeAgentArgs = {
-  data: CreateEpisodeAgentInput;
+export type MutationCreateEpisodeEntityLinkArgs = {
+  data: CreateEpisodeEntityLinkInput;
 };
 
 
@@ -1159,12 +1160,12 @@ export type DataEntryAgentEpisodesQueryVariables = Exact<{
 
 export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeAgentType', id: string, episode: { __typename?: 'EpisodeType', id: string } }> } | null };
 
-export type DataEntryCreateAgentEpisodeMutationMutationVariables = Exact<{
-  data: CreateEpisodeAgentInput;
+export type DataEntryCreateEpisodeEntityLinkMutationMutationVariables = Exact<{
+  input: CreateEpisodeEntityLinkInput;
 }>;
 
 
-export type DataEntryCreateAgentEpisodeMutationMutation = { __typename?: 'Mutation', createEpisodeAgent?: { __typename?: 'CreateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryCreateEpisodeEntityLinkMutationMutation = { __typename?: 'Mutation', createEpisodeEntityLink?: { __typename?: 'CreateEpisodeEntityLinkMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteAgentEpisodeMutationMutationVariables = Exact<{
   agent: Scalars['ID']['input'];
@@ -1490,9 +1491,9 @@ export const DataEntryAgentEpisodesDocument = gql`
       super(apollo);
     }
   }
-export const DataEntryCreateAgentEpisodeMutationDocument = gql`
-    mutation DataEntryCreateAgentEpisodeMutation($data: CreateEpisodeAgentInput!) {
-  createEpisodeAgent(data: $data) {
+export const DataEntryCreateEpisodeEntityLinkMutationDocument = gql`
+    mutation DataEntryCreateEpisodeEntityLinkMutation($input: CreateEpisodeEntityLinkInput!) {
+  createEpisodeEntityLink(data: $input) {
     ok
     errors {
       field
@@ -1505,8 +1506,8 @@ export const DataEntryCreateAgentEpisodeMutationDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryCreateAgentEpisodeMutationGQL extends Apollo.Mutation<DataEntryCreateAgentEpisodeMutationMutation, DataEntryCreateAgentEpisodeMutationMutationVariables> {
-    override document = DataEntryCreateAgentEpisodeMutationDocument;
+  export class DataEntryCreateEpisodeEntityLinkMutationGQL extends Apollo.Mutation<DataEntryCreateEpisodeEntityLinkMutationMutation, DataEntryCreateEpisodeEntityLinkMutationMutationVariables> {
+    override document = DataEntryCreateEpisodeEntityLinkMutationDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index ba928fba..42ea9f08 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -86,12 +86,13 @@ type CreateAgentMutation {
   ok: Boolean!
 }
 
-input CreateEpisodeAgentInput {
-  agent: ID!
+input CreateEpisodeEntityLinkInput {
+  entity: ID!
+  entityType: Entity!
   episode: ID!
 }
 
-type CreateEpisodeAgentMutation {
+type CreateEpisodeEntityLinkMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
@@ -478,7 +479,7 @@ type LettercraftErrorType {
 type Mutation {
   createAgent(agentData: CreateAgentInput!): CreateAgentMutation
   createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
-  createEpisodeAgent(data: CreateEpisodeAgentInput!): CreateEpisodeAgentMutation
+  createEpisodeEntityLink(data: CreateEpisodeEntityLinkInput!): CreateEpisodeEntityLinkMutation
   createGift(giftData: CreateGiftInput!): CreateGiftMutation
   createLetter(letterData: CreateLetterInput!): CreateLetterMutation
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 2436cbf6..b91911ba 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -1,8 +1,9 @@
 import { Component, OnDestroy } from '@angular/core';
 import { FormService } from '../../shared/form.service';
 import {
-    CreateEpisodeAgentInput, DataEntryAgentEpisodesGQL, DataEntryAgentEpisodesQuery,
-    DataEntryCreateAgentEpisodeMutationGQL,
+    CreateEpisodeEntityLinkInput, DataEntryAgentEpisodesGQL,
+    DataEntryAgentEpisodesQuery,
+    DataEntryCreateEpisodeEntityLinkMutationGQL,
     DataEntryDeleteAgentEpisodeMutationGQL,
     DataEntryDeleteAgentEpisodeMutationMutationVariables,
     Entity,
@@ -40,7 +41,7 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     constructor(
         private formService: FormService,
         private query: DataEntryAgentEpisodesGQL,
-        private addMutation: DataEntryCreateAgentEpisodeMutationGQL,
+        private addMutation: DataEntryCreateEpisodeEntityLinkMutationGQL,
         private removeMutation: DataEntryDeleteAgentEpisodeMutationGQL,
     ) {
         this.formService.attachForm(this.formName, this.status$);
@@ -76,11 +77,12 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     }
 
     addEpisode(episodeID: string, agentID: string): void {
-        const data: CreateEpisodeAgentInput = {
-            agent: agentID,
+        const input: CreateEpisodeEntityLinkInput = {
+            entity: agentID,
             episode: episodeID,
+            entityType: Entity.Agent,
         };
-        this.addMutation.mutate({ data }, {
+        this.addMutation.mutate({ input }, {
             refetchQueries: REFETCH_QUERIES,
         }).pipe(
             tap(() => this.status$.next('loading'))
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
index cba8089b..4de35c43 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -17,8 +17,8 @@ query DataEntryAgentEpisodes($id: ID!) {
     }
 }
 
-mutation DataEntryCreateAgentEpisodeMutation($data: CreateEpisodeAgentInput!) {
-    createEpisodeAgent(data: $data) {
+mutation DataEntryCreateEpisodeEntityLinkMutation($input: CreateEpisodeEntityLinkInput!) {
+    createEpisodeEntityLink(data: $input) {
         ok
         errors {
             field
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index 970422c9..d9a8036c 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -5,7 +5,7 @@ import { actionIcons } from "@shared/icons";
 import { MutationResult } from "apollo-angular";
 import { FormService } from "../../shared/form.service";
 import {
-    CreateEpisodeAgentInput, DataEntryCreateAgentEpisodeMutationGQL,
+    CreateEpisodeEntityLinkInput, DataEntryCreateEpisodeEntityLinkMutationGQL,
     DataEntryDeleteAgentEpisodeMutationGQL, DataEntryEpisodeAgentsGQL,
     DataEntryEpisodeAgentsQuery,
     Entity
@@ -38,7 +38,7 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
     constructor(
         private formService: FormService,
         private query: DataEntryEpisodeAgentsGQL,
-        private addMutation: DataEntryCreateAgentEpisodeMutationGQL,
+        private addMutation: DataEntryCreateEpisodeEntityLinkMutationGQL,
         private removeMutation: DataEntryDeleteAgentEpisodeMutationGQL,
     ) {
         this.formService.attachForm(this.formName, this.status$);
@@ -74,11 +74,12 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
     }
 
     addAgent(agentID: string, episodeID: string): void {
-        const data: CreateEpisodeAgentInput = {
-            agent: agentID,
+        const input: CreateEpisodeEntityLinkInput = {
+            entity: agentID,
             episode: episodeID,
+            entityType: Entity.Agent,
         };
-        this.addMutation.mutate({ data }, {
+        this.addMutation.mutate({ input }, {
             refetchQueries: REFETCH_QUERIES,
         }).pipe(
             tap(() => this.status$.next('loading'))

From 3883b3a5349cf92acc4193627b20b451630f87e1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 11:12:16 +0200
Subject: [PATCH 422/565] generate delete episode entity link mutation

---
 ....py => DeleteEpisodeEntityLinkMutation.py} | 19 +++++---
 backend/graphql_app/schema.py                 |  6 ++-
 frontend/generated/graphql.ts                 | 44 +++++++++++--------
 frontend/generated/schema.graphql             |  4 +-
 .../agent-episodes-form.component.ts          | 15 ++++---
 .../agent-episodes.graphql                    |  6 +--
 .../episode-agents-form.component.ts          | 16 ++++---
 7 files changed, 64 insertions(+), 46 deletions(-)
 rename backend/event/mutations/{DeleteEpisodeAgentMutation.py => DeleteEpisodeEntityLinkMutation.py} (55%)

diff --git a/backend/event/mutations/DeleteEpisodeAgentMutation.py b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
similarity index 55%
rename from backend/event/mutations/DeleteEpisodeAgentMutation.py
rename to backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
index 1484c12b..8f4880ff 100644
--- a/backend/event/mutations/DeleteEpisodeAgentMutation.py
+++ b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
@@ -7,33 +7,38 @@
     Mutation,
 )
 
-from event.models import EpisodeAgent
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from event.types.EpisodeEntityType import Entity, ENTITY_MODELS
 
 
-class DeleteEpisodeAgentMutation(Mutation):
+class DeleteEpisodeEntityLinkMutation(Mutation):
     ok = Boolean(required=True)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     class Arguments:
-        agent = ID(required=True)
+        entity = ID(required=True)
         episode = ID(required=True)
+        entity_type = Entity(required=True)
 
     @classmethod
     def mutate(
         cls,
         root: None,
         info: ResolveInfo,
-        agent: ID,
+        entity: ID,
         episode: ID,
+        entity_type: Entity,
     ):
+        LinkModel = ENTITY_MODELS[entity_type]
+        link_data = {entity_type.value: entity, "episode": episode}
+
         try:
-            obj = EpisodeAgent.objects.get(agent__id=agent, episode__id=episode)
-        except EpisodeAgent.DoesNotExist:
+            obj = LinkModel.objects.get(**link_data)
+        except LinkModel.DoesNotExist:
             return cls(
                 ok=False,
                 errors=LettercraftErrorType(
-                    "agent__id", ["Relation object does not exist"]
+                    "episode", ["Relation object does not exist"]
                 ),
             )
 
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index f5296465..6a8c22c5 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -14,7 +14,9 @@
 from event.mutations.CreateEpisodeEntityLinkMutation import (
     CreateEpisodeEntityLinkMutation,
 )
-from event.mutations.DeleteEpisodeAgentMutation import DeleteEpisodeAgentMutation
+from backend.event.mutations.DeleteEpisodeEntityLinkMutation import (
+    DeleteEpisodeEntityLinkMutation,
+)
 from event.mutations.UpdateEpisodeAgentMutation import UpdateEpisodeAgentMutation
 from person.mutations.CreateAgentMutation import CreateAgentMutation
 from person.mutations.UpdateAgentMutation import UpdateAgentMutation
@@ -49,7 +51,7 @@ class Mutation(ObjectType):
     delete_episode = DeleteEpisodeMutation.Field()
     create_episode_entity_link = CreateEpisodeEntityLinkMutation.Field()
     update_episode_agent = UpdateEpisodeAgentMutation.Field()
-    delete_episode_agent = DeleteEpisodeAgentMutation.Field()
+    delete_episode_entity_link = DeleteEpisodeEntityLinkMutation.Field()
     create_agent = CreateAgentMutation.Field()
     update_agent = UpdateAgentMutation.Field()
     delete_agent = DeleteAgentMutation.Field()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 201794f6..70d9bae9 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -153,8 +153,8 @@ export type DeleteAgentMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
-export type DeleteEpisodeAgentMutation = {
-  __typename?: 'DeleteEpisodeAgentMutation';
+export type DeleteEpisodeEntityLinkMutation = {
+  __typename?: 'DeleteEpisodeEntityLinkMutation';
   errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
@@ -459,7 +459,7 @@ export type Mutation = {
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
   deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
-  deleteEpisodeAgent?: Maybe<DeleteEpisodeAgentMutation>;
+  deleteEpisodeEntityLink?: Maybe<DeleteEpisodeEntityLinkMutation>;
   deleteGift?: Maybe<DeleteGiftMutation>;
   deleteLetter?: Maybe<DeleteLetterMutation>;
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
@@ -513,8 +513,9 @@ export type MutationDeleteEpisodeArgs = {
 };
 
 
-export type MutationDeleteEpisodeAgentArgs = {
-  agent: Scalars['ID']['input'];
+export type MutationDeleteEpisodeEntityLinkArgs = {
+  entity: Scalars['ID']['input'];
+  entityType: Entity;
   episode: Scalars['ID']['input'];
 };
 
@@ -1160,20 +1161,21 @@ export type DataEntryAgentEpisodesQueryVariables = Exact<{
 
 export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeAgentType', id: string, episode: { __typename?: 'EpisodeType', id: string } }> } | null };
 
-export type DataEntryCreateEpisodeEntityLinkMutationMutationVariables = Exact<{
+export type DataEntryCreateEpisodeEntityLinkMutationVariables = Exact<{
   input: CreateEpisodeEntityLinkInput;
 }>;
 
 
-export type DataEntryCreateEpisodeEntityLinkMutationMutation = { __typename?: 'Mutation', createEpisodeEntityLink?: { __typename?: 'CreateEpisodeEntityLinkMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryCreateEpisodeEntityLinkMutation = { __typename?: 'Mutation', createEpisodeEntityLink?: { __typename?: 'CreateEpisodeEntityLinkMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
-export type DataEntryDeleteAgentEpisodeMutationMutationVariables = Exact<{
-  agent: Scalars['ID']['input'];
+export type DataEntryDeleteEpisodeEntityLinkMutationVariables = Exact<{
+  entity: Scalars['ID']['input'];
   episode: Scalars['ID']['input'];
+  entityType: Entity;
 }>;
 
 
-export type DataEntryDeleteAgentEpisodeMutationMutation = { __typename?: 'Mutation', deleteEpisodeAgent?: { __typename?: 'DeleteEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryDeleteEpisodeEntityLinkMutation = { __typename?: 'Mutation', deleteEpisodeEntityLink?: { __typename?: 'DeleteEpisodeEntityLinkMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1491,8 +1493,8 @@ export const DataEntryAgentEpisodesDocument = gql`
       super(apollo);
     }
   }
-export const DataEntryCreateEpisodeEntityLinkMutationDocument = gql`
-    mutation DataEntryCreateEpisodeEntityLinkMutation($input: CreateEpisodeEntityLinkInput!) {
+export const DataEntryCreateEpisodeEntityLinkDocument = gql`
+    mutation DataEntryCreateEpisodeEntityLink($input: CreateEpisodeEntityLinkInput!) {
   createEpisodeEntityLink(data: $input) {
     ok
     errors {
@@ -1506,16 +1508,20 @@ export const DataEntryCreateEpisodeEntityLinkMutationDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryCreateEpisodeEntityLinkMutationGQL extends Apollo.Mutation<DataEntryCreateEpisodeEntityLinkMutationMutation, DataEntryCreateEpisodeEntityLinkMutationMutationVariables> {
-    override document = DataEntryCreateEpisodeEntityLinkMutationDocument;
+  export class DataEntryCreateEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryCreateEpisodeEntityLinkMutation, DataEntryCreateEpisodeEntityLinkMutationVariables> {
+    override document = DataEntryCreateEpisodeEntityLinkDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
-export const DataEntryDeleteAgentEpisodeMutationDocument = gql`
-    mutation DataEntryDeleteAgentEpisodeMutation($agent: ID!, $episode: ID!) {
-  deleteEpisodeAgent(agent: $agent, episode: $episode) {
+export const DataEntryDeleteEpisodeEntityLinkDocument = gql`
+    mutation DataEntryDeleteEpisodeEntityLink($entity: ID!, $episode: ID!, $entityType: Entity!) {
+  deleteEpisodeEntityLink(
+    entity: $entity
+    episode: $episode
+    entityType: $entityType
+  ) {
     ok
     errors {
       field
@@ -1528,8 +1534,8 @@ export const DataEntryDeleteAgentEpisodeMutationDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryDeleteAgentEpisodeMutationGQL extends Apollo.Mutation<DataEntryDeleteAgentEpisodeMutationMutation, DataEntryDeleteAgentEpisodeMutationMutationVariables> {
-    override document = DataEntryDeleteAgentEpisodeMutationDocument;
+  export class DataEntryDeleteEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryDeleteEpisodeEntityLinkMutation, DataEntryDeleteEpisodeEntityLinkMutationVariables> {
+    override document = DataEntryDeleteEpisodeEntityLinkDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 42ea9f08..e0ee1de4 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -142,7 +142,7 @@ type DeleteAgentMutation {
   ok: Boolean!
 }
 
-type DeleteEpisodeAgentMutation {
+type DeleteEpisodeEntityLinkMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
@@ -485,7 +485,7 @@ type Mutation {
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
-  deleteEpisodeAgent(agent: ID!, episode: ID!): DeleteEpisodeAgentMutation
+  deleteEpisodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): DeleteEpisodeEntityLinkMutation
   deleteGift(id: ID!): DeleteGiftMutation
   deleteLetter(id: ID!): DeleteLetterMutation
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index b91911ba..024a7954 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -3,9 +3,9 @@ import { FormService } from '../../shared/form.service';
 import {
     CreateEpisodeEntityLinkInput, DataEntryAgentEpisodesGQL,
     DataEntryAgentEpisodesQuery,
-    DataEntryCreateEpisodeEntityLinkMutationGQL,
-    DataEntryDeleteAgentEpisodeMutationGQL,
-    DataEntryDeleteAgentEpisodeMutationMutationVariables,
+    DataEntryCreateEpisodeEntityLinkGQL,
+    DataEntryDeleteEpisodeEntityLinkGQL,
+    DataEntryDeleteEpisodeEntityLinkMutationVariables,
     Entity,
 } from 'generated/graphql';
 import { BehaviorSubject, map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
@@ -41,8 +41,8 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     constructor(
         private formService: FormService,
         private query: DataEntryAgentEpisodesGQL,
-        private addMutation: DataEntryCreateEpisodeEntityLinkMutationGQL,
-        private removeMutation: DataEntryDeleteAgentEpisodeMutationGQL,
+        private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
+        private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
     ) {
         this.formService.attachForm(this.formName, this.status$);
         this.data$ = this.formService.id$.pipe(
@@ -90,9 +90,10 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     }
 
     removeEpisode(episodeID: string, agentID: string): void {
-        const data: DataEntryDeleteAgentEpisodeMutationMutationVariables = {
-            agent: agentID,
+        const data: DataEntryDeleteEpisodeEntityLinkMutationVariables = {
+            entity: agentID,
             episode: episodeID,
+            entityType: Entity.Agent,
         };
         this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
             tap(() => this.status$.next('loading'))
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
index 4de35c43..d57be56a 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -17,7 +17,7 @@ query DataEntryAgentEpisodes($id: ID!) {
     }
 }
 
-mutation DataEntryCreateEpisodeEntityLinkMutation($input: CreateEpisodeEntityLinkInput!) {
+mutation DataEntryCreateEpisodeEntityLink($input: CreateEpisodeEntityLinkInput!) {
     createEpisodeEntityLink(data: $input) {
         ok
         errors {
@@ -27,8 +27,8 @@ mutation DataEntryCreateEpisodeEntityLinkMutation($input: CreateEpisodeEntityLin
     }
 }
 
-mutation DataEntryDeleteAgentEpisodeMutation($agent: ID!, $episode: ID!) {
-    deleteEpisodeAgent(agent: $agent, episode: $episode) {
+mutation DataEntryDeleteEpisodeEntityLink($entity: ID!, $episode: ID!, $entityType: Entity!) {
+    deleteEpisodeEntityLink(entity: $entity, episode: $episode, entityType: $entityType) {
         ok
         errors {
             field
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index d9a8036c..b839922f 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -5,8 +5,11 @@ import { actionIcons } from "@shared/icons";
 import { MutationResult } from "apollo-angular";
 import { FormService } from "../../shared/form.service";
 import {
-    CreateEpisodeEntityLinkInput, DataEntryCreateEpisodeEntityLinkMutationGQL,
-    DataEntryDeleteAgentEpisodeMutationGQL, DataEntryEpisodeAgentsGQL,
+    CreateEpisodeEntityLinkInput,
+    DataEntryCreateEpisodeEntityLinkGQL,
+    DataEntryDeleteEpisodeEntityLinkGQL,
+    DataEntryDeleteEpisodeEntityLinkMutationVariables,
+    DataEntryEpisodeAgentsGQL,
     DataEntryEpisodeAgentsQuery,
     Entity
 } from "generated/graphql";
@@ -38,8 +41,8 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
     constructor(
         private formService: FormService,
         private query: DataEntryEpisodeAgentsGQL,
-        private addMutation: DataEntryCreateEpisodeEntityLinkMutationGQL,
-        private removeMutation: DataEntryDeleteAgentEpisodeMutationGQL,
+        private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
+        private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
     ) {
         this.formService.attachForm(this.formName, this.status$);
         this.data$ = this.formService.id$.pipe(
@@ -87,9 +90,10 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
     }
 
     removeAgent(agentID: string, episodeID: string): void {
-        const data = {
-            agent: agentID,
+        const data: DataEntryDeleteEpisodeEntityLinkMutationVariables = {
+            entity: agentID,
             episode: episodeID,
+            entityType: Entity.Agent,
         };
         this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
             tap(() => this.status$.next('loading'))

From 3c8e11addc838299c041dc84e8021acbc3934d6b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 11:27:35 +0200
Subject: [PATCH 423/565] generalise update episode entity link mutation

---
 .../mutations/UpdateEpisodeAgentMutation.py   | 45 ----------------
 .../UpdateEpisodeEntityLinkMutation.py        | 54 +++++++++++++++++++
 backend/graphql_app/schema.py                 |  8 +--
 frontend/generated/graphql.ts                 | 31 +++++------
 frontend/generated/schema.graphql             |  9 ++--
 .../episode-link-form.component.ts            | 32 +++++------
 .../episode-link-form/episode-link.graphql    |  4 +-
 7 files changed, 99 insertions(+), 84 deletions(-)
 delete mode 100644 backend/event/mutations/UpdateEpisodeAgentMutation.py
 create mode 100644 backend/event/mutations/UpdateEpisodeEntityLinkMutation.py

diff --git a/backend/event/mutations/UpdateEpisodeAgentMutation.py b/backend/event/mutations/UpdateEpisodeAgentMutation.py
deleted file mode 100644
index 648aac8f..00000000
--- a/backend/event/mutations/UpdateEpisodeAgentMutation.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from graphene import (
-    ID,
-    String,
-    InputObjectType,
-    Boolean,
-    ResolveInfo,
-    List,
-    NonNull,
-)
-
-from graphql_app.LettercraftMutation import LettercraftMutation
-from graphql_app.types.LettercraftErrorType import LettercraftErrorType
-from core.types.DescriptionFieldType import SourceMentionEnum
-from event.models import EpisodeAgent
-
-
-class UpdateEpisodeAgentInput(InputObjectType):
-    agent = ID(required=True)
-    episode = ID(required=True)
-    source_mention = SourceMentionEnum()
-    note = String()
-
-
-class UpdateEpisodeAgentMutation(LettercraftMutation):
-    django_model = EpisodeAgent
-
-    ok = Boolean(required=True)
-    errors = List(NonNull(LettercraftErrorType), required=True)
-
-    class Arguments:
-        data = UpdateEpisodeAgentInput(required=True)
-
-    @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, data: UpdateEpisodeAgentInput):
-        try:
-            obj = EpisodeAgent.objects.get(
-                agent__id=data.agent, episode__id=data.episode
-            )
-        except EpisodeAgent.DoesNotExist as e:
-            error = LettercraftErrorType(field="agent", messages=[str(e)])
-            return cls(ok=False, error=[error])
-
-        cls.mutate_object(data, obj, info)
-
-        return cls(ok=True, errors=[])
diff --git a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
new file mode 100644
index 00000000..b5e3a205
--- /dev/null
+++ b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
@@ -0,0 +1,54 @@
+from graphene import (
+    ID,
+    String,
+    InputObjectType,
+    Boolean,
+    ResolveInfo,
+    List,
+    NonNull,
+)
+
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from core.types.DescriptionFieldType import SourceMentionEnum
+from event.models import EpisodeAgent
+from event.types.EpisodeEntityType import Entity, ENTITY_MODELS
+
+
+class UpdateEpisodeEntityLinkInput(InputObjectType):
+    entity = ID(required=True)
+    episode = ID(required=True)
+    entity_type = Entity(required=True)
+    source_mention = SourceMentionEnum()
+    note = String()
+
+
+class UpdateEpisodeEntityLinkMutation(LettercraftMutation):
+    django_model = EpisodeAgent
+
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        data = UpdateEpisodeEntityLinkInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, data: UpdateEpisodeEntityLinkInput):
+        LinkModel = ENTITY_MODELS[data.entity_type]
+        link_data = {data.entity_type.value: data.entity, "episode": data.episode}
+
+        try:
+            obj = LinkModel.objects.get(**link_data)
+        except LinkModel.DoesNotExist:
+            return cls(
+                ok=False,
+                errors=LettercraftErrorType(
+                    "episode", ["Relation object does not exist"]
+                ),
+            )
+
+        cls.mutate_object(
+            data, obj, info, excluded_fields=["entity", "entity_type", "episode"]
+        )
+
+        return cls(ok=True, errors=[])
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 6a8c22c5..1e711101 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -14,10 +14,12 @@
 from event.mutations.CreateEpisodeEntityLinkMutation import (
     CreateEpisodeEntityLinkMutation,
 )
-from backend.event.mutations.DeleteEpisodeEntityLinkMutation import (
+from event.mutations.DeleteEpisodeEntityLinkMutation import (
     DeleteEpisodeEntityLinkMutation,
 )
-from event.mutations.UpdateEpisodeAgentMutation import UpdateEpisodeAgentMutation
+from event.mutations.UpdateEpisodeEntityLinkMutation import (
+    UpdateEpisodeEntityLinkMutation,
+)
 from person.mutations.CreateAgentMutation import CreateAgentMutation
 from person.mutations.UpdateAgentMutation import UpdateAgentMutation
 from person.mutations.DeleteAgentMutation import DeleteAgentMutation
@@ -50,7 +52,7 @@ class Mutation(ObjectType):
     create_episode = CreateEpisodeMutation.Field()
     delete_episode = DeleteEpisodeMutation.Field()
     create_episode_entity_link = CreateEpisodeEntityLinkMutation.Field()
-    update_episode_agent = UpdateEpisodeAgentMutation.Field()
+    update_episode_entity_link = UpdateEpisodeEntityLinkMutation.Field()
     delete_episode_entity_link = DeleteEpisodeEntityLinkMutation.Field()
     create_agent = CreateAgentMutation.Field()
     update_agent = UpdateAgentMutation.Field()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 70d9bae9..196de85e 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -465,7 +465,7 @@ export type Mutation = {
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
-  updateEpisodeAgent?: Maybe<UpdateEpisodeAgentMutation>;
+  updateEpisodeEntityLink?: Maybe<UpdateEpisodeEntityLinkMutation>;
   updateGift?: Maybe<UpdateGiftMutation>;
   updateLetter?: Maybe<UpdateLetterMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
@@ -545,8 +545,8 @@ export type MutationUpdateEpisodeArgs = {
 };
 
 
-export type MutationUpdateEpisodeAgentArgs = {
-  data: UpdateEpisodeAgentInput;
+export type MutationUpdateEpisodeEntityLinkArgs = {
+  data: UpdateEpisodeEntityLinkInput;
 };
 
 
@@ -1047,15 +1047,16 @@ export type UpdateCreateSourceInput = {
   name: Scalars['String']['input'];
 };
 
-export type UpdateEpisodeAgentInput = {
-  agent: Scalars['ID']['input'];
+export type UpdateEpisodeEntityLinkInput = {
+  entity: Scalars['ID']['input'];
+  entityType: Entity;
   episode: Scalars['ID']['input'];
   note?: InputMaybe<Scalars['String']['input']>;
   sourceMention?: InputMaybe<SourceMention>;
 };
 
-export type UpdateEpisodeAgentMutation = {
-  __typename?: 'UpdateEpisodeAgentMutation';
+export type UpdateEpisodeEntityLinkMutation = {
+  __typename?: 'UpdateEpisodeEntityLinkMutation';
   errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
@@ -1355,12 +1356,12 @@ export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
 
 export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeEntityLinkType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'EntityType', id: string, name?: string | null } } | null };
 
-export type DataEntryUpdateEpisodeAgentMutationVariables = Exact<{
-  input: UpdateEpisodeAgentInput;
+export type DataEntryUpdateEpisodeEntityLinkMutationVariables = Exact<{
+  input: UpdateEpisodeEntityLinkInput;
 }>;
 
 
-export type DataEntryUpdateEpisodeAgentMutation = { __typename?: 'Mutation', updateEpisodeAgent?: { __typename?: 'UpdateEpisodeAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateEpisodeEntityLinkMutation = { __typename?: 'Mutation', updateEpisodeEntityLink?: { __typename?: 'UpdateEpisodeEntityLinkMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -2137,9 +2138,9 @@ export const DataEntryEpisodeEntityLinkDocument = gql`
       super(apollo);
     }
   }
-export const DataEntryUpdateEpisodeAgentDocument = gql`
-    mutation DataEntryUpdateEpisodeAgent($input: UpdateEpisodeAgentInput!) {
-  updateEpisodeAgent(data: $input) {
+export const DataEntryUpdateEpisodeEntityLinkDocument = gql`
+    mutation DataEntryUpdateEpisodeEntityLink($input: UpdateEpisodeEntityLinkInput!) {
+  updateEpisodeEntityLink(data: $input) {
     ok
     errors {
       field
@@ -2152,8 +2153,8 @@ export const DataEntryUpdateEpisodeAgentDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryUpdateEpisodeAgentGQL extends Apollo.Mutation<DataEntryUpdateEpisodeAgentMutation, DataEntryUpdateEpisodeAgentMutationVariables> {
-    override document = DataEntryUpdateEpisodeAgentDocument;
+  export class DataEntryUpdateEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryUpdateEpisodeEntityLinkMutation, DataEntryUpdateEpisodeEntityLinkMutationVariables> {
+    override document = DataEntryUpdateEpisodeEntityLinkDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index e0ee1de4..ae51547f 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -491,7 +491,7 @@ type Mutation {
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
   updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
-  updateEpisodeAgent(data: UpdateEpisodeAgentInput!): UpdateEpisodeAgentMutation
+  updateEpisodeEntityLink(data: UpdateEpisodeEntityLinkInput!): UpdateEpisodeEntityLinkMutation
   updateGift(giftData: UpdateGiftInput!): UpdateGiftMutation
   updateLetter(letterData: UpdateLetterInput!): UpdateLetterMutation
   updateOrCreateSource(sourceData: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
@@ -975,14 +975,15 @@ input UpdateCreateSourceInput {
   name: String!
 }
 
-input UpdateEpisodeAgentInput {
-  agent: ID!
+input UpdateEpisodeEntityLinkInput {
+  entity: ID!
+  entityType: Entity!
   episode: ID!
   note: String
   sourceMention: SourceMention
 }
 
-type UpdateEpisodeAgentMutation {
+type UpdateEpisodeEntityLinkMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 5eac08fe..538d26a2 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -1,14 +1,16 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
-import { EntityType, SelectOptions } from '../types';
+import { SelectOptions } from '../types';
 import { debounceTime, distinctUntilChanged, map, Observable, shareReplay, skip, Subject, switchMap, tap, withLatestFrom } from 'rxjs';
 import { actionIcons } from '@shared/icons';
 import {
-    DataEntryUpdateEpisodeAgentGQL, DataEntryUpdateEpisodeAgentMutationVariables,
     SourceMention,
-    DataEntryUpdateEpisodeMutation,
     DataEntryEpisodeEntityLinkGQL,
     Entity,
-    DataEntryEpisodeEntityLinkQuery
+    DataEntryEpisodeEntityLinkQuery,
+    DataEntryUpdateEpisodeEntityLinkGQL,
+    DataEntryUpdateEpisodeEntityLinkMutation,
+    DataEntryUpdateEpisodeEntityLinkMutationVariables,
+    UpdateEpisodeEntityLinkInput
 } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
@@ -49,7 +51,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
 
     sourceMentionOptions: SelectOptions<SourceMention> = sourceMentionSelectOptions();
 
-    private link$ = new Subject<{ entity: string, episode: string, entityType: Entity }>();
+    private link$ = new Subject<UpdateEpisodeEntityLinkInput>();
     private status$ = formStatusSubject();
     private formName = 'episode-link-' + crypto.randomUUID();
 
@@ -57,7 +59,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
 
     constructor(
         query: DataEntryEpisodeEntityLinkGQL,
-        private agentMutation: DataEntryUpdateEpisodeAgentGQL,
+        private updateMutation: DataEntryUpdateEpisodeEntityLinkGQL,
         private formService: FormService,
     ) {
         this.formService.attachForm(this.formName, this.status$);
@@ -121,13 +123,13 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     }
 
     private toMutationInput(
-        [values, link]: [typeof this.form.value, { entity: string, episode: string }]
-    ): DataEntryUpdateEpisodeAgentMutationVariables {
-        return { input: { agent: link.entity, episode: link.episode, ...values } };
+        [values, link]: [typeof this.form.value, UpdateEpisodeEntityLinkInput]
+    ): DataEntryUpdateEpisodeEntityLinkMutationVariables {
+        return { input: { ...link, ...values } };
     }
 
-    private makeMutation(mutationInput: DataEntryUpdateEpisodeAgentMutationVariables) {
-        return this.agentMutation.mutate(mutationInput, {
+    private makeMutation(mutationInput: DataEntryUpdateEpisodeEntityLinkMutationVariables) {
+        return this.updateMutation.mutate(mutationInput, {
             errorPolicy: 'all',
             refetchQueries: [
                 'DataEntryEpisodeEntity',
@@ -135,12 +137,12 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         })
     }
 
-    private onMutationResult(result: MutationResult<DataEntryUpdateEpisodeMutation>) {
-        if (result.errors) {
+    private onMutationResult(result: MutationResult<DataEntryUpdateEpisodeEntityLinkMutation>) {
+        if (result.errors?.length) {
             console.error(result.errors);
             this.status$.next('error');
-        } else if (result.data?.updateEpisode?.errors) {
-            console.error(result.data.updateEpisode.errors);
+        } else if (result.data?.updateEpisodeEntityLink?.errors?.length) {
+            console.error(result.data.updateEpisodeEntityLink.errors);
             this.status$.next('error');
         } else {
             this.status$.next('saved');
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
index ce23d812..39f5bca8 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
@@ -14,8 +14,8 @@ query DataEntryEpisodeEntityLink($entity: ID!, $episode: ID!, $entityType: Entit
     }
 }
 
-mutation DataEntryUpdateEpisodeAgent($input:UpdateEpisodeAgentInput!) {
-    updateEpisodeAgent(data: $input) {
+mutation DataEntryUpdateEpisodeEntityLink($input:UpdateEpisodeEntityLinkInput!) {
+    updateEpisodeEntityLink(data: $input) {
         ok
         errors {
             field

From d6a65b4c1df2dba1f34e0e2a4bb1e6e11f715dfd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 11:30:15 +0200
Subject: [PATCH 424/565] add links for other entities

---
 .../episode-link-form/episode-link-form.component.ts      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 538d26a2..45572012 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -104,7 +104,13 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         if (linkTo == 'episode') {
             return 'episodes';
         }
-        return 'agents';
+        const routes = {
+            [Entity.Agent]: 'agents',
+            [Entity.Gift]: 'gifts',
+            [Entity.Letter]: 'letters',
+            [Entity.Space]: 'locations',
+        };
+        return routes[entityType];
     }
 
     linkedObject(linkTo: LinkTo, data: DataEntryEpisodeEntityLinkQuery) {

From 80ffc5df093695b85ebb1537427fca1d9b31d75c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 13 Sep 2024 11:45:22 +0200
Subject: [PATCH 425/565] use interface for episode entity link in backend

---
 backend/core/entity_models.py                 | 16 ++++++++
 backend/core/models.py                        |  1 +
 backend/core/types/entity.py                  | 14 +++++++
 .../CreateEpisodeEntityLinkMutation.py        |  3 +-
 .../DeleteEpisodeEntityLinkMutation.py        |  4 +-
 .../UpdateEpisodeEntityLinkMutation.py        |  3 +-
 backend/event/queries.py                      | 17 +++-----
 backend/event/tests/test_event_queries.py     | 20 +++++++++
 backend/event/types/EpisodeAgentType.py       | 21 +++++-----
 backend/event/types/EpisodeEntityLink.py      | 13 ++++++
 backend/event/types/EpisodeEntityType.py      | 41 -------------------
 backend/event/types/EpisodeGiftType.py        |  2 +
 backend/event/types/EpisodeLetterType.py      |  2 +
 backend/event/types/EpisodeSpaceType.py       |  3 +-
 backend/letter/types/GiftDescriptionType.py   |  3 +-
 backend/letter/types/LetterDescriptionType.py |  2 +
 backend/person/types/AgentDescriptionType.py  |  2 +
 backend/space/types/SpaceDescriptionType.py   |  2 +
 18 files changed, 101 insertions(+), 68 deletions(-)
 create mode 100644 backend/core/entity_models.py
 create mode 100644 backend/core/types/entity.py
 create mode 100644 backend/event/tests/test_event_queries.py
 create mode 100644 backend/event/types/EpisodeEntityLink.py
 delete mode 100644 backend/event/types/EpisodeEntityType.py

diff --git a/backend/core/entity_models.py b/backend/core/entity_models.py
new file mode 100644
index 00000000..a8a0c751
--- /dev/null
+++ b/backend/core/entity_models.py
@@ -0,0 +1,16 @@
+from typing import Dict, Type
+from core.types.entity import Entity
+from event.models import (
+    EpisodeAgent,
+    EpisodeSpace,
+    EpisodeLetter,
+    EpisodeGift,
+    EpisodeEntity,
+)
+
+ENTITY_MODELS: Dict[str, Type[EpisodeEntity]] = {
+    Entity.AGENT: EpisodeAgent,
+    Entity.SPACE: EpisodeSpace,
+    Entity.LETTER: EpisodeLetter,
+    Entity.GIFT: EpisodeGift,
+}
diff --git a/backend/core/models.py b/backend/core/models.py
index dae5a447..1b5044f2 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -195,6 +195,7 @@ class DescriptionField(Field, models.Model):
 
     source_mention = models.CharField(
         max_length=32,
+        blank=False,
         choices=SourceMention.choices,
         default=SourceMention.DIRECT,
         help_text="How is this information presented in the text?",
diff --git a/backend/core/types/entity.py b/backend/core/types/entity.py
new file mode 100644
index 00000000..93099226
--- /dev/null
+++ b/backend/core/types/entity.py
@@ -0,0 +1,14 @@
+import graphene
+
+
+class Entity(graphene.Enum):
+    AGENT = "agent"
+    GIFT = "gift"
+    LETTER = "letter"
+    SPACE = "space"
+
+
+class EntityInterface(graphene.Interface):
+    id = graphene.NonNull(graphene.ID)
+    name = graphene.String()
+    description = graphene.String()
diff --git a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
index 5ecdb0b1..59c2b197 100644
--- a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
@@ -12,7 +12,8 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from django.core.exceptions import ValidationError
 from django.db import transaction
-from event.types.EpisodeEntityType import Entity, ENTITY_MODELS
+from core.types.entity import Entity
+from core.entity_models import ENTITY_MODELS
 
 
 class CreateEpisodeEntityLinkInput(InputObjectType):
diff --git a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
index 8f4880ff..4ccc92ef 100644
--- a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
@@ -8,8 +8,8 @@
 )
 
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
-from event.types.EpisodeEntityType import Entity, ENTITY_MODELS
-
+from core.types.entity import Entity
+from core.entity_models import ENTITY_MODELS
 
 class DeleteEpisodeEntityLinkMutation(Mutation):
     ok = Boolean(required=True)
diff --git a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
index b5e3a205..d3fd0516 100644
--- a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
@@ -12,7 +12,8 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from core.types.DescriptionFieldType import SourceMentionEnum
 from event.models import EpisodeAgent
-from event.types.EpisodeEntityType import Entity, ENTITY_MODELS
+from core.types.entity import Entity
+from core.entity_models import ENTITY_MODELS
 
 
 class UpdateEpisodeEntityLinkInput(InputObjectType):
diff --git a/backend/event/queries.py b/backend/event/queries.py
index 2b8a8d74..7948cf58 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -4,7 +4,9 @@
 from event.types.EpisodeCategoryType import EpisodeCategoryType
 from event.types.EpisodeType import EpisodeType
 from event.types.EpisodeAgentType import EpisodeAgentType
-from event.types.EpisodeEntityType import EpisodeEntityLinkType, Entity, ENTITY_MODELS
+from event.types.EpisodeEntityLink import EpisodeEntityLink
+from core.types.entity import Entity
+from core.entity_models import ENTITY_MODELS
 
 
 class EventQueries(ObjectType):
@@ -15,7 +17,7 @@ class EventQueries(ObjectType):
         EpisodeAgentType, agent=ID(required=True), episode=ID(required=True)
     )
     episode_entity_link = Field(
-        EpisodeEntityLinkType,
+        EpisodeEntityLink,
         entity=ID(required=True),
         episode=ID(required=True),
         entity_type=Entity(required=True),
@@ -65,15 +67,8 @@ def resolve_episode_entity_link(
         entity: str,
         episode: str,
         entity_type: Entity,
-    ) -> EpisodeEntityLinkType:
+    ) -> EpisodeEntityLink:
         Model = ENTITY_MODELS[entity_type]
         query = {Model.entity_field: entity, "episode": episode}
         obj: EpisodeEntity = Model.objects.get(**query)
-        return EpisodeEntityLinkType(
-            id=obj.pk,
-            episode=obj.episode,
-            entity_type=obj.__class__.entity_field,
-            entity=obj.entity,
-            source_mention=obj.source_mention,
-            note=obj.note,
-        )
+        return obj
diff --git a/backend/event/tests/test_event_queries.py b/backend/event/tests/test_event_queries.py
new file mode 100644
index 00000000..5748b162
--- /dev/null
+++ b/backend/event/tests/test_event_queries.py
@@ -0,0 +1,20 @@
+def test_episode_entity_link_query(graphql_client, episode, agent_description):
+    result = graphql_client.execute(
+        f"""
+        query TestQuery {{
+            episodeEntityLink(
+                episode: "{episode.id}",
+                entity: "{agent_description.id}",
+                entityType: AGENT
+            ) {{
+                id
+                episode {{ name }}
+                entity {{ name }}
+            }}
+        }}
+        """
+    )
+    assert result["data"]["episodeEntityLink"]["episode"]["name"] == episode.name
+    assert (
+        result["data"]["episodeEntityLink"]["entity"]["name"] == agent_description.name
+    )
diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
index 93420d4b..7748b6c4 100644
--- a/backend/event/types/EpisodeAgentType.py
+++ b/backend/event/types/EpisodeAgentType.py
@@ -1,24 +1,25 @@
-from graphene import ResolveInfo
+from graphene import NonNull
 from graphene_django import DjangoObjectType
 from core.types.DescriptionFieldType import DescriptionFieldType
-from django.db.models import QuerySet
 
 from event.models import EpisodeAgent
+from core.types.entity import Entity, EntityInterface
 
+from event.types.EpisodeEntityLink import EpisodeEntityLink
+from core.types.DescriptionFieldType import SourceMentionEnum
 
 class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
+    entity = NonNull(EntityInterface)
+    entity_type = NonNull(Entity)
+    source_mention = NonNull(SourceMentionEnum)
+
     class Meta:
         model = EpisodeAgent
         fields = [
             "id",
             "episode",
             "agent",
+            "entity",
+            "entity_type",
         ] + DescriptionFieldType.fields()
-
-    @classmethod
-    def get_queryset(
-        cls,
-        queryset: QuerySet[EpisodeAgent],
-        info: ResolveInfo,
-    ) -> QuerySet[EpisodeAgent]:
-        return queryset.all()
+        interfaces = (EpisodeEntityLink,)
diff --git a/backend/event/types/EpisodeEntityLink.py b/backend/event/types/EpisodeEntityLink.py
new file mode 100644
index 00000000..2dc264e0
--- /dev/null
+++ b/backend/event/types/EpisodeEntityLink.py
@@ -0,0 +1,13 @@
+from graphene import ID, NonNull, String, Interface
+from core.types.DescriptionFieldType import SourceMentionEnum
+from event.types.EpisodeType import EpisodeType
+from core.types.entity import Entity, EntityInterface
+
+
+class EpisodeEntityLink(Interface):
+    id = NonNull(ID)
+    episode = NonNull(EpisodeType)
+    entity_type = NonNull(Entity)
+    entity = NonNull(EntityInterface)
+    source_mention = NonNull(SourceMentionEnum)
+    note = String()
diff --git a/backend/event/types/EpisodeEntityType.py b/backend/event/types/EpisodeEntityType.py
deleted file mode 100644
index eeb19a3c..00000000
--- a/backend/event/types/EpisodeEntityType.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from graphene import Enum, ID, NonNull, ObjectType, String
-from core.types.DescriptionFieldType import SourceMentionEnum
-from event.models import (
-    EpisodeAgent,
-    EpisodeSpace,
-    EpisodeLetter,
-    EpisodeGift,
-    EpisodeEntity,
-)
-from event.types.EpisodeType import EpisodeType
-from typing import Dict, Type
-
-
-class Entity(Enum):
-    AGENT = "agent"
-    GIFT = "gift"
-    LETTER = "letter"
-    SPACE = "space"
-
-
-ENTITY_MODELS: Dict[str, Type[EpisodeEntity]] = {
-    Entity.AGENT: EpisodeAgent,
-    Entity.SPACE: EpisodeSpace,
-    Entity.LETTER: EpisodeLetter,
-    Entity.GIFT: EpisodeGift,
-}
-
-
-class EntityType(ObjectType):
-    id = NonNull(ID)
-    name = String()
-    description = String()
-
-
-class EpisodeEntityLinkType(ObjectType):
-    id = NonNull(ID)
-    episode = NonNull(EpisodeType)
-    entity_type = NonNull(Entity)
-    entity = NonNull(EntityType)
-    source_mention = NonNull(SourceMentionEnum)
-    note = String()
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
index 47452f81..4a37709f 100644
--- a/backend/event/types/EpisodeGiftType.py
+++ b/backend/event/types/EpisodeGiftType.py
@@ -4,6 +4,7 @@
 from django.db.models import QuerySet
 
 from event.models import EpisodeGift
+from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 
 class EpisodeGiftType(DescriptionFieldType, DjangoObjectType):
@@ -14,6 +15,7 @@ class Meta:
             "episode",
             "gift",
         ] + DescriptionFieldType.fields()
+        interfaces = (EpisodeEntityLink,)
 
     @classmethod
     def get_queryset(
diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
index 19965cbe..cf4f2363 100644
--- a/backend/event/types/EpisodeLetterType.py
+++ b/backend/event/types/EpisodeLetterType.py
@@ -4,6 +4,7 @@
 from django.db.models import QuerySet
 
 from event.models import EpisodeLetter
+from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 
 class EpisodeLetterType(DescriptionFieldType, DjangoObjectType):
@@ -14,6 +15,7 @@ class Meta:
             "episode",
             "letter",
         ] + DescriptionFieldType.fields()
+        interfaces = (EpisodeEntityLink,)
 
     @classmethod
     def get_queryset(
diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
index 252db2d5..5a2a1f7b 100644
--- a/backend/event/types/EpisodeSpaceType.py
+++ b/backend/event/types/EpisodeSpaceType.py
@@ -4,7 +4,7 @@
 from django.db.models import QuerySet
 
 from event.models import EpisodeSpace
-
+from event.types import EpisodeEntityLink
 
 class EpisodeSpaceType(DescriptionFieldType, DjangoObjectType):
     class Meta:
@@ -14,6 +14,7 @@ class Meta:
             "episode",
             "space",
         ] + DescriptionFieldType.fields()
+        interfaces = (EpisodeEntityLink,)
 
     @classmethod
     def get_queryset(
diff --git a/backend/letter/types/GiftDescriptionType.py b/backend/letter/types/GiftDescriptionType.py
index dd886463..f30816bd 100644
--- a/backend/letter/types/GiftDescriptionType.py
+++ b/backend/letter/types/GiftDescriptionType.py
@@ -6,7 +6,7 @@
 from letter.models import GiftCategory, GiftDescription, GiftDescriptionCategory
 from letter.types.GiftDescriptionCategoryType import GiftDescriptionCategoryType
 from letter.types.GiftCategoryType import GiftCategoryType
-
+from core.types.entity import EntityInterface
 
 class GiftDescriptionType(EntityDescriptionType, DjangoObjectType):
     # Direct access to foreign key
@@ -20,6 +20,7 @@ class Meta:
             "id",
             "categories",
         ] + EntityDescriptionType.fields()
+        interfaces = (EntityInterface,)
 
     @classmethod
     def get_queryset(
diff --git a/backend/letter/types/LetterDescriptionType.py b/backend/letter/types/LetterDescriptionType.py
index 46007969..d95b20bc 100644
--- a/backend/letter/types/LetterDescriptionType.py
+++ b/backend/letter/types/LetterDescriptionType.py
@@ -6,6 +6,7 @@
 from letter.models import LetterCategory, LetterDescription, LetterDescriptionCategory
 from letter.types.LetterCategoryType import LetterCategoryType
 from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
+from core.types.entity import EntityInterface
 
 
 class LetterDescriptionType(EntityDescriptionType, DjangoObjectType):
@@ -20,6 +21,7 @@ class Meta:
             "id",
             "categories",
         ] + EntityDescriptionType.fields()
+        interfaces = (EntityInterface,)
 
     @classmethod
     def get_queryset(
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index a34f4082..ba0a8fb1 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -10,6 +10,7 @@
 from person.types.PersonReferenceType import PersonReferenceType
 from event.types.EpisodeAgentType import EpisodeAgentType
 from event.models import EpisodeAgent
+from core.types.entity import EntityInterface
 
 
 class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
@@ -30,6 +31,7 @@ class Meta:
             "location",
             "episodes",
         ] + EntityDescriptionType.fields()
+        interfaces = (EntityInterface,)
 
     @classmethod
     def get_queryset(
diff --git a/backend/space/types/SpaceDescriptionType.py b/backend/space/types/SpaceDescriptionType.py
index 14a8366d..c6643440 100644
--- a/backend/space/types/SpaceDescriptionType.py
+++ b/backend/space/types/SpaceDescriptionType.py
@@ -18,6 +18,7 @@
 from space.types.StructureType import StructureType
 from space.types.SettlementFieldType import SettlementFieldType
 from space.types.StructureFieldType import StructureFieldType
+from core.types.entity import EntityInterface
 
 
 class SpaceDescriptionType(EntityDescriptionType, DjangoObjectType):
@@ -37,6 +38,7 @@ class Meta:
             "settlements",
             "structures",
         ] + EntityDescriptionType.fields()
+        interfaces = (EntityInterface,)
 
     @classmethod
     def get_queryset(

From 185dd8a994c70cc09e5e7c8fca73d19975b6418c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 13 Sep 2024 11:49:04 +0200
Subject: [PATCH 426/565] update graphql schema

---
 backend/core/types/NamedType.py   |  3 ++
 frontend/generated/graphql.ts     | 66 ++++++++++++-------------------
 frontend/generated/schema.graphql | 64 ++++++++----------------------
 3 files changed, 45 insertions(+), 88 deletions(-)

diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
index 3588f9dc..39b7b40e 100644
--- a/backend/core/types/NamedType.py
+++ b/backend/core/types/NamedType.py
@@ -1,3 +1,4 @@
+import graphene
 from core.models import Named
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
@@ -8,6 +9,8 @@ class NamedType(AbstractDjangoObjectType):
     Should not be queried directly, but should be extended by other types.
     """
 
+    name = graphene.NonNull(graphene.String)
+
     class Meta:
         model = Named
         fields = ["name", "description"]
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 196de85e..02102627 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -43,7 +43,7 @@ export type AgentDescriptionLocationType = {
   sourceMention?: Maybe<SourceMention>;
 };
 
-export type AgentDescriptionType = {
+export type AgentDescriptionType = EntityInterface & {
   __typename?: 'AgentDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
@@ -51,8 +51,7 @@ export type AgentDescriptionType = {
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
   describes: Array<HistoricalPersonType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
+  description?: Maybe<Scalars['String']['output']>;
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeAgentType>;
@@ -61,7 +60,6 @@ export type AgentDescriptionType = {
   /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
   isGroup: Scalars['Boolean']['output'];
   location?: Maybe<AgentDescriptionLocationType>;
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
   page: Scalars['String']['output'];
@@ -190,23 +188,23 @@ export enum Entity {
   Space = 'SPACE'
 }
 
-export type EntityType = {
-  __typename?: 'EntityType';
+export type EntityInterface = {
   description?: Maybe<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
   name?: Maybe<Scalars['String']['output']>;
 };
 
-export type EpisodeAgentType = {
+export type EpisodeAgentType = EpisodeEntityLink & {
   __typename?: 'EpisodeAgentType';
   agent: AgentDescriptionType;
   /** How certain are you of this value? */
   certainty: EventEpisodeAgentCertaintyChoices;
+  entity: EntityInterface;
+  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  sourceMention?: Maybe<SourceMention>;
+  note?: Maybe<Scalars['String']['output']>;
+  sourceMention: SourceMention;
 };
 
 export type EpisodeCategoryType = {
@@ -214,13 +212,11 @@ export type EpisodeCategoryType = {
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
 };
 
-export type EpisodeEntityLinkType = {
-  __typename?: 'EpisodeEntityLinkType';
-  entity: EntityType;
+export type EpisodeEntityLink = {
+  entity: EntityInterface;
   entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -247,7 +243,6 @@ export type EpisodeType = {
   id: Scalars['ID']['output'];
   /** letters involved in this episode */
   letters: Array<LetterDescriptionType>;
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
   page: Scalars['String']['output'];
@@ -301,7 +296,6 @@ export type GiftCategoryType = {
   /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
 };
 
@@ -317,7 +311,7 @@ export type GiftDescriptionCategoryType = {
   sourceMention?: Maybe<SourceMention>;
 };
 
-export type GiftDescriptionType = {
+export type GiftDescriptionType = EntityInterface & {
   __typename?: 'GiftDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
@@ -326,12 +320,10 @@ export type GiftDescriptionType = {
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
+  description?: Maybe<Scalars['String']['output']>;
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
   page: Scalars['String']['output'];
@@ -351,7 +343,6 @@ export type HistoricalPersonType = {
   id: Scalars['ID']['output'];
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
   identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
 };
 
@@ -382,7 +373,7 @@ export type LetterDescriptionCategoryType = {
   sourceMention?: Maybe<SourceMention>;
 };
 
-export type LetterDescriptionType = {
+export type LetterDescriptionType = EntityInterface & {
   __typename?: 'LetterDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
@@ -391,12 +382,10 @@ export type LetterDescriptionType = {
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
+  description?: Maybe<Scalars['String']['output']>;
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
   page: Scalars['String']['output'];
@@ -695,7 +684,7 @@ export type Query = {
   episode?: Maybe<EpisodeType>;
   episodeAgentLink?: Maybe<EpisodeAgentType>;
   episodeCategories: Array<EpisodeCategoryType>;
-  episodeEntityLink?: Maybe<EpisodeEntityLinkType>;
+  episodeEntityLink?: Maybe<EpisodeEntityLink>;
   episodes: Array<EpisodeType>;
   giftDescription?: Maybe<GiftDescriptionType>;
   giftDescriptions: Array<GiftDescriptionType>;
@@ -806,7 +795,6 @@ export type RegionType = {
   id: Scalars['ID']['output'];
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
   identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** Kind of region */
   type: SpaceRegionTypeChoices;
@@ -832,7 +820,6 @@ export type SettlementType = {
   id: Scalars['ID']['output'];
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
   identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** Surrounding regions of this settlement */
   regions: Array<RegionType>;
@@ -892,19 +879,17 @@ export type SourceWrittenDateType = {
   yearUpper: Scalars['Int']['output'];
 };
 
-export type SpaceDescriptionType = {
+export type SpaceDescriptionType = EntityInterface & {
   __typename?: 'SpaceDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
+  description?: Maybe<Scalars['String']['output']>;
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
   page: Scalars['String']['output'];
@@ -1003,7 +988,6 @@ export type StructureType = {
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
   identifiable: Scalars['Boolean']['output'];
   level: SpaceStructureLevelChoices;
-  /** A name to help identify this object */
   name: Scalars['String']['output'];
   /** The settlement containing this structure */
   settlement?: Maybe<SettlementType>;
@@ -1183,14 +1167,14 @@ export type DataEntryAgentIdentificationQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
+export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description?: string | null, isGroup: boolean } | null };
 
 export type DataEntryAgentQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description?: string | null, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateAgentMutationVariables = Exact<{
   input: UpdateAgentInput;
@@ -1277,7 +1261,7 @@ export type DataEntryGiftIdentificationQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryGiftIdentificationQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string } | null };
+export type DataEntryGiftIdentificationQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description?: string | null } | null };
 
 export type DataEntryGiftSourceTextQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1291,7 +1275,7 @@ export type DataEntryGiftFormQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryGiftFormQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryGiftFormQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description?: string | null, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateGiftMutationVariables = Exact<{
   giftData: UpdateGiftInput;
@@ -1317,7 +1301,7 @@ export type DataEntryLetterIdentificationQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLetterIdentificationQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string } | null };
+export type DataEntryLetterIdentificationQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description?: string | null } | null };
 
 export type DataEntryLetterSourceTextQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1331,7 +1315,7 @@ export type DataEntryLetterFormQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLetterFormQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryLetterFormQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description?: string | null, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateLetterMutationVariables = Exact<{
   letterData: UpdateLetterInput;
@@ -1345,7 +1329,7 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description?: string | null, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
   entity: Scalars['ID']['input'];
@@ -1354,7 +1338,7 @@ export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeEntityLinkType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'EntityType', id: string, name?: string | null } } | null };
+export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeAgentType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeEntityLinkMutationVariables = Exact<{
   input: UpdateEpisodeEntityLinkInput;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index ae51547f..71c77725 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -30,7 +30,7 @@ type AgentDescriptionLocationType {
   sourceMention: SourceMention
 }
 
-type AgentDescriptionType {
+type AgentDescriptionType implements EntityInterface {
   """The book in the source"""
   book: String!
 
@@ -38,9 +38,7 @@ type AgentDescriptionType {
   chapter: String!
   contributors: [UserType!]!
   describes: [HistoricalPersonType!]!
-
-  """Longer description to help identify this object"""
-  description: String!
+  description: String
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
@@ -53,8 +51,6 @@ type AgentDescriptionType {
   """Whether this agent is a group of people (e.g. 'the nuns of Poitiers')."""
   isGroup: Boolean!
   location: AgentDescriptionLocationType
-
-  """A name to help identify this object"""
   name: String!
 
   """The page number or page range in the source"""
@@ -174,36 +170,34 @@ enum Entity {
   SPACE
 }
 
-type EntityType {
+interface EntityInterface {
   description: String
   id: ID!
   name: String
 }
 
-type EpisodeAgentType {
+type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
 
   """How certain are you of this value?"""
   certainty: EventEpisodeAgentCertaintyChoices!
+  entity: EntityInterface!
+  entityType: Entity!
   episode: EpisodeType!
   id: ID!
-
-  """Additional notes"""
-  note: String!
-  sourceMention: SourceMention
+  note: String
+  sourceMention: SourceMention!
 }
 
 type EpisodeCategoryType {
   """Longer description to help identify this object"""
   description: String!
   id: ID!
-
-  """A name to help identify this object"""
   name: String!
 }
 
-type EpisodeEntityLinkType {
-  entity: EntityType!
+interface EpisodeEntityLink {
+  entity: EntityInterface!
   entityType: Entity!
   episode: EpisodeType!
   id: ID!
@@ -237,8 +231,6 @@ type EpisodeType {
 
   """letters involved in this episode"""
   letters: [LetterDescriptionType!]!
-
-  """A name to help identify this object"""
   name: String!
 
   """The page number or page range in the source"""
@@ -299,8 +291,6 @@ type GiftCategoryType {
   """Longer description to help identify this object"""
   description: String!
   id: ID!
-
-  """A name to help identify this object"""
   name: String!
 }
 
@@ -317,7 +307,7 @@ type GiftDescriptionCategoryType {
   sourceMention: SourceMention
 }
 
-type GiftDescriptionType {
+type GiftDescriptionType implements EntityInterface {
   """The book in the source"""
   book: String!
   categories: [GiftCategoryType!]!
@@ -326,17 +316,13 @@ type GiftDescriptionType {
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-
-  """Longer description to help identify this object"""
-  description: String!
+  description: String
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
   """
   designators: [String!]!
   id: ID!
-
-  """A name to help identify this object"""
   name: String!
 
   """The page number or page range in the source"""
@@ -362,8 +348,6 @@ type HistoricalPersonType {
   Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description
   """
   identifiable: Boolean!
-
-  """A name to help identify this object"""
   name: String!
 }
 
@@ -394,7 +378,7 @@ type LetterDescriptionCategoryType {
   sourceMention: SourceMention
 }
 
-type LetterDescriptionType {
+type LetterDescriptionType implements EntityInterface {
   """The book in the source"""
   book: String!
   categories: [LetterCategoryType!]!
@@ -403,17 +387,13 @@ type LetterDescriptionType {
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-
-  """Longer description to help identify this object"""
-  description: String!
+  description: String
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
   """
   designators: [String!]!
   id: ID!
-
-  """A name to help identify this object"""
   name: String!
 
   """The page number or page range in the source"""
@@ -650,7 +630,7 @@ type Query {
   episode(id: ID!): EpisodeType
   episodeAgentLink(agent: ID!, episode: ID!): EpisodeAgentType
   episodeCategories: [EpisodeCategoryType!]!
-  episodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): EpisodeEntityLinkType
+  episodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): EpisodeEntityLink
   episodes(sourceId: ID): [EpisodeType!]!
   giftDescription(id: ID!): GiftDescriptionType
   giftDescriptions(episodeId: ID, sourceId: ID): [GiftDescriptionType!]!
@@ -688,8 +668,6 @@ type RegionType {
   Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description
   """
   identifiable: Boolean!
-
-  """A name to help identify this object"""
   name: String!
 
   """Kind of region"""
@@ -719,8 +697,6 @@ type SettlementType {
   Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description
   """
   identifiable: Boolean!
-
-  """A name to help identify this object"""
   name: String!
 
   """Surrounding regions of this settlement"""
@@ -795,24 +771,20 @@ type SourceWrittenDateType {
   yearUpper: Int!
 }
 
-type SpaceDescriptionType {
+type SpaceDescriptionType implements EntityInterface {
   """The book in the source"""
   book: String!
 
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-
-  """Longer description to help identify this object"""
-  description: String!
+  description: String
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
   """
   designators: [String!]!
   id: ID!
-
-  """A name to help identify this object"""
   name: String!
 
   """The page number or page range in the source"""
@@ -930,8 +902,6 @@ type StructureType {
   """
   identifiable: Boolean!
   level: SpaceStructureLevelChoices!
-
-  """A name to help identify this object"""
   name: String!
 
   """The settlement containing this structure"""

From f2b9d374c1333b9acc2490326a55e8f5b5421e09 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 13 Sep 2024 12:32:31 +0200
Subject: [PATCH 427/565] more generic variable names

---
 .../episode-agents-form.component.html        | 27 ++++----
 .../episode-agents-form.component.ts          | 61 ++++++++++++-------
 2 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index 82372a71..b42fba4b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -1,13 +1,14 @@
 <ng-container *ngIf="data$ | async as data">
     <ng-container *ngIf="data.episode">
-        <p>The following agents are involved in this episode:</p>
+        <p>The following {{entityName}}s are involved in this episode:</p>
         <ul class="list-unstyled vstack gap-4">
-            <li *ngFor="let agent of data.episode.agents">
+            <li *ngFor="let entity of data.episode.agents">
                 <lc-episode-link-form [entityType]="entityType" linkTo="entity"
-                        [entityID]="agent.id"
+                        [entityID]="entity.id"
                         [episodeID]="data.episode.id">
-                    <button removeControl class="btn btn-danger" aria-label="remove episode"
-                        (click)="removeAgent$.next(agent.id)">
+                    <button removeControl class="btn btn-danger"
+                        [attr.aria-label]="'remove ' + entityName"
+                        (click)="removeEntity$.next(entity.id)">
                         <lc-icon [icon]="actionIcons.remove" />
                     </button>
                 </lc-episode-link-form>
@@ -18,18 +19,20 @@
 
 <div class="mt-4 mb-4">
     <div ngbDropdown>
-        <button type="button" class="btn btn-primary" id="add-agent-dropdown-trigger"
+        <button type="button" class="btn btn-primary"
+            [id]="addDropdownTriggerID"
             ngbDropdownToggle>
-            Add agent
+            Add {{entityName}}
         </button>
-        <div ngbDropdownMenu aria-labelledby="add-agent-dropdown-trigger">
-            <button *ngFor="let agent of (availableAgents$ | async)"
-                ngbDropdownItem (click)="addAgent$.next(agent.id)">
-                {{agent.name}}
+        <div ngbDropdownMenu
+            [attr.aria-labelledby]="addDropdownTriggerID">
+            <button *ngFor="let entity of (availableEntities$ | async)"
+                ngbDropdownItem (click)="addEntity$.next(entity.id)">
+                {{entity.name}}
             </button>
             <button ngbDropdownItem disabled>
                 <lc-icon [icon]="actionIcons.create" />
-                Create new agent
+                Create new {{entityName}}
             </button>
         </div>
     </div>
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index b839922f..cd19dd77 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -24,10 +24,10 @@ const REFETCH_QUERIES = ['DataEntryEpisodeAgents'];
 })
 export class EpisodeAgentsFormComponent implements OnDestroy {
     data$: Observable<DataEntryEpisodeAgentsQuery>;
-    availableAgents$: Observable<{ name: string, id: string }[]>;
+    availableEntities$: Observable<{ name: string, id: string }[]>;
 
-    addAgent$ = new Subject<string>();
-    removeAgent$ = new Subject<string>();
+    addEntity$ = new Subject<string>();
+    removeEntity$ = new Subject<string>();
     actionIcons = actionIcons;
     status$ = formStatusSubject();
     formName = 'agents';
@@ -50,37 +50,52 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
             map(result => result.data),
             takeUntilDestroyed(),
         );
-        this.availableAgents$ = this.data$.pipe(
-            map(this.availableAgents)
+        this.availableEntities$ = this.data$.pipe(
+            map(this.availableEntities)
         );
 
-        this.addAgent$.pipe(
+        this.addEntity$.pipe(
             withLatestFrom(this.formService.id$),
             takeUntilDestroyed(),
-        ).subscribe(([episodeID, agentID]) =>
-            this.addAgent(episodeID, agentID)
+        ).subscribe(([episodeID, entityID]) =>
+            this.addEntity(episodeID, entityID)
         );
 
-        this.removeAgent$.pipe(
+        this.removeEntity$.pipe(
             withLatestFrom(this.formService.id$),
             takeUntilDestroyed(),
-        ).subscribe(([episodeID, agentID]) =>
-            this.removeAgent(episodeID, agentID)
+        ).subscribe(([episodeID, entityID]) =>
+            this.removeEntity(episodeID, entityID)
         );
     }
 
+    /** name of the entity type in natural language */
+    get entityName(): string {
+        const names = {
+            [Entity.Agent]: 'agent',
+            [Entity.Gift]: 'gift',
+            [Entity.Letter]: 'letter',
+            [Entity.Space]: 'location',
+        };
+        return names[this.entityType];
+    }
+
+    get addDropdownTriggerID(): string {
+        return `add-${this.entityType}-dropdown-trigger`;
+    }
+
     ngOnDestroy(): void {
         this.status$.complete();
-        this.addAgent$.complete();
-        this.removeAgent$.complete();
+        this.addEntity$.complete();
+        this.removeEntity$.complete();
         this.formService.detachForm(this.formName);
     }
 
-    addAgent(agentID: string, episodeID: string): void {
+    addEntity(entityID: string, episodeID: string): void {
         const input: CreateEpisodeEntityLinkInput = {
-            entity: agentID,
+            entity: entityID,
             episode: episodeID,
-            entityType: Entity.Agent,
+            entityType: this.entityType,
         };
         this.addMutation.mutate({ input }, {
             refetchQueries: REFETCH_QUERIES,
@@ -89,11 +104,11 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         ).subscribe(this.mutationObserver);
     }
 
-    removeAgent(agentID: string, episodeID: string): void {
+    removeEntity(entityID: string, episodeID: string): void {
         const data: DataEntryDeleteEpisodeEntityLinkMutationVariables = {
-            entity: agentID,
+            entity: entityID,
             episode: episodeID,
-            entityType: Entity.Agent,
+            entityType: this.entityType,
         };
         this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
             tap(() => this.status$.next('loading'))
@@ -109,11 +124,11 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         this.status$.next('error');
     }
 
-    private availableAgents(
+    private availableEntities(
         data: DataEntryEpisodeAgentsQuery
     ): { name: string, id: string }[] {
-        const allAgents = data.episode?.source.agents || [];
-        const linkedAgents = data.episode?.agents || [];
-        return differencyBy(allAgents, linkedAgents, 'id');
+        const allEntities = data.episode?.source.agents || [];
+        const linkedEntities = data.episode?.agents || [];
+        return differencyBy(allEntities, linkedEntities, 'id');
     }
 }

From 7d552bc6ea71b4c7a872653a2a06dbaec9940e41 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 11:39:29 +0200
Subject: [PATCH 428/565] add gifts, letters, spaces to  source type

---
 backend/source/types/SourceType.py | 48 ++++++++++++++++--------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 5f78c0b7..09a0b367 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -1,6 +1,8 @@
 from graphene import Field, Int, List, NonNull, ResolveInfo
 from django.db.models import QuerySet, Value, Case, When, F
 from graphene_django import DjangoObjectType
+from typing import Type
+
 from event.models import Episode
 from source.models import Source
 from event.types.EpisodeType import EpisodeType
@@ -8,6 +10,12 @@
 from source.types.SourceWrittenDateType import SourceWrittenDateType
 from person.models import AgentDescription
 from person.types.AgentDescriptionType import AgentDescriptionType
+from letter.types.GiftDescriptionType import GiftDescriptionType
+from letter.types.LetterDescriptionType import LetterDescriptionType
+from letter.models import GiftDescription, LetterDescription
+from core.models import EntityDescription
+from space.models import SpaceDescription
+from space.types.SpaceDescriptionType import SpaceDescriptionType
 
 class SourceType(DjangoObjectType):
     episodes = List(NonNull(EpisodeType), required=True)
@@ -15,6 +23,9 @@ class SourceType(DjangoObjectType):
     written_date = Field(SourceWrittenDateType)
     contents_date = Field(SourceContentsDateType)
     agents = List(NonNull(AgentDescriptionType), required=True)
+    gifts = List(NonNull(GiftDescriptionType), required=True)
+    letters = List(NonNull(LetterDescriptionType), required=True)
+    spaces = List(NonNull(SpaceDescriptionType), required=True)
 
     class Meta:
         model = Source
@@ -27,29 +38,22 @@ class Meta:
             "edition_author",
         ]
 
-    @classmethod
-    def get_queryset(
-        cls, queryset: QuerySet[Source], info: ResolveInfo
-    ) -> QuerySet[Source]:
-        return queryset.all()
+    def _entity_resolver(
+        Model: Type[EntityDescription], OutputType: Type[DjangoObjectType]
+    ):
+        def resolve(parent: Source, info: ResolveInfo) -> QuerySet[Model]:
+            return OutputType.get_queryset(Model.objects, info).filter(
+                source__id=parent.pk
+            )
 
-    @staticmethod
-    def resolve_episodes(parent: Source, info: ResolveInfo) -> QuerySet[Episode]:
-        return (
-            EpisodeType.get_queryset(Episode.objects, info)
-            .filter(source_id=parent.pk)
-        )
+        return resolve
 
-    @staticmethod
-    def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
-        return (
-            EpisodeType.get_queryset(Episode.objects, info)
-            .filter(source_id=parent.pk)
-            .count()
-        )
+    resolve_episodes = _entity_resolver(Episode, EpisodeType)
+    resolve_agents = _entity_resolver(AgentDescription, AgentDescriptionType)
+    resolve_gifts = _entity_resolver(GiftDescription, GiftDescriptionType)
+    resolve_letters = _entity_resolver(LetterDescription, LetterDescriptionType)
+    resolve_spaces = _entity_resolver(SpaceDescription, SpaceDescriptionType)
 
     @staticmethod
-    def resolve_agents(parent: Source, info: ResolveInfo) -> QuerySet[AgentDescription]:
-        return AgentDescriptionType.get_queryset(AgentDescription.objects, info).filter(
-            source__id=parent.pk
-        )
+    def resolve_num_of_episodes(parent: Source, info: ResolveInfo) -> int:
+        return SourceType.resolve_episodes(parent, info).count()

From 28ad085f90433417dc14c43ef584e9b74261ce02 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 11:53:25 +0200
Subject: [PATCH 429/565] fetch all entity relationships

---
 frontend/generated/graphql.ts                 | 36 +++++++++++---
 frontend/generated/schema.graphql             |  3 ++
 .../episode-agents-form.component.html        |  2 +-
 .../episode-agents-form.component.ts          | 42 +++++++++++++----
 .../episode-agents.graphql                    | 47 ++++++++++++++-----
 5 files changed, 102 insertions(+), 28 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 02102627..1f54a3f9 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -854,7 +854,9 @@ export type SourceType = {
   /** The title of the edition used for this source */
   editionTitle: Scalars['String']['output'];
   episodes: Array<EpisodeType>;
+  gifts: Array<GiftDescriptionType>;
   id: Scalars['ID']['output'];
+  letters: Array<LetterDescriptionType>;
   /** The name of the original author of the work, if known */
   medievalAuthor: Scalars['String']['output'];
   /** The original title of the work, if known */
@@ -862,6 +864,7 @@ export type SourceType = {
   /** a unique name to identify this source in the database */
   name: Scalars['String']['output'];
   numOfEpisodes: Scalars['Int']['output'];
+  spaces: Array<SpaceDescriptionType>;
   writtenDate?: Maybe<SourceWrittenDateType>;
 };
 
@@ -1190,12 +1193,12 @@ export type DataEntryDeleteAgentMutationVariables = Exact<{
 
 export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
 
-export type DataEntryEpisodeAgentsQueryVariables = Exact<{
+export type DataEntryEpisodeEntitiesQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type DataEntryEpisodeAgentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }> } | null };
+export type DataEntryEpisodeEntitiesQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string }> } | null };
 
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1616,8 +1619,8 @@ export const DataEntryDeleteAgentDocument = gql`
       super(apollo);
     }
   }
-export const DataEntryEpisodeAgentsDocument = gql`
-    query DataEntryEpisodeAgents($id: ID!) {
+export const DataEntryEpisodeEntitiesDocument = gql`
+    query DataEntryEpisodeEntities($id: ID!) {
   episode(id: $id) {
     id
     source {
@@ -1626,10 +1629,31 @@ export const DataEntryEpisodeAgentsDocument = gql`
         id
         name
       }
+      letters {
+        id
+        name
+      }
+      gifts {
+        id
+        name
+      }
+      spaces {
+        id
+        name
+      }
     }
     agents {
       id
     }
+    gifts {
+      id
+    }
+    letters {
+      id
+    }
+    spaces {
+      id
+    }
   }
 }
     `;
@@ -1637,8 +1661,8 @@ export const DataEntryEpisodeAgentsDocument = gql`
   @Injectable({
     providedIn: 'root'
   })
-  export class DataEntryEpisodeAgentsGQL extends Apollo.Query<DataEntryEpisodeAgentsQuery, DataEntryEpisodeAgentsQueryVariables> {
-    override document = DataEntryEpisodeAgentsDocument;
+  export class DataEntryEpisodeEntitiesGQL extends Apollo.Query<DataEntryEpisodeEntitiesQuery, DataEntryEpisodeEntitiesQueryVariables> {
+    override document = DataEntryEpisodeEntitiesDocument;
     
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 71c77725..ab8c1727 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -738,7 +738,9 @@ type SourceType {
   """The title of the edition used for this source"""
   editionTitle: String!
   episodes: [EpisodeType!]!
+  gifts: [GiftDescriptionType!]!
   id: ID!
+  letters: [LetterDescriptionType!]!
 
   """The name of the original author of the work, if known"""
   medievalAuthor: String!
@@ -749,6 +751,7 @@ type SourceType {
   """a unique name to identify this source in the database"""
   name: String!
   numOfEpisodes: Int!
+  spaces: [SpaceDescriptionType!]!
   writtenDate: SourceWrittenDateType
 }
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index b42fba4b..84c72376 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -2,7 +2,7 @@
     <ng-container *ngIf="data.episode">
         <p>The following {{entityName}}s are involved in this episode:</p>
         <ul class="list-unstyled vstack gap-4">
-            <li *ngFor="let entity of data.episode.agents">
+            <li *ngFor="let entity of linkedEntities$ | async">
                 <lc-episode-link-form [entityType]="entityType" linkTo="entity"
                         [entityID]="entity.id"
                         [episodeID]="data.episode.id">
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index cd19dd77..d990809a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -9,13 +9,15 @@ import {
     DataEntryCreateEpisodeEntityLinkGQL,
     DataEntryDeleteEpisodeEntityLinkGQL,
     DataEntryDeleteEpisodeEntityLinkMutationVariables,
-    DataEntryEpisodeAgentsGQL,
-    DataEntryEpisodeAgentsQuery,
+    DataEntryEpisodeEntitiesGQL,
+    DataEntryEpisodeEntitiesQuery,
     Entity
 } from "generated/graphql";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 
-const REFETCH_QUERIES = ['DataEntryEpisodeAgents'];
+const REFETCH_QUERIES = ['DataEntryEpisodeEntities'];
+
+type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
 
 @Component({
     selector: "lc-episode-agents-form",
@@ -23,7 +25,9 @@ const REFETCH_QUERIES = ['DataEntryEpisodeAgents'];
     styleUrls: ["./episode-agents-form.component.scss"],
 })
 export class EpisodeAgentsFormComponent implements OnDestroy {
-    data$: Observable<DataEntryEpisodeAgentsQuery>;
+    data$: Observable<DataEntryEpisodeEntitiesQuery>;
+
+    linkedEntities$: Observable<{ id: string }[]>;
     availableEntities$: Observable<{ name: string, id: string }[]>;
 
     addEntity$ = new Subject<string>();
@@ -40,7 +44,7 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
 
     constructor(
         private formService: FormService,
-        private query: DataEntryEpisodeAgentsGQL,
+        private query: DataEntryEpisodeEntitiesGQL,
         private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
         private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
     ) {
@@ -53,6 +57,9 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         this.availableEntities$ = this.data$.pipe(
             map(this.availableEntities)
         );
+        this.linkedEntities$ = this.data$.pipe(
+            map(this.linkedEntities)
+        );
 
         this.addEntity$.pipe(
             withLatestFrom(this.formService.id$),
@@ -80,6 +87,17 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         return names[this.entityType];
     }
 
+    /** property used for the entity relationship in graphQL data */
+    get entityProperty(): EntityPropertyName {
+        const keys: Record<Entity, EntityPropertyName> = {
+            [Entity.Agent]: 'agents',
+            [Entity.Gift]: 'gifts',
+            [Entity.Letter]: 'letters',
+            [Entity.Space]: 'spaces',
+        }
+        return keys[this.entityType]
+    }
+
     get addDropdownTriggerID(): string {
         return `add-${this.entityType}-dropdown-trigger`;
     }
@@ -124,11 +142,19 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         this.status$.next('error');
     }
 
+    private linkedEntities(data: DataEntryEpisodeEntitiesQuery): { id: string }[] {
+        return data.episode?.source[this.entityProperty] || [];
+    }
+
     private availableEntities(
-        data: DataEntryEpisodeAgentsQuery
+        data: DataEntryEpisodeEntitiesQuery
     ): { name: string, id: string }[] {
-        const allEntities = data.episode?.source.agents || [];
-        const linkedEntities = data.episode?.agents || [];
+        const allEntities: {
+            __typename?: string,
+            name: string,
+            id: string
+        }[] = data.episode?.source[this.entityProperty] || [];
+        const linkedEntities = data.episode?.[this.entityProperty] || [];
         return differencyBy(allEntities, linkedEntities, 'id');
     }
 }
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
index d975d1d0..afafbdde 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
@@ -1,15 +1,36 @@
-query DataEntryEpisodeAgents($id:ID!) {
-    episode(id: $id) {
-        id
-        source {
-            id
-            agents {
-                id
-                name
-            }
-        }
-        agents {
-            id
-        }
+query DataEntryEpisodeEntities($id:ID!) {
+  episode(id: $id) {
+    id
+    source {
+      id
+      agents {
+        id
+        name
+      }
+      letters {
+        id
+        name
+      }
+      gifts {
+        id
+        name
+      }
+      spaces {
+        id
+        name
+      }
+    }
+    agents {
+      id
+    }
+    gifts {
+      id
+    }
+    letters {
+      id
+    }
+    spaces {
+      id
     }
+  }
 }

From 2b7b23f33666d768e459243282570e49d95e6bd4 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 13:36:59 +0200
Subject: [PATCH 430/565] read query data based on entity type

---
 .../agent-episodes-form.component.ts          |  2 +-
 .../episode-agents-form.component.ts          | 17 ++++-----
 frontend/src/app/data-entry/shared/utils.ts   | 20 ----------
 frontend/src/app/shared/utils.ts              | 37 +++++++++++++++++++
 4 files changed, 45 insertions(+), 31 deletions(-)
 create mode 100644 frontend/src/app/shared/utils.ts

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 024a7954..4f30716e 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -13,7 +13,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { actionIcons } from '@shared/icons';
 import { FormStatus } from '../../shared/types';
 import { MutationResult } from 'apollo-angular';
-import { differencyBy } from '../../shared/utils';
+import { differencyBy } from '@shared/utils';
 
 const REFETCH_QUERIES = ['DataEntryAgentEpisodes'];
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index d990809a..288cc1ec 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy } from "@angular/core";
 import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from "rxjs";
-import { differencyBy, formStatusSubject } from "../../shared/utils";
+import { formStatusSubject } from "../../shared/utils";
 import { actionIcons } from "@shared/icons";
 import { MutationResult } from "apollo-angular";
 import { FormService } from "../../shared/form.service";
@@ -14,6 +14,7 @@ import {
     Entity
 } from "generated/graphql";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { splat, differencyBy } from "@shared/utils";
 
 const REFETCH_QUERIES = ['DataEntryEpisodeEntities'];
 
@@ -55,25 +56,21 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
             takeUntilDestroyed(),
         );
         this.availableEntities$ = this.data$.pipe(
-            map(this.availableEntities)
+            map(this.availableEntities.bind(this))
         );
         this.linkedEntities$ = this.data$.pipe(
-            map(this.linkedEntities)
+            map(this.linkedEntities.bind(this))
         );
 
         this.addEntity$.pipe(
             withLatestFrom(this.formService.id$),
             takeUntilDestroyed(),
-        ).subscribe(([episodeID, entityID]) =>
-            this.addEntity(episodeID, entityID)
-        );
+        ).subscribe(splat(this.addEntity.bind(this)));
 
         this.removeEntity$.pipe(
             withLatestFrom(this.formService.id$),
             takeUntilDestroyed(),
-        ).subscribe(([episodeID, entityID]) =>
-            this.removeEntity(episodeID, entityID)
-        );
+        ).subscribe(splat(this.removeEntity.bind(this)));
     }
 
     /** name of the entity type in natural language */
@@ -143,7 +140,7 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
     }
 
     private linkedEntities(data: DataEntryEpisodeEntitiesQuery): { id: string }[] {
-        return data.episode?.source[this.entityProperty] || [];
+        return data.episode?.[this.entityProperty] || [];
     }
 
     private availableEntities(
diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
index 587eba58..9fbbb970 100644
--- a/frontend/src/app/data-entry/shared/utils.ts
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -9,23 +9,3 @@ export const sourceMentionSelectOptions = (): SelectOptions<SourceMention> => [
 ];
 
 export const formStatusSubject = () => new BehaviorSubject<FormStatus>('idle');
-
-/**
- * Exclude all values from a list that have a matching value in another list, based
- * on the specified property.
- *
- * Similar to _.difference, but compares on a specified key.
- *
- * @param list The starting list
- * @param others The list with values to excluded
- * @param key The property by which to compare objects
- * @returns The contents of `list` for which no value in `others` matches the `key`
- * property.
- */
-export const differencyBy = <T extends object>(
-    list: T[], others: object[], key: string
-): T[] => {
-    const getValue = (obj: object) => _.get(obj, key, undefined);
-    const excludeValues = others.map(getValue);
-    return list.filter(item => !excludeValues.includes(getValue(item)));
-}
diff --git a/frontend/src/app/shared/utils.ts b/frontend/src/app/shared/utils.ts
new file mode 100644
index 00000000..464df3ee
--- /dev/null
+++ b/frontend/src/app/shared/utils.ts
@@ -0,0 +1,37 @@
+import _ from "underscore";
+
+/**
+ * Exclude all values from a list that have a matching value in another list, based
+ * on the specified property.
+ *
+ * Similar to _.difference, but compares on a specified key.
+ *
+ * @param list The starting list
+ * @param others The list with values to excluded
+ * @param key The property by which to compare objects
+ * @returns The contents of `list` for which no value in `others` matches the `key`
+ * property.
+ */
+export const differencyBy = <T extends object>(
+    list: T[], others: object[], key: string
+): T[] => {
+    const getValue = (obj: object) => _.get(obj, key, undefined);
+    const excludeValues = others.map(getValue);
+    return list.filter(item => !excludeValues.includes(getValue(item)));
+}
+
+/**
+ * Wrapper for functions to accept arguments as an array.
+ *
+ * For example:
+ *
+ * ```ts
+ * splat(Math.min)([3, 5, 2]) // => 2
+ * ```
+ *
+ * @param func Function to transform
+ * @return A function that accepts an array of the arguments to `func`, and returns
+ * the output of `func`.
+ */
+export const splat = <I, O>(func: (...a: I[]) => O) =>
+    (args: I[]) => func(...args);

From 2a16a82d32f822eed414e7c81ec396846bf22c11 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 13:45:23 +0200
Subject: [PATCH 431/565] reuse episode entities form

---
 .../episode-agents-form.component.ts            | 17 ++++++++++++-----
 .../episode-form/episode-form.component.html    | 12 ++++++++----
 .../episode-form/episode-form.component.ts      |  4 +++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index 288cc1ec..6b20a770 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy } from "@angular/core";
+import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from "@angular/core";
 import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from "rxjs";
 import { formStatusSubject } from "../../shared/utils";
 import { actionIcons } from "@shared/icons";
@@ -25,7 +25,9 @@ type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
     templateUrl: "./episode-agents-form.component.html",
     styleUrls: ["./episode-agents-form.component.scss"],
 })
-export class EpisodeAgentsFormComponent implements OnDestroy {
+export class EpisodeAgentsFormComponent implements OnChanges, OnDestroy {
+    @Input() entityType: Entity = Entity.Agent;
+
     data$: Observable<DataEntryEpisodeEntitiesQuery>;
 
     linkedEntities$: Observable<{ id: string }[]>;
@@ -35,8 +37,7 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
     removeEntity$ = new Subject<string>();
     actionIcons = actionIcons;
     status$ = formStatusSubject();
-    formName = 'agents';
-    entityType = Entity.Agent;
+    formName = crypto.randomUUID();
 
     private mutationObserver: Partial<Observer<MutationResult>> = {
         next: this.onSuccess.bind(this),
@@ -49,7 +50,6 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
         private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
     ) {
-        this.formService.attachForm(this.formName, this.status$);
         this.data$ = this.formService.id$.pipe(
             switchMap(id => this.query.watch({ id }).valueChanges),
             map(result => result.data),
@@ -99,6 +99,13 @@ export class EpisodeAgentsFormComponent implements OnDestroy {
         return `add-${this.entityType}-dropdown-trigger`;
     }
 
+    ngOnChanges(changes: SimpleChanges): void {
+        if (changes['entityType']) {
+
+            this.formService.attachForm(this.formName, this.status$);
+        }
+    }
+
     ngOnDestroy(): void {
         this.status$.complete();
         this.addEntity$.complete();
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 348cf041..b391eb3e 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -21,13 +21,17 @@ <h2 class="subform-header">Contents</h2>
 <lc-episode-contents-form />
 
 <h2 class="subform-header">Agents</h2>
-<lc-episode-agents-form />
+<lc-episode-agents-form [entityType]="Entity.Agent" />
 
 <h2 class="subform-header">Locations</h2>
-<lc-episode-locations-form />
+<lc-episode-agents-form [entityType]="Entity.Space" />
+
+<h2 class="subform-header">Letters</h2>
+<lc-episode-agents-form [entityType]="Entity.Letter" />
+
+<h2 class="subform-header">Gifts</h2>
+<lc-episode-agents-form [entityType]="Entity.Gift" />
 
-<h2 class="subform-header">Objects</h2>
-<lc-episode-objects-form />
 
 <ng-template #loading>
     <div class="spinner-border" role="status">
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 58d65068..c9b1a44b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -1,7 +1,7 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntryEpisodeFormGQL } from "generated/graphql";
+import { DataEntryEpisodeFormGQL, Entity } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
 import { FormService } from "../shared/form.service";
 
@@ -12,6 +12,8 @@ import { FormService } from "../shared/form.service";
     providers: [FormService],
 })
 export class EpisodeFormComponent {
+    Entity = Entity;
+
     private id$ = this.route.params.pipe(map((params) => params["id"]));
 
     public episode$ = this.id$.pipe(

From df2b4ffb75d3a2865d89a9658002d63bebfba895 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 13:48:36 +0200
Subject: [PATCH 432/565] add test for episode letter query

---
 backend/conftest.py                       |  3 ++-
 backend/event/tests/test_event_queries.py | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/backend/conftest.py b/backend/conftest.py
index 2af3a8fb..b9f3e746 100644
--- a/backend/conftest.py
+++ b/backend/conftest.py
@@ -114,13 +114,14 @@ def space_description(db, source):
 
 
 @pytest.fixture()
-def episode(db, source, agent_description, agent_description_2):
+def episode(db, source, agent_description, agent_description_2, letter_description):
     event = Episode.objects.create(
         name="Bert writes a letter",
         source=source,
     )
     event.agents.add(agent_description)
     event.agents.add(agent_description_2)
+    event.letters.add(letter_description)
     return event
 
 
diff --git a/backend/event/tests/test_event_queries.py b/backend/event/tests/test_event_queries.py
index 5748b162..96033d86 100644
--- a/backend/event/tests/test_event_queries.py
+++ b/backend/event/tests/test_event_queries.py
@@ -18,3 +18,25 @@ def test_episode_entity_link_query(graphql_client, episode, agent_description):
     assert (
         result["data"]["episodeEntityLink"]["entity"]["name"] == agent_description.name
     )
+
+
+def test_episode_entity_link_query_letter(graphql_client, episode, letter_description):
+    result = graphql_client.execute(
+        f"""
+        query TestQuery {{
+            episodeEntityLink(
+                episode: "{episode.id}",
+                entity: "{letter_description.id}",
+                entityType: LETTER
+            ) {{
+                id
+                episode {{ name }}
+                entity {{ name }}
+            }}
+        }}
+        """
+    )
+    assert result["data"]["episodeEntityLink"]["episode"]["name"] == episode.name
+    assert (
+        result["data"]["episodeEntityLink"]["entity"]["name"] == letter_description.name
+    )

From 1e9cf6b02cb884611c3e25e6f1c76824409c721c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 13:53:01 +0200
Subject: [PATCH 433/565] remove unused query

---
 backend/event/queries.py | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/backend/event/queries.py b/backend/event/queries.py
index 7948cf58..a8a63ebc 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -1,9 +1,8 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
-from event.models import Episode, EpisodeCategory, EpisodeEntity, EpisodeAgent
+from event.models import Episode, EpisodeCategory, EpisodeEntity
 from event.types.EpisodeCategoryType import EpisodeCategoryType
 from event.types.EpisodeType import EpisodeType
-from event.types.EpisodeAgentType import EpisodeAgentType
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 from core.types.entity import Entity
 from core.entity_models import ENTITY_MODELS
@@ -13,9 +12,6 @@ class EventQueries(ObjectType):
     episode = Field(EpisodeType, id=ID(required=True))
     episodes = List(NonNull(EpisodeType), required=True, source_id=ID())
     episode_categories = List(NonNull(EpisodeCategoryType), required=True)
-    episode_agent_link = Field(
-        EpisodeAgentType, agent=ID(required=True), episode=ID(required=True)
-    )
     episode_entity_link = Field(
         EpisodeEntityLink,
         entity=ID(required=True),
@@ -46,20 +42,6 @@ def resolve_episode_categories(
     ) -> QuerySet[EpisodeCategory]:
         return EpisodeCategoryType.get_queryset(EpisodeCategory.objects, info).all()
 
-    @staticmethod
-    def resolve_episode_agent_link(
-        parent: None,
-        info: ResolveInfo,
-        agent: str,
-        episode: str,
-    ) -> EpisodeAgent | None:
-        try:
-            return EpisodeAgentType.get_queryset(EpisodeAgent.objects, info).get(
-                agent__id=agent, episode__id=episode
-            )
-        except EpisodeAgent.DoesNotExist:
-            return None
-
     @staticmethod
     def resolve_episode_entity_link(
         parent: None,

From 6e535ba01e672d789c60faa976c021af77f175bc Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 13:54:37 +0200
Subject: [PATCH 434/565] fix interface resolving, add episodes to entity types

---
 backend/event/types/EpisodeAgentType.py       |  3 +--
 backend/event/types/EpisodeGiftType.py        | 18 +++++++---------
 backend/event/types/EpisodeLetterType.py      | 21 ++++++++-----------
 backend/event/types/EpisodeSpaceType.py       | 20 +++++++-----------
 backend/graphql_app/schema.py                 |  2 +-
 backend/letter/types/GiftDescriptionType.py   | 10 +++++++++
 backend/letter/types/LetterDescriptionType.py | 11 +++++++++-
 backend/space/types/SpaceDescriptionType.py   | 11 +++++++++-
 8 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
index 7748b6c4..6e7a8ce2 100644
--- a/backend/event/types/EpisodeAgentType.py
+++ b/backend/event/types/EpisodeAgentType.py
@@ -1,10 +1,9 @@
 from graphene import NonNull
 from graphene_django import DjangoObjectType
-from core.types.DescriptionFieldType import DescriptionFieldType
 
+from core.types.DescriptionFieldType import DescriptionFieldType
 from event.models import EpisodeAgent
 from core.types.entity import Entity, EntityInterface
-
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 from core.types.DescriptionFieldType import SourceMentionEnum
 
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
index 4a37709f..6b8f2fb2 100644
--- a/backend/event/types/EpisodeGiftType.py
+++ b/backend/event/types/EpisodeGiftType.py
@@ -1,13 +1,17 @@
-from graphene import ResolveInfo
+from graphene import NonNull
 from graphene_django import DjangoObjectType
-from core.types.DescriptionFieldType import DescriptionFieldType
-from django.db.models import QuerySet
 
+from core.types.entity import Entity, EntityInterface
+from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
 from event.models import EpisodeGift
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 
 class EpisodeGiftType(DescriptionFieldType, DjangoObjectType):
+    entity = NonNull(EntityInterface)
+    entity_type = NonNull(Entity)
+    source_mention = NonNull(SourceMentionEnum)
+
     class Meta:
         model = EpisodeGift
         fields = [
@@ -16,11 +20,3 @@ class Meta:
             "gift",
         ] + DescriptionFieldType.fields()
         interfaces = (EpisodeEntityLink,)
-
-    @classmethod
-    def get_queryset(
-        cls,
-        queryset: QuerySet[EpisodeGift],
-        info: ResolveInfo,
-    ) -> QuerySet[EpisodeGift]:
-        return queryset.all()
diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
index cf4f2363..984ed70c 100644
--- a/backend/event/types/EpisodeLetterType.py
+++ b/backend/event/types/EpisodeLetterType.py
@@ -1,26 +1,23 @@
-from graphene import ResolveInfo
+from graphene import NonNull
 from graphene_django import DjangoObjectType
-from core.types.DescriptionFieldType import DescriptionFieldType
-from django.db.models import QuerySet
 
+from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
+from core.types.entity import Entity, EntityInterface
 from event.models import EpisodeLetter
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
-
 class EpisodeLetterType(DescriptionFieldType, DjangoObjectType):
+    entity = NonNull(EntityInterface)
+    entity_type = NonNull(Entity)
+    source_mention = NonNull(SourceMentionEnum)
+
     class Meta:
         model = EpisodeLetter
         fields = [
             "id",
             "episode",
             "letter",
+            "entity",
+            "entity_type",
         ] + DescriptionFieldType.fields()
         interfaces = (EpisodeEntityLink,)
-
-    @classmethod
-    def get_queryset(
-        cls,
-        queryset: QuerySet[EpisodeLetter],
-        info: ResolveInfo,
-    ) -> QuerySet[EpisodeLetter]:
-        return queryset.all()
diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
index 5a2a1f7b..ab869237 100644
--- a/backend/event/types/EpisodeSpaceType.py
+++ b/backend/event/types/EpisodeSpaceType.py
@@ -1,12 +1,16 @@
-from graphene import ResolveInfo
+from graphene import NonNull
 from graphene_django import DjangoObjectType
-from core.types.DescriptionFieldType import DescriptionFieldType
-from django.db.models import QuerySet
 
+from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
+from core.types.entity import Entity, EntityInterface
 from event.models import EpisodeSpace
-from event.types import EpisodeEntityLink
+from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 class EpisodeSpaceType(DescriptionFieldType, DjangoObjectType):
+    entity = NonNull(EntityInterface)
+    entity_type = NonNull(Entity)
+    source_mention = NonNull(SourceMentionEnum)
+
     class Meta:
         model = EpisodeSpace
         fields = [
@@ -15,11 +19,3 @@ class Meta:
             "space",
         ] + DescriptionFieldType.fields()
         interfaces = (EpisodeEntityLink,)
-
-    @classmethod
-    def get_queryset(
-        cls,
-        queryset: QuerySet[EpisodeSpace],
-        info: ResolveInfo,
-    ) -> QuerySet[EpisodeSpace]:
-        return queryset.all()
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 1e711101..ce7afbfb 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -37,9 +37,9 @@
 class Query(
     SourceQueries,
     PersonQueries,
-    EventQueries,
     LetterQueries,
     SpaceQueries,
+    EventQueries,
     UserQueries,
     ObjectType,
 ):
diff --git a/backend/letter/types/GiftDescriptionType.py b/backend/letter/types/GiftDescriptionType.py
index f30816bd..8451d6ec 100644
--- a/backend/letter/types/GiftDescriptionType.py
+++ b/backend/letter/types/GiftDescriptionType.py
@@ -7,18 +7,22 @@
 from letter.types.GiftDescriptionCategoryType import GiftDescriptionCategoryType
 from letter.types.GiftCategoryType import GiftCategoryType
 from core.types.entity import EntityInterface
+from event.types.EpisodeGiftType import EpisodeGiftType
+from event.models import EpisodeGift
 
 class GiftDescriptionType(EntityDescriptionType, DjangoObjectType):
     # Direct access to foreign key
     categories = List(NonNull(GiftCategoryType), required=True)
     # Through model
     categorisations = List(NonNull(GiftDescriptionCategoryType), required=True)
+    episodes = List(NonNull(EpisodeGiftType), required=True)
 
     class Meta:
         model = GiftDescription
         fields = [
             "id",
             "categories",
+            "episodes",
         ] + EntityDescriptionType.fields()
         interfaces = (EntityInterface,)
 
@@ -39,3 +43,9 @@ def resolve_categorisations(
         parent: GiftDescription, info: ResolveInfo
     ) -> QuerySet[GiftDescriptionCategory]:
         return GiftDescriptionCategory.objects.filter(gift=parent)
+
+    @staticmethod
+    def resolve_episodes(
+        parent: GiftDescription, info: ResolveInfo
+    ) -> QuerySet[EpisodeGift]:
+        return EpisodeGift.objects.filter(gift=parent)
diff --git a/backend/letter/types/LetterDescriptionType.py b/backend/letter/types/LetterDescriptionType.py
index d95b20bc..f1e6878a 100644
--- a/backend/letter/types/LetterDescriptionType.py
+++ b/backend/letter/types/LetterDescriptionType.py
@@ -7,19 +7,22 @@
 from letter.types.LetterCategoryType import LetterCategoryType
 from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
 from core.types.entity import EntityInterface
-
+from event.models import EpisodeLetter
+from event.types.EpisodeLetterType import EpisodeLetterType
 
 class LetterDescriptionType(EntityDescriptionType, DjangoObjectType):
     # Direct access to foreign key
     categories = List(NonNull(LetterCategoryType), required=True)
     # Through model
     categorisations = List(NonNull(LetterDescriptionCategoryType), required=True)
+    episodes = List(NonNull(EpisodeLetterType), required=True)
 
     class Meta:
         model = LetterDescription
         fields = [
             "id",
             "categories",
+            "episodes",
         ] + EntityDescriptionType.fields()
         interfaces = (EntityInterface,)
 
@@ -40,3 +43,9 @@ def resolve_categorisations(
         parent: LetterDescription, info: ResolveInfo
     ) -> QuerySet[LetterDescriptionCategory]:
         return LetterDescriptionCategory.objects.filter(letter=parent)
+
+    @staticmethod
+    def resolve_episodes(
+        parent: LetterDescription, info: ResolveInfo
+    ) -> QuerySet[EpisodeLetter]:
+        return EpisodeLetter.objects.filter(letter=parent)
diff --git a/backend/space/types/SpaceDescriptionType.py b/backend/space/types/SpaceDescriptionType.py
index c6643440..eebc53f2 100644
--- a/backend/space/types/SpaceDescriptionType.py
+++ b/backend/space/types/SpaceDescriptionType.py
@@ -19,7 +19,8 @@
 from space.types.SettlementFieldType import SettlementFieldType
 from space.types.StructureFieldType import StructureFieldType
 from core.types.entity import EntityInterface
-
+from event.types.EpisodeSpaceType import EpisodeSpaceType
+from event.models import EpisodeSpace
 
 class SpaceDescriptionType(EntityDescriptionType, DjangoObjectType):
     regions = List(NonNull(RegionType), required=True)
@@ -29,6 +30,7 @@ class SpaceDescriptionType(EntityDescriptionType, DjangoObjectType):
     region_fields = List(NonNull(RegionFieldType), required=True)
     settlement_fields = List(NonNull(SettlementFieldType), required=True)
     structure_fields = List(NonNull(StructureFieldType), required=True)
+    episodes = List(NonNull(EpisodeSpaceType), required=True)
 
     class Meta:
         model = SpaceDescription
@@ -37,6 +39,7 @@ class Meta:
             "regions",
             "settlements",
             "structures",
+            "episodes",
         ] + EntityDescriptionType.fields()
         interfaces = (EntityInterface,)
 
@@ -87,3 +90,9 @@ def resolve_structure_fields(
         return StructureFieldType.get_queryset(StructureField.objects, info).filter(
             space=parent
         )
+
+    @staticmethod
+    def resolve_episodes(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> QuerySet[EpisodeSpace]:
+        return EpisodeSpace.objects.filter(space=parent)

From 5de95601449e698768423860625c8a3d4fef2c56 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 15:28:12 +0200
Subject: [PATCH 435/565] update graphql types

---
 frontend/generated/graphql.ts     | 81 ++++++++++++++++++++++++++++---
 frontend/generated/schema.graphql | 76 ++++++++++++++++++++++++++++-
 2 files changed, 148 insertions(+), 9 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 1f54a3f9..3bbaeb94 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -224,6 +224,45 @@ export type EpisodeEntityLink = {
   sourceMention: SourceMention;
 };
 
+export type EpisodeGiftType = EpisodeEntityLink & {
+  __typename?: 'EpisodeGiftType';
+  /** How certain are you of this value? */
+  certainty: EventEpisodeGiftCertaintyChoices;
+  entity: EntityInterface;
+  entityType: Entity;
+  episode: EpisodeType;
+  gift: GiftDescriptionType;
+  id: Scalars['ID']['output'];
+  note?: Maybe<Scalars['String']['output']>;
+  sourceMention: SourceMention;
+};
+
+export type EpisodeLetterType = EpisodeEntityLink & {
+  __typename?: 'EpisodeLetterType';
+  /** How certain are you of this value? */
+  certainty: EventEpisodeLetterCertaintyChoices;
+  entity: EntityInterface;
+  entityType: Entity;
+  episode: EpisodeType;
+  id: Scalars['ID']['output'];
+  letter: LetterDescriptionType;
+  note?: Maybe<Scalars['String']['output']>;
+  sourceMention: SourceMention;
+};
+
+export type EpisodeSpaceType = EpisodeEntityLink & {
+  __typename?: 'EpisodeSpaceType';
+  /** How certain are you of this value? */
+  certainty: EventEpisodeSpaceCertaintyChoices;
+  entity: EntityInterface;
+  entityType: Entity;
+  episode: EpisodeType;
+  id: Scalars['ID']['output'];
+  note?: Maybe<Scalars['String']['output']>;
+  sourceMention: SourceMention;
+  space: SpaceDescriptionType;
+};
+
 export type EpisodeType = {
   __typename?: 'EpisodeType';
   /** agents involved in this episode */
@@ -266,6 +305,26 @@ export enum EventEpisodeAgentCertaintyChoices {
   A_2 = 'A_2'
 }
 
+/** An enumeration. */
+export enum EventEpisodeGiftCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
+/** An enumeration. */
+export enum EventEpisodeLetterCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
   /** directly mentioned */
@@ -274,6 +333,16 @@ export enum EventEpisodeSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
+/** An enumeration. */
+export enum EventEpisodeSpaceCertaintyChoices {
+  /** uncertain */
+  A_0 = 'A_0',
+  /** somewhat certain */
+  A_1 = 'A_1',
+  /** certain */
+  A_2 = 'A_2'
+}
+
 /** An enumeration. */
 export enum Gender {
   Female = 'FEMALE',
@@ -323,6 +392,7 @@ export type GiftDescriptionType = EntityInterface & {
   description?: Maybe<Scalars['String']['output']>;
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
+  episodes: Array<EpisodeGiftType>;
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
@@ -385,6 +455,7 @@ export type LetterDescriptionType = EntityInterface & {
   description?: Maybe<Scalars['String']['output']>;
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
+  episodes: Array<EpisodeLetterType>;
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
@@ -682,7 +753,6 @@ export type Query = {
   agentDescription?: Maybe<AgentDescriptionType>;
   agentDescriptions: Array<AgentDescriptionType>;
   episode?: Maybe<EpisodeType>;
-  episodeAgentLink?: Maybe<EpisodeAgentType>;
   episodeCategories: Array<EpisodeCategoryType>;
   episodeEntityLink?: Maybe<EpisodeEntityLink>;
   episodes: Array<EpisodeType>;
@@ -716,12 +786,6 @@ export type QueryEpisodeArgs = {
 };
 
 
-export type QueryEpisodeAgentLinkArgs = {
-  agent: Scalars['ID']['input'];
-  episode: Scalars['ID']['input'];
-};
-
-
 export type QueryEpisodeEntityLinkArgs = {
   entity: Scalars['ID']['input'];
   entityType: Entity;
@@ -892,6 +956,7 @@ export type SpaceDescriptionType = EntityInterface & {
   description?: Maybe<Scalars['String']['output']>;
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
+  episodes: Array<EpisodeSpaceType>;
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
@@ -1341,7 +1406,7 @@ export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeAgentType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | null };
+export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeAgentType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeGiftType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeLetterType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeSpaceType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeEntityLinkMutationVariables = Exact<{
   input: UpdateEpisodeEntityLinkInput;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index ab8c1727..54d80c88 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -205,6 +205,42 @@ interface EpisodeEntityLink {
   sourceMention: SourceMention!
 }
 
+type EpisodeGiftType implements EpisodeEntityLink {
+  """How certain are you of this value?"""
+  certainty: EventEpisodeGiftCertaintyChoices!
+  entity: EntityInterface!
+  entityType: Entity!
+  episode: EpisodeType!
+  gift: GiftDescriptionType!
+  id: ID!
+  note: String
+  sourceMention: SourceMention!
+}
+
+type EpisodeLetterType implements EpisodeEntityLink {
+  """How certain are you of this value?"""
+  certainty: EventEpisodeLetterCertaintyChoices!
+  entity: EntityInterface!
+  entityType: Entity!
+  episode: EpisodeType!
+  id: ID!
+  letter: LetterDescriptionType!
+  note: String
+  sourceMention: SourceMention!
+}
+
+type EpisodeSpaceType implements EpisodeEntityLink {
+  """How certain are you of this value?"""
+  certainty: EventEpisodeSpaceCertaintyChoices!
+  entity: EntityInterface!
+  entityType: Entity!
+  episode: EpisodeType!
+  id: ID!
+  note: String
+  sourceMention: SourceMention!
+  space: SpaceDescriptionType!
+}
+
 type EpisodeType {
   """agents involved in this episode"""
   agents: [AgentDescriptionType!]!
@@ -261,6 +297,30 @@ enum EventEpisodeAgentCertaintyChoices {
   A_2
 }
 
+"""An enumeration."""
+enum EventEpisodeGiftCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
+"""An enumeration."""
+enum EventEpisodeLetterCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
 """An enumeration."""
 enum EventEpisodeSourceMentionChoices {
   """directly mentioned"""
@@ -270,6 +330,18 @@ enum EventEpisodeSourceMentionChoices {
   IMPLIED
 }
 
+"""An enumeration."""
+enum EventEpisodeSpaceCertaintyChoices {
+  """uncertain"""
+  A_0
+
+  """somewhat certain"""
+  A_1
+
+  """certain"""
+  A_2
+}
+
 """An enumeration."""
 enum Gender {
   FEMALE
@@ -322,6 +394,7 @@ type GiftDescriptionType implements EntityInterface {
   Relevant (Latin) terminology used to describe this entity in the source text
   """
   designators: [String!]!
+  episodes: [EpisodeGiftType!]!
   id: ID!
   name: String!
 
@@ -393,6 +466,7 @@ type LetterDescriptionType implements EntityInterface {
   Relevant (Latin) terminology used to describe this entity in the source text
   """
   designators: [String!]!
+  episodes: [EpisodeLetterType!]!
   id: ID!
   name: String!
 
@@ -628,7 +702,6 @@ type Query {
   agentDescription(id: ID!): AgentDescriptionType
   agentDescriptions(episodeId: ID, sourceId: ID): [AgentDescriptionType!]!
   episode(id: ID!): EpisodeType
-  episodeAgentLink(agent: ID!, episode: ID!): EpisodeAgentType
   episodeCategories: [EpisodeCategoryType!]!
   episodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): EpisodeEntityLink
   episodes(sourceId: ID): [EpisodeType!]!
@@ -787,6 +860,7 @@ type SpaceDescriptionType implements EntityInterface {
   Relevant (Latin) terminology used to describe this entity in the source text
   """
   designators: [String!]!
+  episodes: [EpisodeSpaceType!]!
   id: ID!
   name: String!
 

From bf7f40afd045b789da98529bd5dba8cbc58fce10 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 15:33:58 +0200
Subject: [PATCH 436/565] add message for no linked entities

---
 .../episode-agents-form.component.html        | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index 84c72376..9369b9a7 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -1,19 +1,26 @@
 <ng-container *ngIf="data$ | async as data">
     <ng-container *ngIf="data.episode">
-        <p>The following {{entityName}}s are involved in this episode:</p>
-        <ul class="list-unstyled vstack gap-4">
-            <li *ngFor="let entity of linkedEntities$ | async">
-                <lc-episode-link-form [entityType]="entityType" linkTo="entity"
-                        [entityID]="entity.id"
-                        [episodeID]="data.episode.id">
-                    <button removeControl class="btn btn-danger"
-                        [attr.aria-label]="'remove ' + entityName"
-                        (click)="removeEntity$.next(entity.id)">
-                        <lc-icon [icon]="actionIcons.remove" />
-                    </button>
-                </lc-episode-link-form>
-            </li>
-        </ul>
+        <ng-container *ngIf="(linkedEntities$ | async)?.length; else noEntities">
+            <p>The following {{entityName}}s are involved in this episode:</p>
+            <ul class="list-unstyled vstack gap-4">
+                <li *ngFor="let entity of linkedEntities$ | async">
+                    <lc-episode-link-form [entityType]="entityType" linkTo="entity"
+                            [entityID]="entity.id"
+                            [episodeID]="data.episode.id">
+                        <button removeControl class="btn btn-danger"
+                            [attr.aria-label]="'remove ' + entityName"
+                            (click)="removeEntity$.next(entity.id)">
+                            <lc-icon [icon]="actionIcons.remove" />
+                        </button>
+                    </lc-episode-link-form>
+                </li>
+            </ul>
+        </ng-container>
+        <ng-template #noEntities>
+            <p>
+                No {{entityName}}s have been added to this episode.
+            </p>
+        </ng-template>
     </ng-container>
 </ng-container>
 

From 5ac70c132e6694404c1c530db3ba9e80d23034e7 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 15:42:32 +0200
Subject: [PATCH 437/565] correct text in episode link form

---
 .../episode-agents-form.component.ts                   | 10 ++--------
 .../episode-link-form/episode-link-form.component.html |  2 +-
 .../episode-link-form/episode-link-form.component.ts   |  6 +++++-
 frontend/src/app/data-entry/shared/utils.ts            | 10 +++++++++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index 6b20a770..de3b5a9e 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from "@angular/core";
 import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from "rxjs";
-import { formStatusSubject } from "../../shared/utils";
+import { entityTypeNames, formStatusSubject } from "../../shared/utils";
 import { actionIcons } from "@shared/icons";
 import { MutationResult } from "apollo-angular";
 import { FormService } from "../../shared/form.service";
@@ -75,13 +75,7 @@ export class EpisodeAgentsFormComponent implements OnChanges, OnDestroy {
 
     /** name of the entity type in natural language */
     get entityName(): string {
-        const names = {
-            [Entity.Agent]: 'agent',
-            [Entity.Gift]: 'gift',
-            [Entity.Letter]: 'letter',
-            [Entity.Space]: 'location',
-        };
-        return names[this.entityType];
+        return entityTypeNames[this.entityType];
     }
 
     /** property used for the entity relationship in graphQL data */
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 31b13e8d..f264a50c 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -15,7 +15,7 @@
     <form cardBody [formGroup]="form">
         <div class="mb-3">
             <label [htmlFor]="sourceMentionInput" class="form-label">
-                How is this agent's involvement in the episode represented?
+                How is this {{entityName}}'s involvement in the episode represented?
             </label>
             <select #sourceMentionInput class="form-select"
                 [formControl]="form.controls.sourceMention">
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 45572012..e50f00dd 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -14,7 +14,7 @@ import {
 } from 'generated/graphql';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup } from '@angular/forms';
-import { formStatusSubject, sourceMentionSelectOptions } from '../utils';
+import { entityTypeNames, formStatusSubject, sourceMentionSelectOptions } from '../utils';
 import _ from 'underscore';
 import { MutationResult } from 'apollo-angular';
 import { FormService } from '../form.service';
@@ -84,6 +84,10 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         ).subscribe(this.onMutationResult.bind(this));
     }
 
+    get entityName(): string {
+        return entityTypeNames[this.entityType];
+    }
+
     ngOnChanges(changes: SimpleChanges): void {
         if (changes['entityID'] || changes['episodeID'] || changes['entityType']) {
             this.link$.next({
diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
index 9fbbb970..6289bc5f 100644
--- a/frontend/src/app/data-entry/shared/utils.ts
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -1,4 +1,4 @@
-import { SourceMention } from "generated/graphql";
+import { Entity, SourceMention } from "generated/graphql";
 import { FormStatus, SelectOptions } from "./types";
 import { BehaviorSubject } from "rxjs";
 import _ from "underscore";
@@ -9,3 +9,11 @@ export const sourceMentionSelectOptions = (): SelectOptions<SourceMention> => [
 ];
 
 export const formStatusSubject = () => new BehaviorSubject<FormStatus>('idle');
+
+/** names of entity types in natural language */
+export const entityTypeNames: Record<Entity, string> = {
+    [Entity.Agent]: 'agent',
+    [Entity.Gift]: 'gift',
+    [Entity.Letter]: 'letter',
+    [Entity.Space]: 'location',
+};

From 203ead79e15c41910e41ec3778d7174a902b68f7 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 16:17:46 +0200
Subject: [PATCH 438/565] generate unique IDs for repeated form elements

---
 .../episode-link-form.component.html          |  6 ++++--
 frontend/src/app/shared/shared.module.ts      |  3 +++
 .../app/shared/unique-id.directive.spec.ts    |  8 ++++++++
 .../src/app/shared/unique-id.directive.ts     | 20 +++++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/app/shared/unique-id.directive.spec.ts
 create mode 100644 frontend/src/app/shared/unique-id.directive.ts

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index f264a50c..9c92f743 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -14,10 +14,11 @@
     <ng-content cardControl select="[removeControl]"></ng-content>
     <form cardBody [formGroup]="form">
         <div class="mb-3">
-            <label [htmlFor]="sourceMentionInput" class="form-label">
+            <label [attr.for]="sourceMentionInput.id" class="form-label">
                 How is this {{entityName}}'s involvement in the episode represented?
             </label>
             <select #sourceMentionInput class="form-select"
+                lcUniqueID
                 [formControl]="form.controls.sourceMention">
                 <option *ngFor="let option of sourceMentionOptions"
                     [ngValue]="option.value">
@@ -26,8 +27,9 @@
             </select>
         </div>
         <div class="mb-3">
-            <label [htmlFor]="notesInput" class="form-label">Notes</label>
+            <label [attr.for]="notesInput.id" class="form-label">Notes</label>
             <textarea #notesInput class="form-control"
+                lcUniqueID
                 [formControl]="form.controls.note">
             </textarea>
         </div>
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 03a3079d..63f3cf53 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -13,6 +13,7 @@ import { BaseModalComponent } from "./base-modal/base-modal.component";
 import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
 import { ContributorsComponent } from './contributors/contributors.component';
 import { CollapsibleCardComponent } from './collapsible-card/collapsible-card.component';
+import { UniqueIDDirective } from './unique-id.directive';
 
 
 
@@ -25,6 +26,7 @@ import { CollapsibleCardComponent } from './collapsible-card/collapsible-card.co
         ConfirmationModalComponent,
         ContributorsComponent,
         CollapsibleCardComponent,
+        UniqueIDDirective
     ],
     imports: [
         CommonModule,
@@ -47,6 +49,7 @@ import { CollapsibleCardComponent } from './collapsible-card/collapsible-card.co
         ActionButtonGroupComponent,
         ContributorsComponent,
         CollapsibleCardComponent,
+        UniqueIDDirective,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,
diff --git a/frontend/src/app/shared/unique-id.directive.spec.ts b/frontend/src/app/shared/unique-id.directive.spec.ts
new file mode 100644
index 00000000..815019f2
--- /dev/null
+++ b/frontend/src/app/shared/unique-id.directive.spec.ts
@@ -0,0 +1,8 @@
+import { UniqueIDDirective } from './unique-id.directive';
+
+describe('UniqueIdDirective', () => {
+  it('should create an instance', () => {
+    const directive = new UniqueIDDirective();
+    expect(directive).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/shared/unique-id.directive.ts b/frontend/src/app/shared/unique-id.directive.ts
new file mode 100644
index 00000000..bc0d3364
--- /dev/null
+++ b/frontend/src/app/shared/unique-id.directive.ts
@@ -0,0 +1,20 @@
+import { Directive, HostBinding } from '@angular/core';
+
+/**
+ * Generates a unique `id` for the element in the DOM.
+ *
+ * This is especially useful if you want to reuse a component multiple times on a page.
+ *
+ * Example usage:
+ *
+ * ```html
+ * <label [attr.for]="nameInput.id">Name</label>
+ * <input type="text" lcUniqueID #nameInput>
+ * ```
+ */
+@Directive({
+    selector: '[lcUniqueID]'
+})
+export class UniqueIDDirective {
+    @HostBinding('attr.id') id = crypto.randomUUID();
+}

From 05c587ad127809b73b65d86c5a439268bd61ea89 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 16:27:48 +0200
Subject: [PATCH 439/565] fix spec

---
 .../agent-episodes-form.component.spec.ts     | 28 +++++++++++--------
 .../agent-episodes-form.component.ts          |  4 +--
 ...gent-identification-form.component.spec.ts |  1 +
 .../delete-agent.component.spec.ts            |  4 +--
 .../episode-agents-form.component.spec.ts     |  2 ++
 .../episode-agents-form.component.ts          |  4 +--
 .../collapsible-card.component.spec.ts        | 28 +++++++++++--------
 .../app/{data-entry => }/shared/utils.spec.ts | 10 +++++--
 frontend/src/app/shared/utils.ts              |  2 +-
 9 files changed, 50 insertions(+), 33 deletions(-)
 rename frontend/src/app/{data-entry => }/shared/utils.spec.ts (58%)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts
index 800eb107..7239035c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.spec.ts
@@ -1,21 +1,25 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AgentEpisodesFormComponent } from './agent-episodes-form.component';
+import { FormService } from '../../shared/form.service';
+import { SharedTestingModule } from '@shared/shared-testing.module';
 
 describe('AgentEpisodesFormComponent', () => {
-  let component: AgentEpisodesFormComponent;
-  let fixture: ComponentFixture<AgentEpisodesFormComponent>;
+    let component: AgentEpisodesFormComponent;
+    let fixture: ComponentFixture<AgentEpisodesFormComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [AgentEpisodesFormComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [AgentEpisodesFormComponent],
+            providers: [FormService],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(AgentEpisodesFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(AgentEpisodesFormComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 4f30716e..df61debb 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -13,7 +13,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { actionIcons } from '@shared/icons';
 import { FormStatus } from '../../shared/types';
 import { MutationResult } from 'apollo-angular';
-import { differencyBy } from '@shared/utils';
+import { differenceBy } from '@shared/utils';
 
 const REFETCH_QUERIES = ['DataEntryAgentEpisodes'];
 
@@ -114,6 +114,6 @@ export class AgentEpisodesFormComponent implements OnDestroy {
     ): { name: string, id: string }[] {
         const allEpisodes = data.agentDescription?.source.episodes || [];
         const linkedEpisodes = data.agentDescription?.episodes || [];
-        return differencyBy(allEpisodes, linkedEpisodes, 'id');
+        return differenceBy(allEpisodes, linkedEpisodes, 'id');
     }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
index 877736a1..80c9d849 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
@@ -11,6 +11,7 @@ describe('AgentIdentificationFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [AgentIdentificationFormComponent],
+            providers: [FormService],
             imports: [SharedTestingModule],
             providers: [FormService],
         });
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
index 2729fc7d..dca9961f 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.spec.ts
@@ -1,8 +1,8 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DeleteAgentComponent } from './delete-agent.component';
-import { FormService } from '../../shared/form.service';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { FormService } from '../../shared/form.service';
 
 describe('DeleteAgentComponent', () => {
     let component: DeleteAgentComponent;
@@ -11,8 +11,8 @@ describe('DeleteAgentComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [DeleteAgentComponent],
-            imports: [SharedTestingModule],
             providers: [FormService],
+            imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(DeleteAgentComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
index 18ab6a8b..677427de 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeAgentsFormComponent } from "./episode-agents-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("EpisodeAgentsFormComponent", () => {
     let component: EpisodeAgentsFormComponent;
@@ -10,6 +11,7 @@ describe("EpisodeAgentsFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [EpisodeAgentsFormComponent],
+            providers: [FormService],
             imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(EpisodeAgentsFormComponent);
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index de3b5a9e..ed7b120e 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -14,7 +14,7 @@ import {
     Entity
 } from "generated/graphql";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { splat, differencyBy } from "@shared/utils";
+import { splat, differenceBy } from "@shared/utils";
 
 const REFETCH_QUERIES = ['DataEntryEpisodeEntities'];
 
@@ -153,6 +153,6 @@ export class EpisodeAgentsFormComponent implements OnChanges, OnDestroy {
             id: string
         }[] = data.episode?.source[this.entityProperty] || [];
         const linkedEntities = data.episode?.[this.entityProperty] || [];
-        return differencyBy(allEntities, linkedEntities, 'id');
+        return differenceBy(allEntities, linkedEntities, 'id');
     }
 }
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
index 20a04183..98101ccd 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
@@ -1,21 +1,25 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CollapsibleCardComponent } from './collapsible-card.component';
+import { CommonModule } from '@angular/common';
+import { IconComponent } from '@shared/icon/icon.component';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
 describe('CollapsibleCardComponent', () => {
-  let component: CollapsibleCardComponent;
-  let fixture: ComponentFixture<CollapsibleCardComponent>;
+    let component: CollapsibleCardComponent;
+    let fixture: ComponentFixture<CollapsibleCardComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [CollapsibleCardComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [CollapsibleCardComponent, IconComponent],
+            imports: [CommonModule, NgbModule],
+        });
+        fixture = TestBed.createComponent(CollapsibleCardComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(CollapsibleCardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/shared/utils.spec.ts b/frontend/src/app/shared/utils.spec.ts
similarity index 58%
rename from frontend/src/app/data-entry/shared/utils.spec.ts
rename to frontend/src/app/shared/utils.spec.ts
index ed08973b..22f2404b 100644
--- a/frontend/src/app/data-entry/shared/utils.spec.ts
+++ b/frontend/src/app/shared/utils.spec.ts
@@ -1,4 +1,4 @@
-import { differencyBy } from "./utils";
+import { differenceBy, splat } from "./utils";
 
 describe('differenceBy', () => {
     it('should compare lists', () => {
@@ -12,6 +12,12 @@ describe('differenceBy', () => {
             { id: '2' },
             { id: '4' },
         ];
-        expect(differencyBy(a, b, 'id')).toEqual([a[0], a[2]]);
+        expect(differenceBy(a, b, 'id')).toEqual([a[0], a[2]]);
+    });
+});
+
+describe('splat', () => {
+    it('should handle a list of arguments', () => {
+        expect(splat(Math.min)([3, 5, 2])).toBe(2)
     });
 });
diff --git a/frontend/src/app/shared/utils.ts b/frontend/src/app/shared/utils.ts
index 464df3ee..e609ed2c 100644
--- a/frontend/src/app/shared/utils.ts
+++ b/frontend/src/app/shared/utils.ts
@@ -12,7 +12,7 @@ import _ from "underscore";
  * @returns The contents of `list` for which no value in `others` matches the `key`
  * property.
  */
-export const differencyBy = <T extends object>(
+export const differenceBy = <T extends object>(
     list: T[], others: object[], key: string
 ): T[] => {
     const getValue = (obj: object) => _.get(obj, key, undefined);

From b160678afed9a2d1a04926d1c11d1685e32b5207 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 16:29:38 +0200
Subject: [PATCH 440/565] use unique id directive in collapsible card component

---
 .../shared/collapsible-card/collapsible-card.component.html   | 4 ++--
 .../collapsible-card/collapsible-card.component.spec.ts       | 3 ++-
 .../app/shared/collapsible-card/collapsible-card.component.ts | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
index 0abc663e..13cb96c7 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
@@ -5,13 +5,13 @@
         <button class="btn btn-secondary ms-auto"
             ariaLabel="{{ collapsed ? 'show' : 'hide' }} {{contentDescription}}"
             [attr.aria-expanded]="!collapsed"
-            [attr.aria-controls]="bodyID"
+            [attr.aria-controls]="body.id"
             (click)="collapsed = !collapsed">
             <lc-icon [icon]="collapsed ? actionIcons.expand : actionIcons.collapse" />
         </button>
         <ng-content select="[cardControl]" />
     </div>
 </div>
-<div class="card-body" [id]="bodyID" [ngbCollapse]="collapsed">
+<div class="card-body" lcUniqueID #body [ngbCollapse]="collapsed">
     <ng-content select="[cardBody]" />
 </div>
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
index 98101ccd..de5367fc 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
@@ -4,6 +4,7 @@ import { CollapsibleCardComponent } from './collapsible-card.component';
 import { CommonModule } from '@angular/common';
 import { IconComponent } from '@shared/icon/icon.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { UniqueIDDirective } from '@shared/unique-id.directive';
 
 describe('CollapsibleCardComponent', () => {
     let component: CollapsibleCardComponent;
@@ -11,7 +12,7 @@ describe('CollapsibleCardComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [CollapsibleCardComponent, IconComponent],
+            declarations: [CollapsibleCardComponent, IconComponent, UniqueIDDirective],
             imports: [CommonModule, NgbModule],
         });
         fixture = TestBed.createComponent(CollapsibleCardComponent);
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts b/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
index 9f2a6cae..34dd29c6 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
@@ -13,6 +13,5 @@ export class CollapsibleCardComponent {
     collapsed = true;
 
     @HostBinding('class.card') card = true;
-    bodyID = crypto.randomUUID();
     actionIcons = actionIcons;
 }

From 7b6be2db11a3fd42d2d6852fd53eb71db561bf5d Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 17:04:56 +0200
Subject: [PATCH 441/565] focus on dropdown toggle after closing

---
 .../agent-episodes-form/agent-episodes-form.component.html | 3 ++-
 .../episode-agents-form/episode-agents-form.component.html | 7 ++++---
 .../episode-agents-form/episode-agents-form.component.ts   | 6 +-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 77e7e8e1..4e62f33d 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -20,12 +20,13 @@
 <div class="mt-4 mb-4">
     <div ngbDropdown>
         <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
+            #dropdownToggle
             ngbDropdownToggle>
             Add episode
         </button>
         <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
             <button *ngFor="let episode of (availableEpisodes$ | async)"
-                ngbDropdownItem (click)="addEpisode$.next(episode.id)">
+                ngbDropdownItem (click)="addEpisode$.next(episode.id); dropdownToggle.focus()">
                 {{episode.name}}
             </button>
             <button ngbDropdownItem disabled>
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
index 9369b9a7..7d45fa28 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
@@ -27,14 +27,15 @@
 <div class="mt-4 mb-4">
     <div ngbDropdown>
         <button type="button" class="btn btn-primary"
-            [id]="addDropdownTriggerID"
+            #dropdownToggle
+            lcUniqueID
             ngbDropdownToggle>
             Add {{entityName}}
         </button>
         <div ngbDropdownMenu
-            [attr.aria-labelledby]="addDropdownTriggerID">
+            [attr.aria-labelledby]="dropdownToggle.id">
             <button *ngFor="let entity of (availableEntities$ | async)"
-                ngbDropdownItem (click)="addEntity$.next(entity.id)">
+                ngbDropdownItem (click)="addEntity$.next(entity.id); dropdownToggle.focus()">
                 {{entity.name}}
             </button>
             <button ngbDropdownItem disabled>
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
index ed7b120e..c2983e83 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from "@angular/core";
+import { Component, ElementRef, Input, OnChanges, OnDestroy, SimpleChanges, ViewChild } from "@angular/core";
 import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from "rxjs";
 import { entityTypeNames, formStatusSubject } from "../../shared/utils";
 import { actionIcons } from "@shared/icons";
@@ -89,10 +89,6 @@ export class EpisodeAgentsFormComponent implements OnChanges, OnDestroy {
         return keys[this.entityType]
     }
 
-    get addDropdownTriggerID(): string {
-        return `add-${this.entityType}-dropdown-trigger`;
-    }
-
     ngOnChanges(changes: SimpleChanges): void {
         if (changes['entityType']) {
 

From 11d0a6ce6ce37dcce0a70d39d6accf6c678eef6e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 17:22:32 +0200
Subject: [PATCH 442/565] rename EpisodeAgentsComponent ->
 EpisodeEntitiesComponent

---
 frontend/generated/graphql.ts                 | 98 +++++++++----------
 .../episode-entities-form.component.html}     |  0
 .../episode-entities-form.component.scss}     |  0
 .../episode-entities-form.component.spec.ts}  | 12 +--
 .../episode-entities-form.component.ts}       |  8 +-
 .../episode-entities.graphql}                 |  0
 .../episode-form/episode-form.component.html  |  8 +-
 .../episode-form/episode-form.module.ts       |  4 +-
 8 files changed, 65 insertions(+), 65 deletions(-)
 rename frontend/src/app/data-entry/episode-form/{episode-agents-form/episode-agents-form.component.html => episode-entities-form/episode-entities-form.component.html} (100%)
 rename frontend/src/app/data-entry/episode-form/{episode-agents-form/episode-agents-form.component.scss => episode-entities-form/episode-entities-form.component.scss} (100%)
 rename frontend/src/app/data-entry/episode-form/{episode-agents-form/episode-agents-form.component.spec.ts => episode-entities-form/episode-entities-form.component.spec.ts} (58%)
 rename frontend/src/app/data-entry/episode-form/{episode-agents-form/episode-agents-form.component.ts => episode-entities-form/episode-entities-form.component.ts} (95%)
 rename frontend/src/app/data-entry/episode-form/{episode-agents-form/episode-agents.graphql => episode-entities-form/episode-entities.graphql} (100%)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 3bbaeb94..3dc0aca3 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1258,13 +1258,6 @@ export type DataEntryDeleteAgentMutationVariables = Exact<{
 
 export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
 
-export type DataEntryEpisodeEntitiesQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type DataEntryEpisodeEntitiesQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string }> } | null };
-
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1277,6 +1270,13 @@ export type DataEntryEpisodeCategoriesQueryVariables = Exact<{ [key: string]: ne
 
 export type DataEntryEpisodeCategoriesQuery = { __typename?: 'Query', episodeCategories: Array<{ __typename?: 'EpisodeCategoryType', id: string, name: string, description: string }> };
 
+export type DataEntryEpisodeEntitiesQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryEpisodeEntitiesQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string }> } | null };
+
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1680,6 +1680,48 @@ export const DataEntryDeleteAgentDocument = gql`
   export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
     override document = DataEntryDeleteAgentDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryEpisodeContentsDocument = gql`
+    query DataEntryEpisodeContents($id: ID!) {
+  episode(id: $id) {
+    id
+    summary
+    categories {
+      id
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
+    override document = DataEntryEpisodeContentsDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryEpisodeCategoriesDocument = gql`
+    query DataEntryEpisodeCategories {
+  episodeCategories {
+    id
+    name
+    description
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
+    override document = DataEntryEpisodeCategoriesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1729,48 +1771,6 @@ export const DataEntryEpisodeEntitiesDocument = gql`
   export class DataEntryEpisodeEntitiesGQL extends Apollo.Query<DataEntryEpisodeEntitiesQuery, DataEntryEpisodeEntitiesQueryVariables> {
     override document = DataEntryEpisodeEntitiesDocument;
     
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const DataEntryEpisodeContentsDocument = gql`
-    query DataEntryEpisodeContents($id: ID!) {
-  episode(id: $id) {
-    id
-    summary
-    categories {
-      id
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
-    override document = DataEntryEpisodeContentsDocument;
-    
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const DataEntryEpisodeCategoriesDocument = gql`
-    query DataEntryEpisodeCategories {
-  episodeCategories {
-    id
-    name
-    description
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
-    override document = DataEntryEpisodeCategoriesDocument;
-    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
similarity index 100%
rename from frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.html
rename to frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.scss
similarity index 100%
rename from frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.scss
rename to frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.scss
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.spec.ts
similarity index 58%
rename from frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
rename to frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.spec.ts
index 677427de..718a3d9d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { EpisodeAgentsFormComponent } from "./episode-agents-form.component";
+import { EpisodeEntitiesFormComponent } from "./episode-entities-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
 import { FormService } from "../../shared/form.service";
 
-describe("EpisodeAgentsFormComponent", () => {
-    let component: EpisodeAgentsFormComponent;
-    let fixture: ComponentFixture<EpisodeAgentsFormComponent>;
+describe("EpisodeEntitiesFormComponent", () => {
+    let component: EpisodeEntitiesFormComponent;
+    let fixture: ComponentFixture<EpisodeEntitiesFormComponent>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [EpisodeAgentsFormComponent],
+            declarations: [EpisodeEntitiesFormComponent],
             providers: [FormService],
             imports: [SharedTestingModule],
         });
-        fixture = TestBed.createComponent(EpisodeAgentsFormComponent);
+        fixture = TestBed.createComponent(EpisodeEntitiesFormComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
     });
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
similarity index 95%
rename from frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
rename to frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index c2983e83..13943e3d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -21,11 +21,11 @@ const REFETCH_QUERIES = ['DataEntryEpisodeEntities'];
 type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
 
 @Component({
-    selector: "lc-episode-agents-form",
-    templateUrl: "./episode-agents-form.component.html",
-    styleUrls: ["./episode-agents-form.component.scss"],
+    selector: "lc-episode-entities-form",
+    templateUrl: "./episode-entities-form.component.html",
+    styleUrls: ["./episode-entities-form.component.scss"],
 })
-export class EpisodeAgentsFormComponent implements OnChanges, OnDestroy {
+export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
     @Input() entityType: Entity = Entity.Agent;
 
     data$: Observable<DataEntryEpisodeEntitiesQuery>;
diff --git a/frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
similarity index 100%
rename from frontend/src/app/data-entry/episode-form/episode-agents-form/episode-agents.graphql
rename to frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index b391eb3e..15f37365 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -21,16 +21,16 @@ <h2 class="subform-header">Contents</h2>
 <lc-episode-contents-form />
 
 <h2 class="subform-header">Agents</h2>
-<lc-episode-agents-form [entityType]="Entity.Agent" />
+<lc-episode-entities-form [entityType]="Entity.Agent" />
 
 <h2 class="subform-header">Locations</h2>
-<lc-episode-agents-form [entityType]="Entity.Space" />
+<lc-episode-entities-form [entityType]="Entity.Space" />
 
 <h2 class="subform-header">Letters</h2>
-<lc-episode-agents-form [entityType]="Entity.Letter" />
+<lc-episode-entities-form [entityType]="Entity.Letter" />
 
 <h2 class="subform-header">Gifts</h2>
-<lc-episode-agents-form [entityType]="Entity.Gift" />
+<lc-episode-entities-form [entityType]="Entity.Gift" />
 
 
 <ng-template #loading>
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.module.ts b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
index 2b232e3b..3faa4c4a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.module.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
@@ -3,7 +3,7 @@ import { CommonModule } from "@angular/common";
 import { EpisodeIdentificationFormComponent } from "./episode-identification-form/episode-identification-form.component";
 import { EpisodeSourceTextFormComponent } from "./episode-source-text-form/episode-source-text-form.component";
 import { EpisodeContentsFormComponent } from "./episode-contents-form/episode-contents-form.component";
-import { EpisodeAgentsFormComponent } from "./episode-agents-form/episode-agents-form.component";
+import { EpisodeEntitiesFormComponent } from "./episode-entities-form/episode-entities-form.component";
 import { EpisodeLocationsFormComponent } from "./episode-locations-form/episode-locations-form.component";
 import { EpisodeObjectsFormComponent } from "./episode-objects-form/episode-objects-form.component";
 import { SharedModule } from "@shared/shared.module";
@@ -17,7 +17,7 @@ import { NewEpisodeFormComponent } from "./new-episode-form/new-episode-form.com
         EpisodeIdentificationFormComponent,
         EpisodeSourceTextFormComponent,
         EpisodeContentsFormComponent,
-        EpisodeAgentsFormComponent,
+        EpisodeEntitiesFormComponent,
         EpisodeLocationsFormComponent,
         EpisodeObjectsFormComponent,
         NewEpisodeFormComponent,

From 3a1e6cc178b3c43db279a3082c8e12aab353a5fa Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 17:24:05 +0200
Subject: [PATCH 443/565] remove unused components

---
 .../episode-form/episode-form.module.ts       |  6 +----
 .../episode-locations-form.component.html     |  1 -
 .../episode-locations-form.component.scss     |  0
 .../episode-locations-form.component.spec.ts  | 23 -------------------
 .../episode-locations-form.component.ts       |  8 -------
 .../episode-objects-form.component.html       |  1 -
 .../episode-objects-form.component.scss       |  0
 .../episode-objects-form.component.spec.ts    | 23 -------------------
 .../episode-objects-form.component.ts         |  8 -------
 9 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.scss
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.scss
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
 delete mode 100644 frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.module.ts b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
index 3faa4c4a..bda110e1 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.module.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
@@ -4,8 +4,6 @@ import { EpisodeIdentificationFormComponent } from "./episode-identification-for
 import { EpisodeSourceTextFormComponent } from "./episode-source-text-form/episode-source-text-form.component";
 import { EpisodeContentsFormComponent } from "./episode-contents-form/episode-contents-form.component";
 import { EpisodeEntitiesFormComponent } from "./episode-entities-form/episode-entities-form.component";
-import { EpisodeLocationsFormComponent } from "./episode-locations-form/episode-locations-form.component";
-import { EpisodeObjectsFormComponent } from "./episode-objects-form/episode-objects-form.component";
 import { SharedModule } from "@shared/shared.module";
 import { EpisodeFormComponent } from "./episode-form.component";
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
@@ -18,11 +16,9 @@ import { NewEpisodeFormComponent } from "./new-episode-form/new-episode-form.com
         EpisodeSourceTextFormComponent,
         EpisodeContentsFormComponent,
         EpisodeEntitiesFormComponent,
-        EpisodeLocationsFormComponent,
-        EpisodeObjectsFormComponent,
         NewEpisodeFormComponent,
     ],
     imports: [CommonModule, SharedModule, DataEntrySharedModule],
-    exports: [NewEpisodeFormComponent],
+    exports: [NewEpisodeFormComponent, EpisodeFormComponent],
 })
 export class EpisodeFormModule {}
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
deleted file mode 100644
index ce59c301..00000000
--- a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><i>Coming soon!</i></p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
deleted file mode 100644
index 2b27207c..00000000
--- a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-
-import { EpisodeLocationsFormComponent } from "./episode-locations-form.component";
-import { SharedTestingModule } from "@shared/shared-testing.module";
-
-describe("EpisodeLocationsFormComponent", () => {
-    let component: EpisodeLocationsFormComponent;
-    let fixture: ComponentFixture<EpisodeLocationsFormComponent>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            declarations: [EpisodeLocationsFormComponent],
-            imports: [SharedTestingModule],
-        });
-        fixture = TestBed.createComponent(EpisodeLocationsFormComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it("should create", () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts
deleted file mode 100644
index 78ce037b..00000000
--- a/frontend/src/app/data-entry/episode-form/episode-locations-form/episode-locations-form.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-    selector: "lc-episode-locations-form",
-    templateUrl: "./episode-locations-form.component.html",
-    styleUrls: ["./episode-locations-form.component.scss"],
-})
-export class EpisodeLocationsFormComponent {}
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
deleted file mode 100644
index ce59c301..00000000
--- a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p><i>Coming soon!</i></p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.scss b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
deleted file mode 100644
index 78fef072..00000000
--- a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-
-import { EpisodeObjectsFormComponent } from "./episode-objects-form.component";
-import { SharedTestingModule } from "@shared/shared-testing.module";
-
-describe("EpisodeObjectsFormComponent", () => {
-    let component: EpisodeObjectsFormComponent;
-    let fixture: ComponentFixture<EpisodeObjectsFormComponent>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            declarations: [EpisodeObjectsFormComponent],
-            imports: [SharedTestingModule],
-        });
-        fixture = TestBed.createComponent(EpisodeObjectsFormComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it("should create", () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts
deleted file mode 100644
index d525c0ff..00000000
--- a/frontend/src/app/data-entry/episode-form/episode-objects-form/episode-objects-form.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-    selector: "lc-episode-objects-form",
-    templateUrl: "./episode-objects-form.component.html",
-    styleUrls: ["./episode-objects-form.component.scss"],
-})
-export class EpisodeObjectsFormComponent {}

From 1ccc89d3d4e45316af221f756391f28456587048 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 16:57:13 +0200
Subject: [PATCH 444/565] tooltips and clearer aria labels

tooltips in agent form
---
 frontend/generated/graphql.ts                            | 9 +++++++--
 .../agent-episodes-form.component.html                   | 4 +++-
 .../agent-episodes-form/agent-episodes.graphql           | 1 +
 .../episode-entities-form.component.html                 | 3 ++-
 .../episode-entities-form.component.ts                   | 4 ++--
 .../episode-entities-form/episode-entities.graphql       | 4 ++++
 .../episode-link-form/episode-link-form.component.html   | 4 +++-
 .../episode-link-form/episode-link-form.component.ts     | 4 ++++
 .../collapsible-card/collapsible-card.component.html     | 1 +
 9 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 3dc0aca3..0afce8fe 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1212,7 +1212,7 @@ export type DataEntryAgentEpisodesQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeAgentType', id: string, episode: { __typename?: 'EpisodeType', id: string } }> } | null };
+export type DataEntryAgentEpisodesQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeAgentType', id: string, episode: { __typename?: 'EpisodeType', id: string, name: string } }> } | null };
 
 export type DataEntryCreateEpisodeEntityLinkMutationVariables = Exact<{
   input: CreateEpisodeEntityLinkInput;
@@ -1275,7 +1275,7 @@ export type DataEntryEpisodeEntitiesQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeEntitiesQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string }> } | null };
+export type DataEntryEpisodeEntitiesQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> } | null };
 
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1530,6 +1530,7 @@ export const DataEntryAgentEpisodesDocument = gql`
       id
       episode {
         id
+        name
       }
     }
   }
@@ -1751,15 +1752,19 @@ export const DataEntryEpisodeEntitiesDocument = gql`
     }
     agents {
       id
+      name
     }
     gifts {
       id
+      name
     }
     letters {
       id
+      name
     }
     spaces {
       id
+      name
     }
   }
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
index 4e62f33d..cdf7fee0 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.html
@@ -6,7 +6,9 @@
                 <lc-episode-link-form [entityType]="entityType"
                         [entityID]="data.agentDescription.id"
                         [episodeID]="item.episode.id">
-                    <button removeControl class="btn btn-danger" aria-label="remove episode"
+                    <button removeControl class="btn btn-danger"
+                        [attr.aria-label]="'remove episode: ' + item.episode.name"
+                        ngbTooltip="remove this episode"
                         (click)="removeEpisode$.next(item.episode.id)">
                         <lc-icon [icon]="actionIcons.remove" />
                     </button>
diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
index d57be56a..aa796889 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes.graphql
@@ -12,6 +12,7 @@ query DataEntryAgentEpisodes($id: ID!) {
             id
             episode {
                 id
+                name
             }
         }
     }
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index 7d45fa28..532a4e80 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -8,7 +8,8 @@
                             [entityID]="entity.id"
                             [episodeID]="data.episode.id">
                         <button removeControl class="btn btn-danger"
-                            [attr.aria-label]="'remove ' + entityName"
+                            [attr.aria-label]="'remove ' + entityName + ': ' + entity.name"
+                            [ngbTooltip]="'remove this ' + entityName"
                             (click)="removeEntity$.next(entity.id)">
                             <lc-icon [icon]="actionIcons.remove" />
                         </button>
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index 13943e3d..336ef0bd 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -30,7 +30,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
 
     data$: Observable<DataEntryEpisodeEntitiesQuery>;
 
-    linkedEntities$: Observable<{ id: string }[]>;
+    linkedEntities$: Observable<{ id: string, name: string }[]>;
     availableEntities$: Observable<{ name: string, id: string }[]>;
 
     addEntity$ = new Subject<string>();
@@ -136,7 +136,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         this.status$.next('error');
     }
 
-    private linkedEntities(data: DataEntryEpisodeEntitiesQuery): { id: string }[] {
+    private linkedEntities(data: DataEntryEpisodeEntitiesQuery): { id: string, name: string }[] {
         return data.episode?.[this.entityProperty] || [];
     }
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
index afafbdde..f97d57ce 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
@@ -22,15 +22,19 @@ query DataEntryEpisodeEntities($id:ID!) {
     }
     agents {
       id
+      name
     }
     gifts {
       id
+      name
     }
     letters {
       id
+      name
     }
     spaces {
       id
+      name
     }
   }
 }
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 9c92f743..eafc64ac 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -3,7 +3,9 @@
     <span cardTitle>
         {{ linkedObject(linkTo, data)?.name }}
     </span>
-    <a cardControl class="btn btn-primary" aria-label="edit episode"
+    <a cardControl class="btn btn-primary"
+        [attr.aria-label]="'edit ' + linkedObjectName + ': ' + linkedObject(linkTo, data)?.name"
+        [ngbTooltip]="'edit this ' + linkedObjectName"
         [routerLink]="[
             '/data-entry',
             formUrl(linkTo, entityType),
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index e50f00dd..34b00640 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -88,6 +88,10 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         return entityTypeNames[this.entityType];
     }
 
+    get linkedObjectName(): string {
+        return this.linkTo == 'episode' ? 'episode' : this.entityName;
+    }
+
     ngOnChanges(changes: SimpleChanges): void {
         if (changes['entityID'] || changes['episodeID'] || changes['entityType']) {
             this.link$.next({
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
index 13cb96c7..429cf3ac 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
@@ -4,6 +4,7 @@
         <ng-content select="[cardTitle]" />
         <button class="btn btn-secondary ms-auto"
             ariaLabel="{{ collapsed ? 'show' : 'hide' }} {{contentDescription}}"
+            [ngbTooltip]="(collapsed ? 'show' : 'hide') + ' ' + contentDescription"
             [attr.aria-expanded]="!collapsed"
             [attr.aria-controls]="body.id"
             (click)="collapsed = !collapsed">

From 94f544f70c4b9dc0bb1c1996250992bc91f3d4cb Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 17:34:43 +0200
Subject: [PATCH 445/565] fix availableEpisodes

---
 .../agent-episodes-form/agent-episodes-form.component.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index df61debb..e8c27358 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -113,7 +113,7 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         data: DataEntryAgentEpisodesQuery
     ): { name: string, id: string }[] {
         const allEpisodes = data.agentDescription?.source.episodes || [];
-        const linkedEpisodes = data.agentDescription?.episodes || [];
+        const linkedEpisodes = data.agentDescription?.episodes.map(link => link.episode) || [];
         return differenceBy(allEpisodes, linkedEpisodes, 'id');
     }
 }

From f2d97fb5a49b4eab02da76328316ce1a5d32814c Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 16:50:43 +0200
Subject: [PATCH 446/565] Added delete entity button with loading spinner

---
 .../shared/data-entry-shared.module.ts        |  3 +++
 .../delete-entity-button.component.html       | 15 +++++++++++++
 .../delete-entity-button.component.scss       |  0
 .../delete-entity-button.component.spec.ts    | 21 +++++++++++++++++++
 .../delete-entity-button.component.ts         | 15 +++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.html
 create mode 100644 frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.scss
 create mode 100644 frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.ts

diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index a10856d6..1f102529 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -4,6 +4,7 @@ import { DesignatorsControlComponent } from "./designators-control/designators-c
 import { MultiselectComponent } from "./multiselect/multiselect.component";
 import { LabelSelectComponent } from "./label-select/label-select.component";
 import { EntityDescriptionLeadComponent } from "./entity-description-lead/entity-description-lead.component";
+import { DeleteEntityButtonComponent } from "./delete-entity-button/delete-entity-button.component";
 
 @NgModule({
     declarations: [
@@ -11,6 +12,7 @@ import { EntityDescriptionLeadComponent } from "./entity-description-lead/entity
         MultiselectComponent,
         LabelSelectComponent,
         EntityDescriptionLeadComponent,
+        DeleteEntityButtonComponent,
     ],
     imports: [SharedModule],
     exports: [
@@ -18,6 +20,7 @@ import { EntityDescriptionLeadComponent } from "./entity-description-lead/entity
         MultiselectComponent,
         LabelSelectComponent,
         EntityDescriptionLeadComponent,
+        DeleteEntityButtonComponent,
     ],
 })
 export class DataEntrySharedModule {}
diff --git a/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.html b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.html
new file mode 100644
index 00000000..8bf5cb3a
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.html
@@ -0,0 +1,15 @@
+<div class="hstack">
+    <button class="btn btn-danger ms-auto" (click)="clickDelete.emit()">
+        <lc-icon
+            *ngIf="!deletingInProgress; else deleting"
+            [icon]="actionIcons.delete"
+        />
+        Delete {{ entityName }}
+    </button>
+</div>
+
+<ng-template #deleting>
+    <div class="spinner-border spinner-border-sm" role="status">
+        <span class="visually-hidden">Deleting {{ entityName }}...</span>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.scss b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts
new file mode 100644
index 00000000..47021c78
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DeleteEntityButtonComponent } from './delete-entity-button.component';
+
+describe('DeleteEntityButtonComponent', () => {
+  let component: DeleteEntityButtonComponent;
+  let fixture: ComponentFixture<DeleteEntityButtonComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [DeleteEntityButtonComponent]
+    });
+    fixture = TestBed.createComponent(DeleteEntityButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.ts b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.ts
new file mode 100644
index 00000000..1a828481
--- /dev/null
+++ b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.ts
@@ -0,0 +1,15 @@
+import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { actionIcons } from "@shared/icons";
+
+@Component({
+    selector: "lc-delete-entity-button",
+    templateUrl: "./delete-entity-button.component.html",
+    styleUrls: ["./delete-entity-button.component.scss"],
+})
+export class DeleteEntityButtonComponent {
+    @Input({ required: true }) public entityName!: string;
+    @Input() public deletingInProgress = false;
+    @Output() public clickDelete = new EventEmitter<void>();
+
+    public actionIcons = actionIcons;
+}

From 291c7665d612fe9e69c33c7231d1a031a7f42093 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 16:52:10 +0200
Subject: [PATCH 447/565] Delete buttons for gift, letter, episode

---
 .../episode-form/episode-form.component.html  |  5 ++
 .../episode-form/episode-form.component.ts    | 76 ++++++++++++++++--
 .../gift-form/gift-form.component.html        |  5 ++
 .../gift-form/gift-form.component.ts          | 78 ++++++++++++++++++-
 .../src/app/data-entry/gift-form/gift.graphql | 10 +++
 .../letter-form/letter-form.component.html    | 18 ++---
 .../letter-form/letter-form.component.ts      |  4 +-
 7 files changed, 171 insertions(+), 25 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 04a27f98..603b5969 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -7,6 +7,11 @@ <h1 class="mb-4">
         <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
     </h1>
     <lc-entity-description-lead [entity]="episode" />
+    <lc-delete-entity-button
+        (clickDelete)="onClickDelete(episode)"
+        [deletingInProgress]="deletingInProgress"
+        entityName="episode"
+    />
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 18f8377f..358f23aa 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -1,9 +1,15 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { Component, DestroyRef } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute, Router } from "@angular/router";
+import { ApolloCache } from "@apollo/client/core";
+import { ModalService } from "@services/modal.service";
+import { ToastService } from "@services/toast.service";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntryEpisodeFormGQL } from "generated/graphql";
+import { DataEntryDeleteEpisodeGQL, DataEntryEpisodeFormGQL, DataEntryEpisodeFormQuery } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
 
+type QueriedEpisode = NonNullable<DataEntryEpisodeFormQuery["episode"]>;
+
 @Component({
     selector: "lc-episode",
     templateUrl: "./episode-form.component.html",
@@ -48,8 +54,68 @@ export class EpisodeFormComponent {
     public dataIcons = dataIcons;
     public actionIcons = actionIcons;
 
+    public deletingInProgress = false;
+
     constructor(
+        private destroyRef: DestroyRef,
         private route: ActivatedRoute,
-        private episodeQuery: DataEntryEpisodeFormGQL
-    ) {}
+        private router: Router,
+        private toastService: ToastService,
+        private modalService: ModalService,
+        private episodeQuery: DataEntryEpisodeFormGQL,
+        private deleteEpisode: DataEntryDeleteEpisodeGQL
+    ) { }
+
+    public onClickDelete(episode: QueriedEpisode): void {
+        this.modalService
+        .openConfirmationModal({
+            title: "Delete episode",
+            message: `Are you sure you want to delete this episode? (${episode.name})`,
+        })
+        .then(() => this.performDelete(episode.id, episode.source.id))
+        .catch(() => {
+            // Do nothing on cancel / dismissal.
+        });
+    }
+
+    private performDelete(episodeId: string, sourceId: string): void {
+        this.deletingInProgress = true;
+        this.deleteEpisode
+            .mutate(
+                {
+                    id: episodeId,
+                },
+                {
+                    update: (cache) => this.updateCache(cache, episodeId),
+                }
+            )
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                this.deletingInProgress = false;
+                const errors = result.data?.deleteEpisode?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Deletion failed",
+                    });
+                } else {
+                    this.toastService.show({
+                        body: "Episode deleted",
+                        type: "success",
+                        header: "Success",
+                    });
+                }
+                this.router.navigate([`/data-entry/sources/${sourceId}`]);
+            });
+    }
+
+    private updateCache(cache: ApolloCache<unknown>, episodeId: string): void {
+        const identified = cache.identify({
+            __typename: "EpisodeType",
+            id: episodeId,
+        });
+        cache.evict({ id: identified });
+        cache.gc();
+    }
 }
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index d6059f5c..551763de 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -10,6 +10,11 @@ <h1 class="mb-4">
     </h1>
 
     <lc-entity-description-lead [entity]="gift" />
+    <lc-delete-entity-button
+        (clickDelete)="onClickDelete(gift)"
+        [deletingInProgress]="deletingInProgress"
+        entityName="gift"
+    />
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
index bf090ec8..861006c7 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
@@ -1,9 +1,19 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { Component, DestroyRef } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ActivatedRoute, Router } from "@angular/router";
+import { ApolloCache } from "@apollo/client/core";
+import { ModalService } from "@services/modal.service";
+import { ToastService } from "@services/toast.service";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntryGiftFormGQL } from "generated/graphql";
+import {
+    DataEntryDeleteGiftGQL,
+    DataEntryGiftFormGQL,
+    DataEntryGiftFormQuery,
+} from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
 
+type QueriedGift = NonNullable<DataEntryGiftFormQuery["giftDescription"]>;
+
 @Component({
     selector: "lc-gift-form",
     templateUrl: "./gift-form.component.html",
@@ -48,8 +58,68 @@ export class GiftFormComponent {
     public dataIcons = dataIcons;
     public actionIcons = actionIcons;
 
+    public deletingInProgress = false;
+
     constructor(
+        private destroyRef: DestroyRef,
         private route: ActivatedRoute,
-        private giftQuery: DataEntryGiftFormGQL
+        private router: Router,
+        private toastService: ToastService,
+        private modalService: ModalService,
+        private giftQuery: DataEntryGiftFormGQL,
+        private deleteGift: DataEntryDeleteGiftGQL
     ) {}
+
+    public onClickDelete(gift: QueriedGift): void {
+        this.modalService
+            .openConfirmationModal({
+                title: "Delete gift",
+                message: `Are you sure you want to delete this gift? (${gift.name})`,
+            })
+            .then(() => this.performDelete(gift.id, gift.source.id))
+            .catch(() => {
+                // Do nothing on cancel / dismissal.
+            });
+    }
+
+    private performDelete(giftId: string, sourceId: string): void {
+        this.deletingInProgress = true;
+        this.deleteGift
+            .mutate(
+                {
+                    id: giftId,
+                },
+                {
+                    update: (cache) => this.updateCache(cache, giftId),
+                }
+            )
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                this.deletingInProgress = false;
+                const errors = result.data?.deleteGift?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Deletion failed",
+                    });
+                } else {
+                    this.toastService.show({
+                        body: "Gift deleted",
+                        type: "success",
+                        header: "Success",
+                    });
+                }
+                this.router.navigate([`/data-entry/sources/${sourceId}`]);
+            });
+    }
+
+    private updateCache(cache: ApolloCache<unknown>, giftId: string): void {
+        const identified = cache.identify({
+            __typename: "GiftDescriptionType",
+            id: giftId,
+        });
+        cache.evict({ id: identified });
+        cache.gc();
+    }
 }
diff --git a/frontend/src/app/data-entry/gift-form/gift.graphql b/frontend/src/app/data-entry/gift-form/gift.graphql
index 48dda6c9..fd194f27 100644
--- a/frontend/src/app/data-entry/gift-form/gift.graphql
+++ b/frontend/src/app/data-entry/gift-form/gift.graphql
@@ -19,3 +19,13 @@ mutation DataEntryUpdateGift($giftData: UpdateGiftInput!) {
         }
     }
 }
+
+mutation DataEntryDeleteGift($id: ID!) {
+    deleteGift(id: $id) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 52c78d7e..6a707ded 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -10,13 +10,11 @@ <h1 class="mb-4">
     </h1>
 
     <lc-entity-description-lead [entity]="letter" />
-
-    <div class="hstack">
-        <button class="btn btn-danger ms-auto" (click)="onClickDelete(letter)">
-            <lc-icon *ngIf="!deletingInProgress; else deleting" [icon]="actionIcons.delete" />
-            Delete letter
-        </button>
-    </div>
+    <lc-delete-entity-button
+        (clickDelete)="onClickDelete(letter)"
+        [deletingInProgress]="deletingInProgress"
+        entityName="letter"
+    />
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>
@@ -33,9 +31,3 @@ <h2 class="subform-header">Categories</h2>
         <span class="visually-hidden">Loading...</span>
     </div>
 </ng-template>
-
-<ng-template #deleting>
-    <div class="spinner-border spinner-border-sm" role="status">
-        <span class="visually-hidden">Deleting...</span>
-    </div>
-</ng-template>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 06c6af5c..3e7d0cc4 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { ApolloCache } from "@apollo/client/core";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
-import { actionIcons, dataIcons } from "@shared/icons";
+import { dataIcons } from "@shared/icons";
 import {
     DataEntryDeleteLetterGQL,
     DataEntryLetterFormGQL,
@@ -56,8 +56,6 @@ export class LetterFormComponent {
     );
 
     public dataIcons = dataIcons;
-    public actionIcons = actionIcons;
-
     public deletingInProgress = false;
 
     constructor(

From 294b6fb01e9c025a61e3a1678dd17fe7f2638e4d Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 16:52:24 +0200
Subject: [PATCH 448/565] Generated types

---
 frontend/generated/graphql.ts | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 44bb1ee8..68dd7915 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1204,6 +1204,13 @@ export type DataEntryUpdateGiftMutationVariables = Exact<{
 
 export type DataEntryUpdateGiftMutation = { __typename?: 'Mutation', updateGift?: { __typename?: 'UpdateGiftMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryDeleteGiftMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryDeleteGiftMutation = { __typename?: 'Mutation', deleteGift?: { __typename?: 'DeleteGiftMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryLetterCategoriesQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1690,6 +1697,28 @@ export const DataEntryUpdateGiftDocument = gql`
   export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
     override document = DataEntryUpdateGiftDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryDeleteGiftDocument = gql`
+    mutation DataEntryDeleteGift($id: ID!) {
+  deleteGift(id: $id) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteGiftGQL extends Apollo.Mutation<DataEntryDeleteGiftMutation, DataEntryDeleteGiftMutationVariables> {
+    override document = DataEntryDeleteGiftDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }

From bf169905d5bf8a4fa8d7e499038c9f06549de551 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 18 Sep 2024 16:52:41 +0200
Subject: [PATCH 449/565] Fix links to entity forms

---
 .../source/episode-preview/episode-preview.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index 7adfc134..8ec7f7c8 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -30,7 +30,7 @@
                         class="inline-list-item"
                     >
                         <a
-                            [routerLink]="['agent/', agent.id]"
+                            [routerLink]="['/', 'data-entry', 'agents', agent.id]"
                             class="icon-link"
                         >
                             <lc-icon [icon]="agentIcon(agent)" />
@@ -51,7 +51,7 @@
                         class="inline-list-item"
                     >
                         <a
-                            [routerLink]="['location/', space.id]"
+                            [routerLink]="['/', 'data-entry', 'locations', space.id]"
                             class="icon-link"
                         >
                             <lc-icon [icon]="dataIcons.location" />

From 71cc7c09298dff65bcf503c21367843fbd927576 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 18 Sep 2024 17:12:34 +0200
Subject: [PATCH 450/565] outfactor enums in queries

---
 backend/core/types/DescriptionFieldType.py    |   5 +-
 backend/core/types/FieldType.py               |   7 +-
 backend/event/types/EpisodeAgentType.py       |   1 -
 backend/event/types/EpisodeGiftType.py        |   1 -
 backend/event/types/EpisodeLetterType.py      |   1 -
 backend/event/types/EpisodeSpaceType.py       |   1 -
 .../types/AgentDescriptionGenderType.py       |   8 +-
 frontend/generated/graphql.ts                 | 219 ++-------------
 frontend/generated/schema.graphql             | 253 ++----------------
 .../agent-description-form.component.ts       |  17 +-
 ...gent-identification-form.component.spec.ts |   1 -
 .../gift-identification-form.component.ts     |  26 +-
 .../letter-identification-form.component.ts   |  25 +-
 13 files changed, 104 insertions(+), 461 deletions(-)

diff --git a/backend/core/types/DescriptionFieldType.py b/backend/core/types/DescriptionFieldType.py
index d173c58c..8f81b75e 100644
--- a/backend/core/types/DescriptionFieldType.py
+++ b/backend/core/types/DescriptionFieldType.py
@@ -1,7 +1,8 @@
+from graphene import Enum, NonNull
+
 from core.models import DescriptionField, SourceMention
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.FieldType import LettercraftFieldType
-from graphene import Enum
 
 SourceMentionEnum = Enum.from_enum(SourceMention)
 
@@ -11,7 +12,7 @@ class DescriptionFieldType(LettercraftFieldType, AbstractDjangoObjectType):
     Should not be queried directly, but should be extended by other types.
     """
 
-    source_mention = SourceMentionEnum()
+    source_mention = NonNull(SourceMentionEnum)
 
     class Meta:
         model = DescriptionField
diff --git a/backend/core/types/FieldType.py b/backend/core/types/FieldType.py
index ff1596ef..bfcf9040 100644
--- a/backend/core/types/FieldType.py
+++ b/backend/core/types/FieldType.py
@@ -1,6 +1,9 @@
-from core.models import Field
+from graphene import Enum, NonNull
+
+from core.models import Field, Certainty
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 
+CertaintyEnum = Enum.from_enum(Certainty)
 
 class LettercraftFieldType(AbstractDjangoObjectType):
     """
@@ -8,6 +11,8 @@ class LettercraftFieldType(AbstractDjangoObjectType):
     Should not be queried directly, but should be extended by other types.
     """
 
+    certainty = NonNull(CertaintyEnum)
+
     class Meta:
         model = Field
         fields = [
diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
index 6e7a8ce2..48ac29df 100644
--- a/backend/event/types/EpisodeAgentType.py
+++ b/backend/event/types/EpisodeAgentType.py
@@ -10,7 +10,6 @@
 class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityInterface)
     entity_type = NonNull(Entity)
-    source_mention = NonNull(SourceMentionEnum)
 
     class Meta:
         model = EpisodeAgent
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
index 6b8f2fb2..9c76abc3 100644
--- a/backend/event/types/EpisodeGiftType.py
+++ b/backend/event/types/EpisodeGiftType.py
@@ -10,7 +10,6 @@
 class EpisodeGiftType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityInterface)
     entity_type = NonNull(Entity)
-    source_mention = NonNull(SourceMentionEnum)
 
     class Meta:
         model = EpisodeGift
diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
index 984ed70c..a63e486a 100644
--- a/backend/event/types/EpisodeLetterType.py
+++ b/backend/event/types/EpisodeLetterType.py
@@ -9,7 +9,6 @@
 class EpisodeLetterType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityInterface)
     entity_type = NonNull(Entity)
-    source_mention = NonNull(SourceMentionEnum)
 
     class Meta:
         model = EpisodeLetter
diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
index ab869237..24b74bb4 100644
--- a/backend/event/types/EpisodeSpaceType.py
+++ b/backend/event/types/EpisodeSpaceType.py
@@ -9,7 +9,6 @@
 class EpisodeSpaceType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityInterface)
     entity_type = NonNull(Entity)
-    source_mention = NonNull(SourceMentionEnum)
 
     class Meta:
         model = EpisodeSpace
diff --git a/backend/person/types/AgentDescriptionGenderType.py b/backend/person/types/AgentDescriptionGenderType.py
index 64ef0743..752fb380 100644
--- a/backend/person/types/AgentDescriptionGenderType.py
+++ b/backend/person/types/AgentDescriptionGenderType.py
@@ -1,9 +1,15 @@
 from graphene_django import DjangoObjectType
+from graphene import Enum, NonNull
+
 from core.types.DescriptionFieldType import DescriptionFieldType
-from person.models import AgentDescriptionGender
+from person.models import AgentDescriptionGender, Gender
+
+GenderEnum = Enum.from_enum(Gender)
 
 
 class AgentDescriptionGenderType(DescriptionFieldType, DjangoObjectType):
+    gender = NonNull(GenderEnum)
+
     class Meta:
         model = AgentDescriptionGender
         fields = [
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 0afce8fe..59e5250d 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -20,27 +20,24 @@ export type Scalars = {
 export type AgentDescriptionGenderType = {
   __typename?: 'AgentDescriptionGenderType';
   agent: AgentDescriptionType;
-  /** How certain are you of this value? */
-  certainty: PersonAgentDescriptionGenderCertaintyChoices;
-  /** The gender of this agent. The option Mixed is only applicable for groups. */
-  gender: PersonAgentDescriptionGenderGenderChoices;
+  certainty: Certainty;
+  gender: Gender;
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
-  sourceMention?: Maybe<SourceMention>;
+  sourceMention: SourceMention;
 };
 
 export type AgentDescriptionLocationType = {
   __typename?: 'AgentDescriptionLocationType';
   agent: AgentDescriptionType;
-  /** How certain are you of this value? */
-  certainty: PersonAgentDescriptionLocationCertaintyChoices;
+  certainty: Certainty;
   id: Scalars['ID']['output'];
   /** location by which the agent is identified */
   location: SpaceDescriptionType;
   /** Additional notes */
   note: Scalars['String']['output'];
-  sourceMention?: Maybe<SourceMention>;
+  sourceMention: SourceMention;
 };
 
 export type AgentDescriptionType = EntityInterface & {
@@ -197,8 +194,7 @@ export type EntityInterface = {
 export type EpisodeAgentType = EpisodeEntityLink & {
   __typename?: 'EpisodeAgentType';
   agent: AgentDescriptionType;
-  /** How certain are you of this value? */
-  certainty: EventEpisodeAgentCertaintyChoices;
+  certainty: Certainty;
   entity: EntityInterface;
   entityType: Entity;
   episode: EpisodeType;
@@ -226,8 +222,7 @@ export type EpisodeEntityLink = {
 
 export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
-  /** How certain are you of this value? */
-  certainty: EventEpisodeGiftCertaintyChoices;
+  certainty: Certainty;
   entity: EntityInterface;
   entityType: Entity;
   episode: EpisodeType;
@@ -239,8 +234,7 @@ export type EpisodeGiftType = EpisodeEntityLink & {
 
 export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
-  /** How certain are you of this value? */
-  certainty: EventEpisodeLetterCertaintyChoices;
+  certainty: Certainty;
   entity: EntityInterface;
   entityType: Entity;
   episode: EpisodeType;
@@ -252,8 +246,7 @@ export type EpisodeLetterType = EpisodeEntityLink & {
 
 export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
-  /** How certain are you of this value? */
-  certainty: EventEpisodeSpaceCertaintyChoices;
+  certainty: Certainty;
   entity: EntityInterface;
   entityType: Entity;
   episode: EpisodeType;
@@ -295,36 +288,6 @@ export type EpisodeType = {
   summary: Scalars['String']['output'];
 };
 
-/** An enumeration. */
-export enum EventEpisodeAgentCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
-/** An enumeration. */
-export enum EventEpisodeGiftCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
-/** An enumeration. */
-export enum EventEpisodeLetterCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
   /** directly mentioned */
@@ -333,16 +296,6 @@ export enum EventEpisodeSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
-/** An enumeration. */
-export enum EventEpisodeSpaceCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum Gender {
   Female = 'FEMALE',
@@ -371,13 +324,12 @@ export type GiftCategoryType = {
 export type GiftDescriptionCategoryType = {
   __typename?: 'GiftDescriptionCategoryType';
   category: GiftCategoryType;
-  /** How certain are you of this value? */
-  certainty: LetterGiftDescriptionCategoryCertaintyChoices;
+  certainty: Certainty;
   gift: GiftDescriptionType;
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
-  sourceMention?: Maybe<SourceMention>;
+  sourceMention: SourceMention;
 };
 
 export type GiftDescriptionType = EntityInterface & {
@@ -434,13 +386,12 @@ export type LetterCategoryType = {
 export type LetterDescriptionCategoryType = {
   __typename?: 'LetterDescriptionCategoryType';
   category: LetterCategoryType;
-  /** How certain are you of this value? */
-  certainty: LetterLetterDescriptionCategoryCertaintyChoices;
+  certainty: Certainty;
   id: Scalars['ID']['output'];
   letter: LetterDescriptionType;
   /** Additional notes */
   note: Scalars['String']['output'];
-  sourceMention?: Maybe<SourceMention>;
+  sourceMention: SourceMention;
 };
 
 export type LetterDescriptionType = EntityInterface & {
@@ -466,16 +417,6 @@ export type LetterDescriptionType = EntityInterface & {
   sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
 };
 
-/** An enumeration. */
-export enum LetterGiftDescriptionCategoryCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum LetterGiftDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -484,16 +425,6 @@ export enum LetterGiftDescriptionSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
-/** An enumeration. */
-export enum LetterLetterDescriptionCategoryCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum LetterLetterDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -629,40 +560,6 @@ export type MutationUpdatePersonReferenceArgs = {
   referenceData: UpdatePersonReferenceInput;
 };
 
-/** An enumeration. */
-export enum PersonAgentDescriptionGenderCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
-/** An enumeration. */
-export enum PersonAgentDescriptionGenderGenderChoices {
-  /** Female */
-  Female = 'FEMALE',
-  /** Male */
-  Male = 'MALE',
-  /** Mixed */
-  Mixed = 'MIXED',
-  /** Other */
-  Other = 'OTHER',
-  /** Unknown */
-  Unknown = 'UNKNOWN'
-}
-
-/** An enumeration. */
-export enum PersonAgentDescriptionLocationCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -673,8 +570,7 @@ export enum PersonAgentDescriptionSourceMentionChoices {
 
 export type PersonDateOfBirthType = {
   __typename?: 'PersonDateOfBirthType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonDateOfBirthCertaintyChoices;
+  certainty: Certainty;
   displayDate: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   /** Additional notes */
@@ -691,8 +587,7 @@ export type PersonDateOfBirthType = {
 
 export type PersonDateOfDeathType = {
   __typename?: 'PersonDateOfDeathType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonDateOfDeathCertaintyChoices;
+  certainty: Certainty;
   displayDate: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   /** Additional notes */
@@ -707,40 +602,9 @@ export type PersonDateOfDeathType = {
   yearUpper: Scalars['Int']['output'];
 };
 
-/** An enumeration. */
-export enum PersonPersonDateOfBirthCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
-/** An enumeration. */
-export enum PersonPersonDateOfDeathCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
-/** An enumeration. */
-export enum PersonPersonReferenceCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 export type PersonReferenceType = {
   __typename?: 'PersonReferenceType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonReferenceCertaintyChoices;
+  certainty: Certainty;
   description: AgentDescriptionType;
   id: Scalars['ID']['output'];
   /** Additional notes */
@@ -841,13 +705,12 @@ export type QueryUserDescriptionArgs = {
 
 export type RegionFieldType = {
   __typename?: 'RegionFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceRegionFieldCertaintyChoices;
+  certainty: Certainty;
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
   region: RegionType;
-  sourceMention?: Maybe<SourceMention>;
+  sourceMention: SourceMention;
   space: SpaceDescriptionType;
 };
 
@@ -866,13 +729,12 @@ export type RegionType = {
 
 export type SettlementFieldType = {
   __typename?: 'SettlementFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceSettlementFieldCertaintyChoices;
+  certainty: Certainty;
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
   settlement: SettlementType;
-  sourceMention?: Maybe<SourceMention>;
+  sourceMention: SourceMention;
   space: SpaceDescriptionType;
 };
 
@@ -973,16 +835,6 @@ export type SpaceDescriptionType = EntityInterface & {
   structures: Array<StructureType>;
 };
 
-/** An enumeration. */
-export enum SpaceRegionFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum SpaceRegionTypeChoices {
   /** ecclesiastical */
@@ -993,16 +845,6 @@ export enum SpaceRegionTypeChoices {
   Political = 'POLITICAL'
 }
 
-/** An enumeration. */
-export enum SpaceSettlementFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum SpaceSpaceDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -1011,16 +853,6 @@ export enum SpaceSpaceDescriptionSourceMentionChoices {
   Implied = 'IMPLIED'
 }
 
-/** An enumeration. */
-export enum SpaceStructureFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
-}
-
 /** An enumeration. */
 export enum SpaceStructureLevelChoices {
   /** road, square, crossroad */
@@ -1037,12 +869,11 @@ export enum SpaceStructureLevelChoices {
 
 export type StructureFieldType = {
   __typename?: 'StructureFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceStructureFieldCertaintyChoices;
+  certainty: Certainty;
   id: Scalars['ID']['output'];
   /** Additional notes */
   note: Scalars['String']['output'];
-  sourceMention?: Maybe<SourceMention>;
+  sourceMention: SourceMention;
   space: SpaceDescriptionType;
   structure: StructureType;
 };
@@ -1198,7 +1029,7 @@ export type DataEntryAgentDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: SourceMention | null, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention?: SourceMention | null, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
+export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: Gender, sourceMention: SourceMention, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention: SourceMention, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
 
 export type LocationsInSourceListQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1317,7 +1148,7 @@ export type DataEntryGiftCategoriesQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryGiftCategoriesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, categorisations: Array<{ __typename?: 'GiftDescriptionCategoryType', id: string, sourceMention?: SourceMention | null, note: string, certainty: LetterGiftDescriptionCategoryCertaintyChoices, category: { __typename?: 'GiftCategoryType', id: string, name: string } }> } | null };
+export type DataEntryGiftCategoriesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, categorisations: Array<{ __typename?: 'GiftDescriptionCategoryType', id: string, sourceMention: SourceMention, note: string, certainty: Certainty, category: { __typename?: 'GiftCategoryType', id: string, name: string } }> } | null };
 
 export type DataEntryAllGiftCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1357,7 +1188,7 @@ export type DataEntryLetterCategoriesQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLetterCategoriesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, categorisations: Array<{ __typename?: 'LetterDescriptionCategoryType', id: string, sourceMention?: SourceMention | null, note: string, certainty: LetterLetterDescriptionCategoryCertaintyChoices, category: { __typename?: 'LetterCategoryType', id: string, label: string } }> } | null };
+export type DataEntryLetterCategoriesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, categorisations: Array<{ __typename?: 'LetterDescriptionCategoryType', id: string, sourceMention: SourceMention, note: string, certainty: Certainty, category: { __typename?: 'LetterCategoryType', id: string, label: string } }> } | null };
 
 export type DataEntryAllLetterCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
 
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 54d80c88..54a6bf2e 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -1,25 +1,17 @@
 type AgentDescriptionGenderType {
   agent: AgentDescriptionType!
-
-  """How certain are you of this value?"""
-  certainty: PersonAgentDescriptionGenderCertaintyChoices!
-
-  """
-  The gender of this agent. The option Mixed is only applicable for groups.
-  """
-  gender: PersonAgentDescriptionGenderGenderChoices!
+  certainty: Certainty!
+  gender: Gender!
   id: ID!
 
   """Additional notes"""
   note: String!
-  sourceMention: SourceMention
+  sourceMention: SourceMention!
 }
 
 type AgentDescriptionLocationType {
   agent: AgentDescriptionType!
-
-  """How certain are you of this value?"""
-  certainty: PersonAgentDescriptionLocationCertaintyChoices!
+  certainty: Certainty!
   id: ID!
 
   """location by which the agent is identified"""
@@ -27,7 +19,7 @@ type AgentDescriptionLocationType {
 
   """Additional notes"""
   note: String!
-  sourceMention: SourceMention
+  sourceMention: SourceMention!
 }
 
 type AgentDescriptionType implements EntityInterface {
@@ -178,9 +170,7 @@ interface EntityInterface {
 
 type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
-
-  """How certain are you of this value?"""
-  certainty: EventEpisodeAgentCertaintyChoices!
+  certainty: Certainty!
   entity: EntityInterface!
   entityType: Entity!
   episode: EpisodeType!
@@ -206,8 +196,7 @@ interface EpisodeEntityLink {
 }
 
 type EpisodeGiftType implements EpisodeEntityLink {
-  """How certain are you of this value?"""
-  certainty: EventEpisodeGiftCertaintyChoices!
+  certainty: Certainty!
   entity: EntityInterface!
   entityType: Entity!
   episode: EpisodeType!
@@ -218,8 +207,7 @@ type EpisodeGiftType implements EpisodeEntityLink {
 }
 
 type EpisodeLetterType implements EpisodeEntityLink {
-  """How certain are you of this value?"""
-  certainty: EventEpisodeLetterCertaintyChoices!
+  certainty: Certainty!
   entity: EntityInterface!
   entityType: Entity!
   episode: EpisodeType!
@@ -230,8 +218,7 @@ type EpisodeLetterType implements EpisodeEntityLink {
 }
 
 type EpisodeSpaceType implements EpisodeEntityLink {
-  """How certain are you of this value?"""
-  certainty: EventEpisodeSpaceCertaintyChoices!
+  certainty: Certainty!
   entity: EntityInterface!
   entityType: Entity!
   episode: EpisodeType!
@@ -285,42 +272,6 @@ type EpisodeType {
   summary: String!
 }
 
-"""An enumeration."""
-enum EventEpisodeAgentCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
-"""An enumeration."""
-enum EventEpisodeGiftCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
-"""An enumeration."""
-enum EventEpisodeLetterCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum EventEpisodeSourceMentionChoices {
   """directly mentioned"""
@@ -330,18 +281,6 @@ enum EventEpisodeSourceMentionChoices {
   IMPLIED
 }
 
-"""An enumeration."""
-enum EventEpisodeSpaceCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum Gender {
   FEMALE
@@ -368,15 +307,13 @@ type GiftCategoryType {
 
 type GiftDescriptionCategoryType {
   category: GiftCategoryType!
-
-  """How certain are you of this value?"""
-  certainty: LetterGiftDescriptionCategoryCertaintyChoices!
+  certainty: Certainty!
   gift: GiftDescriptionType!
   id: ID!
 
   """Additional notes"""
   note: String!
-  sourceMention: SourceMention
+  sourceMention: SourceMention!
 }
 
 type GiftDescriptionType implements EntityInterface {
@@ -440,15 +377,13 @@ type LetterCategoryType {
 
 type LetterDescriptionCategoryType {
   category: LetterCategoryType!
-
-  """How certain are you of this value?"""
-  certainty: LetterLetterDescriptionCategoryCertaintyChoices!
+  certainty: Certainty!
   id: ID!
   letter: LetterDescriptionType!
 
   """Additional notes"""
   note: String!
-  sourceMention: SourceMention
+  sourceMention: SourceMention!
 }
 
 type LetterDescriptionType implements EntityInterface {
@@ -480,18 +415,6 @@ type LetterDescriptionType implements EntityInterface {
   sourceMention: LetterLetterDescriptionSourceMentionChoices
 }
 
-"""An enumeration."""
-enum LetterGiftDescriptionCategoryCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum LetterGiftDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -501,18 +424,6 @@ enum LetterGiftDescriptionSourceMentionChoices {
   IMPLIED
 }
 
-"""An enumeration."""
-enum LetterLetterDescriptionCategoryCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum LetterLetterDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -552,48 +463,6 @@ type Mutation {
   updatePersonReference(referenceData: UpdatePersonReferenceInput!): UpdatePersonReferenceMutation
 }
 
-"""An enumeration."""
-enum PersonAgentDescriptionGenderCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
-"""An enumeration."""
-enum PersonAgentDescriptionGenderGenderChoices {
-  """Female"""
-  FEMALE
-
-  """Male"""
-  MALE
-
-  """Mixed"""
-  MIXED
-
-  """Other"""
-  OTHER
-
-  """Unknown"""
-  UNKNOWN
-}
-
-"""An enumeration."""
-enum PersonAgentDescriptionLocationCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum PersonAgentDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -604,8 +473,7 @@ enum PersonAgentDescriptionSourceMentionChoices {
 }
 
 type PersonDateOfBirthType {
-  """How certain are you of this value?"""
-  certainty: PersonPersonDateOfBirthCertaintyChoices!
+  certainty: Certainty!
   displayDate: String!
   id: ID!
 
@@ -628,8 +496,7 @@ type PersonDateOfBirthType {
 }
 
 type PersonDateOfDeathType {
-  """How certain are you of this value?"""
-  certainty: PersonPersonDateOfDeathCertaintyChoices!
+  certainty: Certainty!
   displayDate: String!
   id: ID!
 
@@ -651,45 +518,8 @@ type PersonDateOfDeathType {
   yearUpper: Int!
 }
 
-"""An enumeration."""
-enum PersonPersonDateOfBirthCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
-"""An enumeration."""
-enum PersonPersonDateOfDeathCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
-"""An enumeration."""
-enum PersonPersonReferenceCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 type PersonReferenceType {
-  """How certain are you of this value?"""
-  certainty: PersonPersonReferenceCertaintyChoices!
+  certainty: Certainty!
   description: AgentDescriptionType!
   id: ID!
 
@@ -719,14 +549,13 @@ type Query {
 }
 
 type RegionFieldType {
-  """How certain are you of this value?"""
-  certainty: SpaceRegionFieldCertaintyChoices!
+  certainty: Certainty!
   id: ID!
 
   """Additional notes"""
   note: String!
   region: RegionType!
-  sourceMention: SourceMention
+  sourceMention: SourceMention!
   space: SpaceDescriptionType!
 }
 
@@ -748,14 +577,13 @@ type RegionType {
 }
 
 type SettlementFieldType {
-  """How certain are you of this value?"""
-  certainty: SpaceSettlementFieldCertaintyChoices!
+  certainty: Certainty!
   id: ID!
 
   """Additional notes"""
   note: String!
   settlement: SettlementType!
-  sourceMention: SourceMention
+  sourceMention: SourceMention!
   space: SpaceDescriptionType!
 }
 
@@ -880,18 +708,6 @@ type SpaceDescriptionType implements EntityInterface {
   structures: [StructureType!]!
 }
 
-"""An enumeration."""
-enum SpaceRegionFieldCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum SpaceRegionTypeChoices {
   """ecclesiastical"""
@@ -904,18 +720,6 @@ enum SpaceRegionTypeChoices {
   POLITICAL
 }
 
-"""An enumeration."""
-enum SpaceSettlementFieldCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum SpaceSpaceDescriptionSourceMentionChoices {
   """directly mentioned"""
@@ -925,18 +729,6 @@ enum SpaceSpaceDescriptionSourceMentionChoices {
   IMPLIED
 }
 
-"""An enumeration."""
-enum SpaceStructureFieldCertaintyChoices {
-  """uncertain"""
-  A_0
-
-  """somewhat certain"""
-  A_1
-
-  """certain"""
-  A_2
-}
-
 """An enumeration."""
 enum SpaceStructureLevelChoices {
   """road, square, crossroad"""
@@ -956,13 +748,12 @@ enum SpaceStructureLevelChoices {
 }
 
 type StructureFieldType {
-  """How certain are you of this value?"""
-  certainty: SpaceStructureFieldCertaintyChoices!
+  certainty: Certainty!
   id: ID!
 
   """Additional notes"""
   note: String!
-  sourceMention: SourceMention
+  sourceMention: SourceMention!
   space: SpaceDescriptionType!
   structure: StructureType!
 }
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index b1fd6360..08c5a7c5 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -9,7 +9,6 @@ import {
     DataEntryUpdateAgentGQL,
     DataEntryUpdateAgentMutation,
     Gender,
-    PersonAgentDescriptionGenderGenderChoices as GenderChoices,
     SourceMention,
     LocationsInSourceListGQL,
     LocationsInSourceListQuery,
@@ -28,12 +27,12 @@ import { sourceMentionSelectOptions } from '../../shared/utils';
     styleUrls: ['./agent-description-form.component.scss'],
 })
 export class AgentDescriptionFormComponent implements OnDestroy {
-    genderOptions: { value: GenderChoices, label: string }[] = [
-        { value: GenderChoices.Female, label: 'Female' },
-        { value: GenderChoices.Male, label: 'Male' },
-        { value: GenderChoices.Other, label: 'Other' },
-        { value: GenderChoices.Mixed, label: 'Mixed (for groups)' },
-        { value: GenderChoices.Unknown, label: 'Unknown' }
+    genderOptions: { value: Gender, label: string }[] = [
+        { value: Gender.Female, label: 'Female' },
+        { value: Gender.Male, label: 'Male' },
+        { value: Gender.Other, label: 'Other' },
+        { value: Gender.Mixed, label: 'Mixed (for groups)' },
+        { value: Gender.Unknown, label: 'Unknown' }
     ];
 
     sourceMentionOptions = sourceMentionSelectOptions();
@@ -41,7 +40,7 @@ export class AgentDescriptionFormComponent implements OnDestroy {
     form = new FormGroup({
         designators: new FormControl<string[]>([], { nonNullable: true }),
         gender: new FormGroup({
-            gender: new FormControl<string>(GenderChoices.Unknown),
+            gender: new FormControl<string>(Gender.Unknown),
             sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
             note: new FormControl<string>(''),
         }),
@@ -105,7 +104,7 @@ export class AgentDescriptionFormComponent implements OnDestroy {
         this.form.setValue({
             designators: data.agentDescription?.designators || [],
             gender: {
-                gender: data.agentDescription?.gender?.gender || GenderChoices.Unknown,
+                gender: data.agentDescription?.gender?.gender || Gender.Unknown,
                 sourceMention: data.agentDescription?.gender?.sourceMention || SourceMention.Direct,
                 note: data.agentDescription?.gender?.note || '',
             },
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
index 80c9d849..d328a9ee 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
@@ -13,7 +13,6 @@ describe('AgentIdentificationFormComponent', () => {
             declarations: [AgentIdentificationFormComponent],
             providers: [FormService],
             imports: [SharedTestingModule],
-            providers: [FormService],
         });
         fixture = TestBed.createComponent(AgentIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index 886ed7c3..51d679db 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -7,8 +7,10 @@ import { ToastService } from "@services/toast.service";
 import { MutationResult } from "apollo-angular";
 import {
     DataEntryGiftIdentificationGQL,
+    DataEntryGiftIdentificationQuery,
     DataEntryUpdateGiftGQL,
     DataEntryUpdateGiftMutation,
+    GiftDescriptionType,
 } from "generated/graphql";
 import {
     map,
@@ -64,15 +66,7 @@ export class GiftIdentificationFormComponent implements OnInit {
     ngOnInit(): void {
         this.gift$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((gift) => {
-                if (!gift) {
-                    return;
-                }
-                this.form.patchValue(gift, {
-                    emitEvent: false,
-                    onlySelf: true,
-                });
-            });
+            .subscribe(this.updateFormData.bind(this));
 
         this.gift$
             .pipe(
@@ -101,6 +95,20 @@ export class GiftIdentificationFormComponent implements OnInit {
             });
     }
 
+    private updateFormData(gift: Partial<GiftDescriptionType> | null | undefined) {
+        if (!gift) {
+            return;
+        }
+        const value = {
+            name: gift.name,
+            description: gift.description || '',
+        };
+        this.form.patchValue(value, {
+            emitEvent: false,
+            onlySelf: true,
+        });
+    }
+
     private performMutation(
         gift: GiftIdentification,
         id: string
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index 965ef88a..f2b7f3fe 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -6,6 +6,7 @@ import { ToastService } from "@services/toast.service";
 import {
     DataEntryLetterIdentificationGQL,
     DataEntryUpdateLetterGQL,
+    LetterDescriptionType,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -51,15 +52,7 @@ export class LetterIdentificationFormComponent implements OnInit {
     ngOnInit(): void {
         this.letter$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((letter) => {
-                if (!letter) {
-                    return;
-                }
-                this.form.patchValue(letter, {
-                    emitEvent: false,
-                    onlySelf: true,
-                });
-            });
+            .subscribe(this.updateFormData.bind(this));
 
         this.letter$
             .pipe(
@@ -102,4 +95,18 @@ export class LetterIdentificationFormComponent implements OnInit {
                 }
             });
     }
+
+    private updateFormData(letter: Partial<LetterDescriptionType> | null | undefined) {
+        if (!letter) {
+            return;
+        }
+        const value = {
+            name: letter.name,
+            description: letter.description || '',
+        }
+        this.form.patchValue(value, {
+            emitEvent: false,
+            onlySelf: true,
+        });
+    }
 }

From f5228a1f29b269f4caf8b11dd5a62f3866a23180 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 18 Sep 2024 18:53:41 +0200
Subject: [PATCH 451/565] fix lifecycle issues with unique element IDs

---
 .../episode-entities-form.component.html      |  4 ++--
 .../episode-entities-form.component.ts        | 14 +++++++++----
 .../episode-link-form.component.html          |  8 ++++----
 .../episode-link-form.component.ts            | 15 +++++++++++---
 .../collapsible-card.component.html           |  4 ++--
 .../collapsible-card.component.spec.ts        |  3 +--
 .../collapsible-card.component.ts             |  5 +++++
 frontend/src/app/shared/shared.module.ts      |  3 ---
 .../app/shared/unique-id.directive.spec.ts    |  8 --------
 .../src/app/shared/unique-id.directive.ts     | 20 -------------------
 10 files changed, 36 insertions(+), 48 deletions(-)
 delete mode 100644 frontend/src/app/shared/unique-id.directive.spec.ts
 delete mode 100644 frontend/src/app/shared/unique-id.directive.ts

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index 532a4e80..a2467e6b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -29,12 +29,12 @@
     <div ngbDropdown>
         <button type="button" class="btn btn-primary"
             #dropdownToggle
-            lcUniqueID
+            [attr.id]="dropdownToggleID"
             ngbDropdownToggle>
             Add {{entityName}}
         </button>
         <div ngbDropdownMenu
-            [attr.aria-labelledby]="dropdownToggle.id">
+            [attr.aria-labelledby]="dropdownToggleID">
             <button *ngFor="let entity of (availableEntities$ | async)"
                 ngbDropdownItem (click)="addEntity$.next(entity.id); dropdownToggle.focus()">
                 {{entity.name}}
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index 336ef0bd..6c18b35d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -16,9 +16,11 @@ import {
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { splat, differenceBy } from "@shared/utils";
 
+type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
+
 const REFETCH_QUERIES = ['DataEntryEpisodeEntities'];
 
-type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
+let nextID = 0;
 
 @Component({
     selector: "lc-episode-entities-form",
@@ -37,7 +39,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
     removeEntity$ = new Subject<string>();
     actionIcons = actionIcons;
     status$ = formStatusSubject();
-    formName = crypto.randomUUID();
+    id = `episode-entities-${nextID++}`;
 
     private mutationObserver: Partial<Observer<MutationResult>> = {
         next: this.onSuccess.bind(this),
@@ -73,6 +75,10 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         ).subscribe(splat(this.removeEntity.bind(this)));
     }
 
+    get dropdownToggleID() {
+        return this.id + '-dropdown-toggle';
+    }
+
     /** name of the entity type in natural language */
     get entityName(): string {
         return entityTypeNames[this.entityType];
@@ -92,7 +98,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
     ngOnChanges(changes: SimpleChanges): void {
         if (changes['entityType']) {
 
-            this.formService.attachForm(this.formName, this.status$);
+            this.formService.attachForm(this.id, this.status$);
         }
     }
 
@@ -100,7 +106,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         this.status$.complete();
         this.addEntity$.complete();
         this.removeEntity$.complete();
-        this.formService.detachForm(this.formName);
+        this.formService.detachForm(this.id);
     }
 
     addEntity(entityID: string, episodeID: string): void {
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index eafc64ac..5ea8f998 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -16,11 +16,11 @@
     <ng-content cardControl select="[removeControl]"></ng-content>
     <form cardBody [formGroup]="form">
         <div class="mb-3">
-            <label [attr.for]="sourceMentionInput.id" class="form-label">
+            <label [attr.for]="sourceMentionInputID" class="form-label">
                 How is this {{entityName}}'s involvement in the episode represented?
             </label>
             <select #sourceMentionInput class="form-select"
-                lcUniqueID
+                [id]="sourceMentionInputID"
                 [formControl]="form.controls.sourceMention">
                 <option *ngFor="let option of sourceMentionOptions"
                     [ngValue]="option.value">
@@ -29,9 +29,9 @@
             </select>
         </div>
         <div class="mb-3">
-            <label [attr.for]="notesInput.id" class="form-label">Notes</label>
+            <label [attr.for]="notesInputID" class="form-label">Notes</label>
             <textarea #notesInput class="form-control"
-                lcUniqueID
+                [id]="notesInputID"
                 [formControl]="form.controls.note">
             </textarea>
         </div>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 34b00640..27b451a5 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -21,6 +21,7 @@ import { FormService } from '../form.service';
 
 
 type LinkTo = 'episode' | 'entity';
+let nextID = 0;
 
 @Component({
     selector: 'lc-episode-link-form',
@@ -53,7 +54,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
 
     private link$ = new Subject<UpdateEpisodeEntityLinkInput>();
     private status$ = formStatusSubject();
-    private formName = 'episode-link-' + crypto.randomUUID();
+    private id = `episode-link-${nextID++}`;
 
     actionIcons = actionIcons;
 
@@ -62,7 +63,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         private updateMutation: DataEntryUpdateEpisodeEntityLinkGQL,
         private formService: FormService,
     ) {
-        this.formService.attachForm(this.formName, this.status$);
+        this.formService.attachForm(this.id, this.status$);
 
         this.data$ = this.link$.pipe(
             switchMap((link) => query.watch(link).valueChanges),
@@ -84,6 +85,14 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
         ).subscribe(this.onMutationResult.bind(this));
     }
 
+    get sourceMentionInputID() {
+        return this.id + '-source-mention-input';
+    }
+
+    get notesInputID() {
+        return this.id + '-notes-input';
+    }
+
     get entityName(): string {
         return entityTypeNames[this.entityType];
     }
@@ -105,7 +114,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     ngOnDestroy(): void {
         this.link$.complete();
         this.status$.complete();
-        this.formService.detachForm(this.formName);
+        this.formService.detachForm(this.id);
     }
 
     formUrl(linkTo: LinkTo, entityType: Entity): string {
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
index 429cf3ac..e60c3ac9 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
@@ -6,13 +6,13 @@
             ariaLabel="{{ collapsed ? 'show' : 'hide' }} {{contentDescription}}"
             [ngbTooltip]="(collapsed ? 'show' : 'hide') + ' ' + contentDescription"
             [attr.aria-expanded]="!collapsed"
-            [attr.aria-controls]="body.id"
+            [attr.aria-controls]="bodyID"
             (click)="collapsed = !collapsed">
             <lc-icon [icon]="collapsed ? actionIcons.expand : actionIcons.collapse" />
         </button>
         <ng-content select="[cardControl]" />
     </div>
 </div>
-<div class="card-body" lcUniqueID #body [ngbCollapse]="collapsed">
+<div class="card-body" [attr.id]="bodyID" [ngbCollapse]="collapsed">
     <ng-content select="[cardBody]" />
 </div>
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
index de5367fc..98101ccd 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.spec.ts
@@ -4,7 +4,6 @@ import { CollapsibleCardComponent } from './collapsible-card.component';
 import { CommonModule } from '@angular/common';
 import { IconComponent } from '@shared/icon/icon.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { UniqueIDDirective } from '@shared/unique-id.directive';
 
 describe('CollapsibleCardComponent', () => {
     let component: CollapsibleCardComponent;
@@ -12,7 +11,7 @@ describe('CollapsibleCardComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [CollapsibleCardComponent, IconComponent, UniqueIDDirective],
+            declarations: [CollapsibleCardComponent, IconComponent],
             imports: [CommonModule, NgbModule],
         });
         fixture = TestBed.createComponent(CollapsibleCardComponent);
diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts b/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
index 34dd29c6..301c9fce 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.ts
@@ -1,6 +1,8 @@
 import { Component, HostBinding, Input } from '@angular/core';
 import { actionIcons } from '@shared/icons';
 
+let nextID = 0;
+
 @Component({
     selector: 'lc-collapsible-card',
     templateUrl: './collapsible-card.component.html',
@@ -14,4 +16,7 @@ export class CollapsibleCardComponent {
 
     @HostBinding('class.card') card = true;
     actionIcons = actionIcons;
+
+    id = `collapsible-card-${nextID++}`;
+    bodyID = this.id + '-body';
 }
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 63f3cf53..03a3079d 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -13,7 +13,6 @@ import { BaseModalComponent } from "./base-modal/base-modal.component";
 import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
 import { ContributorsComponent } from './contributors/contributors.component';
 import { CollapsibleCardComponent } from './collapsible-card/collapsible-card.component';
-import { UniqueIDDirective } from './unique-id.directive';
 
 
 
@@ -26,7 +25,6 @@ import { UniqueIDDirective } from './unique-id.directive';
         ConfirmationModalComponent,
         ContributorsComponent,
         CollapsibleCardComponent,
-        UniqueIDDirective
     ],
     imports: [
         CommonModule,
@@ -49,7 +47,6 @@ import { UniqueIDDirective } from './unique-id.directive';
         ActionButtonGroupComponent,
         ContributorsComponent,
         CollapsibleCardComponent,
-        UniqueIDDirective,
         CommonModule,
         BrowserModule,
         BrowserAnimationsModule,
diff --git a/frontend/src/app/shared/unique-id.directive.spec.ts b/frontend/src/app/shared/unique-id.directive.spec.ts
deleted file mode 100644
index 815019f2..00000000
--- a/frontend/src/app/shared/unique-id.directive.spec.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { UniqueIDDirective } from './unique-id.directive';
-
-describe('UniqueIdDirective', () => {
-  it('should create an instance', () => {
-    const directive = new UniqueIDDirective();
-    expect(directive).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/shared/unique-id.directive.ts b/frontend/src/app/shared/unique-id.directive.ts
deleted file mode 100644
index bc0d3364..00000000
--- a/frontend/src/app/shared/unique-id.directive.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Directive, HostBinding } from '@angular/core';
-
-/**
- * Generates a unique `id` for the element in the DOM.
- *
- * This is especially useful if you want to reuse a component multiple times on a page.
- *
- * Example usage:
- *
- * ```html
- * <label [attr.for]="nameInput.id">Name</label>
- * <input type="text" lcUniqueID #nameInput>
- * ```
- */
-@Directive({
-    selector: '[lcUniqueID]'
-})
-export class UniqueIDDirective {
-    @HostBinding('attr.id') id = crypto.randomUUID();
-}

From 83da94de7db326dcdf30391be777af53d3095b1b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 19 Sep 2024 12:12:26 +0200
Subject: [PATCH 452/565] interface inheritance

---
 backend/core/types/EntityDescriptionType.py   |  2 +
 backend/core/types/NamedType.py               |  1 +
 backend/core/types/entity.py                  |  2 +-
 backend/event/types/EpisodeAgentType.py       |  4 +-
 backend/event/types/EpisodeEntityLink.py      |  4 +-
 backend/event/types/EpisodeGiftType.py        |  4 +-
 backend/event/types/EpisodeLetterType.py      |  4 +-
 backend/event/types/EpisodeSpaceType.py       |  4 +-
 backend/event/types/EpisodeType.py            |  1 +
 backend/letter/types/GiftDescriptionType.py   |  3 +-
 backend/letter/types/LetterDescriptionType.py |  3 +-
 backend/person/types/AgentDescriptionType.py  |  3 +-
 backend/space/types/SpaceDescriptionType.py   |  3 +-
 frontend/generated/graphql.ts                 | 53 ++++++++-----------
 frontend/generated/schema.graphql             | 42 ++++++---------
 .../gift-identification-form.component.ts     |  6 +--
 .../letter-identification-form.component.ts   |  6 +--
 17 files changed, 59 insertions(+), 86 deletions(-)

diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index 56af6189..f89db74b 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -6,6 +6,7 @@
 
 from user.models import User
 from user.types.UserType import UserType
+from core.types.entity import EntityDescription as EntityDescriptionInterface
 
 
 class EntityDescriptionType(NamedType, AbstractDjangoObjectType):
@@ -27,6 +28,7 @@ class Meta:
             "page",
             "contributors",
         ] + NamedType.fields()
+        interfaces = (EntityDescriptionInterface,)
 
     @staticmethod
     def resolve_contributors(
diff --git a/backend/core/types/NamedType.py b/backend/core/types/NamedType.py
index 39b7b40e..e9148a75 100644
--- a/backend/core/types/NamedType.py
+++ b/backend/core/types/NamedType.py
@@ -10,6 +10,7 @@ class NamedType(AbstractDjangoObjectType):
     """
 
     name = graphene.NonNull(graphene.String)
+    description = graphene.NonNull(graphene.String)
 
     class Meta:
         model = Named
diff --git a/backend/core/types/entity.py b/backend/core/types/entity.py
index 93099226..2710b211 100644
--- a/backend/core/types/entity.py
+++ b/backend/core/types/entity.py
@@ -8,7 +8,7 @@ class Entity(graphene.Enum):
     SPACE = "space"
 
 
-class EntityInterface(graphene.Interface):
+class EntityDescription(graphene.Interface):
     id = graphene.NonNull(graphene.ID)
     name = graphene.String()
     description = graphene.String()
diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
index 48ac29df..14991f89 100644
--- a/backend/event/types/EpisodeAgentType.py
+++ b/backend/event/types/EpisodeAgentType.py
@@ -3,12 +3,12 @@
 
 from core.types.DescriptionFieldType import DescriptionFieldType
 from event.models import EpisodeAgent
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 from core.types.DescriptionFieldType import SourceMentionEnum
 
 class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:
diff --git a/backend/event/types/EpisodeEntityLink.py b/backend/event/types/EpisodeEntityLink.py
index 2dc264e0..bb7e27bd 100644
--- a/backend/event/types/EpisodeEntityLink.py
+++ b/backend/event/types/EpisodeEntityLink.py
@@ -1,13 +1,13 @@
 from graphene import ID, NonNull, String, Interface
 from core.types.DescriptionFieldType import SourceMentionEnum
 from event.types.EpisodeType import EpisodeType
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 
 
 class EpisodeEntityLink(Interface):
     id = NonNull(ID)
     episode = NonNull(EpisodeType)
     entity_type = NonNull(Entity)
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     source_mention = NonNull(SourceMentionEnum)
     note = String()
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
index 9c76abc3..82606b23 100644
--- a/backend/event/types/EpisodeGiftType.py
+++ b/backend/event/types/EpisodeGiftType.py
@@ -1,14 +1,14 @@
 from graphene import NonNull
 from graphene_django import DjangoObjectType
 
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
 from event.models import EpisodeGift
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 
 class EpisodeGiftType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:
diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
index a63e486a..97b3deff 100644
--- a/backend/event/types/EpisodeLetterType.py
+++ b/backend/event/types/EpisodeLetterType.py
@@ -2,12 +2,12 @@
 from graphene_django import DjangoObjectType
 
 from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from event.models import EpisodeLetter
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 class EpisodeLetterType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:
diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
index 24b74bb4..c85c1967 100644
--- a/backend/event/types/EpisodeSpaceType.py
+++ b/backend/event/types/EpisodeSpaceType.py
@@ -2,12 +2,12 @@
 from graphene_django import DjangoObjectType
 
 from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
-from core.types.entity import Entity, EntityInterface
+from core.types.entity import Entity, EntityDescription
 from event.models import EpisodeSpace
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 class EpisodeSpaceType(DescriptionFieldType, DjangoObjectType):
-    entity = NonNull(EntityInterface)
+    entity = NonNull(EntityDescription)
     entity_type = NonNull(Entity)
 
     class Meta:
diff --git a/backend/event/types/EpisodeType.py b/backend/event/types/EpisodeType.py
index 3383d6e4..eee68c82 100644
--- a/backend/event/types/EpisodeType.py
+++ b/backend/event/types/EpisodeType.py
@@ -21,6 +21,7 @@ class Meta:
             "letters",
             "spaces",
         ] + EntityDescriptionType.fields()
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(
diff --git a/backend/letter/types/GiftDescriptionType.py b/backend/letter/types/GiftDescriptionType.py
index 8451d6ec..c69cf8d3 100644
--- a/backend/letter/types/GiftDescriptionType.py
+++ b/backend/letter/types/GiftDescriptionType.py
@@ -6,7 +6,6 @@
 from letter.models import GiftCategory, GiftDescription, GiftDescriptionCategory
 from letter.types.GiftDescriptionCategoryType import GiftDescriptionCategoryType
 from letter.types.GiftCategoryType import GiftCategoryType
-from core.types.entity import EntityInterface
 from event.types.EpisodeGiftType import EpisodeGiftType
 from event.models import EpisodeGift
 
@@ -24,7 +23,7 @@ class Meta:
             "categories",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(
diff --git a/backend/letter/types/LetterDescriptionType.py b/backend/letter/types/LetterDescriptionType.py
index f1e6878a..3cee4396 100644
--- a/backend/letter/types/LetterDescriptionType.py
+++ b/backend/letter/types/LetterDescriptionType.py
@@ -6,7 +6,6 @@
 from letter.models import LetterCategory, LetterDescription, LetterDescriptionCategory
 from letter.types.LetterCategoryType import LetterCategoryType
 from letter.types.LetterDescriptionCategoryType import LetterDescriptionCategoryType
-from core.types.entity import EntityInterface
 from event.models import EpisodeLetter
 from event.types.EpisodeLetterType import EpisodeLetterType
 
@@ -24,7 +23,7 @@ class Meta:
             "categories",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index ba0a8fb1..9f7e2650 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -10,7 +10,6 @@
 from person.types.PersonReferenceType import PersonReferenceType
 from event.types.EpisodeAgentType import EpisodeAgentType
 from event.models import EpisodeAgent
-from core.types.entity import EntityInterface
 
 
 class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
@@ -31,7 +30,7 @@ class Meta:
             "location",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(
diff --git a/backend/space/types/SpaceDescriptionType.py b/backend/space/types/SpaceDescriptionType.py
index eebc53f2..9f7d42d1 100644
--- a/backend/space/types/SpaceDescriptionType.py
+++ b/backend/space/types/SpaceDescriptionType.py
@@ -18,7 +18,6 @@
 from space.types.StructureType import StructureType
 from space.types.SettlementFieldType import SettlementFieldType
 from space.types.StructureFieldType import StructureFieldType
-from core.types.entity import EntityInterface
 from event.types.EpisodeSpaceType import EpisodeSpaceType
 from event.models import EpisodeSpace
 
@@ -41,7 +40,7 @@ class Meta:
             "structures",
             "episodes",
         ] + EntityDescriptionType.fields()
-        interfaces = (EntityInterface,)
+        interfaces = EntityDescriptionType._meta.interfaces
 
     @classmethod
     def get_queryset(
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 59e5250d..b78420b6 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -40,7 +40,7 @@ export type AgentDescriptionLocationType = {
   sourceMention: SourceMention;
 };
 
-export type AgentDescriptionType = EntityInterface & {
+export type AgentDescriptionType = EntityDescription & {
   __typename?: 'AgentDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
@@ -48,7 +48,7 @@ export type AgentDescriptionType = EntityInterface & {
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
   describes: Array<HistoricalPersonType>;
-  description?: Maybe<Scalars['String']['output']>;
+  description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeAgentType>;
@@ -185,7 +185,7 @@ export enum Entity {
   Space = 'SPACE'
 }
 
-export type EntityInterface = {
+export type EntityDescription = {
   description?: Maybe<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
   name?: Maybe<Scalars['String']['output']>;
@@ -195,7 +195,7 @@ export type EpisodeAgentType = EpisodeEntityLink & {
   __typename?: 'EpisodeAgentType';
   agent: AgentDescriptionType;
   certainty: Certainty;
-  entity: EntityInterface;
+  entity: EntityDescription;
   entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -205,14 +205,13 @@ export type EpisodeAgentType = EpisodeEntityLink & {
 
 export type EpisodeCategoryType = {
   __typename?: 'EpisodeCategoryType';
-  /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
 };
 
 export type EpisodeEntityLink = {
-  entity: EntityInterface;
+  entity: EntityDescription;
   entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -223,7 +222,7 @@ export type EpisodeEntityLink = {
 export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
   certainty: Certainty;
-  entity: EntityInterface;
+  entity: EntityDescription;
   entityType: Entity;
   episode: EpisodeType;
   gift: GiftDescriptionType;
@@ -235,7 +234,7 @@ export type EpisodeGiftType = EpisodeEntityLink & {
 export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
   certainty: Certainty;
-  entity: EntityInterface;
+  entity: EntityDescription;
   entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -247,7 +246,7 @@ export type EpisodeLetterType = EpisodeEntityLink & {
 export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
   certainty: Certainty;
-  entity: EntityInterface;
+  entity: EntityDescription;
   entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -256,7 +255,7 @@ export type EpisodeSpaceType = EpisodeEntityLink & {
   space: SpaceDescriptionType;
 };
 
-export type EpisodeType = {
+export type EpisodeType = EntityDescription & {
   __typename?: 'EpisodeType';
   /** agents involved in this episode */
   agents: Array<AgentDescriptionType>;
@@ -266,7 +265,6 @@ export type EpisodeType = {
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
@@ -315,7 +313,6 @@ export type GiftCategorisationInput = {
 
 export type GiftCategoryType = {
   __typename?: 'GiftCategoryType';
-  /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
@@ -332,7 +329,7 @@ export type GiftDescriptionCategoryType = {
   sourceMention: SourceMention;
 };
 
-export type GiftDescriptionType = EntityInterface & {
+export type GiftDescriptionType = EntityDescription & {
   __typename?: 'GiftDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
@@ -341,7 +338,7 @@ export type GiftDescriptionType = EntityInterface & {
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  description?: Maybe<Scalars['String']['output']>;
+  description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeGiftType>;
@@ -360,7 +357,6 @@ export type HistoricalPersonType = {
   contributors: Array<UserType>;
   dateOfBirth?: Maybe<PersonDateOfBirthType>;
   dateOfDeath?: Maybe<PersonDateOfDeathType>;
-  /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
@@ -394,7 +390,7 @@ export type LetterDescriptionCategoryType = {
   sourceMention: SourceMention;
 };
 
-export type LetterDescriptionType = EntityInterface & {
+export type LetterDescriptionType = EntityDescription & {
   __typename?: 'LetterDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
@@ -403,7 +399,7 @@ export type LetterDescriptionType = EntityInterface & {
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  description?: Maybe<Scalars['String']['output']>;
+  description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeLetterType>;
@@ -717,7 +713,6 @@ export type RegionFieldType = {
 export type RegionType = {
   __typename?: 'RegionType';
   contributors: Array<UserType>;
-  /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
@@ -741,7 +736,6 @@ export type SettlementFieldType = {
 export type SettlementType = {
   __typename?: 'SettlementType';
   contributors: Array<UserType>;
-  /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
@@ -808,14 +802,14 @@ export type SourceWrittenDateType = {
   yearUpper: Scalars['Int']['output'];
 };
 
-export type SpaceDescriptionType = EntityInterface & {
+export type SpaceDescriptionType = EntityDescription & {
   __typename?: 'SpaceDescriptionType';
   /** The book in the source */
   book: Scalars['String']['output'];
   /** The chapter or chapters in the source */
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
-  description?: Maybe<Scalars['String']['output']>;
+  description: Scalars['String']['output'];
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeSpaceType>;
@@ -881,7 +875,6 @@ export type StructureFieldType = {
 export type StructureType = {
   __typename?: 'StructureType';
   contributors: Array<UserType>;
-  /** Longer description to help identify this object */
   description: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
@@ -1066,14 +1059,14 @@ export type DataEntryAgentIdentificationQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description?: string | null, isGroup: boolean } | null };
+export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
 
 export type DataEntryAgentQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description?: string | null, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateAgentMutationVariables = Exact<{
   input: UpdateAgentInput;
@@ -1160,7 +1153,7 @@ export type DataEntryGiftIdentificationQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryGiftIdentificationQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description?: string | null } | null };
+export type DataEntryGiftIdentificationQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string } | null };
 
 export type DataEntryGiftSourceTextQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1174,7 +1167,7 @@ export type DataEntryGiftFormQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryGiftFormQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description?: string | null, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryGiftFormQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateGiftMutationVariables = Exact<{
   giftData: UpdateGiftInput;
@@ -1200,7 +1193,7 @@ export type DataEntryLetterIdentificationQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLetterIdentificationQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description?: string | null } | null };
+export type DataEntryLetterIdentificationQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string } | null };
 
 export type DataEntryLetterSourceTextQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1214,7 +1207,7 @@ export type DataEntryLetterFormQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLetterFormQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description?: string | null, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryLetterFormQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateLetterMutationVariables = Exact<{
   letterData: UpdateLetterInput;
@@ -1228,7 +1221,7 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description?: string | null, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
   entity: Scalars['ID']['input'];
@@ -1237,7 +1230,7 @@ export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeAgentType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeGiftType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeLetterType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeSpaceType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | null };
+export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeAgentType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeGiftType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeLetterType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeSpaceType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeEntityLinkMutationVariables = Exact<{
   input: UpdateEpisodeEntityLinkInput;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 54a6bf2e..bfd06295 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -22,7 +22,7 @@ type AgentDescriptionLocationType {
   sourceMention: SourceMention!
 }
 
-type AgentDescriptionType implements EntityInterface {
+type AgentDescriptionType implements EntityDescription {
   """The book in the source"""
   book: String!
 
@@ -30,7 +30,7 @@ type AgentDescriptionType implements EntityInterface {
   chapter: String!
   contributors: [UserType!]!
   describes: [HistoricalPersonType!]!
-  description: String
+  description: String!
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
@@ -162,7 +162,7 @@ enum Entity {
   SPACE
 }
 
-interface EntityInterface {
+interface EntityDescription {
   description: String
   id: ID!
   name: String
@@ -171,7 +171,7 @@ interface EntityInterface {
 type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
   certainty: Certainty!
-  entity: EntityInterface!
+  entity: EntityDescription!
   entityType: Entity!
   episode: EpisodeType!
   id: ID!
@@ -180,14 +180,13 @@ type EpisodeAgentType implements EpisodeEntityLink {
 }
 
 type EpisodeCategoryType {
-  """Longer description to help identify this object"""
   description: String!
   id: ID!
   name: String!
 }
 
 interface EpisodeEntityLink {
-  entity: EntityInterface!
+  entity: EntityDescription!
   entityType: Entity!
   episode: EpisodeType!
   id: ID!
@@ -197,7 +196,7 @@ interface EpisodeEntityLink {
 
 type EpisodeGiftType implements EpisodeEntityLink {
   certainty: Certainty!
-  entity: EntityInterface!
+  entity: EntityDescription!
   entityType: Entity!
   episode: EpisodeType!
   gift: GiftDescriptionType!
@@ -208,7 +207,7 @@ type EpisodeGiftType implements EpisodeEntityLink {
 
 type EpisodeLetterType implements EpisodeEntityLink {
   certainty: Certainty!
-  entity: EntityInterface!
+  entity: EntityDescription!
   entityType: Entity!
   episode: EpisodeType!
   id: ID!
@@ -219,7 +218,7 @@ type EpisodeLetterType implements EpisodeEntityLink {
 
 type EpisodeSpaceType implements EpisodeEntityLink {
   certainty: Certainty!
-  entity: EntityInterface!
+  entity: EntityDescription!
   entityType: Entity!
   episode: EpisodeType!
   id: ID!
@@ -228,7 +227,7 @@ type EpisodeSpaceType implements EpisodeEntityLink {
   space: SpaceDescriptionType!
 }
 
-type EpisodeType {
+type EpisodeType implements EntityDescription {
   """agents involved in this episode"""
   agents: [AgentDescriptionType!]!
 
@@ -239,8 +238,6 @@ type EpisodeType {
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-
-  """Longer description to help identify this object"""
   description: String!
 
   """
@@ -299,7 +296,6 @@ input GiftCategorisationInput {
 }
 
 type GiftCategoryType {
-  """Longer description to help identify this object"""
   description: String!
   id: ID!
   name: String!
@@ -316,7 +312,7 @@ type GiftDescriptionCategoryType {
   sourceMention: SourceMention!
 }
 
-type GiftDescriptionType implements EntityInterface {
+type GiftDescriptionType implements EntityDescription {
   """The book in the source"""
   book: String!
   categories: [GiftCategoryType!]!
@@ -325,7 +321,7 @@ type GiftDescriptionType implements EntityInterface {
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-  description: String
+  description: String!
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
@@ -349,8 +345,6 @@ type HistoricalPersonType {
   contributors: [UserType!]!
   dateOfBirth: PersonDateOfBirthType
   dateOfDeath: PersonDateOfDeathType
-
-  """Longer description to help identify this object"""
   description: String!
   id: ID!
 
@@ -386,7 +380,7 @@ type LetterDescriptionCategoryType {
   sourceMention: SourceMention!
 }
 
-type LetterDescriptionType implements EntityInterface {
+type LetterDescriptionType implements EntityDescription {
   """The book in the source"""
   book: String!
   categories: [LetterCategoryType!]!
@@ -395,7 +389,7 @@ type LetterDescriptionType implements EntityInterface {
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-  description: String
+  description: String!
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
@@ -561,8 +555,6 @@ type RegionFieldType {
 
 type RegionType {
   contributors: [UserType!]!
-
-  """Longer description to help identify this object"""
   description: String!
   id: ID!
 
@@ -589,8 +581,6 @@ type SettlementFieldType {
 
 type SettlementType {
   contributors: [UserType!]!
-
-  """Longer description to help identify this object"""
   description: String!
   id: ID!
 
@@ -675,14 +665,14 @@ type SourceWrittenDateType {
   yearUpper: Int!
 }
 
-type SpaceDescriptionType implements EntityInterface {
+type SpaceDescriptionType implements EntityDescription {
   """The book in the source"""
   book: String!
 
   """The chapter or chapters in the source"""
   chapter: String!
   contributors: [UserType!]!
-  description: String
+  description: String!
 
   """
   Relevant (Latin) terminology used to describe this entity in the source text
@@ -760,8 +750,6 @@ type StructureFieldType {
 
 type StructureType {
   contributors: [UserType!]!
-
-  """Longer description to help identify this object"""
   description: String!
   id: ID!
 
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index 51d679db..c92e7c79 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -99,11 +99,7 @@ export class GiftIdentificationFormComponent implements OnInit {
         if (!gift) {
             return;
         }
-        const value = {
-            name: gift.name,
-            description: gift.description || '',
-        };
-        this.form.patchValue(value, {
+        this.form.patchValue(gift, {
             emitEvent: false,
             onlySelf: true,
         });
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index f2b7f3fe..a2ccdbce 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -100,11 +100,7 @@ export class LetterIdentificationFormComponent implements OnInit {
         if (!letter) {
             return;
         }
-        const value = {
-            name: letter.name,
-            description: letter.description || '',
-        }
-        this.form.patchValue(value, {
+        this.form.patchValue(letter, {
             emitEvent: false,
             onlySelf: true,
         });

From 9f2a48ff0081e4466a9b13663f10efebee57a199 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 16:13:01 +0200
Subject: [PATCH 453/565] clearer filler text in episode preview

---
 .../episode-preview/episode-preview.component.html    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index cd62b2fb..2ed61189 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -19,7 +19,10 @@
         </div>
     </div>
     <div class="card-body">
-        <p>{{ episode.summary || "..." }}</p>
+        <p>
+            <span *ngIf="episode.summary; else noDescription">{{episode.summary}}</span>
+            <ng-template #noDescription><i>(No description added.)</i></ng-template>
+        </p>
 
         <dl>
             <dt>Agents</dt>
@@ -40,7 +43,7 @@
                 </ul>
             </dd>
             <ng-template #noAgents>
-                <dd class="ms-4">No agents have been added yet.</dd>
+                <dd class="ms-4">No agents have been added.</dd>
             </ng-template>
 
             <dt>Locations</dt>
@@ -61,7 +64,7 @@
                 </ul>
             </dd>
             <ng-template #noSpaces>
-                <dd class="ms-4">No locations have been added yet.</dd>
+                <dd class="ms-4">No locations have been added.</dd>
             </ng-template>
 
             <dt>Objects</dt>
@@ -100,7 +103,7 @@
                 </ul>
             </dd>
             <ng-template #noObjects>
-                <dd class="ms-4">No objects have been added yet.</dd>
+                <dd class="ms-4">No objects have been added.</dd>
             </ng-template>
         </dl>
         <div class="d-flex justify-content-end">

From 334354609cf9412499a78fc684207910821b8d05 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 16:29:16 +0200
Subject: [PATCH 454/565] clear up description/summary confusion

---
 frontend/generated/graphql.ts                        |  3 +--
 .../episode-form/episode-form.component.html         |  3 ---
 .../episode-identification-form.component.html       | 12 ------------
 .../episode-identification-form.component.ts         |  6 +-----
 .../src/app/data-entry/episode-form/episode.graphql  |  1 -
 .../episode-preview/episode-preview.component.html   |  4 ++--
 6 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index b78420b6..eb439a0d 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1120,7 +1120,7 @@ export type DataEntryEpisodeFormQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeMutationVariables = Exact<{
   episodeData: UpdateEpisodeInput;
@@ -1651,7 +1651,6 @@ export const DataEntryEpisodeFormDocument = gql`
   episode(id: $id) {
     id
     name
-    description
     source {
       id
       name
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 15f37365..605e0c15 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -6,9 +6,6 @@ <h1 class="mb-4">
         <span class="ms-2">{{ episode.name }}</span>
         <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
     </h1>
-    <p class="lead mb-4" *ngIf="episode.description">
-        {{ episode.description}}
-    </p>
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
index 2849f50a..864a6b08 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
@@ -17,16 +17,4 @@
         />
         <p class="invalid-feedback">This field is required.</p>
     </div>
-
-    <div class="form-group mt-4">
-        <label for="episode-description" class="form-label">Description</label>
-        <p class="form-text">
-            A longer description to help identify this object in the database.
-        </p>
-        <textarea
-            id="episode-description"
-            class="form-control"
-            [formControl]="form.controls.description"
-        ></textarea>
-    </div>
 </form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 3511800f..59e730a1 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -2,7 +2,6 @@ import { Component, DestroyRef, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
-import { ApolloCache } from "@apollo/client/core";
 import { ToastService } from "@services/toast.service";
 import { MutationResult } from "apollo-angular";
 import {
@@ -50,9 +49,6 @@ export class EpisodeIdentificationFormComponent implements OnInit {
             nonNullable: true,
             validators: [Validators.required],
         }),
-        description: new FormControl<string>("", {
-            nonNullable: true,
-        }),
     });
 
     constructor(
@@ -120,7 +116,7 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         );
     }
 
-    private updateCache(cache: ApolloCache<unknown>, id: string): void {
+    private updateCache(cache: any, id: string): void {
         const identified = cache.identify({
             __typename: "EpisodeType",
             id,
diff --git a/frontend/src/app/data-entry/episode-form/episode.graphql b/frontend/src/app/data-entry/episode-form/episode.graphql
index 4457084b..cd27b49d 100644
--- a/frontend/src/app/data-entry/episode-form/episode.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode.graphql
@@ -2,7 +2,6 @@ query DataEntryEpisodeForm($id: ID!) {
     episode(id: $id) {
         id
         name
-        description
         source {
             id
             name
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index 2ed61189..7f107db1 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -20,8 +20,8 @@
     </div>
     <div class="card-body">
         <p>
-            <span *ngIf="episode.summary; else noDescription">{{episode.summary}}</span>
-            <ng-template #noDescription><i>(No description added.)</i></ng-template>
+            <span *ngIf="episode.summary; else noSummary">{{episode.summary}}</span>
+            <ng-template #noSummary><i>(No summary added.)</i></ng-template>
         </p>
 
         <dl>

From f51f50072a58b2e93694062a7834b6e39c0a76e8 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 16:32:49 +0200
Subject: [PATCH 455/565] show page in episode location

---
 .../source/episode-preview/episode-preview.component.html      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index 7f107db1..cbeae8e6 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -6,9 +6,10 @@
                 &nbsp;
                 {{ episode.name }}
                 <br />
-                <small *ngIf="episode.book || episode.chapter" class="inline-list">
+                <small *ngIf="episode.book || episode.chapter || episode.page" class="inline-list">
                     <span *ngIf="episode.book" class="inline-list-item">book {{ episode.book }}</span>
                     <span *ngIf="episode.chapter" class="inline-list-item">chapter {{ episode.chapter }}</span>
+                    <span *ngIf="episode.page" class="inline-list-item">page {{ episode.page }}</span>
                 </small>
             </div>
             <lc-action-button-group

From b58ac556174d022ca2b797e8bda1c9f01befdf40 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 16:41:26 +0200
Subject: [PATCH 456/565] evict cache when updating episode summary

---
 .../episode-contents-form.component.ts        | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index e46af37a..e60743ef 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -92,15 +92,7 @@ export class EpisodeContentsFormComponent implements OnInit {
                         filter(() => this.form.valid),
                         debounceTime(300),
                         withLatestFrom(this.id$),
-                        switchMap(([episode, id]) =>
-                            this.updateEpisode
-                                .mutate({
-                                    episodeData: {
-                                        id,
-                                        ...episode,
-                                    },
-                                })
-                        )
+                        switchMap(this.makeMutation.bind(this))
                     )
                 )
             )
@@ -115,4 +107,22 @@ export class EpisodeContentsFormComponent implements OnInit {
                 }
             });
     }
+
+    private makeMutation([episode, id]: [typeof this.form.value, string]) {
+        return this.updateEpisode.mutate({
+            episodeData: {
+                id,
+                ...episode,
+            },
+        }, {
+            update: (cache) => {
+                const identified = cache.identify({
+                    __typename: "EpisodeType",
+                    id,
+                });
+                cache.evict({ id: identified });
+                cache.gc();
+            },
+        });
+    }
 }

From 456db72a8b81a38dfb505fb55881161a5a462d19 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 16:44:14 +0200
Subject: [PATCH 457/565] show status of episode identification form

---
 .../episode-form/episode-form.component.html  |  2 +
 .../episode-form/episode-form.component.ts    |  7 +-
 .../episode-identification-form.component.ts  | 80 +++++++++++--------
 3 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 605e0c15..35b3de47 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -8,6 +8,8 @@ <h1 class="mb-4">
     </h1>
 </ng-container>
 
+<lc-form-status [status$]="status$" />
+
 <h2 class="subform-header">Identification</h2>
 <lc-episode-identification-form />
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index c9b1a44b..279fd36c 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -14,7 +14,7 @@ import { FormService } from "../shared/form.service";
 export class EpisodeFormComponent {
     Entity = Entity;
 
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
 
     public episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
@@ -49,11 +49,14 @@ export class EpisodeFormComponent {
         })
     );
 
+    status$ = this.formService.status$;
+
     public dataIcons = dataIcons;
     public actionIcons = actionIcons;
 
     constructor(
         private route: ActivatedRoute,
-        private episodeQuery: DataEntryEpisodeFormGQL
+        private episodeQuery: DataEntryEpisodeFormGQL,
+        private formService: FormService,
     ) {}
 }
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 59e730a1..58d9feca 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -1,7 +1,6 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import { MutationResult } from "apollo-angular";
 import {
@@ -16,12 +15,14 @@ import {
     Observable,
     shareReplay,
     switchMap,
+    tap,
     withLatestFrom,
 } from "rxjs";
+import { FormService } from "../../shared/form.service";
+import { formStatusSubject } from "../../shared/utils";
 
 interface EpisodeIdentification {
     name: string;
-    description: string;
 }
 
 type EpisodeIdentificationForm = {
@@ -33,10 +34,8 @@ type EpisodeIdentificationForm = {
     templateUrl: "./episode-identification-form.component.html",
     styleUrls: ["./episode-identification-form.component.scss"],
 })
-export class EpisodeIdentificationFormComponent implements OnInit {
-    public id$: Observable<string> = this.route.params.pipe(
-        map((params) => params["id"])
-    );
+export class EpisodeIdentificationFormComponent implements OnDestroy {
+    public id$ = this.formService.id$;
 
     public episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
@@ -51,15 +50,17 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         }),
     });
 
+    private status$ = formStatusSubject();
+
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeIdentificationGQL,
-        private updateEpisode: DataEntryUpdateEpisodeGQL
-    ) {}
+        private updateEpisode: DataEntryUpdateEpisodeGQL,
+        private formService: FormService,
+    ) {
+        this.formService.attachForm('identification', this.status$);
 
-    public ngOnInit(): void {
         this.episode$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((episode) => {
@@ -72,31 +73,30 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 });
             });
 
+        this.form.statusChanges.pipe(
+            filter(status => status === 'INVALID'),
+            takeUntilDestroyed(),
+        ).subscribe(() => this.status$.next('invalid'));
+
         this.episode$
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([episode, id]) =>
-                            this.performMutation(episode, id)
-                        ),
-                        takeUntilDestroyed(this.destroyRef)
-                    )
-                )
+                switchMap(() => this.form.valueChanges),
+                debounceTime(500),
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                tap(() => this.status$.next('loading')),
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) =>
+                    this.performMutation(episode, id)
+                ),
+                takeUntilDestroyed(this.destroyRef)
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateEpisode?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
-            });
+            .subscribe(this.handleResult.bind(this));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm('identification');
+        this.status$.complete();
     }
 
     private performMutation(
@@ -124,4 +124,18 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         cache.evict({ id: identified });
         cache.gc();
     }
+
+    private handleResult(result: MutationResult<DataEntryUpdateEpisodeMutation>): void {
+        const errors = result.data?.updateEpisode?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next('error');
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        } else {
+            this.status$.next('saved');
+        }
+    }
 }

From ff43c2869a568c8106a8f670fb694c123a14146e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 17:13:31 +0200
Subject: [PATCH 458/565] show form status of episode contents form

---
 .../episode-contents-form.component.ts        | 70 +++++++++++--------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index e60743ef..a0341b13 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -1,12 +1,12 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeCategoriesGQL,
     DataEntryEpisodeContentsGQL,
     DataEntryUpdateEpisodeGQL,
+    DataEntryUpdateEpisodeMutation,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -15,19 +15,21 @@ import {
     Observable,
     shareReplay,
     switchMap,
-    withLatestFrom,
+    tap,
+    withLatestFrom
 } from "rxjs";
 import { LabelSelectOption } from "../../shared/label-select/label-select.component";
+import { FormService } from "../../shared/form.service";
+import { formStatusSubject } from "../../shared/utils";
+import { MutationResult } from "apollo-angular";
 
 @Component({
     selector: "lc-episode-contents-form",
     templateUrl: "./episode-contents-form.component.html",
     styleUrls: ["./episode-contents-form.component.scss"],
 })
-export class EpisodeContentsFormComponent implements OnInit {
-    private id$: Observable<string> = this.route.params.pipe(
-        map((params) => params["id"])
-    );
+export class EpisodeContentsFormComponent implements OnInit, OnDestroy {
+    private id$: Observable<string> = this.formService.id$;
 
     private episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
@@ -56,14 +58,18 @@ export class EpisodeContentsFormComponent implements OnInit {
             })
         );
 
+    private status$ = formStatusSubject();
+
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeContentsGQL,
         private episodeCategoriesQuery: DataEntryEpisodeCategoriesGQL,
         private updateEpisode: DataEntryUpdateEpisodeGQL
-    ) {}
+    ) {
+        this.formService.attachForm('contents', this.status$);
+    }
 
     ngOnInit(): void {
         this.episode$
@@ -86,26 +92,20 @@ export class EpisodeContentsFormComponent implements OnInit {
 
         this.episode$
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(this.makeMutation.bind(this))
-                    )
-                )
+                switchMap(() => this.form.valueChanges),
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                tap(() => this.status$.next('loading')),
+                withLatestFrom(this.id$),
+                switchMap(this.makeMutation.bind(this))
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateEpisode?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
-            });
+            .subscribe(this.handleResult.bind(this));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm('contents');
+        this.status$.complete();
     }
 
     private makeMutation([episode, id]: [typeof this.form.value, string]) {
@@ -125,4 +125,18 @@ export class EpisodeContentsFormComponent implements OnInit {
             },
         });
     }
+
+    private handleResult(result: MutationResult<DataEntryUpdateEpisodeMutation>) {
+        const errors = result.data?.updateEpisode?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next('error');
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        } else {
+            this.status$.next('saved');
+        }
+    }
 }

From 4e9ad39714ff9c144021de876c0bae693f8bb434 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 9 Sep 2024 17:20:08 +0200
Subject: [PATCH 459/565] show status in source text fields

---
 .../episode-source-text-form.component.ts     | 79 +++++++++++--------
 1 file changed, 48 insertions(+), 31 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 0c257e67..92f3a51b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -6,6 +6,7 @@ import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeSourceTextMentionGQL,
     DataEntryUpdateEpisodeGQL,
+    DataEntryUpdateEpisodeMutation,
 } from "generated/graphql";
 import {
     debounceTime,
@@ -14,15 +15,19 @@ import {
     Observable,
     shareReplay,
     switchMap,
+    tap,
     withLatestFrom,
 } from "rxjs";
+import { FormService } from "../../shared/form.service";
+import { formStatusSubject } from "../../shared/utils";
+import { MutationResult } from "apollo-angular";
 
 @Component({
     selector: "lc-episode-source-text-form",
     templateUrl: "./episode-source-text-form.component.html",
     styleUrls: ["./episode-source-text-form.component.scss"],
 })
-export class EpisodeSourceTextFormComponent implements OnInit {
+export class EpisodeSourceTextFormComponent implements OnInit, OnDestroy {
     private id$: Observable<string> = this.route.params.pipe(
         map((params) => params["id"])
     );
@@ -40,13 +45,18 @@ export class EpisodeSourceTextFormComponent implements OnInit {
         page: new FormControl<string>("", { nonNullable: true }),
     });
 
+    private status$ = formStatusSubject();
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeSourceTextMentionGQL,
-        private updateEpisode: DataEntryUpdateEpisodeGQL
-    ) {}
+        private updateEpisode: DataEntryUpdateEpisodeGQL,
+        private formService: FormService,
+    ) {
+        this.formService.attachForm('source-text', this.status$);
+    }
 
     ngOnInit(): void {
         this.episode$
@@ -63,33 +73,40 @@ export class EpisodeSourceTextFormComponent implements OnInit {
 
         this.episode$
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([episode, id]) =>
-                            this.updateEpisode.mutate({
-                                episodeData: {
-                                    id,
-                                    ...episode,
-                                },
-                            })
-                        ),
-                        takeUntilDestroyed(this.destroyRef)
-                    )
-                )
-            )
-            .subscribe((result) => {
-                const errors = result.data?.updateEpisode?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
+                switchMap(() => this.form.valueChanges),
+                map(() => this.form.getRawValue()),
+                filter(() => this.form.valid),
+                debounceTime(300),
+                withLatestFrom(this.id$),
+                tap(() => this.status$.next('loading')),
+                switchMap(([episode, id]) =>
+                    this.updateEpisode.mutate({
+                        episodeData: {
+                            id,
+                            ...episode,
+                        },
+                    })
+                ),
+                takeUntilDestroyed(this.destroyRef)
+        )
+            .subscribe(this.handleResult.bind(this));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm('source-text');
+    }
+
+    private handleResult(result: MutationResult<DataEntryUpdateEpisodeMutation>) {
+        const errors = result.data?.updateEpisode?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next('error');
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
             });
+        } else {
+            this.status$.next('saved');
+        }
     }
 }

From f55eadcc17473494b73230e20061d0825c7d01ff Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 13:26:28 +0200
Subject: [PATCH 460/565] update component spec imports

---
 .../agent-identification-form.component.spec.ts                 | 1 +
 .../episode-contents-form.component.spec.ts                     | 2 ++
 .../episode-identification-form.component.spec.ts               | 2 ++
 .../episode-source-text-form.component.spec.ts                  | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
index d328a9ee..80c9d849 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
@@ -13,6 +13,7 @@ describe('AgentIdentificationFormComponent', () => {
             declarations: [AgentIdentificationFormComponent],
             providers: [FormService],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(AgentIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
index a37f3965..4b0206ac 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeContentsFormComponent } from "./episode-contents-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("EpisodeContentsFormComponent", () => {
     let component: EpisodeContentsFormComponent;
@@ -11,6 +12,7 @@ describe("EpisodeContentsFormComponent", () => {
         TestBed.configureTestingModule({
             declarations: [EpisodeContentsFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(EpisodeContentsFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
index f522e5cd..bd784c99 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeIdentificationFormComponent } from "./episode-identification-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("EpisodeIdentificationFormComponent", () => {
     let component: EpisodeIdentificationFormComponent;
@@ -11,6 +12,7 @@ describe("EpisodeIdentificationFormComponent", () => {
         TestBed.configureTestingModule({
             declarations: [EpisodeIdentificationFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(EpisodeIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
index cdeea205..a2291bbe 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeSourceTextFormComponent } from "./episode-source-text-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("EpisodeSourceTextFormComponent", () => {
     let component: EpisodeSourceTextFormComponent;
@@ -11,6 +12,7 @@ describe("EpisodeSourceTextFormComponent", () => {
         TestBed.configureTestingModule({
             declarations: [EpisodeSourceTextFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(EpisodeSourceTextFormComponent);
         component = fixture.componentInstance;

From e133b68a506dce3dc699c4aeedb7584ef7190e4b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 15:07:16 +0200
Subject: [PATCH 461/565] add contributors in mutations

---
 .../mutations/CreateEpisodeEntityLinkMutation.py   | 10 ++++++++++
 backend/event/mutations/CreateEpisodeMutation.py   |  5 +++++
 .../mutations/DeleteEpisodeEntityLinkMutation.py   |  6 ++++++
 .../mutations/UpdateEpisodeEntityLinkMutation.py   | 14 ++++++++++++--
 backend/person/mutations/CreateAgentMutation.py    | 14 ++++++++++++++
 backend/person/mutations/UpdateAgentMutation.py    |  7 +++++++
 6 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
index 59c2b197..93b34af5 100644
--- a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
@@ -65,6 +65,7 @@ def mutate(cls, root: None, info: ResolveInfo, data: CreateEpisodeEntityLinkInpu
                 obj = LinkModel.objects.create(
                     **{"episode": episode, LinkModel.entity_field: entity}
                 )
+                cls.add_contribution(obj, data, info)
                 obj.clean()
         except ValidationError as e:
             errors = [
@@ -74,3 +75,12 @@ def mutate(cls, root: None, info: ResolveInfo, data: CreateEpisodeEntityLinkInpu
             return cls(ok=False, errors=errors)
 
         return cls(ok=True, errors=[])
+
+    def add_contribution(
+        episode_entity_link: EpisodeEntity,
+        data: CreateEpisodeEntityLinkInput,
+        info: ResolveInfo,
+    ):
+        user = info.context.user
+        episode_entity_link.episode.contributors.add(user)
+        episode_entity_link.entity.contributors.add(user)
diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
index 22b029c6..ef7f50b0 100644
--- a/backend/event/mutations/CreateEpisodeMutation.py
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -41,8 +41,13 @@ def mutate(cls, root: None, info: ResolveInfo, episode_data: CreateEpisodeInput)
             name=getattr(episode_data, "name"),
             source=source,
         )
+        cls.add_contribution(episode, episode_data, info)
 
         user = info.context.user
         episode.contributors.add(user)
 
         return cls(episode=episode, errors=[])  # type: ignore
+
+    def add_contribution(obj: Episode, data: CreateEpisodeInput, info: ResolveInfo):
+        user = info.context.user
+        obj.contributors.add(user)
diff --git a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
index 4ccc92ef..af4c2a67 100644
--- a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
@@ -10,6 +10,7 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from core.types.entity import Entity
 from core.entity_models import ENTITY_MODELS
+from event.models import EpisodeEntity
 
 class DeleteEpisodeEntityLinkMutation(Mutation):
     ok = Boolean(required=True)
@@ -45,3 +46,8 @@ def mutate(
         obj.delete()
 
         return cls(ok=True, errors=[])
+
+    def add_contribution(obj: EpisodeEntity, info: ResolveInfo):
+        user = info.context.user
+        obj.episode.contributors.add(user)
+        obj.entity.contributors.add(user)
diff --git a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
index d3fd0516..6cde530b 100644
--- a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
@@ -11,9 +11,9 @@
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from core.types.DescriptionFieldType import SourceMentionEnum
-from event.models import EpisodeAgent
 from core.types.entity import Entity
 from core.entity_models import ENTITY_MODELS
+from event.models import EpisodeEntity
 
 
 class UpdateEpisodeEntityLinkInput(InputObjectType):
@@ -25,7 +25,7 @@ class UpdateEpisodeEntityLinkInput(InputObjectType):
 
 
 class UpdateEpisodeEntityLinkMutation(LettercraftMutation):
-    django_model = EpisodeAgent
+    django_model = EpisodeEntity
 
     ok = Boolean(required=True)
     errors = List(NonNull(LettercraftErrorType), required=True)
@@ -51,5 +51,15 @@ def mutate(cls, root: None, info: ResolveInfo, data: UpdateEpisodeEntityLinkInpu
         cls.mutate_object(
             data, obj, info, excluded_fields=["entity", "entity_type", "episode"]
         )
+        cls.add_contribution(obj, data, info)
 
         return cls(ok=True, errors=[])
+
+    def add_contribution(
+        obj: EpisodeEntity,
+        data: UpdateEpisodeEntityLinkInput,
+        info: ResolveInfo,
+    ):
+        user = info.context.user
+        obj.episode.contributors.add(user)
+        obj.entity.contributors.add(user)
diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index af5acdfc..30959dbd 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -15,6 +15,8 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from django.core.exceptions import ValidationError
 from django.db import transaction
+from event.models import Episode
+from source.models import Source
 
 
 class CreateAgentInput(InputObjectType):
@@ -38,6 +40,7 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
         try:
             with transaction.atomic():
                 cls.mutate_object(agent_data, agent, info)
+                cls._add_contribution(agent, agent_data, info)
                 agent.full_clean()
         except ValidationError as e:
             errors = [
@@ -47,3 +50,14 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
             return cls(ok=False, agent=None, errors=errors)
 
         return cls(ok=True, agent=agent, errors=[])
+
+    def _add_contribution(
+        agent: AgentDescription, agent_data: CreateAgentInput, info: ResolveInfo
+    ):
+        user = info.context.user
+        agent.contributors.add(user)
+
+        if agent_data.episodes:
+            for episode_id in agent_data.episodes:
+                episode = Episode.objects.get(id=episode_id)
+                episode.contributors.add(user)
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 19abaf9d..90a725ae 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -72,6 +72,7 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: UpdateAgentInput):
                     excluded_fields=["gender", "location"],
                 )
                 cls.handle_nested_fields(agent, agent_data, info)
+                cls.add_contribution(agent, agent_data, info)
                 # refresh to load related objects if those were updated through nested
                 # fields
                 agent.refresh_from_db()
@@ -136,3 +137,9 @@ def mutate_nested_object(
                 related_obj = related_model(**relation)
             cls.mutate_object(nested_data, related_obj, info)
             related_obj.full_clean()
+
+    def add_contribution(
+        agent: AgentDescription, agent_data: UpdateAgentInput, info: ResolveInfo
+    ):
+        user = info.context.user
+        agent.contributors.add(user)

From 00bd41e758ef872133b5648c1bd58e37e6e3b5d3 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 15:35:43 +0200
Subject: [PATCH 462/565] fix contributors in test context

---
 .../mutations/CreateEpisodeEntityLinkMutation.py    |  7 ++++---
 backend/event/mutations/CreateEpisodeMutation.py    |  5 +++--
 .../mutations/DeleteEpisodeEntityLinkMutation.py    |  7 ++++---
 .../mutations/UpdateEpisodeEntityLinkMutation.py    |  7 ++++---
 backend/event/mutations/UpdateEpisodeMutation.py    |  5 +++--
 backend/person/mutations/CreateAgentMutation.py     | 13 +++++++------
 backend/person/mutations/UpdateAgentMutation.py     |  5 +++--
 7 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
index 93b34af5..b1461bd0 100644
--- a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
@@ -81,6 +81,7 @@ def add_contribution(
         data: CreateEpisodeEntityLinkInput,
         info: ResolveInfo,
     ):
-        user = info.context.user
-        episode_entity_link.episode.contributors.add(user)
-        episode_entity_link.entity.contributors.add(user)
+        if info.context:
+            user = info.context.user
+            episode_entity_link.episode.contributors.add(user)
+            episode_entity_link.entity.contributors.add(user)
diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
index ef7f50b0..0d70067e 100644
--- a/backend/event/mutations/CreateEpisodeMutation.py
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -49,5 +49,6 @@ def mutate(cls, root: None, info: ResolveInfo, episode_data: CreateEpisodeInput)
         return cls(episode=episode, errors=[])  # type: ignore
 
     def add_contribution(obj: Episode, data: CreateEpisodeInput, info: ResolveInfo):
-        user = info.context.user
-        obj.contributors.add(user)
+        if info.context:
+            user = info.context.user
+            obj.contributors.add(user)
diff --git a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
index af4c2a67..989e238b 100644
--- a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
@@ -48,6 +48,7 @@ def mutate(
         return cls(ok=True, errors=[])
 
     def add_contribution(obj: EpisodeEntity, info: ResolveInfo):
-        user = info.context.user
-        obj.episode.contributors.add(user)
-        obj.entity.contributors.add(user)
+        if info.context:
+            user = info.context.user
+            obj.episode.contributors.add(user)
+            obj.entity.contributors.add(user)
diff --git a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
index 6cde530b..5b12d33a 100644
--- a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
@@ -60,6 +60,7 @@ def add_contribution(
         data: UpdateEpisodeEntityLinkInput,
         info: ResolveInfo,
     ):
-        user = info.context.user
-        obj.episode.contributors.add(user)
-        obj.entity.contributors.add(user)
+        if info.context:
+            user = info.context.user
+            obj.episode.contributors.add(user)
+            obj.entity.contributors.add(user)
diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index 995207d0..466702df 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -39,8 +39,9 @@ def mutate(cls, root: None, info: ResolveInfo, episode_data: UpdateEpisodeInput)
             )
             return cls(ok=False, errors=[error])  # type: ignore
 
-        user = info.context.user
-        episode.contributors.add(user)
+        if info.context:
+            user = info.context.user
+            episode.contributors.add(user)
 
         episode.save()
 
diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index 30959dbd..d82016fd 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -54,10 +54,11 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
     def _add_contribution(
         agent: AgentDescription, agent_data: CreateAgentInput, info: ResolveInfo
     ):
-        user = info.context.user
-        agent.contributors.add(user)
+        if info.context:
+            user = info.context.user
+            agent.contributors.add(user)
 
-        if agent_data.episodes:
-            for episode_id in agent_data.episodes:
-                episode = Episode.objects.get(id=episode_id)
-                episode.contributors.add(user)
+            if agent_data.episodes:
+                for episode_id in agent_data.episodes:
+                    episode = Episode.objects.get(id=episode_id)
+                    episode.contributors.add(user)
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 90a725ae..03406c0f 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -141,5 +141,6 @@ def mutate_nested_object(
     def add_contribution(
         agent: AgentDescription, agent_data: UpdateAgentInput, info: ResolveInfo
     ):
-        user = info.context.user
-        agent.contributors.add(user)
+        if info.context:
+            user = info.context.user
+            agent.contributors.add(user)

From 0a0c7244dcb0bae723a6003e2b3ac63836a79f94 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 15:37:26 +0200
Subject: [PATCH 463/565] use group icon for groups

---
 .../src/app/data-entry/agent-form/agent-form.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index f9fb8d49..37537d03 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -3,7 +3,7 @@
 
     <ng-container *ngIf="data.agentDescription as agentDescription; else noAgent">
         <h1 class="mb-4">
-            <lc-icon [icon]="dataIcons.person" />
+            <lc-icon [icon]="agentDescription.isGroup ? dataIcons.group : dataIcons.person" />
             {{agentDescription.name}}
             <span class="text-secondary">
                 ({{agentDescription.source.name}})

From 1ac5280704fe41224a372e6a93ce1c726162ca59 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 15:51:06 +0200
Subject: [PATCH 464/565] python 3.9 compatability

---
 backend/core/admin.py                           |  4 ++--
 backend/event/queries.py                        |  5 +++--
 backend/graphql_app/LettercraftMutation.py      |  4 ++--
 backend/letter/queries.py                       | 13 +++++++------
 backend/person/admin.py                         |  5 +++--
 backend/person/mutations/UpdateAgentMutation.py |  4 ++--
 backend/person/queries.py                       |  8 +++++---
 backend/source/queries.py                       |  3 ++-
 backend/space/queries.py                        |  5 +++--
 backend/user/queries.py                         |  4 +++-
 10 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/backend/core/admin.py b/backend/core/admin.py
index b3c8ee7f..a98b0379 100644
--- a/backend/core/admin.py
+++ b/backend/core/admin.py
@@ -3,7 +3,7 @@
 from django.db.models.query import QuerySet
 from django.http import HttpRequest
 import re
-
+from typing import Union
 
 named_fieldset = (
     "Name and description",
@@ -45,7 +45,7 @@ class EntityDescriptionAdmin(admin.ModelAdmin):
 
 
 def get_queryset_matching_parent_source(
-    admin: admin.StackedInline | admin.TabularInline,
+    admin: Union[admin.StackedInline, admin.TabularInline],
     db_field: RelatedField,
     request: HttpRequest,
 ) -> QuerySet:
diff --git a/backend/event/queries.py b/backend/event/queries.py
index a8a63ebc..7210108e 100644
--- a/backend/event/queries.py
+++ b/backend/event/queries.py
@@ -1,6 +1,7 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
 from event.models import Episode, EpisodeCategory, EpisodeEntity
+from typing import Optional
 from event.types.EpisodeCategoryType import EpisodeCategoryType
 from event.types.EpisodeType import EpisodeType
 from event.types.EpisodeEntityLink import EpisodeEntityLink
@@ -20,7 +21,7 @@ class EventQueries(ObjectType):
     )
 
     @staticmethod
-    def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Episode | None:
+    def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Optional[Episode]:
         try:
             return EpisodeType.get_queryset(Episode.objects, info).get(id=id)
         except Episode.DoesNotExist:
@@ -30,7 +31,7 @@ def resolve_episode(parent: None, info: ResolveInfo, id: str) -> Episode | None:
     def resolve_episodes(
         parent: None,
         info: ResolveInfo,
-        source_id: str | None = None,
+        source_id: Optional[str] = None,
     ) -> QuerySet[Episode]:
         filters = Q() if source_id is None else Q(source_id=source_id)
 
diff --git a/backend/graphql_app/LettercraftMutation.py b/backend/graphql_app/LettercraftMutation.py
index 5e4d1b14..d120caed 100644
--- a/backend/graphql_app/LettercraftMutation.py
+++ b/backend/graphql_app/LettercraftMutation.py
@@ -1,4 +1,4 @@
-from typing import Type
+from typing import Type, Optional
 from dataclasses import dataclass
 from graphene import InputObjectType, Mutation, ResolveInfo
 from django.db.models import Model
@@ -17,7 +17,7 @@ class LettercraftMutation(Mutation):
     An extension of Graphene's base Mutation class.
     """
 
-    django_model: Type[Model] | None = None
+    django_model: Optional[Type[Model]] = None
 
     @classmethod
     def get_object(cls, info: ResolveInfo, mutation_input: InputObjectType) -> Model:
diff --git a/backend/letter/queries.py b/backend/letter/queries.py
index 18260b27..b885bbe2 100644
--- a/backend/letter/queries.py
+++ b/backend/letter/queries.py
@@ -1,5 +1,6 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
+from typing import Optional
 
 from letter.models import GiftDescription, LetterCategory, LetterDescription
 from letter.types.LetterCategoryType import LetterCategoryType
@@ -28,7 +29,7 @@ class LetterQueries(ObjectType):
     @staticmethod
     def resolve_letter_description(
         parent: None, info: ResolveInfo, id: str
-    ) -> LetterDescription | None:
+    ) -> Optional[LetterDescription]:
         try:
             return LetterDescriptionType.get_queryset(
                 LetterDescription.objects, info
@@ -40,8 +41,8 @@ def resolve_letter_description(
     def resolve_letter_descriptions(
         parent: None,
         info: ResolveInfo,
-        episode_id: str | None = None,
-        source_id: str | None = None,
+        episode_id: Optional[str] = None,
+        source_id: Optional[str] = None,
     ) -> QuerySet[LetterDescription]:
         filters = Q()
         if episode_id:
@@ -62,7 +63,7 @@ def resolve_letter_categories(
     @staticmethod
     def resolve_gift_description(
         parent: None, info: ResolveInfo, id: str
-    ) -> GiftDescription | None:
+    ) -> Optional[GiftDescription]:
         try:
             return GiftDescriptionType.get_queryset(GiftDescription.objects, info).get(
                 id=id
@@ -74,8 +75,8 @@ def resolve_gift_description(
     def resolve_gift_descriptions(
         parent: None,
         info: ResolveInfo,
-        episode_id: str | None = None,
-        source_id: str | None = None,
+        episode_id: Optional[str] = None,
+        source_id: Optional[str] = None,
     ) -> QuerySet[GiftDescription]:
         filters = Q()
         if episode_id:
diff --git a/backend/person/admin.py b/backend/person/admin.py
index 6f163ceb..819c5a9a 100644
--- a/backend/person/admin.py
+++ b/backend/person/admin.py
@@ -2,6 +2,7 @@
 from django.db.models.fields.related import RelatedField
 from django.db.models.query import QuerySet
 from django.http import HttpRequest
+from typing import Optional
 
 from . import models
 from core import admin as core_admin
@@ -53,8 +54,8 @@ class AgentDescriptionLocationAdmin(admin.StackedInline):
     extra = 0
 
     def get_field_queryset(
-        self, db, db_field: RelatedField, request: HttpRequest | None
-    ) -> QuerySet | None:
+        self, db, db_field: RelatedField, request: Optional[HttpRequest]
+    ) -> Optional[QuerySet]:
         if db_field.name == "location" and request:
             return core_admin.get_queryset_matching_parent_source(
                 self, db_field, request
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index 03406c0f..d0285d2a 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -9,7 +9,7 @@
     Enum,
     NonNull,
 )
-
+from typing import Union
 from person.types.AgentDescriptionType import AgentDescriptionType
 from person.models import AgentDescription, Gender
 from core.models import SourceMention
@@ -109,7 +109,7 @@ def mutate_nested_object(
         agent_data: UpdateAgentInput,
         info: ResolveInfo,
         field_name: str,
-        descriptor: ForwardOneToOneDescriptor | ReverseOneToOneDescriptor,
+        descriptor: Union[ForwardOneToOneDescriptor, ReverseOneToOneDescriptor],
     ):
 
         if not field_name in agent_data:
diff --git a/backend/person/queries.py b/backend/person/queries.py
index 213b8b90..91e933b4 100644
--- a/backend/person/queries.py
+++ b/backend/person/queries.py
@@ -1,5 +1,7 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet, Q
+from typing import Optional
+
 from person.models import AgentDescription
 from person.types.AgentDescriptionType import AgentDescriptionType
 
@@ -13,7 +15,7 @@ class PersonQueries(ObjectType):
     @staticmethod
     def resolve_agent_description(
         parent: None, info: ResolveInfo, id: str
-    ) -> AgentDescription | None:
+    ) -> Optional[AgentDescription]:
         try:
             return AgentDescriptionType.get_queryset(
                 AgentDescription.objects, info
@@ -25,8 +27,8 @@ def resolve_agent_description(
     def resolve_agent_descriptions(
         parent: None,
         info: ResolveInfo,
-        episode_id: str | None = None,
-        source_id: str | None = None,
+        episode_id: Optional[str] = None,
+        source_id: Optional[str] = None,
     ) -> QuerySet[AgentDescription]:
         filters = Q()
         if episode_id:
diff --git a/backend/source/queries.py b/backend/source/queries.py
index 79667285..71ab5a35 100644
--- a/backend/source/queries.py
+++ b/backend/source/queries.py
@@ -1,5 +1,6 @@
 from graphene import ID, Field, NonNull, ObjectType, ResolveInfo
 from graphene_django import DjangoListField
+from typing import Optional
 
 from source.models import Source
 from source.types.SourceType import SourceType
@@ -10,7 +11,7 @@ class SourceQueries(ObjectType):
     sources = DjangoListField(NonNull(SourceType), required=True)
 
     @staticmethod
-    def resolve_source(root: None, info: ResolveInfo, id: str) -> Source | None:
+    def resolve_source(root: None, info: ResolveInfo, id: str) -> Optional[Source]:
         try:
             return SourceType.get_queryset(Source.objects, info).get(pk=id)
         except Source.DoesNotExist:
diff --git a/backend/space/queries.py b/backend/space/queries.py
index b8323a8d..d1996d03 100644
--- a/backend/space/queries.py
+++ b/backend/space/queries.py
@@ -1,5 +1,6 @@
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import Q, QuerySet
+from typing import Optional
 
 from space.models import SpaceDescription
 from space.types.SpaceDescriptionType import SpaceDescriptionType
@@ -14,7 +15,7 @@ class SpaceQueries(ObjectType):
     @staticmethod
     def resolve_space_description(
         parent: None, info: ResolveInfo, id: str
-    ) -> SpaceDescription | None:
+    ) -> Optional[SpaceDescription]:
         try:
             return SpaceDescriptionType.get_queryset(
                 SpaceDescription.objects, info
@@ -26,7 +27,7 @@ def resolve_space_description(
     def resolve_space_descriptions(
         parent: None,
         info: ResolveInfo,
-        source_id: str | None = None,
+        source_id: Optional[str] = None,
     ) -> QuerySet[SpaceDescription]:
         filters = Q() if source_id is None else Q(source_id=source_id)
 
diff --git a/backend/user/queries.py b/backend/user/queries.py
index 6122d999..8688e523 100644
--- a/backend/user/queries.py
+++ b/backend/user/queries.py
@@ -2,6 +2,8 @@
 from django.db.models import QuerySet
 from graphene import ID, Field, List, NonNull, ObjectType, ResolveInfo
 from django.db.models import QuerySet
+from typing import Optional
+
 from user.types.UserType import UserType
 from user.models import User
 
@@ -13,7 +15,7 @@ class UserQueries(ObjectType):
     @staticmethod
     def resolve_user_description(
         parent: None, info: ResolveInfo, id: str
-    ) -> User | None:
+    ) -> Optional[User]:
         try:
             return UserType.get_queryset(User.objects, info).get(id=id)
         except User.DoesNotExist:

From e4b6cac515a20f9aeba8a2bffe23ae5c0d818b06 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 17:07:33 +0200
Subject: [PATCH 465/565] increase budget for bundle

---
 frontend/angular.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/angular.json b/frontend/angular.json
index facd5306..54e798f8 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -47,7 +47,7 @@
                 {
                   "type": "initial",
                   "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumError": "2mb"
                 },
                 {
                   "type": "anyComponentStyle",

From 704bd0937f856d10b09de28cbdb811b80bc8afdc Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 17:46:51 +0200
Subject: [PATCH 466/565] show message when adding agent fails

---
 .../episode-entities-form.component.ts                     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index 6c18b35d..fd939d50 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -15,6 +15,7 @@ import {
 } from "generated/graphql";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { splat, differenceBy } from "@shared/utils";
+import { ToastService } from "@services/toast.service";
 
 type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
 
@@ -51,6 +52,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         private query: DataEntryEpisodeEntitiesGQL,
         private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
         private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
+        private toastService: ToastService,
     ) {
         this.data$ = this.formService.id$.pipe(
             switchMap(id => this.query.watch({ id }).valueChanges),
@@ -139,6 +141,11 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
 
     onError(error: any) {
         console.error(error);
+        this.toastService.show({
+            header: 'Creating agent failed',
+            body: 'Could not create agent',
+            type: 'danger',
+        })
         this.status$.next('error');
     }
 

From e96458a41e6493f23b8883b470fff5743eb3c01c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 17:50:59 +0200
Subject: [PATCH 467/565] cache eviction in episode agents form

---
 .../episode-entities-form.component.ts        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index fd939d50..cc292fb0 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -118,7 +118,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
             entityType: this.entityType,
         };
         this.addMutation.mutate({ input }, {
-            refetchQueries: REFETCH_QUERIES,
+            update: cache => this.updateCacheOnAddRemove(episodeID, entityID, cache),
         }).pipe(
             tap(() => this.status$.next('loading'))
         ).subscribe(this.mutationObserver);
@@ -130,7 +130,9 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
             episode: episodeID,
             entityType: this.entityType,
         };
-        this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
+        this.removeMutation.mutate(data, {
+            update: cache => this.updateCacheOnAddRemove(episodeID, entityID, cache)
+        }).pipe(
             tap(() => this.status$.next('loading'))
         ).subscribe(this.mutationObserver)
     }
@@ -164,4 +166,17 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         const linkedEntities = data.episode?.[this.entityProperty] || [];
         return differenceBy(allEntities, linkedEntities, 'id');
     }
+
+    private updateCacheOnAddRemove(episodeID: string, entityID: string, cache: any) {
+        cache.evict(cache.identify({
+            __typename: "EpisodeType",
+            id: episodeID,
+        }));
+        cache.evict(cache.identify({
+            __typename: "AgentDescriptionType",
+            id: entityID,
+        }));
+        cache.gc();
+    }
+
 }

From d27f8db4d7c49730d09cf444c46c87c1aa523877 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 11 Sep 2024 16:58:52 +0200
Subject: [PATCH 468/565] use confirmationmodal in delete agent component

---
 .../delete-agent/delete-agent.component.html  | 26 +------------------
 .../delete-agent/delete-agent.component.ts    | 24 ++++++++---------
 frontend/src/app/services/modal.service.ts    |  2 +-
 3 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
index a44b74a6..e58283e3 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.html
@@ -1,28 +1,4 @@
-<button class="btn btn-danger" (click)="open(confirmModal)">
+<button class="btn btn-danger" *ngIf="id$ | async as id" (click)="openConfirm(id)">
     <lc-icon [icon]="actionIcons.delete"></lc-icon>
     Delete agent
 </button>
-
-<ng-template #confirmModal let-modal>
-    <div class="modal-header">
-        <h2 class="modal-title" id="modal-title">Delete agent?</h2>
-        <button type="button" class="btn-close" aria-label="close"
-            (click)="modal.dismiss('cancel')">
-        </button>
-    </div>
-    <div class="modal-body">
-        <p>
-            Delete this agent from this source text? They will be removed from <i>all</i>
-            episodes they are involved in!
-        </p>
-    </div>
-    <div class="modal-footer">
-        <button type="button" class="btn btn-danger"
-            *ngIf="id$ | async as id" (click)="modal.close(id)">
-            Delete
-        </button>
-        <button type="button" class="btn btn-secondary" (click)="modal.dismiss('cancel')">
-            Cancel
-        </button>
-    </div>
-</ng-template>
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 68e15142..181fe46a 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -1,13 +1,12 @@
-import { Component, Input, OnDestroy, TemplateRef } from '@angular/core';
+import { Component, Input, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
 import { actionIcons } from '@shared/icons';
 import { DataEntryDeleteAgentGQL, LettercraftErrorType } from 'generated/graphql';
-import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { BehaviorSubject } from 'rxjs';
 import { FormStatus } from '../../shared/types';
+import { ModalService } from '@services/modal.service';
 
 @Component({
     selector: 'lc-delete-agent',
@@ -24,11 +23,11 @@ export class DeleteAgentComponent implements OnDestroy {
     private formName = 'delete';
 
     constructor(
-        private modalService: NgbModal,
         private deleteMutation: DataEntryDeleteAgentGQL,
         private toastService: ToastService,
         private router: Router,
         private formService: FormService,
+        private modalService: ModalService,
     ) {
         this.formService.attachForm(this.formName, this.status$);
     }
@@ -37,19 +36,18 @@ export class DeleteAgentComponent implements OnDestroy {
         this.formService.detachForm(this.formName);
     }
 
-    open(content: TemplateRef<unknown>) {
-        this.modalService.open(content, { ariaLabelledBy: 'modal-title' }).result.then(
-            this.deleteAgent.bind(this),
-            _.constant(undefined), // do nothing on dismiss
-        );
+    openConfirm(id: string) {
+        this.modalService.openConfirmationModal({
+            title: 'Delete agent?',
+            message: `Delete this agent from this source text? They will be removed from all
+            episodes they are involved in!`
+        }).then(() => this.deleteAgent(id));
     }
 
     deleteAgent(id: string) {
         this.status$.next('loading');
         this.deleteMutation.mutate({ id }, {
-            refetchQueries: [
-                'source'
-            ],
+            update: (cache) => cache.evict({ fieldName: "source" }),
         }).subscribe({
             next: (result) => {
                 if (result.data?.deleteAgent?.ok) {
@@ -85,7 +83,7 @@ export class DeleteAgentComponent implements OnDestroy {
         this.toastService.show({
             type: 'danger',
             header: 'Deletion failed',
-            body: `Deleting agent failed:\n${messages}`
+            body: `Deleting agent failed: \n${messages}`
         });
     }
 }
diff --git a/frontend/src/app/services/modal.service.ts b/frontend/src/app/services/modal.service.ts
index 7f9c313e..2ff9f658 100644
--- a/frontend/src/app/services/modal.service.ts
+++ b/frontend/src/app/services/modal.service.ts
@@ -13,7 +13,7 @@ interface ConfirmationModalConfig {
 export class ModalService {
     constructor(private modal: NgbModal) {}
 
-    public openConfirmationModal(config: ConfirmationModalConfig): Promise<void> {
+    public openConfirmationModal(config: ConfirmationModalConfig): Promise<any> {
         const modal = this.modal.open(ConfirmationModalComponent);
         const { title, message } = config;
         modal.componentInstance.title = title;

From 44aeda8baf5d5f6266712cdcf222ead1ce554977 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 17 Sep 2024 17:48:23 +0200
Subject: [PATCH 469/565] style class for designators remove button

---
 .../designators-control/designators-control.component.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index d4b464d4..6f21908d 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -10,7 +10,7 @@
         <li *ngFor="let designator of designators$.value; let i = index"
             class="list-group-item hstack gap-3">
             <span>{{designator}}</span>
-            <button class="btn ms-auto" type="button"
+            <button class="btn btn-light ms-auto" type="button"
                 [disabled]="disabled"
                 (blur)="blur$.next()"
                 (click)="removeDesignator(i)">
@@ -30,7 +30,7 @@
         <button class="btn btn-primary" type="submit"
             [disabled]="disabled"
             (blur)="blur$.next()">
-            <lc-icon [icon]="actionIcons.add" aria-label="add designator" />
+            <lc-icon [icon]="actionIcons.add" aria-label="add provided designator" />
         </button>
     </div>
 </form>

From ba911fdd16bb700fb960dcf4925b3d3d67fd167c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 10 Sep 2024 15:19:34 +0200
Subject: [PATCH 470/565] fix cache updates when adding/removing agent episodes

---
 .../agent-episodes-form.component.ts                | 13 ++++++++++---
 .../episode-entities-form.component.ts              |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index e8c27358..04d6add1 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -15,7 +15,6 @@ import { FormStatus } from '../../shared/types';
 import { MutationResult } from 'apollo-angular';
 import { differenceBy } from '@shared/utils';
 
-const REFETCH_QUERIES = ['DataEntryAgentEpisodes'];
 
 @Component({
   selector: 'lc-agent-episodes-form',
@@ -83,7 +82,7 @@ export class AgentEpisodesFormComponent implements OnDestroy {
             entityType: Entity.Agent,
         };
         this.addMutation.mutate({ input }, {
-            refetchQueries: REFETCH_QUERIES,
+            update: (cache) => this.updateCache(episodeID, agentID, cache),
         }).pipe(
             tap(() => this.status$.next('loading'))
         ).subscribe(this.mutationObserver);
@@ -95,7 +94,9 @@ export class AgentEpisodesFormComponent implements OnDestroy {
             episode: episodeID,
             entityType: Entity.Agent,
         };
-        this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
+        this.removeMutation.mutate(data, {
+            update: (cache) => this.updateCache(episodeID, agentID, cache),
+        }).pipe(
             tap(() => this.status$.next('loading'))
         ).subscribe(this.mutationObserver)
     }
@@ -109,6 +110,12 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         this.status$.next('error');
     }
 
+    private updateCache(episodeID: string, agentID: string, cache: any) {
+        cache.evict({ id: cache.identify({ __typename: "EpisodeType", id: episodeID }) });
+        cache.evict({ id: cache.identify({ __typename: "AgentDescriptionType", id: agentID }) });
+        cache.gc();
+    }
+
     private availableEpisodes(
         data: DataEntryAgentEpisodesQuery
     ): { name: string, id: string }[] {
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index cc292fb0..c39a7c54 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -144,8 +144,8 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
     onError(error: any) {
         console.error(error);
         this.toastService.show({
-            header: 'Creating agent failed',
-            body: 'Could not create agent',
+            header: `Adding ${this.entityName} failed`,
+            body: `Could not add ${this.entityName}`,
             type: 'danger',
         })
         this.status$.next('error');

From 677fbda6417ad19eb0ca316e16223cd19374fb33 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 19 Sep 2024 14:25:25 +0200
Subject: [PATCH 471/565] use python 3.9 in github tests

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b7034a38..9ef7a842 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,7 +44,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
+        python-version: '3.9'
         cache: 'pip'
     - name: Use Node.js
       uses: actions/setup-node@v4

From 31c1f28c5c922cfba09db2fe9eb1df7969e6b4bd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 19 Sep 2024 14:32:50 +0200
Subject: [PATCH 472/565] generalise cache update

---
 .../episode-entities-form.component.ts            | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index c39a7c54..50541e3d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -18,8 +18,7 @@ import { splat, differenceBy } from "@shared/utils";
 import { ToastService } from "@services/toast.service";
 
 type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
-
-const REFETCH_QUERIES = ['DataEntryEpisodeEntities'];
+type EntityTypeName = 'AgentDescriptionType' | 'GiftDescriptionType' | 'LetterDescriptionType' | 'SpaceDescriptionType';
 
 let nextID = 0;
 
@@ -97,6 +96,16 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         return keys[this.entityType]
     }
 
+    get entityTypeName(): EntityTypeName {
+        const types: Record<Entity, EntityTypeName> = {
+            [Entity.Agent]: 'AgentDescriptionType',
+            [Entity.Gift]: 'GiftDescriptionType',
+            [Entity.Letter]: 'LetterDescriptionType',
+            [Entity.Space]: 'SpaceDescriptionType',
+        }
+        return types[this.entityType];
+    }
+
     ngOnChanges(changes: SimpleChanges): void {
         if (changes['entityType']) {
 
@@ -173,7 +182,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
             id: episodeID,
         }));
         cache.evict(cache.identify({
-            __typename: "AgentDescriptionType",
+            __typename: this.entityTypeName,
             id: entityID,
         }));
         cache.gc();

From cdf160e368fd0f92e3a61e7442e772fdfe2795c2 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 19 Sep 2024 14:35:00 +0200
Subject: [PATCH 473/565] fix test module

---
 .../agent-identification-form.component.spec.ts                  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
index 80c9d849..d328a9ee 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.spec.ts
@@ -13,7 +13,6 @@ describe('AgentIdentificationFormComponent', () => {
             declarations: [AgentIdentificationFormComponent],
             providers: [FormService],
             imports: [SharedTestingModule],
-            providers: [FormService],
         });
         fixture = TestBed.createComponent(AgentIdentificationFormComponent);
         component = fixture.componentInstance;

From a50446d71e7ff0bc2cda32238361b19125dbaccb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 21 Sep 2024 13:39:38 +0200
Subject: [PATCH 474/565] Remove status input from FormStatus

---
 .../agent-form/agent-form.component.html      |  2 +-
 .../agent-form/agent-form.component.ts        |  2 --
 .../episode-form/episode-form.component.html  |  3 ++
 .../form-status/form-status.component.ts      | 34 ++++++++++---------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index b16dd437..4318128c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -19,7 +19,7 @@ <h1 class="mb-4">
             </ng-template>
         </p>
 
-        <lc-form-status [status$]="status$" />
+        <lc-form-status />
 
         <div class="hstack">
             <lc-delete-agent class="ms-auto" [navigateOnDelete]="sourceLink(data)" />
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index a7bf3d1d..8e3eb905 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -17,8 +17,6 @@ export class AgentFormComponent {
 
     dataIcons = dataIcons;
 
-    status$ = this.formService.status$;
-
     constructor(
         private agentQuery: DataEntryAgentGQL,
         private formService: FormService,
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 603b5969..aec92d13 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -7,6 +7,9 @@ <h1 class="mb-4">
         <span class="text-body-secondary"> ({{ episode.source.name }}) </span>
     </h1>
     <lc-entity-description-lead [entity]="episode" />
+
+    <lc-form-status />
+
     <lc-delete-entity-button
         (clickDelete)="onClickDelete(episode)"
         [deletingInProgress]="deletingInProgress"
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
index 869f9a91..8651a5e4 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -1,7 +1,7 @@
-import { Component, Input } from '@angular/core';
-import { FormStatus } from '../types';
-import { Observable } from 'rxjs';
-import { statusIcons } from '@shared/icons';
+import { Component } from "@angular/core";
+import { FormStatus } from "../types";
+import { statusIcons } from "@shared/icons";
+import { FormService } from "../form.service";
 
 @Component({
     selector: 'lc-form-status',
@@ -9,23 +9,25 @@ import { statusIcons } from '@shared/icons';
     styleUrls: ['./form-status.component.scss']
 })
 export class FormStatusComponent {
-    @Input({ required: true }) status$!: Observable<FormStatus>;
+    public status$ = this.formService.status$;
 
-    statusIcons = statusIcons;
+    public statusIcons = statusIcons;
+
+    constructor(private formService: FormService) {}
 
     messages: Record<FormStatus, string> = {
-        'idle': 'No changes made',
-        'invalid': 'Form contains errors',
-        'loading': 'Loading...',
-        'saved': 'Changes saved',
-        'error': 'Saving failed',
+        idle: "No changes made",
+        invalid: "Form contains errors",
+        loading: "Loading...",
+        saved: "Changes saved",
+        error: "Saving failed",
     };
 
     classes: Record<FormStatus, string> = {
-        'idle': 'text-secondary',
-        'invalid': 'text-danger',
-        'loading': 'text-secondary',
-        'saved': 'text-success',
-        'error': 'text-danger',
+        idle: "text-secondary",
+        invalid: "text-danger",
+        loading: "text-secondary",
+        saved: "text-success",
+        error: "text-danger",
     };
 }

From db40774ad5c1c6210e6dd5303043489af5dd0611 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 21 Sep 2024 14:12:37 +0200
Subject: [PATCH 475/565] Remove id$ from FormService

---
 .../agent-description-form.component.ts        |  4 +++-
 .../agent-form/agent-form.component.ts         | 18 +++++++++---------
 .../data-entry/agent-form/agent-form.module.ts |  2 ++
 .../agent-identification-form.component.ts     |  6 ++++--
 .../delete-agent/delete-agent.component.ts     |  7 ++++---
 .../shared/data-entry-shared.module.ts         |  2 ++
 .../src/app/data-entry/shared/form.service.ts  |  4 ----
 7 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 9704d1a2..e40d7081 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -21,6 +21,7 @@ import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinct
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
+import { ActivatedRoute } from '@angular/router';
 
 
 @Component({
@@ -67,11 +68,12 @@ export class AgentDescriptionFormComponent implements OnDestroy {
 
     status$ = new BehaviorSubject<FormStatus>('idle');
 
-    private id$ = this.formService.id$;
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
     private data$: Observable<DataEntryAgentDescriptionQuery>;
     private formName = 'description';
 
     constructor(
+        private route: ActivatedRoute,
         private agentQuery: DataEntryAgentDescriptionGQL,
         private locationsQuery: LocationsInSourceListGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index 8e3eb905..35355a3f 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -1,25 +1,25 @@
-import { Component } from '@angular/core';
-import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
-import { dataIcons } from '@shared/icons';
-import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
-import { map, Observable, switchMap } from 'rxjs';
-import { FormService } from '../shared/form.service';
+import { Component } from "@angular/core";
+import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
+import { dataIcons } from "@shared/icons";
+import { DataEntryAgentGQL, DataEntryAgentQuery } from "generated/graphql";
+import { map, Observable, switchMap } from "rxjs";
+import { ActivatedRoute } from "@angular/router";
 
 @Component({
     selector: 'lc-agent-form',
     templateUrl: './agent-form.component.html',
     styleUrls: ['./agent-form.component.scss'],
-    providers: [FormService],
 })
 export class AgentFormComponent {
-    id$: Observable<string> = this.formService.id$;
+    public id$ = this.route.params.pipe(map((params) => params["id"]));
+
     data$: Observable<DataEntryAgentQuery>;
 
     dataIcons = dataIcons;
 
     constructor(
+        private route: ActivatedRoute,
         private agentQuery: DataEntryAgentGQL,
-        private formService: FormService,
     ) {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index 46c71a58..03867948 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -5,6 +5,7 @@ import { AgentIdentificationFormComponent } from './agent-identification-form/ag
 import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 import { DeleteAgentComponent } from './delete-agent/delete-agent.component';
+import { FormService } from '../shared/form.service';
 
 
 
@@ -19,6 +20,7 @@ import { DeleteAgentComponent } from './delete-agent/delete-agent.component';
         SharedModule,
         DataEntrySharedModule
     ],
+    providers: [FormService],
     exports: [
         AgentFormComponent,
     ]
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index de8efdba..0bc630e3 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -17,6 +17,7 @@ import {
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
+import { ActivatedRoute } from '@angular/router';
 
 interface FormData {
     name: string;
@@ -27,7 +28,7 @@ interface FormData {
 @Component({
     selector: 'lc-agent-identification-form',
     templateUrl: './agent-identification-form.component.html',
-    styleUrls: ['./agent-identification-form.component.scss']
+    styleUrls: ['./agent-identification-form.component.scss'],
 })
 export class AgentIdentificationFormComponent implements OnDestroy {
     form = new FormGroup({
@@ -41,10 +42,11 @@ export class AgentIdentificationFormComponent implements OnDestroy {
 
     status$ = new BehaviorSubject<FormStatus>('idle');
 
-    private id$ = this.formService.id$;
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
     private formName = 'identification';
 
     constructor(
+        private route: ActivatedRoute,
         private agentQuery: DataEntryAgentIdentificationGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 68e15142..4dc738eb 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -1,12 +1,12 @@
 import { Component, Input, OnDestroy, TemplateRef } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
 import { actionIcons } from '@shared/icons';
 import { DataEntryDeleteAgentGQL, LettercraftErrorType } from 'generated/graphql';
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, map } from 'rxjs';
 import { FormStatus } from '../../shared/types';
 
 @Component({
@@ -19,11 +19,12 @@ export class DeleteAgentComponent implements OnDestroy {
 
     actionIcons = actionIcons;
 
-    id$ = this.formService.id$;
+    id$ = this.route.params.pipe(map((params) => params["id"]));
     status$ = new BehaviorSubject<FormStatus>('idle');
     private formName = 'delete';
 
     constructor(
+        private route: ActivatedRoute,
         private modalService: NgbModal,
         private deleteMutation: DataEntryDeleteAgentGQL,
         private toastService: ToastService,
diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index 98c04ff0..da3445eb 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -6,6 +6,7 @@ import { LabelSelectComponent } from "./label-select/label-select.component";
 import { EntityDescriptionLeadComponent } from "./entity-description-lead/entity-description-lead.component";
 import { DeleteEntityButtonComponent } from "./delete-entity-button/delete-entity-button.component";
 import { FormStatusComponent } from './form-status/form-status.component';
+import { FormService } from "./form.service";
 
 @NgModule({
     declarations: [
@@ -17,6 +18,7 @@ import { FormStatusComponent } from './form-status/form-status.component';
         FormStatusComponent,
     ],
     imports: [SharedModule],
+    providers: [FormService],
     exports: [
         DesignatorsControlComponent,
         MultiselectComponent,
diff --git a/frontend/src/app/data-entry/shared/form.service.ts b/frontend/src/app/data-entry/shared/form.service.ts
index 62f3fd15..d44a7114 100644
--- a/frontend/src/app/data-entry/shared/form.service.ts
+++ b/frontend/src/app/data-entry/shared/form.service.ts
@@ -6,16 +6,12 @@ import _ from 'underscore';
 
 @Injectable()
 export class FormService {
-    id$: Observable<string>;
 
     status$: Observable<FormStatus>;
 
     private statuses$ = new BehaviorSubject<Record<string, Observable<FormStatus>>>({});
 
     constructor(private route: ActivatedRoute) {
-        this.id$ = this.route.params.pipe(
-            map(params => params['id'])
-        );
         this.status$ = this.statuses$.pipe(
             switchMap(statuses => combineLatest(_.values(statuses))),
             map(this.combinedStatus),

From cd35f106199b44e32739df5617bc9f42db4bed77 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 21 Sep 2024 15:07:44 +0200
Subject: [PATCH 476/565] Provide FormService in DataEntrySharedModule

---
 frontend/src/app/data-entry/agent-form/agent-form.module.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index 03867948..d0bb444c 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -20,7 +20,6 @@ import { FormService } from '../shared/form.service';
         SharedModule,
         DataEntrySharedModule
     ],
-    providers: [FormService],
     exports: [
         AgentFormComponent,
     ]

From a2a849d090f58f25da62f645af095b530ab83696 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 21 Sep 2024 15:10:23 +0200
Subject: [PATCH 477/565] Cleanup

---
 .../agent-identification-form.component.ts                    | 2 --
 frontend/src/app/data-entry/shared/form.service.ts            | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index 0bc630e3..fdec73c8 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -61,8 +61,6 @@ export class AgentIdentificationFormComponent implements OnDestroy {
         ).subscribe(this.updateFormData.bind(this));
 
 
-
-
         this.form.statusChanges.pipe(
             filter(status => status == 'INVALID'),
             takeUntilDestroyed(),
diff --git a/frontend/src/app/data-entry/shared/form.service.ts b/frontend/src/app/data-entry/shared/form.service.ts
index d44a7114..bbcc9abe 100644
--- a/frontend/src/app/data-entry/shared/form.service.ts
+++ b/frontend/src/app/data-entry/shared/form.service.ts
@@ -1,17 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { asyncScheduler, BehaviorSubject, combineLatest, map, Observable, shareReplay, switchMap, throttleTime } from 'rxjs';
 import { FormStatus } from './types';
 import _ from 'underscore';
 
 @Injectable()
 export class FormService {
-
     status$: Observable<FormStatus>;
 
     private statuses$ = new BehaviorSubject<Record<string, Observable<FormStatus>>>({});
 
-    constructor(private route: ActivatedRoute) {
+    constructor() {
         this.status$ = this.statuses$.pipe(
             switchMap(statuses => combineLatest(_.values(statuses))),
             map(this.combinedStatus),

From 57a5a6c97a2bb26bd525dd61fdfe3f49ffb8fb55 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 21 Sep 2024 15:10:39 +0200
Subject: [PATCH 478/565] Hook up EpisodeIdentificationForm

---
 .../episode-identification-form.component.ts  | 87 +++++++++++++------
 1 file changed, 60 insertions(+), 27 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 3511800f..d6e8d106 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -11,14 +11,18 @@ import {
     DataEntryUpdateEpisodeMutation,
 } from "generated/graphql";
 import {
+    BehaviorSubject,
     debounceTime,
     filter,
     map,
     Observable,
+    share,
     shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs";
+import { FormStatus } from "../../shared/types";
+import { FormService } from "../../shared/form.service";
 
 interface EpisodeIdentification {
     name: string;
@@ -34,8 +38,8 @@ type EpisodeIdentificationForm = {
     templateUrl: "./episode-identification-form.component.html",
     styleUrls: ["./episode-identification-form.component.scss"],
 })
-export class EpisodeIdentificationFormComponent implements OnInit {
-    public id$: Observable<string> = this.route.params.pipe(
+export class EpisodeIdentificationFormComponent implements OnInit, OnDestroy {
+    private id$: Observable<string> = this.route.params.pipe(
         map((params) => params["id"])
     );
 
@@ -55,15 +59,21 @@ export class EpisodeIdentificationFormComponent implements OnInit {
         }),
     });
 
+    private formName = "identification";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeIdentificationGQL,
         private updateEpisode: DataEntryUpdateEpisodeGQL
     ) {}
 
-    public ngOnInit(): void {
+    ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.episode$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((episode) => {
@@ -76,31 +86,39 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 });
             });
 
-        this.episode$
+        this.form.statusChanges
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([episode, id]) =>
-                            this.performMutation(episode, id)
-                        ),
-                        takeUntilDestroyed(this.destroyRef)
-                    )
+                filter((status) => status == "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.episode$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
                 )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) => this.performMutation(episode, id)),
+                takeUntilDestroyed(this.destroyRef)
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateEpisode?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
-            });
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
     }
 
     private performMutation(
@@ -115,11 +133,26 @@ export class EpisodeIdentificationFormComponent implements OnInit {
                 },
             },
             {
-                update: cache => this.updateCache(cache, id),
+                update: (cache) => this.updateCache(cache, id),
             }
         );
     }
 
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateEpisodeMutation>
+    ): void {
+        const errors = result.data?.updateEpisode?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        }
+        this.status$.next("saved");
+    }
+
     private updateCache(cache: ApolloCache<unknown>, id: string): void {
         const identified = cache.identify({
             __typename: "EpisodeType",

From 95267a6e2891cc6aa1bae50c055c42462aa0fa8f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 21 Sep 2024 15:17:02 +0200
Subject: [PATCH 479/565] EpisodeContentsForm hooked up to FormStatus

---
 .../episode-contents-form.component.ts        | 94 +++++++++++++------
 1 file changed, 65 insertions(+), 29 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index e46af37a..054b0e46 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -7,24 +7,30 @@ import {
     DataEntryEpisodeCategoriesGQL,
     DataEntryEpisodeContentsGQL,
     DataEntryUpdateEpisodeGQL,
+    DataEntryUpdateEpisodeMutation,
 } from "generated/graphql";
 import {
+    BehaviorSubject,
     debounceTime,
     filter,
     map,
     Observable,
+    share,
     shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs";
 import { LabelSelectOption } from "../../shared/label-select/label-select.component";
+import { FormStatus } from "../../shared/types";
+import { FormService } from "../../shared/form.service";
+import { MutationResult } from "apollo-angular";
 
 @Component({
     selector: "lc-episode-contents-form",
     templateUrl: "./episode-contents-form.component.html",
     styleUrls: ["./episode-contents-form.component.scss"],
 })
-export class EpisodeContentsFormComponent implements OnInit {
+export class EpisodeContentsFormComponent implements OnInit, OnDestroy {
     private id$: Observable<string> = this.route.params.pipe(
         map((params) => params["id"])
     );
@@ -56,9 +62,13 @@ export class EpisodeContentsFormComponent implements OnInit {
             })
         );
 
+    private formName = "contents";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeContentsGQL,
         private episodeCategoriesQuery: DataEntryEpisodeCategoriesGQL,
@@ -66,6 +76,8 @@ export class EpisodeContentsFormComponent implements OnInit {
     ) {}
 
     ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.episode$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((episode) => {
@@ -79,40 +91,64 @@ export class EpisodeContentsFormComponent implements OnInit {
                     },
                     {
                         emitEvent: false,
-                        onlySelf: true
+                        onlySelf: true,
                     }
                 );
             });
 
-        this.episode$
+        this.form.statusChanges
+            .pipe(
+                filter((status) => status == "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.episode$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([episode, id]) =>
-                            this.updateEpisode
-                                .mutate({
-                                    episodeData: {
-                                        id,
-                                        ...episode,
-                                    },
-                                })
-                        )
-                    )
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) =>
+                    this.updateEpisode.mutate({
+                        episodeData: {
+                            id,
+                            ...episode,
+                        },
+                    })
                 )
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateEpisode?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateEpisodeMutation>
+    ): void {
+        const errors = result.data?.updateEpisode?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
             });
+        }
+        this.status$.next("saved");
     }
 }

From 8d13dffa6bf82ccaaadd721642c00bde7efd9dbb Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sat, 21 Sep 2024 15:21:23 +0200
Subject: [PATCH 480/565] EpisodeSourceText hooked up

---
 .../episode-source-text-form.component.ts     | 93 +++++++++++++------
 1 file changed, 65 insertions(+), 28 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 0c257e67..f2c51619 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -6,23 +6,29 @@ import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeSourceTextMentionGQL,
     DataEntryUpdateEpisodeGQL,
+    DataEntryUpdateEpisodeMutation,
 } from "generated/graphql";
 import {
+    BehaviorSubject,
     debounceTime,
     filter,
     map,
     Observable,
+    share,
     shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs";
+import { FormStatus } from "../../shared/types";
+import { FormService } from "../../shared/form.service";
+import { MutationResult } from "apollo-angular";
 
 @Component({
     selector: "lc-episode-source-text-form",
     templateUrl: "./episode-source-text-form.component.html",
     styleUrls: ["./episode-source-text-form.component.scss"],
 })
-export class EpisodeSourceTextFormComponent implements OnInit {
+export class EpisodeSourceTextFormComponent implements OnInit, OnDestroy {
     private id$: Observable<string> = this.route.params.pipe(
         map((params) => params["id"])
     );
@@ -40,15 +46,21 @@ export class EpisodeSourceTextFormComponent implements OnInit {
         page: new FormControl<string>("", { nonNullable: true }),
     });
 
+    private formName = "sourceMention";
+    public status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeSourceTextMentionGQL,
         private updateEpisode: DataEntryUpdateEpisodeGQL
     ) {}
 
     ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.episode$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((episode) => {
@@ -61,35 +73,60 @@ export class EpisodeSourceTextFormComponent implements OnInit {
                 });
             });
 
-        this.episode$
+        this.form.statusChanges
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([episode, id]) =>
-                            this.updateEpisode.mutate({
-                                episodeData: {
-                                    id,
-                                    ...episode,
-                                },
-                            })
-                        ),
-                        takeUntilDestroyed(this.destroyRef)
-                    )
+                filter((status) => status == "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.episode$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
                 )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) =>
+                    this.updateEpisode.mutate({
+                        episodeData: {
+                            id,
+                            ...episode,
+                        },
+                    })
+                ),
+                takeUntilDestroyed(this.destroyRef)
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateEpisode?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateEpisodeMutation>
+    ): void {
+        const errors = result.data?.updateEpisode?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
             });
+        }
+        this.status$.next("saved");
     }
 }

From a512b5b361b6f4ad9b1c286b44c5df6123dd14a1 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 22 Sep 2024 12:23:36 +0200
Subject: [PATCH 481/565] Rename episodeIdentification

---
 .../episode-identification-form.component.ts                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index d6e8d106..c3f99e8c 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -122,13 +122,13 @@ export class EpisodeIdentificationFormComponent implements OnInit, OnDestroy {
     }
 
     private performMutation(
-        episode: EpisodeIdentification,
+        episodeIdentification: EpisodeIdentification,
         id: string
     ): Observable<MutationResult<DataEntryUpdateEpisodeMutation>> {
         return this.updateEpisode.mutate(
             {
                 episodeData: {
-                    ...episode,
+                    ...episodeIdentification,
                     id,
                 },
             },

From 3f12c44963d27bb73577a6e4ec3046efe645f6e9 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 22 Sep 2024 12:37:13 +0200
Subject: [PATCH 482/565] Letter form hooked up to FormStatus

---
 .../letter-categories-form.component.ts       |  90 +++++++++++-
 .../letter-form/letter-form.component.html    |   3 +
 .../letter-identification-form.component.ts   | 130 ++++++++++++------
 .../letter-source-text-form.component.ts      | 108 +++++++++++----
 4 files changed, 257 insertions(+), 74 deletions(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
index a38b0fb5..320c04c4 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { FormControl, FormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
@@ -6,17 +6,22 @@ import {
     DataEntryAllLetterCategoriesGQL,
     DataEntryLetterCategoriesGQL,
     DataEntryUpdateLetterGQL,
+    DataEntryUpdateLetterMutation,
 } from "generated/graphql";
-import { map, Observable, share, switchMap } from "rxjs";
+import { BehaviorSubject, debounceTime, filter, map, Observable, share, switchMap, withLatestFrom } from "rxjs";
 import { MultiselectOption } from "../../shared/multiselect/multiselect.component";
+import { FormStatus } from "../../shared/types";
+import { FormService } from "../../shared/form.service";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { MutationResult } from "apollo-angular";
 
 @Component({
     selector: "lc-letter-categories-form",
     templateUrl: "./letter-categories-form.component.html",
     styleUrls: ["./letter-categories-form.component.scss"],
 })
-export class LetterCategoriesFormComponent {
-    public id$ = this.route.params.pipe(
+export class LetterCategoriesFormComponent implements OnInit, OnDestroy {
+    private id$ = this.route.params.pipe(
         map((params) => params["id"]),
         share()
     );
@@ -43,12 +48,85 @@ export class LetterCategoriesFormComponent {
             )
         );
 
+    private formName = "categories";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private letterQuery: DataEntryLetterCategoriesGQL,
         private letterCategoriesQuery: DataEntryAllLetterCategoriesGQL,
-        private letterMutation: DataEntryUpdateLetterGQL
-    ) {}
+        private updateLetter: DataEntryUpdateLetterGQL
+    ) { }
+
+    ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
+        this.letter$.pipe(
+            takeUntilDestroyed(this.destroyRef)
+        ).subscribe(letter => {
+            if (!letter) {
+                return;
+            }
+            // TODO: patch form with letter data.
+        });
+
+        this.form.statusChanges
+            .pipe(
+                filter((status) => status == "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.letter$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([letter, id]) => this.performMutation(letter, id)),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private performMutation(letterCategories: unknown, id: string): Observable<MutationResult<DataEntryUpdateLetterMutation>> {
+        return this.updateLetter.mutate({
+            letterData: {
+                // ...Add letterCategory data here
+                id,
+            }
+        })
+    }
+
+    private onMutationResult(result: MutationResult<DataEntryUpdateLetterMutation>): void {
+        const errors = result.data?.updateLetter?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        }
+        this.status$.next("saved");
+    }
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 6a707ded..b2208a11 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -10,6 +10,9 @@ <h1 class="mb-4">
     </h1>
 
     <lc-entity-description-lead [entity]="letter" />
+
+    <lc-form-status />
+
     <lc-delete-entity-button
         (clickDelete)="onClickDelete(letter)"
         [deletingInProgress]="deletingInProgress"
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index 965ef88a..ec2f139e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -6,22 +6,34 @@ import { ToastService } from "@services/toast.service";
 import {
     DataEntryLetterIdentificationGQL,
     DataEntryUpdateLetterGQL,
+    DataEntryUpdateLetterMutation,
 } from "generated/graphql";
+import { BehaviorSubject, Observable } from "rxjs";
 import {
     debounceTime,
     filter,
     map,
+    share,
     shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs/operators";
+import { FormStatus } from "../../shared/types";
+import { FormService } from "../../shared/form.service";
+import { ApolloCache } from "@apollo/client/core";
+import { MutationResult } from "apollo-angular";
+
+interface LetterIdentification {
+    name: string;
+    description: string;
+}
 
 @Component({
     selector: "lc-letter-identification-form",
     templateUrl: "./letter-identification-form.component.html",
     styleUrls: ["./letter-identification-form.component.scss"],
 })
-export class LetterIdentificationFormComponent implements OnInit {
+export class LetterIdentificationFormComponent implements OnInit, OnDestroy {
     public id$ = this.route.params.pipe(map((params) => params["id"]));
 
     public letter$ = this.id$.pipe(
@@ -40,15 +52,21 @@ export class LetterIdentificationFormComponent implements OnInit {
         }),
     });
 
+    private formName = "identification";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private letterQuery: DataEntryLetterIdentificationGQL,
-        private letterMutation: DataEntryUpdateLetterGQL
+        private updateLetter: DataEntryUpdateLetterGQL
     ) {}
 
     ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.letter$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((letter) => {
@@ -61,45 +79,79 @@ export class LetterIdentificationFormComponent implements OnInit {
                 });
             });
 
-        this.letter$
+        this.form.statusChanges
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([letter, id]) =>
-                            this.letterMutation.mutate(
-                                {
-                                    letterData: {
-                                        ...letter,
-                                        id,
-                                    },
-                                },
-                                {
-                                    update: (cache) => {
-                                        cache.evict({
-                                            id: `LetterDescriptionType:${id}`,
-                                        });
-                                        cache.gc();
-                                    },
-                                }
-                            )
-                        )
-                    )
-                ),
+                filter((status) => status == "INVALID"),
                 takeUntilDestroyed(this.destroyRef)
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateLetter?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((e) => e.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.letter$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid),
+                    debounceTime(300),
+                    share()
+                )
+            )
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([letter, id]) => this.performMutation(letter, id)),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private performMutation(
+        letter: LetterIdentification,
+        id: string
+    ): Observable<MutationResult<DataEntryUpdateLetterMutation>> {
+        return this.updateLetter.mutate(
+            {
+                letterData: {
+                    ...letter,
+                    id,
+                },
+            },
+            {
+                update: (cache) => this.updateCache(cache, id),
+            }
+        );
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateLetterMutation>
+    ): void {
+        const errors = result.data?.updateLetter?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((e) => e.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
             });
+        }
+        this.status$.next("saved");
+    }
+
+    private updateCache(cache: ApolloCache<unknown>, id: string): void {
+        const identified = cache.identify({
+            __typename: "LetterDescriptionType",
+            id,
+        });
+        cache.evict({ id: identified });
+        cache.gc();
     }
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
index 9daaa4ab..d473f9c3 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -6,22 +6,36 @@ import { ToastService } from "@services/toast.service";
 import {
     DataEntryLetterSourceTextGQL,
     DataEntryUpdateLetterGQL,
+    DataEntryUpdateLetterMutation,
 } from "generated/graphql";
 import {
+    BehaviorSubject,
     debounceTime,
     filter,
     map,
+    Observable,
+    share,
     shareReplay,
     switchMap,
     withLatestFrom,
 } from "rxjs";
+import { FormService } from "../../shared/form.service";
+import { FormStatus } from "../../shared/types";
+import { MutationResult } from "apollo-angular";
+
+interface LetterSourceText {
+    designators: string[];
+    book: string;
+    chapter: string;
+    page: string;
+}
 
 @Component({
     selector: "lc-letter-source-text-form",
     templateUrl: "./letter-source-text-form.component.html",
     styleUrls: ["./letter-source-text-form.component.scss"],
 })
-export class LetterSourceTextFormComponent implements OnInit {
+export class LetterSourceTextFormComponent implements OnInit, OnDestroy {
     private id$ = this.route.params.pipe(map((params) => params["id"]));
 
     public letter$ = this.id$.pipe(
@@ -45,15 +59,21 @@ export class LetterSourceTextFormComponent implements OnInit {
         }),
     });
 
+    private formName = "sourceText";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private letterQuery: DataEntryLetterSourceTextGQL,
-        private letterMutation: DataEntryUpdateLetterGQL
+        private updateLetter: DataEntryUpdateLetterGQL
     ) {}
 
     ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.letter$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((letter) => {
@@ -66,35 +86,65 @@ export class LetterSourceTextFormComponent implements OnInit {
                 });
             });
 
-        this.letter$
+        this.form.statusChanges
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([letter, id]) =>
-                            this.letterMutation.mutate({
-                                letterData: {
-                                    ...letter,
-                                    id,
-                                },
-                            })
-                        )
-                    )
-                ),
+                filter((status) => status == "INVALID"),
                 takeUntilDestroyed(this.destroyRef)
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateLetter?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.letter$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([letter, id]) => this.performMutation(letter, id)),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private performMutation(
+        letterSourceText: LetterSourceText,
+        id: string
+    ): Observable<MutationResult<DataEntryUpdateLetterMutation>> {
+        return this.updateLetter.mutate({
+            letterData: {
+                ...letterSourceText,
+                id,
+            },
+        });
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateLetterMutation>
+    ): void {
+        const errors = result.data?.updateLetter?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
             });
+        }
+        this.status$.next("saved");
     }
 }

From 301988f8072d0a3a35e5345f571e728bd798712f Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 22 Sep 2024 13:05:01 +0200
Subject: [PATCH 483/565] Gift forms hooked up to FormStatus

---
 .../episode-source-text-form.component.ts     |   2 +-
 .../gift-categories-form.component.ts         | 104 +++++++++++++++++-
 .../gift-form/gift-form.component.html        |   3 +
 .../gift-identification-form.component.ts     |  93 +++++++++++-----
 .../gift-source-text-form.component.ts        |  91 ++++++++++-----
 5 files changed, 230 insertions(+), 63 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index f2c51619..48807327 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -47,7 +47,7 @@ export class EpisodeSourceTextFormComponent implements OnInit, OnDestroy {
     });
 
     private formName = "sourceMention";
-    public status$ = new BehaviorSubject<FormStatus>("idle");
+    private status$ = new BehaviorSubject<FormStatus>("idle");
 
     constructor(
         private destroyRef: DestroyRef,
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
index 60061838..370915c1 100644
--- a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { FormGroup, FormControl } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
@@ -6,22 +6,36 @@ import {
     DataEntryGiftCategoriesGQL,
     DataEntryAllGiftCategoriesGQL,
     DataEntryUpdateGiftGQL,
+    DataEntryUpdateGiftMutation,
 } from "generated/graphql";
-import { map, share, switchMap, Observable } from "rxjs";
+import {
+    map,
+    share,
+    switchMap,
+    Observable,
+    BehaviorSubject,
+    filter,
+    debounceTime,
+    withLatestFrom,
+} from "rxjs";
 import { MultiselectOption } from "../../shared/multiselect/multiselect.component";
+import { FormStatus } from "../../shared/types";
+import { FormService } from "../../shared/form.service";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { MutationResult } from "apollo-angular";
 
 @Component({
     selector: "lc-gift-categories-form",
     templateUrl: "./gift-categories-form.component.html",
     styleUrls: ["./gift-categories-form.component.scss"],
 })
-export class GiftCategoriesFormComponent {
-    public id$ = this.route.params.pipe(
+export class GiftCategoriesFormComponent implements OnInit, OnDestroy {
+    private id$ = this.route.params.pipe(
         map((params) => params["id"]),
         share()
     );
 
-    public letter$ = this.id$.pipe(
+    public gift$ = this.id$.pipe(
         switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
         map((result) => result.data.giftDescription)
     );
@@ -43,12 +57,90 @@ export class GiftCategoriesFormComponent {
             )
         );
 
+    private formName = "categories";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private giftQuery: DataEntryGiftCategoriesGQL,
         private giftCategoriesQuery: DataEntryAllGiftCategoriesGQL,
-        private giftMutation: DataEntryUpdateGiftGQL
+        private updateGift: DataEntryUpdateGiftGQL
     ) {}
+
+    ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
+        this.gift$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((letter) => {
+                if (!letter) {
+                    return;
+                }
+                // TODO: patch form with gift data.
+            });
+
+        this.form.statusChanges
+            .pipe(
+                filter((status) => status == "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.gift$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([letter, id]) => this.performMutation(letter, id)),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private performMutation(
+        giftCategories: unknown,
+        id: string
+    ): Observable<MutationResult<DataEntryUpdateGiftMutation>> {
+        return this.updateGift.mutate({
+            giftData: {
+                // ...Add letterCategory data here
+                id,
+            },
+        });
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateGiftMutation>
+    ): void {
+        const errors = result.data?.updateGift?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        }
+        this.status$.next("saved");
+    }
 }
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index 551763de..c22916d9 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -10,6 +10,9 @@ <h1 class="mb-4">
     </h1>
 
     <lc-entity-description-lead [entity]="gift" />
+
+    <lc-form-status />
+
     <lc-delete-entity-button
         (clickDelete)="onClickDelete(gift)"
         [deletingInProgress]="deletingInProgress"
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index 886ed7c3..44c37d03 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormGroup, FormControl, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -18,7 +18,11 @@ import {
     debounceTime,
     withLatestFrom,
     Observable,
+    BehaviorSubject,
+    share,
 } from "rxjs";
+import { FormStatus } from "../../shared/types";
+import { FormService } from "../../shared/form.service";
 
 interface GiftIdentification {
     name: string;
@@ -34,8 +38,8 @@ type GiftIdentificationForm = {
     templateUrl: "./gift-identification-form.component.html",
     styleUrls: ["./gift-identification-form.component.scss"],
 })
-export class GiftIdentificationFormComponent implements OnInit {
-    public id$ = this.route.params.pipe(map((params) => params["id"]));
+export class GiftIdentificationFormComponent implements OnInit, OnDestroy {
+    private id$ = this.route.params.pipe(map((params) => params["id"]));
 
     public gift$ = this.id$.pipe(
         switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
@@ -53,15 +57,21 @@ export class GiftIdentificationFormComponent implements OnInit {
         }),
     });
 
+    private formName = "identification";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private giftQuery: DataEntryGiftIdentificationGQL,
-        private giftMutation: DataEntryUpdateGiftGQL
+        private updateGift: DataEntryUpdateGiftGQL
     ) {}
 
     ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.gift$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((gift) => {
@@ -74,38 +84,46 @@ export class GiftIdentificationFormComponent implements OnInit {
                 });
             });
 
-        this.gift$
+        this.form.statusChanges
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([gift, id]) =>
-                            this.performMutation(gift, id)
-                        )
-                    )
-                ),
+                filter((status) => status == "INVALID"),
                 takeUntilDestroyed(this.destroyRef)
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateGift?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((e) => e.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
-            });
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.gift$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([gift, id]) => this.performMutation(gift, id)),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
     }
 
     private performMutation(
         gift: GiftIdentification,
         id: string
     ): Observable<MutationResult<DataEntryUpdateGiftMutation>> {
-        return this.giftMutation.mutate(
+        return this.updateGift.mutate(
             {
                 giftData: {
                     ...gift,
@@ -118,10 +136,27 @@ export class GiftIdentificationFormComponent implements OnInit {
         );
     }
 
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateGiftMutation>
+    ): void {
+        const errors = result.data?.updateGift?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((e) => e.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        }
+        this.status$.next("saved");
+    }
+
     private updateCache(cache: ApolloCache<unknown>, id: string): void {
-        cache.evict({
-            id: `GiftDescriptionType:${id}`,
+        const identified = cache.identify({
+            __typename: "GiftDescriptionType",
+            id,
         });
+        cache.evict({ id: identified });
         cache.gc();
     }
 }
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
index 484d793e..8f70afe6 100644
--- a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, DestroyRef, OnInit } from "@angular/core";
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormGroup, FormControl } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
@@ -6,6 +6,7 @@ import { ToastService } from "@services/toast.service";
 import {
     DataEntryGiftSourceTextGQL,
     DataEntryUpdateGiftGQL,
+    DataEntryUpdateGiftMutation,
 } from "generated/graphql";
 import {
     map,
@@ -14,14 +15,19 @@ import {
     filter,
     debounceTime,
     withLatestFrom,
+    BehaviorSubject,
+    share,
 } from "rxjs";
+import { FormService } from "../../shared/form.service";
+import { FormStatus } from "../../shared/types";
+import { MutationResult } from "apollo-angular";
 
 @Component({
     selector: "lc-gift-source-text-form",
     templateUrl: "./gift-source-text-form.component.html",
     styleUrls: ["./gift-source-text-form.component.scss"],
 })
-export class GiftSourceTextFormComponent implements OnInit {
+export class GiftSourceTextFormComponent implements OnInit, OnDestroy {
     private id$ = this.route.params.pipe(map((params) => params["id"]));
 
     public gift$ = this.id$.pipe(
@@ -45,15 +51,21 @@ export class GiftSourceTextFormComponent implements OnInit {
         }),
     });
 
+    private formName = "sourceText";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
+        private formService: FormService,
         private toastService: ToastService,
         private giftQuery: DataEntryGiftSourceTextGQL,
         private giftMutation: DataEntryUpdateGiftGQL
     ) {}
 
     ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
         this.gift$
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((gift) => {
@@ -66,35 +78,60 @@ export class GiftSourceTextFormComponent implements OnInit {
                 });
             });
 
-        this.gift$
+        this.form.statusChanges
             .pipe(
-                switchMap(() =>
-                    this.form.valueChanges.pipe(
-                        map(() => this.form.getRawValue()),
-                        filter(() => this.form.valid),
-                        debounceTime(300),
-                        withLatestFrom(this.id$),
-                        switchMap(([gift, id]) =>
-                            this.giftMutation.mutate({
-                                giftData: {
-                                    ...gift,
-                                    id,
-                                },
-                            })
-                        )
-                    )
+                filter((status) => status == "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.gift$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([gift, id]) =>
+                    this.giftMutation.mutate({
+                        giftData: {
+                            ...gift,
+                            id,
+                        },
+                    })
                 ),
                 takeUntilDestroyed(this.destroyRef)
             )
-            .subscribe((result) => {
-                const errors = result.data?.updateGift?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Update failed",
-                    });
-                }
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateGiftMutation>
+    ): void {
+        const errors = result.data?.updateGift?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
             });
+        }
+        this.status$.next("saved");
     }
 }

From 664e851cda54295ad93696b5ce432a1f4f0dc111 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 23 Sep 2024 23:02:53 +0200
Subject: [PATCH 484/565] Fix failing tests

---
 .../delete-entity-button.component.spec.ts    | 32 ++++++++++---------
 .../entity-description-lead.component.spec.ts |  1 +
 .../form-status/form-status.component.spec.ts |  4 ++-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts
index 47021c78..9630791b 100644
--- a/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts
+++ b/frontend/src/app/data-entry/shared/delete-entity-button/delete-entity-button.component.spec.ts
@@ -1,21 +1,23 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from "@angular/core/testing";
 
-import { DeleteEntityButtonComponent } from './delete-entity-button.component';
+import { DeleteEntityButtonComponent } from "./delete-entity-button.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
-describe('DeleteEntityButtonComponent', () => {
-  let component: DeleteEntityButtonComponent;
-  let fixture: ComponentFixture<DeleteEntityButtonComponent>;
+describe("DeleteEntityButtonComponent", () => {
+    let component: DeleteEntityButtonComponent;
+    let fixture: ComponentFixture<DeleteEntityButtonComponent>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [DeleteEntityButtonComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [DeleteEntityButtonComponent],
+            imports: [SharedTestingModule]
+        });
+        fixture = TestBed.createComponent(DeleteEntityButtonComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(DeleteEntityButtonComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
 });
diff --git a/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts
index e882ad2a..8f1d60fd 100644
--- a/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts
+++ b/frontend/src/app/data-entry/shared/entity-description-lead/entity-description-lead.component.spec.ts
@@ -12,6 +12,7 @@ describe("EntityDescriptionLeadComponent", () => {
         });
         fixture = TestBed.createComponent(EntityDescriptionLeadComponent);
         component = fixture.componentInstance;
+        component.entity = { description: "test" };
         fixture.detectChanges();
     });
 
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
index 9fcc0c8c..dab92649 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { FormStatusComponent } from './form-status.component';
+import { FormService } from '../form.service';
 
 describe('FormStatusComponent', () => {
   let component: FormStatusComponent;
@@ -8,7 +9,8 @@ describe('FormStatusComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [FormStatusComponent]
+        declarations: [FormStatusComponent],
+        providers: [FormService]
     });
     fixture = TestBed.createComponent(FormStatusComponent);
     component = fixture.componentInstance;

From c176b8c195a7867fe7e9787f316cdc6932444421 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Mon, 23 Sep 2024 23:52:41 +0200
Subject: [PATCH 485/565] Cleanup

---
 .../agent-form/agent-form.module.ts           |  2 --
 .../agent-identification-form.component.ts    |  2 +-
 .../form-status/form-status.component.ts      | 28 +++++++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-form.module.ts b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
index d0bb444c..0ad0016f 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.module.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.module.ts
@@ -5,8 +5,6 @@ import { AgentIdentificationFormComponent } from './agent-identification-form/ag
 import { AgentDescriptionFormComponent } from './agent-description-form/agent-description-form.component';
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 import { DeleteAgentComponent } from './delete-agent/delete-agent.component';
-import { FormService } from '../shared/form.service';
-
 
 
 @NgModule({
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index fdec73c8..c932207d 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -28,7 +28,7 @@ interface FormData {
 @Component({
     selector: 'lc-agent-identification-form',
     templateUrl: './agent-identification-form.component.html',
-    styleUrls: ['./agent-identification-form.component.scss'],
+    styleUrls: ['./agent-identification-form.component.scss']
 })
 export class AgentIdentificationFormComponent implements OnDestroy {
     form = new FormGroup({
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
index 8651a5e4..d5eacc5c 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -1,7 +1,7 @@
-import { Component } from "@angular/core";
-import { FormStatus } from "../types";
-import { statusIcons } from "@shared/icons";
-import { FormService } from "../form.service";
+import { Component } from '@angular/core';
+import { FormStatus } from '../types';
+import { statusIcons } from '@shared/icons';
+import { FormService } from '../form.service';
 
 @Component({
     selector: 'lc-form-status',
@@ -16,18 +16,18 @@ export class FormStatusComponent {
     constructor(private formService: FormService) {}
 
     messages: Record<FormStatus, string> = {
-        idle: "No changes made",
-        invalid: "Form contains errors",
-        loading: "Loading...",
-        saved: "Changes saved",
-        error: "Saving failed",
+        idle: 'No changes made',
+        invalid: 'Form contains errors',
+        loading: 'Loading...',
+        saved: 'Changes saved',
+        error: 'Saving failed',
     };
 
     classes: Record<FormStatus, string> = {
-        idle: "text-secondary",
-        invalid: "text-danger",
-        loading: "text-secondary",
-        saved: "text-success",
-        error: "text-danger",
+        idle: 'text-secondary',
+        invalid: 'text-danger',
+        loading: 'text-secondary',
+        saved: 'text-success',
+        error: 'text-danger',
     };
 }

From 31eccabc1664dde478272fc119ae495fbb174eed Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 24 Sep 2024 13:48:52 +0200
Subject: [PATCH 486/565] remove entity_type from query output

---
 backend/event/types/EpisodeAgentType.py  | 2 --
 backend/event/types/EpisodeEntityLink.py | 1 -
 backend/event/types/EpisodeGiftType.py   | 1 -
 backend/event/types/EpisodeLetterType.py | 4 +---
 backend/event/types/EpisodeSpaceType.py  | 3 +--
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
index 14991f89..6368e936 100644
--- a/backend/event/types/EpisodeAgentType.py
+++ b/backend/event/types/EpisodeAgentType.py
@@ -9,7 +9,6 @@
 
 class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityDescription)
-    entity_type = NonNull(Entity)
 
     class Meta:
         model = EpisodeAgent
@@ -18,6 +17,5 @@ class Meta:
             "episode",
             "agent",
             "entity",
-            "entity_type",
         ] + DescriptionFieldType.fields()
         interfaces = (EpisodeEntityLink,)
diff --git a/backend/event/types/EpisodeEntityLink.py b/backend/event/types/EpisodeEntityLink.py
index bb7e27bd..c9267db8 100644
--- a/backend/event/types/EpisodeEntityLink.py
+++ b/backend/event/types/EpisodeEntityLink.py
@@ -7,7 +7,6 @@
 class EpisodeEntityLink(Interface):
     id = NonNull(ID)
     episode = NonNull(EpisodeType)
-    entity_type = NonNull(Entity)
     entity = NonNull(EntityDescription)
     source_mention = NonNull(SourceMentionEnum)
     note = String()
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
index 82606b23..02d10d48 100644
--- a/backend/event/types/EpisodeGiftType.py
+++ b/backend/event/types/EpisodeGiftType.py
@@ -9,7 +9,6 @@
 
 class EpisodeGiftType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityDescription)
-    entity_type = NonNull(Entity)
 
     class Meta:
         model = EpisodeGift
diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
index 97b3deff..95a0bddb 100644
--- a/backend/event/types/EpisodeLetterType.py
+++ b/backend/event/types/EpisodeLetterType.py
@@ -1,14 +1,13 @@
 from graphene import NonNull
 from graphene_django import DjangoObjectType
 
-from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
+from core.types.DescriptionFieldType import DescriptionFieldType
 from core.types.entity import Entity, EntityDescription
 from event.models import EpisodeLetter
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 class EpisodeLetterType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityDescription)
-    entity_type = NonNull(Entity)
 
     class Meta:
         model = EpisodeLetter
@@ -17,6 +16,5 @@ class Meta:
             "episode",
             "letter",
             "entity",
-            "entity_type",
         ] + DescriptionFieldType.fields()
         interfaces = (EpisodeEntityLink,)
diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
index c85c1967..fee80922 100644
--- a/backend/event/types/EpisodeSpaceType.py
+++ b/backend/event/types/EpisodeSpaceType.py
@@ -1,14 +1,13 @@
 from graphene import NonNull
 from graphene_django import DjangoObjectType
 
-from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
+from core.types.DescriptionFieldType import DescriptionFieldType
 from core.types.entity import Entity, EntityDescription
 from event.models import EpisodeSpace
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
 class EpisodeSpaceType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityDescription)
-    entity_type = NonNull(Entity)
 
     class Meta:
         model = EpisodeSpace

From ed32f5dd8a1ccdfc59102d04da232b9e2a3c487d Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 24 Sep 2024 13:50:57 +0200
Subject: [PATCH 487/565] remove unused imports

---
 backend/event/types/EpisodeAgentType.py  | 3 +--
 backend/event/types/EpisodeGiftType.py   | 4 ++--
 backend/event/types/EpisodeLetterType.py | 2 +-
 backend/event/types/EpisodeSpaceType.py  | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/event/types/EpisodeAgentType.py b/backend/event/types/EpisodeAgentType.py
index 6368e936..36068f0a 100644
--- a/backend/event/types/EpisodeAgentType.py
+++ b/backend/event/types/EpisodeAgentType.py
@@ -3,9 +3,8 @@
 
 from core.types.DescriptionFieldType import DescriptionFieldType
 from event.models import EpisodeAgent
-from core.types.entity import Entity, EntityDescription
+from core.types.entity import EntityDescription
 from event.types.EpisodeEntityLink import EpisodeEntityLink
-from core.types.DescriptionFieldType import SourceMentionEnum
 
 class EpisodeAgentType(DescriptionFieldType, DjangoObjectType):
     entity = NonNull(EntityDescription)
diff --git a/backend/event/types/EpisodeGiftType.py b/backend/event/types/EpisodeGiftType.py
index 02d10d48..216c90cd 100644
--- a/backend/event/types/EpisodeGiftType.py
+++ b/backend/event/types/EpisodeGiftType.py
@@ -1,8 +1,8 @@
 from graphene import NonNull
 from graphene_django import DjangoObjectType
 
-from core.types.entity import Entity, EntityDescription
-from core.types.DescriptionFieldType import DescriptionFieldType, SourceMentionEnum
+from core.types.entity import EntityDescription
+from core.types.DescriptionFieldType import DescriptionFieldType
 from event.models import EpisodeGift
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
diff --git a/backend/event/types/EpisodeLetterType.py b/backend/event/types/EpisodeLetterType.py
index 95a0bddb..3fb466af 100644
--- a/backend/event/types/EpisodeLetterType.py
+++ b/backend/event/types/EpisodeLetterType.py
@@ -2,7 +2,7 @@
 from graphene_django import DjangoObjectType
 
 from core.types.DescriptionFieldType import DescriptionFieldType
-from core.types.entity import Entity, EntityDescription
+from core.types.entity import EntityDescription
 from event.models import EpisodeLetter
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 
diff --git a/backend/event/types/EpisodeSpaceType.py b/backend/event/types/EpisodeSpaceType.py
index fee80922..647a990a 100644
--- a/backend/event/types/EpisodeSpaceType.py
+++ b/backend/event/types/EpisodeSpaceType.py
@@ -2,7 +2,7 @@
 from graphene_django import DjangoObjectType
 
 from core.types.DescriptionFieldType import DescriptionFieldType
-from core.types.entity import Entity, EntityDescription
+from core.types.entity import EntityDescription
 from event.models import EpisodeSpace
 from event.types.EpisodeEntityLink import EpisodeEntityLink
 

From 6a90f2941faf305a48b2374340d423ad6b25cacb Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 24 Sep 2024 14:31:02 +0200
Subject: [PATCH 488/565] remove unused imports / variables

---
 .../gift-identification-form.component.ts                       | 1 -
 frontend/src/app/data-entry/shared/types.ts                     | 2 --
 2 files changed, 3 deletions(-)

diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index c92e7c79..dab3d11f 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -7,7 +7,6 @@ import { ToastService } from "@services/toast.service";
 import { MutationResult } from "apollo-angular";
 import {
     DataEntryGiftIdentificationGQL,
-    DataEntryGiftIdentificationQuery,
     DataEntryUpdateGiftGQL,
     DataEntryUpdateGiftMutation,
     GiftDescriptionType,
diff --git a/frontend/src/app/data-entry/shared/types.ts b/frontend/src/app/data-entry/shared/types.ts
index cd94fb8d..1746cd00 100644
--- a/frontend/src/app/data-entry/shared/types.ts
+++ b/frontend/src/app/data-entry/shared/types.ts
@@ -1,5 +1,3 @@
 export type FormStatus = 'idle' | 'invalid' | 'loading' | 'saved' | 'error';
 
-export type EntityType = 'agent';
-
 export type SelectOptions<T> = { value: T, label: string }[];

From f034b6c08f7b28554ddd15bea7f4990e4e482eda Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 24 Sep 2024 14:37:08 +0200
Subject: [PATCH 489/565] update docstrings

---
 frontend/src/app/data-entry/shared/utils.ts | 1 -
 frontend/src/app/shared/utils.ts            | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
index 6289bc5f..cccbe978 100644
--- a/frontend/src/app/data-entry/shared/utils.ts
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -1,7 +1,6 @@
 import { Entity, SourceMention } from "generated/graphql";
 import { FormStatus, SelectOptions } from "./types";
 import { BehaviorSubject } from "rxjs";
-import _ from "underscore";
 
 export const sourceMentionSelectOptions = (): SelectOptions<SourceMention> => [
     { value: SourceMention.Direct, label: 'Directly mentioned' },
diff --git a/frontend/src/app/shared/utils.ts b/frontend/src/app/shared/utils.ts
index e609ed2c..7b91a0f6 100644
--- a/frontend/src/app/shared/utils.ts
+++ b/frontend/src/app/shared/utils.ts
@@ -7,7 +7,7 @@ import _ from "underscore";
  * Similar to _.difference, but compares on a specified key.
  *
  * @param list The starting list
- * @param others The list with values to excluded
+ * @param others The list with values to exclude
  * @param key The property by which to compare objects
  * @returns The contents of `list` for which no value in `others` matches the `key`
  * property.
@@ -26,11 +26,11 @@ export const differenceBy = <T extends object>(
  * For example:
  *
  * ```ts
- * splat(Math.min)([3, 5, 2]) // => 2
+ * splat(Math.min)([3, 5, 2]) // => Math.min(3, 5, 2) => 2
  * ```
  *
  * @param func Function to transform
- * @return A function that accepts an array of the arguments to `func`, and returns
+ * @returns A function that accepts an array of the arguments to `func`, and returns
  * the output of `func`.
  */
 export const splat = <I, O>(func: (...a: I[]) => O) =>

From 1fd0b6dfe0846a592e9983e03c9aca31e8104216 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 24 Sep 2024 14:43:41 +0200
Subject: [PATCH 490/565] clarity updates

---
 .../episode-entities-form.component.ts               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index 6c18b35d..bb450d6b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, Input, OnChanges, OnDestroy, SimpleChanges, ViewChild } from "@angular/core";
+import { Component, Input, OnChanges, OnDestroy, SimpleChanges } from "@angular/core";
 import { map, Observable, Observer, Subject, switchMap, tap, withLatestFrom } from "rxjs";
 import { entityTypeNames, formStatusSubject } from "../../shared/utils";
 import { actionIcons } from "@shared/icons";
@@ -28,7 +28,7 @@ let nextID = 0;
     styleUrls: ["./episode-entities-form.component.scss"],
 })
 export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
-    @Input() entityType: Entity = Entity.Agent;
+    @Input() entityType!: Entity;
 
     data$: Observable<DataEntryEpisodeEntitiesQuery>;
 
@@ -41,7 +41,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
     status$ = formStatusSubject();
     id = `episode-entities-${nextID++}`;
 
-    private mutationObserver: Partial<Observer<MutationResult>> = {
+    private mutationRequestObserver: Partial<Observer<MutationResult>> = {
         next: this.onSuccess.bind(this),
         error: this.onError.bind(this),
     };
@@ -119,7 +119,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
             refetchQueries: REFETCH_QUERIES,
         }).pipe(
             tap(() => this.status$.next('loading'))
-        ).subscribe(this.mutationObserver);
+        ).subscribe(this.mutationRequestObserver);
     }
 
     removeEntity(entityID: string, episodeID: string): void {
@@ -130,7 +130,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         };
         this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
             tap(() => this.status$.next('loading'))
-        ).subscribe(this.mutationObserver)
+        ).subscribe(this.mutationRequestObserver)
     }
 
     onSuccess() {
@@ -154,7 +154,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
             name: string,
             id: string
         }[] = data.episode?.source[this.entityProperty] || [];
-        const linkedEntities = data.episode?.[this.entityProperty] || [];
+        const linkedEntities = this.linkedEntities(data);
         return differenceBy(allEntities, linkedEntities, 'id');
     }
 }

From 71391709ede181eba94c498fa42d71a6e6cbcc9b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 24 Sep 2024 14:44:34 +0200
Subject: [PATCH 491/565] Reverted component-scoped FormService

---
 .../agent-description-form.component.ts       |  4 +--
 .../agent-form/agent-form.component.html      |  2 +-
 .../agent-form/agent-form.component.ts        | 20 ++++++------
 .../agent-identification-form.component.ts    |  4 +--
 .../delete-agent/delete-agent.component.ts    |  7 ++--
 .../episode-contents-form.component.spec.ts   |  2 ++
 .../episode-contents-form.component.ts        |  6 +---
 .../episode-form/episode-form.component.html  |  2 +-
 .../episode-form/episode-form.component.ts    | 32 ++++++++++++-------
 ...sode-identification-form.component.spec.ts |  2 ++
 .../episode-identification-form.component.ts  |  6 +---
 ...episode-source-text-form.component.spec.ts |  2 ++
 .../episode-source-text-form.component.ts     |  7 +---
 .../gift-categories-form.component.spec.ts    |  4 ++-
 .../gift-categories-form.component.ts         |  7 +---
 .../gift-form/gift-form.component.html        |  2 +-
 .../gift-form/gift-form.component.ts          | 10 ++++--
 ...gift-identification-form.component.spec.ts |  4 ++-
 .../gift-identification-form.component.ts     |  4 +--
 .../gift-source-text-form.component.spec.ts   |  4 ++-
 .../gift-source-text-form.component.ts        |  4 +--
 .../letter-categories-form.component.spec.ts  |  4 ++-
 .../letter-categories-form.component.ts       |  7 +---
 .../letter-form/letter-form.component.html    |  2 +-
 .../letter-form/letter-form.component.ts      | 10 ++++--
 ...tter-identification-form.component.spec.ts |  4 ++-
 .../letter-identification-form.component.ts   |  4 +--
 .../letter-source-text-form.component.spec.ts |  4 ++-
 .../letter-source-text-form.component.ts      |  4 +--
 .../shared/data-entry-shared.module.ts        |  2 --
 .../form-status/form-status.component.spec.ts |  4 +--
 .../form-status/form-status.component.ts      | 12 +++----
 .../src/app/data-entry/shared/form.service.ts | 11 ++++++-
 33 files changed, 103 insertions(+), 100 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index e40d7081..9704d1a2 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -21,7 +21,6 @@ import { Observable, map, switchMap, shareReplay, filter, debounceTime, distinct
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
-import { ActivatedRoute } from '@angular/router';
 
 
 @Component({
@@ -68,12 +67,11 @@ export class AgentDescriptionFormComponent implements OnDestroy {
 
     status$ = new BehaviorSubject<FormStatus>('idle');
 
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
     private data$: Observable<DataEntryAgentDescriptionQuery>;
     private formName = 'description';
 
     constructor(
-        private route: ActivatedRoute,
         private agentQuery: DataEntryAgentDescriptionGQL,
         private locationsQuery: LocationsInSourceListGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 4318128c..b16dd437 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -19,7 +19,7 @@ <h1 class="mb-4">
             </ng-template>
         </p>
 
-        <lc-form-status />
+        <lc-form-status [status$]="status$" />
 
         <div class="hstack">
             <lc-delete-agent class="ms-auto" [navigateOnDelete]="sourceLink(data)" />
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index 35355a3f..a7bf3d1d 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -1,25 +1,27 @@
-import { Component } from "@angular/core";
-import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
-import { dataIcons } from "@shared/icons";
-import { DataEntryAgentGQL, DataEntryAgentQuery } from "generated/graphql";
-import { map, Observable, switchMap } from "rxjs";
-import { ActivatedRoute } from "@angular/router";
+import { Component } from '@angular/core';
+import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
+import { dataIcons } from '@shared/icons';
+import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
+import { map, Observable, switchMap } from 'rxjs';
+import { FormService } from '../shared/form.service';
 
 @Component({
     selector: 'lc-agent-form',
     templateUrl: './agent-form.component.html',
     styleUrls: ['./agent-form.component.scss'],
+    providers: [FormService],
 })
 export class AgentFormComponent {
-    public id$ = this.route.params.pipe(map((params) => params["id"]));
-
+    id$: Observable<string> = this.formService.id$;
     data$: Observable<DataEntryAgentQuery>;
 
     dataIcons = dataIcons;
 
+    status$ = this.formService.status$;
+
     constructor(
-        private route: ActivatedRoute,
         private agentQuery: DataEntryAgentGQL,
+        private formService: FormService,
     ) {
         this.data$ = this.id$.pipe(
             switchMap(id => this.agentQuery.watch({ id }).valueChanges),
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index c932207d..2cfc32e5 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -17,7 +17,6 @@ import {
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
-import { ActivatedRoute } from '@angular/router';
 
 interface FormData {
     name: string;
@@ -42,11 +41,10 @@ export class AgentIdentificationFormComponent implements OnDestroy {
 
     status$ = new BehaviorSubject<FormStatus>('idle');
 
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
     private formName = 'identification';
 
     constructor(
-        private route: ActivatedRoute,
         private agentQuery: DataEntryAgentIdentificationGQL,
         private agentMutation: DataEntryUpdateAgentGQL,
         private toastService: ToastService,
diff --git a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
index 4dc738eb..68e15142 100644
--- a/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
+++ b/frontend/src/app/data-entry/agent-form/delete-agent/delete-agent.component.ts
@@ -1,12 +1,12 @@
 import { Component, Input, OnDestroy, TemplateRef } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
 import { actionIcons } from '@shared/icons';
 import { DataEntryDeleteAgentGQL, LettercraftErrorType } from 'generated/graphql';
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
-import { BehaviorSubject, map } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { FormStatus } from '../../shared/types';
 
 @Component({
@@ -19,12 +19,11 @@ export class DeleteAgentComponent implements OnDestroy {
 
     actionIcons = actionIcons;
 
-    id$ = this.route.params.pipe(map((params) => params["id"]));
+    id$ = this.formService.id$;
     status$ = new BehaviorSubject<FormStatus>('idle');
     private formName = 'delete';
 
     constructor(
-        private route: ActivatedRoute,
         private modalService: NgbModal,
         private deleteMutation: DataEntryDeleteAgentGQL,
         private toastService: ToastService,
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
index a37f3965..4b0206ac 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeContentsFormComponent } from "./episode-contents-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("EpisodeContentsFormComponent", () => {
     let component: EpisodeContentsFormComponent;
@@ -11,6 +12,7 @@ describe("EpisodeContentsFormComponent", () => {
         TestBed.configureTestingModule({
             declarations: [EpisodeContentsFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(EpisodeContentsFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index 054b0e46..3554a765 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeCategoriesGQL,
@@ -31,9 +30,7 @@ import { MutationResult } from "apollo-angular";
     styleUrls: ["./episode-contents-form.component.scss"],
 })
 export class EpisodeContentsFormComponent implements OnInit, OnDestroy {
-    private id$: Observable<string> = this.route.params.pipe(
-        map((params) => params["id"])
-    );
+    private id$: Observable<string> = this.formService.id$;
 
     private episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
@@ -67,7 +64,6 @@ export class EpisodeContentsFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeContentsGQL,
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index aec92d13..c40e35e4 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -8,7 +8,7 @@ <h1 class="mb-4">
     </h1>
     <lc-entity-description-lead [entity]="episode" />
 
-    <lc-form-status />
+    <lc-form-status [status$]="status$" />
 
     <lc-delete-entity-button
         (clickDelete)="onClickDelete(episode)"
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 358f23aa..0f7eec1f 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -5,8 +5,13 @@ import { ApolloCache } from "@apollo/client/core";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
 import { actionIcons, dataIcons } from "@shared/icons";
-import { DataEntryDeleteEpisodeGQL, DataEntryEpisodeFormGQL, DataEntryEpisodeFormQuery } from "generated/graphql";
+import {
+    DataEntryDeleteEpisodeGQL,
+    DataEntryEpisodeFormGQL,
+    DataEntryEpisodeFormQuery,
+} from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
+import { FormService } from "../shared/form.service";
 
 type QueriedEpisode = NonNullable<DataEntryEpisodeFormQuery["episode"]>;
 
@@ -14,9 +19,10 @@ type QueriedEpisode = NonNullable<DataEntryEpisodeFormQuery["episode"]>;
     selector: "lc-episode",
     templateUrl: "./episode-form.component.html",
     styleUrls: ["./episode-form.component.scss"],
+    providers: [FormService],
 })
 export class EpisodeFormComponent {
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
 
     public episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
@@ -24,6 +30,8 @@ export class EpisodeFormComponent {
         share()
     );
 
+    public status$ = this.formService.status$;
+
     public breadcrumbs$ = this.episode$.pipe(
         filter((episode) => !!episode),
         map((episode) => {
@@ -58,24 +66,24 @@ export class EpisodeFormComponent {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
+        private formService: FormService,
         private router: Router,
         private toastService: ToastService,
         private modalService: ModalService,
         private episodeQuery: DataEntryEpisodeFormGQL,
         private deleteEpisode: DataEntryDeleteEpisodeGQL
-    ) { }
+    ) {}
 
     public onClickDelete(episode: QueriedEpisode): void {
         this.modalService
-        .openConfirmationModal({
-            title: "Delete episode",
-            message: `Are you sure you want to delete this episode? (${episode.name})`,
-        })
-        .then(() => this.performDelete(episode.id, episode.source.id))
-        .catch(() => {
-            // Do nothing on cancel / dismissal.
-        });
+            .openConfirmationModal({
+                title: "Delete episode",
+                message: `Are you sure you want to delete this episode? (${episode.name})`,
+            })
+            .then(() => this.performDelete(episode.id, episode.source.id))
+            .catch(() => {
+                // Do nothing on cancel / dismissal.
+            });
     }
 
     private performDelete(episodeId: string, sourceId: string): void {
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
index f522e5cd..bd784c99 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeIdentificationFormComponent } from "./episode-identification-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("EpisodeIdentificationFormComponent", () => {
     let component: EpisodeIdentificationFormComponent;
@@ -11,6 +12,7 @@ describe("EpisodeIdentificationFormComponent", () => {
         TestBed.configureTestingModule({
             declarations: [EpisodeIdentificationFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(EpisodeIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index c3f99e8c..2a808647 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ApolloCache } from "@apollo/client/core";
 import { ToastService } from "@services/toast.service";
 import { MutationResult } from "apollo-angular";
@@ -39,9 +38,7 @@ type EpisodeIdentificationForm = {
     styleUrls: ["./episode-identification-form.component.scss"],
 })
 export class EpisodeIdentificationFormComponent implements OnInit, OnDestroy {
-    private id$: Observable<string> = this.route.params.pipe(
-        map((params) => params["id"])
-    );
+    private id$ = this.formService.id$;
 
     public episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
@@ -64,7 +61,6 @@ export class EpisodeIdentificationFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeIdentificationGQL,
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
index cdeea205..a2291bbe 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { EpisodeSourceTextFormComponent } from "./episode-source-text-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("EpisodeSourceTextFormComponent", () => {
     let component: EpisodeSourceTextFormComponent;
@@ -11,6 +12,7 @@ describe("EpisodeSourceTextFormComponent", () => {
         TestBed.configureTestingModule({
             declarations: [EpisodeSourceTextFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(EpisodeSourceTextFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 48807327..4c4af28f 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryEpisodeSourceTextMentionGQL,
@@ -13,7 +12,6 @@ import {
     debounceTime,
     filter,
     map,
-    Observable,
     share,
     shareReplay,
     switchMap,
@@ -29,9 +27,7 @@ import { MutationResult } from "apollo-angular";
     styleUrls: ["./episode-source-text-form.component.scss"],
 })
 export class EpisodeSourceTextFormComponent implements OnInit, OnDestroy {
-    private id$: Observable<string> = this.route.params.pipe(
-        map((params) => params["id"])
-    );
+    private id$ = this.formService.id$;
 
     public episode$ = this.id$.pipe(
         switchMap((id) => this.episodeQuery.watch({ id }).valueChanges),
@@ -51,7 +47,6 @@ export class EpisodeSourceTextFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeSourceTextMentionGQL,
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
index e59eb802..374643b1 100644
--- a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { GiftCategoriesFormComponent } from "./gift-categories-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("GiftCategoriesFormComponent", () => {
     let component: GiftCategoriesFormComponent;
@@ -10,7 +11,8 @@ describe("GiftCategoriesFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [GiftCategoriesFormComponent],
-            imports: [SharedTestingModule]
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(GiftCategoriesFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
index 370915c1..9a502232 100644
--- a/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-categories-form/gift-categories-form.component.ts
@@ -1,6 +1,5 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { FormGroup, FormControl } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryGiftCategoriesGQL,
@@ -30,10 +29,7 @@ import { MutationResult } from "apollo-angular";
     styleUrls: ["./gift-categories-form.component.scss"],
 })
 export class GiftCategoriesFormComponent implements OnInit, OnDestroy {
-    private id$ = this.route.params.pipe(
-        map((params) => params["id"]),
-        share()
-    );
+    private id$ = this.formService.id$;
 
     public gift$ = this.id$.pipe(
         switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
@@ -62,7 +58,6 @@ export class GiftCategoriesFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private giftQuery: DataEntryGiftCategoriesGQL,
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index c22916d9..891a37aa 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -11,7 +11,7 @@ <h1 class="mb-4">
 
     <lc-entity-description-lead [entity]="gift" />
 
-    <lc-form-status />
+    <lc-form-status [status$]="status$" />
 
     <lc-delete-entity-button
         (clickDelete)="onClickDelete(gift)"
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
index 861006c7..d2c92a28 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, DestroyRef } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute, Router } from "@angular/router";
+import { Router } from "@angular/router";
 import { ApolloCache } from "@apollo/client/core";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
@@ -11,6 +11,7 @@ import {
     DataEntryGiftFormQuery,
 } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
+import { FormService } from "../shared/form.service";
 
 type QueriedGift = NonNullable<DataEntryGiftFormQuery["giftDescription"]>;
 
@@ -18,9 +19,12 @@ type QueriedGift = NonNullable<DataEntryGiftFormQuery["giftDescription"]>;
     selector: "lc-gift-form",
     templateUrl: "./gift-form.component.html",
     styleUrls: ["./gift-form.component.scss"],
+    providers: [FormService]
 })
 export class GiftFormComponent {
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
+
+    public status$ = this.formService.status$;
 
     public gift$ = this.id$.pipe(
         switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
@@ -62,8 +66,8 @@ export class GiftFormComponent {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private router: Router,
+        private formService: FormService,
         private toastService: ToastService,
         private modalService: ModalService,
         private giftQuery: DataEntryGiftFormGQL,
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
index e1bc216c..12d672d8 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { GiftIdentificationFormComponent } from "./gift-identification-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("GiftIdentificationFormComponent", () => {
     let component: GiftIdentificationFormComponent;
@@ -10,7 +11,8 @@ describe("GiftIdentificationFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [GiftIdentificationFormComponent],
-            imports: [SharedTestingModule]
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(GiftIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index 44c37d03..8c90785f 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormGroup, FormControl, Validators } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ApolloCache } from "@apollo/client/core";
 import { ToastService } from "@services/toast.service";
 import { MutationResult } from "apollo-angular";
@@ -39,7 +38,7 @@ type GiftIdentificationForm = {
     styleUrls: ["./gift-identification-form.component.scss"],
 })
 export class GiftIdentificationFormComponent implements OnInit, OnDestroy {
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
 
     public gift$ = this.id$.pipe(
         switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
@@ -62,7 +61,6 @@ export class GiftIdentificationFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private giftQuery: DataEntryGiftIdentificationGQL,
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
index 357f0177..e0aa1f34 100644
--- a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { GiftSourceTextFormComponent } from "./gift-source-text-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("GiftSourceTextFormComponent", () => {
     let component: GiftSourceTextFormComponent;
@@ -10,7 +11,8 @@ describe("GiftSourceTextFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [GiftSourceTextFormComponent],
-            imports: [SharedTestingModule]
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(GiftSourceTextFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
index 8f70afe6..aa9bdb72 100644
--- a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormGroup, FormControl } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryGiftSourceTextGQL,
@@ -28,7 +27,7 @@ import { MutationResult } from "apollo-angular";
     styleUrls: ["./gift-source-text-form.component.scss"],
 })
 export class GiftSourceTextFormComponent implements OnInit, OnDestroy {
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
 
     public gift$ = this.id$.pipe(
         switchMap((id) => this.giftQuery.watch({ id }).valueChanges),
@@ -56,7 +55,6 @@ export class GiftSourceTextFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private giftQuery: DataEntryGiftSourceTextGQL,
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
index 103285a1..36b7a78b 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LetterCategoriesFormComponent } from "./letter-categories-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("LetterCategoriesFormComponent", () => {
     let component: LetterCategoriesFormComponent;
@@ -10,7 +11,8 @@ describe("LetterCategoriesFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LetterCategoriesFormComponent],
-            imports: [SharedTestingModule]
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(LetterCategoriesFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
index 320c04c4..f04e789e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-categories-form/letter-categories-form.component.ts
@@ -1,6 +1,5 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { FormControl, FormGroup } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryAllLetterCategoriesGQL,
@@ -21,10 +20,7 @@ import { MutationResult } from "apollo-angular";
     styleUrls: ["./letter-categories-form.component.scss"],
 })
 export class LetterCategoriesFormComponent implements OnInit, OnDestroy {
-    private id$ = this.route.params.pipe(
-        map((params) => params["id"]),
-        share()
-    );
+    private id$ = this.formService.id$;
 
     public letter$ = this.id$.pipe(
         switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
@@ -53,7 +49,6 @@ export class LetterCategoriesFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private letterQuery: DataEntryLetterCategoriesGQL,
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index b2208a11..cf15506b 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -11,7 +11,7 @@ <h1 class="mb-4">
 
     <lc-entity-description-lead [entity]="letter" />
 
-    <lc-form-status />
+    <lc-form-status [status$]="status$" />
 
     <lc-delete-entity-button
         (clickDelete)="onClickDelete(letter)"
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 3e7d0cc4..4cc59171 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, DestroyRef } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute, Router } from "@angular/router";
+import { Router } from "@angular/router";
 import { ApolloCache } from "@apollo/client/core";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
@@ -11,6 +11,7 @@ import {
     DataEntryLetterFormQuery,
 } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
+import { FormService } from "../shared/form.service";
 
 type QueriedLetter = NonNullable<DataEntryLetterFormQuery["letterDescription"]>;
 
@@ -18,9 +19,12 @@ type QueriedLetter = NonNullable<DataEntryLetterFormQuery["letterDescription"]>;
     selector: "lc-letter-form",
     templateUrl: "./letter-form.component.html",
     styleUrls: ["./letter-form.component.scss"],
+    providers: [FormService],
 })
 export class LetterFormComponent {
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
+
+    public status$ = this.formService.status$;
 
     public letter$ = this.id$.pipe(
         switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
@@ -60,8 +64,8 @@ export class LetterFormComponent {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private router: Router,
+        private formService: FormService,
         private toastService: ToastService,
         private modalService: ModalService,
         private letterQuery: DataEntryLetterFormGQL,
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
index 88253157..e2809f21 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LetterIdentificationFormComponent } from "./letter-identification-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("LetterIdentificationFormComponent", () => {
     let component: LetterIdentificationFormComponent;
@@ -10,7 +11,8 @@ describe("LetterIdentificationFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LetterIdentificationFormComponent],
-            imports: [SharedTestingModule]
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(LetterIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index ec2f139e..5552d7c6 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryLetterIdentificationGQL,
@@ -34,7 +33,7 @@ interface LetterIdentification {
     styleUrls: ["./letter-identification-form.component.scss"],
 })
 export class LetterIdentificationFormComponent implements OnInit, OnDestroy {
-    public id$ = this.route.params.pipe(map((params) => params["id"]));
+    public id$ = this.formService.id$;
 
     public letter$ = this.id$.pipe(
         switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
@@ -57,7 +56,6 @@ export class LetterIdentificationFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private letterQuery: DataEntryLetterIdentificationGQL,
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
index 4a740170..ba078aef 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LetterSourceTextFormComponent } from "./letter-source-text-form.component";
 import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("LetterSourceTextFormComponent", () => {
     let component: LetterSourceTextFormComponent;
@@ -10,7 +11,8 @@ describe("LetterSourceTextFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LetterSourceTextFormComponent],
-            imports: [SharedTestingModule]
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(LetterSourceTextFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
index d473f9c3..90eb4e6b 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
@@ -1,7 +1,6 @@
 import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup } from "@angular/forms";
-import { ActivatedRoute } from "@angular/router";
 import { ToastService } from "@services/toast.service";
 import {
     DataEntryLetterSourceTextGQL,
@@ -36,7 +35,7 @@ interface LetterSourceText {
     styleUrls: ["./letter-source-text-form.component.scss"],
 })
 export class LetterSourceTextFormComponent implements OnInit, OnDestroy {
-    private id$ = this.route.params.pipe(map((params) => params["id"]));
+    private id$ = this.formService.id$;
 
     public letter$ = this.id$.pipe(
         switchMap((id) => this.letterQuery.watch({ id }).valueChanges),
@@ -64,7 +63,6 @@ export class LetterSourceTextFormComponent implements OnInit, OnDestroy {
 
     constructor(
         private destroyRef: DestroyRef,
-        private route: ActivatedRoute,
         private formService: FormService,
         private toastService: ToastService,
         private letterQuery: DataEntryLetterSourceTextGQL,
diff --git a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
index da3445eb..98c04ff0 100644
--- a/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
+++ b/frontend/src/app/data-entry/shared/data-entry-shared.module.ts
@@ -6,7 +6,6 @@ import { LabelSelectComponent } from "./label-select/label-select.component";
 import { EntityDescriptionLeadComponent } from "./entity-description-lead/entity-description-lead.component";
 import { DeleteEntityButtonComponent } from "./delete-entity-button/delete-entity-button.component";
 import { FormStatusComponent } from './form-status/form-status.component';
-import { FormService } from "./form.service";
 
 @NgModule({
     declarations: [
@@ -18,7 +17,6 @@ import { FormService } from "./form.service";
         FormStatusComponent,
     ],
     imports: [SharedModule],
-    providers: [FormService],
     exports: [
         DesignatorsControlComponent,
         MultiselectComponent,
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
index dab92649..9fcc0c8c 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.spec.ts
@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { FormStatusComponent } from './form-status.component';
-import { FormService } from '../form.service';
 
 describe('FormStatusComponent', () => {
   let component: FormStatusComponent;
@@ -9,8 +8,7 @@ describe('FormStatusComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-        declarations: [FormStatusComponent],
-        providers: [FormService]
+      declarations: [FormStatusComponent]
     });
     fixture = TestBed.createComponent(FormStatusComponent);
     component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
index d5eacc5c..94e2910a 100644
--- a/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
+++ b/frontend/src/app/data-entry/shared/form-status/form-status.component.ts
@@ -1,7 +1,7 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { FormStatus } from '../types';
+import { Observable } from 'rxjs';
 import { statusIcons } from '@shared/icons';
-import { FormService } from '../form.service';
 
 @Component({
     selector: 'lc-form-status',
@@ -9,13 +9,11 @@ import { FormService } from '../form.service';
     styleUrls: ['./form-status.component.scss']
 })
 export class FormStatusComponent {
-    public status$ = this.formService.status$;
+    @Input({ required: true }) status$!: Observable<FormStatus>;
 
     public statusIcons = statusIcons;
 
-    constructor(private formService: FormService) {}
-
-    messages: Record<FormStatus, string> = {
+    public messages: Record<FormStatus, string> = {
         idle: 'No changes made',
         invalid: 'Form contains errors',
         loading: 'Loading...',
@@ -23,7 +21,7 @@ export class FormStatusComponent {
         error: 'Saving failed',
     };
 
-    classes: Record<FormStatus, string> = {
+    public classes: Record<FormStatus, string> = {
         idle: 'text-secondary',
         invalid: 'text-danger',
         loading: 'text-secondary',
diff --git a/frontend/src/app/data-entry/shared/form.service.ts b/frontend/src/app/data-entry/shared/form.service.ts
index bbcc9abe..e85d52de 100644
--- a/frontend/src/app/data-entry/shared/form.service.ts
+++ b/frontend/src/app/data-entry/shared/form.service.ts
@@ -1,15 +1,24 @@
 import { Injectable } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { asyncScheduler, BehaviorSubject, combineLatest, map, Observable, shareReplay, switchMap, throttleTime } from 'rxjs';
 import { FormStatus } from './types';
 import _ from 'underscore';
 
+/**
+ *  This service is scoped to individual form components. That is why it can access ActivatedRoute.
+ */
 @Injectable()
 export class FormService {
+    id$: Observable<string>;
+
     status$: Observable<FormStatus>;
 
     private statuses$ = new BehaviorSubject<Record<string, Observable<FormStatus>>>({});
 
-    constructor() {
+    constructor(private route: ActivatedRoute) {
+        this.id$ = this.route.params.pipe(
+            map(params => params['id'])
+        );
         this.status$ = this.statuses$.pipe(
             switchMap(statuses => combineLatest(_.values(statuses))),
             map(this.combinedStatus),

From 715129690051d48ecc2aa12d67ee556092192eec Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 24 Sep 2024 14:45:19 +0200
Subject: [PATCH 492/565] fix loading status update

---
 .../episode-entities-form.component.ts                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index bb450d6b..7daea7e8 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -110,6 +110,7 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
     }
 
     addEntity(entityID: string, episodeID: string): void {
+        this.status$.next('loading');
         const input: CreateEpisodeEntityLinkInput = {
             entity: entityID,
             episode: episodeID,
@@ -117,19 +118,18 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         };
         this.addMutation.mutate({ input }, {
             refetchQueries: REFETCH_QUERIES,
-        }).pipe(
-            tap(() => this.status$.next('loading'))
-        ).subscribe(this.mutationRequestObserver);
+        }).subscribe(this.mutationRequestObserver);
     }
 
     removeEntity(entityID: string, episodeID: string): void {
+        this.status$.next('loading');
         const data: DataEntryDeleteEpisodeEntityLinkMutationVariables = {
             entity: entityID,
             episode: episodeID,
             entityType: this.entityType,
         };
-        this.removeMutation.mutate(data, { refetchQueries: REFETCH_QUERIES }).pipe(
-            tap(() => this.status$.next('loading'))
+        this.removeMutation.mutate(
+            data, { refetchQueries: REFETCH_QUERIES }
         ).subscribe(this.mutationRequestObserver)
     }
 

From 9558a2d1e7fac1224c52e9508513a6e5e9f15511 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 24 Sep 2024 13:57:12 +0200
Subject: [PATCH 493/565] Basic location mutations

---
 backend/graphql_app/schema.py                 |   6 +
 .../space/mutations/CreateLocationMutation.py |  45 ++++
 .../space/mutations/DeleteLocationMutation.py |  26 +++
 .../space/mutations/UpdateLocationMutation.py |  52 +++++
 frontend/generated/graphql.ts                 | 211 +++++++++++++++---
 frontend/generated/schema.graphql             |  34 +++
 .../data-entry/location-form/location.graphql |  21 ++
 7 files changed, 360 insertions(+), 35 deletions(-)
 create mode 100644 backend/space/mutations/CreateLocationMutation.py
 create mode 100644 backend/space/mutations/DeleteLocationMutation.py
 create mode 100644 backend/space/mutations/UpdateLocationMutation.py
 create mode 100644 frontend/src/app/data-entry/location-form/location.graphql

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index 1ade2fe6..68a6ea09 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -20,6 +20,9 @@
 from letter.mutations.CreateGiftMutation import CreateGiftMutation
 from letter.mutations.DeleteGiftMutation import DeleteGiftMutation
 from letter.mutations.UpdateGiftMutation import UpdateGiftMutation
+from space.mutations.CreateLocationMutation import CreateLocationMutation
+from space.mutations.DeleteLocationMutation import DeleteLocationMutation
+from space.mutations.UpdateLocationMutation import UpdateLocationMutation
 from person.mutations.CreatePersonReferenceMutation import CreatePersonReferenceMutation
 from person.mutations.UpdatePersonReferenceMutation import UpdatePersonReferenceMutation
 from person.mutations.DeletePersonReferenceMutation import DeletePersonReferenceMutation
@@ -51,6 +54,9 @@ class Mutation(ObjectType):
     create_gift = CreateGiftMutation.Field()
     update_gift = UpdateGiftMutation.Field()
     delete_gift = DeleteGiftMutation.Field()
+    create_location = CreateLocationMutation.Field()
+    update_location = UpdateLocationMutation.Field()
+    delete_location = DeleteLocationMutation.Field()
     create_person_reference = CreatePersonReferenceMutation.Field()
     update_person_reference = UpdatePersonReferenceMutation.Field()
     delete_person_reference = DeletePersonReferenceMutation.Field()
diff --git a/backend/space/mutations/CreateLocationMutation.py b/backend/space/mutations/CreateLocationMutation.py
new file mode 100644
index 00000000..e8772086
--- /dev/null
+++ b/backend/space/mutations/CreateLocationMutation.py
@@ -0,0 +1,45 @@
+from graphene import ID, Field, InputObjectType, List, NonNull, ResolveInfo, String
+
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from source.models import Source
+from space.models import SpaceDescription
+from space.types.SpaceDescriptionType import SpaceDescriptionType
+
+
+class CreateLocationInput(InputObjectType):
+    name = String(required=True)
+    source = ID(required=True)
+
+
+class CreateLocationMutation(LettercraftMutation):
+    location = Field(SpaceDescriptionType)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = SpaceDescription
+
+    class Arguments:
+        location_data = CreateLocationInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, location_data: CreateLocationInput):
+        try:
+            source = Source.objects.get(id=getattr(location_data, "source"))
+        except Source.DoesNotExist:
+            error = LettercraftErrorType(field="source", messages=["Source not found."])
+            return cls(errors=[error])  # type: ignore
+
+        location = SpaceDescription.objects.create(
+            name=getattr(location_data, "name"),
+            source=source,
+        )
+
+        cls.add_contribution(info, location)
+
+        return cls(location=location, errors=[])  # type: ignore
+
+    @staticmethod
+    def add_contribution(info: ResolveInfo, location: SpaceDescription) -> None:
+        user = info.context.user
+        if user.is_authenticated:
+            location.contributors.add(user)
diff --git a/backend/space/mutations/DeleteLocationMutation.py b/backend/space/mutations/DeleteLocationMutation.py
new file mode 100644
index 00000000..7271df70
--- /dev/null
+++ b/backend/space/mutations/DeleteLocationMutation.py
@@ -0,0 +1,26 @@
+from graphene import ID, Boolean, List, Mutation, NonNull, ResolveInfo
+
+from space.models import SpaceDescription
+from space.types.SpaceDescriptionType import SpaceDescriptionType
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+
+
+class DeleteLocationMutation(Mutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    class Arguments:
+        id = ID(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, id: str):
+        try:
+            location = SpaceDescriptionType.get_queryset(SpaceDescription.objects, info).get(
+                id=id
+            )
+        except SpaceDescription.DoesNotExist:
+            error = LettercraftErrorType(field="id", messages=["Location not found."])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        location.delete()
+        return cls(ok=True, errors=[])  # type: ignore
diff --git a/backend/space/mutations/UpdateLocationMutation.py b/backend/space/mutations/UpdateLocationMutation.py
new file mode 100644
index 00000000..8b43a758
--- /dev/null
+++ b/backend/space/mutations/UpdateLocationMutation.py
@@ -0,0 +1,52 @@
+from graphene import ID, Boolean, InputObjectType, List, NonNull, ResolveInfo
+from django.core.exceptions import ObjectDoesNotExist
+from core.types.input.DescriptionFieldInputType import DescriptionFieldInputType
+from core.types.input.EntityDescriptionInputType import EntityDescriptionInputType
+from letter.models import LetterDescription
+from graphql_app.LettercraftMutation import LettercraftMutation
+
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from space.models import SpaceDescription
+
+
+class UpdateLocationInput(EntityDescriptionInputType, InputObjectType):
+    id = ID(required=True)
+
+
+class UpdateLocationMutation(LettercraftMutation):
+    ok = Boolean(required=True)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = SpaceDescription
+
+    class Arguments:
+        location_data = UpdateLocationInput(required=True)
+
+    @classmethod
+    def mutate(cls, root: None, info: ResolveInfo, location_data: UpdateLocationInput):
+        try:
+            retrieved_object = cls.get_or_create_object(info, location_data)
+        except ObjectDoesNotExist as e:
+            error = LettercraftErrorType(field="id", messages=[str(e)])
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        location: SpaceDescription = retrieved_object.object  # type: ignore
+
+        try:
+            cls.mutate_object(location_data, location, info, ["categorisations"])
+        except ObjectDoesNotExist as field:
+            error = LettercraftErrorType(
+                field=str(field), messages=["Related object cannot be found."]
+            )
+            return cls(ok=False, errors=[error])  # type: ignore
+
+        cls.add_contribution(info, location)
+        location.save()
+
+        return cls(ok=True, errors=[])  # type: ignore
+
+    @staticmethod
+    def add_contribution(info: ResolveInfo, location: SpaceDescription) -> None:
+        user = info.context.user
+        if user.is_authenticated:
+            location.contributors.add(user)
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 7765a056..a2131dff 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -125,6 +125,17 @@ export type CreateLetterMutation = {
   letter?: Maybe<LetterDescriptionType>;
 };
 
+export type CreateLocationInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
+export type CreateLocationMutation = {
+  __typename?: 'CreateLocationMutation';
+  errors: Array<LettercraftErrorType>;
+  location?: Maybe<SpaceDescriptionType>;
+};
+
 export type CreatePersonReferenceInput = {
   description: Scalars['ID']['input'];
   person: Scalars['ID']['input'];
@@ -160,6 +171,12 @@ export type DeleteLetterMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type DeleteLocationMutation = {
+  __typename?: 'DeleteLocationMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type DeletePersonReferenceMutation = {
   __typename?: 'DeletePersonReferenceMutation';
   errors: Array<LettercraftErrorType>;
@@ -410,16 +427,19 @@ export type Mutation = {
   createEpisode?: Maybe<CreateEpisodeMutation>;
   createGift?: Maybe<CreateGiftMutation>;
   createLetter?: Maybe<CreateLetterMutation>;
+  createLocation?: Maybe<CreateLocationMutation>;
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
   deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
   deleteGift?: Maybe<DeleteGiftMutation>;
   deleteLetter?: Maybe<DeleteLetterMutation>;
+  deleteLocation?: Maybe<DeleteLocationMutation>;
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateGift?: Maybe<UpdateGiftMutation>;
   updateLetter?: Maybe<UpdateLetterMutation>;
+  updateLocation?: Maybe<UpdateLocationMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
   updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
 };
@@ -445,6 +465,11 @@ export type MutationCreateLetterArgs = {
 };
 
 
+export type MutationCreateLocationArgs = {
+  locationData: CreateLocationInput;
+};
+
+
 export type MutationCreatePersonReferenceArgs = {
   referenceData: CreatePersonReferenceInput;
 };
@@ -470,6 +495,11 @@ export type MutationDeleteLetterArgs = {
 };
 
 
+export type MutationDeleteLocationArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type MutationDeletePersonReferenceArgs = {
   id: Scalars['ID']['input'];
 };
@@ -495,6 +525,11 @@ export type MutationUpdateLetterArgs = {
 };
 
 
+export type MutationUpdateLocationArgs = {
+  locationData: UpdateLocationInput;
+};
+
+
 export type MutationUpdateOrCreateSourceArgs = {
   sourceData: UpdateCreateSourceInput;
 };
@@ -1063,6 +1098,23 @@ export type UpdateLetterMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type UpdateLocationInput = {
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdateLocationMutation = {
+  __typename?: 'UpdateLocationMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type UpdateOrCreateSourceMutation = {
   __typename?: 'UpdateOrCreateSourceMutation';
   errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
@@ -1258,6 +1310,27 @@ export type DataEntryUpdateLetterMutationVariables = Exact<{
 
 export type DataEntryUpdateLetterMutation = { __typename?: 'Mutation', updateLetter?: { __typename?: 'UpdateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryDeleteLetterMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryDeleteLetterMutation = { __typename?: 'Mutation', deleteLetter?: { __typename?: 'DeleteLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
+export type DataEntryLocationQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryLocationQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type DataEntryUpdateLocationMutationVariables = Exact<{
+  locationData: UpdateLocationInput;
+}>;
+
+
+export type DataEntryUpdateLocationMutation = { __typename?: 'Mutation', updateLocation?: { __typename?: 'UpdateLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1341,7 +1414,7 @@ export const DataEntryAgentDescriptionDocument = gql`
   })
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1360,7 +1433,7 @@ export const LocationsInSourceListDocument = gql`
   })
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1381,7 +1454,7 @@ export const DataEntryAgentIdentificationDocument = gql`
   })
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1406,7 +1479,7 @@ export const DataEntryAgentDocument = gql`
   })
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1428,7 +1501,7 @@ export const DataEntryUpdateAgentDocument = gql`
   })
   export class DataEntryUpdateAgentGQL extends Apollo.Mutation<DataEntryUpdateAgentMutation, DataEntryUpdateAgentMutationVariables> {
     override document = DataEntryUpdateAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1450,7 +1523,7 @@ export const DataEntryDeleteAgentDocument = gql`
   })
   export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
     override document = DataEntryDeleteAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1472,7 +1545,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   })
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1492,7 +1565,7 @@ export const DataEntryEpisodeCategoriesDocument = gql`
   })
   export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
     override document = DataEntryEpisodeCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1512,7 +1585,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   })
   export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1534,7 +1607,7 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
   })
   export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1558,7 +1631,7 @@ export const DataEntryEpisodeFormDocument = gql`
   })
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1580,7 +1653,7 @@ export const DataEntryUpdateEpisodeDocument = gql`
   })
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1604,7 +1677,7 @@ export const DataEntryCreateEpisodeDocument = gql`
   })
   export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1632,7 +1705,7 @@ export const DataEntryGiftCategoriesDocument = gql`
   })
   export class DataEntryGiftCategoriesGQL extends Apollo.Query<DataEntryGiftCategoriesQuery, DataEntryGiftCategoriesQueryVariables> {
     override document = DataEntryGiftCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1652,7 +1725,7 @@ export const DataEntryAllGiftCategoriesDocument = gql`
   })
   export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
     override document = DataEntryAllGiftCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1672,7 +1745,7 @@ export const DataEntryGiftIdentificationDocument = gql`
   })
   export class DataEntryGiftIdentificationGQL extends Apollo.Query<DataEntryGiftIdentificationQuery, DataEntryGiftIdentificationQueryVariables> {
     override document = DataEntryGiftIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1694,7 +1767,7 @@ export const DataEntryGiftSourceTextDocument = gql`
   })
   export class DataEntryGiftSourceTextGQL extends Apollo.Query<DataEntryGiftSourceTextQuery, DataEntryGiftSourceTextQueryVariables> {
     override document = DataEntryGiftSourceTextDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1718,7 +1791,7 @@ export const DataEntryGiftFormDocument = gql`
   })
   export class DataEntryGiftFormGQL extends Apollo.Query<DataEntryGiftFormQuery, DataEntryGiftFormQueryVariables> {
     override document = DataEntryGiftFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1740,7 +1813,7 @@ export const DataEntryUpdateGiftDocument = gql`
   })
   export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
     override document = DataEntryUpdateGiftDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1768,7 +1841,7 @@ export const DataEntryLetterCategoriesDocument = gql`
   })
   export class DataEntryLetterCategoriesGQL extends Apollo.Query<DataEntryLetterCategoriesQuery, DataEntryLetterCategoriesQueryVariables> {
     override document = DataEntryLetterCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1788,7 +1861,7 @@ export const DataEntryAllLetterCategoriesDocument = gql`
   })
   export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
     override document = DataEntryAllLetterCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1808,7 +1881,7 @@ export const DataEntryLetterIdentificationDocument = gql`
   })
   export class DataEntryLetterIdentificationGQL extends Apollo.Query<DataEntryLetterIdentificationQuery, DataEntryLetterIdentificationQueryVariables> {
     override document = DataEntryLetterIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1830,7 +1903,7 @@ export const DataEntryLetterSourceTextDocument = gql`
   })
   export class DataEntryLetterSourceTextGQL extends Apollo.Query<DataEntryLetterSourceTextQuery, DataEntryLetterSourceTextQueryVariables> {
     override document = DataEntryLetterSourceTextDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1854,7 +1927,7 @@ export const DataEntryLetterFormDocument = gql`
   })
   export class DataEntryLetterFormGQL extends Apollo.Query<DataEntryLetterFormQuery, DataEntryLetterFormQueryVariables> {
     override document = DataEntryLetterFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1876,7 +1949,75 @@ export const DataEntryUpdateLetterDocument = gql`
   })
   export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
     override document = DataEntryUpdateLetterDocument;
-    
+
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryDeleteLetterDocument = gql`
+    mutation DataEntryDeleteLetter($id: ID!) {
+  deleteLetter(id: $id) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteLetterGQL extends Apollo.Mutation<DataEntryDeleteLetterMutation, DataEntryDeleteLetterMutationVariables> {
+    override document = DataEntryDeleteLetterDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryLocationDocument = gql`
+    query DataEntryLocation($id: ID!) {
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLocationGQL extends Apollo.Query<DataEntryLocationQuery, DataEntryLocationQueryVariables> {
+    override document = DataEntryLocationDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryUpdateLocationDocument = gql`
+    mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
+  updateLocation(locationData: $locationData) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateLocationGQL extends Apollo.Mutation<DataEntryUpdateLocationMutation, DataEntryUpdateLocationMutationVariables> {
+    override document = DataEntryUpdateLocationDocument;
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1900,7 +2041,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
   })
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1922,7 +2063,7 @@ export const DataEntryDeleteEpisodeDocument = gql`
   })
   export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1975,7 +2116,7 @@ export const DataEntrySourceDetailDocument = gql`
   })
   export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1999,7 +2140,7 @@ export const DataEntrySourceListDocument = gql`
   })
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2018,7 +2159,7 @@ export const SourceTitleQueryDocument = gql`
   })
   export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
     override document = SourceTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2041,7 +2182,7 @@ export const AgentTitleQueryDocument = gql`
   })
   export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
     override document = AgentTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2064,7 +2205,7 @@ export const LetterTitleQueryDocument = gql`
   })
   export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
     override document = LetterTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2087,7 +2228,7 @@ export const GiftTitleQueryDocument = gql`
   })
   export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
     override document = GiftTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2110,8 +2251,8 @@ export const SpaceTitleQueryDocument = gql`
   })
   export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
     override document = SpaceTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
-  }
\ No newline at end of file
+  }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 85b8da4c..714a3ff7 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -119,6 +119,16 @@ type CreateLetterMutation {
   letter: LetterDescriptionType
 }
 
+input CreateLocationInput {
+  name: String!
+  source: ID!
+}
+
+type CreateLocationMutation {
+  errors: [LettercraftErrorType!]!
+  location: SpaceDescriptionType
+}
+
 input CreatePersonReferenceInput {
   description: ID!
   person: ID!
@@ -149,6 +159,11 @@ type DeleteLetterMutation {
   ok: Boolean!
 }
 
+type DeleteLocationMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type DeletePersonReferenceMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
@@ -443,16 +458,19 @@ type Mutation {
   createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
   createGift(giftData: CreateGiftInput!): CreateGiftMutation
   createLetter(letterData: CreateLetterInput!): CreateLetterMutation
+  createLocation(locationData: CreateLocationInput!): CreateLocationMutation
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
   deleteGift(id: ID!): DeleteGiftMutation
   deleteLetter(id: ID!): DeleteLetterMutation
+  deleteLocation(id: ID!): DeleteLocationMutation
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
   updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
   updateGift(giftData: UpdateGiftInput!): UpdateGiftMutation
   updateLetter(letterData: UpdateLetterInput!): UpdateLetterMutation
+  updateLocation(locationData: UpdateLocationInput!): UpdateLocationMutation
   updateOrCreateSource(sourceData: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
   updatePersonReference(referenceData: UpdatePersonReferenceInput!): UpdatePersonReferenceMutation
 }
@@ -1033,6 +1051,22 @@ type UpdateLetterMutation {
   ok: Boolean!
 }
 
+input UpdateLocationInput {
+  book: String
+  categories: [ID!]
+  chapter: String
+  description: String
+  designators: [String!]
+  id: ID!
+  name: String
+  page: String
+}
+
+type UpdateLocationMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type UpdateOrCreateSourceMutation {
   errors: [String]
   source: SourceType
diff --git a/frontend/src/app/data-entry/location-form/location.graphql b/frontend/src/app/data-entry/location-form/location.graphql
new file mode 100644
index 00000000..b063cbe1
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location.graphql
@@ -0,0 +1,21 @@
+query DataEntryLocation($id: ID!) {
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
+    }
+  }
+}
+
+mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
+    updateLocation(locationData: $locationData) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From fef995a333adfc024d7ace1d2359bc87029f1619 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Wed, 25 Sep 2024 10:35:32 +0200
Subject: [PATCH 494/565] Add base location form

---
 frontend/generated/graphql.ts                 | 130 +++++++--------
 .../location-form.component.html              |  53 +++---
 .../location-form/location-form.component.ts  | 151 +++++++++++++-----
 .../location-form/location-form.module.ts     |  23 +--
 .../data-entry/location-form/location.graphql |  10 ++
 5 files changed, 229 insertions(+), 138 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index a2131dff..768f6642 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1310,13 +1310,6 @@ export type DataEntryUpdateLetterMutationVariables = Exact<{
 
 export type DataEntryUpdateLetterMutation = { __typename?: 'Mutation', updateLetter?: { __typename?: 'UpdateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
-export type DataEntryDeleteLetterMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type DataEntryDeleteLetterMutation = { __typename?: 'Mutation', deleteLetter?: { __typename?: 'DeleteLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
-
 export type DataEntryLocationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1331,6 +1324,13 @@ export type DataEntryUpdateLocationMutationVariables = Exact<{
 
 export type DataEntryUpdateLocationMutation = { __typename?: 'Mutation', updateLocation?: { __typename?: 'UpdateLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryDeleteLocationMutationVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryDeleteLocationMutation = { __typename?: 'Mutation', deleteLocation?: { __typename?: 'DeleteLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1414,7 +1414,7 @@ export const DataEntryAgentDescriptionDocument = gql`
   })
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1433,7 +1433,7 @@ export const LocationsInSourceListDocument = gql`
   })
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1454,7 +1454,7 @@ export const DataEntryAgentIdentificationDocument = gql`
   })
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1479,7 +1479,7 @@ export const DataEntryAgentDocument = gql`
   })
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1501,7 +1501,7 @@ export const DataEntryUpdateAgentDocument = gql`
   })
   export class DataEntryUpdateAgentGQL extends Apollo.Mutation<DataEntryUpdateAgentMutation, DataEntryUpdateAgentMutationVariables> {
     override document = DataEntryUpdateAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1523,7 +1523,7 @@ export const DataEntryDeleteAgentDocument = gql`
   })
   export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
     override document = DataEntryDeleteAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1545,7 +1545,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   })
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1565,7 +1565,7 @@ export const DataEntryEpisodeCategoriesDocument = gql`
   })
   export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
     override document = DataEntryEpisodeCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1585,7 +1585,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   })
   export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1607,7 +1607,7 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
   })
   export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1631,7 +1631,7 @@ export const DataEntryEpisodeFormDocument = gql`
   })
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1653,7 +1653,7 @@ export const DataEntryUpdateEpisodeDocument = gql`
   })
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1677,7 +1677,7 @@ export const DataEntryCreateEpisodeDocument = gql`
   })
   export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1705,7 +1705,7 @@ export const DataEntryGiftCategoriesDocument = gql`
   })
   export class DataEntryGiftCategoriesGQL extends Apollo.Query<DataEntryGiftCategoriesQuery, DataEntryGiftCategoriesQueryVariables> {
     override document = DataEntryGiftCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1725,7 +1725,7 @@ export const DataEntryAllGiftCategoriesDocument = gql`
   })
   export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
     override document = DataEntryAllGiftCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1745,7 +1745,7 @@ export const DataEntryGiftIdentificationDocument = gql`
   })
   export class DataEntryGiftIdentificationGQL extends Apollo.Query<DataEntryGiftIdentificationQuery, DataEntryGiftIdentificationQueryVariables> {
     override document = DataEntryGiftIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1767,7 +1767,7 @@ export const DataEntryGiftSourceTextDocument = gql`
   })
   export class DataEntryGiftSourceTextGQL extends Apollo.Query<DataEntryGiftSourceTextQuery, DataEntryGiftSourceTextQueryVariables> {
     override document = DataEntryGiftSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1791,7 +1791,7 @@ export const DataEntryGiftFormDocument = gql`
   })
   export class DataEntryGiftFormGQL extends Apollo.Query<DataEntryGiftFormQuery, DataEntryGiftFormQueryVariables> {
     override document = DataEntryGiftFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1813,7 +1813,7 @@ export const DataEntryUpdateGiftDocument = gql`
   })
   export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
     override document = DataEntryUpdateGiftDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1841,7 +1841,7 @@ export const DataEntryLetterCategoriesDocument = gql`
   })
   export class DataEntryLetterCategoriesGQL extends Apollo.Query<DataEntryLetterCategoriesQuery, DataEntryLetterCategoriesQueryVariables> {
     override document = DataEntryLetterCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1861,7 +1861,7 @@ export const DataEntryAllLetterCategoriesDocument = gql`
   })
   export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
     override document = DataEntryAllLetterCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1881,7 +1881,7 @@ export const DataEntryLetterIdentificationDocument = gql`
   })
   export class DataEntryLetterIdentificationGQL extends Apollo.Query<DataEntryLetterIdentificationQuery, DataEntryLetterIdentificationQueryVariables> {
     override document = DataEntryLetterIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1903,7 +1903,7 @@ export const DataEntryLetterSourceTextDocument = gql`
   })
   export class DataEntryLetterSourceTextGQL extends Apollo.Query<DataEntryLetterSourceTextQuery, DataEntryLetterSourceTextQueryVariables> {
     override document = DataEntryLetterSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1927,7 +1927,7 @@ export const DataEntryLetterFormDocument = gql`
   })
   export class DataEntryLetterFormGQL extends Apollo.Query<DataEntryLetterFormQuery, DataEntryLetterFormQueryVariables> {
     override document = DataEntryLetterFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1949,29 +1949,7 @@ export const DataEntryUpdateLetterDocument = gql`
   })
   export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
     override document = DataEntryUpdateLetterDocument;
-
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const DataEntryDeleteLetterDocument = gql`
-    mutation DataEntryDeleteLetter($id: ID!) {
-  deleteLetter(id: $id) {
-    ok
-    errors {
-      field
-      messages
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryDeleteLetterGQL extends Apollo.Mutation<DataEntryDeleteLetterMutation, DataEntryDeleteLetterMutationVariables> {
-    override document = DataEntryDeleteLetterDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1995,7 +1973,7 @@ export const DataEntryLocationDocument = gql`
   })
   export class DataEntryLocationGQL extends Apollo.Query<DataEntryLocationQuery, DataEntryLocationQueryVariables> {
     override document = DataEntryLocationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2017,7 +1995,29 @@ export const DataEntryUpdateLocationDocument = gql`
   })
   export class DataEntryUpdateLocationGQL extends Apollo.Mutation<DataEntryUpdateLocationMutation, DataEntryUpdateLocationMutationVariables> {
     override document = DataEntryUpdateLocationDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryDeleteLocationDocument = gql`
+    mutation DataEntryDeleteLocation($id: ID!) {
+  deleteLocation(id: $id) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteLocationGQL extends Apollo.Mutation<DataEntryDeleteLocationMutation, DataEntryDeleteLocationMutationVariables> {
+    override document = DataEntryDeleteLocationDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2041,7 +2041,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
   })
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2063,7 +2063,7 @@ export const DataEntryDeleteEpisodeDocument = gql`
   })
   export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2116,7 +2116,7 @@ export const DataEntrySourceDetailDocument = gql`
   })
   export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2140,7 +2140,7 @@ export const DataEntrySourceListDocument = gql`
   })
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2159,7 +2159,7 @@ export const SourceTitleQueryDocument = gql`
   })
   export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
     override document = SourceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2182,7 +2182,7 @@ export const AgentTitleQueryDocument = gql`
   })
   export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
     override document = AgentTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2205,7 +2205,7 @@ export const LetterTitleQueryDocument = gql`
   })
   export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
     override document = LetterTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2228,7 +2228,7 @@ export const GiftTitleQueryDocument = gql`
   })
   export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
     override document = GiftTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2251,8 +2251,8 @@ export const SpaceTitleQueryDocument = gql`
   })
   export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
     override document = SpaceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
-  }
+  }
\ No newline at end of file
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index 42079d5a..14e0b546 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -1,21 +1,34 @@
-<ng-container *ngIf="data$ | async as data">
-    <lc-breadcrumb [breadcrumbs]="getBreadcrumbs(data)"></lc-breadcrumb>
-
-    <ng-container *ngIf="data.spaceDescription as spaceDescription">
-        <h1 class="mb-4">
-            <lc-icon [icon]="dataIcons.location" />
-            {{spaceDescription.name}}
-            <span class="text-secondary">
-                ({{spaceDescription.source.name}})
-            </span>
-        </h1>
-
-        <p class="lead mb-4" *ngIf="spaceDescription.description">
-            {{spaceDescription.description}}
-        </p>
-
-        <p class="alert alert-warning">
-            This form is not implemented yet!
-        </p>
-    </ng-container>
+<lc-breadcrumb [breadcrumbs]="(breadcrumbs$ | async) ?? []" />
+
+<ng-container *ngIf="location$ | async as location; else loading">
+    <h1 class="mb-4">
+        <lc-icon [icon]="dataIcons.location" />
+        {{ location.name }}
+        <span class="text-secondary"> ({{ location.source.name }}) </span>
+    </h1>
+
+    <!-- <lc-entity-description-lead [entity]="location" /> -->
+
+    <!-- <lc-delete-entity-button
+            (clickDelete)="onClickDelete(location)"
+            [deletingInProgress]="deletingInProgress"
+            entityName="location"
+        /> -->
+
+    <p class="alert alert-warning">This form is not implemented yet!</p>
 </ng-container>
+
+<!-- <h2 class="subform-header">Identification</h2>
+<lc-gift-identification-form />
+
+<h2 class="subform-header">Source text</h2>
+<lc-gift-source-text-form />
+
+<h2 class="subform-header">Categories</h2>
+<lc-gift-categories-form /> -->
+
+<ng-template #loading>
+    <div class="spinner-border" role="status">
+        <span class="visually-hidden">Loading...</span>
+    </div>
+</ng-template>
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
index 07f623a9..de37dc2c 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -1,53 +1,128 @@
-import { Component } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
-import { dataIcons } from '@shared/icons';
-import { DataEntrySpaceDescriptionGQL, DataEntrySpaceDescriptionQuery } from 'generated/graphql';
-import { map, Observable, switchMap } from 'rxjs';
+import { Component, DestroyRef } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
+import { dataIcons } from "@shared/icons";
+import {
+    DataEntryDeleteLocationGQL,
+    DataEntryLocationQuery,
+    DataEntrySpaceDescriptionGQL,
+    DataEntrySpaceDescriptionQuery,
+} from "generated/graphql";
+import { filter, map, Observable, share, switchMap } from "rxjs";
+import { FormService } from "../shared/form.service";
+import { ModalService } from "@services/modal.service";
+import { ToastService } from "@services/toast.service";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { ApolloCache } from "@apollo/client/core";
+
+type QueriedLocation = NonNullable<DataEntryLocationQuery["spaceDescription"]>
 
 @Component({
-    selector: 'lc-location-form',
-    templateUrl: './location-form.component.html',
-    styleUrls: ['./location-form.component.scss']
+    selector: "lc-location-form",
+    templateUrl: "./location-form.component.html",
+    styleUrls: ["./location-form.component.scss"],
+    providers: [FormService],
 })
 export class LocationFormComponent {
-    id$: Observable<string>;
-    data$: Observable<DataEntrySpaceDescriptionQuery>;
+    private id$ = this.formService.id$;
 
-    dataIcons = dataIcons;
+    public status$ = this.formService.status$;
 
-    constructor(
-        private route: ActivatedRoute, private spaceQuery: DataEntrySpaceDescriptionGQL
-    ) {
-        this.id$ = this.route.params.pipe(
-            map(params => params['id']),
-        );
-        this.data$ = this.id$.pipe(
-            switchMap(id => this.spaceQuery.watch({ id }).valueChanges),
-            map(result => result.data),
-        );
-    }
+    public location$ = this.id$.pipe(
+        switchMap((id) => this.locationQuery.watch({ id }).valueChanges),
+        map((result) => result.data.spaceDescription),
+        share()
+    );
 
-    getBreadcrumbs(data: DataEntrySpaceDescriptionQuery): Breadcrumb[] {
-        if (data.spaceDescription) {
+    public breadcrumbs$ = this.location$.pipe(
+        filter(location => !!location),
+        map(location => {
+            if (!location) {
+                return [
+                    { link: "/", label: "Lettercraft" },
+                    { link: "/data-entry", label: "Data entry" },
+                    { link: "", label: "Location not found" },
+                ];
+            }
             return [
-                { link: '/', label: 'Lettercraft' },
-                { link: '/data-entry', label: 'Data entry' },
+                { link: "/", label: "Lettercraft" },
+                { link: "/data-entry", label: "Data entry" },
                 {
-                    link: `/data-entry/sources/${data.spaceDescription.source.id}`,
-                    label: data.spaceDescription.source.name
+                    link: `/data-entry/sources/${location.source.id}`,
+                    label: location.source.name,
                 },
                 {
-                    link: `/data-entry/locations/${data.spaceDescription.id}`,
-                    label: data.spaceDescription.name
+                    link: `/location-entry/locations/${location.id}`,
+                    label: location.name,
                 },
-            ];
-        } else {
-            return [
-                { link: '/', label: 'Lettercraft' },
-                { link: '/data-entry', label: 'Data entry' },
-                { link: '', label: 'Location not found' }
             ]
-        }
+        })
+    )
+
+
+    public dataIcons = dataIcons;
+    public deletingInProgress = false;
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private router: Router,
+        private modalService: ModalService,
+        private toastService: ToastService,
+        private formService: FormService,
+        private locationQuery: DataEntrySpaceDescriptionGQL,
+        private deleteLocation: DataEntryDeleteLocationGQL
+    ) { }
+
+    public onClickDelete(location: QueriedLocation): void {
+        this.modalService
+            .openConfirmationModal({
+                title: "Delete location",
+                message: `Are you sure you want to delete this location? (${location.name})`,
+            })
+            .then(() => this.performDelete(location.id, location.source.id))
+            .catch(() => {
+                // Do nothing on cancel / dismissal.
+            });
+    }
+
+    private performDelete(locationId: string, sourceId: string): void {
+        this.deletingInProgress = true;
+        this.deleteLocation
+            .mutate(
+                {
+                    id: locationId,
+                },
+                {
+                    update: (cache) => this.updateCache(cache, locationId),
+                }
+            )
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                this.deletingInProgress = false;
+                const errors = result.data?.deleteLocation?.errors;
+                if (errors && errors.length > 0) {
+                    this.toastService.show({
+                        body: errors.map((error) => error.messages).join("\n"),
+                        type: "danger",
+                        header: "Deletion failed",
+                    });
+                } else {
+                    this.toastService.show({
+                        body: "Location deleted",
+                        type: "success",
+                        header: "Success",
+                    });
+                }
+                this.router.navigate([`/data-entry/sources/${sourceId}`]);
+            });
+    }
+
+    private updateCache(cache: ApolloCache<unknown>, locationId: string): void {
+        const identified = cache.identify({
+            __typename: "SpaceDescriptionType",
+            id: locationId,
+        });
+        cache.evict({ id: identified });
+        cache.gc();
     }
 }
diff --git a/frontend/src/app/data-entry/location-form/location-form.module.ts b/frontend/src/app/data-entry/location-form/location-form.module.ts
index 5e82e237..111bb084 100644
--- a/frontend/src/app/data-entry/location-form/location-form.module.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.module.ts
@@ -1,18 +1,11 @@
-import { NgModule } from '@angular/core';
-import { SharedModule } from '@shared/shared.module';
-import { LocationFormComponent } from './location-form.component';
-
-
+import { NgModule } from "@angular/core";
+import { LocationFormComponent } from "./location-form.component";
+import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
+import { SharedModule } from "@shared/shared.module";
 
 @NgModule({
-    declarations: [
-        LocationFormComponent
-    ],
-    imports: [
-        SharedModule
-    ],
-    exports: [
-        LocationFormComponent
-    ]
+    declarations: [LocationFormComponent],
+    imports: [SharedModule, DataEntrySharedModule],
+    exports: [LocationFormComponent],
 })
-export class LocationFormModule { }
+export class LocationFormModule {}
diff --git a/frontend/src/app/data-entry/location-form/location.graphql b/frontend/src/app/data-entry/location-form/location.graphql
index b063cbe1..7f8f2c22 100644
--- a/frontend/src/app/data-entry/location-form/location.graphql
+++ b/frontend/src/app/data-entry/location-form/location.graphql
@@ -19,3 +19,13 @@ mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
         }
     }
 }
+
+mutation DataEntryDeleteLocation($id: ID!) {
+    deleteLocation(id: $id) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From 9b1338d5b7ae64914f972bf4ca2eb153c4852e24 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 25 Sep 2024 14:40:36 +0200
Subject: [PATCH 495/565] consistent method name

---
 backend/person/mutations/CreateAgentMutation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index d82016fd..6e72276d 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -40,7 +40,7 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
         try:
             with transaction.atomic():
                 cls.mutate_object(agent_data, agent, info)
-                cls._add_contribution(agent, agent_data, info)
+                cls.add_contribution(agent, agent_data, info)
                 agent.full_clean()
         except ValidationError as e:
             errors = [
@@ -51,7 +51,7 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
 
         return cls(ok=True, agent=agent, errors=[])
 
-    def _add_contribution(
+    def add_contribution(
         agent: AgentDescription, agent_data: CreateAgentInput, info: ResolveInfo
     ):
         if info.context:

From 8db2a42a07e4905cb47d635344c21e8a97fd4d36 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 25 Sep 2024 14:46:41 +0200
Subject: [PATCH 496/565] cleaner updateCache methods

---
 .../agent-episodes-form.component.ts          |  3 ++-
 .../episode-entities-form.component.ts        | 25 ++++++++++++-------
 .../episode-identification-form.component.ts  |  6 +++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
index 04d6add1..1e5510e5 100644
--- a/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-episodes-form/agent-episodes-form.component.ts
@@ -14,6 +14,7 @@ import { actionIcons } from '@shared/icons';
 import { FormStatus } from '../../shared/types';
 import { MutationResult } from 'apollo-angular';
 import { differenceBy } from '@shared/utils';
+import { ApolloCache } from '@apollo/client/core';
 
 
 @Component({
@@ -110,7 +111,7 @@ export class AgentEpisodesFormComponent implements OnDestroy {
         this.status$.next('error');
     }
 
-    private updateCache(episodeID: string, agentID: string, cache: any) {
+    private updateCache(episodeID: string, agentID: string, cache: ApolloCache<unknown>) {
         cache.evict({ id: cache.identify({ __typename: "EpisodeType", id: episodeID }) });
         cache.evict({ id: cache.identify({ __typename: "AgentDescriptionType", id: agentID }) });
         cache.gc();
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index 048f619a..ccfe5600 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -16,6 +16,7 @@ import {
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { splat, differenceBy } from "@shared/utils";
 import { ToastService } from "@services/toast.service";
+import { ApolloCache } from "@apollo/client/core";
 
 type EntityPropertyName = 'agents' | 'gifts' | 'letters' | 'spaces';
 type EntityTypeName = 'AgentDescriptionType' | 'GiftDescriptionType' | 'LetterDescriptionType' | 'SpaceDescriptionType';
@@ -177,15 +178,21 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
         return differenceBy(allEntities, linkedEntities, 'id');
     }
 
-    private updateCacheOnAddRemove(episodeID: string, entityID: string, cache: any) {
-        cache.evict(cache.identify({
-            __typename: "EpisodeType",
-            id: episodeID,
-        }));
-        cache.evict(cache.identify({
-            __typename: this.entityTypeName,
-            id: entityID,
-        }));
+    private updateCacheOnAddRemove(episodeID: string, entityID: string, cache: ApolloCache<unknown>) {
+        cache.evict({
+            id: cache.identify({
+                __typename: "EpisodeType",
+                id: episodeID,
+            }),
+            fieldName: this.entityProperty,
+        });
+        cache.evict({
+            id: cache.identify({
+                __typename: this.entityTypeName,
+                id: entityID,
+            }),
+            fieldName: 'episodes',
+        });
         cache.gc();
     }
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 58d9feca..0317cb55 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -20,6 +20,8 @@ import {
 } from "rxjs";
 import { FormService } from "../../shared/form.service";
 import { formStatusSubject } from "../../shared/utils";
+import { ApolloCache } from "@apollo/client/core";
+
 
 interface EpisodeIdentification {
     name: string;
@@ -116,12 +118,12 @@ export class EpisodeIdentificationFormComponent implements OnDestroy {
         );
     }
 
-    private updateCache(cache: any, id: string): void {
+    private updateCache(cache: ApolloCache<unknown>, id: string): void {
         const identified = cache.identify({
             __typename: "EpisodeType",
             id,
         });
-        cache.evict({ id: identified });
+        cache.evict({ id: identified, fieldName: 'name' });
         cache.gc();
     }
 

From 0b7f7963c59b2d61d8271245f4721745bca9c00b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 19 Sep 2024 15:48:04 +0200
Subject: [PATCH 497/565] generate create agent component

---
 .../create-agent/create-agent.component.html  |  1 +
 .../create-agent/create-agent.component.scss  |  0
 .../create-agent.component.spec.ts            | 21 +++++++++++++++++++
 .../create-agent/create-agent.component.ts    | 10 +++++++++
 .../create-forms/create-forms.module.ts       | 20 ++++++++++++++++++
 .../episode-entities-form.component.html      |  2 ++
 .../episode-form/episode-form.module.ts       |  3 ++-
 7 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.scss
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
 create mode 100644 frontend/src/app/data-entry/create-forms/create-forms.module.ts

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
new file mode 100644
index 00000000..054f0bc1
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
@@ -0,0 +1 @@
+<p>create-agent works!</p>
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.scss b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
new file mode 100644
index 00000000..897e5d94
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateAgentComponent } from './create-agent.component';
+
+describe('CreateAgentComponent', () => {
+  let component: CreateAgentComponent;
+  let fixture: ComponentFixture<CreateAgentComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [CreateAgentComponent]
+    });
+    fixture = TestBed.createComponent(CreateAgentComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
new file mode 100644
index 00000000..9376dde6
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'lc-create-agent',
+  templateUrl: './create-agent.component.html',
+  styleUrls: ['./create-agent.component.scss']
+})
+export class CreateAgentComponent {
+
+}
diff --git a/frontend/src/app/data-entry/create-forms/create-forms.module.ts b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
new file mode 100644
index 00000000..f2f6608b
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CreateAgentComponent } from './create-agent/create-agent.component';
+import { SharedModule } from '@shared/shared.module';
+import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
+
+
+
+@NgModule({
+    declarations: [
+        CreateAgentComponent
+    ],
+    imports: [
+        SharedModule,
+        DataEntrySharedModule,
+    ],
+    exports: [
+        CreateAgentComponent,
+    ]
+})
+export class CreateFormsModule { }
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index a2467e6b..1862b8f2 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -46,3 +46,5 @@
         </div>
     </div>
 </div>
+
+<lc-create-agent></lc-create-agent>
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.module.ts b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
index bda110e1..80c9b11e 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.module.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.module.ts
@@ -8,6 +8,7 @@ import { SharedModule } from "@shared/shared.module";
 import { EpisodeFormComponent } from "./episode-form.component";
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 import { NewEpisodeFormComponent } from "./new-episode-form/new-episode-form.component";
+import { CreateFormsModule } from "../create-forms/create-forms.module";
 
 @NgModule({
     declarations: [
@@ -18,7 +19,7 @@ import { NewEpisodeFormComponent } from "./new-episode-form/new-episode-form.com
         EpisodeEntitiesFormComponent,
         NewEpisodeFormComponent,
     ],
-    imports: [CommonModule, SharedModule, DataEntrySharedModule],
+    imports: [CommonModule, SharedModule, DataEntrySharedModule, CreateFormsModule,],
     exports: [NewEpisodeFormComponent, EpisodeFormComponent],
 })
 export class EpisodeFormModule {}

From cd3d27ad5b99751c0914514f441cdbcaca95a4f2 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 19 Sep 2024 16:03:29 +0200
Subject: [PATCH 498/565] draft create agent modal

---
 .../create-agent/create-agent.component.html  | 47 ++++++++++++++++++-
 .../create-agent/create-agent.component.ts    | 37 ++++++++++++++-
 .../episode-entities-form.component.html      |  5 +-
 .../episode-entities-form.component.ts        |  2 +
 4 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
index 054f0bc1..761f1523 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
@@ -1 +1,46 @@
-<p>create-agent works!</p>
+<ng-template #createAgentModal>
+    <lc-base-modal (dismiss)="closeModal()">
+        <ng-container modal-header>
+            <h4 ngbAutofocus tabindex="-1">Create new agent</h4>
+        </ng-container>
+        <form modal-content [formGroup]="form" (ngSubmit)="submit()">
+            <div class="form-group">
+                <label class="form-label" for="episode-name">Name</label>
+                <p class="form-text">
+                    This is a name to identify the agent in the overview of the
+                    source. For example: "Radegund", "messenger from Poitiers",
+                    "the citizens of Arles".
+                </p>
+                <input
+                    id="episode-name"
+                    type="text"
+                    class="form-control"
+                    [formControl]="form.controls.name"
+                    [class.is-invalid]="
+                        form.controls.name.invalid && form.controls.name.touched
+                    "
+                />
+                <p class="invalid-feedback">This field is required.</p>
+            </div>
+        </form>
+        <ng-container modal-footer>
+            <button
+                type="button"
+                class="btn btn-primary"
+                (click)="submit()"
+            >
+                Create
+                <div *ngIf="loading" class="spinner-border spinner-border-sm">
+                    <span class="visually-hidden">Creating new agent...</span>
+                </div>
+            </button>
+            <button
+                type="button"
+                class="btn btn-secondary"
+                (click)="closeModal()"
+            >
+                Cancel
+            </button>
+        </ng-container>
+    </lc-base-modal>
+</ng-template>
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 9376dde6..5aaf4cb9 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -1,10 +1,43 @@
-import { Component } from '@angular/core';
+import { AfterViewInit, Component, Input, TemplateRef, ViewChild } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'lc-create-agent',
   templateUrl: './create-agent.component.html',
   styleUrls: ['./create-agent.component.scss']
 })
-export class CreateAgentComponent {
+export class CreateAgentComponent implements AfterViewInit {
+    @Input({ required: true }) create!: Observable<void>;
 
+    @ViewChild('createAgentModal') modalTempate?: TemplateRef<unknown>;
+
+    modal: NgbModalRef | null = null;
+    form = new FormGroup({
+        name: new FormControl<string>('', {
+            nonNullable: true,
+            validators: Validators.required,
+        }),
+    });
+
+    loading = false;
+
+    constructor(
+        private modalService: NgbModal,
+    ) { }
+
+    ngAfterViewInit(): void {
+        this.create.subscribe(() =>
+            this.modal = this.modalService.open(this.modalTempate)
+        );
+    }
+
+    closeModal() {
+        this.modal?.close();
+    }
+
+    submit() {
+        this.modal?.close();
+    }
 }
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index 1862b8f2..cbf4f5e4 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -39,7 +39,7 @@
                 ngbDropdownItem (click)="addEntity$.next(entity.id); dropdownToggle.focus()">
                 {{entity.name}}
             </button>
-            <button ngbDropdownItem disabled>
+            <button ngbDropdownItem (click)="createEntity$.next()">
                 <lc-icon [icon]="actionIcons.create" />
                 Create new {{entityName}}
             </button>
@@ -47,4 +47,5 @@
     </div>
 </div>
 
-<lc-create-agent></lc-create-agent>
+
+<lc-create-agent [create]="createEntity$"></lc-create-agent>
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index ccfe5600..87f66033 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -38,6 +38,8 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
 
     addEntity$ = new Subject<string>();
     removeEntity$ = new Subject<string>();
+    createEntity$ = new Subject<void>();
+
     actionIcons = actionIcons;
     status$ = formStatusSubject();
     id = `episode-entities-${nextID++}`;

From 4de3f428b3cd4a37eac506164f7b48ba1358820b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 20 Sep 2024 11:06:20 +0200
Subject: [PATCH 499/565] submit create agent form

---
 .../person/mutations/CreateAgentMutation.py   |  1 +
 frontend/generated/graphql.ts                 | 29 +++++++++
 .../create-agent/create-agent.component.ts    | 61 ++++++++++++++++++-
 .../create-agent/create-agent.graphql         |  9 +++
 .../episode-entities-form.component.html      | 47 +++++++-------
 5 files changed, 122 insertions(+), 25 deletions(-)
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql

diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index 6e72276d..a9f5e428 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -22,6 +22,7 @@
 class CreateAgentInput(InputObjectType):
     name = String(required=True)
     source = ID(required=True)
+    episodes = List(NonNull(ID))
 
 
 class CreateAgentMutation(LettercraftMutation):
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index eb439a0d..fe892482 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1082,6 +1082,13 @@ export type DataEntryDeleteAgentMutationVariables = Exact<{
 
 export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
 
+export type DataEntryCreateAgentMutationVariables = Exact<{
+  input: CreateAgentInput;
+}>;
+
+
+export type DataEntryCreateAgentMutation = { __typename?: 'Mutation', createAgent?: { __typename?: 'CreateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1505,6 +1512,28 @@ export const DataEntryDeleteAgentDocument = gql`
   export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
     override document = DataEntryDeleteAgentDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryCreateAgentDocument = gql`
+    mutation DataEntryCreateAgent($input: CreateAgentInput!) {
+  createAgent(agentData: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryCreateAgentGQL extends Apollo.Mutation<DataEntryCreateAgentMutation, DataEntryCreateAgentMutationVariables> {
+    override document = DataEntryCreateAgentDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 5aaf4cb9..6487c299 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -1,7 +1,11 @@
-import { AfterViewInit, Component, Input, TemplateRef, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, DestroyRef, Input, TemplateRef, ViewChild } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { ToastService } from '@services/toast.service';
+import { CreateAgentInput, DataEntryCreateAgentGQL } from 'generated/graphql';
 import { Observable } from 'rxjs';
+import _ from 'underscore';
 
 @Component({
   selector: 'lc-create-agent',
@@ -10,6 +14,7 @@ import { Observable } from 'rxjs';
 })
 export class CreateAgentComponent implements AfterViewInit {
     @Input({ required: true }) create!: Observable<void>;
+    @Input({ required: true }) sourceID!: string;
 
     @ViewChild('createAgentModal') modalTempate?: TemplateRef<unknown>;
 
@@ -25,6 +30,9 @@ export class CreateAgentComponent implements AfterViewInit {
 
     constructor(
         private modalService: NgbModal,
+        private createMutation: DataEntryCreateAgentGQL,
+        private toastService: ToastService,
+        private destroyRef: DestroyRef,
     ) { }
 
     ngAfterViewInit(): void {
@@ -38,6 +46,57 @@ export class CreateAgentComponent implements AfterViewInit {
     }
 
     submit() {
+        this.form.updateValueAndValidity();
+        this.form.controls.name.markAsTouched();
+        if (this.form.invalid) {
+            return;
+        }
+        this.loading = true;
+        const input: CreateAgentInput = {
+            name: this.form.value.name || '',
+            source: this.sourceID,
+        };
+        this.createMutation.mutate(
+            { input },
+            {
+                errorPolicy: 'all',
+                update: (cache) => this.updateCache(this.sourceID, cache),
+            }
+        )
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => {
+                const errors = result.errors || result.data?.createAgent?.errors;
+                if (errors && errors.length > 0) {
+                    this.onMutationError(errors);
+                }
+                this.onMutationSuccess();
+            });
+    }
+
+    private updateCache(sourceID: string, cache: any) {
+        cache.evict({
+            id: cache.identify({ __typename: "SourceType", id: sourceID }),
+            fieldName: 'agents',
+        });
+        cache.gc();
+    }
+
+    private onMutationSuccess() {
+        this.loading = false;
         this.modal?.close();
+        this.form.reset();
+    }
+
+    private onMutationError(errors: any[] | readonly any[] | undefined) {
+        console.error(errors);
+        const messages = errors?.map(error =>
+            _.get(error, 'message', undefined) || _.get(error, 'messages', []).join('\n')
+        ) || ['Unknown error'];
+        this.loading = false;
+        this.toastService.show({
+            type: 'danger',
+            header: 'Creating agent failed',
+            body: messages.join('\n'),
+        })
     }
 }
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql
new file mode 100644
index 00000000..98ff467f
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql
@@ -0,0 +1,9 @@
+mutation DataEntryCreateAgent($input: CreateAgentInput!) {
+    createAgent(agentData: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index cbf4f5e4..c0078926 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -22,30 +22,29 @@
                 No {{entityName}}s have been added to this episode.
             </p>
         </ng-template>
-    </ng-container>
-</ng-container>
 
-<div class="mt-4 mb-4">
-    <div ngbDropdown>
-        <button type="button" class="btn btn-primary"
-            #dropdownToggle
-            [attr.id]="dropdownToggleID"
-            ngbDropdownToggle>
-            Add {{entityName}}
-        </button>
-        <div ngbDropdownMenu
-            [attr.aria-labelledby]="dropdownToggleID">
-            <button *ngFor="let entity of (availableEntities$ | async)"
-                ngbDropdownItem (click)="addEntity$.next(entity.id); dropdownToggle.focus()">
-                {{entity.name}}
-            </button>
-            <button ngbDropdownItem (click)="createEntity$.next()">
-                <lc-icon [icon]="actionIcons.create" />
-                Create new {{entityName}}
-            </button>
+        <div class="mt-4 mb-4">
+            <div ngbDropdown>
+                <button type="button" class="btn btn-primary"
+                    #dropdownToggle
+                    [attr.id]="dropdownToggleID"
+                    ngbDropdownToggle>
+                    Add {{entityName}}
+                </button>
+                <div ngbDropdownMenu
+                    [attr.aria-labelledby]="dropdownToggleID">
+                    <button *ngFor="let entity of (availableEntities$ | async)"
+                        ngbDropdownItem (click)="addEntity$.next(entity.id); dropdownToggle.focus()">
+                        {{entity.name}}
+                    </button>
+                    <button ngbDropdownItem (click)="createEntity$.next()">
+                        <lc-icon [icon]="actionIcons.create" />
+                        Create new {{entityName}}
+                    </button>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-
 
-<lc-create-agent [create]="createEntity$"></lc-create-agent>
+        <lc-create-agent [create]="createEntity$" [sourceID]="data.episode.source.id" />
+    </ng-container>
+</ng-container>

From 5d823d1acc2d352e475cad65685ffc8c88d10965 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 20 Sep 2024 11:21:53 +0200
Subject: [PATCH 500/565] create agents

---
 ...ode_agents_alter_episode_gifts_and_more.py | 36 +++++++++++++++++++
 backend/event/models.py                       |  4 +++
 .../person/mutations/CreateAgentMutation.py   |  1 -
 frontend/generated/graphql.ts                 |  1 +
 frontend/generated/schema.graphql             |  1 +
 .../create-agent/create-agent.component.ts    | 12 +++++--
 .../episode-entities-form.component.html      |  3 +-
 7 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 backend/event/migrations/0026_alter_episode_agents_alter_episode_gifts_and_more.py

diff --git a/backend/event/migrations/0026_alter_episode_agents_alter_episode_gifts_and_more.py b/backend/event/migrations/0026_alter_episode_agents_alter_episode_gifts_and_more.py
new file mode 100644
index 00000000..22aed249
--- /dev/null
+++ b/backend/event/migrations/0026_alter_episode_agents_alter_episode_gifts_and_more.py
@@ -0,0 +1,36 @@
+# Generated by Django 4.2.7 on 2024-09-20 09:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('letter', '0019_alter_giftdescriptioncategory_source_mention_and_more'),
+        ('space', '0018_alter_regionfield_source_mention_and_more'),
+        ('person', '0021_alter_agentdescriptiongender_source_mention_and_more'),
+        ('event', '0025_fill_in_blank_sourcemention'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='episode',
+            name='agents',
+            field=models.ManyToManyField(blank=True, help_text='agents involved in this episode', related_name='episodes', through='event.EpisodeAgent', to='person.agentdescription'),
+        ),
+        migrations.AlterField(
+            model_name='episode',
+            name='gifts',
+            field=models.ManyToManyField(blank=True, help_text='gifts involved in this episode', related_name='episodes', through='event.EpisodeGift', to='letter.giftdescription'),
+        ),
+        migrations.AlterField(
+            model_name='episode',
+            name='letters',
+            field=models.ManyToManyField(blank=True, help_text='letters involved in this episode', related_name='episodes', through='event.EpisodeLetter', to='letter.letterdescription'),
+        ),
+        migrations.AlterField(
+            model_name='episode',
+            name='spaces',
+            field=models.ManyToManyField(blank=True, help_text='locations involved in this episode', related_name='episodes', through='event.EpisodeSpace', to='space.spacedescription'),
+        ),
+    ]
diff --git a/backend/event/models.py b/backend/event/models.py
index c4e202cf..785ed13a 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -29,24 +29,28 @@ class Episode(EntityDescription, models.Model):
     agents = models.ManyToManyField(
         to=AgentDescription,
         through="EpisodeAgent",
+        related_name="episodes",
         blank=True,
         help_text="agents involved in this episode",
     )
     gifts = models.ManyToManyField(
         to=GiftDescription,
         through="EpisodeGift",
+        related_name="episodes",
         blank=True,
         help_text="gifts involved in this episode",
     )
     letters = models.ManyToManyField(
         to=LetterDescription,
         through="EpisodeLetter",
+        related_name="episodes",
         blank=True,
         help_text="letters involved in this episode",
     )
     spaces = models.ManyToManyField(
         to=SpaceDescription,
         through="EpisodeSpace",
+        related_name="episodes",
         blank=True,
         help_text="locations involved in this episode",
     )
diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index a9f5e428..c5c61929 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -16,7 +16,6 @@
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from event.models import Episode
-from source.models import Source
 
 
 class CreateAgentInput(InputObjectType):
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index fe892482..651e0ccb 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -75,6 +75,7 @@ export enum Certainty {
 }
 
 export type CreateAgentInput = {
+  episodes?: InputMaybe<Array<Scalars['ID']['input']>>;
   name: Scalars['String']['input'];
   source: Scalars['ID']['input'];
 };
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index bfd06295..c356e48d 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -64,6 +64,7 @@ enum Certainty {
 }
 
 input CreateAgentInput {
+  episodes: [ID!]
   name: String!
   source: ID!
 }
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 6487c299..76a226f9 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -15,6 +15,7 @@ import _ from 'underscore';
 export class CreateAgentComponent implements AfterViewInit {
     @Input({ required: true }) create!: Observable<void>;
     @Input({ required: true }) sourceID!: string;
+    @Input() episodeID?: string;
 
     @ViewChild('createAgentModal') modalTempate?: TemplateRef<unknown>;
 
@@ -55,12 +56,13 @@ export class CreateAgentComponent implements AfterViewInit {
         const input: CreateAgentInput = {
             name: this.form.value.name || '',
             source: this.sourceID,
+            episodes: this.episodeID ? [this.episodeID] : null
         };
         this.createMutation.mutate(
             { input },
             {
                 errorPolicy: 'all',
-                update: (cache) => this.updateCache(this.sourceID, cache),
+                update: (cache) => this.updateCache(this.sourceID, this.episodeID, cache),
             }
         )
             .pipe(takeUntilDestroyed(this.destroyRef))
@@ -73,11 +75,17 @@ export class CreateAgentComponent implements AfterViewInit {
             });
     }
 
-    private updateCache(sourceID: string, cache: any) {
+    private updateCache(sourceID: string, episodeID: string | undefined, cache: any) {
         cache.evict({
             id: cache.identify({ __typename: "SourceType", id: sourceID }),
             fieldName: 'agents',
         });
+        if (episodeID) {
+            cache.evict({
+                id: cache.identify({ __typename: "EpisodeType", id: episodeID }),
+                fieldName: 'agents',
+            });
+        }
         cache.gc();
     }
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index c0078926..8be5d55b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -45,6 +45,7 @@
             </div>
         </div>
 
-        <lc-create-agent [create]="createEntity$" [sourceID]="data.episode.source.id" />
+        <lc-create-agent [create]="createEntity$" [sourceID]="data.episode.source.id"
+            [episodeID]="data.episode.id" />
     </ng-container>
 </ng-container>

From 5932699d8a0f97ee50fed29b79b499a402d6ba31 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 20 Sep 2024 11:26:44 +0200
Subject: [PATCH 501/565] more targeted cache update

---
 .../episode-entities-form/episode-entities-form.component.ts     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
index 87f66033..f687397d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.ts
@@ -193,7 +193,6 @@ export class EpisodeEntitiesFormComponent implements OnChanges, OnDestroy {
                 __typename: this.entityTypeName,
                 id: entityID,
             }),
-            fieldName: 'episodes',
         });
         cache.gc();
     }

From 74733462be9ec92139a54708524d910554ef9f15 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 20 Sep 2024 11:43:37 +0200
Subject: [PATCH 502/565] form improvements

---
 .../create-agent/create-agent.component.html             | 6 +++---
 .../create-forms/create-agent/create-agent.component.ts  | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
index 761f1523..0015b9bd 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
@@ -16,9 +16,9 @@ <h4 ngbAutofocus tabindex="-1">Create new agent</h4>
                     type="text"
                     class="form-control"
                     [formControl]="form.controls.name"
-                    [class.is-invalid]="
-                        form.controls.name.invalid && form.controls.name.touched
-                    "
+                    [class.is-invalid]="form.controls.name.invalid && submitted"
+                    [attr.aria-invalid]="form.controls.name.invalid && submitted"
+                    [attr.aria-required]="true"
                 />
                 <p class="invalid-feedback">This field is required.</p>
             </div>
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 76a226f9..be57f6cb 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -28,6 +28,7 @@ export class CreateAgentComponent implements AfterViewInit {
     });
 
     loading = false;
+    submitted = false;
 
     constructor(
         private modalService: NgbModal,
@@ -37,9 +38,10 @@ export class CreateAgentComponent implements AfterViewInit {
     ) { }
 
     ngAfterViewInit(): void {
-        this.create.subscribe(() =>
-            this.modal = this.modalService.open(this.modalTempate)
-        );
+        this.create.subscribe(() => {
+            this.submitted = false;
+            this.modal = this.modalService.open(this.modalTempate);
+        });
     }
 
     closeModal() {
@@ -47,6 +49,7 @@ export class CreateAgentComponent implements AfterViewInit {
     }
 
     submit() {
+        this.submitted = true;
         this.form.updateValueAndValidity();
         this.form.controls.name.markAsTouched();
         if (this.form.invalid) {

From 20330e415782618a25c53b21ce0f74b99779a3a6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 20 Sep 2024 11:47:49 +0200
Subject: [PATCH 503/565] disable create button for other entity types

---
 .../episode-entities-form/episode-entities-form.component.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index 8be5d55b..3139c8c9 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -37,7 +37,8 @@
                         ngbDropdownItem (click)="addEntity$.next(entity.id); dropdownToggle.focus()">
                         {{entity.name}}
                     </button>
-                    <button ngbDropdownItem (click)="createEntity$.next()">
+                    <button ngbDropdownItem (click)="createEntity$.next()"
+                        [disabled]="entityName !== 'agent'">
                         <lc-icon [icon]="actionIcons.create" />
                         Create new {{entityName}}
                     </button>

From 500797a60bfaa86e66e8e378ceb9316bef01ac02 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 20 Sep 2024 12:06:26 +0200
Subject: [PATCH 504/565] list examples for names

---
 .../agent-identification-form.component.html          |  2 +-
 .../agent-identification-form.component.ts            |  3 +++
 .../create-agent/create-agent.component.html          |  3 +--
 .../create-agent/create-agent.component.ts            |  3 +++
 .../episode-identification-form.component.html        |  3 +--
 .../episode-identification-form.component.ts          |  5 +++--
 .../gift-identification-form.component.html           |  2 +-
 .../gift-identification-form.component.ts             |  3 +++
 .../letter-identification-form.component.html         |  3 +--
 .../letter-identification-form.component.ts           |  3 +++
 frontend/src/app/data-entry/shared/utils.ts           | 11 +++++++++++
 11 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
index 63e84889..ee7f0a18 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.html
@@ -6,7 +6,7 @@
         <p>
             <small class="text-body-secondary">
                 This is a name to identify the agent in the overview of the source.
-                For example: "Radegund", "messenger from Poitiers", "the citizens of Arles".
+                For example: {{ nameExamples }}.
             </small>
         </p>
         <input id="input-name" type="text" class="form-control"
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index de8efdba..a4028fd6 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -17,6 +17,7 @@ import {
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
+import { listNames, nameExamples } from '../../shared/utils';
 
 interface FormData {
     name: string;
@@ -41,6 +42,8 @@ export class AgentIdentificationFormComponent implements OnDestroy {
 
     status$ = new BehaviorSubject<FormStatus>('idle');
 
+    nameExamples = listNames(nameExamples['agent']);
+
     private id$ = this.formService.id$;
     private formName = 'identification';
 
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
index 0015b9bd..e2132f2a 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
@@ -8,8 +8,7 @@ <h4 ngbAutofocus tabindex="-1">Create new agent</h4>
                 <label class="form-label" for="episode-name">Name</label>
                 <p class="form-text">
                     This is a name to identify the agent in the overview of the
-                    source. For example: "Radegund", "messenger from Poitiers",
-                    "the citizens of Arles".
+                    source. For example: {{ nameExamples }}.
                 </p>
                 <input
                     id="episode-name"
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index be57f6cb..7bd768d5 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -6,6 +6,7 @@ import { ToastService } from '@services/toast.service';
 import { CreateAgentInput, DataEntryCreateAgentGQL } from 'generated/graphql';
 import { Observable } from 'rxjs';
 import _ from 'underscore';
+import { listNames, nameExamples } from '../../shared/utils';
 
 @Component({
   selector: 'lc-create-agent',
@@ -30,6 +31,8 @@ export class CreateAgentComponent implements AfterViewInit {
     loading = false;
     submitted = false;
 
+    nameExamples = listNames(nameExamples['agent']);
+
     constructor(
         private modalService: NgbModal,
         private createMutation: DataEntryCreateAgentGQL,
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
index 864a6b08..4da699ef 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.html
@@ -3,8 +3,7 @@
         <label class="form-label" for="episode-name">Name</label>
         <p class="form-text">
             This is a name to identify the episode in the overview of the
-            source. For example: "journey to Rome", "Clovis' response",
-            "Radegund asks Germanus for help".
+            source. For example: {{ nameExamples }}.
         </p>
         <input
             id="episode-name"
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 0317cb55..fd310287 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -19,10 +19,9 @@ import {
     withLatestFrom,
 } from "rxjs";
 import { FormService } from "../../shared/form.service";
-import { formStatusSubject } from "../../shared/utils";
+import { formStatusSubject, listNames, nameExamples } from "../../shared/utils";
 import { ApolloCache } from "@apollo/client/core";
 
-
 interface EpisodeIdentification {
     name: string;
 }
@@ -52,6 +51,8 @@ export class EpisodeIdentificationFormComponent implements OnDestroy {
         }),
     });
 
+    nameExamples = listNames(nameExamples['episode']);
+
     private status$ = formStatusSubject();
 
     constructor(
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html
index 139ec834..88f75045 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.html
@@ -3,7 +3,7 @@
         <label class="form-label" for="episode-name">Name</label>
         <p class="form-text">
             This is a name to identify the gift in the overview of the source.
-            For example: "golden cup", "hair shirt".
+            For example: {{ nameExamples }}.
         </p>
         <input
             id="episode-name"
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index dab3d11f..761d69a8 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -20,6 +20,7 @@ import {
     withLatestFrom,
     Observable,
 } from "rxjs";
+import { listNames, nameExamples } from "../../shared/utils";
 
 interface GiftIdentification {
     name: string;
@@ -54,6 +55,8 @@ export class GiftIdentificationFormComponent implements OnInit {
         }),
     });
 
+    nameExamples = listNames(nameExamples['gift']);
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
index 37e8ba7e..39d1cc46 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.html
@@ -3,8 +3,7 @@
         <label class="form-label" for="episode-name">Name</label>
         <p class="form-text">
             This is a name to identify the letter in the overview of the source.
-            For example: "letter from Radegund to Germanus", "Radegund's first
-            letter".
+            For example: {{ nameExamples }}.
         </p>
         <input
             id="episode-name"
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index a2ccdbce..f8dd2bc9 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -16,6 +16,7 @@ import {
     switchMap,
     withLatestFrom,
 } from "rxjs/operators";
+import { listNames, nameExamples } from "../../shared/utils";
 
 @Component({
     selector: "lc-letter-identification-form",
@@ -41,6 +42,8 @@ export class LetterIdentificationFormComponent implements OnInit {
         }),
     });
 
+    nameExamples = listNames(nameExamples['letter']);
+
     constructor(
         private destroyRef: DestroyRef,
         private route: ActivatedRoute,
diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
index cccbe978..d3f99e61 100644
--- a/frontend/src/app/data-entry/shared/utils.ts
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -16,3 +16,14 @@ export const entityTypeNames: Record<Entity, string> = {
     [Entity.Letter]: 'letter',
     [Entity.Space]: 'location',
 };
+
+export const nameExamples: Record<string, string[]> = {
+    episode: ['journey to Rome', 'Clovis\' response', 'Radegund asks Germanus for help'],
+    agent: ['Radegund', 'messenger from Poitiers', 'the citizens of Arles'],
+    letter: ['letter from Radegund to Germanus', 'Radegund\'s first letter'],
+    gift: ['royal gifts', 'golden cup'],
+    location: ['Alemannia', 'royal court', 'ducal villa'],
+}
+
+export const listNames = (names: string[]): string =>
+    names.map(name => `"${name}"`).join(', ');

From 267236c9b41b07a4c44e2c8d10c1e3b1bb26b409 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 20 Sep 2024 12:20:36 +0200
Subject: [PATCH 505/565] update create agent form spec

---
 .../create-agent.component.spec.ts            | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
index 897e5d94..e90ba5dd 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
@@ -1,21 +1,33 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CreateAgentComponent } from './create-agent.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+import { Subject } from 'rxjs';
 
 describe('CreateAgentComponent', () => {
-  let component: CreateAgentComponent;
-  let fixture: ComponentFixture<CreateAgentComponent>;
+    let component: CreateAgentComponent;
+    let fixture: ComponentFixture<CreateAgentComponent>;
+    let create$: Subject<void>;
 
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [CreateAgentComponent]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [CreateAgentComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(CreateAgentComponent);
+        component = fixture.componentInstance;
+        create$ = new Subject<void>();
+        component.create = create$;
+        component.sourceID = '1';
+        fixture.detectChanges();
     });
-    fixture = TestBed.createComponent(CreateAgentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+
+    it('should open a modal', () => {
+        create$.next();
+        expect(component.modal).toBeTruthy();
+    })
 });

From 98a626695ea98dadc62392d755bd5f291346bbe1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 23 Sep 2024 11:50:06 +0200
Subject: [PATCH 506/565] split AgentCreator class from coponent

---
 .../create-agent/create-agent.component.ts    | 126 ++++++++++++------
 frontend/src/app/shared/request-utils.ts      |   9 ++
 2 files changed, 97 insertions(+), 38 deletions(-)
 create mode 100644 frontend/src/app/shared/request-utils.ts

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 7bd768d5..d95a3d61 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -3,10 +3,84 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
-import { CreateAgentInput, DataEntryCreateAgentGQL } from 'generated/graphql';
-import { Observable } from 'rxjs';
+import { CreateAgentInput, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
+import { filter, map, Observable, shareReplay, } from 'rxjs';
 import _ from 'underscore';
 import { listNames, nameExamples } from '../../shared/utils';
+import { MutationResult } from 'apollo-angular';
+import { isLoading } from '@shared/request-utils';
+
+interface MutationOutcome<T> {
+    loading$: Observable<boolean>;
+    succes$: Observable<T>;
+    errors$: Observable<string[]>,
+}
+
+class AgentCreator {
+    constructor(
+        private createMutation: DataEntryCreateAgentGQL,
+        private destroyRef: DestroyRef
+    ) { }
+
+    submit(input: CreateAgentInput): MutationOutcome<DataEntryCreateAgentMutation> {
+        const result$ = this.createMutation.mutate(
+            { input },
+            {
+                errorPolicy: 'all',
+                update: (cache) => this.updateCache(input.source, input.episodes, cache),
+            }
+        ).pipe(
+            shareReplay(1),
+            takeUntilDestroyed(this.destroyRef),
+        );
+        return this.getOutcome(result$);
+    }
+
+    private getOutcome(result$: Observable<MutationResult<DataEntryCreateAgentMutation>>): MutationOutcome<DataEntryCreateAgentMutation> {
+        const loading$ = isLoading(result$);
+        const succes$: Observable<DataEntryCreateAgentMutation> = result$.pipe(
+            filter(result => _.isUndefined(this.resultErrors(result))),
+            map(result => result.data?.createAgent as DataEntryCreateAgentMutation),
+        );
+
+        const errors$: Observable<string[]> = result$.pipe(
+            map(this.resultErrors),
+            filter(_.negate(_.isUndefined)),
+        );
+
+        return { loading$, succes$, errors$ };
+    }
+
+    private updateCache(source: string, episodes: string[] | null | undefined, cache: any) {
+        cache.evict({
+            id: cache.identify({ __typename: "SourceType", id: source }),
+            fieldName: 'agents',
+        });
+        if (episodes) {
+            for (const episode of episodes) {
+                cache.evict({
+                    id: cache.identify({ __typename: "EpisodeType", id: episode }),
+                    fieldName: 'agents',
+                })
+            }
+        }
+        cache.gc();
+    }
+
+    private resultErrors(result: MutationResult<DataEntryCreateAgentMutation>): string[] | undefined {
+        if (result.errors?.length) {
+            return result.errors.map(error => error.message);
+        }
+        if (result.data?.createAgent?.errors.length) {
+            return result.data.createAgent.errors.flatMap(error => error.messages);
+        }
+        if (!result.data?.createAgent) {
+            return ['Unknown error'];
+        }
+        return undefined;
+    }
+
+}
 
 @Component({
   selector: 'lc-create-agent',
@@ -33,12 +107,16 @@ export class CreateAgentComponent implements AfterViewInit {
 
     nameExamples = listNames(nameExamples['agent']);
 
+    private agentCreateService: AgentCreator;
+
     constructor(
         private modalService: NgbModal,
-        private createMutation: DataEntryCreateAgentGQL,
+        createMutation: DataEntryCreateAgentGQL,
         private toastService: ToastService,
-        private destroyRef: DestroyRef,
-    ) { }
+        destroyRef: DestroyRef,
+    ) {
+        this.agentCreateService = new AgentCreator(createMutation, destroyRef);
+    }
 
     ngAfterViewInit(): void {
         this.create.subscribe(() => {
@@ -64,35 +142,10 @@ export class CreateAgentComponent implements AfterViewInit {
             source: this.sourceID,
             episodes: this.episodeID ? [this.episodeID] : null
         };
-        this.createMutation.mutate(
-            { input },
-            {
-                errorPolicy: 'all',
-                update: (cache) => this.updateCache(this.sourceID, this.episodeID, cache),
-            }
-        )
-            .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                const errors = result.errors || result.data?.createAgent?.errors;
-                if (errors && errors.length > 0) {
-                    this.onMutationError(errors);
-                }
-                this.onMutationSuccess();
-            });
-    }
+        const outcome = this.agentCreateService.submit(input);
 
-    private updateCache(sourceID: string, episodeID: string | undefined, cache: any) {
-        cache.evict({
-            id: cache.identify({ __typename: "SourceType", id: sourceID }),
-            fieldName: 'agents',
-        });
-        if (episodeID) {
-            cache.evict({
-                id: cache.identify({ __typename: "EpisodeType", id: episodeID }),
-                fieldName: 'agents',
-            });
-        }
-        cache.gc();
+        outcome.succes$.subscribe(this.onMutationSuccess.bind(this));
+        outcome.errors$.subscribe(this.onMutationError.bind(this));
     }
 
     private onMutationSuccess() {
@@ -101,11 +154,8 @@ export class CreateAgentComponent implements AfterViewInit {
         this.form.reset();
     }
 
-    private onMutationError(errors: any[] | readonly any[] | undefined) {
-        console.error(errors);
-        const messages = errors?.map(error =>
-            _.get(error, 'message', undefined) || _.get(error, 'messages', []).join('\n')
-        ) || ['Unknown error'];
+    private onMutationError(messages: string[]) {
+        console.error(messages);
         this.loading = false;
         this.toastService.show({
             type: 'danger',
diff --git a/frontend/src/app/shared/request-utils.ts b/frontend/src/app/shared/request-utils.ts
new file mode 100644
index 00000000..461a67ed
--- /dev/null
+++ b/frontend/src/app/shared/request-utils.ts
@@ -0,0 +1,9 @@
+import { last, map, Observable, startWith } from "rxjs";
+import _ from "underscore";
+
+export const isLoading = (result$: Observable<any>) =>
+    result$.pipe(
+        last(),
+        map(_.constant(false)),
+        startWith(true),
+    );

From 1c1a9aac405c0f9b348438aa9d41893bb53d897c Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 23 Sep 2024 12:00:02 +0200
Subject: [PATCH 507/565] make agent creator injectable

---
 .../create-agent/create-agent.component.ts    | 94 ++-----------------
 .../create-agent/create-agent.service.ts      | 84 +++++++++++++++++
 2 files changed, 93 insertions(+), 85 deletions(-)
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index d95a3d61..536d3dc4 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -1,91 +1,18 @@
-import { AfterViewInit, Component, DestroyRef, Input, TemplateRef, ViewChild } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { AfterViewInit, Component, Input, TemplateRef, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
-import { CreateAgentInput, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
-import { filter, map, Observable, shareReplay, } from 'rxjs';
-import _ from 'underscore';
+import { CreateAgentInput } from 'generated/graphql';
+import { Observable } from 'rxjs';
 import { listNames, nameExamples } from '../../shared/utils';
-import { MutationResult } from 'apollo-angular';
-import { isLoading } from '@shared/request-utils';
+import { CreateAgentService } from './create-agent.service';
 
-interface MutationOutcome<T> {
-    loading$: Observable<boolean>;
-    succes$: Observable<T>;
-    errors$: Observable<string[]>,
-}
-
-class AgentCreator {
-    constructor(
-        private createMutation: DataEntryCreateAgentGQL,
-        private destroyRef: DestroyRef
-    ) { }
-
-    submit(input: CreateAgentInput): MutationOutcome<DataEntryCreateAgentMutation> {
-        const result$ = this.createMutation.mutate(
-            { input },
-            {
-                errorPolicy: 'all',
-                update: (cache) => this.updateCache(input.source, input.episodes, cache),
-            }
-        ).pipe(
-            shareReplay(1),
-            takeUntilDestroyed(this.destroyRef),
-        );
-        return this.getOutcome(result$);
-    }
-
-    private getOutcome(result$: Observable<MutationResult<DataEntryCreateAgentMutation>>): MutationOutcome<DataEntryCreateAgentMutation> {
-        const loading$ = isLoading(result$);
-        const succes$: Observable<DataEntryCreateAgentMutation> = result$.pipe(
-            filter(result => _.isUndefined(this.resultErrors(result))),
-            map(result => result.data?.createAgent as DataEntryCreateAgentMutation),
-        );
-
-        const errors$: Observable<string[]> = result$.pipe(
-            map(this.resultErrors),
-            filter(_.negate(_.isUndefined)),
-        );
-
-        return { loading$, succes$, errors$ };
-    }
-
-    private updateCache(source: string, episodes: string[] | null | undefined, cache: any) {
-        cache.evict({
-            id: cache.identify({ __typename: "SourceType", id: source }),
-            fieldName: 'agents',
-        });
-        if (episodes) {
-            for (const episode of episodes) {
-                cache.evict({
-                    id: cache.identify({ __typename: "EpisodeType", id: episode }),
-                    fieldName: 'agents',
-                })
-            }
-        }
-        cache.gc();
-    }
-
-    private resultErrors(result: MutationResult<DataEntryCreateAgentMutation>): string[] | undefined {
-        if (result.errors?.length) {
-            return result.errors.map(error => error.message);
-        }
-        if (result.data?.createAgent?.errors.length) {
-            return result.data.createAgent.errors.flatMap(error => error.messages);
-        }
-        if (!result.data?.createAgent) {
-            return ['Unknown error'];
-        }
-        return undefined;
-    }
-
-}
 
 @Component({
   selector: 'lc-create-agent',
   templateUrl: './create-agent.component.html',
-  styleUrls: ['./create-agent.component.scss']
+    styleUrls: ['./create-agent.component.scss'],
+    providers: [CreateAgentService],
 })
 export class CreateAgentComponent implements AfterViewInit {
     @Input({ required: true }) create!: Observable<void>;
@@ -107,15 +34,12 @@ export class CreateAgentComponent implements AfterViewInit {
 
     nameExamples = listNames(nameExamples['agent']);
 
-    private agentCreateService: AgentCreator;
-
     constructor(
         private modalService: NgbModal,
-        createMutation: DataEntryCreateAgentGQL,
         private toastService: ToastService,
-        destroyRef: DestroyRef,
+        private createAgentService: CreateAgentService,
     ) {
-        this.agentCreateService = new AgentCreator(createMutation, destroyRef);
+
     }
 
     ngAfterViewInit(): void {
@@ -142,7 +66,7 @@ export class CreateAgentComponent implements AfterViewInit {
             source: this.sourceID,
             episodes: this.episodeID ? [this.episodeID] : null
         };
-        const outcome = this.agentCreateService.submit(input);
+        const outcome = this.createAgentService.submit(input);
 
         outcome.succes$.subscribe(this.onMutationSuccess.bind(this));
         outcome.errors$.subscribe(this.onMutationError.bind(this));
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
new file mode 100644
index 00000000..0505450a
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
@@ -0,0 +1,84 @@
+import { DestroyRef, Injectable } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { CreateAgentInput, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
+import { filter, map, Observable, shareReplay, } from 'rxjs';
+import _ from 'underscore';
+import { MutationResult } from 'apollo-angular';
+import { isLoading } from '@shared/request-utils';
+
+interface MutationOutcome<T> {
+    loading$: Observable<boolean>;
+    succes$: Observable<T>;
+    errors$: Observable<string[]>,
+}
+
+@Injectable()
+export class CreateAgentService {
+    constructor(
+        private createMutation: DataEntryCreateAgentGQL,
+        private destroyRef: DestroyRef
+    ) { }
+
+    submit(input: CreateAgentInput): MutationOutcome<DataEntryCreateAgentMutation> {
+        const result$ = this.createMutation.mutate(
+            { input },
+            {
+                errorPolicy: 'all',
+                update: (cache) => this.updateCache(input.source, input.episodes, cache),
+            }
+        ).pipe(
+            shareReplay(1),
+            takeUntilDestroyed(this.destroyRef),
+        );
+        return this.getOutcome(result$);
+    }
+
+    private getOutcome(
+        result$: Observable<MutationResult<DataEntryCreateAgentMutation>>
+    ): MutationOutcome<DataEntryCreateAgentMutation> {
+        const loading$ = isLoading(result$);
+        const succes$: Observable<DataEntryCreateAgentMutation> = result$.pipe(
+            filter(result => _.isUndefined(this.resultErrors(result))),
+            map(result => result.data?.createAgent as DataEntryCreateAgentMutation),
+        );
+        const errors$: Observable<string[]> = result$.pipe(
+            map(this.resultErrors),
+            filter(_.negate(_.isUndefined)),
+        );
+        return { loading$, succes$, errors$ };
+    }
+
+    private updateCache(
+        source: string, episodes: string[] | null | undefined, cache: any
+    ) {
+        cache.evict({
+            id: cache.identify({ __typename: 'SourceType', id: source }),
+            fieldName: 'agents',
+        });
+        if (episodes) {
+            for (const episode of episodes) {
+                cache.evict({
+                    id: cache.identify({ __typename: 'EpisodeType', id: episode }),
+                    fieldName: 'agents',
+                })
+            }
+        }
+        cache.gc();
+    }
+
+    private resultErrors(
+        result: MutationResult<DataEntryCreateAgentMutation>
+    ): string[] | undefined {
+        if (result.errors?.length) {
+            return result.errors.map(error => error.message);
+        }
+        if (result.data?.createAgent?.errors.length) {
+            return result.data.createAgent.errors.flatMap(error => error.messages);
+        }
+        if (!result.data?.createAgent) {
+            return ['Unknown error'];
+        }
+        return undefined;
+    }
+
+}

From b26608cf002be70bdee8fb8a8ce2613a08d6b539 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 23 Sep 2024 12:06:15 +0200
Subject: [PATCH 508/565] clearer messages

---
 .../create-agent/create-agent.component.ts     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 536d3dc4..c8f38cbc 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -68,23 +68,29 @@ export class CreateAgentComponent implements AfterViewInit {
         };
         const outcome = this.createAgentService.submit(input);
 
-        outcome.succes$.subscribe(this.onMutationSuccess.bind(this));
-        outcome.errors$.subscribe(this.onMutationError.bind(this));
+        outcome.succes$.subscribe(() => this.onMutationSuccess(input.name));
+        outcome.errors$.subscribe(messages => this.onMutationError(messages, input.name));
     }
 
-    private onMutationSuccess() {
+    private onMutationSuccess(agentName: string) {
         this.loading = false;
         this.modal?.close();
         this.form.reset();
+        this.toastService.show({
+            type: 'success',
+            header: 'Agent created',
+            body: `Created agent "${agentName}"`
+        })
     }
 
-    private onMutationError(messages: string[]) {
-        console.error(messages);
+    private onMutationError(messages: string[], agentName: string) {
+        const body = `Could not create agent "${agentName}".
+        ${messages.join('\n')}`;
         this.loading = false;
         this.toastService.show({
             type: 'danger',
             header: 'Creating agent failed',
-            body: messages.join('\n'),
+            body,
         })
     }
 }

From 9cee7327b9acf00a27161b126bd5d20b86e5ce03 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 23 Sep 2024 12:30:34 +0200
Subject: [PATCH 509/565] spec and docstrings

---
 .../create-agent/create-agent.component.spec.ts       |  2 ++
 .../create-agent/create-agent.component.ts            | 11 ++++++++---
 .../create-forms/create-agent/create-agent.service.ts |  2 +-
 .../data-entry/create-forms/create-forms.module.ts    |  4 ++++
 frontend/src/app/shared/request-utils.ts              |  6 +++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
index e90ba5dd..72a48b3d 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
@@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CreateAgentComponent } from './create-agent.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { Subject } from 'rxjs';
+import { CreateAgentService } from './create-agent.service';
 
 describe('CreateAgentComponent', () => {
     let component: CreateAgentComponent;
@@ -13,6 +14,7 @@ describe('CreateAgentComponent', () => {
         TestBed.configureTestingModule({
             declarations: [CreateAgentComponent],
             imports: [SharedTestingModule],
+            providers: [CreateAgentService],
         });
         fixture = TestBed.createComponent(CreateAgentComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index c8f38cbc..6da566c4 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -7,12 +7,16 @@ import { Observable } from 'rxjs';
 import { listNames, nameExamples } from '../../shared/utils';
 import { CreateAgentService } from './create-agent.service';
 
-
+/**
+ * Opens modal(s) to create new AgentDescriptions.
+ *
+ * The parent component shoud implement a trigger to create agents (e.g. a button); use
+ * the `[create]` input to signal when to open a modal.
+ */
 @Component({
   selector: 'lc-create-agent',
   templateUrl: './create-agent.component.html',
     styleUrls: ['./create-agent.component.scss'],
-    providers: [CreateAgentService],
 })
 export class CreateAgentComponent implements AfterViewInit {
     @Input({ required: true }) create!: Observable<void>;
@@ -73,9 +77,10 @@ export class CreateAgentComponent implements AfterViewInit {
     }
 
     private onMutationSuccess(agentName: string) {
-        this.loading = false;
         this.modal?.close();
         this.form.reset();
+        this.loading = false;
+        this.submitted = false;
         this.toastService.show({
             type: 'success',
             header: 'Agent created',
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
index 0505450a..5881d71e 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
@@ -36,7 +36,7 @@ export class CreateAgentService {
     private getOutcome(
         result$: Observable<MutationResult<DataEntryCreateAgentMutation>>
     ): MutationOutcome<DataEntryCreateAgentMutation> {
-        const loading$ = isLoading(result$);
+        const loading$ = result$.pipe(isLoading);
         const succes$: Observable<DataEntryCreateAgentMutation> = result$.pipe(
             filter(result => _.isUndefined(this.resultErrors(result))),
             map(result => result.data?.createAgent as DataEntryCreateAgentMutation),
diff --git a/frontend/src/app/data-entry/create-forms/create-forms.module.ts b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
index f2f6608b..d9248d52 100644
--- a/frontend/src/app/data-entry/create-forms/create-forms.module.ts
+++ b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { CreateAgentComponent } from './create-agent/create-agent.component';
 import { SharedModule } from '@shared/shared.module';
 import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
+import { CreateAgentService } from './create-agent/create-agent.service';
 
 
 
@@ -15,6 +16,9 @@ import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
     ],
     exports: [
         CreateAgentComponent,
+    ],
+    providers: [
+        CreateAgentService,
     ]
 })
 export class CreateFormsModule { }
diff --git a/frontend/src/app/shared/request-utils.ts b/frontend/src/app/shared/request-utils.ts
index 461a67ed..bc9b7838 100644
--- a/frontend/src/app/shared/request-utils.ts
+++ b/frontend/src/app/shared/request-utils.ts
@@ -1,7 +1,11 @@
 import { last, map, Observable, startWith } from "rxjs";
 import _ from "underscore";
 
-export const isLoading = (result$: Observable<any>) =>
+/**
+ * Operator to check whether a request is still loading. It will signal `true` at
+ * the start, and `false` when the input observable completes.
+ */
+export const isLoading = <T>(result$: Observable<T>): Observable<boolean> =>
     result$.pipe(
         last(),
         map(_.constant(false)),

From c6e63c963572392a67c3977ae311a85655d44712 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 23 Sep 2024 15:11:08 +0200
Subject: [PATCH 510/565] improve isLoading operator

use pipe function
catch errors
---
 .../create-agent/create-agent.service.ts      |  2 +-
 frontend/src/app/shared/request-utils.spec.ts | 34 +++++++++++++++++++
 frontend/src/app/shared/request-utils.ts      |  7 ++--
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/app/shared/request-utils.spec.ts

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
index 5881d71e..00747971 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
@@ -36,7 +36,7 @@ export class CreateAgentService {
     private getOutcome(
         result$: Observable<MutationResult<DataEntryCreateAgentMutation>>
     ): MutationOutcome<DataEntryCreateAgentMutation> {
-        const loading$ = result$.pipe(isLoading);
+        const loading$ = result$.pipe(isLoading());
         const succes$: Observable<DataEntryCreateAgentMutation> = result$.pipe(
             filter(result => _.isUndefined(this.resultErrors(result))),
             map(result => result.data?.createAgent as DataEntryCreateAgentMutation),
diff --git a/frontend/src/app/shared/request-utils.spec.ts b/frontend/src/app/shared/request-utils.spec.ts
new file mode 100644
index 00000000..562ee246
--- /dev/null
+++ b/frontend/src/app/shared/request-utils.spec.ts
@@ -0,0 +1,34 @@
+import { TestScheduler } from "rxjs/testing";
+import { isLoading } from "./request-utils";
+
+describe('isLoading', () => {
+    let scheduler: TestScheduler;
+
+    beforeEach(() => {
+        scheduler = new TestScheduler((actual, expected) => {
+            expect(actual).toEqual(expected);
+        });
+    })
+
+    it('should show the status of a succesful request', () => {
+        scheduler.run((helpers) => {
+            const { cold, expectObservable } = helpers;
+            const request$ = cold('---a|');
+            const isLoading$ = request$.pipe(isLoading());
+            const expected = 'b---(c|)';
+
+            expectObservable(isLoading$).toBe(expected, { b: true, c: false });
+        });
+    });
+
+    it('should show the status of a failed request', () => {
+        scheduler.run((helpers) => {
+            const { cold, expectObservable } = helpers;
+            const request$ = cold('---#');
+            const isLoading$ = request$.pipe(isLoading());
+            const expected = 'b--(c|)';
+
+            expectObservable(isLoading$).toBe(expected, { b: true, c: false });
+        });
+    })
+});
diff --git a/frontend/src/app/shared/request-utils.ts b/frontend/src/app/shared/request-utils.ts
index bc9b7838..c214b14f 100644
--- a/frontend/src/app/shared/request-utils.ts
+++ b/frontend/src/app/shared/request-utils.ts
@@ -1,12 +1,13 @@
-import { last, map, Observable, startWith } from "rxjs";
+import { catchError, last, map, of, OperatorFunction, pipe, startWith } from "rxjs";
 import _ from "underscore";
 
 /**
  * Operator to check whether a request is still loading. It will signal `true` at
  * the start, and `false` when the input observable completes.
  */
-export const isLoading = <T>(result$: Observable<T>): Observable<boolean> =>
-    result$.pipe(
+export const isLoading = (): OperatorFunction<any, boolean> =>
+    pipe(
+        catchError(() => of(undefined)),
         last(),
         map(_.constant(false)),
         startWith(true),

From c7fbc65909884e7fcd51cfecc5cb6f5b1be6d2f6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 23 Sep 2024 15:44:23 +0200
Subject: [PATCH 511/565] using isloading observable in component

---
 .../create-forms/create-agent/create-agent.component.html  | 4 ++--
 .../create-forms/create-agent/create-agent.component.ts    | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
index e2132f2a..cd9c3e00 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
@@ -29,8 +29,8 @@ <h4 ngbAutofocus tabindex="-1">Create new agent</h4>
                 (click)="submit()"
             >
                 Create
-                <div *ngIf="loading" class="spinner-border spinner-border-sm">
-                    <span class="visually-hidden">Creating new agent...</span>
+                <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm">
+                    <span class="visually-hidden">(loading)</span>
                 </div>
             </button>
             <button
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 6da566c4..57e37687 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -33,7 +33,8 @@ export class CreateAgentComponent implements AfterViewInit {
         }),
     });
 
-    loading = false;
+    loading$?: Observable<boolean>;
+
     submitted = false;
 
     nameExamples = listNames(nameExamples['agent']);
@@ -64,7 +65,6 @@ export class CreateAgentComponent implements AfterViewInit {
         if (this.form.invalid) {
             return;
         }
-        this.loading = true;
         const input: CreateAgentInput = {
             name: this.form.value.name || '',
             source: this.sourceID,
@@ -72,6 +72,7 @@ export class CreateAgentComponent implements AfterViewInit {
         };
         const outcome = this.createAgentService.submit(input);
 
+        this.loading$ = outcome.loading$;
         outcome.succes$.subscribe(() => this.onMutationSuccess(input.name));
         outcome.errors$.subscribe(messages => this.onMutationError(messages, input.name));
     }
@@ -79,7 +80,6 @@ export class CreateAgentComponent implements AfterViewInit {
     private onMutationSuccess(agentName: string) {
         this.modal?.close();
         this.form.reset();
-        this.loading = false;
         this.submitted = false;
         this.toastService.show({
             type: 'success',
@@ -91,7 +91,6 @@ export class CreateAgentComponent implements AfterViewInit {
     private onMutationError(messages: string[], agentName: string) {
         const body = `Could not create agent "${agentName}".
         ${messages.join('\n')}`;
-        this.loading = false;
         this.toastService.show({
             type: 'danger',
             header: 'Creating agent failed',

From ad3aee883089e5d8b10974dbfcf7122b9873a63b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 23 Sep 2024 16:01:15 +0200
Subject: [PATCH 512/565] form accessibility

---
 backend/person/mutations/CreateAgentMutation.py      |  1 -
 .../create-agent/create-agent.component.html         | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index c5c61929..02865bc7 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -17,7 +17,6 @@
 from django.db import transaction
 from event.models import Episode
 
-
 class CreateAgentInput(InputObjectType):
     name = String(required=True)
     source = ID(required=True)
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
index cd9c3e00..aa980b9e 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
@@ -5,13 +5,13 @@ <h4 ngbAutofocus tabindex="-1">Create new agent</h4>
         </ng-container>
         <form modal-content [formGroup]="form" (ngSubmit)="submit()">
             <div class="form-group">
-                <label class="form-label" for="episode-name">Name</label>
+                <label class="form-label" for="agent-name-input">Name</label>
                 <p class="form-text">
                     This is a name to identify the agent in the overview of the
                     source. For example: {{ nameExamples }}.
                 </p>
                 <input
-                    id="episode-name"
+                    id="agent-name-input"
                     type="text"
                     class="form-control"
                     [formControl]="form.controls.name"
@@ -29,9 +29,11 @@ <h4 ngbAutofocus tabindex="-1">Create new agent</h4>
                 (click)="submit()"
             >
                 Create
-                <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm">
-                    <span class="visually-hidden">(loading)</span>
-                </div>
+                <span role="status">
+                    <div *ngIf="loading$ | async" class="spinner-border spinner-border-sm">
+                        <span class="visually-hidden">(loading)</span>
+                    </div>
+                </span>
             </button>
             <button
                 type="button"

From 127a33be2d7b9cb0e0dc96a06b4dea4cdfff6fc9 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Wed, 25 Sep 2024 16:02:10 +0200
Subject: [PATCH 513/565] add similar mutations for all entity types

---
 backend/core/types/EntityDescriptionType.py   |   7 +
 backend/graphql_app/schema.py                 |   3 +-
 .../letter/mutations/CreateGiftMutation.py    |  61 +++++---
 .../letter/mutations/CreateLetterMutation.py  |  61 +++++---
 .../person/mutations/CreateAgentMutation.py   |  17 +--
 .../space/mutations/CreateSpaceMutation.py    |  67 +++++++++
 frontend/generated/graphql.ts                 | 139 ++++++++++++++----
 frontend/generated/schema.graphql             |  42 +++---
 .../create-agent/create-agent.component.ts    |   4 +-
 .../create-agent/create-agent.graphql         |   9 --
 .../create-agent/create-agent.service.ts      |   4 +-
 .../create-agent/create-entity.graphql        |  39 +++++
 12 files changed, 340 insertions(+), 113 deletions(-)
 create mode 100644 backend/space/mutations/CreateSpaceMutation.py
 delete mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-entity.graphql

diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index f89db74b..5b61b708 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -1,3 +1,4 @@
+import graphene
 from core.models import EntityDescription
 from core.types.AbstractDjangoObjectType import AbstractDjangoObjectType
 from core.types.NamedType import NamedType
@@ -35,3 +36,9 @@ def resolve_contributors(
         parent: EntityDescription, info: ResolveInfo
     ) -> QuerySet[User]:
         return parent.contributors.all()
+
+
+class CreateEntityDescriptionInput(graphene.InputObjectType):
+    name = graphene.String(required=True)
+    source = graphene.ID(required=True)
+    episodes = graphene.List(graphene.NonNull(graphene.ID))
diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index ce7afbfb..cf017b25 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -32,7 +32,7 @@
 from person.mutations.CreatePersonReferenceMutation import CreatePersonReferenceMutation
 from person.mutations.UpdatePersonReferenceMutation import UpdatePersonReferenceMutation
 from person.mutations.DeletePersonReferenceMutation import DeletePersonReferenceMutation
-
+from space.mutations.CreateSpaceMutation import CreateSpaceMutation
 
 class Query(
     SourceQueries,
@@ -66,6 +66,7 @@ class Mutation(ObjectType):
     create_person_reference = CreatePersonReferenceMutation.Field()
     update_person_reference = UpdatePersonReferenceMutation.Field()
     delete_person_reference = DeletePersonReferenceMutation.Field()
+    create_space = CreateSpaceMutation.Field()
 
 
 schema = Schema(query=Query, mutation=Mutation)
diff --git a/backend/letter/mutations/CreateGiftMutation.py b/backend/letter/mutations/CreateGiftMutation.py
index c06dd9aa..6eb1b1ec 100644
--- a/backend/letter/mutations/CreateGiftMutation.py
+++ b/backend/letter/mutations/CreateGiftMutation.py
@@ -1,45 +1,66 @@
 from graphene import (
-    ID,
     Field,
-    InputObjectType,
     List,
     NonNull,
     ResolveInfo,
-    String,
+    Boolean,
 )
+from django.db import transaction
+from django.core.exceptions import ValidationError
 
 from letter.models import GiftDescription
 from letter.types.GiftDescriptionType import GiftDescriptionType
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from source.models import Source
-
-
-class CreateGiftInput(InputObjectType):
-    name = String(required=True)
-    source = ID(required=True)
-
+from event.models import Episode
+from core.types.EntityDescriptionType import CreateEntityDescriptionInput
 
 class CreateGiftMutation(LettercraftMutation):
+    ok = Boolean(required=True)
     gift = Field(GiftDescriptionType)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     django_model = GiftDescription
 
     class Arguments:
-        gift_data = CreateGiftInput(required=True)
+        gift_data = CreateEntityDescriptionInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, gift_data: CreateGiftInput):
+    def mutate(
+        cls, root: None, info: ResolveInfo, gift_data: CreateEntityDescriptionInput
+    ):
+        gift = cls.create_object()
         try:
-            source = Source.objects.get(id=getattr(gift_data, "source"))
-        except Source.DoesNotExist:
-            error = LettercraftErrorType(field="source", messages=["Source not found."])
-            return cls(errors=[error])  # type: ignore
+            with transaction.atomic():
+                cls.mutate_object(gift_data, gift, info)
+                cls.add_contribution(gift, gift_data, info)
+                gift.full_clean()
+        except Source.DoesNotExist as e:
+            error = LettercraftErrorType(field="source", messages=[e.args[0]])
+            return cls(ok=False, errors=[error])  # type: ignore
+        except Episode.DoesNotExist as e:
+            error = LettercraftErrorType(field="episodes", messages=[e.args[0]])
+            return cls(ok=False, errors=[error])
+        except ValidationError as e:
+            errors = [
+                LettercraftErrorType(field, messages)
+                for field, messages in e.message_dict.items()
+            ]
+            return cls(ok=False, errors=errors)
+
+        return cls(ok=True, gift=gift, errors=[])
 
-        letter = GiftDescription.objects.create(
-            name=getattr(gift_data, "name"),
-            source=source,
-        )
+    def add_contribution(
+        gift: GiftDescription,
+        gift_data: CreateEntityDescriptionInput,
+        info: ResolveInfo,
+    ):
+        if info.context:
+            user = info.context.user
+            gift.contributors.add(user)
 
-        return cls(Letter=letter, errors=[])  # type: ignore
+            if gift_data.episodes:
+                for episode_id in gift_data.episodes:
+                    episode = Episode.objects.get(id=episode_id)
+                    episode.contributors.add(user)
diff --git a/backend/letter/mutations/CreateLetterMutation.py b/backend/letter/mutations/CreateLetterMutation.py
index bf9bc5f8..a28e43cb 100644
--- a/backend/letter/mutations/CreateLetterMutation.py
+++ b/backend/letter/mutations/CreateLetterMutation.py
@@ -1,45 +1,66 @@
 from graphene import (
-    ID,
     Field,
-    InputObjectType,
     List,
     NonNull,
     ResolveInfo,
-    String,
+    Boolean,
 )
+from django.db import transaction
+from django.core.exceptions import ValidationError
 
 from letter.models import LetterDescription
 from letter.types.LetterDescriptionType import LetterDescriptionType
 from graphql_app.LettercraftMutation import LettercraftMutation
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 from source.models import Source
-
-
-class CreateLetterInput(InputObjectType):
-    name = String(required=True)
-    source = ID(required=True)
-
+from event.models import Episode
+from core.types.EntityDescriptionType import CreateEntityDescriptionInput
 
 class CreateLetterMutation(LettercraftMutation):
+    ok = Boolean(required=True)
     letter = Field(LetterDescriptionType)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     django_model = LetterDescription
 
     class Arguments:
-        letter_data = CreateLetterInput(required=True)
+        letter_data = CreateEntityDescriptionInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, letter_data: CreateLetterInput):
+    def mutate(
+        cls, root: None, info: ResolveInfo, letter_data: CreateEntityDescriptionInput
+    ):
+        letter = cls.create_object()
         try:
-            source = Source.objects.get(id=getattr(letter_data, "source"))
-        except Source.DoesNotExist:
-            error = LettercraftErrorType(field="source", messages=["Source not found."])
-            return cls(errors=[error])  # type: ignore
+            with transaction.atomic():
+                cls.mutate_object(letter_data, letter, info)
+                cls.add_contribution(letter, letter_data, info)
+                letter.full_clean()
+        except Source.DoesNotExist as e:
+            error = LettercraftErrorType(field="source", messages=[e.args[0]])
+            return cls(ok=False, errors=[error])  # type: ignore
+        except Episode.DoesNotExist as e:
+            error = LettercraftErrorType(field="episodes", messages=[e.args[0]])
+            return cls(ok=False, errors=[error])
+        except ValidationError as e:
+            errors = [
+                LettercraftErrorType(field, messages)
+                for field, messages in e.message_dict.items()
+            ]
+            return cls(ok=False, errors=errors)
+
+        return cls(ok=True, letter=letter, errors=[])
 
-        letter = LetterDescription.objects.create(
-            name=getattr(letter_data, "name"),
-            source=source,
-        )
+    def add_contribution(
+        letter: LetterDescription,
+        letter_data: CreateEntityDescriptionInput,
+        info: ResolveInfo,
+    ):
+        if info.context:
+            user = info.context.user
+            letter.contributors.add(user)
 
-        return cls(Letter=letter, errors=[])  # type: ignore
+            if letter_data.episodes:
+                for episode_id in letter_data.episodes:
+                    episode = Episode.objects.get(id=episode_id)
+                    episode.contributors.add(user)
diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index 02865bc7..cdb3218c 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -16,12 +16,7 @@
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from event.models import Episode
-
-class CreateAgentInput(InputObjectType):
-    name = String(required=True)
-    source = ID(required=True)
-    episodes = List(NonNull(ID))
-
+from core.types.EntityDescriptionType import CreateEntityDescriptionInput
 
 class CreateAgentMutation(LettercraftMutation):
     django_model = AgentDescription
@@ -31,10 +26,12 @@ class CreateAgentMutation(LettercraftMutation):
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     class Arguments:
-        agent_data = CreateAgentInput(required=True)
+        agent_data = CreateEntityDescriptionInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
+    def mutate(
+        cls, root: None, info: ResolveInfo, agent_data: CreateEntityDescriptionInput
+    ):
         agent = cls.create_object()
         try:
             with transaction.atomic():
@@ -51,7 +48,9 @@ def mutate(cls, root: None, info: ResolveInfo, agent_data: CreateAgentInput):
         return cls(ok=True, agent=agent, errors=[])
 
     def add_contribution(
-        agent: AgentDescription, agent_data: CreateAgentInput, info: ResolveInfo
+        agent: AgentDescription,
+        agent_data: CreateEntityDescriptionInput,
+        info: ResolveInfo,
     ):
         if info.context:
             user = info.context.user
diff --git a/backend/space/mutations/CreateSpaceMutation.py b/backend/space/mutations/CreateSpaceMutation.py
new file mode 100644
index 00000000..bdf46129
--- /dev/null
+++ b/backend/space/mutations/CreateSpaceMutation.py
@@ -0,0 +1,67 @@
+from graphene import (
+    Field,
+    List,
+    NonNull,
+    ResolveInfo,
+    Boolean,
+)
+from django.db import transaction
+from django.core.exceptions import ValidationError
+
+from space.models import SpaceDescription
+from space.types.SpaceDescriptionType import SpaceDescriptionType
+from graphql_app.LettercraftMutation import LettercraftMutation
+from graphql_app.types.LettercraftErrorType import LettercraftErrorType
+from source.models import Source
+from event.models import Episode
+from core.types.EntityDescriptionType import CreateEntityDescriptionInput
+
+
+class CreateSpaceMutation(LettercraftMutation):
+    ok = Boolean(required=True)
+    space = Field(SpaceDescriptionType)
+    errors = List(NonNull(LettercraftErrorType), required=True)
+
+    django_model = SpaceDescription
+
+    class Arguments:
+        space_data = CreateEntityDescriptionInput(required=True)
+
+    @classmethod
+    def mutate(
+        cls, root: None, info: ResolveInfo, space_data: CreateEntityDescriptionInput
+    ):
+        space = cls.create_object()
+        try:
+            with transaction.atomic():
+                cls.mutate_object(space_data, space, info)
+                cls.add_contribution(space, space_data, info)
+                space.full_clean()
+        except Source.DoesNotExist as e:
+            error = LettercraftErrorType(field="source", messages=[e.args[0]])
+            return cls(ok=False, errors=[error])  # type: ignore
+        except Episode.DoesNotExist as e:
+            error = LettercraftErrorType(field="episodes", messages=[e.args[0]])
+            return cls(ok=False, errors=[error])
+        except ValidationError as e:
+            errors = [
+                LettercraftErrorType(field, messages)
+                for field, messages in e.message_dict.items()
+            ]
+            return cls(ok=False, errors=errors)
+
+        return cls(ok=True, space=space, errors=[])
+
+    def add_contribution(
+        space: SpaceDescription,
+        space_data: CreateEntityDescriptionInput,
+        info: ResolveInfo,
+    ):
+        if info.context:
+            user = info.context.user
+            space.contributors.add(user)
+
+            if space_data.episodes:
+                for episode_id in space_data.episodes:
+                    episode = Episode.objects.get(id=episode_id)
+                    episode.contributors.add(user)
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 651e0ccb..b0fa9fae 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -74,12 +74,6 @@ export enum Certainty {
   Uncertain = 'UNCERTAIN'
 }
 
-export type CreateAgentInput = {
-  episodes?: InputMaybe<Array<Scalars['ID']['input']>>;
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
-};
-
 export type CreateAgentMutation = {
   __typename?: 'CreateAgentMutation';
   agent?: Maybe<AgentDescriptionType>;
@@ -87,6 +81,12 @@ export type CreateAgentMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type CreateEntityDescriptionInput = {
+  episodes?: InputMaybe<Array<Scalars['ID']['input']>>;
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
 export type CreateEpisodeEntityLinkInput = {
   entity: Scalars['ID']['input'];
   entityType: Entity;
@@ -110,26 +110,18 @@ export type CreateEpisodeMutation = {
   errors: Array<LettercraftErrorType>;
 };
 
-export type CreateGiftInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
-};
-
 export type CreateGiftMutation = {
   __typename?: 'CreateGiftMutation';
   errors: Array<LettercraftErrorType>;
   gift?: Maybe<GiftDescriptionType>;
-};
-
-export type CreateLetterInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
+  ok: Scalars['Boolean']['output'];
 };
 
 export type CreateLetterMutation = {
   __typename?: 'CreateLetterMutation';
   errors: Array<LettercraftErrorType>;
   letter?: Maybe<LetterDescriptionType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type CreatePersonReferenceInput = {
@@ -143,6 +135,13 @@ export type CreatePersonReferenceMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type CreateSpaceMutation = {
+  __typename?: 'CreateSpaceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+  space?: Maybe<SpaceDescriptionType>;
+};
+
 export type DeleteAgentMutation = {
   __typename?: 'DeleteAgentMutation';
   errors: Array<LettercraftErrorType>;
@@ -197,7 +196,6 @@ export type EpisodeAgentType = EpisodeEntityLink & {
   agent: AgentDescriptionType;
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -213,7 +211,6 @@ export type EpisodeCategoryType = {
 
 export type EpisodeEntityLink = {
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -224,7 +221,6 @@ export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   gift: GiftDescriptionType;
   id: Scalars['ID']['output'];
@@ -236,7 +232,6 @@ export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   letter: LetterDescriptionType;
@@ -248,7 +243,6 @@ export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -445,6 +439,7 @@ export type Mutation = {
   createGift?: Maybe<CreateGiftMutation>;
   createLetter?: Maybe<CreateLetterMutation>;
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
+  createSpace?: Maybe<CreateSpaceMutation>;
   deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
   deleteEpisodeEntityLink?: Maybe<DeleteEpisodeEntityLinkMutation>;
@@ -462,7 +457,7 @@ export type Mutation = {
 
 
 export type MutationCreateAgentArgs = {
-  agentData: CreateAgentInput;
+  agentData: CreateEntityDescriptionInput;
 };
 
 
@@ -477,12 +472,12 @@ export type MutationCreateEpisodeEntityLinkArgs = {
 
 
 export type MutationCreateGiftArgs = {
-  giftData: CreateGiftInput;
+  giftData: CreateEntityDescriptionInput;
 };
 
 
 export type MutationCreateLetterArgs = {
-  letterData: CreateLetterInput;
+  letterData: CreateEntityDescriptionInput;
 };
 
 
@@ -491,6 +486,11 @@ export type MutationCreatePersonReferenceArgs = {
 };
 
 
+export type MutationCreateSpaceArgs = {
+  spaceData: CreateEntityDescriptionInput;
+};
+
+
 export type MutationDeleteAgentArgs = {
   id: Scalars['ID']['input'];
 };
@@ -1084,12 +1084,33 @@ export type DataEntryDeleteAgentMutationVariables = Exact<{
 export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
 
 export type DataEntryCreateAgentMutationVariables = Exact<{
-  input: CreateAgentInput;
+  input: CreateEntityDescriptionInput;
 }>;
 
 
 export type DataEntryCreateAgentMutation = { __typename?: 'Mutation', createAgent?: { __typename?: 'CreateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryCreateGiftMutationVariables = Exact<{
+  input: CreateEntityDescriptionInput;
+}>;
+
+
+export type DataEntryCreateGiftMutation = { __typename?: 'Mutation', createGift?: { __typename?: 'CreateGiftMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
+export type DataEntryCreateLetterMutationVariables = Exact<{
+  input: CreateEntityDescriptionInput;
+}>;
+
+
+export type DataEntryCreateLetterMutation = { __typename?: 'Mutation', createLetter?: { __typename?: 'CreateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
+export type DataEntryCreateSpaceMutationVariables = Exact<{
+  input: CreateEntityDescriptionInput;
+}>;
+
+
+export type DataEntryCreateSpaceMutation = { __typename?: 'Mutation', createSpace?: { __typename?: 'CreateSpaceMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1518,7 +1539,7 @@ export const DataEntryDeleteAgentDocument = gql`
     }
   }
 export const DataEntryCreateAgentDocument = gql`
-    mutation DataEntryCreateAgent($input: CreateAgentInput!) {
+    mutation DataEntryCreateAgent($input: CreateEntityDescriptionInput!) {
   createAgent(agentData: $input) {
     ok
     errors {
@@ -1535,6 +1556,72 @@ export const DataEntryCreateAgentDocument = gql`
   export class DataEntryCreateAgentGQL extends Apollo.Mutation<DataEntryCreateAgentMutation, DataEntryCreateAgentMutationVariables> {
     override document = DataEntryCreateAgentDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryCreateGiftDocument = gql`
+    mutation DataEntryCreateGift($input: CreateEntityDescriptionInput!) {
+  createGift(giftData: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryCreateGiftGQL extends Apollo.Mutation<DataEntryCreateGiftMutation, DataEntryCreateGiftMutationVariables> {
+    override document = DataEntryCreateGiftDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryCreateLetterDocument = gql`
+    mutation DataEntryCreateLetter($input: CreateEntityDescriptionInput!) {
+  createLetter(letterData: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryCreateLetterGQL extends Apollo.Mutation<DataEntryCreateLetterMutation, DataEntryCreateLetterMutationVariables> {
+    override document = DataEntryCreateLetterDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryCreateSpaceDocument = gql`
+    mutation DataEntryCreateSpace($input: CreateEntityDescriptionInput!) {
+  createSpace(spaceData: $input) {
+    ok
+    errors {
+      field
+      messages
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryCreateSpaceGQL extends Apollo.Mutation<DataEntryCreateSpaceMutation, DataEntryCreateSpaceMutationVariables> {
+    override document = DataEntryCreateSpaceDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index c356e48d..0ae1998f 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -63,18 +63,18 @@ enum Certainty {
   UNCERTAIN
 }
 
-input CreateAgentInput {
-  episodes: [ID!]
-  name: String!
-  source: ID!
-}
-
 type CreateAgentMutation {
   agent: AgentDescriptionType
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
 
+input CreateEntityDescriptionInput {
+  episodes: [ID!]
+  name: String!
+  source: ID!
+}
+
 input CreateEpisodeEntityLinkInput {
   entity: ID!
   entityType: Entity!
@@ -96,24 +96,16 @@ type CreateEpisodeMutation {
   errors: [LettercraftErrorType!]!
 }
 
-input CreateGiftInput {
-  name: String!
-  source: ID!
-}
-
 type CreateGiftMutation {
   errors: [LettercraftErrorType!]!
   gift: GiftDescriptionType
-}
-
-input CreateLetterInput {
-  name: String!
-  source: ID!
+  ok: Boolean!
 }
 
 type CreateLetterMutation {
   errors: [LettercraftErrorType!]!
   letter: LetterDescriptionType
+  ok: Boolean!
 }
 
 input CreatePersonReferenceInput {
@@ -126,6 +118,12 @@ type CreatePersonReferenceMutation {
   ok: Boolean!
 }
 
+type CreateSpaceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+  space: SpaceDescriptionType
+}
+
 type DeleteAgentMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
@@ -173,7 +171,6 @@ type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -188,7 +185,6 @@ type EpisodeCategoryType {
 
 interface EpisodeEntityLink {
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -198,7 +194,6 @@ interface EpisodeEntityLink {
 type EpisodeGiftType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   gift: GiftDescriptionType!
   id: ID!
@@ -209,7 +204,6 @@ type EpisodeGiftType implements EpisodeEntityLink {
 type EpisodeLetterType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   letter: LetterDescriptionType!
@@ -220,7 +214,6 @@ type EpisodeLetterType implements EpisodeEntityLink {
 type EpisodeSpaceType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -437,12 +430,13 @@ type LettercraftErrorType {
 }
 
 type Mutation {
-  createAgent(agentData: CreateAgentInput!): CreateAgentMutation
+  createAgent(agentData: CreateEntityDescriptionInput!): CreateAgentMutation
   createEpisode(episodeData: CreateEpisodeInput!): CreateEpisodeMutation
   createEpisodeEntityLink(data: CreateEpisodeEntityLinkInput!): CreateEpisodeEntityLinkMutation
-  createGift(giftData: CreateGiftInput!): CreateGiftMutation
-  createLetter(letterData: CreateLetterInput!): CreateLetterMutation
+  createGift(giftData: CreateEntityDescriptionInput!): CreateGiftMutation
+  createLetter(letterData: CreateEntityDescriptionInput!): CreateLetterMutation
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
+  createSpace(spaceData: CreateEntityDescriptionInput!): CreateSpaceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
   deleteEpisodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): DeleteEpisodeEntityLinkMutation
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 57e37687..9d5ece19 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -2,7 +2,7 @@ import { AfterViewInit, Component, Input, TemplateRef, ViewChild } from '@angula
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
-import { CreateAgentInput } from 'generated/graphql';
+import { CreateEntityDescriptionInput } from 'generated/graphql';
 import { Observable } from 'rxjs';
 import { listNames, nameExamples } from '../../shared/utils';
 import { CreateAgentService } from './create-agent.service';
@@ -65,7 +65,7 @@ export class CreateAgentComponent implements AfterViewInit {
         if (this.form.invalid) {
             return;
         }
-        const input: CreateAgentInput = {
+        const input: CreateEntityDescriptionInput = {
             name: this.form.value.name || '',
             source: this.sourceID,
             episodes: this.episodeID ? [this.episodeID] : null
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql
deleted file mode 100644
index 98ff467f..00000000
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.graphql
+++ /dev/null
@@ -1,9 +0,0 @@
-mutation DataEntryCreateAgent($input: CreateAgentInput!) {
-    createAgent(agentData: $input) {
-        ok
-        errors {
-            field
-            messages
-        }
-    }
-}
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
index 00747971..c9a8fbb1 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
@@ -1,6 +1,6 @@
 import { DestroyRef, Injectable } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { CreateAgentInput, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
+import { CreateEntityDescriptionInput, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
 import { filter, map, Observable, shareReplay, } from 'rxjs';
 import _ from 'underscore';
 import { MutationResult } from 'apollo-angular';
@@ -19,7 +19,7 @@ export class CreateAgentService {
         private destroyRef: DestroyRef
     ) { }
 
-    submit(input: CreateAgentInput): MutationOutcome<DataEntryCreateAgentMutation> {
+    submit(input: CreateEntityDescriptionInput): MutationOutcome<DataEntryCreateAgentMutation> {
         const result$ = this.createMutation.mutate(
             { input },
             {
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-entity.graphql b/frontend/src/app/data-entry/create-forms/create-agent/create-entity.graphql
new file mode 100644
index 00000000..a0b6a78a
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-entity.graphql
@@ -0,0 +1,39 @@
+mutation DataEntryCreateAgent($input: CreateEntityDescriptionInput!) {
+    createAgent(agentData: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}
+
+mutation DataEntryCreateGift($input: CreateEntityDescriptionInput!) {
+    createGift(giftData: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}
+
+mutation DataEntryCreateLetter($input: CreateEntityDescriptionInput!) {
+    createLetter(letterData: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}
+
+mutation DataEntryCreateSpace($input: CreateEntityDescriptionInput!) {
+    createSpace(spaceData: $input) {
+        ok
+        errors {
+            field
+            messages
+        }
+    }
+}

From 9bcf6290f93e9c4a8540841a4f9dd3d4cd2661f6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 10:57:07 +0200
Subject: [PATCH 514/565] more create services

---
 .../create-agent/create-agent.component.ts    |   2 +-
 .../create-agent/create-agent.service.ts      |  83 ++-----------
 .../create-agent/create-entity.ts             | 115 ++++++++++++++++++
 .../create-agent/create-gift.service.ts       |  25 ++++
 .../create-agent/create-letter.service.ts     |  25 ++++
 .../create-agent/create-space.service.ts      |  25 ++++
 .../create-forms/create-forms.module.ts       |   6 +
 7 files changed, 209 insertions(+), 72 deletions(-)
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-entity.ts
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 9d5ece19..65007792 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -73,7 +73,7 @@ export class CreateAgentComponent implements AfterViewInit {
         const outcome = this.createAgentService.submit(input);
 
         this.loading$ = outcome.loading$;
-        outcome.succes$.subscribe(() => this.onMutationSuccess(input.name));
+        outcome.success$.subscribe(() => this.onMutationSuccess(input.name));
         outcome.errors$.subscribe(messages => this.onMutationError(messages, input.name));
     }
 
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
index c9a8fbb1..44a95306 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
@@ -1,84 +1,25 @@
 import { DestroyRef, Injectable } from '@angular/core';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { CreateEntityDescriptionInput, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
-import { filter, map, Observable, shareReplay, } from 'rxjs';
-import _ from 'underscore';
+import { CreateAgentMutation, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
 import { MutationResult } from 'apollo-angular';
-import { isLoading } from '@shared/request-utils';
 
-interface MutationOutcome<T> {
-    loading$: Observable<boolean>;
-    succes$: Observable<T>;
-    errors$: Observable<string[]>,
-}
-
-@Injectable()
-export class CreateAgentService {
-    constructor(
-        private createMutation: DataEntryCreateAgentGQL,
-        private destroyRef: DestroyRef
-    ) { }
+import { CreateEntityDescriptionService } from './create-entity';
 
-    submit(input: CreateEntityDescriptionInput): MutationOutcome<DataEntryCreateAgentMutation> {
-        const result$ = this.createMutation.mutate(
-            { input },
-            {
-                errorPolicy: 'all',
-                update: (cache) => this.updateCache(input.source, input.episodes, cache),
-            }
-        ).pipe(
-            shareReplay(1),
-            takeUntilDestroyed(this.destroyRef),
-        );
-        return this.getOutcome(result$);
-    }
 
-    private getOutcome(
-        result$: Observable<MutationResult<DataEntryCreateAgentMutation>>
-    ): MutationOutcome<DataEntryCreateAgentMutation> {
-        const loading$ = result$.pipe(isLoading());
-        const succes$: Observable<DataEntryCreateAgentMutation> = result$.pipe(
-            filter(result => _.isUndefined(this.resultErrors(result))),
-            map(result => result.data?.createAgent as DataEntryCreateAgentMutation),
-        );
-        const errors$: Observable<string[]> = result$.pipe(
-            map(this.resultErrors),
-            filter(_.negate(_.isUndefined)),
-        );
-        return { loading$, succes$, errors$ };
-    }
+@Injectable()
+export class CreateAgentService extends CreateEntityDescriptionService<DataEntryCreateAgentMutation, CreateAgentMutation> {
+    relatedName = 'agents';
 
-    private updateCache(
-        source: string, episodes: string[] | null | undefined, cache: any
+    constructor(
+        createMutation: DataEntryCreateAgentGQL,
+        destroyRef: DestroyRef,
     ) {
-        cache.evict({
-            id: cache.identify({ __typename: 'SourceType', id: source }),
-            fieldName: 'agents',
-        });
-        if (episodes) {
-            for (const episode of episodes) {
-                cache.evict({
-                    id: cache.identify({ __typename: 'EpisodeType', id: episode }),
-                    fieldName: 'agents',
-                })
-            }
-        }
-        cache.gc();
+        super(createMutation, destroyRef);
     }
 
-    private resultErrors(
+    protected resultData(
         result: MutationResult<DataEntryCreateAgentMutation>
-    ): string[] | undefined {
-        if (result.errors?.length) {
-            return result.errors.map(error => error.message);
-        }
-        if (result.data?.createAgent?.errors.length) {
-            return result.data.createAgent.errors.flatMap(error => error.messages);
-        }
-        if (!result.data?.createAgent) {
-            return ['Unknown error'];
-        }
-        return undefined;
+    ): CreateAgentMutation | undefined {
+        return result.data?.createAgent || undefined;
     }
 
 }
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-entity.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-entity.ts
new file mode 100644
index 00000000..72ba4201
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-entity.ts
@@ -0,0 +1,115 @@
+import { DestroyRef } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { CreateEntityDescriptionInput, DataEntryCreateAgentMutation, DataEntryCreateGiftMutation, DataEntryCreateLetterMutation, DataEntryCreateSpaceMutation, LettercraftErrorType, } from 'generated/graphql';
+import { filter, map, Observable, shareReplay, } from 'rxjs';
+import { Mutation, MutationResult } from 'apollo-angular';
+import { ApolloCache } from '@apollo/client/core';
+import { isLoading } from '@shared/request-utils';
+import _ from 'underscore';
+
+export interface MutationOutcome<T> {
+    loading$: Observable<boolean>;
+    success$: Observable<T>;
+    errors$: Observable<string[]>,
+}
+
+type CreateEntityMutationUnion = (
+    DataEntryCreateAgentMutation |
+    DataEntryCreateGiftMutation |
+    DataEntryCreateLetterMutation |
+    DataEntryCreateSpaceMutation
+);
+
+export abstract class CreateEntityDescriptionService<
+    CreateEntityMutation extends CreateEntityMutationUnion,
+    Result extends { errors?: LettercraftErrorType[] },
+> {
+    /** Property used to refer to this entity in source and episode types */
+    abstract relatedName: string;
+
+    constructor(
+        protected createMutation: Mutation<CreateEntityMutation, unknown>,
+        protected destroyRef: DestroyRef
+    ) { }
+
+    /** Submit input to create a new entity */
+    submit(input: CreateEntityDescriptionInput): MutationOutcome<Result> {
+        const result$ = this.createMutation.mutate(
+            { input },
+            {
+                errorPolicy: 'all',
+                update: (cache) => this.updateCache(input, cache),
+            }
+        ).pipe(
+            shareReplay(1),
+            takeUntilDestroyed(this.destroyRef),
+        );
+        return this.getOutcome(result$);
+    }
+
+    /** Wraps the mutation result in an object containing loading$, error$, and
+     * success$ observables
+     * */
+    protected getOutcome(
+        result$: Observable<MutationResult<CreateEntityMutation>>
+    ): MutationOutcome<Result> {
+        const loading$ = result$.pipe(isLoading());
+        const succes$: Observable<Result> = result$.pipe(
+            filter(result => _.isUndefined(this.resultErrors(result))),
+            map(result => this.resultData(result) as Result),
+        );
+        const errors$: Observable<string[]> = result$.pipe(
+            map(this.resultErrors),
+            filter(_.negate(_.isUndefined)),
+        );
+        return { loading$, success$: succes$, errors$ };
+    }
+
+    /** Extract a list of error messages from the mutation result.
+     *
+     * @returns A list of error messages (strings). If there are no errors, returns
+     * `undefined`.
+     */
+    protected resultErrors(
+        result: MutationResult<CreateEntityMutation>
+    ): string[] | undefined {
+        if (result.errors?.length) {
+            return result.errors.map(error => error.message);
+        }
+        const data = this.resultData(result);
+        if (!data) {
+            return ['Unknown error'];
+        }
+        if (data.errors?.length) {
+            return data.errors.flatMap(error => error.messages);
+        }
+        return undefined;
+    }
+
+    /** Update the cache based on the provided input
+     */
+    protected updateCache(
+        input: CreateEntityDescriptionInput, cache: ApolloCache<unknown>
+    ) {
+        cache.evict({
+            id: cache.identify({ __typename: 'SourceType', id: input.source }),
+            fieldName: this.relatedName,
+        });
+        if (input.episodes) {
+            for (const episode of input.episodes) {
+                cache.evict({
+                    id: cache.identify({ __typename: 'EpisodeType', id: episode }),
+                    fieldName: this.relatedName,
+                })
+            }
+        }
+        cache.gc();
+    }
+
+    /** Extract the result of this mutation from the request result.
+     */
+    protected abstract resultData(
+        result: MutationResult<CreateEntityMutation>
+    ): Result | undefined;
+
+}
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts
new file mode 100644
index 00000000..164a5515
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts
@@ -0,0 +1,25 @@
+import { DestroyRef, Injectable } from '@angular/core';
+import { CreateGiftMutation, DataEntryCreateGiftGQL, DataEntryCreateGiftMutation } from 'generated/graphql';
+import { MutationResult } from 'apollo-angular';
+import { CreateEntityDescriptionService } from './create-entity';
+
+
+@Injectable()
+export class CreateGiftService extends CreateEntityDescriptionService<DataEntryCreateGiftMutation, CreateGiftMutation> {
+    relatedName = 'gifts';
+
+    constructor(
+        createMutation: DataEntryCreateGiftGQL,
+        destroyRef: DestroyRef
+    ) {
+        super(createMutation, destroyRef);
+    }
+
+
+    protected resultData(
+        result: MutationResult<DataEntryCreateGiftMutation>
+    ): CreateGiftMutation | undefined {
+        return result.data?.createGift || undefined;
+    }
+
+}
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts
new file mode 100644
index 00000000..43c9a580
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts
@@ -0,0 +1,25 @@
+import { DestroyRef, Injectable } from '@angular/core';
+import { CreateLetterMutation, DataEntryCreateLetterGQL, DataEntryCreateLetterMutation } from 'generated/graphql';
+import { MutationResult } from 'apollo-angular';
+import { CreateEntityDescriptionService } from './create-entity';
+
+
+@Injectable()
+export class CreateLetterService extends CreateEntityDescriptionService<DataEntryCreateLetterMutation, CreateLetterMutation> {
+    relatedName = 'letters';
+
+    constructor(
+        createMutation: DataEntryCreateLetterGQL,
+        destroyRef: DestroyRef
+    ) {
+        super(createMutation, destroyRef);
+    }
+
+
+    protected resultData(
+        result: MutationResult<DataEntryCreateLetterMutation>
+    ): CreateLetterMutation | undefined {
+        return result.data?.createLetter || undefined;
+    }
+
+}
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts
new file mode 100644
index 00000000..225abc0d
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts
@@ -0,0 +1,25 @@
+import { DestroyRef, Injectable } from '@angular/core';
+import { CreateSpaceMutation, DataEntryCreateSpaceGQL, DataEntryCreateSpaceMutation } from 'generated/graphql';
+import { MutationResult } from 'apollo-angular';
+import { CreateEntityDescriptionService } from './create-entity';
+
+
+@Injectable()
+export class CreateSpaceService extends CreateEntityDescriptionService<DataEntryCreateSpaceMutation, CreateSpaceMutation> {
+    relatedName = 'spaces';
+
+    constructor(
+        createMutation: DataEntryCreateSpaceGQL,
+        destroyRef: DestroyRef
+    ) {
+        super(createMutation, destroyRef);
+    }
+
+
+    protected resultData(
+        result: MutationResult<DataEntryCreateSpaceMutation>
+    ): CreateSpaceMutation | undefined {
+        return result.data?.createSpace || undefined;
+    }
+
+}
diff --git a/frontend/src/app/data-entry/create-forms/create-forms.module.ts b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
index d9248d52..4361db08 100644
--- a/frontend/src/app/data-entry/create-forms/create-forms.module.ts
+++ b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
@@ -3,6 +3,9 @@ import { CreateAgentComponent } from './create-agent/create-agent.component';
 import { SharedModule } from '@shared/shared.module';
 import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
 import { CreateAgentService } from './create-agent/create-agent.service';
+import { CreateGiftService } from './create-agent/create-gift.service';
+import { CreateLetterService } from './create-agent/create-letter.service';
+import { CreateSpaceService } from './create-agent/create-space.service';
 
 
 
@@ -19,6 +22,9 @@ import { CreateAgentService } from './create-agent/create-agent.service';
     ],
     providers: [
         CreateAgentService,
+        CreateGiftService,
+        CreateLetterService,
+        CreateSpaceService,
     ]
 })
 export class CreateFormsModule { }

From 411600132f85f1f659066782131bc7f7e36d1dca Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 11:16:30 +0200
Subject: [PATCH 515/565] implement different entity types in create component

---
 .../create-agent/create-agent.component.html  | 10 ++---
 .../create-agent/create-agent.component.ts    | 43 ++++++++++++-------
 .../create-agent/create-agent.service.ts      |  4 +-
 ...te-entity.ts => create-entity-abstract.ts} |  2 +-
 .../create-agent/create-entity.service.ts     | 33 ++++++++++++++
 .../create-agent/create-gift.service.ts       |  4 +-
 .../create-agent/create-letter.service.ts     |  4 +-
 .../create-agent/create-space.service.ts      |  4 +-
 .../create-forms/create-forms.module.ts       |  2 +
 .../episode-entities-form.component.html      | 15 +++----
 10 files changed, 83 insertions(+), 38 deletions(-)
 rename frontend/src/app/data-entry/create-forms/create-agent/{create-entity.ts => create-entity-abstract.ts} (98%)
 create mode 100644 frontend/src/app/data-entry/create-forms/create-agent/create-entity.service.ts

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
index aa980b9e..72fc9073 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
@@ -1,17 +1,17 @@
-<ng-template #createAgentModal>
+<ng-template #createEntityModal>
     <lc-base-modal (dismiss)="closeModal()">
         <ng-container modal-header>
-            <h4 ngbAutofocus tabindex="-1">Create new agent</h4>
+            <h4 ngbAutofocus tabindex="-1">Create new {{ entityName }}</h4>
         </ng-container>
         <form modal-content [formGroup]="form" (ngSubmit)="submit()">
             <div class="form-group">
-                <label class="form-label" for="agent-name-input">Name</label>
+                <label class="form-label" for="create-entity-name-input">Name</label>
                 <p class="form-text">
-                    This is a name to identify the agent in the overview of the
+                    This is a name to identify the {{ entityName }} in the overview of the
                     source. For example: {{ nameExamples }}.
                 </p>
                 <input
-                    id="agent-name-input"
+                    id="create-entity-name-input"
                     type="text"
                     class="form-control"
                     [formControl]="form.controls.name"
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
index 65007792..ef74591d 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
@@ -2,10 +2,11 @@ import { AfterViewInit, Component, Input, TemplateRef, ViewChild } from '@angula
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
-import { CreateEntityDescriptionInput } from 'generated/graphql';
+import { CreateEntityDescriptionInput, Entity } from 'generated/graphql';
 import { Observable } from 'rxjs';
 import { listNames, nameExamples } from '../../shared/utils';
-import { CreateAgentService } from './create-agent.service';
+import { CreateEntityService } from './create-entity.service';
+
 
 /**
  * Opens modal(s) to create new AgentDescriptions.
@@ -22,8 +23,9 @@ export class CreateAgentComponent implements AfterViewInit {
     @Input({ required: true }) create!: Observable<void>;
     @Input({ required: true }) sourceID!: string;
     @Input() episodeID?: string;
+    @Input({ required: true }) entityType!: Entity;
 
-    @ViewChild('createAgentModal') modalTempate?: TemplateRef<unknown>;
+    @ViewChild('createEntitytModal') modalTempate?: TemplateRef<unknown>;
 
     modal: NgbModalRef | null = null;
     form = new FormGroup({
@@ -37,14 +39,25 @@ export class CreateAgentComponent implements AfterViewInit {
 
     submitted = false;
 
-    nameExamples = listNames(nameExamples['agent']);
 
     constructor(
         private modalService: NgbModal,
         private toastService: ToastService,
-        private createAgentService: CreateAgentService,
-    ) {
+        private createEntityService: CreateEntityService,
+    ) { }
+
+    get entityName(): string {
+        const names = {
+            [Entity.Agent]: 'agent',
+            [Entity.Gift]: 'gift',
+            [Entity.Letter]: 'letter',
+            [Entity.Space]: 'space',
+        }
+        return names[this.entityType];
+    }
 
+    get nameExamples(): string {
+        return listNames(nameExamples[this.entityName]);
     }
 
     ngAfterViewInit(): void {
@@ -70,30 +83,30 @@ export class CreateAgentComponent implements AfterViewInit {
             source: this.sourceID,
             episodes: this.episodeID ? [this.episodeID] : null
         };
-        const outcome = this.createAgentService.submit(input);
+        const outcome = this.createEntityService.submit(this.entityType, input);
 
         this.loading$ = outcome.loading$;
-        outcome.success$.subscribe(() => this.onMutationSuccess(input.name));
-        outcome.errors$.subscribe(messages => this.onMutationError(messages, input.name));
+        outcome.success$.subscribe(() => this.onMutationSuccess(input.name, this.entityName));
+        outcome.errors$.subscribe(messages => this.onMutationError(messages, input.name, this.entityName));
     }
 
-    private onMutationSuccess(agentName: string) {
+    private onMutationSuccess(entityName: string, entityTypeName: string) {
         this.modal?.close();
         this.form.reset();
         this.submitted = false;
         this.toastService.show({
             type: 'success',
-            header: 'Agent created',
-            body: `Created agent "${agentName}"`
+            header: `Created ${entityTypeName}`,
+            body: `Created ${entityTypeName} "${entityName}"`
         })
     }
 
-    private onMutationError(messages: string[], agentName: string) {
-        const body = `Could not create agent "${agentName}".
+    private onMutationError(messages: string[], entityName: string, entityTypeName: string) {
+        const body = `Could not create ${entityTypeName} "${entityName}".
         ${messages.join('\n')}`;
         this.toastService.show({
             type: 'danger',
-            header: 'Creating agent failed',
+            header: `Creating ${entityTypeName} failed`,
             body,
         })
     }
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
index 44a95306..23ee6fbb 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
@@ -2,11 +2,11 @@ import { DestroyRef, Injectable } from '@angular/core';
 import { CreateAgentMutation, DataEntryCreateAgentGQL, DataEntryCreateAgentMutation } from 'generated/graphql';
 import { MutationResult } from 'apollo-angular';
 
-import { CreateEntityDescriptionService } from './create-entity';
+import { CreateEntityDescriptionAbstract } from './create-entity-abstract';
 
 
 @Injectable()
-export class CreateAgentService extends CreateEntityDescriptionService<DataEntryCreateAgentMutation, CreateAgentMutation> {
+export class CreateAgentService extends CreateEntityDescriptionAbstract<DataEntryCreateAgentMutation, CreateAgentMutation> {
     relatedName = 'agents';
 
     constructor(
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-entity.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-entity-abstract.ts
similarity index 98%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-entity.ts
rename to frontend/src/app/data-entry/create-forms/create-agent/create-entity-abstract.ts
index 72ba4201..437fe798 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-entity.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-entity-abstract.ts
@@ -20,7 +20,7 @@ type CreateEntityMutationUnion = (
     DataEntryCreateSpaceMutation
 );
 
-export abstract class CreateEntityDescriptionService<
+export abstract class CreateEntityDescriptionAbstract<
     CreateEntityMutation extends CreateEntityMutationUnion,
     Result extends { errors?: LettercraftErrorType[] },
 > {
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-entity.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-entity.service.ts
new file mode 100644
index 00000000..e032bb56
--- /dev/null
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-entity.service.ts
@@ -0,0 +1,33 @@
+import { Injectable } from "@angular/core";
+import { CreateAgentService } from "./create-agent.service";
+import { CreateGiftService } from "./create-gift.service";
+import { CreateLetterService } from "./create-letter.service";
+import { CreateSpaceService } from "./create-space.service";
+import { CreateEntityDescriptionInput, Entity } from "generated/graphql";
+import { MutationOutcome } from "./create-entity-abstract";
+
+type CreateService = CreateAgentService | CreateGiftService | CreateLetterService | CreateSpaceService;
+
+@Injectable()
+export class CreateEntityService {
+    private createServices: Record<Entity, CreateService>;
+
+    constructor(
+        createAgentService: CreateAgentService,
+        createGiftService: CreateGiftService,
+        createLetterService: CreateLetterService,
+        createSpaceService: CreateSpaceService,
+    ) {
+        this.createServices = {
+            [Entity.Agent]: createAgentService,
+            [Entity.Gift]: createGiftService,
+            [Entity.Letter]: createLetterService,
+            [Entity.Space]: createSpaceService,
+        };
+    }
+
+    submit(entityType: Entity, input: CreateEntityDescriptionInput): MutationOutcome<any> {
+        const service = this.createServices[entityType];
+        return service.submit(input);
+    }
+}
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts
index 164a5515..d13f5627 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts
@@ -1,11 +1,11 @@
 import { DestroyRef, Injectable } from '@angular/core';
 import { CreateGiftMutation, DataEntryCreateGiftGQL, DataEntryCreateGiftMutation } from 'generated/graphql';
 import { MutationResult } from 'apollo-angular';
-import { CreateEntityDescriptionService } from './create-entity';
+import { CreateEntityDescriptionAbstract } from './create-entity-abstract';
 
 
 @Injectable()
-export class CreateGiftService extends CreateEntityDescriptionService<DataEntryCreateGiftMutation, CreateGiftMutation> {
+export class CreateGiftService extends CreateEntityDescriptionAbstract<DataEntryCreateGiftMutation, CreateGiftMutation> {
     relatedName = 'gifts';
 
     constructor(
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts
index 43c9a580..bff43743 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts
@@ -1,11 +1,11 @@
 import { DestroyRef, Injectable } from '@angular/core';
 import { CreateLetterMutation, DataEntryCreateLetterGQL, DataEntryCreateLetterMutation } from 'generated/graphql';
 import { MutationResult } from 'apollo-angular';
-import { CreateEntityDescriptionService } from './create-entity';
+import { CreateEntityDescriptionAbstract } from './create-entity-abstract';
 
 
 @Injectable()
-export class CreateLetterService extends CreateEntityDescriptionService<DataEntryCreateLetterMutation, CreateLetterMutation> {
+export class CreateLetterService extends CreateEntityDescriptionAbstract<DataEntryCreateLetterMutation, CreateLetterMutation> {
     relatedName = 'letters';
 
     constructor(
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts b/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts
index 225abc0d..ce01b78a 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts
+++ b/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts
@@ -1,11 +1,11 @@
 import { DestroyRef, Injectable } from '@angular/core';
 import { CreateSpaceMutation, DataEntryCreateSpaceGQL, DataEntryCreateSpaceMutation } from 'generated/graphql';
 import { MutationResult } from 'apollo-angular';
-import { CreateEntityDescriptionService } from './create-entity';
+import { CreateEntityDescriptionAbstract } from './create-entity-abstract';
 
 
 @Injectable()
-export class CreateSpaceService extends CreateEntityDescriptionService<DataEntryCreateSpaceMutation, CreateSpaceMutation> {
+export class CreateSpaceService extends CreateEntityDescriptionAbstract<DataEntryCreateSpaceMutation, CreateSpaceMutation> {
     relatedName = 'spaces';
 
     constructor(
diff --git a/frontend/src/app/data-entry/create-forms/create-forms.module.ts b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
index 4361db08..556c70a1 100644
--- a/frontend/src/app/data-entry/create-forms/create-forms.module.ts
+++ b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
@@ -6,6 +6,7 @@ import { CreateAgentService } from './create-agent/create-agent.service';
 import { CreateGiftService } from './create-agent/create-gift.service';
 import { CreateLetterService } from './create-agent/create-letter.service';
 import { CreateSpaceService } from './create-agent/create-space.service';
+import { CreateEntityService } from './create-agent/create-entity.service';
 
 
 
@@ -25,6 +26,7 @@ import { CreateSpaceService } from './create-agent/create-space.service';
         CreateGiftService,
         CreateLetterService,
         CreateSpaceService,
+        CreateEntityService,
     ]
 })
 export class CreateFormsModule { }
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index 3139c8c9..1b7ea980 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -25,20 +25,16 @@
 
         <div class="mt-4 mb-4">
             <div ngbDropdown>
-                <button type="button" class="btn btn-primary"
-                    #dropdownToggle
-                    [attr.id]="dropdownToggleID"
-                    ngbDropdownToggle>
+                <button type="button" class="btn btn-primary" #dropdownToggle
+                    [attr.id]="dropdownToggleID" ngbDropdownToggle>
                     Add {{entityName}}
                 </button>
-                <div ngbDropdownMenu
-                    [attr.aria-labelledby]="dropdownToggleID">
+                <div ngbDropdownMenu [attr.aria-labelledby]="dropdownToggleID">
                     <button *ngFor="let entity of (availableEntities$ | async)"
                         ngbDropdownItem (click)="addEntity$.next(entity.id); dropdownToggle.focus()">
                         {{entity.name}}
                     </button>
-                    <button ngbDropdownItem (click)="createEntity$.next()"
-                        [disabled]="entityName !== 'agent'">
+                    <button ngbDropdownItem (click)="createEntity$.next()">
                         <lc-icon [icon]="actionIcons.create" />
                         Create new {{entityName}}
                     </button>
@@ -46,7 +42,8 @@
             </div>
         </div>
 
-        <lc-create-agent [create]="createEntity$" [sourceID]="data.episode.source.id"
+        <lc-create-agent [entityType]="entityType" [create]="createEntity$"
+            [sourceID]="data.episode.source.id"
             [episodeID]="data.episode.id" />
     </ng-container>
 </ng-container>

From 67cc36ae409dcb1eca4d1ef24b6a60e0fda35919 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 11:42:59 +0200
Subject: [PATCH 516/565] move files

---
 .../create-agent.service.ts                          |  0
 .../create-entity-abstract.ts                        |  0
 .../create-entity.component.html}                    |  0
 .../create-entity.component.scss}                    |  0
 .../create-entity.component.spec.ts}                 |  2 +-
 .../create-entity.component.ts}                      |  6 +++---
 .../create-entity.graphql                            |  0
 .../create-entity.service.ts                         |  0
 .../create-gift.service.ts                           |  0
 .../create-letter.service.ts                         |  0
 .../create-space.service.ts                          |  0
 .../data-entry/create-forms/create-forms.module.ts   | 12 ++++++------
 .../episode-entities-form.component.html             |  2 +-
 13 files changed, 11 insertions(+), 11 deletions(-)
 rename frontend/src/app/data-entry/create-forms/{create-agent => create-entity}/create-agent.service.ts (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent => create-entity}/create-entity-abstract.ts (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent/create-agent.component.html => create-entity/create-entity.component.html} (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent/create-agent.component.scss => create-entity/create-entity.component.scss} (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent/create-agent.component.spec.ts => create-entity/create-entity.component.spec.ts} (94%)
 rename frontend/src/app/data-entry/create-forms/{create-agent/create-agent.component.ts => create-entity/create-entity.component.ts} (96%)
 rename frontend/src/app/data-entry/create-forms/{create-agent => create-entity}/create-entity.graphql (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent => create-entity}/create-entity.service.ts (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent => create-entity}/create-gift.service.ts (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent => create-entity}/create-letter.service.ts (100%)
 rename frontend/src/app/data-entry/create-forms/{create-agent => create-entity}/create-space.service.ts (100%)

diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-agent.service.ts
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-agent.service.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-agent.service.ts
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-entity-abstract.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity-abstract.ts
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-entity-abstract.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-entity-abstract.ts
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.html
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.html
rename to frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.html
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.scss b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.scss
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.scss
rename to frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.scss
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
similarity index 94%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
index 72a48b3d..10979107 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.spec.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CreateAgentComponent } from './create-agent.component';
+import { CreateAgentComponent } from './create-entity.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { Subject } from 'rxjs';
 import { CreateAgentService } from './create-agent.service';
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
similarity index 96%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
index ef74591d..fe1f61c8 100644
--- a/frontend/src/app/data-entry/create-forms/create-agent/create-agent.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
@@ -15,9 +15,9 @@ import { CreateEntityService } from './create-entity.service';
  * the `[create]` input to signal when to open a modal.
  */
 @Component({
-  selector: 'lc-create-agent',
-  templateUrl: './create-agent.component.html',
-    styleUrls: ['./create-agent.component.scss'],
+    selector: 'lc-create-agent',
+    templateUrl: './create-entity.component.html',
+    styleUrls: ['./create-entity.component.scss'],
 })
 export class CreateAgentComponent implements AfterViewInit {
     @Input({ required: true }) create!: Observable<void>;
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-entity.graphql b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.graphql
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-entity.graphql
rename to frontend/src/app/data-entry/create-forms/create-entity/create-entity.graphql
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-entity.service.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.service.ts
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-entity.service.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-entity.service.ts
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-gift.service.ts
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-gift.service.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-gift.service.ts
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-letter.service.ts
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-letter.service.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-letter.service.ts
diff --git a/frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-space.service.ts
similarity index 100%
rename from frontend/src/app/data-entry/create-forms/create-agent/create-space.service.ts
rename to frontend/src/app/data-entry/create-forms/create-entity/create-space.service.ts
diff --git a/frontend/src/app/data-entry/create-forms/create-forms.module.ts b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
index 556c70a1..85864f63 100644
--- a/frontend/src/app/data-entry/create-forms/create-forms.module.ts
+++ b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
@@ -1,12 +1,12 @@
 import { NgModule } from '@angular/core';
-import { CreateAgentComponent } from './create-agent/create-agent.component';
+import { CreateAgentComponent } from './create-entity/create-entity.component';
 import { SharedModule } from '@shared/shared.module';
 import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
-import { CreateAgentService } from './create-agent/create-agent.service';
-import { CreateGiftService } from './create-agent/create-gift.service';
-import { CreateLetterService } from './create-agent/create-letter.service';
-import { CreateSpaceService } from './create-agent/create-space.service';
-import { CreateEntityService } from './create-agent/create-entity.service';
+import { CreateAgentService } from './create-entity/create-agent.service';
+import { CreateGiftService } from './create-entity/create-gift.service';
+import { CreateLetterService } from './create-entity/create-letter.service';
+import { CreateSpaceService } from './create-entity/create-space.service';
+import { CreateEntityService } from './create-entity/create-entity.service';
 
 
 
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index 1b7ea980..1671a295 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -44,6 +44,6 @@
 
         <lc-create-agent [entityType]="entityType" [create]="createEntity$"
             [sourceID]="data.episode.source.id"
-            [episodeID]="data.episode.id" />
+            [episodeID]="data.episode.id" />ya
     </ng-container>
 </ng-container>

From 5b61c5eb65150d366ce1d49afadc66c9c83cfe05 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 11:44:58 +0200
Subject: [PATCH 517/565] rename component

---
 .../create-entity/create-entity.component.spec.ts     | 10 +++++-----
 .../create-entity/create-entity.component.ts          | 11 ++++++-----
 .../data-entry/create-forms/create-forms.module.ts    |  6 +++---
 .../episode-entities-form.component.html              |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
index 10979107..08582970 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
@@ -1,22 +1,22 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CreateAgentComponent } from './create-entity.component';
+import { CreateEntityComponent } from './create-entity.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { Subject } from 'rxjs';
 import { CreateAgentService } from './create-agent.service';
 
 describe('CreateAgentComponent', () => {
-    let component: CreateAgentComponent;
-    let fixture: ComponentFixture<CreateAgentComponent>;
+    let component: CreateEntityComponent;
+    let fixture: ComponentFixture<CreateEntityComponent>;
     let create$: Subject<void>;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [CreateAgentComponent],
+            declarations: [CreateEntityComponent],
             imports: [SharedTestingModule],
             providers: [CreateAgentService],
         });
-        fixture = TestBed.createComponent(CreateAgentComponent);
+        fixture = TestBed.createComponent(CreateEntityComponent);
         component = fixture.componentInstance;
         create$ = new Subject<void>();
         component.create = create$;
diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
index fe1f61c8..4741a664 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
@@ -9,23 +9,24 @@ import { CreateEntityService } from './create-entity.service';
 
 
 /**
- * Opens modal(s) to create new AgentDescriptions.
+ * Opens modal(s) to create new AgentDescriptions, GiftDescriptions, LetterDescriptions,
+ * or SpaceDescriptions.
  *
- * The parent component shoud implement a trigger to create agents (e.g. a button); use
+ * The parent component shoud implement a trigger to create objects (e.g. a button); use
  * the `[create]` input to signal when to open a modal.
  */
 @Component({
-    selector: 'lc-create-agent',
+    selector: 'lc-create-entity',
     templateUrl: './create-entity.component.html',
     styleUrls: ['./create-entity.component.scss'],
 })
-export class CreateAgentComponent implements AfterViewInit {
+export class CreateEntityComponent implements AfterViewInit {
     @Input({ required: true }) create!: Observable<void>;
     @Input({ required: true }) sourceID!: string;
     @Input() episodeID?: string;
     @Input({ required: true }) entityType!: Entity;
 
-    @ViewChild('createEntitytModal') modalTempate?: TemplateRef<unknown>;
+    @ViewChild('createEntityModal') modalTempate?: TemplateRef<unknown>;
 
     modal: NgbModalRef | null = null;
     form = new FormGroup({
diff --git a/frontend/src/app/data-entry/create-forms/create-forms.module.ts b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
index 85864f63..f45eba26 100644
--- a/frontend/src/app/data-entry/create-forms/create-forms.module.ts
+++ b/frontend/src/app/data-entry/create-forms/create-forms.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { CreateAgentComponent } from './create-entity/create-entity.component';
+import { CreateEntityComponent } from './create-entity/create-entity.component';
 import { SharedModule } from '@shared/shared.module';
 import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
 import { CreateAgentService } from './create-entity/create-agent.service';
@@ -12,14 +12,14 @@ import { CreateEntityService } from './create-entity/create-entity.service';
 
 @NgModule({
     declarations: [
-        CreateAgentComponent
+        CreateEntityComponent
     ],
     imports: [
         SharedModule,
         DataEntrySharedModule,
     ],
     exports: [
-        CreateAgentComponent,
+        CreateEntityComponent,
     ],
     providers: [
         CreateAgentService,
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
index 1671a295..9bf68dd4 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities-form.component.html
@@ -42,8 +42,8 @@
             </div>
         </div>
 
-        <lc-create-agent [entityType]="entityType" [create]="createEntity$"
+        <lc-create-entity [entityType]="entityType" [create]="createEntity$"
             [sourceID]="data.episode.source.id"
-            [episodeID]="data.episode.id" />ya
+            [episodeID]="data.episode.id" />
     </ng-container>
 </ng-container>

From 5efc04dcc836298fa289f7d9f03af0fea0257ca3 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 11:50:59 +0200
Subject: [PATCH 518/565] small fixes

---
 .../create-forms/create-entity/create-entity-abstract.ts        | 2 +-
 .../create-forms/create-entity/create-entity.component.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity-abstract.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity-abstract.ts
index 437fe798..2727d8e8 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity-abstract.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity-abstract.ts
@@ -59,7 +59,7 @@ export abstract class CreateEntityDescriptionAbstract<
             map(result => this.resultData(result) as Result),
         );
         const errors$: Observable<string[]> = result$.pipe(
-            map(this.resultErrors),
+            map(this.resultErrors.bind(this)),
             filter(_.negate(_.isUndefined)),
         );
         return { loading$, success$: succes$, errors$ };
diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
index 4741a664..b67a2c10 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
@@ -52,7 +52,7 @@ export class CreateEntityComponent implements AfterViewInit {
             [Entity.Agent]: 'agent',
             [Entity.Gift]: 'gift',
             [Entity.Letter]: 'letter',
-            [Entity.Space]: 'space',
+            [Entity.Space]: 'location',
         }
         return names[this.entityType];
     }

From c0780c3bd56a1a6b33639adfaf2de5ee52a18237 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 12:14:29 +0200
Subject: [PATCH 519/565] fix test module

---
 .../create-entity/create-entity.component.spec.ts          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
index 08582970..566a60a1 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.spec.ts
@@ -3,7 +3,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CreateEntityComponent } from './create-entity.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
 import { Subject } from 'rxjs';
+import { CreateEntityService } from './create-entity.service';
 import { CreateAgentService } from './create-agent.service';
+import { CreateGiftService } from './create-gift.service';
+import { CreateLetterService } from './create-letter.service';
+import { CreateSpaceService } from './create-space.service';
 
 describe('CreateAgentComponent', () => {
     let component: CreateEntityComponent;
@@ -14,7 +18,8 @@ describe('CreateAgentComponent', () => {
         TestBed.configureTestingModule({
             declarations: [CreateEntityComponent],
             imports: [SharedTestingModule],
-            providers: [CreateAgentService],
+            providers: [CreateEntityService, CreateAgentService, CreateGiftService,
+                CreateLetterService, CreateSpaceService],
         });
         fixture = TestBed.createComponent(CreateEntityComponent);
         component = fixture.componentInstance;

From e0539c79e24668e91c6e17f29d643610e135be32 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 14:13:19 +0200
Subject: [PATCH 520/565] resolve partial and missing names

---
 backend/user/types/UserType.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/user/types/UserType.py b/backend/user/types/UserType.py
index 6e6d4538..ca3a8402 100644
--- a/backend/user/types/UserType.py
+++ b/backend/user/types/UserType.py
@@ -24,4 +24,9 @@ def get_queryset(
 
     @staticmethod
     def resolve_full_name(parent: User, info: ResolveInfo) -> str:
-        return f"{parent.first_name} {parent.last_name}"
+        if parent.first_name and parent.last_name:
+            return f"{parent.first_name} {parent.last_name}"
+        elif parent.first_name or parent.last_name:
+            return parent.first_name or parent.last_name
+        else:
+            return "nameless contributor"

From a8a6311f08d35a13dd46811feb279f0f40789f18 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 14:24:01 +0200
Subject: [PATCH 521/565] update cache after changing user settings

---
 .../user-settings/user-settings.component.ts  | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/user/user-settings/user-settings.component.ts b/frontend/src/app/user/user-settings/user-settings.component.ts
index 1c60fc29..3432cde2 100644
--- a/frontend/src/app/user/user-settings/user-settings.component.ts
+++ b/frontend/src/app/user/user-settings/user-settings.component.ts
@@ -1,7 +1,7 @@
 import { Component, DestroyRef, OnInit } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { AuthService } from "@services/auth.service";
-import { UserSettings } from "../models/user";
+import { UserResponse, UserSettings } from "../models/user";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { filter } from "rxjs";
 import {
@@ -12,6 +12,7 @@ import {
 } from "../utils";
 import { ToastService } from "@services/toast.service";
 import { usernameValidators } from "../validation";
+import { Apollo } from "apollo-angular";
 
 type UserSettingsForm = {
     [key in keyof UserSettings]: FormControl<UserSettings[key]>;
@@ -58,6 +59,7 @@ export class UserSettingsComponent implements OnInit {
         private authService: AuthService,
         private toastService: ToastService,
         private destroyRef: DestroyRef,
+        private apollo: Apollo,
     ) {}
 
     ngOnInit(): void {
@@ -106,11 +108,7 @@ export class UserSettingsComponent implements OnInit {
 
         this.authService.updateSettings.success$
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe(() => this.toastService.show({
-                header: "Settings updated",
-                body: "Your settings have been successfully updated.",
-                type: "success",
-            }));
+            .subscribe(this.onSuccess.bind(this));
     }
 
     public requestPasswordReset(): void {
@@ -132,4 +130,22 @@ export class UserSettingsComponent implements OnInit {
         const userSettings = this.form.getRawValue();
         this.authService.newUserSettings(userSettings);
     }
+
+    private onSuccess(user: UserResponse) {
+        this.toastService.show({
+            header: "Settings updated",
+            body: "Your settings have been successfully updated.",
+            type: "success",
+        });
+        this.updateCache(user.id);
+    }
+
+    private updateCache(id: number) {
+        const cache = this.apollo.client.cache;
+        const identified = cache.identify({ __typename: 'UserType', id });
+        cache.evict({ id: identified, fieldName: 'firstName' });
+        cache.evict({ id: identified, fieldName: 'lastName' });
+        cache.evict({ id: identified, fieldName: 'fullName' });
+        cache.gc();
+    }
 }

From 4db7fefb78e3112a3307f4b49598f1da1e23b2c1 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 26 Sep 2024 15:26:29 +0200
Subject: [PATCH 522/565] Basic Location form

---
 frontend/generated/graphql.ts                 | 3588 ++++++++++-------
 .../location-form.component.html              |   20 +-
 .../location-form/location-form.module.ts     |    8 +-
 ...ocation-identification-form.component.html |   31 +
 ...ocation-identification-form.component.scss |    0
 ...tion-identification-form.component.spec.ts |   21 +
 .../location-identification-form.component.ts |  158 +
 .../location-identification-form.graphql      |    7 +
 .../location-source-text-form.component.html  |   37 +
 .../location-source-text-form.component.scss  |    0
 ...ocation-source-text-form.component.spec.ts |   21 +
 .../location-source-text-form.component.ts    |  135 +
 .../location-source-text-form.graphql         |    9 +
 13 files changed, 2509 insertions(+), 1526 deletions(-)
 create mode 100644 frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html
 create mode 100644 frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.scss
 create mode 100644 frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.graphql
 create mode 100644 frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
 create mode 100644 frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.scss
 create mode 100644 frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 768f6642..88af965c 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1,2258 +1,2810 @@
-import { gql } from 'apollo-angular';
-import { Injectable } from '@angular/core';
-import * as Apollo from 'apollo-angular';
+import { gql } from "apollo-angular";
+import { Injectable } from "@angular/core";
+import * as Apollo from "apollo-angular";
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
-export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
-export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };
-export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
+export type Exact<T extends { [key: string]: unknown }> = {
+    [K in keyof T]: T[K];
+};
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
+    [SubKey in K]?: Maybe<T[SubKey]>;
+};
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
+    [SubKey in K]: Maybe<T[SubKey]>;
+};
+export type MakeEmpty<
+    T extends { [key: string]: unknown },
+    K extends keyof T
+> = { [_ in K]?: never };
+export type Incremental<T> =
+    | T
+    | {
+          [P in keyof T]?: P extends " $fragmentName" | "__typename"
+              ? T[P]
+              : never;
+      };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-  ID: { input: string; output: string; }
-  String: { input: string; output: string; }
-  Boolean: { input: boolean; output: boolean; }
-  Int: { input: number; output: number; }
-  Float: { input: number; output: number; }
+    ID: { input: string; output: string };
+    String: { input: string; output: string };
+    Boolean: { input: boolean; output: boolean };
+    Int: { input: number; output: number };
+    Float: { input: number; output: number };
 };
 
 export type AgentDescriptionGenderType = {
-  __typename?: 'AgentDescriptionGenderType';
-  agent: AgentDescriptionType;
-  /** How certain are you of this value? */
-  certainty: PersonAgentDescriptionGenderCertaintyChoices;
-  /** The gender of this agent. The option Mixed is only applicable for groups. */
-  gender: PersonAgentDescriptionGenderGenderChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
+    __typename?: "AgentDescriptionGenderType";
+    agent: AgentDescriptionType;
+    /** How certain are you of this value? */
+    certainty: PersonAgentDescriptionGenderCertaintyChoices;
+    /** The gender of this agent. The option Mixed is only applicable for groups. */
+    gender: PersonAgentDescriptionGenderGenderChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<PersonAgentDescriptionGenderSourceMentionChoices>;
 };
 
 export type AgentDescriptionLocationType = {
-  __typename?: 'AgentDescriptionLocationType';
-  agent: AgentDescriptionType;
-  /** How certain are you of this value? */
-  certainty: PersonAgentDescriptionLocationCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** location by which the agent is identified */
-  location: SpaceDescriptionType;
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
+    __typename?: "AgentDescriptionLocationType";
+    agent: AgentDescriptionType;
+    /** How certain are you of this value? */
+    certainty: PersonAgentDescriptionLocationCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** location by which the agent is identified */
+    location: SpaceDescriptionType;
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<PersonAgentDescriptionLocationSourceMentionChoices>;
 };
 
 export type AgentDescriptionType = {
-  __typename?: 'AgentDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  gender?: Maybe<AgentDescriptionGenderType>;
-  id: Scalars['ID']['output'];
-  /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
-  isGroup: Scalars['Boolean']['output'];
-  location?: Maybe<AgentDescriptionLocationType>;
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
+    __typename?: "AgentDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    describes?: Maybe<Array<Maybe<HistoricalPersonType>>>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    gender?: Maybe<AgentDescriptionGenderType>;
+    id: Scalars["ID"]["output"];
+    /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
+    isGroup: Scalars["Boolean"]["output"];
+    location?: Maybe<AgentDescriptionLocationType>;
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    personReferences?: Maybe<Array<Maybe<PersonReferenceType>>>;
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<PersonAgentDescriptionSourceMentionChoices>;
 };
 
 /** An enumeration. */
 export enum Certainty {
-  Certain = 'CERTAIN',
-  SomewhatCertain = 'SOMEWHAT_CERTAIN',
-  Uncertain = 'UNCERTAIN'
+    Certain = "CERTAIN",
+    SomewhatCertain = "SOMEWHAT_CERTAIN",
+    Uncertain = "UNCERTAIN",
 }
 
 export type CreateAgentInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
 };
 
 export type CreateAgentMutation = {
-  __typename?: 'CreateAgentMutation';
-  agent?: Maybe<AgentDescriptionType>;
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "CreateAgentMutation";
+    agent?: Maybe<AgentDescriptionType>;
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type CreateEpisodeInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
 };
 
 export type CreateEpisodeMutation = {
-  __typename?: 'CreateEpisodeMutation';
-  episode?: Maybe<EpisodeType>;
-  errors: Array<LettercraftErrorType>;
+    __typename?: "CreateEpisodeMutation";
+    episode?: Maybe<EpisodeType>;
+    errors: Array<LettercraftErrorType>;
 };
 
 export type CreateGiftInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
 };
 
 export type CreateGiftMutation = {
-  __typename?: 'CreateGiftMutation';
-  errors: Array<LettercraftErrorType>;
-  gift?: Maybe<GiftDescriptionType>;
+    __typename?: "CreateGiftMutation";
+    errors: Array<LettercraftErrorType>;
+    gift?: Maybe<GiftDescriptionType>;
 };
 
 export type CreateLetterInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
 };
 
 export type CreateLetterMutation = {
-  __typename?: 'CreateLetterMutation';
-  errors: Array<LettercraftErrorType>;
-  letter?: Maybe<LetterDescriptionType>;
+    __typename?: "CreateLetterMutation";
+    errors: Array<LettercraftErrorType>;
+    letter?: Maybe<LetterDescriptionType>;
 };
 
 export type CreateLocationInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
+    name: Scalars["String"]["input"];
+    source: Scalars["ID"]["input"];
 };
 
 export type CreateLocationMutation = {
-  __typename?: 'CreateLocationMutation';
-  errors: Array<LettercraftErrorType>;
-  location?: Maybe<SpaceDescriptionType>;
+    __typename?: "CreateLocationMutation";
+    errors: Array<LettercraftErrorType>;
+    location?: Maybe<SpaceDescriptionType>;
 };
 
 export type CreatePersonReferenceInput = {
-  description: Scalars['ID']['input'];
-  person: Scalars['ID']['input'];
+    description: Scalars["ID"]["input"];
+    person: Scalars["ID"]["input"];
 };
 
 export type CreatePersonReferenceMutation = {
-  __typename?: 'CreatePersonReferenceMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "CreatePersonReferenceMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type DeleteAgentMutation = {
-  __typename?: 'DeleteAgentMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "DeleteAgentMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type DeleteEpisodeMutation = {
-  __typename?: 'DeleteEpisodeMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "DeleteEpisodeMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type DeleteGiftMutation = {
-  __typename?: 'DeleteGiftMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "DeleteGiftMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type DeleteLetterMutation = {
-  __typename?: 'DeleteLetterMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "DeleteLetterMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type DeleteLocationMutation = {
-  __typename?: 'DeleteLocationMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "DeleteLocationMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type DeletePersonReferenceMutation = {
-  __typename?: 'DeletePersonReferenceMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "DeletePersonReferenceMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type EpisodeCategoryType = {
-  __typename?: 'EpisodeCategoryType';
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
+    __typename?: "EpisodeCategoryType";
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
 };
 
 export type EpisodeType = {
-  __typename?: 'EpisodeType';
-  /** agents involved in this episode */
-  agents: Array<AgentDescriptionType>;
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  categories: Array<EpisodeCategoryType>;
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  /** gifts involved in this episode */
-  gifts: Array<GiftDescriptionType>;
-  id: Scalars['ID']['output'];
-  /** letters involved in this episode */
-  letters: Array<LetterDescriptionType>;
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<EventEpisodeSourceMentionChoices>;
-  /** locations involved in this episode */
-  spaces: Array<SpaceDescriptionType>;
-  /** full description of the events in the passage */
-  summary: Scalars['String']['output'];
+    __typename?: "EpisodeType";
+    /** agents involved in this episode */
+    agents: Array<AgentDescriptionType>;
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    categories: Array<EpisodeCategoryType>;
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    /** gifts involved in this episode */
+    gifts: Array<GiftDescriptionType>;
+    id: Scalars["ID"]["output"];
+    /** letters involved in this episode */
+    letters: Array<LetterDescriptionType>;
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<EventEpisodeSourceMentionChoices>;
+    /** locations involved in this episode */
+    spaces: Array<SpaceDescriptionType>;
+    /** full description of the events in the passage */
+    summary: Scalars["String"]["output"];
 };
 
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum Gender {
-  Female = 'FEMALE',
-  Male = 'MALE',
-  Mixed = 'MIXED',
-  Other = 'OTHER',
-  Unknown = 'UNKNOWN'
+    Female = "FEMALE",
+    Male = "MALE",
+    Mixed = "MIXED",
+    Other = "OTHER",
+    Unknown = "UNKNOWN",
 }
 
 export type GiftCategorisationInput = {
-  category: Scalars['ID']['input'];
-  certainty?: InputMaybe<Scalars['String']['input']>;
-  id?: InputMaybe<Scalars['ID']['input']>;
-  note?: InputMaybe<Scalars['String']['input']>;
-  sourceMention?: InputMaybe<SourceMention>;
+    category: Scalars["ID"]["input"];
+    certainty?: InputMaybe<Scalars["String"]["input"]>;
+    id?: InputMaybe<Scalars["ID"]["input"]>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type GiftCategoryType = {
-  __typename?: 'GiftCategoryType';
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
+    __typename?: "GiftCategoryType";
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
 };
 
 export type GiftDescriptionCategoryType = {
-  __typename?: 'GiftDescriptionCategoryType';
-  category: GiftCategoryType;
-  /** How certain are you of this value? */
-  certainty: LetterGiftDescriptionCategoryCertaintyChoices;
-  gift: GiftDescriptionType;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
+    __typename?: "GiftDescriptionCategoryType";
+    category: GiftCategoryType;
+    /** How certain are you of this value? */
+    certainty: LetterGiftDescriptionCategoryCertaintyChoices;
+    gift: GiftDescriptionType;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<LetterGiftDescriptionCategorySourceMentionChoices>;
 };
 
 export type GiftDescriptionType = {
-  __typename?: 'GiftDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  categories: Array<GiftCategoryType>;
-  categorisations: Array<GiftDescriptionCategoryType>;
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<LetterGiftDescriptionSourceMentionChoices>;
+    __typename?: "GiftDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    categories: Array<GiftCategoryType>;
+    categorisations: Array<GiftDescriptionCategoryType>;
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<LetterGiftDescriptionSourceMentionChoices>;
 };
 
 export type HistoricalPersonType = {
-  __typename?: 'HistoricalPersonType';
-  contributors: Array<UserType>;
-  dateOfBirth?: Maybe<PersonDateOfBirthType>;
-  dateOfDeath?: Maybe<PersonDateOfDeathType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
+    __typename?: "HistoricalPersonType";
+    contributors: Array<UserType>;
+    dateOfBirth?: Maybe<PersonDateOfBirthType>;
+    dateOfDeath?: Maybe<PersonDateOfDeathType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
 };
 
 export type LetterCategorisationInput = {
-  category: Scalars['ID']['input'];
-  certainty?: InputMaybe<Scalars['String']['input']>;
-  id?: InputMaybe<Scalars['ID']['input']>;
-  note?: InputMaybe<Scalars['String']['input']>;
-  sourceMention?: InputMaybe<SourceMention>;
+    category: Scalars["ID"]["input"];
+    certainty?: InputMaybe<Scalars["String"]["input"]>;
+    id?: InputMaybe<Scalars["ID"]["input"]>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type LetterCategoryType = {
-  __typename?: 'LetterCategoryType';
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  label: Scalars['String']['output'];
+    __typename?: "LetterCategoryType";
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    label: Scalars["String"]["output"];
 };
 
 export type LetterDescriptionCategoryType = {
-  __typename?: 'LetterDescriptionCategoryType';
-  category: LetterCategoryType;
-  /** How certain are you of this value? */
-  certainty: LetterLetterDescriptionCategoryCertaintyChoices;
-  id: Scalars['ID']['output'];
-  letter: LetterDescriptionType;
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
+    __typename?: "LetterDescriptionCategoryType";
+    category: LetterCategoryType;
+    /** How certain are you of this value? */
+    certainty: LetterLetterDescriptionCategoryCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    letter: LetterDescriptionType;
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<LetterLetterDescriptionCategorySourceMentionChoices>;
 };
 
 export type LetterDescriptionType = {
-  __typename?: 'LetterDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  categories: Array<LetterCategoryType>;
-  categorisations: Array<LetterDescriptionCategoryType>;
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
+    __typename?: "LetterDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    categories: Array<LetterCategoryType>;
+    categorisations: Array<LetterDescriptionCategoryType>;
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<LetterLetterDescriptionSourceMentionChoices>;
 };
 
 /** An enumeration. */
 export enum LetterGiftDescriptionCategoryCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum LetterGiftDescriptionCategorySourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum LetterGiftDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionCategoryCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionCategorySourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** A simple wrapper around Graphene-Django's ErrorType with a constructor. */
 export type LettercraftErrorType = {
-  __typename?: 'LettercraftErrorType';
-  field: Scalars['String']['output'];
-  messages: Array<Scalars['String']['output']>;
+    __typename?: "LettercraftErrorType";
+    field: Scalars["String"]["output"];
+    messages: Array<Scalars["String"]["output"]>;
 };
 
 export type Mutation = {
-  __typename?: 'Mutation';
-  createAgent?: Maybe<CreateAgentMutation>;
-  createEpisode?: Maybe<CreateEpisodeMutation>;
-  createGift?: Maybe<CreateGiftMutation>;
-  createLetter?: Maybe<CreateLetterMutation>;
-  createLocation?: Maybe<CreateLocationMutation>;
-  createPersonReference?: Maybe<CreatePersonReferenceMutation>;
-  deleteAgent?: Maybe<DeleteAgentMutation>;
-  deleteEpisode?: Maybe<DeleteEpisodeMutation>;
-  deleteGift?: Maybe<DeleteGiftMutation>;
-  deleteLetter?: Maybe<DeleteLetterMutation>;
-  deleteLocation?: Maybe<DeleteLocationMutation>;
-  deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
-  updateAgent?: Maybe<UpdateAgentMutation>;
-  updateEpisode?: Maybe<UpdateEpisodeMutation>;
-  updateGift?: Maybe<UpdateGiftMutation>;
-  updateLetter?: Maybe<UpdateLetterMutation>;
-  updateLocation?: Maybe<UpdateLocationMutation>;
-  updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
-  updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
+    __typename?: "Mutation";
+    createAgent?: Maybe<CreateAgentMutation>;
+    createEpisode?: Maybe<CreateEpisodeMutation>;
+    createGift?: Maybe<CreateGiftMutation>;
+    createLetter?: Maybe<CreateLetterMutation>;
+    createLocation?: Maybe<CreateLocationMutation>;
+    createPersonReference?: Maybe<CreatePersonReferenceMutation>;
+    deleteAgent?: Maybe<DeleteAgentMutation>;
+    deleteEpisode?: Maybe<DeleteEpisodeMutation>;
+    deleteGift?: Maybe<DeleteGiftMutation>;
+    deleteLetter?: Maybe<DeleteLetterMutation>;
+    deleteLocation?: Maybe<DeleteLocationMutation>;
+    deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
+    updateAgent?: Maybe<UpdateAgentMutation>;
+    updateEpisode?: Maybe<UpdateEpisodeMutation>;
+    updateGift?: Maybe<UpdateGiftMutation>;
+    updateLetter?: Maybe<UpdateLetterMutation>;
+    updateLocation?: Maybe<UpdateLocationMutation>;
+    updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
+    updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
 };
 
-
 export type MutationCreateAgentArgs = {
-  agentData: CreateAgentInput;
+    agentData: CreateAgentInput;
 };
 
-
 export type MutationCreateEpisodeArgs = {
-  episodeData: CreateEpisodeInput;
+    episodeData: CreateEpisodeInput;
 };
 
-
 export type MutationCreateGiftArgs = {
-  giftData: CreateGiftInput;
+    giftData: CreateGiftInput;
 };
 
-
 export type MutationCreateLetterArgs = {
-  letterData: CreateLetterInput;
+    letterData: CreateLetterInput;
 };
 
-
 export type MutationCreateLocationArgs = {
-  locationData: CreateLocationInput;
+    locationData: CreateLocationInput;
 };
 
-
 export type MutationCreatePersonReferenceArgs = {
-  referenceData: CreatePersonReferenceInput;
+    referenceData: CreatePersonReferenceInput;
 };
 
-
 export type MutationDeleteAgentArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type MutationDeleteEpisodeArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type MutationDeleteGiftArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type MutationDeleteLetterArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type MutationDeleteLocationArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type MutationDeletePersonReferenceArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type MutationUpdateAgentArgs = {
-  agentData: UpdateAgentInput;
+    agentData: UpdateAgentInput;
 };
 
-
 export type MutationUpdateEpisodeArgs = {
-  episodeData: UpdateEpisodeInput;
+    episodeData: UpdateEpisodeInput;
 };
 
-
 export type MutationUpdateGiftArgs = {
-  giftData: UpdateGiftInput;
+    giftData: UpdateGiftInput;
 };
 
-
 export type MutationUpdateLetterArgs = {
-  letterData: UpdateLetterInput;
+    letterData: UpdateLetterInput;
 };
 
-
 export type MutationUpdateLocationArgs = {
-  locationData: UpdateLocationInput;
+    locationData: UpdateLocationInput;
 };
 
-
 export type MutationUpdateOrCreateSourceArgs = {
-  sourceData: UpdateCreateSourceInput;
+    sourceData: UpdateCreateSourceInput;
 };
 
-
 export type MutationUpdatePersonReferenceArgs = {
-  referenceData: UpdatePersonReferenceInput;
+    referenceData: UpdatePersonReferenceInput;
 };
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderGenderChoices {
-  /** Female */
-  Female = 'FEMALE',
-  /** Male */
-  Male = 'MALE',
-  /** Mixed */
-  Mixed = 'MIXED',
-  /** Other */
-  Other = 'OTHER',
-  /** Unknown */
-  Unknown = 'UNKNOWN'
+    /** Female */
+    Female = "FEMALE",
+    /** Male */
+    Male = "MALE",
+    /** Mixed */
+    Mixed = "MIXED",
+    /** Other */
+    Other = "OTHER",
+    /** Unknown */
+    Unknown = "UNKNOWN",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionGenderSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionLocationCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionLocationSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 export type PersonDateOfBirthType = {
-  __typename?: 'PersonDateOfBirthType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonDateOfBirthCertaintyChoices;
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** date on which this person was born */
-  person: HistoricalPersonType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "PersonDateOfBirthType";
+    /** How certain are you of this value? */
+    certainty: PersonPersonDateOfBirthCertaintyChoices;
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** date on which this person was born */
+    person: HistoricalPersonType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
 export type PersonDateOfDeathType = {
-  __typename?: 'PersonDateOfDeathType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonDateOfDeathCertaintyChoices;
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** date on which this person died */
-  person: HistoricalPersonType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "PersonDateOfDeathType";
+    /** How certain are you of this value? */
+    certainty: PersonPersonDateOfDeathCertaintyChoices;
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** date on which this person died */
+    person: HistoricalPersonType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
 /** An enumeration. */
 export enum PersonPersonDateOfBirthCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonPersonDateOfDeathCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum PersonPersonReferenceCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 export type PersonReferenceType = {
-  __typename?: 'PersonReferenceType';
-  /** How certain are you of this value? */
-  certainty: PersonPersonReferenceCertaintyChoices;
-  description: AgentDescriptionType;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  person: HistoricalPersonType;
+    __typename?: "PersonReferenceType";
+    /** How certain are you of this value? */
+    certainty: PersonPersonReferenceCertaintyChoices;
+    description: AgentDescriptionType;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    person: HistoricalPersonType;
 };
 
 export type Query = {
-  __typename?: 'Query';
-  agentDescription?: Maybe<AgentDescriptionType>;
-  agentDescriptions: Array<AgentDescriptionType>;
-  episode?: Maybe<EpisodeType>;
-  episodeCategories: Array<EpisodeCategoryType>;
-  episodes: Array<EpisodeType>;
-  giftDescription?: Maybe<GiftDescriptionType>;
-  giftDescriptions: Array<GiftDescriptionType>;
-  letterCategories: Array<LetterCategoryType>;
-  letterDescription?: Maybe<LetterDescriptionType>;
-  letterDescriptions: Array<LetterDescriptionType>;
-  source: SourceType;
-  sources: Array<SourceType>;
-  spaceDescription?: Maybe<SpaceDescriptionType>;
-  spaceDescriptions: Array<SpaceDescriptionType>;
-  userDescription?: Maybe<UserType>;
-  userDescriptions: Array<UserType>;
+    __typename?: "Query";
+    agentDescription?: Maybe<AgentDescriptionType>;
+    agentDescriptions: Array<AgentDescriptionType>;
+    episode?: Maybe<EpisodeType>;
+    episodeCategories: Array<EpisodeCategoryType>;
+    episodes: Array<EpisodeType>;
+    giftDescription?: Maybe<GiftDescriptionType>;
+    giftDescriptions: Array<GiftDescriptionType>;
+    letterCategories: Array<LetterCategoryType>;
+    letterDescription?: Maybe<LetterDescriptionType>;
+    letterDescriptions: Array<LetterDescriptionType>;
+    source: SourceType;
+    sources: Array<SourceType>;
+    spaceDescription?: Maybe<SpaceDescriptionType>;
+    spaceDescriptions: Array<SpaceDescriptionType>;
+    userDescription?: Maybe<UserType>;
+    userDescriptions: Array<UserType>;
 };
 
-
 export type QueryAgentDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryAgentDescriptionsArgs = {
-  episodeId?: InputMaybe<Scalars['ID']['input']>;
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryEpisodeArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryEpisodesArgs = {
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryGiftDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryGiftDescriptionsArgs = {
-  episodeId?: InputMaybe<Scalars['ID']['input']>;
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryLetterDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QueryLetterDescriptionsArgs = {
-  episodeId?: InputMaybe<Scalars['ID']['input']>;
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QuerySourceArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QuerySpaceDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
-
 export type QuerySpaceDescriptionsArgs = {
-  sourceId?: InputMaybe<Scalars['ID']['input']>;
+    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
 };
 
-
 export type QueryUserDescriptionArgs = {
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 };
 
 export type RegionFieldType = {
-  __typename?: 'RegionFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceRegionFieldCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  region: RegionType;
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
-  space: SpaceDescriptionType;
+    __typename?: "RegionFieldType";
+    /** How certain are you of this value? */
+    certainty: SpaceRegionFieldCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    region: RegionType;
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<SpaceRegionFieldSourceMentionChoices>;
+    space: SpaceDescriptionType;
 };
 
 export type RegionType = {
-  __typename?: 'RegionType';
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** Kind of region */
-  type: SpaceRegionTypeChoices;
+    __typename?: "RegionType";
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** Kind of region */
+    type: SpaceRegionTypeChoices;
 };
 
 export type SettlementFieldType = {
-  __typename?: 'SettlementFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceSettlementFieldCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  settlement: SettlementType;
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
-  space: SpaceDescriptionType;
+    __typename?: "SettlementFieldType";
+    /** How certain are you of this value? */
+    certainty: SpaceSettlementFieldCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    settlement: SettlementType;
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<SpaceSettlementFieldSourceMentionChoices>;
+    space: SpaceDescriptionType;
 };
 
 export type SettlementType = {
-  __typename?: 'SettlementType';
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** Surrounding regions of this settlement */
-  regions: Array<RegionType>;
+    __typename?: "SettlementType";
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** Surrounding regions of this settlement */
+    regions: Array<RegionType>;
 };
 
 export type SourceContentsDateType = {
-  __typename?: 'SourceContentsDateType';
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** The source whose events took place at this date */
-  source: SourceType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "SourceContentsDateType";
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** The source whose events took place at this date */
+    source: SourceType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
 /** An enumeration. */
 export enum SourceMention {
-  Direct = 'DIRECT',
-  Implied = 'IMPLIED'
+    Direct = "DIRECT",
+    Implied = "IMPLIED",
 }
 
 export type SourceType = {
-  __typename?: 'SourceType';
-  contentsDate?: Maybe<SourceContentsDateType>;
-  /** The name of the author of the edition */
-  editionAuthor: Scalars['String']['output'];
-  /** The title of the edition used for this source */
-  editionTitle: Scalars['String']['output'];
-  episodes: Array<EpisodeType>;
-  id: Scalars['ID']['output'];
-  /** The name of the original author of the work, if known */
-  medievalAuthor: Scalars['String']['output'];
-  /** The original title of the work, if known */
-  medievalTitle: Scalars['String']['output'];
-  /** a unique name to identify this source in the database */
-  name: Scalars['String']['output'];
-  numOfEpisodes: Scalars['Int']['output'];
-  writtenDate?: Maybe<SourceWrittenDateType>;
+    __typename?: "SourceType";
+    contentsDate?: Maybe<SourceContentsDateType>;
+    /** The name of the author of the edition */
+    editionAuthor: Scalars["String"]["output"];
+    /** The title of the edition used for this source */
+    editionTitle: Scalars["String"]["output"];
+    episodes: Array<EpisodeType>;
+    id: Scalars["ID"]["output"];
+    /** The name of the original author of the work, if known */
+    medievalAuthor: Scalars["String"]["output"];
+    /** The original title of the work, if known */
+    medievalTitle: Scalars["String"]["output"];
+    /** a unique name to identify this source in the database */
+    name: Scalars["String"]["output"];
+    numOfEpisodes: Scalars["Int"]["output"];
+    writtenDate?: Maybe<SourceWrittenDateType>;
 };
 
 export type SourceWrittenDateType = {
-  __typename?: 'SourceWrittenDateType';
-  displayDate: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** The source that was written at this date */
-  source: SourceType;
-  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-  yearExact?: Maybe<Scalars['Int']['output']>;
-  /** The earliest possible year for this value */
-  yearLower: Scalars['Int']['output'];
-  /** The latest possible year for this value */
-  yearUpper: Scalars['Int']['output'];
+    __typename?: "SourceWrittenDateType";
+    displayDate: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** The source that was written at this date */
+    source: SourceType;
+    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+    yearExact?: Maybe<Scalars["Int"]["output"]>;
+    /** The earliest possible year for this value */
+    yearLower: Scalars["Int"]["output"];
+    /** The latest possible year for this value */
+    yearUpper: Scalars["Int"]["output"];
 };
 
 export type SpaceDescriptionType = {
-  __typename?: 'SpaceDescriptionType';
-  /** The book in the source */
-  book: Scalars['String']['output'];
-  /** The chapter or chapters in the source */
-  chapter: Scalars['String']['output'];
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
-  id: Scalars['ID']['output'];
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The page number or page range in the source */
-  page: Scalars['String']['output'];
-  regionFields: Array<RegionFieldType>;
-  regions: Array<RegionType>;
-  settlementFields: Array<SettlementFieldType>;
-  settlements: Array<SettlementType>;
-  /** Source text containing this description */
-  source: SourceType;
-  /** How is this entity presented in the text? */
-  sourceMention?: Maybe<SpaceSpaceDescriptionSourceMentionChoices>;
-  structureFields: Array<StructureFieldType>;
-  structures: Array<StructureType>;
+    __typename?: "SpaceDescriptionType";
+    /** The book in the source */
+    book: Scalars["String"]["output"];
+    /** The chapter or chapters in the source */
+    chapter: Scalars["String"]["output"];
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    /** Relevant (Latin) terminology used to describe this entity in the source text */
+    designators: Array<Scalars["String"]["output"]>;
+    id: Scalars["ID"]["output"];
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The page number or page range in the source */
+    page: Scalars["String"]["output"];
+    regionFields: Array<RegionFieldType>;
+    regions: Array<RegionType>;
+    settlementFields: Array<SettlementFieldType>;
+    settlements: Array<SettlementType>;
+    /** Source text containing this description */
+    source: SourceType;
+    /** How is this entity presented in the text? */
+    sourceMention?: Maybe<SpaceSpaceDescriptionSourceMentionChoices>;
+    structureFields: Array<StructureFieldType>;
+    structures: Array<StructureType>;
 };
 
 /** An enumeration. */
 export enum SpaceRegionFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum SpaceRegionFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceRegionTypeChoices {
-  /** ecclesiastical */
-  Ecclesiastical = 'ECCLESIASTICAL',
-  /** geographical */
-  Geographical = 'GEOGRAPHICAL',
-  /** political */
-  Political = 'POLITICAL'
+    /** ecclesiastical */
+    Ecclesiastical = "ECCLESIASTICAL",
+    /** geographical */
+    Geographical = "GEOGRAPHICAL",
+    /** political */
+    Political = "POLITICAL",
 }
 
 /** An enumeration. */
 export enum SpaceSettlementFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum SpaceSettlementFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceSpaceDescriptionSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceStructureFieldCertaintyChoices {
-  /** uncertain */
-  A_0 = 'A_0',
-  /** somewhat certain */
-  A_1 = 'A_1',
-  /** certain */
-  A_2 = 'A_2'
+    /** uncertain */
+    A_0 = "A_0",
+    /** somewhat certain */
+    A_1 = "A_1",
+    /** certain */
+    A_2 = "A_2",
 }
 
 /** An enumeration. */
 export enum SpaceStructureFieldSourceMentionChoices {
-  /** directly mentioned */
-  Direct = 'DIRECT',
-  /** implied */
-  Implied = 'IMPLIED'
+    /** directly mentioned */
+    Direct = "DIRECT",
+    /** implied */
+    Implied = "IMPLIED",
 }
 
 /** An enumeration. */
 export enum SpaceStructureLevelChoices {
-  /** road, square, crossroad */
-  A_1 = 'A_1',
-  /** fortification */
-  A_2 = 'A_2',
-  /** building, vessel */
-  A_3 = 'A_3',
-  /** room */
-  A_4 = 'A_4',
-  /** spot, object */
-  A_5 = 'A_5'
+    /** road, square, crossroad */
+    A_1 = "A_1",
+    /** fortification */
+    A_2 = "A_2",
+    /** building, vessel */
+    A_3 = "A_3",
+    /** room */
+    A_4 = "A_4",
+    /** spot, object */
+    A_5 = "A_5",
 }
 
 export type StructureFieldType = {
-  __typename?: 'StructureFieldType';
-  /** How certain are you of this value? */
-  certainty: SpaceStructureFieldCertaintyChoices;
-  id: Scalars['ID']['output'];
-  /** Additional notes */
-  note: Scalars['String']['output'];
-  /** How is this information presented in the text? */
-  sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
-  space: SpaceDescriptionType;
-  structure: StructureType;
+    __typename?: "StructureFieldType";
+    /** How certain are you of this value? */
+    certainty: SpaceStructureFieldCertaintyChoices;
+    id: Scalars["ID"]["output"];
+    /** Additional notes */
+    note: Scalars["String"]["output"];
+    /** How is this information presented in the text? */
+    sourceMention?: Maybe<SpaceStructureFieldSourceMentionChoices>;
+    space: SpaceDescriptionType;
+    structure: StructureType;
 };
 
 export type StructureType = {
-  __typename?: 'StructureType';
-  contributors: Array<UserType>;
-  /** Longer description to help identify this object */
-  description: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
-  identifiable: Scalars['Boolean']['output'];
-  level: SpaceStructureLevelChoices;
-  /** A name to help identify this object */
-  name: Scalars['String']['output'];
-  /** The settlement containing this structure */
-  settlement?: Maybe<SettlementType>;
+    __typename?: "StructureType";
+    contributors: Array<UserType>;
+    /** Longer description to help identify this object */
+    description: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    /** Whether this entity is identifiable (i.e. can be cross-referenced between descriptions), or a generic description */
+    identifiable: Scalars["Boolean"]["output"];
+    level: SpaceStructureLevelChoices;
+    /** A name to help identify this object */
+    name: Scalars["String"]["output"];
+    /** The settlement containing this structure */
+    settlement?: Maybe<SettlementType>;
 };
 
 export type UpdateAgentGenderInput = {
-  gender?: InputMaybe<Gender>;
-  note?: InputMaybe<Scalars['String']['input']>;
-  sourceMention?: InputMaybe<SourceMention>;
+    gender?: InputMaybe<Gender>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentInput = {
-  description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
-  gender?: InputMaybe<UpdateAgentGenderInput>;
-  id: Scalars['ID']['input'];
-  isGroup?: InputMaybe<Scalars['Boolean']['input']>;
-  location?: InputMaybe<UpdateAgentLocationInput>;
-  name?: InputMaybe<Scalars['String']['input']>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>;
+    gender?: InputMaybe<UpdateAgentGenderInput>;
+    id: Scalars["ID"]["input"];
+    isGroup?: InputMaybe<Scalars["Boolean"]["input"]>;
+    location?: InputMaybe<UpdateAgentLocationInput>;
+    name?: InputMaybe<Scalars["String"]["input"]>;
 };
 
 export type UpdateAgentLocationInput = {
-  location?: InputMaybe<Scalars['ID']['input']>;
-  note?: InputMaybe<Scalars['String']['input']>;
-  sourceMention?: InputMaybe<SourceMention>;
+    location?: InputMaybe<Scalars["ID"]["input"]>;
+    note?: InputMaybe<Scalars["String"]["input"]>;
+    sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentMutation = {
-  __typename?: 'UpdateAgentMutation';
-  agent?: Maybe<AgentDescriptionType>;
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "UpdateAgentMutation";
+    agent?: Maybe<AgentDescriptionType>;
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateCreateSourceInput = {
-  editionAuthor?: InputMaybe<Scalars['String']['input']>;
-  editionTitle?: InputMaybe<Scalars['String']['input']>;
-  id?: InputMaybe<Scalars['ID']['input']>;
-  medievalAuthor?: InputMaybe<Scalars['String']['input']>;
-  medievalTitle?: InputMaybe<Scalars['String']['input']>;
-  name: Scalars['String']['input'];
+    editionAuthor?: InputMaybe<Scalars["String"]["input"]>;
+    editionTitle?: InputMaybe<Scalars["String"]["input"]>;
+    id?: InputMaybe<Scalars["ID"]["input"]>;
+    medievalAuthor?: InputMaybe<Scalars["String"]["input"]>;
+    medievalTitle?: InputMaybe<Scalars["String"]["input"]>;
+    name: Scalars["String"]["input"];
 };
 
 export type UpdateEpisodeInput = {
-  book?: InputMaybe<Scalars['String']['input']>;
-  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
-  chapter?: InputMaybe<Scalars['String']['input']>;
-  description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
-  id: Scalars['ID']['input'];
-  name?: InputMaybe<Scalars['String']['input']>;
-  page?: InputMaybe<Scalars['String']['input']>;
-  summary?: InputMaybe<Scalars['String']['input']>;
+    book?: InputMaybe<Scalars["String"]["input"]>;
+    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+    chapter?: InputMaybe<Scalars["String"]["input"]>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
+    id: Scalars["ID"]["input"];
+    name?: InputMaybe<Scalars["String"]["input"]>;
+    page?: InputMaybe<Scalars["String"]["input"]>;
+    summary?: InputMaybe<Scalars["String"]["input"]>;
 };
 
 export type UpdateEpisodeMutation = {
-  __typename?: 'UpdateEpisodeMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "UpdateEpisodeMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateGiftInput = {
-  book?: InputMaybe<Scalars['String']['input']>;
-  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
-  categorisations?: InputMaybe<Array<GiftCategorisationInput>>;
-  chapter?: InputMaybe<Scalars['String']['input']>;
-  description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
-  id: Scalars['ID']['input'];
-  name?: InputMaybe<Scalars['String']['input']>;
-  page?: InputMaybe<Scalars['String']['input']>;
+    book?: InputMaybe<Scalars["String"]["input"]>;
+    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+    categorisations?: InputMaybe<Array<GiftCategorisationInput>>;
+    chapter?: InputMaybe<Scalars["String"]["input"]>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
+    id: Scalars["ID"]["input"];
+    name?: InputMaybe<Scalars["String"]["input"]>;
+    page?: InputMaybe<Scalars["String"]["input"]>;
 };
 
 export type UpdateGiftMutation = {
-  __typename?: 'UpdateGiftMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "UpdateGiftMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateLetterInput = {
-  book?: InputMaybe<Scalars['String']['input']>;
-  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
-  categorisations?: InputMaybe<Array<LetterCategorisationInput>>;
-  chapter?: InputMaybe<Scalars['String']['input']>;
-  description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
-  id: Scalars['ID']['input'];
-  name?: InputMaybe<Scalars['String']['input']>;
-  page?: InputMaybe<Scalars['String']['input']>;
+    book?: InputMaybe<Scalars["String"]["input"]>;
+    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+    categorisations?: InputMaybe<Array<LetterCategorisationInput>>;
+    chapter?: InputMaybe<Scalars["String"]["input"]>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
+    id: Scalars["ID"]["input"];
+    name?: InputMaybe<Scalars["String"]["input"]>;
+    page?: InputMaybe<Scalars["String"]["input"]>;
 };
 
 export type UpdateLetterMutation = {
-  __typename?: 'UpdateLetterMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "UpdateLetterMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateLocationInput = {
-  book?: InputMaybe<Scalars['String']['input']>;
-  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
-  chapter?: InputMaybe<Scalars['String']['input']>;
-  description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
-  id: Scalars['ID']['input'];
-  name?: InputMaybe<Scalars['String']['input']>;
-  page?: InputMaybe<Scalars['String']['input']>;
+    book?: InputMaybe<Scalars["String"]["input"]>;
+    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
+    chapter?: InputMaybe<Scalars["String"]["input"]>;
+    description?: InputMaybe<Scalars["String"]["input"]>;
+    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
+    id: Scalars["ID"]["input"];
+    name?: InputMaybe<Scalars["String"]["input"]>;
+    page?: InputMaybe<Scalars["String"]["input"]>;
 };
 
 export type UpdateLocationMutation = {
-  __typename?: 'UpdateLocationMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "UpdateLocationMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UpdateOrCreateSourceMutation = {
-  __typename?: 'UpdateOrCreateSourceMutation';
-  errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
-  source?: Maybe<SourceType>;
+    __typename?: "UpdateOrCreateSourceMutation";
+    errors?: Maybe<Array<Maybe<Scalars["String"]["output"]>>>;
+    source?: Maybe<SourceType>;
 };
 
 export type UpdatePersonReferenceInput = {
-  certainty?: InputMaybe<Certainty>;
-  id: Scalars['ID']['input'];
-  note?: InputMaybe<Scalars['String']['input']>;
+    certainty?: InputMaybe<Certainty>;
+    id: Scalars["ID"]["input"];
+    note?: InputMaybe<Scalars["String"]["input"]>;
 };
 
 export type UpdatePersonReferenceMutation = {
-  __typename?: 'UpdatePersonReferenceMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
+    __typename?: "UpdatePersonReferenceMutation";
+    errors: Array<LettercraftErrorType>;
+    ok: Scalars["Boolean"]["output"];
 };
 
 export type UserType = {
-  __typename?: 'UserType';
-  firstName: Scalars['String']['output'];
-  fullName: Scalars['String']['output'];
-  id: Scalars['ID']['output'];
-  lastName: Scalars['String']['output'];
+    __typename?: "UserType";
+    firstName: Scalars["String"]["output"];
+    fullName: Scalars["String"]["output"];
+    id: Scalars["ID"]["output"];
+    lastName: Scalars["String"]["output"];
 };
 
 export type DataEntryAgentDescriptionQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: PersonAgentDescriptionGenderGenderChoices, sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
+export type DataEntryAgentDescriptionQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        isGroup: boolean;
+        designators: Array<string>;
+        gender?: {
+            __typename?: "AgentDescriptionGenderType";
+            id: string;
+            gender: PersonAgentDescriptionGenderGenderChoices;
+            sourceMention?: PersonAgentDescriptionGenderSourceMentionChoices | null;
+            note: string;
+        } | null;
+        location?: {
+            __typename?: "AgentDescriptionLocationType";
+            id: string;
+            sourceMention?: PersonAgentDescriptionLocationSourceMentionChoices | null;
+            note: string;
+            location: { __typename?: "SpaceDescriptionType"; id: string };
+        } | null;
+        source: { __typename?: "SourceType"; id: string };
+    } | null;
+};
 
 export type LocationsInSourceListQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type LocationsInSourceListQuery = { __typename?: 'Query', spaceDescriptions: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> };
+export type LocationsInSourceListQuery = {
+    __typename?: "Query";
+    spaceDescriptions: Array<{
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+    }>;
+};
 
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
+export type DataEntryAgentIdentificationQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        isGroup: boolean;
+    } | null;
+};
 
 export type DataEntryAgentQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryAgentQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        isGroup: boolean;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryUpdateAgentMutationVariables = Exact<{
-  input: UpdateAgentInput;
+    input: UpdateAgentInput;
 }>;
 
-
-export type DataEntryUpdateAgentMutation = { __typename?: 'Mutation', updateAgent?: { __typename?: 'UpdateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateAgentMutation = {
+    __typename?: "Mutation";
+    updateAgent?: {
+        __typename?: "UpdateAgentMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
 export type DataEntryDeleteAgentMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
+export type DataEntryDeleteAgentMutation = {
+    __typename?: "Mutation";
+    deleteAgent?: {
+        __typename?: "DeleteAgentMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            messages: Array<string>;
+            field: string;
+        }>;
+    } | null;
+};
 
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
+export type DataEntryEpisodeContentsQuery = {
+    __typename?: "Query";
+    episode?: {
+        __typename?: "EpisodeType";
+        id: string;
+        summary: string;
+        categories: Array<{ __typename?: "EpisodeCategoryType"; id: string }>;
+    } | null;
+};
 
-export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
-
-export type DataEntryEpisodeCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
-
+export type DataEntryEpisodeCategoriesQueryVariables = Exact<{
+    [key: string]: never;
+}>;
 
-export type DataEntryEpisodeCategoriesQuery = { __typename?: 'Query', episodeCategories: Array<{ __typename?: 'EpisodeCategoryType', id: string, name: string, description: string }> };
+export type DataEntryEpisodeCategoriesQuery = {
+    __typename?: "Query";
+    episodeCategories: Array<{
+        __typename?: "EpisodeCategoryType";
+        id: string;
+        name: string;
+        description: string;
+    }>;
+};
 
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string } | null };
+export type DataEntryEpisodeIdentificationQuery = {
+    __typename?: "Query";
+    episode?: {
+        __typename?: "EpisodeType";
+        id: string;
+        name: string;
+        description: string;
+    } | null;
+};
 
 export type DataEntryEpisodeSourceTextMentionQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryEpisodeSourceTextMentionQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryEpisodeSourceTextMentionQuery = {
+    __typename?: "Query";
+    episode?: {
+        __typename?: "EpisodeType";
+        id: string;
+        designators: Array<string>;
+        book: string;
+        chapter: string;
+        page: string;
+    } | null;
+};
 
 export type DataEntryEpisodeFormQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryEpisodeFormQuery = {
+    __typename?: "Query";
+    episode?: {
+        __typename?: "EpisodeType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryUpdateEpisodeMutationVariables = Exact<{
-  episodeData: UpdateEpisodeInput;
+    episodeData: UpdateEpisodeInput;
 }>;
 
-
-export type DataEntryUpdateEpisodeMutation = { __typename?: 'Mutation', updateEpisode?: { __typename?: 'UpdateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateEpisodeMutation = {
+    __typename?: "Mutation";
+    updateEpisode?: {
+        __typename?: "UpdateEpisodeMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
 export type DataEntryCreateEpisodeMutationVariables = Exact<{
-  episodeData: CreateEpisodeInput;
+    episodeData: CreateEpisodeInput;
 }>;
 
-
-export type DataEntryCreateEpisodeMutation = { __typename?: 'Mutation', createEpisode?: { __typename?: 'CreateEpisodeMutation', episode?: { __typename?: 'EpisodeType', id: string } | null, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryCreateEpisodeMutation = {
+    __typename?: "Mutation";
+    createEpisode?: {
+        __typename?: "CreateEpisodeMutation";
+        episode?: { __typename?: "EpisodeType"; id: string } | null;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
 export type DataEntryGiftCategoriesQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
+export type DataEntryGiftCategoriesQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        categorisations: Array<{
+            __typename?: "GiftDescriptionCategoryType";
+            id: string;
+            sourceMention?: LetterGiftDescriptionCategorySourceMentionChoices | null;
+            note: string;
+            certainty: LetterGiftDescriptionCategoryCertaintyChoices;
+            category: {
+                __typename?: "GiftCategoryType";
+                id: string;
+                name: string;
+            };
+        }>;
+    } | null;
+};
+
+export type DataEntryAllGiftCategoriesQueryVariables = Exact<{
+    [key: string]: never;
+}>;
 
-export type DataEntryGiftCategoriesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, categorisations: Array<{ __typename?: 'GiftDescriptionCategoryType', id: string, sourceMention?: LetterGiftDescriptionCategorySourceMentionChoices | null, note: string, certainty: LetterGiftDescriptionCategoryCertaintyChoices, category: { __typename?: 'GiftCategoryType', id: string, name: string } }> } | null };
-
-export type DataEntryAllGiftCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataEntryAllGiftCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
+export type DataEntryAllGiftCategoriesQuery = {
+    __typename?: "Query";
+    letterCategories: Array<{
+        __typename?: "LetterCategoryType";
+        id: string;
+        label: string;
+        description: string;
+    }>;
+};
 
 export type DataEntryGiftIdentificationQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryGiftIdentificationQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string } | null };
+export type DataEntryGiftIdentificationQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+    } | null;
+};
 
 export type DataEntryGiftSourceTextQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryGiftSourceTextQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryGiftSourceTextQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        designators: Array<string>;
+        book: string;
+        chapter: string;
+        page: string;
+    } | null;
+};
 
 export type DataEntryGiftFormQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryGiftFormQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryGiftFormQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryUpdateGiftMutationVariables = Exact<{
-  giftData: UpdateGiftInput;
+    giftData: UpdateGiftInput;
 }>;
 
-
-export type DataEntryUpdateGiftMutation = { __typename?: 'Mutation', updateGift?: { __typename?: 'UpdateGiftMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateGiftMutation = {
+    __typename?: "Mutation";
+    updateGift?: {
+        __typename?: "UpdateGiftMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
 export type DataEntryLetterCategoriesQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
+export type DataEntryLetterCategoriesQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        categorisations: Array<{
+            __typename?: "LetterDescriptionCategoryType";
+            id: string;
+            sourceMention?: LetterLetterDescriptionCategorySourceMentionChoices | null;
+            note: string;
+            certainty: LetterLetterDescriptionCategoryCertaintyChoices;
+            category: {
+                __typename?: "LetterCategoryType";
+                id: string;
+                label: string;
+            };
+        }>;
+    } | null;
+};
+
+export type DataEntryAllLetterCategoriesQueryVariables = Exact<{
+    [key: string]: never;
+}>;
 
-export type DataEntryLetterCategoriesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, categorisations: Array<{ __typename?: 'LetterDescriptionCategoryType', id: string, sourceMention?: LetterLetterDescriptionCategorySourceMentionChoices | null, note: string, certainty: LetterLetterDescriptionCategoryCertaintyChoices, category: { __typename?: 'LetterCategoryType', id: string, label: string } }> } | null };
-
-export type DataEntryAllLetterCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataEntryAllLetterCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
+export type DataEntryAllLetterCategoriesQuery = {
+    __typename?: "Query";
+    letterCategories: Array<{
+        __typename?: "LetterCategoryType";
+        id: string;
+        label: string;
+        description: string;
+    }>;
+};
 
 export type DataEntryLetterIdentificationQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryLetterIdentificationQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string } | null };
+export type DataEntryLetterIdentificationQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+    } | null;
+};
 
 export type DataEntryLetterSourceTextQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryLetterSourceTextQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryLetterSourceTextQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        designators: Array<string>;
+        book: string;
+        chapter: string;
+        page: string;
+    } | null;
+};
 
 export type DataEntryLetterFormQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryLetterFormQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryLetterFormQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryUpdateLetterMutationVariables = Exact<{
-  letterData: UpdateLetterInput;
+    letterData: UpdateLetterInput;
 }>;
 
+export type DataEntryUpdateLetterMutation = {
+    __typename?: "Mutation";
+    updateLetter?: {
+        __typename?: "UpdateLetterMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
+
+export type DataEntryLocationIdentificationQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
 
-export type DataEntryUpdateLetterMutation = { __typename?: 'Mutation', updateLetter?: { __typename?: 'UpdateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryLocationIdentificationQuery = {
+    __typename?: "Query";
+    spaceDescription?: {
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+    } | null;
+};
 
-export type DataEntryLocationQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+export type DataEntryLocationSourceTextQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
 }>;
 
+export type DataEntryLocationSourceTextQuery = {
+    __typename?: "Query";
+    spaceDescription?: {
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        designators: Array<string>;
+        book: string;
+        chapter: string;
+        page: string;
+    } | null;
+};
 
-export type DataEntryLocationQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryLocationQueryVariables = Exact<{
+    id: Scalars["ID"]["input"];
+}>;
+
+export type DataEntryLocationQuery = {
+    __typename?: "Query";
+    spaceDescription?: {
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryUpdateLocationMutationVariables = Exact<{
-  locationData: UpdateLocationInput;
+    locationData: UpdateLocationInput;
 }>;
 
-
-export type DataEntryUpdateLocationMutation = { __typename?: 'Mutation', updateLocation?: { __typename?: 'UpdateLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateLocationMutation = {
+    __typename?: "Mutation";
+    updateLocation?: {
+        __typename?: "UpdateLocationMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
 export type DataEntryDeleteLocationMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryDeleteLocationMutation = { __typename?: 'Mutation', deleteLocation?: { __typename?: 'DeleteLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryDeleteLocationMutation = {
+    __typename?: "Mutation";
+    deleteLocation?: {
+        __typename?: "DeleteLocationMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntrySpaceDescriptionQuery = {
+    __typename?: "Query";
+    spaceDescription?: {
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+        description: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntryDeleteEpisodeMutation = { __typename?: 'Mutation', deleteEpisode?: { __typename?: 'DeleteEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryDeleteEpisodeMutation = {
+    __typename?: "Mutation";
+    deleteEpisode?: {
+        __typename?: "DeleteEpisodeMutation";
+        ok: boolean;
+        errors: Array<{
+            __typename?: "LettercraftErrorType";
+            field: string;
+            messages: Array<string>;
+        }>;
+    } | null;
+};
 
 export type DataEntrySourceDetailQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
+    id: Scalars["ID"]["input"];
 }>;
 
-
-export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes?: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean } | null> | null }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
-
-export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
-
-export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type SourceTitleQueryQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string } };
-
-export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type AgentTitleQueryQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
-
-export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type LetterTitleQueryQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
-
-export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GiftTitleQueryQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
-
-export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type SpaceTitleQueryQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntrySourceDetailQuery = {
+    __typename?: "Query";
+    source: {
+        __typename?: "SourceType";
+        id: string;
+        name: string;
+        episodes: Array<{
+            __typename?: "EpisodeType";
+            id: string;
+            name: string;
+            description: string;
+            summary: string;
+            book: string;
+            chapter: string;
+            page: string;
+            contributors: Array<{
+                __typename?: "UserType";
+                id: string;
+                fullName: string;
+            }>;
+            agents: Array<{
+                __typename?: "AgentDescriptionType";
+                id: string;
+                name: string;
+                isGroup: boolean;
+                describes?: Array<{
+                    __typename?: "HistoricalPersonType";
+                    id: string;
+                    identifiable: boolean;
+                } | null> | null;
+            }>;
+            gifts: Array<{
+                __typename?: "GiftDescriptionType";
+                id: string;
+                name: string;
+            }>;
+            letters: Array<{
+                __typename?: "LetterDescriptionType";
+                id: string;
+                name: string;
+            }>;
+            spaces: Array<{
+                __typename?: "SpaceDescriptionType";
+                id: string;
+                name: string;
+            }>;
+        }>;
+    };
+};
+
+export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never }>;
+
+export type DataEntrySourceListQuery = {
+    __typename?: "Query";
+    sources: Array<{
+        __typename?: "SourceType";
+        id: string;
+        name: string;
+        editionAuthor: string;
+        editionTitle: string;
+        medievalAuthor: string;
+        medievalTitle: string;
+        numOfEpisodes: number;
+    }>;
+};
+
+export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SourceTitleQueryQuery = {
+    __typename?: "Query";
+    source: { __typename?: "SourceType"; id: string; name: string };
+};
+
+export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+
+export type AgentTitleQueryQuery = {
+    __typename?: "Query";
+    agentDescription?: {
+        __typename?: "AgentDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
+
+export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+
+export type LetterTitleQueryQuery = {
+    __typename?: "Query";
+    letterDescription?: {
+        __typename?: "LetterDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
+
+export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+
+export type GiftTitleQueryQuery = {
+    __typename?: "Query";
+    giftDescription?: {
+        __typename?: "GiftDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
+
+export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SpaceTitleQueryQuery = {
+    __typename?: "Query";
+    spaceDescription?: {
+        __typename?: "SpaceDescriptionType";
+        id: string;
+        name: string;
+        source: { __typename?: "SourceType"; id: string; name: string };
+    } | null;
+};
 
 export const DataEntryAgentDescriptionDocument = gql`
     query DataEntryAgentDescription($id: ID!) {
-  agentDescription(id: $id) {
-    id
-    isGroup
-    designators
-    gender {
-      id
-      gender
-      sourceMention
-      note
-    }
-    location {
-      id
-      sourceMention
-      note
-      location {
-        id
-      }
-    }
-    source {
-      id
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
+        agentDescription(id: $id) {
+            id
+            isGroup
+            designators
+            gender {
+                id
+                gender
+                sourceMention
+                note
+            }
+            location {
+                id
+                sourceMention
+                note
+                location {
+                    id
+                }
+            }
+            source {
+                id
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAgentDescriptionGQL extends Apollo.Query<
+    DataEntryAgentDescriptionQuery,
+    DataEntryAgentDescriptionQueryVariables
+> {
     override document = DataEntryAgentDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const LocationsInSourceListDocument = gql`
     query LocationsInSourceList($id: ID!) {
-  spaceDescriptions(sourceId: $id) {
-    id
-    name
-  }
-}
-    `;
+        spaceDescriptions(sourceId: $id) {
+            id
+            name
+        }
+    }
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class LocationsInSourceListGQL extends Apollo.Query<
+    LocationsInSourceListQuery,
+    LocationsInSourceListQueryVariables
+> {
     override document = LocationsInSourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryAgentIdentificationDocument = gql`
     query DataEntryAgentIdentification($id: ID!) {
-  agentDescription(id: $id) {
-    id
-    name
-    description
-    isGroup
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
+        agentDescription(id: $id) {
+            id
+            name
+            description
+            isGroup
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAgentIdentificationGQL extends Apollo.Query<
+    DataEntryAgentIdentificationQuery,
+    DataEntryAgentIdentificationQueryVariables
+> {
     override document = DataEntryAgentIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryAgentDocument = gql`
     query DataEntryAgent($id: ID!) {
-  agentDescription(id: $id) {
-    id
-    name
-    description
-    isGroup
-    source {
-      id
-      name
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
+        agentDescription(id: $id) {
+            id
+            name
+            description
+            isGroup
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAgentGQL extends Apollo.Query<
+    DataEntryAgentQuery,
+    DataEntryAgentQueryVariables
+> {
     override document = DataEntryAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryUpdateAgentDocument = gql`
     mutation DataEntryUpdateAgent($input: UpdateAgentInput!) {
-  updateAgent(agentData: $input) {
-    ok
-    errors {
-      field
-      messages
+        updateAgent(agentData: $input) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryUpdateAgentGQL extends Apollo.Mutation<DataEntryUpdateAgentMutation, DataEntryUpdateAgentMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateAgentGQL extends Apollo.Mutation<
+    DataEntryUpdateAgentMutation,
+    DataEntryUpdateAgentMutationVariables
+> {
     override document = DataEntryUpdateAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryDeleteAgentDocument = gql`
     mutation DataEntryDeleteAgent($id: ID!) {
-  deleteAgent(id: $id) {
-    ok
-    errors {
-      messages
-      field
+        deleteAgent(id: $id) {
+            ok
+            errors {
+                messages
+                field
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryDeleteAgentGQL extends Apollo.Mutation<
+    DataEntryDeleteAgentMutation,
+    DataEntryDeleteAgentMutationVariables
+> {
     override document = DataEntryDeleteAgentDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeContentsDocument = gql`
     query DataEntryEpisodeContents($id: ID!) {
-  episode(id: $id) {
-    id
-    summary
-    categories {
-      id
+        episode(id: $id) {
+            id
+            summary
+            categories {
+                id
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeContentsGQL extends Apollo.Query<
+    DataEntryEpisodeContentsQuery,
+    DataEntryEpisodeContentsQueryVariables
+> {
     override document = DataEntryEpisodeContentsDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeCategoriesDocument = gql`
     query DataEntryEpisodeCategories {
-  episodeCategories {
-    id
-    name
-    description
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
+        episodeCategories {
+            id
+            name
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<
+    DataEntryEpisodeCategoriesQuery,
+    DataEntryEpisodeCategoriesQueryVariables
+> {
     override document = DataEntryEpisodeCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeIdentificationDocument = gql`
     query DataEntryEpisodeIdentification($id: ID!) {
-  episode(id: $id) {
-    id
-    name
-    description
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
+        episode(id: $id) {
+            id
+            name
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<
+    DataEntryEpisodeIdentificationQuery,
+    DataEntryEpisodeIdentificationQueryVariables
+> {
     override document = DataEntryEpisodeIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeSourceTextMentionDocument = gql`
     query DataEntryEpisodeSourceTextMention($id: ID!) {
-  episode(id: $id) {
-    id
-    designators
-    book
-    chapter
-    page
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
+        episode(id: $id) {
+            id
+            designators
+            book
+            chapter
+            page
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<
+    DataEntryEpisodeSourceTextMentionQuery,
+    DataEntryEpisodeSourceTextMentionQueryVariables
+> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryEpisodeFormDocument = gql`
     query DataEntryEpisodeForm($id: ID!) {
-  episode(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
+        episode(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryEpisodeFormGQL extends Apollo.Query<
+    DataEntryEpisodeFormQuery,
+    DataEntryEpisodeFormQueryVariables
+> {
     override document = DataEntryEpisodeFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryUpdateEpisodeDocument = gql`
     mutation DataEntryUpdateEpisode($episodeData: UpdateEpisodeInput!) {
-  updateEpisode(episodeData: $episodeData) {
-    ok
-    errors {
-      field
-      messages
+        updateEpisode(episodeData: $episodeData) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<
+    DataEntryUpdateEpisodeMutation,
+    DataEntryUpdateEpisodeMutationVariables
+> {
     override document = DataEntryUpdateEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryCreateEpisodeDocument = gql`
     mutation DataEntryCreateEpisode($episodeData: CreateEpisodeInput!) {
-  createEpisode(episodeData: $episodeData) {
-    episode {
-      id
-    }
-    errors {
-      field
-      messages
+        createEpisode(episodeData: $episodeData) {
+            episode {
+                id
+            }
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<
+    DataEntryCreateEpisodeMutation,
+    DataEntryCreateEpisodeMutationVariables
+> {
     override document = DataEntryCreateEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryGiftCategoriesDocument = gql`
     query DataEntryGiftCategories($id: ID!) {
-  giftDescription(id: $id) {
-    id
-    categorisations {
-      id
-      sourceMention
-      note
-      certainty
-      category {
-        id
-        name
-      }
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryGiftCategoriesGQL extends Apollo.Query<DataEntryGiftCategoriesQuery, DataEntryGiftCategoriesQueryVariables> {
+        giftDescription(id: $id) {
+            id
+            categorisations {
+                id
+                sourceMention
+                note
+                certainty
+                category {
+                    id
+                    name
+                }
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftCategoriesGQL extends Apollo.Query<
+    DataEntryGiftCategoriesQuery,
+    DataEntryGiftCategoriesQueryVariables
+> {
     override document = DataEntryGiftCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryAllGiftCategoriesDocument = gql`
     query DataEntryAllGiftCategories {
-  letterCategories {
-    id
-    label
-    description
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
+        letterCategories {
+            id
+            label
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<
+    DataEntryAllGiftCategoriesQuery,
+    DataEntryAllGiftCategoriesQueryVariables
+> {
     override document = DataEntryAllGiftCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryGiftIdentificationDocument = gql`
     query DataEntryGiftIdentification($id: ID!) {
-  giftDescription(id: $id) {
-    id
-    name
-    description
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryGiftIdentificationGQL extends Apollo.Query<DataEntryGiftIdentificationQuery, DataEntryGiftIdentificationQueryVariables> {
+        giftDescription(id: $id) {
+            id
+            name
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftIdentificationGQL extends Apollo.Query<
+    DataEntryGiftIdentificationQuery,
+    DataEntryGiftIdentificationQueryVariables
+> {
     override document = DataEntryGiftIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryGiftSourceTextDocument = gql`
     query DataEntryGiftSourceText($id: ID!) {
-  giftDescription(id: $id) {
-    id
-    designators
-    book
-    chapter
-    page
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryGiftSourceTextGQL extends Apollo.Query<DataEntryGiftSourceTextQuery, DataEntryGiftSourceTextQueryVariables> {
+        giftDescription(id: $id) {
+            id
+            designators
+            book
+            chapter
+            page
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftSourceTextGQL extends Apollo.Query<
+    DataEntryGiftSourceTextQuery,
+    DataEntryGiftSourceTextQueryVariables
+> {
     override document = DataEntryGiftSourceTextDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryGiftFormDocument = gql`
     query DataEntryGiftForm($id: ID!) {
-  giftDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryGiftFormGQL extends Apollo.Query<DataEntryGiftFormQuery, DataEntryGiftFormQueryVariables> {
+        giftDescription(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryGiftFormGQL extends Apollo.Query<
+    DataEntryGiftFormQuery,
+    DataEntryGiftFormQueryVariables
+> {
     override document = DataEntryGiftFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryUpdateGiftDocument = gql`
     mutation DataEntryUpdateGift($giftData: UpdateGiftInput!) {
-  updateGift(giftData: $giftData) {
-    ok
-    errors {
-      field
-      messages
+        updateGift(giftData: $giftData) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateGiftGQL extends Apollo.Mutation<
+    DataEntryUpdateGiftMutation,
+    DataEntryUpdateGiftMutationVariables
+> {
     override document = DataEntryUpdateGiftDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryLetterCategoriesDocument = gql`
     query DataEntryLetterCategories($id: ID!) {
-  letterDescription(id: $id) {
-    id
-    categorisations {
-      id
-      sourceMention
-      note
-      certainty
-      category {
-        id
-        label
-      }
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryLetterCategoriesGQL extends Apollo.Query<DataEntryLetterCategoriesQuery, DataEntryLetterCategoriesQueryVariables> {
+        letterDescription(id: $id) {
+            id
+            categorisations {
+                id
+                sourceMention
+                note
+                certainty
+                category {
+                    id
+                    label
+                }
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterCategoriesGQL extends Apollo.Query<
+    DataEntryLetterCategoriesQuery,
+    DataEntryLetterCategoriesQueryVariables
+> {
     override document = DataEntryLetterCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryAllLetterCategoriesDocument = gql`
     query DataEntryAllLetterCategories {
-  letterCategories {
-    id
-    label
-    description
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
+        letterCategories {
+            id
+            label
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<
+    DataEntryAllLetterCategoriesQuery,
+    DataEntryAllLetterCategoriesQueryVariables
+> {
     override document = DataEntryAllLetterCategoriesDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryLetterIdentificationDocument = gql`
     query DataEntryLetterIdentification($id: ID!) {
-  letterDescription(id: $id) {
-    id
-    name
-    description
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryLetterIdentificationGQL extends Apollo.Query<DataEntryLetterIdentificationQuery, DataEntryLetterIdentificationQueryVariables> {
+        letterDescription(id: $id) {
+            id
+            name
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterIdentificationGQL extends Apollo.Query<
+    DataEntryLetterIdentificationQuery,
+    DataEntryLetterIdentificationQueryVariables
+> {
     override document = DataEntryLetterIdentificationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryLetterSourceTextDocument = gql`
     query DataEntryLetterSourceText($id: ID!) {
-  letterDescription(id: $id) {
-    id
-    designators
-    book
-    chapter
-    page
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryLetterSourceTextGQL extends Apollo.Query<DataEntryLetterSourceTextQuery, DataEntryLetterSourceTextQueryVariables> {
+        letterDescription(id: $id) {
+            id
+            designators
+            book
+            chapter
+            page
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterSourceTextGQL extends Apollo.Query<
+    DataEntryLetterSourceTextQuery,
+    DataEntryLetterSourceTextQueryVariables
+> {
     override document = DataEntryLetterSourceTextDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryLetterFormDocument = gql`
     query DataEntryLetterForm($id: ID!) {
-  letterDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryLetterFormGQL extends Apollo.Query<DataEntryLetterFormQuery, DataEntryLetterFormQueryVariables> {
+        letterDescription(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLetterFormGQL extends Apollo.Query<
+    DataEntryLetterFormQuery,
+    DataEntryLetterFormQueryVariables
+> {
     override document = DataEntryLetterFormDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryUpdateLetterDocument = gql`
     mutation DataEntryUpdateLetter($letterData: UpdateLetterInput!) {
-  updateLetter(letterData: $letterData) {
-    ok
-    errors {
-      field
-      messages
+        updateLetter(letterData: $letterData) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateLetterGQL extends Apollo.Mutation<
+    DataEntryUpdateLetterMutation,
+    DataEntryUpdateLetterMutationVariables
+> {
     override document = DataEntryUpdateLetterDocument;
-    
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntryLocationIdentificationDocument = gql`
+    query DataEntryLocationIdentification($id: ID!) {
+        spaceDescription(id: $id) {
+            id
+            name
+            description
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLocationIdentificationGQL extends Apollo.Query<
+    DataEntryLocationIdentificationQuery,
+    DataEntryLocationIdentificationQueryVariables
+> {
+    override document = DataEntryLocationIdentificationDocument;
+
+    constructor(apollo: Apollo.Apollo) {
+        super(apollo);
+    }
+}
+export const DataEntryLocationSourceTextDocument = gql`
+    query DataEntryLocationSourceText($id: ID!) {
+        spaceDescription(id: $id) {
+            id
+            designators
+            book
+            chapter
+            page
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLocationSourceTextGQL extends Apollo.Query<
+    DataEntryLocationSourceTextQuery,
+    DataEntryLocationSourceTextQueryVariables
+> {
+    override document = DataEntryLocationSourceTextDocument;
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryLocationDocument = gql`
     query DataEntryLocation($id: ID!) {
-  spaceDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryLocationGQL extends Apollo.Query<DataEntryLocationQuery, DataEntryLocationQueryVariables> {
+        spaceDescription(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryLocationGQL extends Apollo.Query<
+    DataEntryLocationQuery,
+    DataEntryLocationQueryVariables
+> {
     override document = DataEntryLocationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryUpdateLocationDocument = gql`
     mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
-  updateLocation(locationData: $locationData) {
-    ok
-    errors {
-      field
-      messages
+        updateLocation(locationData: $locationData) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryUpdateLocationGQL extends Apollo.Mutation<DataEntryUpdateLocationMutation, DataEntryUpdateLocationMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryUpdateLocationGQL extends Apollo.Mutation<
+    DataEntryUpdateLocationMutation,
+    DataEntryUpdateLocationMutationVariables
+> {
     override document = DataEntryUpdateLocationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryDeleteLocationDocument = gql`
     mutation DataEntryDeleteLocation($id: ID!) {
-  deleteLocation(id: $id) {
-    ok
-    errors {
-      field
-      messages
+        deleteLocation(id: $id) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryDeleteLocationGQL extends Apollo.Mutation<DataEntryDeleteLocationMutation, DataEntryDeleteLocationMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryDeleteLocationGQL extends Apollo.Mutation<
+    DataEntryDeleteLocationMutation,
+    DataEntryDeleteLocationMutationVariables
+> {
     override document = DataEntryDeleteLocationDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntrySpaceDescriptionDocument = gql`
     query DataEntrySpaceDescription($id: ID!) {
-  spaceDescription(id: $id) {
-    id
-    name
-    description
-    source {
-      id
-      name
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
+        spaceDescription(id: $id) {
+            id
+            name
+            description
+            source {
+                id
+                name
+            }
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntrySpaceDescriptionGQL extends Apollo.Query<
+    DataEntrySpaceDescriptionQuery,
+    DataEntrySpaceDescriptionQueryVariables
+> {
     override document = DataEntrySpaceDescriptionDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntryDeleteEpisodeDocument = gql`
     mutation DataEntryDeleteEpisode($id: ID!) {
-  deleteEpisode(id: $id) {
-    ok
-    errors {
-      field
-      messages
+        deleteEpisode(id: $id) {
+            ok
+            errors {
+                field
+                messages
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<
+    DataEntryDeleteEpisodeMutation,
+    DataEntryDeleteEpisodeMutationVariables
+> {
     override document = DataEntryDeleteEpisodeDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntrySourceDetailDocument = gql`
     query DataEntrySourceDetail($id: ID!) {
-  source(id: $id) {
-    id
-    name
-    episodes {
-      id
-      name
-      description
-      summary
-      book
-      chapter
-      contributors {
-        id
-        fullName
-      }
-      page
-      agents {
-        id
-        name
-        isGroup
-        describes {
-          id
-          identifiable
+        source(id: $id) {
+            id
+            name
+            episodes {
+                id
+                name
+                description
+                summary
+                book
+                chapter
+                contributors {
+                    id
+                    fullName
+                }
+                page
+                agents {
+                    id
+                    name
+                    isGroup
+                    describes {
+                        id
+                        identifiable
+                    }
+                }
+                gifts {
+                    id
+                    name
+                }
+                letters {
+                    id
+                    name
+                }
+                spaces {
+                    id
+                    name
+                }
+            }
         }
-      }
-      gifts {
-        id
-        name
-      }
-      letters {
-        id
-        name
-      }
-      spaces {
-        id
-        name
-      }
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntrySourceDetailGQL extends Apollo.Query<
+    DataEntrySourceDetailQuery,
+    DataEntrySourceDetailQueryVariables
+> {
     override document = DataEntrySourceDetailDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const DataEntrySourceListDocument = gql`
     query DataEntrySourceList {
-  sources {
-    id
-    name
-    editionAuthor
-    editionTitle
-    medievalAuthor
-    medievalTitle
-    numOfEpisodes
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
+        sources {
+            id
+            name
+            editionAuthor
+            editionTitle
+            medievalAuthor
+            medievalTitle
+            numOfEpisodes
+        }
+    }
+`;
+
+@Injectable({
+    providedIn: "root",
+})
+export class DataEntrySourceListGQL extends Apollo.Query<
+    DataEntrySourceListQuery,
+    DataEntrySourceListQueryVariables
+> {
     override document = DataEntrySourceListDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const SourceTitleQueryDocument = gql`
     query SourceTitleQuery {
-  source(id: "") {
-    id
-    name
-  }
-}
-    `;
+        source(id: "") {
+            id
+            name
+        }
+    }
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class SourceTitleQueryGQL extends Apollo.Query<
+    SourceTitleQueryQuery,
+    SourceTitleQueryQueryVariables
+> {
     override document = SourceTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const AgentTitleQueryDocument = gql`
     query AgentTitleQuery {
-  agentDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        agentDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class AgentTitleQueryGQL extends Apollo.Query<
+    AgentTitleQueryQuery,
+    AgentTitleQueryQueryVariables
+> {
     override document = AgentTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const LetterTitleQueryDocument = gql`
     query LetterTitleQuery {
-  letterDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        letterDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class LetterTitleQueryGQL extends Apollo.Query<
+    LetterTitleQueryQuery,
+    LetterTitleQueryQueryVariables
+> {
     override document = LetterTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const GiftTitleQueryDocument = gql`
     query GiftTitleQuery {
-  giftDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        giftDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class GiftTitleQueryGQL extends Apollo.Query<
+    GiftTitleQueryQuery,
+    GiftTitleQueryQueryVariables
+> {
     override document = GiftTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
+}
 export const SpaceTitleQueryDocument = gql`
     query SpaceTitleQuery {
-  spaceDescription(id: "") {
-    id
-    name
-    source {
-      id
-      name
+        spaceDescription(id: "") {
+            id
+            name
+            source {
+                id
+                name
+            }
+        }
     }
-  }
-}
-    `;
+`;
 
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
+@Injectable({
+    providedIn: "root",
+})
+export class SpaceTitleQueryGQL extends Apollo.Query<
+    SpaceTitleQueryQuery,
+    SpaceTitleQueryQueryVariables
+> {
     override document = SpaceTitleQueryDocument;
-    
+
     constructor(apollo: Apollo.Apollo) {
-      super(apollo);
+        super(apollo);
     }
-  }
\ No newline at end of file
+}
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index 14e0b546..b14000ff 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -9,23 +9,29 @@ <h1 class="mb-4">
 
     <!-- <lc-entity-description-lead [entity]="location" /> -->
 
+    <lc-form-status [status$]="status$" />
+
     <!-- <lc-delete-entity-button
             (clickDelete)="onClickDelete(location)"
             [deletingInProgress]="deletingInProgress"
             entityName="location"
         /> -->
-
-    <p class="alert alert-warning">This form is not implemented yet!</p>
 </ng-container>
 
-<!-- <h2 class="subform-header">Identification</h2>
-<lc-gift-identification-form />
+<h2 class="subform-header">Identification</h2>
+<lc-location-identification-form />
 
 <h2 class="subform-header">Source text</h2>
-<lc-gift-source-text-form />
+<lc-location-source-text-form />
+
+<h2 class="subform-header">Regions</h2>
+<p><i>Coming soon!</i></p>
+
+<h2 class="subform-header">Settlements</h2>
+<p><i>Coming soon!</i></p>
 
-<h2 class="subform-header">Categories</h2>
-<lc-gift-categories-form /> -->
+<h2 class="subform-header">Structures</h2>
+<p><i>Coming soon!</i></p>
 
 <ng-template #loading>
     <div class="spinner-border" role="status">
diff --git a/frontend/src/app/data-entry/location-form/location-form.module.ts b/frontend/src/app/data-entry/location-form/location-form.module.ts
index 111bb084..da396562 100644
--- a/frontend/src/app/data-entry/location-form/location-form.module.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.module.ts
@@ -2,9 +2,15 @@ import { NgModule } from "@angular/core";
 import { LocationFormComponent } from "./location-form.component";
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 import { SharedModule } from "@shared/shared.module";
+import { LocationIdentificationFormComponent } from "./location-identification-form/location-identification-form.component";
+import { LocationSourceTextFormComponent } from "./location-source-text-form/location-source-text-form.component";
 
 @NgModule({
-    declarations: [LocationFormComponent],
+    declarations: [
+        LocationFormComponent,
+        LocationIdentificationFormComponent,
+        LocationSourceTextFormComponent,
+    ],
     imports: [SharedModule, DataEntrySharedModule],
     exports: [LocationFormComponent],
 })
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html
new file mode 100644
index 00000000..c2ec5ba9
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html
@@ -0,0 +1,31 @@
+<form>
+    <div class="form-group">
+        <label class="form-label" for="episode-name">Name</label>
+        <p class="form-text">
+            This is a name to identify the location in the overview of the
+            source. For example: "Kingdom of Burgundy", "Abbey of St Gall".
+        </p>
+        <input
+            id="episode-name"
+            type="text"
+            class="form-control"
+            [formControl]="form.controls.name"
+            [class.is-invalid]="
+                form.controls.name.invalid && form.controls.name.touched
+            "
+        />
+        <p class="invalid-feedback">This field is required.</p>
+    </div>
+
+    <div class="form-group mt-4">
+        <div class="form-label">Description</div>
+        <p class="form-text">
+            Add a description to help identify this location in the database.
+        </p>
+        <textarea
+            class="form-control"
+            [formControl]="form.controls.description"
+        >
+        </textarea>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.scss b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts
new file mode 100644
index 00000000..a0722013
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { LocationIdentificationFormComponent } from "./location-identification-form.component";
+
+describe("LocationIdentificationFormComponent", () => {
+    let component: LocationIdentificationFormComponent;
+    let fixture: ComponentFixture<LocationIdentificationFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LocationIdentificationFormComponent],
+        });
+        fixture = TestBed.createComponent(LocationIdentificationFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
new file mode 100644
index 00000000..40726161
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
@@ -0,0 +1,158 @@
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormControl, FormGroup, Validators } from "@angular/forms";
+import { ApolloCache } from "@apollo/client/core";
+import { ToastService } from "@services/toast.service";
+import { MutationResult } from "apollo-angular";
+import {
+    DataEntryLocationIdentificationGQL,
+    DataEntryUpdateLocationGQL,
+    DataEntryUpdateLocationMutation,
+} from "generated/graphql";
+import {
+    map,
+    switchMap,
+    shareReplay,
+    filter,
+    debounceTime,
+    withLatestFrom,
+    Observable,
+    BehaviorSubject,
+    share,
+} from "rxjs";
+import { FormService } from "../../shared/form.service";
+import { FormStatus } from "../../shared/types";
+
+interface LocationIdentification {
+    name: string;
+    description: string;
+}
+
+type LocationIdentificationForm = {
+    [key in keyof LocationIdentification]: FormControl<string>;
+};
+
+@Component({
+    selector: "lc-location-identification-form",
+    templateUrl: "./location-identification-form.component.html",
+    styleUrls: ["./location-identification-form.component.scss"],
+})
+export class LocationIdentificationFormComponent implements OnInit, OnDestroy {
+    public id$ = this.formService.id$;
+
+    public location$ = this.id$.pipe(
+        switchMap((id) => this.locationQuery.watch({ id }).valueChanges),
+        map((result) => result.data.spaceDescription),
+        shareReplay(1)
+    );
+
+    public form = new FormGroup<LocationIdentificationForm>({
+        name: new FormControl("", {
+            validators: [Validators.required],
+            nonNullable: true,
+        }),
+        description: new FormControl("", {
+            nonNullable: true,
+        }),
+    });
+
+    private formName = "identification";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private formService: FormService,
+        private toastService: ToastService,
+        private locationQuery: DataEntryLocationIdentificationGQL,
+        private updateLocation: DataEntryUpdateLocationGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
+        this.location$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((location) => {
+                if (!location) {
+                    return;
+                }
+                this.form.patchValue(location, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
+            });
+
+        this.form.statusChanges
+            .pipe(
+                filter((status) => status === "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.location$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([episode, id]) => this.performMutation(episode, id)),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private performMutation(
+        location: LocationIdentification,
+        id: string
+    ): Observable<MutationResult<DataEntryUpdateLocationMutation>> {
+        return this.updateLocation.mutate(
+            {
+                locationData: {
+                    ...location,
+                    id,
+                },
+            },
+            {
+                update: (cache) => this.updateCache(cache, id),
+            }
+        );
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateLocationMutation>
+    ): void {
+        const errors = result.data?.updateLocation?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        }
+        this.status$.next("saved");
+    }
+
+    private updateCache(cache: ApolloCache<unknown>, id: string): void {
+        cache.evict({
+            id: `SpaceDescriptionType:${id}`,
+        });
+        cache.gc();
+    }
+}
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.graphql b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.graphql
new file mode 100644
index 00000000..c4bb82f1
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.graphql
@@ -0,0 +1,7 @@
+query DataEntryLocationIdentification($id: ID!) {
+    spaceDescription(id: $id) {
+        id
+        name
+        description
+    }
+}
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
new file mode 100644
index 00000000..819d7cc9
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
@@ -0,0 +1,37 @@
+<form>
+    <lc-designators-control [formControl]="form.controls.designators" />
+
+    <h3>Location</h3>
+    <p class="form-text">
+        Describe the location of this gift in the source text.
+    </p>
+    <div class="row">
+        <div class="form-group col">
+            <label class="form-label" for="book">Book</label>
+            <input
+                id="book"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.book"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="chapter">Chapter</label>
+            <input
+                id="chapter"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.chapter"
+            />
+        </div>
+        <div class="form-group col">
+            <label class="form-label" for="page">Page</label>
+            <input
+                id="page"
+                type="text"
+                class="form-control"
+                [formControl]="form.controls.page"
+            />
+        </div>
+    </div>
+</form>
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.scss b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts
new file mode 100644
index 00000000..8514ab37
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { LocationSourceTextFormComponent } from "./location-source-text-form.component";
+
+describe("LocationSourceTextFormComponent", () => {
+    let component: LocationSourceTextFormComponent;
+    let fixture: ComponentFixture<LocationSourceTextFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LocationSourceTextFormComponent],
+        });
+        fixture = TestBed.createComponent(LocationSourceTextFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
new file mode 100644
index 00000000..4d424110
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
@@ -0,0 +1,135 @@
+import { Component, DestroyRef, OnDestroy, OnInit } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+import { FormGroup, FormControl } from "@angular/forms";
+import { ToastService } from "@services/toast.service";
+import { MutationResult } from "apollo-angular";
+import {
+    DataEntryLocationSourceTextGQL,
+    DataEntryUpdateLocationGQL,
+    DataEntryUpdateLocationMutation,
+} from "generated/graphql";
+import {
+    switchMap,
+    map,
+    shareReplay,
+    BehaviorSubject,
+    filter,
+    debounceTime,
+    share,
+    withLatestFrom,
+} from "rxjs";
+import { FormService } from "../../shared/form.service";
+import { FormStatus } from "../../shared/types";
+
+@Component({
+    selector: "lc-location-source-text-form",
+    templateUrl: "./location-source-text-form.component.html",
+    styleUrls: ["./location-source-text-form.component.scss"],
+})
+export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
+    private id$ = this.formService.id$;
+
+    public location$ = this.id$.pipe(
+        switchMap((id) => this.locationQuery.watch({ id }).valueChanges),
+        map((result) => result.data.spaceDescription),
+        shareReplay(1)
+    );
+
+    public form = new FormGroup({
+        designators: new FormControl<string[]>([], {
+            nonNullable: true,
+        }),
+        book: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+        chapter: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+        page: new FormControl<string>("", {
+            nonNullable: true,
+        }),
+    });
+
+    private formName = "sourceText";
+    private status$ = new BehaviorSubject<FormStatus>("idle");
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private formService: FormService,
+        private toastService: ToastService,
+        private locationQuery: DataEntryLocationSourceTextGQL,
+        private updateLocation: DataEntryUpdateLocationGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.formService.attachForm(this.formName, this.status$);
+
+        this.location$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((location) => {
+                if (!location) {
+                    return;
+                }
+                this.form.patchValue(location, {
+                    emitEvent: false,
+                    onlySelf: true,
+                });
+            });
+
+        this.form.statusChanges
+            .pipe(
+                filter((status) => status == "INVALID"),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe(() => this.status$.next("invalid"));
+
+        const validFormSubmission$ = this.location$.pipe(
+            switchMap(() =>
+                this.form.valueChanges.pipe(
+                    map(() => this.form.getRawValue()),
+                    filter(() => this.form.valid)
+                )
+            ),
+            debounceTime(300),
+            share()
+        );
+
+        validFormSubmission$
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe(() => this.status$.next("loading"));
+
+        validFormSubmission$
+            .pipe(
+                withLatestFrom(this.id$),
+                switchMap(([location, id]) =>
+                    this.updateLocation.mutate({
+                        locationData: {
+                            ...location,
+                            id,
+                        },
+                    })
+                ),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => this.onMutationResult(result));
+    }
+
+    ngOnDestroy(): void {
+        this.formService.detachForm(this.formName);
+    }
+
+    private onMutationResult(
+        result: MutationResult<DataEntryUpdateLocationMutation>
+    ): void {
+        const errors = result.data?.updateLocation?.errors;
+        if (errors && errors.length > 0) {
+            this.status$.next("error");
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Update failed",
+            });
+        }
+        this.status$.next("saved");
+    }
+}
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql
new file mode 100644
index 00000000..615371a8
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql
@@ -0,0 +1,9 @@
+query DataEntryLocationSourceText($id: ID!) {
+    spaceDescription(id: $id) {
+        id
+        designators
+        book
+        chapter
+        page
+    }
+}

From b75af201ff85fd432cdd539ab171603664519a18 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Thu, 26 Sep 2024 15:45:40 +0200
Subject: [PATCH 523/565] Fix tests

---
 .../data-entry/location-form/location-form.component.spec.ts  | 3 ++-
 .../location-identification-form.component.spec.ts            | 4 ++++
 .../location-source-text-form.component.spec.ts               | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/location-form/location-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
index fa5bc31a..6da7d2cb 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LocationFormComponent } from './location-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { LocationFormModule } from './location-form.module';
 
 describe('LocationFormComponent', () => {
     let component: LocationFormComponent;
@@ -10,7 +11,7 @@ describe('LocationFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LocationFormComponent],
-            imports: [SharedTestingModule],
+            imports: [LocationFormModule, SharedTestingModule],
         });
         fixture = TestBed.createComponent(LocationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts
index a0722013..7690ceca 100644
--- a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.spec.ts
@@ -1,6 +1,8 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LocationIdentificationFormComponent } from "./location-identification-form.component";
+import { FormService } from "../../shared/form.service";
+import { SharedTestingModule } from "@shared/shared-testing.module";
 
 describe("LocationIdentificationFormComponent", () => {
     let component: LocationIdentificationFormComponent;
@@ -9,6 +11,8 @@ describe("LocationIdentificationFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LocationIdentificationFormComponent],
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(LocationIdentificationFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts
index 8514ab37..3b79e9e9 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.spec.ts
@@ -1,6 +1,8 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { LocationSourceTextFormComponent } from "./location-source-text-form.component";
+import { SharedTestingModule } from "@shared/shared-testing.module";
+import { FormService } from "../../shared/form.service";
 
 describe("LocationSourceTextFormComponent", () => {
     let component: LocationSourceTextFormComponent;
@@ -9,6 +11,8 @@ describe("LocationSourceTextFormComponent", () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             declarations: [LocationSourceTextFormComponent],
+            imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(LocationSourceTextFormComponent);
         component = fixture.componentInstance;

From b110de9168f25ce77cb5787b72571ea56812efcd Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 15:45:45 +0200
Subject: [PATCH 524/565] move designators to EpisodeEntity model

---
 backend/core/admin.py                         |  8 +++-
 backend/core/models.py                        | 11 ------
 backend/core/types/EntityDescriptionType.py   |  1 -
 .../types/input/EntityDescriptionInputType.py |  1 -
 ...nators_episodegift_designators_and_more.py | 39 +++++++++++++++++++
 backend/event/models.py                       | 22 +++++++++++
 .../UpdateEpisodeEntityLinkMutation.py        |  1 +
 .../event/mutations/UpdateEpisodeMutation.py  |  1 +
 backend/event/types/EpisodeType.py            |  1 +
 ...ve_giftdescription_designators_and_more.py | 21 ++++++++++
 ...022_remove_agentdescription_designators.py | 17 ++++++++
 .../person/mutations/UpdateAgentMutation.py   |  1 -
 ...019_remove_spacedescription_designators.py | 17 ++++++++
 frontend/generated/graphql.ts                 | 24 ++----------
 frontend/generated/schema.graphql             | 27 +------------
 .../agent-description-form.component.html     |  6 ---
 .../agent-description-form.component.ts       |  3 --
 .../agent-description.graphql                 |  1 -
 .../gift-source-text-form.component.html      |  2 -
 .../gift-source-text-form.component.ts        |  3 --
 .../gift-source-text-form.graphql             |  1 -
 .../letter-source-text-form.component.html    |  2 -
 .../letter-source-text-form.component.ts      |  3 --
 .../letter-source-text-form.graphql           |  1 -
 24 files changed, 130 insertions(+), 84 deletions(-)
 create mode 100644 backend/event/migrations/0026_episodeagent_designators_episodegift_designators_and_more.py
 create mode 100644 backend/letter/migrations/0020_remove_giftdescription_designators_and_more.py
 create mode 100644 backend/person/migrations/0022_remove_agentdescription_designators.py
 create mode 100644 backend/space/migrations/0019_remove_spacedescription_designators.py

diff --git a/backend/core/admin.py b/backend/core/admin.py
index a98b0379..dcae4882 100644
--- a/backend/core/admin.py
+++ b/backend/core/admin.py
@@ -17,7 +17,7 @@
     "Source information",
     {
         "description": "Information about the source from which this description is taken.",
-        "fields": ["source", "source_mention", "designators", "book", "chapter", "page"],
+        "fields": ["source", "source_mention", "book", "chapter", "page"],
     },
 )
 
@@ -38,9 +38,13 @@ class EntityDescriptionAdmin(admin.ModelAdmin):
     search_fields = ["name", "description"]
     filter_horizontal = ["contributors"]
     fieldsets = [
-        named_fieldset,
+        (
+            "Name",
+            {"fields": ["name"]},
+        ),
         contributions_fieldset,
         description_source_fieldset,
+        ("Contents", {"fields": ["summary", "designators"]}),
     ]
 
 
diff --git a/backend/core/models.py b/backend/core/models.py
index 1b5044f2..b1b9959a 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -1,6 +1,5 @@
 from django.db import models
 from django.core.validators import MinValueValidator, MaxValueValidator
-from django.contrib.postgres.fields import ArrayField
 
 from user.models import User
 
@@ -144,16 +143,6 @@ class EntityDescription(Named, models.Model):
         help_text="How is this entity presented in the text?",
     )
 
-    designators = ArrayField(
-        models.CharField(
-            max_length=200,
-        ),
-        default=list,
-        blank=True,
-        size=5,
-        help_text="Relevant (Latin) terminology used to describe this entity in the source text",
-    )
-
     book = models.CharField(
         max_length=255,
         blank=True,
diff --git a/backend/core/types/EntityDescriptionType.py b/backend/core/types/EntityDescriptionType.py
index f89db74b..e6d9e5aa 100644
--- a/backend/core/types/EntityDescriptionType.py
+++ b/backend/core/types/EntityDescriptionType.py
@@ -22,7 +22,6 @@ class Meta:
         fields = [
             "source",
             "source_mention",
-            "designators",
             "book",
             "chapter",
             "page",
diff --git a/backend/core/types/input/EntityDescriptionInputType.py b/backend/core/types/input/EntityDescriptionInputType.py
index b5026c5a..7daea131 100644
--- a/backend/core/types/input/EntityDescriptionInputType.py
+++ b/backend/core/types/input/EntityDescriptionInputType.py
@@ -7,5 +7,4 @@ class EntityDescriptionInputType(NamedInputType, InputObjectType):
     book = String()
     chapter = String()
     page = String()
-    designators = List(NonNull(String))
     categories = List(NonNull(ID))
diff --git a/backend/event/migrations/0026_episodeagent_designators_episodegift_designators_and_more.py b/backend/event/migrations/0026_episodeagent_designators_episodegift_designators_and_more.py
new file mode 100644
index 00000000..02c0d494
--- /dev/null
+++ b/backend/event/migrations/0026_episodeagent_designators_episodegift_designators_and_more.py
@@ -0,0 +1,39 @@
+# Generated by Django 4.2.7 on 2024-09-26 13:23
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('event', '0025_fill_in_blank_sourcemention'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='episodeagent',
+            name='designators',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=200), blank=True, default=list, help_text='Relevant (Latin) terminology used to describe the entity in the episode', size=5),
+        ),
+        migrations.AddField(
+            model_name='episodegift',
+            name='designators',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=200), blank=True, default=list, help_text='Relevant (Latin) terminology used to describe the entity in the episode', size=5),
+        ),
+        migrations.AddField(
+            model_name='episodeletter',
+            name='designators',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=200), blank=True, default=list, help_text='Relevant (Latin) terminology used to describe the entity in the episode', size=5),
+        ),
+        migrations.AddField(
+            model_name='episodespace',
+            name='designators',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=200), blank=True, default=list, help_text='Relevant (Latin) terminology used to describe the entity in the episode', size=5),
+        ),
+        migrations.AlterField(
+            model_name='episode',
+            name='designators',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=200), blank=True, default=list, help_text='Relevant (Latin) terminology used to describe the actions in the episode', size=5),
+        ),
+    ]
diff --git a/backend/event/models.py b/backend/event/models.py
index c4e202cf..5e7d41ca 100644
--- a/backend/event/models.py
+++ b/backend/event/models.py
@@ -1,5 +1,7 @@
 from django.db import models
 from django.core.exceptions import ValidationError
+from django.contrib.postgres.fields import ArrayField
+
 from core.models import EntityDescription, DescriptionField, Named
 from person.models import AgentDescription
 from letter.models import GiftDescription, LetterDescription
@@ -26,6 +28,16 @@ class Episode(EntityDescription, models.Model):
         help_text="labels assigned to this episode",
         blank=True,
     )
+    designators = ArrayField(
+        models.CharField(
+            max_length=200,
+        ),
+        default=list,
+        blank=True,
+        size=5,
+        help_text="Relevant (Latin) terminology used to describe the actions in the episode",
+    )
+
     agents = models.ManyToManyField(
         to=AgentDescription,
         through="EpisodeAgent",
@@ -71,6 +83,16 @@ class Meta:
         on_delete=models.CASCADE,
     )
 
+    designators = ArrayField(
+        models.CharField(
+            max_length=200,
+        ),
+        default=list,
+        blank=True,
+        size=5,
+        help_text="Relevant (Latin) terminology used to describe the entity in the episode",
+    )
+
     @property
     def entity(self) -> EntityDescription:
         entity_field = getattr(self, "entity_field")
diff --git a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
index 5b12d33a..fc143054 100644
--- a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
@@ -22,6 +22,7 @@ class UpdateEpisodeEntityLinkInput(InputObjectType):
     entity_type = Entity(required=True)
     source_mention = SourceMentionEnum()
     note = String()
+    designators = List(NonNull(String))
 
 
 class UpdateEpisodeEntityLinkMutation(LettercraftMutation):
diff --git a/backend/event/mutations/UpdateEpisodeMutation.py b/backend/event/mutations/UpdateEpisodeMutation.py
index 466702df..d0c6e23d 100644
--- a/backend/event/mutations/UpdateEpisodeMutation.py
+++ b/backend/event/mutations/UpdateEpisodeMutation.py
@@ -10,6 +10,7 @@
 class UpdateEpisodeInput(EntityDescriptionInputType, InputObjectType):
     id = ID(required=True)
     summary = String()
+    designators = List(NonNull(String))
 
 
 class UpdateEpisodeMutation(LettercraftMutation):
diff --git a/backend/event/types/EpisodeType.py b/backend/event/types/EpisodeType.py
index eee68c82..ecfd933f 100644
--- a/backend/event/types/EpisodeType.py
+++ b/backend/event/types/EpisodeType.py
@@ -16,6 +16,7 @@ class Meta:
             "id",
             "summary",
             "categories",
+            "designators",
             "agents",
             "gifts",
             "letters",
diff --git a/backend/letter/migrations/0020_remove_giftdescription_designators_and_more.py b/backend/letter/migrations/0020_remove_giftdescription_designators_and_more.py
new file mode 100644
index 00000000..843b6812
--- /dev/null
+++ b/backend/letter/migrations/0020_remove_giftdescription_designators_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.7 on 2024-09-26 13:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('letter', '0019_alter_giftdescriptioncategory_source_mention_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='giftdescription',
+            name='designators',
+        ),
+        migrations.RemoveField(
+            model_name='letterdescription',
+            name='designators',
+        ),
+    ]
diff --git a/backend/person/migrations/0022_remove_agentdescription_designators.py b/backend/person/migrations/0022_remove_agentdescription_designators.py
new file mode 100644
index 00000000..1ceefdd6
--- /dev/null
+++ b/backend/person/migrations/0022_remove_agentdescription_designators.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-09-26 13:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0021_alter_agentdescriptiongender_source_mention_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='agentdescription',
+            name='designators',
+        ),
+    ]
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index d0285d2a..64f98b83 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -40,7 +40,6 @@ class UpdateAgentInput(InputObjectType):
     name = String()
     description = String()
     is_group = Boolean()
-    designators = List(String)
     gender = UpdateAgentGenderInput()
     location = UpdateAgentLocationInput()
 
diff --git a/backend/space/migrations/0019_remove_spacedescription_designators.py b/backend/space/migrations/0019_remove_spacedescription_designators.py
new file mode 100644
index 00000000..577a822e
--- /dev/null
+++ b/backend/space/migrations/0019_remove_spacedescription_designators.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-09-26 13:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('space', '0018_alter_regionfield_source_mention_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='spacedescription',
+            name='designators',
+        ),
+    ]
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index eb439a0d..a54a144c 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -49,8 +49,6 @@ export type AgentDescriptionType = EntityDescription & {
   contributors: Array<UserType>;
   describes: Array<HistoricalPersonType>;
   description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeAgentType>;
   gender?: Maybe<AgentDescriptionGenderType>;
   id: Scalars['ID']['output'];
@@ -196,7 +194,6 @@ export type EpisodeAgentType = EpisodeEntityLink & {
   agent: AgentDescriptionType;
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -212,7 +209,6 @@ export type EpisodeCategoryType = {
 
 export type EpisodeEntityLink = {
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -223,7 +219,6 @@ export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   gift: GiftDescriptionType;
   id: Scalars['ID']['output'];
@@ -235,7 +230,6 @@ export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   letter: LetterDescriptionType;
@@ -247,7 +241,6 @@ export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -266,7 +259,7 @@ export type EpisodeType = EntityDescription & {
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
   description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
+  /** Relevant (Latin) terminology used to describe the actions in the episode */
   designators: Array<Scalars['String']['output']>;
   /** gifts involved in this episode */
   gifts: Array<GiftDescriptionType>;
@@ -339,8 +332,6 @@ export type GiftDescriptionType = EntityDescription & {
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
   description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeGiftType>;
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
@@ -400,8 +391,6 @@ export type LetterDescriptionType = EntityDescription & {
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
   description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeLetterType>;
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
@@ -810,8 +799,6 @@ export type SpaceDescriptionType = EntityDescription & {
   chapter: Scalars['String']['output'];
   contributors: Array<UserType>;
   description: Scalars['String']['output'];
-  /** Relevant (Latin) terminology used to describe this entity in the source text */
-  designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeSpaceType>;
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
@@ -1022,7 +1009,7 @@ export type DataEntryAgentDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: Gender, sourceMention: SourceMention, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention: SourceMention, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
+export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: Gender, sourceMention: SourceMention, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention: SourceMention, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
 
 export type LocationsInSourceListQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1160,7 +1147,7 @@ export type DataEntryGiftSourceTextQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryGiftSourceTextQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryGiftSourceTextQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, book: string, chapter: string, page: string } | null };
 
 export type DataEntryGiftFormQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1200,7 +1187,7 @@ export type DataEntryLetterSourceTextQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLetterSourceTextQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryLetterSourceTextQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, book: string, chapter: string, page: string } | null };
 
 export type DataEntryLetterFormQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1288,7 +1275,6 @@ export const DataEntryAgentDescriptionDocument = gql`
   agentDescription(id: $id) {
     id
     isGroup
-    designators
     gender {
       id
       gender
@@ -1787,7 +1773,6 @@ export const DataEntryGiftSourceTextDocument = gql`
     query DataEntryGiftSourceText($id: ID!) {
   giftDescription(id: $id) {
     id
-    designators
     book
     chapter
     page
@@ -1923,7 +1908,6 @@ export const DataEntryLetterSourceTextDocument = gql`
     query DataEntryLetterSourceText($id: ID!) {
   letterDescription(id: $id) {
     id
-    designators
     book
     chapter
     page
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index bfd06295..8792d58b 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -31,11 +31,6 @@ type AgentDescriptionType implements EntityDescription {
   contributors: [UserType!]!
   describes: [HistoricalPersonType!]!
   description: String!
-
-  """
-  Relevant (Latin) terminology used to describe this entity in the source text
-  """
-  designators: [String!]!
   episodes: [EpisodeAgentType!]!
   gender: AgentDescriptionGenderType
   id: ID!
@@ -172,7 +167,6 @@ type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -187,7 +181,6 @@ type EpisodeCategoryType {
 
 interface EpisodeEntityLink {
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -197,7 +190,6 @@ interface EpisodeEntityLink {
 type EpisodeGiftType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   gift: GiftDescriptionType!
   id: ID!
@@ -208,7 +200,6 @@ type EpisodeGiftType implements EpisodeEntityLink {
 type EpisodeLetterType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   letter: LetterDescriptionType!
@@ -219,7 +210,6 @@ type EpisodeLetterType implements EpisodeEntityLink {
 type EpisodeSpaceType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -241,7 +231,7 @@ type EpisodeType implements EntityDescription {
   description: String!
 
   """
-  Relevant (Latin) terminology used to describe this entity in the source text
+  Relevant (Latin) terminology used to describe the actions in the episode
   """
   designators: [String!]!
 
@@ -322,11 +312,6 @@ type GiftDescriptionType implements EntityDescription {
   chapter: String!
   contributors: [UserType!]!
   description: String!
-
-  """
-  Relevant (Latin) terminology used to describe this entity in the source text
-  """
-  designators: [String!]!
   episodes: [EpisodeGiftType!]!
   id: ID!
   name: String!
@@ -390,11 +375,6 @@ type LetterDescriptionType implements EntityDescription {
   chapter: String!
   contributors: [UserType!]!
   description: String!
-
-  """
-  Relevant (Latin) terminology used to describe this entity in the source text
-  """
-  designators: [String!]!
   episodes: [EpisodeLetterType!]!
   id: ID!
   name: String!
@@ -673,11 +653,6 @@ type SpaceDescriptionType implements EntityDescription {
   chapter: String!
   contributors: [UserType!]!
   description: String!
-
-  """
-  Relevant (Latin) terminology used to describe this entity in the source text
-  """
-  designators: [String!]!
   episodes: [EpisodeSpaceType!]!
   id: ID!
   name: String!
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
index 34dd3882..8a5468d2 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.html
@@ -1,10 +1,4 @@
 <form>
-    <h3>Designators</h3>
-
-    <p>What expressions are used in the text to refer to this agent?</p>
-
-    <lc-designators-control [formControl]="form.controls.designators"></lc-designators-control>
-
     <h3>Gender</h3>
 
     <p>Does the text establish the gender of this agent?</p>
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 08c5a7c5..3c347457 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -38,7 +38,6 @@ export class AgentDescriptionFormComponent implements OnDestroy {
     sourceMentionOptions = sourceMentionSelectOptions();
 
     form = new FormGroup({
-        designators: new FormControl<string[]>([], { nonNullable: true }),
         gender: new FormGroup({
             gender: new FormControl<string>(Gender.Unknown),
             sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
@@ -102,7 +101,6 @@ export class AgentDescriptionFormComponent implements OnDestroy {
 
     updateFormData(data: DataEntryAgentDescriptionQuery) {
         this.form.setValue({
-            designators: data.agentDescription?.designators || [],
             gender: {
                 gender: data.agentDescription?.gender?.gender || Gender.Unknown,
                 sourceMention: data.agentDescription?.gender?.sourceMention || SourceMention.Direct,
@@ -128,7 +126,6 @@ export class AgentDescriptionFormComponent implements OnDestroy {
     private toMutationInput([data, id]: [Partial<typeof this.form.value>, string]): UpdateAgentInput {
         return {
             id,
-            designators: data.designators,
             gender: {
                 gender: data.gender?.gender as Gender,
                 sourceMention: data.gender?.sourceMention as SourceMention,
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
index e6bbc399..79d1d26d 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description.graphql
@@ -2,7 +2,6 @@ query DataEntryAgentDescription($id: ID!) {
   agentDescription(id: $id) {
     id
     isGroup
-    designators
     gender {
       id
       gender
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html
index 819d7cc9..1a59bfcf 100644
--- a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.html
@@ -1,6 +1,4 @@
 <form>
-    <lc-designators-control [formControl]="form.controls.designators" />
-
     <h3>Location</h3>
     <p class="form-text">
         Describe the location of this gift in the source text.
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
index 484d793e..cfc939ab 100644
--- a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.component.ts
@@ -31,9 +31,6 @@ export class GiftSourceTextFormComponent implements OnInit {
     );
 
     public form = new FormGroup({
-        designators: new FormControl<string[]>([], {
-            nonNullable: true,
-        }),
         book: new FormControl<string>("", {
             nonNullable: true,
         }),
diff --git a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql
index cba21288..ed484afb 100644
--- a/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql
+++ b/frontend/src/app/data-entry/gift-form/gift-source-text-form/gift-source-text-form.graphql
@@ -1,7 +1,6 @@
 query DataEntryGiftSourceText($id: ID!) {
     giftDescription(id: $id) {
         id
-        designators
         book
         chapter
         page
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
index 6708c3ff..56d1c399 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.html
@@ -1,6 +1,4 @@
 <form>
-    <lc-designators-control [formControl]="form.controls.designators" />
-
     <h3>Location</h3>
     <p class="form-text">
         Describe the location of this letter in the source text.
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
index 9daaa4ab..8b407262 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
@@ -31,9 +31,6 @@ export class LetterSourceTextFormComponent implements OnInit {
     );
 
     public form = new FormGroup({
-        designators: new FormControl<string[]>([], {
-            nonNullable: true,
-        }),
         book: new FormControl<string>("", {
             nonNullable: true,
         }),
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql
index 3ad3fa1d..4a5be3f1 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.graphql
@@ -1,7 +1,6 @@
 query DataEntryLetterSourceText($id: ID!) {
     letterDescription(id: $id) {
         id
-        designators
         book
         chapter
         page

From 2bf9c495ef354f8e7a65059eeb5a97ba87d8383e Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 15:50:25 +0200
Subject: [PATCH 525/565] add designators control to episode link form

---
 backend/event/types/EpisodeEntityLink.py             |  3 ++-
 frontend/generated/graphql.ts                        | 12 ++++++++----
 frontend/generated/schema.graphql                    |  9 ++++++---
 .../episode-link-form.component.html                 |  3 +++
 .../episode-link-form/episode-link-form.component.ts |  2 ++
 .../shared/episode-link-form/episode-link.graphql    |  1 +
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/backend/event/types/EpisodeEntityLink.py b/backend/event/types/EpisodeEntityLink.py
index c9267db8..806fc881 100644
--- a/backend/event/types/EpisodeEntityLink.py
+++ b/backend/event/types/EpisodeEntityLink.py
@@ -1,4 +1,4 @@
-from graphene import ID, NonNull, String, Interface
+from graphene import ID, NonNull, String, Interface, List
 from core.types.DescriptionFieldType import SourceMentionEnum
 from event.types.EpisodeType import EpisodeType
 from core.types.entity import Entity, EntityDescription
@@ -10,3 +10,4 @@ class EpisodeEntityLink(Interface):
     entity = NonNull(EntityDescription)
     source_mention = NonNull(SourceMentionEnum)
     note = String()
+    designators = List(NonNull(String))
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index a54a144c..5c7f272f 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -193,6 +193,7 @@ export type EpisodeAgentType = EpisodeEntityLink & {
   __typename?: 'EpisodeAgentType';
   agent: AgentDescriptionType;
   certainty: Certainty;
+  designators?: Maybe<Array<Scalars['String']['output']>>;
   entity: EntityDescription;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -208,6 +209,7 @@ export type EpisodeCategoryType = {
 };
 
 export type EpisodeEntityLink = {
+  designators?: Maybe<Array<Scalars['String']['output']>>;
   entity: EntityDescription;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -218,6 +220,7 @@ export type EpisodeEntityLink = {
 export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
   certainty: Certainty;
+  designators?: Maybe<Array<Scalars['String']['output']>>;
   entity: EntityDescription;
   episode: EpisodeType;
   gift: GiftDescriptionType;
@@ -229,6 +232,7 @@ export type EpisodeGiftType = EpisodeEntityLink & {
 export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
   certainty: Certainty;
+  designators?: Maybe<Array<Scalars['String']['output']>>;
   entity: EntityDescription;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -240,6 +244,7 @@ export type EpisodeLetterType = EpisodeEntityLink & {
 export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
   certainty: Certainty;
+  designators?: Maybe<Array<Scalars['String']['output']>>;
   entity: EntityDescription;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
@@ -880,7 +885,6 @@ export type UpdateAgentGenderInput = {
 
 export type UpdateAgentInput = {
   description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
   gender?: InputMaybe<UpdateAgentGenderInput>;
   id: Scalars['ID']['input'];
   isGroup?: InputMaybe<Scalars['Boolean']['input']>;
@@ -911,6 +915,7 @@ export type UpdateCreateSourceInput = {
 };
 
 export type UpdateEpisodeEntityLinkInput = {
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
   entity: Scalars['ID']['input'];
   entityType: Entity;
   episode: Scalars['ID']['input'];
@@ -948,7 +953,6 @@ export type UpdateGiftInput = {
   categorisations?: InputMaybe<Array<GiftCategorisationInput>>;
   chapter?: InputMaybe<Scalars['String']['input']>;
   description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
   id: Scalars['ID']['input'];
   name?: InputMaybe<Scalars['String']['input']>;
   page?: InputMaybe<Scalars['String']['input']>;
@@ -966,7 +970,6 @@ export type UpdateLetterInput = {
   categorisations?: InputMaybe<Array<LetterCategorisationInput>>;
   chapter?: InputMaybe<Scalars['String']['input']>;
   description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
   id: Scalars['ID']['input'];
   name?: InputMaybe<Scalars['String']['input']>;
   page?: InputMaybe<Scalars['String']['input']>;
@@ -1217,7 +1220,7 @@ export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeAgentType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeGiftType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeLetterType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeSpaceType', id: string, note?: string | null, sourceMention: SourceMention, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | null };
+export type DataEntryEpisodeEntityLinkQuery = { __typename?: 'Query', episodeEntityLink?: { __typename?: 'EpisodeAgentType', id: string, note?: string | null, sourceMention: SourceMention, designators?: Array<string> | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeGiftType', id: string, note?: string | null, sourceMention: SourceMention, designators?: Array<string> | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeLetterType', id: string, note?: string | null, sourceMention: SourceMention, designators?: Array<string> | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | { __typename?: 'EpisodeSpaceType', id: string, note?: string | null, sourceMention: SourceMention, designators?: Array<string> | null, episode: { __typename?: 'EpisodeType', id: string, name: string }, entity: { __typename?: 'AgentDescriptionType', id: string, name: string } | { __typename?: 'EpisodeType', id: string, name: string } | { __typename?: 'GiftDescriptionType', id: string, name: string } | { __typename?: 'LetterDescriptionType', id: string, name: string } | { __typename?: 'SpaceDescriptionType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeEntityLinkMutationVariables = Exact<{
   input: UpdateEpisodeEntityLinkInput;
@@ -2001,6 +2004,7 @@ export const DataEntryEpisodeEntityLinkDocument = gql`
     id
     note
     sourceMention
+    designators
     episode {
       id
       name
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 8792d58b..0c7ed786 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -166,6 +166,7 @@ interface EntityDescription {
 type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
   certainty: Certainty!
+  designators: [String!]
   entity: EntityDescription!
   episode: EpisodeType!
   id: ID!
@@ -180,6 +181,7 @@ type EpisodeCategoryType {
 }
 
 interface EpisodeEntityLink {
+  designators: [String!]
   entity: EntityDescription!
   episode: EpisodeType!
   id: ID!
@@ -189,6 +191,7 @@ interface EpisodeEntityLink {
 
 type EpisodeGiftType implements EpisodeEntityLink {
   certainty: Certainty!
+  designators: [String!]
   entity: EntityDescription!
   episode: EpisodeType!
   gift: GiftDescriptionType!
@@ -199,6 +202,7 @@ type EpisodeGiftType implements EpisodeEntityLink {
 
 type EpisodeLetterType implements EpisodeEntityLink {
   certainty: Certainty!
+  designators: [String!]
   entity: EntityDescription!
   episode: EpisodeType!
   id: ID!
@@ -209,6 +213,7 @@ type EpisodeLetterType implements EpisodeEntityLink {
 
 type EpisodeSpaceType implements EpisodeEntityLink {
   certainty: Certainty!
+  designators: [String!]
   entity: EntityDescription!
   episode: EpisodeType!
   id: ID!
@@ -747,7 +752,6 @@ input UpdateAgentGenderInput {
 
 input UpdateAgentInput {
   description: String
-  designators: [String]
   gender: UpdateAgentGenderInput
   id: ID!
   isGroup: Boolean
@@ -777,6 +781,7 @@ input UpdateCreateSourceInput {
 }
 
 input UpdateEpisodeEntityLinkInput {
+  designators: [String!]
   entity: ID!
   entityType: Entity!
   episode: ID!
@@ -812,7 +817,6 @@ input UpdateGiftInput {
   categorisations: [GiftCategorisationInput!]
   chapter: String
   description: String
-  designators: [String!]
   id: ID!
   name: String
   page: String
@@ -829,7 +833,6 @@ input UpdateLetterInput {
   categorisations: [LetterCategorisationInput!]
   chapter: String
   description: String
-  designators: [String!]
   id: ID!
   name: String
   page: String
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 5ea8f998..1842f2eb 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -28,6 +28,9 @@
                 </option>
             </select>
         </div>
+        <div class="mb-3">
+            <lc-designators-control [formControl]="form.controls.designators" />
+        </div>
         <div class="mb-3">
             <label [attr.for]="notesInputID" class="form-label">Notes</label>
             <textarea #notesInput class="form-control"
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 27b451a5..4b8016af 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -47,6 +47,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     data$: Observable<DataEntryEpisodeEntityLinkQuery | undefined>;
     form = new FormGroup({
         sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
+        designators: new FormControl<string[]>([], { nonNullable: true }),
         note: new FormControl<string>('', { nonNullable: true }),
     });
 
@@ -141,6 +142,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     private updateFormValues(data?: DataEntryEpisodeEntityLinkQuery): void {
         this.form.setValue({
             sourceMention: data?.episodeEntityLink?.sourceMention || SourceMention.Direct,
+            designators: data?.episodeEntityLink?.designators || [],
             note: data?.episodeEntityLink?.note || '',
         });
     }
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
index 39f5bca8..4d28ae4a 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link.graphql
@@ -3,6 +3,7 @@ query DataEntryEpisodeEntityLink($entity: ID!, $episode: ID!, $entityType: Entit
         id
         note
         sourceMention
+        designators
         episode {
             id
             name

From 25e2612b05ba6f7e813cfb23fef28a5e99614785 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 16:07:16 +0200
Subject: [PATCH 526/565] clearer layout for designators

---
 frontend/generated/graphql.ts                    |  6 +++---
 .../episode-contents-form.component.html         | 16 ++++++++++++----
 .../episode-contents-form.component.ts           |  1 +
 .../episode-contents-form.graphql                |  1 +
 .../episode-source-text-form.component.html      |  3 ---
 .../episode-source-text-form.component.ts        |  1 -
 .../episode-source-text-form.graphql             |  1 -
 .../designators-control.component.html           |  4 ----
 .../episode-link-form.component.html             |  4 ++++
 9 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 5c7f272f..b920f8c4 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1077,7 +1077,7 @@ export type DataEntryEpisodeContentsQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
+export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, designators: Array<string>, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
 
 export type DataEntryEpisodeCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1103,7 +1103,7 @@ export type DataEntryEpisodeSourceTextMentionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryEpisodeSourceTextMentionQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryEpisodeSourceTextMentionQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, book: string, chapter: string, page: string } | null };
 
 export type DataEntryEpisodeFormQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1503,6 +1503,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   episode(id: $id) {
     id
     summary
+    designators
     categories {
       id
     }
@@ -1617,7 +1618,6 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
     query DataEntryEpisodeSourceTextMention($id: ID!) {
   episode(id: $id) {
     id
-    designators
     book
     chapter
     page
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
index e299d492..369cbab3 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.html
@@ -1,4 +1,4 @@
-<form>
+<form class="vstack gap-4">
     <div class="form-group">
         <label for="summary" class="form-label">Summary</label>
         <p class="form-text">Describe the events in this passage.</p>
@@ -9,11 +9,19 @@
         ></textarea>
     </div>
 
-    <div *ngIf="episodeCategories$ | async as episodeCategories" class="form-group mt-4">
-        <label for="labels" class="form-label">Labels</label>
+    <fieldset>
+        <legend>Designators</legend>
+        <p class="form-text">
+            What (latin) terminology is used to describe the actions in the passage?
+        </p>
+        <lc-designators-control [formControl]="form.controls.designators" />
+    </fieldset>
+
+    <fieldset *ngIf="episodeCategories$ | async as episodeCategories">
+        <legend>Labels</legend>
         <p class="form-text">
             Pick one or more labels that describe this episode.
         </p>
         <lc-label-select [formControl]="form.controls.categories" [options]="episodeCategories" />
-    </div>
+    </fieldset>
 </form>
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index a0341b13..43622b4b 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -41,6 +41,7 @@ export class EpisodeContentsFormComponent implements OnInit, OnDestroy {
         summary: new FormControl<string>("", {
             nonNullable: true,
         }),
+        designators: new FormControl<string[]>([], { nonNullable: true }),
         categories: new FormControl<string[]>([], {
             nonNullable: true,
         }),
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
index b1159eb1..15ed6d09 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.graphql
@@ -2,6 +2,7 @@ query DataEntryEpisodeContents($id: ID!) {
     episode(id: $id) {
         id
         summary
+        designators
         categories {
             id
         }
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html
index 0dbf5085..e13139fd 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.html
@@ -1,7 +1,4 @@
 <form>
-    <lc-designators-control [formControl]="form.controls.designators" />
-
-    <h3>Location</h3>
     <p class="form-text">
         Describe the location of this episode in the source text.
     </p>
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 92f3a51b..547111de 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -39,7 +39,6 @@ export class EpisodeSourceTextFormComponent implements OnInit, OnDestroy {
     );
 
     public form = new FormGroup({
-        designators: new FormControl<string[]>([], { nonNullable: true }),
         book: new FormControl<string>("", { nonNullable: true }),
         chapter: new FormControl<string>("", { nonNullable: true }),
         page: new FormControl<string>("", { nonNullable: true }),
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.graphql b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.graphql
index bf14a3e4..527b5fab 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.graphql
@@ -1,7 +1,6 @@
 query DataEntryEpisodeSourceTextMention($id: ID!) {
     episode(id: $id) {
         id
-        designators
         book
         chapter
         page
diff --git a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
index 6f21908d..ffe35adf 100644
--- a/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
+++ b/frontend/src/app/data-entry/shared/designators-control/designators-control.component.html
@@ -1,8 +1,4 @@
 <div class="mb-3">
-    <p>Designators</p>
-    <p class="form-text">
-        What expressions are used in the text to refer to this entity?
-    </p>
     <p *ngIf="designators$.value.length === 0">
         <i>No designators added.</i>
     </p>
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 1842f2eb..2813a074 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -29,6 +29,10 @@
             </select>
         </div>
         <div class="mb-3">
+            <p class="form-label">Designators</p>
+            <p class="form-text">
+                What terminology is used in the episode to refer to this {{entityName}}?
+            </p>
             <lc-designators-control [formControl]="form.controls.designators" />
         </div>
         <div class="mb-3">

From 60d3222334ddb8d3a6882fe96ccd7578ee226928 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 16:09:08 +0200
Subject: [PATCH 527/565] prevent tooltip flicker

---
 .../shared/collapsible-card/collapsible-card.component.html    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
index e60c3ac9..8f46ff67 100644
--- a/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
+++ b/frontend/src/app/shared/collapsible-card/collapsible-card.component.html
@@ -5,9 +5,10 @@
         <button class="btn btn-secondary ms-auto"
             ariaLabel="{{ collapsed ? 'show' : 'hide' }} {{contentDescription}}"
             [ngbTooltip]="(collapsed ? 'show' : 'hide') + ' ' + contentDescription"
+            #tooltip="ngbTooltip"
             [attr.aria-expanded]="!collapsed"
             [attr.aria-controls]="bodyID"
-            (click)="collapsed = !collapsed">
+            (click)="collapsed = !collapsed; tooltip.close()">
             <lc-icon [icon]="collapsed ? actionIcons.expand : actionIcons.collapse" />
         </button>
         <ng-content select="[cardControl]" />

From 2042bdb030919d544ce430b508c79a08c4f79510 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 16:11:47 +0200
Subject: [PATCH 528/565] spacing

---
 .../episode-link-form/episode-link-form.component.html    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
index 2813a074..571f84fe 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.html
@@ -14,8 +14,8 @@
         <lc-icon [icon]="actionIcons.edit" />
     </a>
     <ng-content cardControl select="[removeControl]"></ng-content>
-    <form cardBody [formGroup]="form">
-        <div class="mb-3">
+    <form cardBody [formGroup]="form" class="vstack gap-4">
+        <div>
             <label [attr.for]="sourceMentionInputID" class="form-label">
                 How is this {{entityName}}'s involvement in the episode represented?
             </label>
@@ -28,14 +28,14 @@
                 </option>
             </select>
         </div>
-        <div class="mb-3">
+        <div>
             <p class="form-label">Designators</p>
             <p class="form-text">
                 What terminology is used in the episode to refer to this {{entityName}}?
             </p>
             <lc-designators-control [formControl]="form.controls.designators" />
         </div>
-        <div class="mb-3">
+        <div>
             <label [attr.for]="notesInputID" class="form-label">Notes</label>
             <textarea #notesInput class="form-control"
                 [id]="notesInputID"

From 8b7b198edd2f1b652ab049329188e5c4783ce10b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 16:18:40 +0200
Subject: [PATCH 529/565] add designator fields in admin

---
 backend/event/admin.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/event/admin.py b/backend/event/admin.py
index 3c1bd17c..0d96660f 100644
--- a/backend/event/admin.py
+++ b/backend/event/admin.py
@@ -11,7 +11,7 @@ class EpisodeCategoryAdmin(admin.ModelAdmin):
 
 class EpisodeAgentAdmin(admin.StackedInline):
     model = models.EpisodeAgent
-    fields = ["agent"] + core_admin.description_field_fields
+    fields = ["agent", "source_mention", "designators", "note"]
     extra = 0
     verbose_name = "involved agent"
 
@@ -26,7 +26,7 @@ def get_field_queryset(self, db, db_field, request):
 
 class EpisodeGiftAdmin(admin.StackedInline):
     model = models.EpisodeGift
-    fields = ["gift"] + core_admin.description_field_fields
+    fields = ["gift", "source_mention", "designators", "note"]
     extra = 0
     verbose_name = "involved gift"
 
@@ -41,7 +41,7 @@ def get_field_queryset(self, db, db_field, request):
 
 class EpisodeLetterAdmin(admin.StackedInline):
     model = models.EpisodeLetter
-    fields = ["letter"] + core_admin.description_field_fields
+    fields = ["letter", "source_mention", "designators", "note"]
     extra = 0
     verbose_name = "involved letter"
 
@@ -56,7 +56,7 @@ def get_field_queryset(self, db, db_field, request):
 
 class EpisodeSpaceAdmin(admin.StackedInline):
     model = models.EpisodeSpace
-    fields = ["space"] + core_admin.description_field_fields
+    fields = ["space", "source_mention", "designators", "note"]
     extra = 0
     verbose_name = "involved space"
 
@@ -79,7 +79,7 @@ class EpisodeAdmin(core_admin.EntityDescriptionAdmin, admin.ModelAdmin):
         (
             "Contents",
             {
-                "fields": ["summary", "categories"],
+                "fields": ["summary", "designators", "categories"],
             },
         ),
     ]

From 1659464b6ef4d58cfc6db806f58ffe18cb3f406a Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Thu, 26 Sep 2024 16:27:21 +0200
Subject: [PATCH 530/565] update text fields on blur

---
 frontend/generated/graphql.ts                                | 5 -----
 frontend/generated/schema.graphql                            | 5 -----
 .../agent-description-form.component.ts                      | 4 ++--
 .../agent-identification-form.component.ts                   | 1 +
 .../episode-contents-form/episode-contents-form.component.ts | 1 +
 .../episode-identification-form.component.ts                 | 1 +
 .../gift-identification-form.component.ts                    | 1 +
 .../letter-identification-form.component.ts                  | 1 +
 .../shared/episode-link-form/episode-link-form.component.ts  | 2 +-
 9 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index eb439a0d..7c3a0df3 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -196,7 +196,6 @@ export type EpisodeAgentType = EpisodeEntityLink & {
   agent: AgentDescriptionType;
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -212,7 +211,6 @@ export type EpisodeCategoryType = {
 
 export type EpisodeEntityLink = {
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -223,7 +221,6 @@ export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   gift: GiftDescriptionType;
   id: Scalars['ID']['output'];
@@ -235,7 +232,6 @@ export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   letter: LetterDescriptionType;
@@ -247,7 +243,6 @@ export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index bfd06295..163a7ea9 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -172,7 +172,6 @@ type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -187,7 +186,6 @@ type EpisodeCategoryType {
 
 interface EpisodeEntityLink {
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -197,7 +195,6 @@ interface EpisodeEntityLink {
 type EpisodeGiftType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   gift: GiftDescriptionType!
   id: ID!
@@ -208,7 +205,6 @@ type EpisodeGiftType implements EpisodeEntityLink {
 type EpisodeLetterType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   letter: LetterDescriptionType!
@@ -219,7 +215,6 @@ type EpisodeLetterType implements EpisodeEntityLink {
 type EpisodeSpaceType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
diff --git a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
index 08c5a7c5..1b4d3591 100644
--- a/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-description-form/agent-description-form.component.ts
@@ -42,13 +42,13 @@ export class AgentDescriptionFormComponent implements OnDestroy {
         gender: new FormGroup({
             gender: new FormControl<string>(Gender.Unknown),
             sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
-            note: new FormControl<string>(''),
+            note: new FormControl<string>('', { updateOn: 'blur' }),
         }),
         location: new FormGroup({
             hasLocation: new FormControl<boolean>(false, { nonNullable: true }),
             location: new FormControl<string | null>(null),
             sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
-            note: new FormControl<string>(''),
+            note: new FormControl<string>('', { updateOn: 'blur' }),
         })
     });
 
diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index de8efdba..c0af537b 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -33,6 +33,7 @@ export class AgentIdentificationFormComponent implements OnDestroy {
     form = new FormGroup({
         name: new FormControl<string>('', {
             nonNullable: true,
+            updateOn: 'blur',
             validators: [Validators.required]
         }),
         description: new FormControl<string>('', { nonNullable: true }),
diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index a0341b13..14a3426d 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -40,6 +40,7 @@ export class EpisodeContentsFormComponent implements OnInit, OnDestroy {
     public form = new FormGroup({
         summary: new FormControl<string>("", {
             nonNullable: true,
+            updateOn: 'blur',
         }),
         categories: new FormControl<string[]>([], {
             nonNullable: true,
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index 0317cb55..26f1b300 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -48,6 +48,7 @@ export class EpisodeIdentificationFormComponent implements OnDestroy {
     public form = new FormGroup<EpisodeIdentificationForm>({
         name: new FormControl<string>("", {
             nonNullable: true,
+            updateOn: 'blur',
             validators: [Validators.required],
         }),
     });
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index dab3d11f..8735c2d9 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -48,6 +48,7 @@ export class GiftIdentificationFormComponent implements OnInit {
         name: new FormControl("", {
             validators: [Validators.required],
             nonNullable: true,
+            updateOn: 'blur',
         }),
         description: new FormControl("", {
             nonNullable: true,
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index a2ccdbce..37d63d6e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -35,6 +35,7 @@ export class LetterIdentificationFormComponent implements OnInit {
         name: new FormControl("", {
             validators: [Validators.required],
             nonNullable: true,
+            updateOn: 'blur',
         }),
         description: new FormControl("", {
             nonNullable: true,
diff --git a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
index 27b451a5..62be1658 100644
--- a/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
+++ b/frontend/src/app/data-entry/shared/episode-link-form/episode-link-form.component.ts
@@ -47,7 +47,7 @@ export class EpisodeLinkFormComponent implements OnChanges, OnDestroy {
     data$: Observable<DataEntryEpisodeEntityLinkQuery | undefined>;
     form = new FormGroup({
         sourceMention: new FormControl<SourceMention>(SourceMention.Direct),
-        note: new FormControl<string>('', { nonNullable: true }),
+        note: new FormControl<string>('', { nonNullable: true, updateOn: 'blur' }),
     });
 
     sourceMentionOptions: SelectOptions<SourceMention> = sourceMentionSelectOptions();

From 2a20b542bcb67cbfac59544b3cb1c028481d2ae6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 27 Sep 2024 12:14:04 +0200
Subject: [PATCH 531/565] add ordering to agent description model

---
 backend/person/models.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/person/models.py b/backend/person/models.py
index 9425c69b..529fe4cd 100644
--- a/backend/person/models.py
+++ b/backend/person/models.py
@@ -74,6 +74,12 @@ class AgentDescription(EntityDescription, models.Model):
     A description of an agent in a source text; can be a single person or a group
     """
 
+    class Meta:
+        ordering = [
+            models.F("describes__identifiable").desc(nulls_last=True),
+            "is_group",
+        ]
+
     describes = models.ManyToManyField(
         to=HistoricalPerson,
         through=PersonReference,

From 927183e784708bc2f1aae46cd7dc974f621e56b8 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 27 Sep 2024 12:23:19 +0200
Subject: [PATCH 532/565] sort space descriptions by identifiable features

---
 backend/space/models.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/backend/space/models.py b/backend/space/models.py
index 4ec35932..e87d0b54 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -10,6 +10,13 @@ class SpaceDescription(EntityDescription, models.Model):
     This model compounds all different aspects of space (geographical, political, etc.).
     """
 
+    class Meta:
+        ordering = [
+            models.F("structures__identifiable").desc(nulls_last=True),
+            models.F("settlements__identifiable").desc(nulls_last=True),
+            models.F("regions__identifiable").desc(nulls_last=True),
+        ]
+
     regions = models.ManyToManyField(
         to="Region",
         through="RegionField",

From 1d945a43522e1b8ce8c8d2ea641749f91303b0c8 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 27 Sep 2024 12:41:16 +0200
Subject: [PATCH 533/565] add has_identifiable_features to space description
 model

---
 backend/space/models.py                     |  7 +++++++
 backend/space/types/SpaceDescriptionType.py | 10 +++++++++-
 frontend/generated/graphql.ts               |  5 -----
 frontend/generated/schema.graphql           |  5 -----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/backend/space/models.py b/backend/space/models.py
index e87d0b54..2bb97575 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -35,6 +35,13 @@ class Meta:
         help_text="Man-made structures referenced in this description",
     )
 
+    def has_identifiable_features(self):
+        return (
+            self.regions.filter(identifiable=True).exists()
+            or self.settlements.filter(identifiable=True).exists()
+            or self.structures.filter(identifiable=True).exists()
+        )
+
 
 class Region(HistoricalEntity, models.Model):
     """
diff --git a/backend/space/types/SpaceDescriptionType.py b/backend/space/types/SpaceDescriptionType.py
index 9f7d42d1..3201a5c8 100644
--- a/backend/space/types/SpaceDescriptionType.py
+++ b/backend/space/types/SpaceDescriptionType.py
@@ -1,4 +1,4 @@
-from graphene import List, NonNull, ResolveInfo
+from graphene import List, NonNull, ResolveInfo, Boolean
 from graphene_django.types import DjangoObjectType
 from django.db.models import QuerySet
 
@@ -25,10 +25,12 @@ class SpaceDescriptionType(EntityDescriptionType, DjangoObjectType):
     regions = List(NonNull(RegionType), required=True)
     settlements = List(NonNull(SettlementType), required=True)
     structures = List(NonNull(StructureType), required=True)
+    has_identifiable_features = Boolean(required=True)
 
     region_fields = List(NonNull(RegionFieldType), required=True)
     settlement_fields = List(NonNull(SettlementFieldType), required=True)
     structure_fields = List(NonNull(StructureFieldType), required=True)
+
     episodes = List(NonNull(EpisodeSpaceType), required=True)
 
     class Meta:
@@ -95,3 +97,9 @@ def resolve_episodes(
         parent: SpaceDescription, info: ResolveInfo
     ) -> QuerySet[EpisodeSpace]:
         return EpisodeSpace.objects.filter(space=parent)
+
+    @staticmethod
+    def resolve_has_identifiable_features(
+        parent: SpaceDescription, info: ResolveInfo
+    ) -> Boolean:
+        return parent.has_identifiable_features()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index eb439a0d..7c3a0df3 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -196,7 +196,6 @@ export type EpisodeAgentType = EpisodeEntityLink & {
   agent: AgentDescriptionType;
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -212,7 +211,6 @@ export type EpisodeCategoryType = {
 
 export type EpisodeEntityLink = {
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -223,7 +221,6 @@ export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   gift: GiftDescriptionType;
   id: Scalars['ID']['output'];
@@ -235,7 +232,6 @@ export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   letter: LetterDescriptionType;
@@ -247,7 +243,6 @@ export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index bfd06295..163a7ea9 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -172,7 +172,6 @@ type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -187,7 +186,6 @@ type EpisodeCategoryType {
 
 interface EpisodeEntityLink {
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -197,7 +195,6 @@ interface EpisodeEntityLink {
 type EpisodeGiftType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   gift: GiftDescriptionType!
   id: ID!
@@ -208,7 +205,6 @@ type EpisodeGiftType implements EpisodeEntityLink {
 type EpisodeLetterType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   letter: LetterDescriptionType!
@@ -219,7 +215,6 @@ type EpisodeLetterType implements EpisodeEntityLink {
 type EpisodeSpaceType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String

From bc43046c56b4975cf713d80a3be8bd2f26699d64 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 27 Sep 2024 12:45:10 +0200
Subject: [PATCH 534/565] show filled icon for identifiable locations

---
 frontend/generated/graphql.ts                              | 7 +++++--
 frontend/generated/schema.graphql                          | 1 +
 .../data-entry/location-form/location-form.component.html  | 2 +-
 .../app/data-entry/location-form/space-description.graphql | 1 +
 .../source/episode-preview/episode-preview.component.html  | 3 ++-
 frontend/src/app/data-entry/source/source.graphql          | 1 +
 frontend/src/app/shared/icons.ts                           | 1 +
 7 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 7c3a0df3..c5993a6d 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -808,6 +808,7 @@ export type SpaceDescriptionType = EntityDescription & {
   /** Relevant (Latin) terminology used to describe this entity in the source text */
   designators: Array<Scalars['String']['output']>;
   episodes: Array<EpisodeSpaceType>;
+  hasIdentifiableFeatures: Scalars['Boolean']['output'];
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
   /** The page number or page range in the source */
@@ -1216,7 +1217,7 @@ export type DataEntrySpaceDescriptionQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, hasIdentifiableFeatures: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
   entity: Scalars['ID']['input'];
@@ -1246,7 +1247,7 @@ export type DataEntrySourceDetailQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean }> }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
+export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean }> }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string, hasIdentifiableFeatures: boolean }> }> } };
 
 export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1988,6 +1989,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
     id
     name
     description
+    hasIdentifiableFeatures
     source {
       id
       name
@@ -2115,6 +2117,7 @@ export const DataEntrySourceDetailDocument = gql`
       spaces {
         id
         name
+        hasIdentifiableFeatures
       }
     }
   }
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 163a7ea9..af0629d3 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -674,6 +674,7 @@ type SpaceDescriptionType implements EntityDescription {
   """
   designators: [String!]!
   episodes: [EpisodeSpaceType!]!
+  hasIdentifiableFeatures: Boolean!
   id: ID!
   name: String!
 
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index 42079d5a..053a85b7 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -3,7 +3,7 @@
 
     <ng-container *ngIf="data.spaceDescription as spaceDescription">
         <h1 class="mb-4">
-            <lc-icon [icon]="dataIcons.location" />
+            <lc-icon [icon]="spaceDescription.hasIdentifiableFeatures ? dataIcons.locationIdentified : dataIcons.location" />
             {{spaceDescription.name}}
             <span class="text-secondary">
                 ({{spaceDescription.source.name}})
diff --git a/frontend/src/app/data-entry/location-form/space-description.graphql b/frontend/src/app/data-entry/location-form/space-description.graphql
index e3aea7cf..f99a96c8 100644
--- a/frontend/src/app/data-entry/location-form/space-description.graphql
+++ b/frontend/src/app/data-entry/location-form/space-description.graphql
@@ -3,6 +3,7 @@ query DataEntrySpaceDescription($id: ID!) {
     id
     name
     description
+    hasIdentifiableFeatures
     source {
       id
       name
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index cbeae8e6..0075d21a 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -58,7 +58,8 @@
                             [routerLink]="['/data-entry', 'locations', space.id]"
                             class="icon-link"
                         >
-                            <lc-icon [icon]="dataIcons.location" />
+                            <lc-icon [icon]="space.hasIdentifiableFeatures ?
+                                dataIcons.locationIdentified : dataIcons.location" />
                             {{ space.name }}
                         </a>
                     </li>
diff --git a/frontend/src/app/data-entry/source/source.graphql b/frontend/src/app/data-entry/source/source.graphql
index 0d3d633e..27f5405a 100644
--- a/frontend/src/app/data-entry/source/source.graphql
+++ b/frontend/src/app/data-entry/source/source.graphql
@@ -34,6 +34,7 @@ query DataEntrySourceDetail($id: ID!) {
             spaces {
                 id
                 name
+                hasIdentifiableFeatures
             }
         }
     }
diff --git a/frontend/src/app/shared/icons.ts b/frontend/src/app/shared/icons.ts
index 33ba1cac..0d1360c9 100644
--- a/frontend/src/app/shared/icons.ts
+++ b/frontend/src/app/shared/icons.ts
@@ -31,6 +31,7 @@ export const dataIcons = {
     personUnknown: 'person',
     group: 'people',
     location: 'geo-alt',
+    locationIdentified: 'geo-alt-fill',
     gift: 'gift',
     letter: 'envelope',
 };

From b1152cc0118d188460adfcae3e0a753e8557e140 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 27 Sep 2024 13:21:25 +0200
Subject: [PATCH 535/565] fix ordering expression for space description

---
 backend/space/models.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/space/models.py b/backend/space/models.py
index 2bb97575..583200ca 100644
--- a/backend/space/models.py
+++ b/backend/space/models.py
@@ -12,9 +12,12 @@ class SpaceDescription(EntityDescription, models.Model):
 
     class Meta:
         ordering = [
-            models.F("structures__identifiable").desc(nulls_last=True),
-            models.F("settlements__identifiable").desc(nulls_last=True),
-            models.F("regions__identifiable").desc(nulls_last=True),
+            models.Case(
+                models.When(structures__identifiable=True, then=1),
+                models.When(settlements__identifiable=True, then=2),
+                models.When(regions__identifiable=True, then=3),
+                default=None,
+            ).asc(nulls_last=True),
         ]
 
     regions = models.ManyToManyField(

From 8a06af6872693ac04d59e5823affa4db9a69be54 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Fri, 27 Sep 2024 13:35:49 +0200
Subject: [PATCH 536/565] simplify icon decision for locations and agents

---
 backend/person/models.py                           |  3 +++
 backend/person/types/AgentDescriptionType.py       |  7 ++++++-
 frontend/generated/graphql.ts                      | 11 +++++------
 frontend/generated/schema.graphql                  |  1 +
 .../agent-form/agent-form.component.html           |  2 +-
 .../data-entry/agent-form/agent-form.component.ts  |  2 ++
 .../src/app/data-entry/agent-form/agent.graphql    |  1 +
 .../location-form/location-form.component.html     |  2 +-
 .../location-form/location-form.component.ts       |  2 ++
 .../episode-preview/episode-preview.component.html |  3 +--
 .../episode-preview/episode-preview.component.ts   | 13 +++----------
 frontend/src/app/data-entry/source/source.graphql  |  5 +----
 frontend/src/app/shared/icons-utils.ts             | 14 ++++++++++++++
 frontend/src/app/shared/icons.ts                   |  4 ++--
 14 files changed, 43 insertions(+), 27 deletions(-)
 create mode 100644 frontend/src/app/shared/icons-utils.ts

diff --git a/backend/person/models.py b/backend/person/models.py
index 529fe4cd..30fb525a 100644
--- a/backend/person/models.py
+++ b/backend/person/models.py
@@ -99,6 +99,9 @@ def clean(self):
                 "Only groups can describe multiple historical figures"
             )
 
+    def identified(self):
+        return self.describes.filter(identifiable=True).exists()
+
 
 class Gender(models.TextChoices):
     FEMALE = "FEMALE", "Female"
diff --git a/backend/person/types/AgentDescriptionType.py b/backend/person/types/AgentDescriptionType.py
index 9f7e2650..02e5f453 100644
--- a/backend/person/types/AgentDescriptionType.py
+++ b/backend/person/types/AgentDescriptionType.py
@@ -1,4 +1,4 @@
-from graphene import Field, List, ResolveInfo, NonNull
+from graphene import Field, List, ResolveInfo, NonNull, Boolean
 from graphene_django import DjangoObjectType
 
 from django.db.models import QuerySet
@@ -18,6 +18,7 @@ class AgentDescriptionType(EntityDescriptionType, DjangoObjectType):
     gender = Field(AgentDescriptionGenderType)
     location = Field(AgentDescriptionLocationType)
     episodes = List(NonNull(EpisodeAgentType), required=True)
+    identified = Boolean(required=True)
 
     class Meta:
         model = AgentDescription
@@ -55,3 +56,7 @@ def resolve_episodes(
         parent: AgentDescription, info: ResolveInfo
     ) -> QuerySet[EpisodeAgent]:
         return EpisodeAgent.objects.filter(agent=parent)
+
+    @staticmethod
+    def resolve_identified(parent: AgentDescription, info: ResolveInfo) -> bool:
+        return parent.identified()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index c5993a6d..e485d4ad 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -54,6 +54,7 @@ export type AgentDescriptionType = EntityDescription & {
   episodes: Array<EpisodeAgentType>;
   gender?: Maybe<AgentDescriptionGenderType>;
   id: Scalars['ID']['output'];
+  identified: Scalars['Boolean']['output'];
   /** Whether this agent is a group of people (e.g. 'the nuns of Poitiers'). */
   isGroup: Scalars['Boolean']['output'];
   location?: Maybe<AgentDescriptionLocationType>;
@@ -1062,7 +1063,7 @@ export type DataEntryAgentQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, identified: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateAgentMutationVariables = Exact<{
   input: UpdateAgentInput;
@@ -1247,7 +1248,7 @@ export type DataEntrySourceDetailQueryVariables = Exact<{
 }>;
 
 
-export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean }> }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string, hasIdentifiableFeatures: boolean }> }> } };
+export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, identified: boolean }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string, hasIdentifiableFeatures: boolean }> }> } };
 
 export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1443,6 +1444,7 @@ export const DataEntryAgentDocument = gql`
     name
     description
     isGroup
+    identified
     source {
       id
       name
@@ -2101,10 +2103,7 @@ export const DataEntrySourceDetailDocument = gql`
         id
         name
         isGroup
-        describes {
-          id
-          identifiable
-        }
+        identified
       }
       gifts {
         id
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index af0629d3..86a2bbd6 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -39,6 +39,7 @@ type AgentDescriptionType implements EntityDescription {
   episodes: [EpisodeAgentType!]!
   gender: AgentDescriptionGenderType
   id: ID!
+  identified: Boolean!
 
   """Whether this agent is a group of people (e.g. 'the nuns of Poitiers')."""
   isGroup: Boolean!
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.html b/frontend/src/app/data-entry/agent-form/agent-form.component.html
index 37537d03..561e8176 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.html
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.html
@@ -3,7 +3,7 @@
 
     <ng-container *ngIf="data.agentDescription as agentDescription; else noAgent">
         <h1 class="mb-4">
-            <lc-icon [icon]="agentDescription.isGroup ? dataIcons.group : dataIcons.person" />
+            <lc-icon [icon]="agentIcon(agentDescription)" />
             {{agentDescription.name}}
             <span class="text-secondary">
                 ({{agentDescription.source.name}})
diff --git a/frontend/src/app/data-entry/agent-form/agent-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
index a7bf3d1d..c69fed4d 100644
--- a/frontend/src/app/data-entry/agent-form/agent-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-form.component.ts
@@ -4,6 +4,7 @@ import { dataIcons } from '@shared/icons';
 import { DataEntryAgentGQL, DataEntryAgentQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
 import { FormService } from '../shared/form.service';
+import { agentIcon } from '@shared/icons-utils';
 
 @Component({
     selector: 'lc-agent-form',
@@ -16,6 +17,7 @@ export class AgentFormComponent {
     data$: Observable<DataEntryAgentQuery>;
 
     dataIcons = dataIcons;
+    agentIcon = agentIcon;
 
     status$ = this.formService.status$;
 
diff --git a/frontend/src/app/data-entry/agent-form/agent.graphql b/frontend/src/app/data-entry/agent-form/agent.graphql
index b3d56359..f10d7f66 100644
--- a/frontend/src/app/data-entry/agent-form/agent.graphql
+++ b/frontend/src/app/data-entry/agent-form/agent.graphql
@@ -4,6 +4,7 @@ query DataEntryAgent($id: ID!) {
     name
     description
     isGroup
+    identified
     source {
       id
       name
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index 053a85b7..a63b8c87 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -3,7 +3,7 @@
 
     <ng-container *ngIf="data.spaceDescription as spaceDescription">
         <h1 class="mb-4">
-            <lc-icon [icon]="spaceDescription.hasIdentifiableFeatures ? dataIcons.locationIdentified : dataIcons.location" />
+            <lc-icon [icon]="locationIcon(spaceDescription)" />
             {{spaceDescription.name}}
             <span class="text-secondary">
                 ({{spaceDescription.source.name}})
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
index 07f623a9..8d4985ea 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Breadcrumb } from '@shared/breadcrumb/breadcrumb.component';
 import { dataIcons } from '@shared/icons';
+import { locationIcon } from '@shared/icons-utils';
 import { DataEntrySpaceDescriptionGQL, DataEntrySpaceDescriptionQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
 
@@ -15,6 +16,7 @@ export class LocationFormComponent {
     data$: Observable<DataEntrySpaceDescriptionQuery>;
 
     dataIcons = dataIcons;
+    locationIcon = locationIcon;
 
     constructor(
         private route: ActivatedRoute, private spaceQuery: DataEntrySpaceDescriptionGQL
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
index 0075d21a..2e3eead7 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.html
@@ -58,8 +58,7 @@
                             [routerLink]="['/data-entry', 'locations', space.id]"
                             class="icon-link"
                         >
-                            <lc-icon [icon]="space.hasIdentifiableFeatures ?
-                                dataIcons.locationIdentified : dataIcons.location" />
+                            <lc-icon [icon]="locationIcon(space)" />
                             {{ space.name }}
                         </a>
                     </li>
diff --git a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
index 3ced9df0..faf22d19 100644
--- a/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
+++ b/frontend/src/app/data-entry/source/episode-preview/episode-preview.component.ts
@@ -3,6 +3,7 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
 import { dataIcons } from "@shared/icons";
+import { agentIcon, locationIcon } from "@shared/icons-utils";
 import {
     DataEntryDeleteEpisodeGQL,
     DataEntrySourceDetailQuery,
@@ -21,6 +22,8 @@ export class EpisodePreviewComponent {
     @Input({ required: true })
     public episode!: QueriedEpisode;
     public dataIcons = dataIcons;
+    agentIcon = agentIcon;
+    locationIcon = locationIcon;
 
     constructor(
         private destroyRef: DestroyRef,
@@ -42,16 +45,6 @@ export class EpisodePreviewComponent {
             });
     }
 
-    public agentIcon(agent: QueriedEpisode["agents"][0]): string {
-        if (agent.isGroup) {
-            return dataIcons.group;
-        }
-        if (agent.describes?.some((person) => person?.identifiable)) {
-            return dataIcons.person;
-        }
-        return dataIcons.personUnknown;
-    }
-
     private performDelete(episodeId: string): void {
         this.deleteEpisode
             .mutate(
diff --git a/frontend/src/app/data-entry/source/source.graphql b/frontend/src/app/data-entry/source/source.graphql
index 27f5405a..cffa8ce5 100644
--- a/frontend/src/app/data-entry/source/source.graphql
+++ b/frontend/src/app/data-entry/source/source.graphql
@@ -18,10 +18,7 @@ query DataEntrySourceDetail($id: ID!) {
                 id
                 name
                 isGroup
-                describes {
-                    id
-                    identifiable
-                }
+                identified
             }
             gifts {
                 id
diff --git a/frontend/src/app/shared/icons-utils.ts b/frontend/src/app/shared/icons-utils.ts
new file mode 100644
index 00000000..8219538f
--- /dev/null
+++ b/frontend/src/app/shared/icons-utils.ts
@@ -0,0 +1,14 @@
+import { dataIcons } from "./icons";
+
+export const agentIcon = (agent: { isGroup: boolean, identified: boolean }): string => {
+    if (agent.isGroup) {
+        return dataIcons.group;
+    }
+    if (agent.identified) {
+        return dataIcons.personIdentified;
+    }
+    return dataIcons.person;
+}
+
+export const locationIcon = (location: { hasIdentifiableFeatures: boolean }): string =>
+    location.hasIdentifiableFeatures ? dataIcons.locationIdentified : dataIcons.location;
diff --git a/frontend/src/app/shared/icons.ts b/frontend/src/app/shared/icons.ts
index 0d1360c9..0ada0cb4 100644
--- a/frontend/src/app/shared/icons.ts
+++ b/frontend/src/app/shared/icons.ts
@@ -27,8 +27,8 @@ export const authIcons = {
 export const dataIcons = {
     source: 'book',
     episode: 'bookmark',
-    person: 'person-fill',
-    personUnknown: 'person',
+    person: 'person',
+    personIdentified: 'person-fill',
     group: 'people',
     location: 'geo-alt',
     locationIdentified: 'geo-alt-fill',

From a678aafe653be502e95b0c0e2b2466bcafcebab7 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Fri, 27 Sep 2024 15:10:39 +0200
Subject: [PATCH 537/565] Rename location to space

---
 backend/graphql_app/schema.py                 |   12 +-
 ...tionMutation.py => CreateSpaceMutation.py} |   24 +-
 ...tionMutation.py => DeleteSpaceMutation.py} |   12 +-
 ...tionMutation.py => UpdateSpaceMutation.py} |   22 +-
 frontend/generated/graphql.ts                 | 2574 +++++++----------
 frontend/generated/schema.graphql             |    5 -
 6 files changed, 1103 insertions(+), 1546 deletions(-)
 rename backend/space/mutations/{CreateLocationMutation.py => CreateSpaceMutation.py} (56%)
 rename backend/space/mutations/{DeleteLocationMutation.py => DeleteSpaceMutation.py} (75%)
 rename backend/space/mutations/{UpdateLocationMutation.py => UpdateSpaceMutation.py} (65%)

diff --git a/backend/graphql_app/schema.py b/backend/graphql_app/schema.py
index eacc2ad5..18e3ef29 100644
--- a/backend/graphql_app/schema.py
+++ b/backend/graphql_app/schema.py
@@ -29,9 +29,9 @@
 from letter.mutations.CreateGiftMutation import CreateGiftMutation
 from letter.mutations.DeleteGiftMutation import DeleteGiftMutation
 from letter.mutations.UpdateGiftMutation import UpdateGiftMutation
-from space.mutations.CreateLocationMutation import CreateLocationMutation
-from space.mutations.DeleteLocationMutation import DeleteLocationMutation
-from space.mutations.UpdateLocationMutation import UpdateLocationMutation
+from space.mutations.CreateSpaceMutation import CreateSpaceMutation
+from space.mutations.DeleteSpaceMutation import DeleteSpaceMutation
+from space.mutations.UpdateSpaceMutation import UpdateSpaceMutation
 from person.mutations.CreatePersonReferenceMutation import CreatePersonReferenceMutation
 from person.mutations.UpdatePersonReferenceMutation import UpdatePersonReferenceMutation
 from person.mutations.DeletePersonReferenceMutation import DeletePersonReferenceMutation
@@ -66,9 +66,9 @@ class Mutation(ObjectType):
     create_gift = CreateGiftMutation.Field()
     update_gift = UpdateGiftMutation.Field()
     delete_gift = DeleteGiftMutation.Field()
-    create_location = CreateLocationMutation.Field()
-    update_location = UpdateLocationMutation.Field()
-    delete_location = DeleteLocationMutation.Field()
+    create_space = CreateSpaceMutation.Field()
+    update_space = UpdateSpaceMutation.Field()
+    delete_space = DeleteSpaceMutation.Field()
     create_person_reference = CreatePersonReferenceMutation.Field()
     update_person_reference = UpdatePersonReferenceMutation.Field()
     delete_person_reference = DeletePersonReferenceMutation.Field()
diff --git a/backend/space/mutations/CreateLocationMutation.py b/backend/space/mutations/CreateSpaceMutation.py
similarity index 56%
rename from backend/space/mutations/CreateLocationMutation.py
rename to backend/space/mutations/CreateSpaceMutation.py
index e8772086..6cbefa0e 100644
--- a/backend/space/mutations/CreateLocationMutation.py
+++ b/backend/space/mutations/CreateSpaceMutation.py
@@ -7,39 +7,39 @@
 from space.types.SpaceDescriptionType import SpaceDescriptionType
 
 
-class CreateLocationInput(InputObjectType):
+class CreateSpaceInput(InputObjectType):
     name = String(required=True)
     source = ID(required=True)
 
 
-class CreateLocationMutation(LettercraftMutation):
-    location = Field(SpaceDescriptionType)
+class CreateSpaceMutation(LettercraftMutation):
+    space = Field(SpaceDescriptionType)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     django_model = SpaceDescription
 
     class Arguments:
-        location_data = CreateLocationInput(required=True)
+        space_data = CreateSpaceInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, location_data: CreateLocationInput):
+    def mutate(cls, root: None, info: ResolveInfo, space_data: CreateSpaceInput):
         try:
-            source = Source.objects.get(id=getattr(location_data, "source"))
+            source = Source.objects.get(id=getattr(space_data, "source"))
         except Source.DoesNotExist:
             error = LettercraftErrorType(field="source", messages=["Source not found."])
             return cls(errors=[error])  # type: ignore
 
-        location = SpaceDescription.objects.create(
-            name=getattr(location_data, "name"),
+        space = SpaceDescription.objects.create(
+            name=getattr(space_data, "name"),
             source=source,
         )
 
-        cls.add_contribution(info, location)
+        cls.add_contribution(info, space)
 
-        return cls(location=location, errors=[])  # type: ignore
+        return cls(space=space, errors=[])  # type: ignore
 
     @staticmethod
-    def add_contribution(info: ResolveInfo, location: SpaceDescription) -> None:
+    def add_contribution(info: ResolveInfo, space: SpaceDescription) -> None:
         user = info.context.user
         if user.is_authenticated:
-            location.contributors.add(user)
+            space.contributors.add(user)
diff --git a/backend/space/mutations/DeleteLocationMutation.py b/backend/space/mutations/DeleteSpaceMutation.py
similarity index 75%
rename from backend/space/mutations/DeleteLocationMutation.py
rename to backend/space/mutations/DeleteSpaceMutation.py
index 7271df70..d4e2dde2 100644
--- a/backend/space/mutations/DeleteLocationMutation.py
+++ b/backend/space/mutations/DeleteSpaceMutation.py
@@ -5,7 +5,7 @@
 from graphql_app.types.LettercraftErrorType import LettercraftErrorType
 
 
-class DeleteLocationMutation(Mutation):
+class DeleteSpaceMutation(Mutation):
     ok = Boolean(required=True)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
@@ -15,12 +15,12 @@ class Arguments:
     @classmethod
     def mutate(cls, root: None, info: ResolveInfo, id: str):
         try:
-            location = SpaceDescriptionType.get_queryset(SpaceDescription.objects, info).get(
-                id=id
-            )
+            space_description = SpaceDescriptionType.get_queryset(
+                SpaceDescription.objects, info
+            ).get(id=id)
         except SpaceDescription.DoesNotExist:
-            error = LettercraftErrorType(field="id", messages=["Location not found."])
+            error = LettercraftErrorType(field="id", messages=["Space not found."])
             return cls(ok=False, errors=[error])  # type: ignore
 
-        location.delete()
+        space_description.delete()
         return cls(ok=True, errors=[])  # type: ignore
diff --git a/backend/space/mutations/UpdateLocationMutation.py b/backend/space/mutations/UpdateSpaceMutation.py
similarity index 65%
rename from backend/space/mutations/UpdateLocationMutation.py
rename to backend/space/mutations/UpdateSpaceMutation.py
index 8b43a758..21247f92 100644
--- a/backend/space/mutations/UpdateLocationMutation.py
+++ b/backend/space/mutations/UpdateSpaceMutation.py
@@ -9,44 +9,44 @@
 from space.models import SpaceDescription
 
 
-class UpdateLocationInput(EntityDescriptionInputType, InputObjectType):
+class UpdateSpaceInput(EntityDescriptionInputType, InputObjectType):
     id = ID(required=True)
 
 
-class UpdateLocationMutation(LettercraftMutation):
+class UpdateSpaceMutation(LettercraftMutation):
     ok = Boolean(required=True)
     errors = List(NonNull(LettercraftErrorType), required=True)
 
     django_model = SpaceDescription
 
     class Arguments:
-        location_data = UpdateLocationInput(required=True)
+        space_data = UpdateSpaceInput(required=True)
 
     @classmethod
-    def mutate(cls, root: None, info: ResolveInfo, location_data: UpdateLocationInput):
+    def mutate(cls, root: None, info: ResolveInfo, space_data: UpdateSpaceInput):
         try:
-            retrieved_object = cls.get_or_create_object(info, location_data)
+            retrieved_object = cls.get_or_create_object(info, space_data)
         except ObjectDoesNotExist as e:
             error = LettercraftErrorType(field="id", messages=[str(e)])
             return cls(ok=False, errors=[error])  # type: ignore
 
-        location: SpaceDescription = retrieved_object.object  # type: ignore
+        space: SpaceDescription = retrieved_object.object  # type: ignore
 
         try:
-            cls.mutate_object(location_data, location, info, ["categorisations"])
+            cls.mutate_object(space_data, space, info, ["categorisations"])
         except ObjectDoesNotExist as field:
             error = LettercraftErrorType(
                 field=str(field), messages=["Related object cannot be found."]
             )
             return cls(ok=False, errors=[error])  # type: ignore
 
-        cls.add_contribution(info, location)
-        location.save()
+        cls.add_contribution(info, space)
+        space.save()
 
         return cls(ok=True, errors=[])  # type: ignore
 
     @staticmethod
-    def add_contribution(info: ResolveInfo, location: SpaceDescription) -> None:
+    def add_contribution(info: ResolveInfo, space: SpaceDescription) -> None:
         user = info.context.user
         if user.is_authenticated:
-            location.contributors.add(user)
+            space.contributors.add(user)
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index c276543c..1aeed5eb 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1,35 +1,20 @@
-import { gql } from "apollo-angular";
-import { Injectable } from "@angular/core";
-import * as Apollo from "apollo-angular";
+import { gql } from 'apollo-angular';
+import { Injectable } from '@angular/core';
+import * as Apollo from 'apollo-angular';
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
-export type Exact<T extends { [key: string]: unknown }> = {
-    [K in keyof T]: T[K];
-};
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & {
-    [SubKey in K]?: Maybe<T[SubKey]>;
-};
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & {
-    [SubKey in K]: Maybe<T[SubKey]>;
-};
-export type MakeEmpty<
-    T extends { [key: string]: unknown },
-    K extends keyof T
-> = { [_ in K]?: never };
-export type Incremental<T> =
-    | T
-    | {
-          [P in keyof T]?: P extends " $fragmentName" | "__typename"
-              ? T[P]
-              : never;
-      };
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };
+export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-    ID: { input: string; output: string };
-    String: { input: string; output: string };
-    Boolean: { input: boolean; output: boolean };
-    Int: { input: number; output: number };
-    Float: { input: number; output: number };
+  ID: { input: string; output: string; }
+  String: { input: string; output: string; }
+  Boolean: { input: boolean; output: boolean; }
+  Int: { input: number; output: number; }
+  Float: { input: number; output: number; }
 };
 
 export type AgentDescriptionGenderType = {
@@ -84,21 +69,21 @@ export type AgentDescriptionType = EntityDescription & {
 
 /** An enumeration. */
 export enum Certainty {
-    Certain = "CERTAIN",
-    SomewhatCertain = "SOMEWHAT_CERTAIN",
-    Uncertain = "UNCERTAIN",
+  Certain = 'CERTAIN',
+  SomewhatCertain = 'SOMEWHAT_CERTAIN',
+  Uncertain = 'UNCERTAIN'
 }
 
 export type CreateAgentInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateAgentMutation = {
-    __typename?: "CreateAgentMutation";
-    agent?: Maybe<AgentDescriptionType>;
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'CreateAgentMutation';
+  agent?: Maybe<AgentDescriptionType>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type CreateEpisodeEntityLinkInput = {
@@ -114,64 +99,64 @@ export type CreateEpisodeEntityLinkMutation = {
 };
 
 export type CreateEpisodeInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateEpisodeMutation = {
-    __typename?: "CreateEpisodeMutation";
-    episode?: Maybe<EpisodeType>;
-    errors: Array<LettercraftErrorType>;
+  __typename?: 'CreateEpisodeMutation';
+  episode?: Maybe<EpisodeType>;
+  errors: Array<LettercraftErrorType>;
 };
 
 export type CreateGiftInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateGiftMutation = {
-    __typename?: "CreateGiftMutation";
-    errors: Array<LettercraftErrorType>;
-    gift?: Maybe<GiftDescriptionType>;
+  __typename?: 'CreateGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  gift?: Maybe<GiftDescriptionType>;
 };
 
 export type CreateLetterInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateLetterMutation = {
-    __typename?: "CreateLetterMutation";
-    errors: Array<LettercraftErrorType>;
-    letter?: Maybe<LetterDescriptionType>;
+  __typename?: 'CreateLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  letter?: Maybe<LetterDescriptionType>;
 };
 
 export type CreateLocationInput = {
-    name: Scalars["String"]["input"];
-    source: Scalars["ID"]["input"];
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
 };
 
 export type CreateLocationMutation = {
-    __typename?: "CreateLocationMutation";
-    errors: Array<LettercraftErrorType>;
-    location?: Maybe<SpaceDescriptionType>;
+  __typename?: 'CreateLocationMutation';
+  errors: Array<LettercraftErrorType>;
+  location?: Maybe<SpaceDescriptionType>;
 };
 
 export type CreatePersonReferenceInput = {
-    description: Scalars["ID"]["input"];
-    person: Scalars["ID"]["input"];
+  description: Scalars['ID']['input'];
+  person: Scalars['ID']['input'];
 };
 
 export type CreatePersonReferenceMutation = {
-    __typename?: "CreatePersonReferenceMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'CreatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteAgentMutation = {
-    __typename?: "DeleteAgentMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteAgentMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteEpisodeEntityLinkMutation = {
@@ -181,33 +166,33 @@ export type DeleteEpisodeEntityLinkMutation = {
 };
 
 export type DeleteEpisodeMutation = {
-    __typename?: "DeleteEpisodeMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteEpisodeMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteGiftMutation = {
-    __typename?: "DeleteGiftMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteLetterMutation = {
-    __typename?: "DeleteLetterMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeleteLocationMutation = {
-    __typename?: "DeleteLocationMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeleteLocationMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type DeletePersonReferenceMutation = {
-    __typename?: "DeletePersonReferenceMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'DeletePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export enum Entity {
@@ -228,7 +213,6 @@ export type EpisodeAgentType = EpisodeEntityLink & {
   agent: AgentDescriptionType;
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -244,7 +228,6 @@ export type EpisodeCategoryType = {
 
 export type EpisodeEntityLink = {
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -255,7 +238,6 @@ export type EpisodeGiftType = EpisodeEntityLink & {
   __typename?: 'EpisodeGiftType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   gift: GiftDescriptionType;
   id: Scalars['ID']['output'];
@@ -267,7 +249,6 @@ export type EpisodeLetterType = EpisodeEntityLink & {
   __typename?: 'EpisodeLetterType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   letter: LetterDescriptionType;
@@ -279,7 +260,6 @@ export type EpisodeSpaceType = EpisodeEntityLink & {
   __typename?: 'EpisodeSpaceType';
   certainty: Certainty;
   entity: EntityDescription;
-  entityType: Entity;
   episode: EpisodeType;
   id: Scalars['ID']['output'];
   note?: Maybe<Scalars['String']['output']>;
@@ -320,27 +300,27 @@ export type EpisodeType = EntityDescription & {
 
 /** An enumeration. */
 export enum EventEpisodeSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum Gender {
-    Female = "FEMALE",
-    Male = "MALE",
-    Mixed = "MIXED",
-    Other = "OTHER",
-    Unknown = "UNKNOWN",
+  Female = 'FEMALE',
+  Male = 'MALE',
+  Mixed = 'MIXED',
+  Other = 'OTHER',
+  Unknown = 'UNKNOWN'
 }
 
 export type GiftCategorisationInput = {
-    category: Scalars["ID"]["input"];
-    certainty?: InputMaybe<Scalars["String"]["input"]>;
-    id?: InputMaybe<Scalars["ID"]["input"]>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+  category: Scalars['ID']['input'];
+  certainty?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type GiftCategoryType = {
@@ -397,18 +377,18 @@ export type HistoricalPersonType = {
 };
 
 export type LetterCategorisationInput = {
-    category: Scalars["ID"]["input"];
-    certainty?: InputMaybe<Scalars["String"]["input"]>;
-    id?: InputMaybe<Scalars["ID"]["input"]>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+  category: Scalars['ID']['input'];
+  certainty?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type LetterCategoryType = {
-    __typename?: "LetterCategoryType";
-    description: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    label: Scalars["String"]["output"];
+  __typename?: 'LetterCategoryType';
+  description: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  label: Scalars['String']['output'];
 };
 
 export type LetterDescriptionCategoryType = {
@@ -447,25 +427,25 @@ export type LetterDescriptionType = EntityDescription & {
 
 /** An enumeration. */
 export enum LetterGiftDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum LetterLetterDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** A simple wrapper around Graphene-Django's ErrorType with a constructor. */
 export type LettercraftErrorType = {
-    __typename?: "LettercraftErrorType";
-    field: Scalars["String"]["output"];
-    messages: Array<Scalars["String"]["output"]>;
+  __typename?: 'LettercraftErrorType';
+  field: Scalars['String']['output'];
+  messages: Array<Scalars['String']['output']>;
 };
 
 export type Mutation = {
@@ -475,28 +455,33 @@ export type Mutation = {
   createEpisodeEntityLink?: Maybe<CreateEpisodeEntityLinkMutation>;
   createGift?: Maybe<CreateGiftMutation>;
   createLetter?: Maybe<CreateLetterMutation>;
+  createLocation?: Maybe<CreateLocationMutation>;
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
   deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
   deleteEpisodeEntityLink?: Maybe<DeleteEpisodeEntityLinkMutation>;
   deleteGift?: Maybe<DeleteGiftMutation>;
   deleteLetter?: Maybe<DeleteLetterMutation>;
+  deleteLocation?: Maybe<DeleteLocationMutation>;
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateEpisodeEntityLink?: Maybe<UpdateEpisodeEntityLinkMutation>;
   updateGift?: Maybe<UpdateGiftMutation>;
   updateLetter?: Maybe<UpdateLetterMutation>;
+  updateLocation?: Maybe<UpdateLocationMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
   updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
 };
 
+
 export type MutationCreateAgentArgs = {
-    agentData: CreateAgentInput;
+  agentData: CreateAgentInput;
 };
 
+
 export type MutationCreateEpisodeArgs = {
-    episodeData: CreateEpisodeInput;
+  episodeData: CreateEpisodeInput;
 };
 
 
@@ -506,27 +491,32 @@ export type MutationCreateEpisodeEntityLinkArgs = {
 
 
 export type MutationCreateGiftArgs = {
-    giftData: CreateGiftInput;
+  giftData: CreateGiftInput;
 };
 
+
 export type MutationCreateLetterArgs = {
-    letterData: CreateLetterInput;
+  letterData: CreateLetterInput;
 };
 
+
 export type MutationCreateLocationArgs = {
-    locationData: CreateLocationInput;
+  locationData: CreateLocationInput;
 };
 
+
 export type MutationCreatePersonReferenceArgs = {
-    referenceData: CreatePersonReferenceInput;
+  referenceData: CreatePersonReferenceInput;
 };
 
+
 export type MutationDeleteAgentArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationDeleteEpisodeArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
 
@@ -538,27 +528,32 @@ export type MutationDeleteEpisodeEntityLinkArgs = {
 
 
 export type MutationDeleteGiftArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationDeleteLetterArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationDeleteLocationArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationDeletePersonReferenceArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type MutationUpdateAgentArgs = {
-    agentData: UpdateAgentInput;
+  agentData: UpdateAgentInput;
 };
 
+
 export type MutationUpdateEpisodeArgs = {
-    episodeData: UpdateEpisodeInput;
+  episodeData: UpdateEpisodeInput;
 };
 
 
@@ -568,31 +563,35 @@ export type MutationUpdateEpisodeEntityLinkArgs = {
 
 
 export type MutationUpdateGiftArgs = {
-    giftData: UpdateGiftInput;
+  giftData: UpdateGiftInput;
 };
 
+
 export type MutationUpdateLetterArgs = {
-    letterData: UpdateLetterInput;
+  letterData: UpdateLetterInput;
 };
 
+
 export type MutationUpdateLocationArgs = {
-    locationData: UpdateLocationInput;
+  locationData: UpdateLocationInput;
 };
 
+
 export type MutationUpdateOrCreateSourceArgs = {
-    sourceData: UpdateCreateSourceInput;
+  sourceData: UpdateCreateSourceInput;
 };
 
+
 export type MutationUpdatePersonReferenceArgs = {
-    referenceData: UpdatePersonReferenceInput;
+  referenceData: UpdatePersonReferenceInput;
 };
 
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 export type PersonDateOfBirthType = {
@@ -660,17 +659,20 @@ export type Query = {
   userDescriptions: Array<UserType>;
 };
 
+
 export type QueryAgentDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QueryAgentDescriptionsArgs = {
-    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryEpisodeArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
 
@@ -682,41 +684,49 @@ export type QueryEpisodeEntityLinkArgs = {
 
 
 export type QueryEpisodesArgs = {
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryGiftDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QueryGiftDescriptionsArgs = {
-    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryLetterDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QueryLetterDescriptionsArgs = {
-    episodeId?: InputMaybe<Scalars["ID"]["input"]>;
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  episodeId?: InputMaybe<Scalars['ID']['input']>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QuerySourceArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QuerySpaceDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
+
 export type QuerySpaceDescriptionsArgs = {
-    sourceId?: InputMaybe<Scalars["ID"]["input"]>;
+  sourceId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+
 export type QueryUserDescriptionArgs = {
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 };
 
 export type RegionFieldType = {
@@ -766,23 +776,23 @@ export type SettlementType = {
 };
 
 export type SourceContentsDateType = {
-    __typename?: "SourceContentsDateType";
-    displayDate: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** The source whose events took place at this date */
-    source: SourceType;
-    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-    yearExact?: Maybe<Scalars["Int"]["output"]>;
-    /** The earliest possible year for this value */
-    yearLower: Scalars["Int"]["output"];
-    /** The latest possible year for this value */
-    yearUpper: Scalars["Int"]["output"];
+  __typename?: 'SourceContentsDateType';
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** The source whose events took place at this date */
+  source: SourceType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
 };
 
 /** An enumeration. */
 export enum SourceMention {
-    Direct = "DIRECT",
-    Implied = "IMPLIED",
+  Direct = 'DIRECT',
+  Implied = 'IMPLIED'
 }
 
 export type SourceType = {
@@ -809,17 +819,17 @@ export type SourceType = {
 };
 
 export type SourceWrittenDateType = {
-    __typename?: "SourceWrittenDateType";
-    displayDate: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    /** The source that was written at this date */
-    source: SourceType;
-    /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
-    yearExact?: Maybe<Scalars["Int"]["output"]>;
-    /** The earliest possible year for this value */
-    yearLower: Scalars["Int"]["output"];
-    /** The latest possible year for this value */
-    yearUpper: Scalars["Int"]["output"];
+  __typename?: 'SourceWrittenDateType';
+  displayDate: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  /** The source that was written at this date */
+  source: SourceType;
+  /** The exact year of the value (if known). This will override the values in the lower and upper bounds fields. */
+  yearExact?: Maybe<Scalars['Int']['output']>;
+  /** The earliest possible year for this value */
+  yearLower: Scalars['Int']['output'];
+  /** The latest possible year for this value */
+  yearUpper: Scalars['Int']['output'];
 };
 
 export type SpaceDescriptionType = EntityDescription & {
@@ -851,34 +861,34 @@ export type SpaceDescriptionType = EntityDescription & {
 
 /** An enumeration. */
 export enum SpaceRegionTypeChoices {
-    /** ecclesiastical */
-    Ecclesiastical = "ECCLESIASTICAL",
-    /** geographical */
-    Geographical = "GEOGRAPHICAL",
-    /** political */
-    Political = "POLITICAL",
+  /** ecclesiastical */
+  Ecclesiastical = 'ECCLESIASTICAL',
+  /** geographical */
+  Geographical = 'GEOGRAPHICAL',
+  /** political */
+  Political = 'POLITICAL'
 }
 
 /** An enumeration. */
 export enum SpaceSpaceDescriptionSourceMentionChoices {
-    /** directly mentioned */
-    Direct = "DIRECT",
-    /** implied */
-    Implied = "IMPLIED",
+  /** directly mentioned */
+  Direct = 'DIRECT',
+  /** implied */
+  Implied = 'IMPLIED'
 }
 
 /** An enumeration. */
 export enum SpaceStructureLevelChoices {
-    /** road, square, crossroad */
-    A_1 = "A_1",
-    /** fortification */
-    A_2 = "A_2",
-    /** building, vessel */
-    A_3 = "A_3",
-    /** room */
-    A_4 = "A_4",
-    /** spot, object */
-    A_5 = "A_5",
+  /** road, square, crossroad */
+  A_1 = 'A_1',
+  /** fortification */
+  A_2 = 'A_2',
+  /** building, vessel */
+  A_3 = 'A_3',
+  /** room */
+  A_4 = 'A_4',
+  /** spot, object */
+  A_5 = 'A_5'
 }
 
 export type StructureFieldType = {
@@ -906,41 +916,41 @@ export type StructureType = {
 };
 
 export type UpdateAgentGenderInput = {
-    gender?: InputMaybe<Gender>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+  gender?: InputMaybe<Gender>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentInput = {
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<InputMaybe<Scalars["String"]["input"]>>>;
-    gender?: InputMaybe<UpdateAgentGenderInput>;
-    id: Scalars["ID"]["input"];
-    isGroup?: InputMaybe<Scalars["Boolean"]["input"]>;
-    location?: InputMaybe<UpdateAgentLocationInput>;
-    name?: InputMaybe<Scalars["String"]["input"]>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<InputMaybe<Scalars['String']['input']>>>;
+  gender?: InputMaybe<UpdateAgentGenderInput>;
+  id: Scalars['ID']['input'];
+  isGroup?: InputMaybe<Scalars['Boolean']['input']>;
+  location?: InputMaybe<UpdateAgentLocationInput>;
+  name?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateAgentLocationInput = {
-    location?: InputMaybe<Scalars["ID"]["input"]>;
-    note?: InputMaybe<Scalars["String"]["input"]>;
-    sourceMention?: InputMaybe<SourceMention>;
+  location?: InputMaybe<Scalars['ID']['input']>;
+  note?: InputMaybe<Scalars['String']['input']>;
+  sourceMention?: InputMaybe<SourceMention>;
 };
 
 export type UpdateAgentMutation = {
-    __typename?: "UpdateAgentMutation";
-    agent?: Maybe<AgentDescriptionType>;
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateAgentMutation';
+  agent?: Maybe<AgentDescriptionType>;
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateCreateSourceInput = {
-    editionAuthor?: InputMaybe<Scalars["String"]["input"]>;
-    editionTitle?: InputMaybe<Scalars["String"]["input"]>;
-    id?: InputMaybe<Scalars["ID"]["input"]>;
-    medievalAuthor?: InputMaybe<Scalars["String"]["input"]>;
-    medievalTitle?: InputMaybe<Scalars["String"]["input"]>;
-    name: Scalars["String"]["input"];
+  editionAuthor?: InputMaybe<Scalars['String']['input']>;
+  editionTitle?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  medievalAuthor?: InputMaybe<Scalars['String']['input']>;
+  medievalTitle?: InputMaybe<Scalars['String']['input']>;
+  name: Scalars['String']['input'];
 };
 
 export type UpdateEpisodeEntityLinkInput = {
@@ -958,121 +968,115 @@ export type UpdateEpisodeEntityLinkMutation = {
 };
 
 export type UpdateEpisodeInput = {
-    book?: InputMaybe<Scalars["String"]["input"]>;
-    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-    chapter?: InputMaybe<Scalars["String"]["input"]>;
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
-    id: Scalars["ID"]["input"];
-    name?: InputMaybe<Scalars["String"]["input"]>;
-    page?: InputMaybe<Scalars["String"]["input"]>;
-    summary?: InputMaybe<Scalars["String"]["input"]>;
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
+  summary?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateEpisodeMutation = {
-    __typename?: "UpdateEpisodeMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateEpisodeMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateGiftInput = {
-    book?: InputMaybe<Scalars["String"]["input"]>;
-    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-    categorisations?: InputMaybe<Array<GiftCategorisationInput>>;
-    chapter?: InputMaybe<Scalars["String"]["input"]>;
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
-    id: Scalars["ID"]["input"];
-    name?: InputMaybe<Scalars["String"]["input"]>;
-    page?: InputMaybe<Scalars["String"]["input"]>;
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  categorisations?: InputMaybe<Array<GiftCategorisationInput>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateGiftMutation = {
-    __typename?: "UpdateGiftMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateGiftMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateLetterInput = {
-    book?: InputMaybe<Scalars["String"]["input"]>;
-    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-    categorisations?: InputMaybe<Array<LetterCategorisationInput>>;
-    chapter?: InputMaybe<Scalars["String"]["input"]>;
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
-    id: Scalars["ID"]["input"];
-    name?: InputMaybe<Scalars["String"]["input"]>;
-    page?: InputMaybe<Scalars["String"]["input"]>;
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  categorisations?: InputMaybe<Array<LetterCategorisationInput>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateLetterMutation = {
-    __typename?: "UpdateLetterMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateLetterMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateLocationInput = {
-    book?: InputMaybe<Scalars["String"]["input"]>;
-    categories?: InputMaybe<Array<Scalars["ID"]["input"]>>;
-    chapter?: InputMaybe<Scalars["String"]["input"]>;
-    description?: InputMaybe<Scalars["String"]["input"]>;
-    designators?: InputMaybe<Array<Scalars["String"]["input"]>>;
-    id: Scalars["ID"]["input"];
-    name?: InputMaybe<Scalars["String"]["input"]>;
-    page?: InputMaybe<Scalars["String"]["input"]>;
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdateLocationMutation = {
-    __typename?: "UpdateLocationMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdateLocationMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UpdateOrCreateSourceMutation = {
-    __typename?: "UpdateOrCreateSourceMutation";
-    errors?: Maybe<Array<Maybe<Scalars["String"]["output"]>>>;
-    source?: Maybe<SourceType>;
+  __typename?: 'UpdateOrCreateSourceMutation';
+  errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  source?: Maybe<SourceType>;
 };
 
 export type UpdatePersonReferenceInput = {
-    certainty?: InputMaybe<Certainty>;
-    id: Scalars["ID"]["input"];
-    note?: InputMaybe<Scalars["String"]["input"]>;
+  certainty?: InputMaybe<Certainty>;
+  id: Scalars['ID']['input'];
+  note?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdatePersonReferenceMutation = {
-    __typename?: "UpdatePersonReferenceMutation";
-    errors: Array<LettercraftErrorType>;
-    ok: Scalars["Boolean"]["output"];
+  __typename?: 'UpdatePersonReferenceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
 };
 
 export type UserType = {
-    __typename?: "UserType";
-    firstName: Scalars["String"]["output"];
-    fullName: Scalars["String"]["output"];
-    id: Scalars["ID"]["output"];
-    lastName: Scalars["String"]["output"];
+  __typename?: 'UserType';
+  firstName: Scalars['String']['output'];
+  fullName: Scalars['String']['output'];
+  id: Scalars['ID']['output'];
+  lastName: Scalars['String']['output'];
 };
 
 export type DataEntryAgentDescriptionQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
 
 export type DataEntryAgentDescriptionQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, isGroup: boolean, designators: Array<string>, gender?: { __typename?: 'AgentDescriptionGenderType', id: string, gender: Gender, sourceMention: SourceMention, note: string } | null, location?: { __typename?: 'AgentDescriptionLocationType', id: string, sourceMention: SourceMention, note: string, location: { __typename?: 'SpaceDescriptionType', id: string } } | null, source: { __typename?: 'SourceType', id: string } } | null };
 
 export type LocationsInSourceListQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type LocationsInSourceListQuery = {
-    __typename?: "Query";
-    spaceDescriptions: Array<{
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-    }>;
-};
+
+export type LocationsInSourceListQuery = { __typename?: 'Query', spaceDescriptions: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> };
 
 export type DataEntryAgentEpisodesQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1098,97 +1102,44 @@ export type DataEntryDeleteEpisodeEntityLinkMutationVariables = Exact<{
 export type DataEntryDeleteEpisodeEntityLinkMutation = { __typename?: 'Mutation', deleteEpisodeEntityLink?: { __typename?: 'DeleteEpisodeEntityLinkMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryAgentIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryAgentIdentificationQuery = {
-    __typename?: "Query";
-    agentDescription?: {
-        __typename?: "AgentDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        isGroup: boolean;
-    } | null;
-};
+
+export type DataEntryAgentIdentificationQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean } | null };
 
 export type DataEntryAgentQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryAgentQuery = {
-    __typename?: "Query";
-    agentDescription?: {
-        __typename?: "AgentDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        isGroup: boolean;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryAgentQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, description: string, isGroup: boolean, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateAgentMutationVariables = Exact<{
-    input: UpdateAgentInput;
+  input: UpdateAgentInput;
 }>;
 
-export type DataEntryUpdateAgentMutation = {
-    __typename?: "Mutation";
-    updateAgent?: {
-        __typename?: "UpdateAgentMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateAgentMutation = { __typename?: 'Mutation', updateAgent?: { __typename?: 'UpdateAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteAgentMutationVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryDeleteAgentMutation = {
-    __typename?: "Mutation";
-    deleteAgent?: {
-        __typename?: "DeleteAgentMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            messages: Array<string>;
-            field: string;
-        }>;
-    } | null;
-};
+
+export type DataEntryDeleteAgentMutation = { __typename?: 'Mutation', deleteAgent?: { __typename?: 'DeleteAgentMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', messages: Array<string>, field: string }> } | null };
 
 export type DataEntryEpisodeContentsQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryEpisodeContentsQuery = {
-    __typename?: "Query";
-    episode?: {
-        __typename?: "EpisodeType";
-        id: string;
-        summary: string;
-        categories: Array<{ __typename?: "EpisodeCategoryType"; id: string }>;
-    } | null;
-};
 
-export type DataEntryEpisodeCategoriesQueryVariables = Exact<{
-    [key: string]: never;
-}>;
+export type DataEntryEpisodeContentsQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, summary: string, categories: Array<{ __typename?: 'EpisodeCategoryType', id: string }> } | null };
+
+export type DataEntryEpisodeCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
 
-export type DataEntryEpisodeCategoriesQuery = {
-    __typename?: "Query";
-    episodeCategories: Array<{
-        __typename?: "EpisodeCategoryType";
-        id: string;
-        name: string;
-        description: string;
-    }>;
-};
+
+export type DataEntryEpisodeCategoriesQuery = { __typename?: 'Query', episodeCategories: Array<{ __typename?: 'EpisodeCategoryType', id: string, name: string, description: string }> };
 
 export type DataEntryEpisodeEntitiesQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -1198,365 +1149,161 @@ export type DataEntryEpisodeEntitiesQueryVariables = Exact<{
 export type DataEntryEpisodeEntitiesQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, source: { __typename?: 'SourceType', id: string, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> } | null };
 
 export type DataEntryEpisodeIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryEpisodeIdentificationQuery = {
-    __typename?: "Query";
-    episode?: {
-        __typename?: "EpisodeType";
-        id: string;
-        name: string;
-        description: string;
-    } | null;
-};
+
+export type DataEntryEpisodeIdentificationQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, description: string } | null };
 
 export type DataEntryEpisodeSourceTextMentionQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryEpisodeSourceTextMentionQuery = {
-    __typename?: "Query";
-    episode?: {
-        __typename?: "EpisodeType";
-        id: string;
-        designators: Array<string>;
-        book: string;
-        chapter: string;
-        page: string;
-    } | null;
-};
+
+export type DataEntryEpisodeSourceTextMentionQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryEpisodeFormQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
 
 export type DataEntryEpisodeFormQuery = { __typename?: 'Query', episode?: { __typename?: 'EpisodeType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateEpisodeMutationVariables = Exact<{
-    episodeData: UpdateEpisodeInput;
+  episodeData: UpdateEpisodeInput;
 }>;
 
-export type DataEntryUpdateEpisodeMutation = {
-    __typename?: "Mutation";
-    updateEpisode?: {
-        __typename?: "UpdateEpisodeMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateEpisodeMutation = { __typename?: 'Mutation', updateEpisode?: { __typename?: 'UpdateEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryCreateEpisodeMutationVariables = Exact<{
-    episodeData: CreateEpisodeInput;
+  episodeData: CreateEpisodeInput;
 }>;
 
-export type DataEntryCreateEpisodeMutation = {
-    __typename?: "Mutation";
-    createEpisode?: {
-        __typename?: "CreateEpisodeMutation";
-        episode?: { __typename?: "EpisodeType"; id: string } | null;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryCreateEpisodeMutation = { __typename?: 'Mutation', createEpisode?: { __typename?: 'CreateEpisodeMutation', episode?: { __typename?: 'EpisodeType', id: string } | null, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryGiftCategoriesQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftCategoriesQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        categorisations: Array<{
-            __typename?: "GiftDescriptionCategoryType";
-            id: string;
-            sourceMention?: LetterGiftDescriptionCategorySourceMentionChoices | null;
-            note: string;
-            certainty: LetterGiftDescriptionCategoryCertaintyChoices;
-            category: {
-                __typename?: "GiftCategoryType";
-                id: string;
-                name: string;
-            };
-        }>;
-    } | null;
-};
 
 export type DataEntryGiftCategoriesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, categorisations: Array<{ __typename?: 'GiftDescriptionCategoryType', id: string, sourceMention: SourceMention, note: string, certainty: Certainty, category: { __typename?: 'GiftCategoryType', id: string, name: string } }> } | null };
 
-export type DataEntryAllGiftCategoriesQuery = {
-    __typename?: "Query";
-    letterCategories: Array<{
-        __typename?: "LetterCategoryType";
-        id: string;
-        label: string;
-        description: string;
-    }>;
-};
+export type DataEntryAllGiftCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntryAllGiftCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
 
 export type DataEntryGiftIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftIdentificationQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-    } | null;
-};
+
+export type DataEntryGiftIdentificationQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string } | null };
 
 export type DataEntryGiftSourceTextQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftSourceTextQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        designators: Array<string>;
-        book: string;
-        chapter: string;
-        page: string;
-    } | null;
-};
+
+export type DataEntryGiftSourceTextQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryGiftFormQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryGiftFormQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryGiftFormQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateGiftMutationVariables = Exact<{
-    giftData: UpdateGiftInput;
+  giftData: UpdateGiftInput;
 }>;
 
-export type DataEntryUpdateGiftMutation = {
-    __typename?: "Mutation";
-    updateGift?: {
-        __typename?: "UpdateGiftMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateGiftMutation = { __typename?: 'Mutation', updateGift?: { __typename?: 'UpdateGiftMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryLetterCategoriesQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterCategoriesQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        categorisations: Array<{
-            __typename?: "LetterDescriptionCategoryType";
-            id: string;
-            sourceMention?: LetterLetterDescriptionCategorySourceMentionChoices | null;
-            note: string;
-            certainty: LetterLetterDescriptionCategoryCertaintyChoices;
-            category: {
-                __typename?: "LetterCategoryType";
-                id: string;
-                label: string;
-            };
-        }>;
-    } | null;
-};
 
 export type DataEntryLetterCategoriesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, categorisations: Array<{ __typename?: 'LetterDescriptionCategoryType', id: string, sourceMention: SourceMention, note: string, certainty: Certainty, category: { __typename?: 'LetterCategoryType', id: string, label: string } }> } | null };
 
-export type DataEntryAllLetterCategoriesQuery = {
-    __typename?: "Query";
-    letterCategories: Array<{
-        __typename?: "LetterCategoryType";
-        id: string;
-        label: string;
-        description: string;
-    }>;
-};
+export type DataEntryAllLetterCategoriesQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntryAllLetterCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
 
 export type DataEntryLetterIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterIdentificationQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-    } | null;
-};
+
+export type DataEntryLetterIdentificationQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string } | null };
 
 export type DataEntryLetterSourceTextQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterSourceTextQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        designators: Array<string>;
-        book: string;
-        chapter: string;
-        page: string;
-    } | null;
-};
+
+export type DataEntryLetterSourceTextQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryLetterFormQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLetterFormQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryLetterFormQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateLetterMutationVariables = Exact<{
-    letterData: UpdateLetterInput;
+  letterData: UpdateLetterInput;
 }>;
 
-export type DataEntryUpdateLetterMutation = {
-    __typename?: "Mutation";
-    updateLetter?: {
-        __typename?: "UpdateLetterMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateLetterMutation = { __typename?: 'Mutation', updateLetter?: { __typename?: 'UpdateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryLocationIdentificationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLocationIdentificationQuery = {
-    __typename?: "Query";
-    spaceDescription?: {
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-    } | null;
-};
+
+export type DataEntryLocationIdentificationQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string } | null };
 
 export type DataEntryLocationSourceTextQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLocationSourceTextQuery = {
-    __typename?: "Query";
-    spaceDescription?: {
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        designators: Array<string>;
-        book: string;
-        chapter: string;
-        page: string;
-    } | null;
-};
+
+export type DataEntryLocationSourceTextQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
 export type DataEntryLocationQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryLocationQuery = {
-    __typename?: "Query";
-    spaceDescription?: {
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntryLocationQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateLocationMutationVariables = Exact<{
-    locationData: UpdateLocationInput;
+  locationData: UpdateLocationInput;
 }>;
 
-export type DataEntryUpdateLocationMutation = {
-    __typename?: "Mutation";
-    updateLocation?: {
-        __typename?: "UpdateLocationMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryUpdateLocationMutation = { __typename?: 'Mutation', updateLocation?: { __typename?: 'UpdateLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteLocationMutationVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryDeleteLocationMutation = {
-    __typename?: "Mutation";
-    deleteLocation?: {
-        __typename?: "DeleteLocationMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryDeleteLocationMutation = { __typename?: 'Mutation', deleteLocation?: { __typename?: 'DeleteLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntrySpaceDescriptionQuery = {
-    __typename?: "Query";
-    spaceDescription?: {
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-        description: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type DataEntrySpaceDescriptionQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryEpisodeEntityLinkQueryVariables = Exact<{
   entity: Scalars['ID']['input'];
@@ -1575,193 +1322,103 @@ export type DataEntryUpdateEpisodeEntityLinkMutationVariables = Exact<{
 export type DataEntryUpdateEpisodeEntityLinkMutation = { __typename?: 'Mutation', updateEpisodeEntityLink?: { __typename?: 'UpdateEpisodeEntityLinkMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteEpisodeMutationVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntryDeleteEpisodeMutation = {
-    __typename?: "Mutation";
-    deleteEpisode?: {
-        __typename?: "DeleteEpisodeMutation";
-        ok: boolean;
-        errors: Array<{
-            __typename?: "LettercraftErrorType";
-            field: string;
-            messages: Array<string>;
-        }>;
-    } | null;
-};
+
+export type DataEntryDeleteEpisodeMutation = { __typename?: 'Mutation', deleteEpisode?: { __typename?: 'DeleteEpisodeMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntrySourceDetailQueryVariables = Exact<{
-    id: Scalars["ID"]["input"];
+  id: Scalars['ID']['input'];
 }>;
 
-export type DataEntrySourceDetailQuery = {
-    __typename?: "Query";
-    source: {
-        __typename?: "SourceType";
-        id: string;
-        name: string;
-        episodes: Array<{
-            __typename?: "EpisodeType";
-            id: string;
-            name: string;
-            description: string;
-            summary: string;
-            book: string;
-            chapter: string;
-            page: string;
-            contributors: Array<{
-                __typename?: "UserType";
-                id: string;
-                fullName: string;
-            }>;
-            agents: Array<{
-                __typename?: "AgentDescriptionType";
-                id: string;
-                name: string;
-                isGroup: boolean;
-                describes?: Array<{
-                    __typename?: "HistoricalPersonType";
-                    id: string;
-                    identifiable: boolean;
-                } | null> | null;
-            }>;
-            gifts: Array<{
-                __typename?: "GiftDescriptionType";
-                id: string;
-                name: string;
-            }>;
-            letters: Array<{
-                __typename?: "LetterDescriptionType";
-                id: string;
-                name: string;
-            }>;
-            spaces: Array<{
-                __typename?: "SpaceDescriptionType";
-                id: string;
-                name: string;
-            }>;
-        }>;
-    };
-};
 
 export type DataEntrySourceDetailQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string, description: string, summary: string, book: string, chapter: string, page: string, contributors: Array<{ __typename?: 'UserType', id: string, fullName: string }>, agents: Array<{ __typename?: 'AgentDescriptionType', id: string, name: string, isGroup: boolean, describes: Array<{ __typename?: 'HistoricalPersonType', id: string, identifiable: boolean }> }>, gifts: Array<{ __typename?: 'GiftDescriptionType', id: string, name: string }>, letters: Array<{ __typename?: 'LetterDescriptionType', id: string, name: string }>, spaces: Array<{ __typename?: 'SpaceDescriptionType', id: string, name: string }> }> } };
 
-export type DataEntrySourceListQuery = {
-    __typename?: "Query";
-    sources: Array<{
-        __typename?: "SourceType";
-        id: string;
-        name: string;
-        editionAuthor: string;
-        editionTitle: string;
-        medievalAuthor: string;
-        medievalTitle: string;
-        numOfEpisodes: number;
-    }>;
-};
+export type DataEntrySourceListQueryVariables = Exact<{ [key: string]: never; }>;
 
-export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
 
-export type SourceTitleQueryQuery = {
-    __typename?: "Query";
-    source: { __typename?: "SourceType"; id: string; name: string };
-};
+export type DataEntrySourceListQuery = { __typename?: 'Query', sources: Array<{ __typename?: 'SourceType', id: string, name: string, editionAuthor: string, editionTitle: string, medievalAuthor: string, medievalTitle: string, numOfEpisodes: number }> };
 
-export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+export type SourceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
-export type AgentTitleQueryQuery = {
-    __typename?: "Query";
-    agentDescription?: {
-        __typename?: "AgentDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
 
-export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+export type SourceTitleQueryQuery = { __typename?: 'Query', source: { __typename?: 'SourceType', id: string, name: string } };
 
-export type LetterTitleQueryQuery = {
-    __typename?: "Query";
-    letterDescription?: {
-        __typename?: "LetterDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+export type AgentTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
-export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
 
-export type GiftTitleQueryQuery = {
-    __typename?: "Query";
-    giftDescription?: {
-        __typename?: "GiftDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+export type AgentTitleQueryQuery = { __typename?: 'Query', agentDescription?: { __typename?: 'AgentDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
-export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never }>;
+export type LetterTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
-export type SpaceTitleQueryQuery = {
-    __typename?: "Query";
-    spaceDescription?: {
-        __typename?: "SpaceDescriptionType";
-        id: string;
-        name: string;
-        source: { __typename?: "SourceType"; id: string; name: string };
-    } | null;
-};
+
+export type LetterTitleQueryQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type GiftTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type GiftTitleQueryQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
+
+export type SpaceTitleQueryQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SpaceTitleQueryQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export const DataEntryAgentDescriptionDocument = gql`
     query DataEntryAgentDescription($id: ID!) {
-        agentDescription(id: $id) {
-            id
-            isGroup
-            designators
-            gender {
-                id
-                gender
-                sourceMention
-                note
-            }
-            location {
-                id
-                sourceMention
-                note
-                location {
-                    id
-                }
-            }
-            source {
-                id
-            }
-        }
+  agentDescription(id: $id) {
+    id
+    isGroup
+    designators
+    gender {
+      id
+      gender
+      sourceMention
+      note
+    }
+    location {
+      id
+      sourceMention
+      note
+      location {
+        id
+      }
+    }
+    source {
+      id
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAgentDescriptionGQL extends Apollo.Query<
-    DataEntryAgentDescriptionQuery,
-    DataEntryAgentDescriptionQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const LocationsInSourceListDocument = gql`
     query LocationsInSourceList($id: ID!) {
-        spaceDescriptions(sourceId: $id) {
-            id
-            name
-        }
+  spaceDescriptions(sourceId: $id) {
+    id
+    name
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
+    override document = LocationsInSourceListDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
     }
   }
 export const DataEntryAgentEpisodesDocument = gql`
@@ -1791,7 +1448,7 @@ export const DataEntryAgentEpisodesDocument = gql`
   })
   export class DataEntryAgentEpisodesGQL extends Apollo.Query<DataEntryAgentEpisodesQuery, DataEntryAgentEpisodesQueryVariables> {
     override document = DataEntryAgentEpisodesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1813,7 +1470,7 @@ export const DataEntryCreateEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryCreateEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryCreateEpisodeEntityLinkMutation, DataEntryCreateEpisodeEntityLinkMutationVariables> {
     override document = DataEntryCreateEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1839,145 +1496,141 @@ export const DataEntryDeleteEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryDeleteEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryDeleteEpisodeEntityLinkMutation, DataEntryDeleteEpisodeEntityLinkMutationVariables> {
     override document = DataEntryDeleteEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
 export const DataEntryAgentIdentificationDocument = gql`
     query DataEntryAgentIdentification($id: ID!) {
-        agentDescription(id: $id) {
-            id
-            name
-            description
-            isGroup
-        }
-    }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAgentIdentificationGQL extends Apollo.Query<
-    DataEntryAgentIdentificationQuery,
-    DataEntryAgentIdentificationQueryVariables
-> {
-    override document = DataEntryAgentIdentificationDocument;
-
-    constructor(apollo: Apollo.Apollo) {
-        super(apollo);
-    }
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    isGroup
+  }
 }
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
+    override document = DataEntryAgentIdentificationDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
 export const DataEntryAgentDocument = gql`
     query DataEntryAgent($id: ID!) {
-        agentDescription(id: $id) {
-            id
-            name
-            description
-            isGroup
-            source {
-                id
-                name
-            }
-        }
+  agentDescription(id: $id) {
+    id
+    name
+    description
+    isGroup
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAgentGQL extends Apollo.Query<
-    DataEntryAgentQuery,
-    DataEntryAgentQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateAgentDocument = gql`
     mutation DataEntryUpdateAgent($input: UpdateAgentInput!) {
-        updateAgent(agentData: $input) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateAgent(agentData: $input) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateAgentGQL extends Apollo.Mutation<
-    DataEntryUpdateAgentMutation,
-    DataEntryUpdateAgentMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateAgentGQL extends Apollo.Mutation<DataEntryUpdateAgentMutation, DataEntryUpdateAgentMutationVariables> {
     override document = DataEntryUpdateAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryDeleteAgentDocument = gql`
     mutation DataEntryDeleteAgent($id: ID!) {
-        deleteAgent(id: $id) {
-            ok
-            errors {
-                messages
-                field
-            }
-        }
+  deleteAgent(id: $id) {
+    ok
+    errors {
+      messages
+      field
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryDeleteAgentGQL extends Apollo.Mutation<
-    DataEntryDeleteAgentMutation,
-    DataEntryDeleteAgentMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
     override document = DataEntryDeleteAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeContentsDocument = gql`
     query DataEntryEpisodeContents($id: ID!) {
-        episode(id: $id) {
-            id
-            summary
-            categories {
-                id
-            }
-        }
+  episode(id: $id) {
+    id
+    summary
+    categories {
+      id
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeContentsGQL extends Apollo.Query<
-    DataEntryEpisodeContentsQuery,
-    DataEntryEpisodeContentsQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeCategoriesDocument = gql`
     query DataEntryEpisodeCategories {
-        episodeCategories {
-            id
-            name
-            description
-        }
+  episodeCategories {
+    id
+    name
+    description
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
+    override document = DataEntryEpisodeCategoriesDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
     }
   }
 export const DataEntryEpisodeEntitiesDocument = gql`
@@ -2028,59 +1681,53 @@ export const DataEntryEpisodeEntitiesDocument = gql`
   })
   export class DataEntryEpisodeEntitiesGQL extends Apollo.Query<DataEntryEpisodeEntitiesQuery, DataEntryEpisodeEntitiesQueryVariables> {
     override document = DataEntryEpisodeEntitiesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
 export const DataEntryEpisodeIdentificationDocument = gql`
     query DataEntryEpisodeIdentification($id: ID!) {
-        episode(id: $id) {
-            id
-            name
-            description
-        }
-    }
-`;
+  episode(id: $id) {
+    id
+    name
+    description
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<
-    DataEntryEpisodeIdentificationQuery,
-    DataEntryEpisodeIdentificationQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeSourceTextMentionDocument = gql`
     query DataEntryEpisodeSourceTextMention($id: ID!) {
-        episode(id: $id) {
-            id
-            designators
-            book
-            chapter
-            page
-        }
-    }
-`;
+  episode(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<
-    DataEntryEpisodeSourceTextMentionQuery,
-    DataEntryEpisodeSourceTextMentionQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryEpisodeFormDocument = gql`
     query DataEntryEpisodeForm($id: ID!) {
   episode(id: $id) {
@@ -2090,531 +1737,470 @@ export const DataEntryEpisodeFormDocument = gql`
       id
       name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryEpisodeFormGQL extends Apollo.Query<
-    DataEntryEpisodeFormQuery,
-    DataEntryEpisodeFormQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateEpisodeDocument = gql`
     mutation DataEntryUpdateEpisode($episodeData: UpdateEpisodeInput!) {
-        updateEpisode(episodeData: $episodeData) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateEpisode(episodeData: $episodeData) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<
-    DataEntryUpdateEpisodeMutation,
-    DataEntryUpdateEpisodeMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryCreateEpisodeDocument = gql`
     mutation DataEntryCreateEpisode($episodeData: CreateEpisodeInput!) {
-        createEpisode(episodeData: $episodeData) {
-            episode {
-                id
-            }
-            errors {
-                field
-                messages
-            }
-        }
+  createEpisode(episodeData: $episodeData) {
+    episode {
+      id
+    }
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<
-    DataEntryCreateEpisodeMutation,
-    DataEntryCreateEpisodeMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftCategoriesDocument = gql`
     query DataEntryGiftCategories($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            categorisations {
-                id
-                sourceMention
-                note
-                certainty
-                category {
-                    id
-                    name
-                }
-            }
-        }
+  giftDescription(id: $id) {
+    id
+    categorisations {
+      id
+      sourceMention
+      note
+      certainty
+      category {
+        id
+        name
+      }
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftCategoriesGQL extends Apollo.Query<
-    DataEntryGiftCategoriesQuery,
-    DataEntryGiftCategoriesQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftCategoriesGQL extends Apollo.Query<DataEntryGiftCategoriesQuery, DataEntryGiftCategoriesQueryVariables> {
     override document = DataEntryGiftCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryAllGiftCategoriesDocument = gql`
     query DataEntryAllGiftCategories {
-        letterCategories {
-            id
-            label
-            description
-        }
-    }
-`;
+  letterCategories {
+    id
+    label
+    description
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<
-    DataEntryAllGiftCategoriesQuery,
-    DataEntryAllGiftCategoriesQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
     override document = DataEntryAllGiftCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftIdentificationDocument = gql`
     query DataEntryGiftIdentification($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            name
-            description
-        }
-    }
-`;
+  giftDescription(id: $id) {
+    id
+    name
+    description
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftIdentificationGQL extends Apollo.Query<
-    DataEntryGiftIdentificationQuery,
-    DataEntryGiftIdentificationQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftIdentificationGQL extends Apollo.Query<DataEntryGiftIdentificationQuery, DataEntryGiftIdentificationQueryVariables> {
     override document = DataEntryGiftIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftSourceTextDocument = gql`
     query DataEntryGiftSourceText($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            designators
-            book
-            chapter
-            page
-        }
-    }
-`;
+  giftDescription(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftSourceTextGQL extends Apollo.Query<
-    DataEntryGiftSourceTextQuery,
-    DataEntryGiftSourceTextQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftSourceTextGQL extends Apollo.Query<DataEntryGiftSourceTextQuery, DataEntryGiftSourceTextQueryVariables> {
     override document = DataEntryGiftSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryGiftFormDocument = gql`
     query DataEntryGiftForm($id: ID!) {
-        giftDescription(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  giftDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryGiftFormGQL extends Apollo.Query<
-    DataEntryGiftFormQuery,
-    DataEntryGiftFormQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftFormGQL extends Apollo.Query<DataEntryGiftFormQuery, DataEntryGiftFormQueryVariables> {
     override document = DataEntryGiftFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateGiftDocument = gql`
     mutation DataEntryUpdateGift($giftData: UpdateGiftInput!) {
-        updateGift(giftData: $giftData) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateGift(giftData: $giftData) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateGiftGQL extends Apollo.Mutation<
-    DataEntryUpdateGiftMutation,
-    DataEntryUpdateGiftMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
     override document = DataEntryUpdateGiftDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterCategoriesDocument = gql`
     query DataEntryLetterCategories($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            categorisations {
-                id
-                sourceMention
-                note
-                certainty
-                category {
-                    id
-                    label
-                }
-            }
-        }
+  letterDescription(id: $id) {
+    id
+    categorisations {
+      id
+      sourceMention
+      note
+      certainty
+      category {
+        id
+        label
+      }
     }
-`;
-
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterCategoriesGQL extends Apollo.Query<
-    DataEntryLetterCategoriesQuery,
-    DataEntryLetterCategoriesQueryVariables
-> {
-    override document = DataEntryLetterCategoriesDocument;
+  }
+}
+    `;
 
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterCategoriesGQL extends Apollo.Query<DataEntryLetterCategoriesQuery, DataEntryLetterCategoriesQueryVariables> {
+    override document = DataEntryLetterCategoriesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryAllLetterCategoriesDocument = gql`
     query DataEntryAllLetterCategories {
-        letterCategories {
-            id
-            label
-            description
-        }
-    }
-`;
+  letterCategories {
+    id
+    label
+    description
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<
-    DataEntryAllLetterCategoriesQuery,
-    DataEntryAllLetterCategoriesQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
     override document = DataEntryAllLetterCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterIdentificationDocument = gql`
     query DataEntryLetterIdentification($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            name
-            description
-        }
-    }
-`;
+  letterDescription(id: $id) {
+    id
+    name
+    description
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterIdentificationGQL extends Apollo.Query<
-    DataEntryLetterIdentificationQuery,
-    DataEntryLetterIdentificationQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterIdentificationGQL extends Apollo.Query<DataEntryLetterIdentificationQuery, DataEntryLetterIdentificationQueryVariables> {
     override document = DataEntryLetterIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterSourceTextDocument = gql`
     query DataEntryLetterSourceText($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            designators
-            book
-            chapter
-            page
-        }
-    }
-`;
+  letterDescription(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterSourceTextGQL extends Apollo.Query<
-    DataEntryLetterSourceTextQuery,
-    DataEntryLetterSourceTextQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterSourceTextGQL extends Apollo.Query<DataEntryLetterSourceTextQuery, DataEntryLetterSourceTextQueryVariables> {
     override document = DataEntryLetterSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLetterFormDocument = gql`
     query DataEntryLetterForm($id: ID!) {
-        letterDescription(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  letterDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLetterFormGQL extends Apollo.Query<
-    DataEntryLetterFormQuery,
-    DataEntryLetterFormQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterFormGQL extends Apollo.Query<DataEntryLetterFormQuery, DataEntryLetterFormQueryVariables> {
     override document = DataEntryLetterFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateLetterDocument = gql`
     mutation DataEntryUpdateLetter($letterData: UpdateLetterInput!) {
-        updateLetter(letterData: $letterData) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateLetter(letterData: $letterData) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateLetterGQL extends Apollo.Mutation<
-    DataEntryUpdateLetterMutation,
-    DataEntryUpdateLetterMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
     override document = DataEntryUpdateLetterDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLocationIdentificationDocument = gql`
     query DataEntryLocationIdentification($id: ID!) {
-        spaceDescription(id: $id) {
-            id
-            name
-            description
-        }
-    }
-`;
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLocationIdentificationGQL extends Apollo.Query<
-    DataEntryLocationIdentificationQuery,
-    DataEntryLocationIdentificationQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLocationIdentificationGQL extends Apollo.Query<DataEntryLocationIdentificationQuery, DataEntryLocationIdentificationQueryVariables> {
     override document = DataEntryLocationIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLocationSourceTextDocument = gql`
     query DataEntryLocationSourceText($id: ID!) {
-        spaceDescription(id: $id) {
-            id
-            designators
-            book
-            chapter
-            page
-        }
-    }
-`;
+  spaceDescription(id: $id) {
+    id
+    designators
+    book
+    chapter
+    page
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLocationSourceTextGQL extends Apollo.Query<
-    DataEntryLocationSourceTextQuery,
-    DataEntryLocationSourceTextQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLocationSourceTextGQL extends Apollo.Query<DataEntryLocationSourceTextQuery, DataEntryLocationSourceTextQueryVariables> {
     override document = DataEntryLocationSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryLocationDocument = gql`
     query DataEntryLocation($id: ID!) {
-        spaceDescription(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryLocationGQL extends Apollo.Query<
-    DataEntryLocationQuery,
-    DataEntryLocationQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLocationGQL extends Apollo.Query<DataEntryLocationQuery, DataEntryLocationQueryVariables> {
     override document = DataEntryLocationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryUpdateLocationDocument = gql`
     mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
-        updateLocation(locationData: $locationData) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  updateLocation(locationData: $locationData) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryUpdateLocationGQL extends Apollo.Mutation<
-    DataEntryUpdateLocationMutation,
-    DataEntryUpdateLocationMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryUpdateLocationGQL extends Apollo.Mutation<DataEntryUpdateLocationMutation, DataEntryUpdateLocationMutationVariables> {
     override document = DataEntryUpdateLocationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntryDeleteLocationDocument = gql`
     mutation DataEntryDeleteLocation($id: ID!) {
-        deleteLocation(id: $id) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  deleteLocation(id: $id) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryDeleteLocationGQL extends Apollo.Mutation<
-    DataEntryDeleteLocationMutation,
-    DataEntryDeleteLocationMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteLocationGQL extends Apollo.Mutation<DataEntryDeleteLocationMutation, DataEntryDeleteLocationMutationVariables> {
     override document = DataEntryDeleteLocationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntrySpaceDescriptionDocument = gql`
     query DataEntrySpaceDescription($id: ID!) {
-        spaceDescription(id: $id) {
-            id
-            name
-            description
-            source {
-                id
-                name
-            }
-        }
+  spaceDescription(id: $id) {
+    id
+    name
+    description
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntrySpaceDescriptionGQL extends Apollo.Query<
-    DataEntrySpaceDescriptionQuery,
-    DataEntrySpaceDescriptionQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
   }
 export const DataEntryEpisodeEntityLinkDocument = gql`
@@ -2640,7 +2226,7 @@ export const DataEntryEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryEpisodeEntityLinkGQL extends Apollo.Query<DataEntryEpisodeEntityLinkQuery, DataEntryEpisodeEntityLinkQueryVariables> {
     override document = DataEntryEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2662,242 +2248,218 @@ export const DataEntryUpdateEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryUpdateEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryUpdateEpisodeEntityLinkMutation, DataEntryUpdateEpisodeEntityLinkMutationVariables> {
     override document = DataEntryUpdateEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
   }
 export const DataEntryDeleteEpisodeDocument = gql`
     mutation DataEntryDeleteEpisode($id: ID!) {
-        deleteEpisode(id: $id) {
-            ok
-            errors {
-                field
-                messages
-            }
-        }
+  deleteEpisode(id: $id) {
+    ok
+    errors {
+      field
+      messages
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<
-    DataEntryDeleteEpisodeMutation,
-    DataEntryDeleteEpisodeMutationVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntrySourceDetailDocument = gql`
     query DataEntrySourceDetail($id: ID!) {
-        source(id: $id) {
-            id
-            name
-            episodes {
-                id
-                name
-                description
-                summary
-                book
-                chapter
-                contributors {
-                    id
-                    fullName
-                }
-                page
-                agents {
-                    id
-                    name
-                    isGroup
-                    describes {
-                        id
-                        identifiable
-                    }
-                }
-                gifts {
-                    id
-                    name
-                }
-                letters {
-                    id
-                    name
-                }
-                spaces {
-                    id
-                    name
-                }
-            }
+  source(id: $id) {
+    id
+    name
+    episodes {
+      id
+      name
+      description
+      summary
+      book
+      chapter
+      contributors {
+        id
+        fullName
+      }
+      page
+      agents {
+        id
+        name
+        isGroup
+        describes {
+          id
+          identifiable
         }
+      }
+      gifts {
+        id
+        name
+      }
+      letters {
+        id
+        name
+      }
+      spaces {
+        id
+        name
+      }
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntrySourceDetailGQL extends Apollo.Query<
-    DataEntrySourceDetailQuery,
-    DataEntrySourceDetailQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const DataEntrySourceListDocument = gql`
     query DataEntrySourceList {
-        sources {
-            id
-            name
-            editionAuthor
-            editionTitle
-            medievalAuthor
-            medievalTitle
-            numOfEpisodes
-        }
-    }
-`;
+  sources {
+    id
+    name
+    editionAuthor
+    editionTitle
+    medievalAuthor
+    medievalTitle
+    numOfEpisodes
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class DataEntrySourceListGQL extends Apollo.Query<
-    DataEntrySourceListQuery,
-    DataEntrySourceListQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const SourceTitleQueryDocument = gql`
     query SourceTitleQuery {
-        source(id: "") {
-            id
-            name
-        }
-    }
-`;
+  source(id: "") {
+    id
+    name
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class SourceTitleQueryGQL extends Apollo.Query<
-    SourceTitleQueryQuery,
-    SourceTitleQueryQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
     override document = SourceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const AgentTitleQueryDocument = gql`
     query AgentTitleQuery {
-        agentDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  agentDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class AgentTitleQueryGQL extends Apollo.Query<
-    AgentTitleQueryQuery,
-    AgentTitleQueryQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
     override document = AgentTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const LetterTitleQueryDocument = gql`
     query LetterTitleQuery {
-        letterDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  letterDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class LetterTitleQueryGQL extends Apollo.Query<
-    LetterTitleQueryQuery,
-    LetterTitleQueryQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
     override document = LetterTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const GiftTitleQueryDocument = gql`
     query GiftTitleQuery {
-        giftDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  giftDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class GiftTitleQueryGQL extends Apollo.Query<
-    GiftTitleQueryQuery,
-    GiftTitleQueryQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
     override document = GiftTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
 export const SpaceTitleQueryDocument = gql`
     query SpaceTitleQuery {
-        spaceDescription(id: "") {
-            id
-            name
-            source {
-                id
-                name
-            }
-        }
+  spaceDescription(id: "") {
+    id
+    name
+    source {
+      id
+      name
     }
-`;
+  }
+}
+    `;
 
-@Injectable({
-    providedIn: "root",
-})
-export class SpaceTitleQueryGQL extends Apollo.Query<
-    SpaceTitleQueryQuery,
-    SpaceTitleQueryQueryVariables
-> {
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
     override document = SpaceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
-        super(apollo);
+      super(apollo);
     }
-}
+  }
\ No newline at end of file
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 93d98eb8..8dd3fb56 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -187,7 +187,6 @@ type EpisodeAgentType implements EpisodeEntityLink {
   agent: AgentDescriptionType!
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -202,7 +201,6 @@ type EpisodeCategoryType {
 
 interface EpisodeEntityLink {
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String
@@ -212,7 +210,6 @@ interface EpisodeEntityLink {
 type EpisodeGiftType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   gift: GiftDescriptionType!
   id: ID!
@@ -223,7 +220,6 @@ type EpisodeGiftType implements EpisodeEntityLink {
 type EpisodeLetterType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   letter: LetterDescriptionType!
@@ -234,7 +230,6 @@ type EpisodeLetterType implements EpisodeEntityLink {
 type EpisodeSpaceType implements EpisodeEntityLink {
   certainty: Certainty!
   entity: EntityDescription!
-  entityType: Entity!
   episode: EpisodeType!
   id: ID!
   note: String

From ce734cd97c709fd2797b91b18bc5349257b89ddf Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Sun, 29 Sep 2024 22:35:59 +0200
Subject: [PATCH 538/565] Added location subspace form

---
 backend/source/types/SourceType.py            |   3 +-
 backend/space/queries.py                      |  20 +-
 frontend/generated/graphql.ts                 | 216 +++++++++++++-----
 frontend/generated/schema.graphql             |  65 +++---
 .../episode-entities.graphql                  |   2 +-
 .../location-form.component.html              |   2 +-
 .../location-form/location-form.component.ts  |   2 +-
 .../location-form/location-form.module.ts     |   2 +
 .../location-identification-form.component.ts |   4 +-
 .../location-source-text-form.component.ts    |   8 +-
 .../location-subspace-form.component.html     |  52 +++++
 .../location-subspace-form.component.scss     |   0
 .../location-subspace-form.component.spec.ts  |  21 ++
 .../location-subspace-form.component.ts       | 148 ++++++++++++
 .../location-subspace-form.graphql            |  39 ++++
 .../data-entry/location-form/location.graphql |   6 +-
 16 files changed, 493 insertions(+), 97 deletions(-)
 create mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html
 create mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.scss
 create mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 09a0b367..95e24170 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -1,5 +1,5 @@
 from graphene import Field, Int, List, NonNull, ResolveInfo
-from django.db.models import QuerySet, Value, Case, When, F
+from django.db.models import QuerySet
 from graphene_django import DjangoObjectType
 from typing import Type
 
@@ -38,6 +38,7 @@ class Meta:
             "edition_author",
         ]
 
+    @staticmethod
     def _entity_resolver(
         Model: Type[EntityDescription], OutputType: Type[DjangoObjectType]
     ):
diff --git a/backend/space/queries.py b/backend/space/queries.py
index d1996d03..77af3b7d 100644
--- a/backend/space/queries.py
+++ b/backend/space/queries.py
@@ -2,8 +2,11 @@
 from django.db.models import Q, QuerySet
 from typing import Optional
 
-from space.models import SpaceDescription
+from space.models import Region, Settlement, SpaceDescription, Structure
+from space.types.RegionType import RegionType
+from space.types.SettlementType import SettlementType
 from space.types.SpaceDescriptionType import SpaceDescriptionType
+from space.types.StructureType import StructureType
 
 
 class SpaceQueries(ObjectType):
@@ -11,6 +14,9 @@ class SpaceQueries(ObjectType):
     space_descriptions = List(
         NonNull(SpaceDescriptionType), required=True, source_id=ID()
     )
+    regions = List(NonNull(RegionType), required=True)
+    settlements = List(NonNull(SettlementType), required=True)
+    structures = List(NonNull(StructureType), required=True)
 
     @staticmethod
     def resolve_space_description(
@@ -34,3 +40,15 @@ def resolve_space_descriptions(
         return SpaceDescriptionType.get_queryset(SpaceDescription.objects, info).filter(
             filters
         )
+
+    @staticmethod
+    def resolve_regions(parent: None, info: ResolveInfo) -> QuerySet[Region]:
+        return RegionType.get_queryset(Region.objects, info).all()
+
+    @staticmethod
+    def resolve_settlements(parent: None, info: ResolveInfo) -> QuerySet[Settlement]:
+        return SettlementType.get_queryset(Settlement.objects, info).all()
+
+    @staticmethod
+    def resolve_structures(parent: None, info: ResolveInfo) -> QuerySet[Structure]:
+        return StructureType.get_queryset(Structure.objects, info).all()
diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 1aeed5eb..bf28f3db 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -131,17 +131,6 @@ export type CreateLetterMutation = {
   letter?: Maybe<LetterDescriptionType>;
 };
 
-export type CreateLocationInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
-};
-
-export type CreateLocationMutation = {
-  __typename?: 'CreateLocationMutation';
-  errors: Array<LettercraftErrorType>;
-  location?: Maybe<SpaceDescriptionType>;
-};
-
 export type CreatePersonReferenceInput = {
   description: Scalars['ID']['input'];
   person: Scalars['ID']['input'];
@@ -153,6 +142,17 @@ export type CreatePersonReferenceMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type CreateSpaceInput = {
+  name: Scalars['String']['input'];
+  source: Scalars['ID']['input'];
+};
+
+export type CreateSpaceMutation = {
+  __typename?: 'CreateSpaceMutation';
+  errors: Array<LettercraftErrorType>;
+  space?: Maybe<SpaceDescriptionType>;
+};
+
 export type DeleteAgentMutation = {
   __typename?: 'DeleteAgentMutation';
   errors: Array<LettercraftErrorType>;
@@ -183,14 +183,14 @@ export type DeleteLetterMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
-export type DeleteLocationMutation = {
-  __typename?: 'DeleteLocationMutation';
+export type DeletePersonReferenceMutation = {
+  __typename?: 'DeletePersonReferenceMutation';
   errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
 
-export type DeletePersonReferenceMutation = {
-  __typename?: 'DeletePersonReferenceMutation';
+export type DeleteSpaceMutation = {
+  __typename?: 'DeleteSpaceMutation';
   errors: Array<LettercraftErrorType>;
   ok: Scalars['Boolean']['output'];
 };
@@ -455,23 +455,23 @@ export type Mutation = {
   createEpisodeEntityLink?: Maybe<CreateEpisodeEntityLinkMutation>;
   createGift?: Maybe<CreateGiftMutation>;
   createLetter?: Maybe<CreateLetterMutation>;
-  createLocation?: Maybe<CreateLocationMutation>;
   createPersonReference?: Maybe<CreatePersonReferenceMutation>;
+  createSpace?: Maybe<CreateSpaceMutation>;
   deleteAgent?: Maybe<DeleteAgentMutation>;
   deleteEpisode?: Maybe<DeleteEpisodeMutation>;
   deleteEpisodeEntityLink?: Maybe<DeleteEpisodeEntityLinkMutation>;
   deleteGift?: Maybe<DeleteGiftMutation>;
   deleteLetter?: Maybe<DeleteLetterMutation>;
-  deleteLocation?: Maybe<DeleteLocationMutation>;
   deletePersonReference?: Maybe<DeletePersonReferenceMutation>;
+  deleteSpace?: Maybe<DeleteSpaceMutation>;
   updateAgent?: Maybe<UpdateAgentMutation>;
   updateEpisode?: Maybe<UpdateEpisodeMutation>;
   updateEpisodeEntityLink?: Maybe<UpdateEpisodeEntityLinkMutation>;
   updateGift?: Maybe<UpdateGiftMutation>;
   updateLetter?: Maybe<UpdateLetterMutation>;
-  updateLocation?: Maybe<UpdateLocationMutation>;
   updateOrCreateSource?: Maybe<UpdateOrCreateSourceMutation>;
   updatePersonReference?: Maybe<UpdatePersonReferenceMutation>;
+  updateSpace?: Maybe<UpdateSpaceMutation>;
 };
 
 
@@ -500,13 +500,13 @@ export type MutationCreateLetterArgs = {
 };
 
 
-export type MutationCreateLocationArgs = {
-  locationData: CreateLocationInput;
+export type MutationCreatePersonReferenceArgs = {
+  referenceData: CreatePersonReferenceInput;
 };
 
 
-export type MutationCreatePersonReferenceArgs = {
-  referenceData: CreatePersonReferenceInput;
+export type MutationCreateSpaceArgs = {
+  spaceData: CreateSpaceInput;
 };
 
 
@@ -537,12 +537,12 @@ export type MutationDeleteLetterArgs = {
 };
 
 
-export type MutationDeleteLocationArgs = {
+export type MutationDeletePersonReferenceArgs = {
   id: Scalars['ID']['input'];
 };
 
 
-export type MutationDeletePersonReferenceArgs = {
+export type MutationDeleteSpaceArgs = {
   id: Scalars['ID']['input'];
 };
 
@@ -572,11 +572,6 @@ export type MutationUpdateLetterArgs = {
 };
 
 
-export type MutationUpdateLocationArgs = {
-  locationData: UpdateLocationInput;
-};
-
-
 export type MutationUpdateOrCreateSourceArgs = {
   sourceData: UpdateCreateSourceInput;
 };
@@ -586,6 +581,11 @@ export type MutationUpdatePersonReferenceArgs = {
   referenceData: UpdatePersonReferenceInput;
 };
 
+
+export type MutationUpdateSpaceArgs = {
+  spaceData: UpdateSpaceInput;
+};
+
 /** An enumeration. */
 export enum PersonAgentDescriptionSourceMentionChoices {
   /** directly mentioned */
@@ -651,10 +651,13 @@ export type Query = {
   letterCategories: Array<LetterCategoryType>;
   letterDescription?: Maybe<LetterDescriptionType>;
   letterDescriptions: Array<LetterDescriptionType>;
+  regions: Array<RegionType>;
+  settlements: Array<SettlementType>;
   source: SourceType;
   sources: Array<SourceType>;
   spaceDescription?: Maybe<SpaceDescriptionType>;
   spaceDescriptions: Array<SpaceDescriptionType>;
+  structures: Array<StructureType>;
   userDescription?: Maybe<UserType>;
   userDescriptions: Array<UserType>;
 };
@@ -1021,23 +1024,6 @@ export type UpdateLetterMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
-export type UpdateLocationInput = {
-  book?: InputMaybe<Scalars['String']['input']>;
-  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
-  chapter?: InputMaybe<Scalars['String']['input']>;
-  description?: InputMaybe<Scalars['String']['input']>;
-  designators?: InputMaybe<Array<Scalars['String']['input']>>;
-  id: Scalars['ID']['input'];
-  name?: InputMaybe<Scalars['String']['input']>;
-  page?: InputMaybe<Scalars['String']['input']>;
-};
-
-export type UpdateLocationMutation = {
-  __typename?: 'UpdateLocationMutation';
-  errors: Array<LettercraftErrorType>;
-  ok: Scalars['Boolean']['output'];
-};
-
 export type UpdateOrCreateSourceMutation = {
   __typename?: 'UpdateOrCreateSourceMutation';
   errors?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
@@ -1056,6 +1042,23 @@ export type UpdatePersonReferenceMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
+export type UpdateSpaceInput = {
+  book?: InputMaybe<Scalars['String']['input']>;
+  categories?: InputMaybe<Array<Scalars['ID']['input']>>;
+  chapter?: InputMaybe<Scalars['String']['input']>;
+  description?: InputMaybe<Scalars['String']['input']>;
+  designators?: InputMaybe<Array<Scalars['String']['input']>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  page?: InputMaybe<Scalars['String']['input']>;
+};
+
+export type UpdateSpaceMutation = {
+  __typename?: 'UpdateSpaceMutation';
+  errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
+};
+
 export type UserType = {
   __typename?: 'UserType';
   firstName: Scalars['String']['output'];
@@ -1277,6 +1280,28 @@ export type DataEntryLocationSourceTextQueryVariables = Exact<{
 
 export type DataEntryLocationSourceTextQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
+export type DataEntrySubspacesQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntrySubspacesQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, regions: Array<{ __typename?: 'RegionType', id: string, name: string }>, settlements: Array<{ __typename?: 'SettlementType', id: string, name: string }>, structures: Array<{ __typename?: 'StructureType', id: string, name: string }> } | null };
+
+export type DataEntryRegionsQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntryRegionsQuery = { __typename?: 'Query', regions: Array<{ __typename?: 'RegionType', id: string, name: string }> };
+
+export type DataEntrySettlementsQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntrySettlementsQuery = { __typename?: 'Query', settlements: Array<{ __typename?: 'SettlementType', id: string, name: string }> };
+
+export type DataEntryStructuresQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type DataEntryStructuresQuery = { __typename?: 'Query', structures: Array<{ __typename?: 'StructureType', id: string, name: string }> };
+
 export type DataEntryLocationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1285,18 +1310,18 @@ export type DataEntryLocationQueryVariables = Exact<{
 export type DataEntryLocationQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, name: string, description: string, source: { __typename?: 'SourceType', id: string, name: string } } | null };
 
 export type DataEntryUpdateLocationMutationVariables = Exact<{
-  locationData: UpdateLocationInput;
+  spaceData: UpdateSpaceInput;
 }>;
 
 
-export type DataEntryUpdateLocationMutation = { __typename?: 'Mutation', updateLocation?: { __typename?: 'UpdateLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryUpdateLocationMutation = { __typename?: 'Mutation', updateSpace?: { __typename?: 'UpdateSpaceMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntryDeleteLocationMutationVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
 
 
-export type DataEntryDeleteLocationMutation = { __typename?: 'Mutation', deleteLocation?: { __typename?: 'DeleteLocationMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
+export type DataEntryDeleteLocationMutation = { __typename?: 'Mutation', deleteSpace?: { __typename?: 'DeleteSpaceMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -2107,6 +2132,93 @@ export const DataEntryLocationSourceTextDocument = gql`
   export class DataEntryLocationSourceTextGQL extends Apollo.Query<DataEntryLocationSourceTextQuery, DataEntryLocationSourceTextQueryVariables> {
     override document = DataEntryLocationSourceTextDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntrySubspacesDocument = gql`
+    query DataEntrySubspaces($id: ID!) {
+  spaceDescription(id: $id) {
+    id
+    regions {
+      id
+      name
+    }
+    settlements {
+      id
+      name
+    }
+    structures {
+      id
+      name
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySubspacesGQL extends Apollo.Query<DataEntrySubspacesQuery, DataEntrySubspacesQueryVariables> {
+    override document = DataEntrySubspacesDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryRegionsDocument = gql`
+    query DataEntryRegions {
+  regions {
+    id
+    name
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryRegionsGQL extends Apollo.Query<DataEntryRegionsQuery, DataEntryRegionsQueryVariables> {
+    override document = DataEntryRegionsDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntrySettlementsDocument = gql`
+    query DataEntrySettlements {
+  settlements {
+    id
+    name
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntrySettlementsGQL extends Apollo.Query<DataEntrySettlementsQuery, DataEntrySettlementsQueryVariables> {
+    override document = DataEntrySettlementsDocument;
+    
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryStructuresDocument = gql`
+    query DataEntryStructures {
+  structures {
+    id
+    name
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryStructuresGQL extends Apollo.Query<DataEntryStructuresQuery, DataEntryStructuresQueryVariables> {
+    override document = DataEntryStructuresDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2136,8 +2248,8 @@ export const DataEntryLocationDocument = gql`
     }
   }
 export const DataEntryUpdateLocationDocument = gql`
-    mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
-  updateLocation(locationData: $locationData) {
+    mutation DataEntryUpdateLocation($spaceData: UpdateSpaceInput!) {
+  updateSpace(spaceData: $spaceData) {
     ok
     errors {
       field
@@ -2159,7 +2271,7 @@ export const DataEntryUpdateLocationDocument = gql`
   }
 export const DataEntryDeleteLocationDocument = gql`
     mutation DataEntryDeleteLocation($id: ID!) {
-  deleteLocation(id: $id) {
+  deleteSpace(id: $id) {
     ok
     errors {
       field
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 8dd3fb56..d1fa950a 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -115,16 +115,6 @@ type CreateLetterMutation {
   letter: LetterDescriptionType
 }
 
-input CreateLocationInput {
-  name: String!
-  source: ID!
-}
-
-type CreateLocationMutation {
-  errors: [LettercraftErrorType!]!
-  location: SpaceDescriptionType
-}
-
 input CreatePersonReferenceInput {
   description: ID!
   person: ID!
@@ -135,6 +125,16 @@ type CreatePersonReferenceMutation {
   ok: Boolean!
 }
 
+input CreateSpaceInput {
+  name: String!
+  source: ID!
+}
+
+type CreateSpaceMutation {
+  errors: [LettercraftErrorType!]!
+  space: SpaceDescriptionType
+}
+
 type DeleteAgentMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
@@ -160,12 +160,12 @@ type DeleteLetterMutation {
   ok: Boolean!
 }
 
-type DeleteLocationMutation {
+type DeletePersonReferenceMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
 
-type DeletePersonReferenceMutation {
+type DeleteSpaceMutation {
   errors: [LettercraftErrorType!]!
   ok: Boolean!
 }
@@ -451,23 +451,23 @@ type Mutation {
   createEpisodeEntityLink(data: CreateEpisodeEntityLinkInput!): CreateEpisodeEntityLinkMutation
   createGift(giftData: CreateGiftInput!): CreateGiftMutation
   createLetter(letterData: CreateLetterInput!): CreateLetterMutation
-  createLocation(locationData: CreateLocationInput!): CreateLocationMutation
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
+  createSpace(spaceData: CreateSpaceInput!): CreateSpaceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
   deleteEpisodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): DeleteEpisodeEntityLinkMutation
   deleteGift(id: ID!): DeleteGiftMutation
   deleteLetter(id: ID!): DeleteLetterMutation
-  deleteLocation(id: ID!): DeleteLocationMutation
   deletePersonReference(id: ID!): DeletePersonReferenceMutation
+  deleteSpace(id: ID!): DeleteSpaceMutation
   updateAgent(agentData: UpdateAgentInput!): UpdateAgentMutation
   updateEpisode(episodeData: UpdateEpisodeInput!): UpdateEpisodeMutation
   updateEpisodeEntityLink(data: UpdateEpisodeEntityLinkInput!): UpdateEpisodeEntityLinkMutation
   updateGift(giftData: UpdateGiftInput!): UpdateGiftMutation
   updateLetter(letterData: UpdateLetterInput!): UpdateLetterMutation
-  updateLocation(locationData: UpdateLocationInput!): UpdateLocationMutation
   updateOrCreateSource(sourceData: UpdateCreateSourceInput!): UpdateOrCreateSourceMutation
   updatePersonReference(referenceData: UpdatePersonReferenceInput!): UpdatePersonReferenceMutation
+  updateSpace(spaceData: UpdateSpaceInput!): UpdateSpaceMutation
 }
 
 """An enumeration."""
@@ -547,10 +547,13 @@ type Query {
   letterCategories: [LetterCategoryType!]!
   letterDescription(id: ID!): LetterDescriptionType
   letterDescriptions(episodeId: ID, sourceId: ID): [LetterDescriptionType!]!
+  regions: [RegionType!]!
+  settlements: [SettlementType!]!
   source(id: ID!): SourceType!
   sources: [SourceType!]!
   spaceDescription(id: ID!): SpaceDescriptionType
   spaceDescriptions(sourceId: ID): [SpaceDescriptionType!]!
+  structures: [StructureType!]!
   userDescription(id: ID!): UserType
   userDescriptions: [UserType!]!
 }
@@ -878,22 +881,6 @@ type UpdateLetterMutation {
   ok: Boolean!
 }
 
-input UpdateLocationInput {
-  book: String
-  categories: [ID!]
-  chapter: String
-  description: String
-  designators: [String!]
-  id: ID!
-  name: String
-  page: String
-}
-
-type UpdateLocationMutation {
-  errors: [LettercraftErrorType!]!
-  ok: Boolean!
-}
-
 type UpdateOrCreateSourceMutation {
   errors: [String]
   source: SourceType
@@ -910,6 +897,22 @@ type UpdatePersonReferenceMutation {
   ok: Boolean!
 }
 
+input UpdateSpaceInput {
+  book: String
+  categories: [ID!]
+  chapter: String
+  description: String
+  designators: [String!]
+  id: ID!
+  name: String
+  page: String
+}
+
+type UpdateSpaceMutation {
+  errors: [LettercraftErrorType!]!
+  ok: Boolean!
+}
+
 type UserType {
   firstName: String!
   fullName: String!
diff --git a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
index f97d57ce..f7a20f55 100644
--- a/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
+++ b/frontend/src/app/data-entry/episode-form/episode-entities-form/episode-entities.graphql
@@ -1,4 +1,4 @@
-query DataEntryEpisodeEntities($id:ID!) {
+query DataEntryEpisodeEntities($id: ID!) {
   episode(id: $id) {
     id
     source {
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index b14000ff..e2cd2f6e 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -25,7 +25,7 @@ <h2 class="subform-header">Source text</h2>
 <lc-location-source-text-form />
 
 <h2 class="subform-header">Regions</h2>
-<p><i>Coming soon!</i></p>
+<lc-location-subspace-form subspaceType="region"/>
 
 <h2 class="subform-header">Settlements</h2>
 <p><i>Coming soon!</i></p>
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
index de37dc2c..3785733b 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -99,7 +99,7 @@ export class LocationFormComponent {
             .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe((result) => {
                 this.deletingInProgress = false;
-                const errors = result.data?.deleteLocation?.errors;
+                const errors = result.data?.deleteSpace?.errors;
                 if (errors && errors.length > 0) {
                     this.toastService.show({
                         body: errors.map((error) => error.messages).join("\n"),
diff --git a/frontend/src/app/data-entry/location-form/location-form.module.ts b/frontend/src/app/data-entry/location-form/location-form.module.ts
index da396562..c723458b 100644
--- a/frontend/src/app/data-entry/location-form/location-form.module.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.module.ts
@@ -4,12 +4,14 @@ import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 import { SharedModule } from "@shared/shared.module";
 import { LocationIdentificationFormComponent } from "./location-identification-form/location-identification-form.component";
 import { LocationSourceTextFormComponent } from "./location-source-text-form/location-source-text-form.component";
+import { LocationSubspaceFormComponent } from './location-subspace-form/location-subspace-form.component';
 
 @NgModule({
     declarations: [
         LocationFormComponent,
         LocationIdentificationFormComponent,
         LocationSourceTextFormComponent,
+        LocationSubspaceFormComponent,
     ],
     imports: [SharedModule, DataEntrySharedModule],
     exports: [LocationFormComponent],
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
index 40726161..bfab7e53 100644
--- a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
@@ -123,7 +123,7 @@ export class LocationIdentificationFormComponent implements OnInit, OnDestroy {
     ): Observable<MutationResult<DataEntryUpdateLocationMutation>> {
         return this.updateLocation.mutate(
             {
-                locationData: {
+                spaceData: {
                     ...location,
                     id,
                 },
@@ -137,7 +137,7 @@ export class LocationIdentificationFormComponent implements OnInit, OnDestroy {
     private onMutationResult(
         result: MutationResult<DataEntryUpdateLocationMutation>
     ): void {
-        const errors = result.data?.updateLocation?.errors;
+        const errors = result.data?.updateSpace?.errors;
         if (errors && errors.length > 0) {
             this.status$.next("error");
             this.toastService.show({
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
index 4d424110..c7360bae 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
@@ -30,7 +30,7 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
     private id$ = this.formService.id$;
 
     public location$ = this.id$.pipe(
-        switchMap((id) => this.locationQuery.watch({ id }).valueChanges),
+        switchMap((id) => this.spaceQuery.watch({ id }).valueChanges),
         map((result) => result.data.spaceDescription),
         shareReplay(1)
     );
@@ -57,7 +57,7 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
         private destroyRef: DestroyRef,
         private formService: FormService,
         private toastService: ToastService,
-        private locationQuery: DataEntryLocationSourceTextGQL,
+        private spaceQuery: DataEntryLocationSourceTextGQL,
         private updateLocation: DataEntryUpdateLocationGQL
     ) {}
 
@@ -103,7 +103,7 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
                 withLatestFrom(this.id$),
                 switchMap(([location, id]) =>
                     this.updateLocation.mutate({
-                        locationData: {
+                        spaceData: {
                             ...location,
                             id,
                         },
@@ -121,7 +121,7 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
     private onMutationResult(
         result: MutationResult<DataEntryUpdateLocationMutation>
     ): void {
-        const errors = result.data?.updateLocation?.errors;
+        const errors = result.data?.updateSpace?.errors;
         if (errors && errors.length > 0) {
             this.status$.next("error");
             this.toastService.show({
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html
new file mode 100644
index 00000000..6232cdf2
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html
@@ -0,0 +1,52 @@
+<ng-container *ngIf="selectedSubspaces.length > 0; else noEntities">
+    <p>The following {{ subspaceName }}s are involved in this episode:</p>
+    <ul class="list-unstyled vstack gap-4">
+        <li *ngFor="let subspace of selectedSubspaces">
+            <p>{{ subspace.name }}</p>
+            <!-- <lc-episode-link-form
+                [entityType]="entityType"
+                linkTo="entity"
+                [entityID]="entity.id"
+                [episodeID]="data.episode.id"
+            >
+                <button
+                    removeControl
+                    class="btn btn-danger"
+                    [attr.aria-label]="
+                        'remove ' + subspaceName + ': ' + entity.name
+                    "
+                    [ngbTooltip]="'remove this ' + subspaceName"
+                    (click)="removeSubspace(subspace.id)"
+                >
+                    <lc-icon [icon]="actionIcons.remove" />
+                </button>
+            </lc-episode-link-form> -->
+        </li>
+    </ul>
+</ng-container>
+<ng-template #noEntities>
+    <p>No {{ subspaceName }}s have been added to this location.</p>
+</ng-template>
+
+<div class="mt-4 mb-4">
+    <div ngbDropdown>
+        <button
+            type="button"
+            class="btn btn-primary"
+            #dropdownToggle
+            [attr.id]="dropdownToggleID"
+            ngbDropdownToggle
+        >
+            Add {{ subspaceName }}
+        </button>
+        <div ngbDropdownMenu [attr.aria-labelledby]="dropdownToggleID">
+            <button
+                *ngFor="let subspace of allSubspaces"
+                ngbDropdownItem
+                (click)="addSubspace(subspace.id); dropdownToggle.focus()"
+            >
+                {{ subspace.name }}
+            </button>
+        </div>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.scss b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts
new file mode 100644
index 00000000..87f46046
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts
@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+
+import { LocationSubspaceFormComponent } from "./location-subspace-form.component";
+
+describe("LocationSubspaceFormComponent", () => {
+    let component: LocationSubspaceFormComponent;
+    let fixture: ComponentFixture<LocationSubspaceFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LocationSubspaceFormComponent],
+        });
+        fixture = TestBed.createComponent(LocationSubspaceFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it("should create", () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts
new file mode 100644
index 00000000..76f3515d
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts
@@ -0,0 +1,148 @@
+import { Component, DestroyRef, Input, OnInit } from "@angular/core";
+import {
+    DataEntryRegionsGQL,
+    DataEntrySettlementsGQL,
+    DataEntryStructuresGQL,
+    DataEntrySubspacesGQL,
+    DataEntrySubspacesQuery,
+} from "generated/graphql";
+import { FormService } from "../../shared/form.service";
+import { map, Observable, switchMap } from "rxjs";
+import { actionIcons } from "@shared/icons";
+import { FormControl, FormGroup } from "@angular/forms";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
+
+type SubspaceType = "region" | "settlement" | "structure";
+
+interface Subspace {
+    id: string;
+    name: string;
+}
+
+let nextID = 0;
+
+const subspaceNames: Record<SubspaceType, string> = {
+    region: "Region",
+    settlement: "Settlement",
+    structure: "Structure",
+};
+
+type SubspaceDataKey = Exclude<
+    keyof NonNullable<DataEntrySubspacesQuery["spaceDescription"]>,
+    "__typename" | "id"
+>;
+
+const subspaceDataKeys: Record<SubspaceType, SubspaceDataKey> = {
+    region: "regions",
+    settlement: "settlements",
+    structure: "structures",
+};
+
+@Component({
+    selector: "lc-location-subspace-form",
+    templateUrl: "./location-subspace-form.component.html",
+    styleUrls: ["./location-subspace-form.component.scss"],
+})
+export class LocationSubspaceFormComponent implements OnInit {
+    @Input({ required: true }) subspaceType!: SubspaceType;
+
+    private id$ = this.formService.id$;
+
+    public form = new FormGroup({
+        selectedSubspaces: new FormControl<string[]>([], {
+            nonNullable: true,
+        }),
+    });
+
+    public subspaceName: string | null = null;
+    public actionIcons = actionIcons;
+
+    public allSubspaces: Subspace[] = [];
+    public selectedSubspaces: Subspace[] = [];
+
+    private formName = `${this.subspaceType}-form-${nextID++}`;
+    private subspaceDataKey: SubspaceDataKey | null = null;
+
+    get dropdownToggleID() {
+        return this.formName + "-dropdown-toggle";
+    }
+
+    constructor(
+        private destroyRef: DestroyRef,
+        private formService: FormService,
+        private subspaceQuery: DataEntrySubspacesGQL,
+        private regionsQuery: DataEntryRegionsGQL,
+        private settlementsQuery: DataEntrySettlementsGQL,
+        private structuresQuery: DataEntryStructuresGQL
+    ) {}
+
+    ngOnInit(): void {
+        this.subspaceDataKey = subspaceDataKeys[this.subspaceType];
+        this.subspaceName = subspaceNames[this.subspaceType];
+
+        // All subspace options
+        this.allSubspacesQuery(this.subspaceType)
+            .pipe(takeUntilDestroyed(this.destroyRef))
+            .subscribe((result) => (this.allSubspaces = result));
+
+        // Selected subspace options for location
+        this.id$
+            .pipe(
+                switchMap(
+                    (id) => this.subspaceQuery.watch({ id }).valueChanges
+                ),
+                takeUntilDestroyed(this.destroyRef)
+            )
+            .subscribe((result) => {
+                const spaceDescription = result.data.spaceDescription;
+                const dataKey = this.subspaceDataKey;
+                if (!spaceDescription || !dataKey) {
+                    return;
+                }
+                const selectedIds = spaceDescription[dataKey].map(
+                    (subspace) => subspace.id
+                );
+                this.form.controls.selectedSubspaces.setValue(selectedIds);
+            });
+
+        // TODO: save selected subspace options
+        this.form.valueChanges.pipe(
+            map(() => this.form.getRawValue()),
+        ).subscribe();
+    }
+
+    public addSubspace(id: string): void {
+        const selectedSubspaces = this.form.controls.selectedSubspaces.value;
+        this.form.controls.selectedSubspaces.setValue([
+            ...selectedSubspaces,
+            id,
+        ]);
+    }
+
+    public removeSubspace(id: string): void {
+        const selectedSubspaces =
+            this.form.controls.selectedSubspaces.value.filter(
+                (subspaceId) => subspaceId !== id
+            );
+        this.form.controls.selectedSubspaces.setValue(selectedSubspaces);
+    }
+
+    private allSubspacesQuery(subspace: SubspaceType): Observable<Subspace[]> {
+        switch (subspace) {
+            case "region":
+                return this.regionsQuery
+                    .watch()
+                    .valueChanges.pipe(map((result) => result.data.regions));
+            case "settlement":
+                return this.settlementsQuery
+                    .watch()
+                    .valueChanges.pipe(
+                        map((result) => result.data.settlements)
+                    );
+            case "structure":
+                return this.structuresQuery
+                    .watch()
+                    .valueChanges.pipe(map((result) => result.data.structures));
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql
new file mode 100644
index 00000000..97d5e089
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql
@@ -0,0 +1,39 @@
+query DataEntrySubspaces($id: ID!) {
+    spaceDescription(id: $id) {
+        id
+        regions {
+            id
+            name
+        }
+        settlements {
+            id
+            name
+        }
+        structures {
+            id
+            name
+        }
+    }
+}
+
+query DataEntryRegions {
+    regions {
+        id
+        name
+    }
+}
+
+query DataEntrySettlements {
+    settlements {
+        id
+        name
+    }
+}
+
+query DataEntryStructures {
+    structures {
+        id
+        name
+    }
+}
+
diff --git a/frontend/src/app/data-entry/location-form/location.graphql b/frontend/src/app/data-entry/location-form/location.graphql
index 7f8f2c22..9c237c1d 100644
--- a/frontend/src/app/data-entry/location-form/location.graphql
+++ b/frontend/src/app/data-entry/location-form/location.graphql
@@ -10,8 +10,8 @@ query DataEntryLocation($id: ID!) {
   }
 }
 
-mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
-    updateLocation(locationData: $locationData) {
+mutation DataEntryUpdateLocation($spaceData: UpdateSpaceInput!) {
+    updateSpace(spaceData: $spaceData) {
         ok
         errors {
             field
@@ -21,7 +21,7 @@ mutation DataEntryUpdateLocation($locationData: UpdateLocationInput!) {
 }
 
 mutation DataEntryDeleteLocation($id: ID!) {
-    deleteLocation(id: $id) {
+    deleteSpace(id: $id) {
         ok
         errors {
             field

From 5c85cede837d406212aaae554385dcb644b14efb Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 13:50:07 +0200
Subject: [PATCH 539/565] add staticmethod decorator

---
 backend/event/mutations/CreateEpisodeEntityLinkMutation.py | 1 +
 backend/event/mutations/CreateEpisodeMutation.py           | 1 +
 backend/event/mutations/DeleteEpisodeEntityLinkMutation.py | 1 +
 backend/event/mutations/UpdateEpisodeEntityLinkMutation.py | 1 +
 backend/letter/mutations/CreateGiftMutation.py             | 1 +
 backend/letter/mutations/CreateLetterMutation.py           | 1 +
 backend/person/mutations/CreateAgentMutation.py            | 1 +
 backend/person/mutations/UpdateAgentMutation.py            | 1 +
 backend/space/mutations/CreateSpaceMutation.py             | 1 +
 9 files changed, 9 insertions(+)

diff --git a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
index b1461bd0..3b07fd3e 100644
--- a/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/CreateEpisodeEntityLinkMutation.py
@@ -76,6 +76,7 @@ def mutate(cls, root: None, info: ResolveInfo, data: CreateEpisodeEntityLinkInpu
 
         return cls(ok=True, errors=[])
 
+    @staticmethod
     def add_contribution(
         episode_entity_link: EpisodeEntity,
         data: CreateEpisodeEntityLinkInput,
diff --git a/backend/event/mutations/CreateEpisodeMutation.py b/backend/event/mutations/CreateEpisodeMutation.py
index 0d70067e..1b10fbe8 100644
--- a/backend/event/mutations/CreateEpisodeMutation.py
+++ b/backend/event/mutations/CreateEpisodeMutation.py
@@ -48,6 +48,7 @@ def mutate(cls, root: None, info: ResolveInfo, episode_data: CreateEpisodeInput)
 
         return cls(episode=episode, errors=[])  # type: ignore
 
+    @staticmethod
     def add_contribution(obj: Episode, data: CreateEpisodeInput, info: ResolveInfo):
         if info.context:
             user = info.context.user
diff --git a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
index 989e238b..204da67d 100644
--- a/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/DeleteEpisodeEntityLinkMutation.py
@@ -47,6 +47,7 @@ def mutate(
 
         return cls(ok=True, errors=[])
 
+    @staticmethod
     def add_contribution(obj: EpisodeEntity, info: ResolveInfo):
         if info.context:
             user = info.context.user
diff --git a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
index 5b12d33a..fea40065 100644
--- a/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
+++ b/backend/event/mutations/UpdateEpisodeEntityLinkMutation.py
@@ -55,6 +55,7 @@ def mutate(cls, root: None, info: ResolveInfo, data: UpdateEpisodeEntityLinkInpu
 
         return cls(ok=True, errors=[])
 
+    @staticmethod
     def add_contribution(
         obj: EpisodeEntity,
         data: UpdateEpisodeEntityLinkInput,
diff --git a/backend/letter/mutations/CreateGiftMutation.py b/backend/letter/mutations/CreateGiftMutation.py
index 6eb1b1ec..49837f1d 100644
--- a/backend/letter/mutations/CreateGiftMutation.py
+++ b/backend/letter/mutations/CreateGiftMutation.py
@@ -51,6 +51,7 @@ def mutate(
 
         return cls(ok=True, gift=gift, errors=[])
 
+    @staticmethod
     def add_contribution(
         gift: GiftDescription,
         gift_data: CreateEntityDescriptionInput,
diff --git a/backend/letter/mutations/CreateLetterMutation.py b/backend/letter/mutations/CreateLetterMutation.py
index a28e43cb..bb950fac 100644
--- a/backend/letter/mutations/CreateLetterMutation.py
+++ b/backend/letter/mutations/CreateLetterMutation.py
@@ -51,6 +51,7 @@ def mutate(
 
         return cls(ok=True, letter=letter, errors=[])
 
+    @staticmethod
     def add_contribution(
         letter: LetterDescription,
         letter_data: CreateEntityDescriptionInput,
diff --git a/backend/person/mutations/CreateAgentMutation.py b/backend/person/mutations/CreateAgentMutation.py
index cdb3218c..01fdd45b 100644
--- a/backend/person/mutations/CreateAgentMutation.py
+++ b/backend/person/mutations/CreateAgentMutation.py
@@ -47,6 +47,7 @@ def mutate(
 
         return cls(ok=True, agent=agent, errors=[])
 
+    @staticmethod
     def add_contribution(
         agent: AgentDescription,
         agent_data: CreateEntityDescriptionInput,
diff --git a/backend/person/mutations/UpdateAgentMutation.py b/backend/person/mutations/UpdateAgentMutation.py
index d0285d2a..950fe0b8 100644
--- a/backend/person/mutations/UpdateAgentMutation.py
+++ b/backend/person/mutations/UpdateAgentMutation.py
@@ -138,6 +138,7 @@ def mutate_nested_object(
             cls.mutate_object(nested_data, related_obj, info)
             related_obj.full_clean()
 
+    @staticmethod
     def add_contribution(
         agent: AgentDescription, agent_data: UpdateAgentInput, info: ResolveInfo
     ):
diff --git a/backend/space/mutations/CreateSpaceMutation.py b/backend/space/mutations/CreateSpaceMutation.py
index bdf46129..045bc6ef 100644
--- a/backend/space/mutations/CreateSpaceMutation.py
+++ b/backend/space/mutations/CreateSpaceMutation.py
@@ -52,6 +52,7 @@ def mutate(
 
         return cls(ok=True, space=space, errors=[])
 
+    @staticmethod
     def add_contribution(
         space: SpaceDescription,
         space_data: CreateEntityDescriptionInput,

From c8501f2d0a3b2ab0bd31f32d7e67f5b4d1264de7 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 13:52:19 +0200
Subject: [PATCH 540/565] rename listNames -> listWithQuotes

---
 .../agent-identification-form.component.ts                    | 4 ++--
 .../create-forms/create-entity/create-entity.component.ts     | 4 ++--
 .../episode-identification-form.component.ts                  | 4 ++--
 .../gift-identification-form.component.ts                     | 4 ++--
 .../letter-identification-form.component.ts                   | 4 ++--
 frontend/src/app/data-entry/shared/utils.ts                   | 3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index a4028fd6..e7907c91 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -17,7 +17,7 @@ import {
 import _ from 'underscore';
 import { FormService } from '../../shared/form.service';
 import { FormStatus } from '../../shared/types';
-import { listNames, nameExamples } from '../../shared/utils';
+import { listWithQuotes, nameExamples } from '../../shared/utils';
 
 interface FormData {
     name: string;
@@ -42,7 +42,7 @@ export class AgentIdentificationFormComponent implements OnDestroy {
 
     status$ = new BehaviorSubject<FormStatus>('idle');
 
-    nameExamples = listNames(nameExamples['agent']);
+    nameExamples = listWithQuotes(nameExamples['agent']);
 
     private id$ = this.formService.id$;
     private formName = 'identification';
diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
index b67a2c10..8d65e130 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
@@ -4,7 +4,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
 import { CreateEntityDescriptionInput, Entity } from 'generated/graphql';
 import { Observable } from 'rxjs';
-import { listNames, nameExamples } from '../../shared/utils';
+import { listWithQuotes, nameExamples } from '../../shared/utils';
 import { CreateEntityService } from './create-entity.service';
 
 
@@ -58,7 +58,7 @@ export class CreateEntityComponent implements AfterViewInit {
     }
 
     get nameExamples(): string {
-        return listNames(nameExamples[this.entityName]);
+        return listWithQuotes(nameExamples[this.entityName]);
     }
 
     ngAfterViewInit(): void {
diff --git a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
index fd310287..744a55b3 100644
--- a/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-identification-form/episode-identification-form.component.ts
@@ -19,7 +19,7 @@ import {
     withLatestFrom,
 } from "rxjs";
 import { FormService } from "../../shared/form.service";
-import { formStatusSubject, listNames, nameExamples } from "../../shared/utils";
+import { formStatusSubject, listWithQuotes, nameExamples } from "../../shared/utils";
 import { ApolloCache } from "@apollo/client/core";
 
 interface EpisodeIdentification {
@@ -51,7 +51,7 @@ export class EpisodeIdentificationFormComponent implements OnDestroy {
         }),
     });
 
-    nameExamples = listNames(nameExamples['episode']);
+    nameExamples = listWithQuotes(nameExamples['episode']);
 
     private status$ = formStatusSubject();
 
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index 761d69a8..9a404081 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -20,7 +20,7 @@ import {
     withLatestFrom,
     Observable,
 } from "rxjs";
-import { listNames, nameExamples } from "../../shared/utils";
+import { listWithQuotes, nameExamples } from "../../shared/utils";
 
 interface GiftIdentification {
     name: string;
@@ -55,7 +55,7 @@ export class GiftIdentificationFormComponent implements OnInit {
         }),
     });
 
-    nameExamples = listNames(nameExamples['gift']);
+    nameExamples = listWithQuotes(nameExamples['gift']);
 
     constructor(
         private destroyRef: DestroyRef,
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index f8dd2bc9..bb3bc755 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -16,7 +16,7 @@ import {
     switchMap,
     withLatestFrom,
 } from "rxjs/operators";
-import { listNames, nameExamples } from "../../shared/utils";
+import { listWithQuotes, nameExamples } from "../../shared/utils";
 
 @Component({
     selector: "lc-letter-identification-form",
@@ -42,7 +42,7 @@ export class LetterIdentificationFormComponent implements OnInit {
         }),
     });
 
-    nameExamples = listNames(nameExamples['letter']);
+    nameExamples = listWithQuotes(nameExamples['letter']);
 
     constructor(
         private destroyRef: DestroyRef,
diff --git a/frontend/src/app/data-entry/shared/utils.ts b/frontend/src/app/data-entry/shared/utils.ts
index d3f99e61..1c6fb014 100644
--- a/frontend/src/app/data-entry/shared/utils.ts
+++ b/frontend/src/app/data-entry/shared/utils.ts
@@ -25,5 +25,6 @@ export const nameExamples: Record<string, string[]> = {
     location: ['Alemannia', 'royal court', 'ducal villa'],
 }
 
-export const listNames = (names: string[]): string =>
+/** wrap each item in quotation marks and join them into a comma-separated string */
+export const listWithQuotes = (names: string[]): string =>
     names.map(name => `"${name}"`).join(', ');

From 06c89fae09b8d12d64bd8d92798e89c2ceb5c1e8 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 13:53:10 +0200
Subject: [PATCH 541/565] fix typo

---
 .../create-forms/create-entity/create-entity.component.ts     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
index 8d65e130..9d8df230 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
@@ -26,7 +26,7 @@ export class CreateEntityComponent implements AfterViewInit {
     @Input() episodeID?: string;
     @Input({ required: true }) entityType!: Entity;
 
-    @ViewChild('createEntityModal') modalTempate?: TemplateRef<unknown>;
+    @ViewChild('createEntityModal') modalTemplate?: TemplateRef<unknown>;
 
     modal: NgbModalRef | null = null;
     form = new FormGroup({
@@ -64,7 +64,7 @@ export class CreateEntityComponent implements AfterViewInit {
     ngAfterViewInit(): void {
         this.create.subscribe(() => {
             this.submitted = false;
-            this.modal = this.modalService.open(this.modalTempate);
+            this.modal = this.modalService.open(this.modalTemplate);
         });
     }
 

From d52e7d3486ef165c730e8a2c5ab61b121f5b79ea Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 13:55:26 +0200
Subject: [PATCH 542/565] add takeuntildestroyed operator

---
 .../create-forms/create-entity/create-entity.component.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
index 9d8df230..aa3edb3a 100644
--- a/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
+++ b/frontend/src/app/data-entry/create-forms/create-entity/create-entity.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, Input, TemplateRef, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, DestroyRef, Input, TemplateRef, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ToastService } from '@services/toast.service';
@@ -6,6 +6,7 @@ import { CreateEntityDescriptionInput, Entity } from 'generated/graphql';
 import { Observable } from 'rxjs';
 import { listWithQuotes, nameExamples } from '../../shared/utils';
 import { CreateEntityService } from './create-entity.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 
 /**
@@ -45,6 +46,7 @@ export class CreateEntityComponent implements AfterViewInit {
         private modalService: NgbModal,
         private toastService: ToastService,
         private createEntityService: CreateEntityService,
+        private destroyRef: DestroyRef,
     ) { }
 
     get entityName(): string {
@@ -62,7 +64,9 @@ export class CreateEntityComponent implements AfterViewInit {
     }
 
     ngAfterViewInit(): void {
-        this.create.subscribe(() => {
+        this.create.pipe(
+            takeUntilDestroyed(this.destroyRef),
+        ).subscribe(() => {
             this.submitted = false;
             this.modal = this.modalService.open(this.modalTemplate);
         });

From f3a1e6052f319187e96d1a109d66018ab91b45d6 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 14:08:08 +0200
Subject: [PATCH 543/565] add updateOn: blur to description fields

---
 .../agent-identification-form.component.ts                   | 5 ++++-
 .../gift-identification-form.component.ts                    | 1 +
 .../letter-identification-form.component.ts                  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
index c0af537b..e915b367 100644
--- a/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
+++ b/frontend/src/app/data-entry/agent-form/agent-identification-form/agent-identification-form.component.ts
@@ -36,7 +36,10 @@ export class AgentIdentificationFormComponent implements OnDestroy {
             updateOn: 'blur',
             validators: [Validators.required]
         }),
-        description: new FormControl<string>('', { nonNullable: true }),
+        description: new FormControl<string>('', {
+            nonNullable: true,
+            updateOn: 'blur',
+        }),
         isGroup: new FormControl<boolean>(false, { nonNullable: true }),
     });
 
diff --git a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
index 8735c2d9..4868586c 100644
--- a/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-identification-form/gift-identification-form.component.ts
@@ -52,6 +52,7 @@ export class GiftIdentificationFormComponent implements OnInit {
         }),
         description: new FormControl("", {
             nonNullable: true,
+            updateOn: 'blur',
         }),
     });
 
diff --git a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
index 37d63d6e..e3aae9a6 100644
--- a/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-identification-form/letter-identification-form.component.ts
@@ -39,6 +39,7 @@ export class LetterIdentificationFormComponent implements OnInit {
         }),
         description: new FormControl("", {
             nonNullable: true,
+            updateOn: 'blur',
         }),
     });
 

From eab58e759ae3ebb0942bed1f536d3371447c6a32 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 14:13:12 +0200
Subject: [PATCH 544/565] add migrations

---
 .../0022_alter_agentdescription_options.py      | 17 +++++++++++++++++
 .../0019_alter_spacedescription_options.py      | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 backend/person/migrations/0022_alter_agentdescription_options.py
 create mode 100644 backend/space/migrations/0019_alter_spacedescription_options.py

diff --git a/backend/person/migrations/0022_alter_agentdescription_options.py b/backend/person/migrations/0022_alter_agentdescription_options.py
new file mode 100644
index 00000000..619252dd
--- /dev/null
+++ b/backend/person/migrations/0022_alter_agentdescription_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-09-30 12:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0021_alter_agentdescriptiongender_source_mention_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='agentdescription',
+            options={'ordering': [models.OrderBy(models.F('describes__identifiable'), descending=True, nulls_last=True), 'is_group']},
+        ),
+    ]
diff --git a/backend/space/migrations/0019_alter_spacedescription_options.py b/backend/space/migrations/0019_alter_spacedescription_options.py
new file mode 100644
index 00000000..c7bd92ed
--- /dev/null
+++ b/backend/space/migrations/0019_alter_spacedescription_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.7 on 2024-09-30 12:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('space', '0018_alter_regionfield_source_mention_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='spacedescription',
+            options={'ordering': [models.OrderBy(models.Case(models.When(structures__identifiable=True, then=1), models.When(settlements__identifiable=True, then=2), models.When(regions__identifiable=True, then=3), default=None), nulls_last=True)]},
+        ),
+    ]

From 240dcd1cd8daa6d4be86c44437e055efeecc3fae Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 14:30:37 +0200
Subject: [PATCH 545/565] update migrations

---
 ..._alter_episode_agents_alter_episode_gifts_and_more.py} | 8 ++++----
 .../0023_remove_agentdescription_designators.py}          | 6 +++---
 .../0020_remove_spacedescription_designators.py}          | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename backend/event/migrations/{0026_alter_episode_agents_alter_episode_gifts_and_more.py => 0027_alter_episode_agents_alter_episode_gifts_and_more.py} (80%)
 rename backend/{space/migrations/0019_remove_spacedescription_designators.py => person/migrations/0023_remove_agentdescription_designators.py} (60%)
 rename backend/{person/migrations/0022_remove_agentdescription_designators.py => space/migrations/0020_remove_spacedescription_designators.py} (58%)

diff --git a/backend/event/migrations/0026_alter_episode_agents_alter_episode_gifts_and_more.py b/backend/event/migrations/0027_alter_episode_agents_alter_episode_gifts_and_more.py
similarity index 80%
rename from backend/event/migrations/0026_alter_episode_agents_alter_episode_gifts_and_more.py
rename to backend/event/migrations/0027_alter_episode_agents_alter_episode_gifts_and_more.py
index 22aed249..443b80ee 100644
--- a/backend/event/migrations/0026_alter_episode_agents_alter_episode_gifts_and_more.py
+++ b/backend/event/migrations/0027_alter_episode_agents_alter_episode_gifts_and_more.py
@@ -6,10 +6,10 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('letter', '0019_alter_giftdescriptioncategory_source_mention_and_more'),
-        ('space', '0018_alter_regionfield_source_mention_and_more'),
-        ('person', '0021_alter_agentdescriptiongender_source_mention_and_more'),
-        ('event', '0025_fill_in_blank_sourcemention'),
+        ("letter", "0019_alter_giftdescriptioncategory_source_mention_and_more"),
+        ("space", "0018_alter_regionfield_source_mention_and_more"),
+        ("person", "0021_alter_agentdescriptiongender_source_mention_and_more"),
+        ("event", "0026_episodeagent_designators_episodegift_designators_and_more"),
     ]
 
     operations = [
diff --git a/backend/space/migrations/0019_remove_spacedescription_designators.py b/backend/person/migrations/0023_remove_agentdescription_designators.py
similarity index 60%
rename from backend/space/migrations/0019_remove_spacedescription_designators.py
rename to backend/person/migrations/0023_remove_agentdescription_designators.py
index 577a822e..7f074f59 100644
--- a/backend/space/migrations/0019_remove_spacedescription_designators.py
+++ b/backend/person/migrations/0023_remove_agentdescription_designators.py
@@ -6,12 +6,12 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('space', '0018_alter_regionfield_source_mention_and_more'),
+        ("person", "0022_alter_agentdescription_options"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='spacedescription',
-            name='designators',
+            model_name="agentdescription",
+            name="designators",
         ),
     ]
diff --git a/backend/person/migrations/0022_remove_agentdescription_designators.py b/backend/space/migrations/0020_remove_spacedescription_designators.py
similarity index 58%
rename from backend/person/migrations/0022_remove_agentdescription_designators.py
rename to backend/space/migrations/0020_remove_spacedescription_designators.py
index 1ceefdd6..25ff79fe 100644
--- a/backend/person/migrations/0022_remove_agentdescription_designators.py
+++ b/backend/space/migrations/0020_remove_spacedescription_designators.py
@@ -6,12 +6,12 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('person', '0021_alter_agentdescriptiongender_source_mention_and_more'),
+        ("space", "0019_alter_spacedescription_options"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='agentdescription',
-            name='designators',
+            model_name="spacedescription",
+            name="designators",
         ),
     ]

From ad784074961847247a956d8aa283f6b78bf50b94 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 16:35:53 +0200
Subject: [PATCH 546/565] generate letter episodes form component

---
 .../letter-episodes-form.component.html       |  1 +
 .../letter-episodes-form.component.scss       |  0
 .../letter-episodes-form.component.spec.ts    | 23 +++++++++++++++++++
 .../letter-episodes-form.component.ts         | 10 ++++++++
 .../letter-form/letter-form.component.html    |  3 +++
 .../letter-form/letter-form.module.ts         |  2 ++
 6 files changed, 39 insertions(+)
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.scss
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts

diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html
new file mode 100644
index 00000000..3e7ff740
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html
@@ -0,0 +1 @@
+<p>letter-episodes-form works!</p>
diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.scss b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts
new file mode 100644
index 00000000..779366c7
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LetterEpisodesFormComponent } from './letter-episodes-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+
+describe('LetterEpisodesFormComponent', () => {
+    let component: LetterEpisodesFormComponent;
+    let fixture: ComponentFixture<LetterEpisodesFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LetterEpisodesFormComponent],
+            imports: [SharedTestingModule],
+        });
+        fixture = TestBed.createComponent(LetterEpisodesFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts
new file mode 100644
index 00000000..837bc833
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'lc-letter-episodes-form',
+  templateUrl: './letter-episodes-form.component.html',
+  styleUrls: ['./letter-episodes-form.component.scss']
+})
+export class LetterEpisodesFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 23c5a774..206de35e 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -23,6 +23,9 @@ <h2 class="subform-header">Source text</h2>
 <h2 class="subform-header">Categories</h2>
 <lc-letter-categories-form />
 
+<h2>Episodes</h2>
+<lc-letter-episodes-form />
+
 <ng-template #loading>
     <div class="spinner-border" role="status">
         <span class="visually-hidden">Loading...</span>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.module.ts b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
index f1fc91a9..37d00d31 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.module.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.module.ts
@@ -5,6 +5,7 @@ import { LetterCategoriesFormComponent } from "./letter-categories-form/letter-c
 import { LetterSourceTextFormComponent } from "./letter-source-text-form/letter-source-text-form.component";
 import { LetterIdentificationFormComponent } from "./letter-identification-form/letter-identification-form.component";
 import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
+import { LetterEpisodesFormComponent } from './letter-episodes-form/letter-episodes-form.component';
 
 @NgModule({
     declarations: [
@@ -12,6 +13,7 @@ import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
         LetterCategoriesFormComponent,
         LetterSourceTextFormComponent,
         LetterIdentificationFormComponent,
+        LetterEpisodesFormComponent,
     ],
     imports: [SharedModule, DataEntrySharedModule],
     exports: [LetterFormComponent],

From d7f448c91b59ffa93b2b414474ceb80c39472c1f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 16:47:22 +0200
Subject: [PATCH 547/565] fill in letter episodes form

based on agent episodes component
---
 frontend/generated/graphql.ts                 |  39 ++++++
 .../letter-episodes-form.component.html       |  41 ++++++-
 .../letter-episodes-form.component.ts         | 113 +++++++++++++++++-
 .../letter-episodes.graphql                   |  19 +++
 .../letter-form/letter-form.component.html    |   2 +-
 .../letter-form/letter-form.component.ts      |   2 +
 6 files changed, 212 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index ce5cbf65..ef5fbd13 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1214,6 +1214,13 @@ export type DataEntryAllLetterCategoriesQueryVariables = Exact<{ [key: string]:
 
 export type DataEntryAllLetterCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
 
+export type DataEntryLetterEpisodesQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryLetterEpisodesQuery = { __typename?: 'Query', letterDescription?: { __typename?: 'LetterDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeLetterType', id: string, episode: { __typename?: 'EpisodeType', id: string, name: string } }> } | null };
+
 export type DataEntryLetterIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -2008,6 +2015,38 @@ export const DataEntryAllLetterCategoriesDocument = gql`
   export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
     override document = DataEntryAllLetterCategoriesDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryLetterEpisodesDocument = gql`
+    query DataEntryLetterEpisodes($id: ID!) {
+  letterDescription(id: $id) {
+    id
+    source {
+      id
+      episodes {
+        id
+        name
+      }
+    }
+    episodes {
+      id
+      episode {
+        id
+        name
+      }
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLetterEpisodesGQL extends Apollo.Query<DataEntryLetterEpisodesQuery, DataEntryLetterEpisodesQueryVariables> {
+    override document = DataEntryLetterEpisodesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html
index 3e7ff740..01110b53 100644
--- a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.html
@@ -1 +1,40 @@
-<p>letter-episodes-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.letterDescription">
+        <p>This letter is involved in the following episodes:</p>
+        <ul class="list-unstyled vstack gap-4">
+            <li *ngFor="let item of data.letterDescription.episodes">
+                <lc-episode-link-form [entityType]="entityType"
+                        [entityID]="data.letterDescription.id"
+                        [episodeID]="item.episode.id">
+                    <button removeControl class="btn btn-danger"
+                        [attr.aria-label]="'remove episode: ' + item.episode.name"
+                        ngbTooltip="remove this episode"
+                        (click)="removeEpisode$.next(item.episode.id)">
+                        <lc-icon [icon]="actionIcons.remove" />
+                    </button>
+                </lc-episode-link-form>
+            </li>
+        </ul>
+    </ng-container>
+</ng-container>
+
+
+<div class="mt-4 mb-4">
+    <div ngbDropdown>
+        <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
+            #dropdownToggle
+            ngbDropdownToggle>
+            Add episode
+        </button>
+        <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
+            <button *ngFor="let episode of (availableEpisodes$ | async)"
+                ngbDropdownItem (click)="addEpisode$.next(episode.id); dropdownToggle.focus()">
+                {{episode.name}}
+            </button>
+            <button ngbDropdownItem disabled>
+                <lc-icon [icon]="actionIcons.create" />
+                Create new episode
+            </button>
+        </div>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts
index 837bc833..2be0811f 100644
--- a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.ts
@@ -1,10 +1,119 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
+import { actionIcons } from '@shared/icons';
+import { CreateEpisodeEntityLinkInput, DataEntryCreateEpisodeEntityLinkGQL, DataEntryDeleteEpisodeEntityLinkGQL, DataEntryDeleteEpisodeEntityLinkMutationVariables, DataEntryLetterEpisodesGQL, DataEntryLetterEpisodesQuery, Entity } from 'generated/graphql';
+import { map, Observable, Observer, Subject, switchMap, withLatestFrom } from 'rxjs';
+import { formStatusSubject } from '../../shared/utils';
+import { MutationResult } from 'apollo-angular';
+import { FormService } from '../../shared/form.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { differenceBy, splat } from '@shared/utils';
+import { ApolloCache } from '@apollo/client/core';
 
 @Component({
   selector: 'lc-letter-episodes-form',
   templateUrl: './letter-episodes-form.component.html',
   styleUrls: ['./letter-episodes-form.component.scss']
 })
-export class LetterEpisodesFormComponent {
+export class LetterEpisodesFormComponent implements OnDestroy {
+    data$: Observable<DataEntryLetterEpisodesQuery>;
+    availableEpisodes$: Observable<{ name: string, id: string }[]>;
 
+    addEpisode$ = new Subject<string>();
+    removeEpisode$ = new Subject<string>();
+    actionIcons = actionIcons;
+    status$ = formStatusSubject();
+    formName = 'episodes';
+    entityType = Entity.Letter;
+
+    private mutationRequestObserver: Partial<Observer<MutationResult>> = {
+        next: this.onSuccess.bind(this),
+        error: this.onError.bind(this),
+    };
+
+    constructor(
+        private formService: FormService,
+        private query: DataEntryLetterEpisodesGQL,
+        private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
+        private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
+    ) {
+        this.formService.attachForm(this.formName, this.status$);
+        this.data$ = this.formService.id$.pipe(
+            switchMap(id => this.query.watch({ id }).valueChanges),
+            map(result => result.data),
+            takeUntilDestroyed(),
+        );
+        this.availableEpisodes$ = this.data$.pipe(
+            map(this.availableEpisodes)
+        );
+
+        this.addEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(splat(this.addEpisode.bind(this)));
+
+        this.removeEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(splat(this.removeEpisode.bind(this)));
+    }
+
+    ngOnDestroy(): void {
+        this.status$.complete();
+        this.addEpisode$.complete();
+        this.removeEpisode$.complete();
+        this.formService.detachForm(this.formName);
+    }
+
+    addEpisode(episodeID: string, letterID: string): void {
+        const input: CreateEpisodeEntityLinkInput = {
+            entity: letterID,
+            episode: episodeID,
+            entityType: this.entityType,
+        };
+        this.status$.next('loading');
+        this.addMutation.mutate({ input }, {
+            update: (cache) => this.updateCache(episodeID, letterID, cache),
+        }).subscribe(this.mutationRequestObserver);
+    }
+
+    removeEpisode(episodeID: string, letterID: string): void {
+        const data: DataEntryDeleteEpisodeEntityLinkMutationVariables = {
+            entity: letterID,
+            episode: episodeID,
+            entityType: this.entityType,
+        };
+        this.status$.next('loading');
+        this.removeMutation.mutate(data, {
+            update: (cache) => this.updateCache(episodeID, letterID, cache),
+        }).subscribe(this.mutationRequestObserver)
+    }
+
+    onSuccess() {
+        this.status$.next('saved');
+    }
+
+    onError(error: any) {
+        console.error(error);
+        this.status$.next('error');
+    }
+
+    private updateCache(episodeID: string, letterID: string, cache: ApolloCache<unknown>) {
+        cache.evict({
+            id: cache.identify({ __typename: "EpisodeType", id: episodeID }),
+            fieldName: 'letters',
+        });
+        cache.evict({
+            id: cache.identify({ __typename: "LetterDescriptionType", id: letterID }),
+            fieldName: 'episodes',
+        });
+        cache.gc();
+    }
+
+    private availableEpisodes(
+        data: DataEntryLetterEpisodesQuery
+    ): { name: string, id: string }[] {
+        const allEpisodes = data.letterDescription?.source.episodes || [];
+        const linkedEpisodes = data.letterDescription?.episodes.map(link => link.episode) || [];
+        return differenceBy(allEpisodes, linkedEpisodes, 'id');
+    }
 }
diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes.graphql b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes.graphql
new file mode 100644
index 00000000..f2fc06b8
--- /dev/null
+++ b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes.graphql
@@ -0,0 +1,19 @@
+query DataEntryLetterEpisodes($id: ID!) {
+    letterDescription(id: $id) {
+        id
+        source {
+            id
+            episodes {
+                id
+                name
+            }
+        }
+        episodes {
+            id
+            episode {
+                id
+                name
+            }
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.html b/frontend/src/app/data-entry/letter-form/letter-form.component.html
index 206de35e..fd999f3f 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.html
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.html
@@ -23,7 +23,7 @@ <h2 class="subform-header">Source text</h2>
 <h2 class="subform-header">Categories</h2>
 <lc-letter-categories-form />
 
-<h2>Episodes</h2>
+<h2 class="subform-header">Episodes</h2>
 <lc-letter-episodes-form />
 
 <ng-template #loading>
diff --git a/frontend/src/app/data-entry/letter-form/letter-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
index 4dc1dabf..4e01e7a3 100644
--- a/frontend/src/app/data-entry/letter-form/letter-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-form.component.ts
@@ -3,11 +3,13 @@ import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
 import { DataEntryLetterFormGQL } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
+import { FormService } from "../shared/form.service";
 
 @Component({
     selector: "lc-letter-form",
     templateUrl: "./letter-form.component.html",
     styleUrls: ["./letter-form.component.scss"],
+    providers: [FormService],
 })
 export class LetterFormComponent {
     private id$ = this.route.params.pipe(map((params) => params["id"]));

From 0d90eb2580c499df3c98cd5910d65dab690f30c1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 16:52:41 +0200
Subject: [PATCH 548/565] generate gift episodes form component

---
 .../gift-episodes-form.component.html         |  1 +
 .../gift-episodes-form.component.scss         |  0
 .../gift-episodes-form.component.spec.ts      | 25 +++++++++++++++++++
 .../gift-episodes-form.component.ts           | 10 ++++++++
 .../gift-form/gift-form.component.html        |  3 +++
 .../data-entry/gift-form/gift-form.module.ts  |  2 ++
 6 files changed, 41 insertions(+)
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.scss
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts

diff --git a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html
new file mode 100644
index 00000000..16c29ca9
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html
@@ -0,0 +1 @@
+<p>gift-episodes-form works!</p>
diff --git a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.scss b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.spec.ts b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.spec.ts
new file mode 100644
index 00000000..d740159c
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { GiftEpisodesFormComponent } from './gift-episodes-form.component';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+import { FormService } from '../../shared/form.service';
+
+describe('GiftEpisodesFormComponent', () => {
+    let component: GiftEpisodesFormComponent;
+    let fixture: ComponentFixture<GiftEpisodesFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [GiftEpisodesFormComponent],
+            imports: [SharedTestingModule],
+            providers: [FormService],
+        });
+        fixture = TestBed.createComponent(GiftEpisodesFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts
new file mode 100644
index 00000000..278bc57f
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'lc-gift-episodes-form',
+  templateUrl: './gift-episodes-form.component.html',
+  styleUrls: ['./gift-episodes-form.component.scss']
+})
+export class GiftEpisodesFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.html b/frontend/src/app/data-entry/gift-form/gift-form.component.html
index 68979b07..3ad035e7 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.html
@@ -23,6 +23,9 @@ <h2 class="subform-header">Source text</h2>
 <h2 class="subform-header">Categories</h2>
 <lc-gift-categories-form />
 
+<h2 class="subform-header">Episodes</h2>
+<lc-gift-episodes-form />
+
 <ng-template #loading>
     <div class="spinner-border" role="status">
         <span class="visually-hidden">Loading...</span>
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.module.ts b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
index 784a8128..2b527928 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.module.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.module.ts
@@ -5,6 +5,7 @@ import { GiftIdentificationFormComponent } from './gift-identification-form/gift
 import { GiftSourceTextFormComponent } from './gift-source-text-form/gift-source-text-form.component';
 import { GiftCategoriesFormComponent } from './gift-categories-form/gift-categories-form.component';
 import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
+import { GiftEpisodesFormComponent } from './gift-episodes-form/gift-episodes-form.component';
 
 
 
@@ -14,6 +15,7 @@ import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
         GiftIdentificationFormComponent,
         GiftSourceTextFormComponent,
         GiftCategoriesFormComponent,
+        GiftEpisodesFormComponent,
     ],
     imports: [
         SharedModule, DataEntrySharedModule

From 008a1f4ba6ae1a3b0102fd5559770ee0353d2846 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 16:52:51 +0200
Subject: [PATCH 549/565] add gift episodes query

---
 frontend/generated/graphql.ts                 | 39 +++++++++++++++++++
 .../gift-episodes-form/gift-episodes.graphql  | 19 +++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index ef5fbd13..afe43d00 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1174,6 +1174,13 @@ export type DataEntryAllGiftCategoriesQueryVariables = Exact<{ [key: string]: ne
 
 export type DataEntryAllGiftCategoriesQuery = { __typename?: 'Query', letterCategories: Array<{ __typename?: 'LetterCategoryType', id: string, label: string, description: string }> };
 
+export type DataEntryGiftEpisodesQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryGiftEpisodesQuery = { __typename?: 'Query', giftDescription?: { __typename?: 'GiftDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeGiftType', id: string, episode: { __typename?: 'EpisodeType', id: string, name: string } }> } | null };
+
 export type DataEntryGiftIdentificationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -1880,6 +1887,38 @@ export const DataEntryAllGiftCategoriesDocument = gql`
   export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
     override document = DataEntryAllGiftCategoriesDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryGiftEpisodesDocument = gql`
+    query DataEntryGiftEpisodes($id: ID!) {
+  giftDescription(id: $id) {
+    id
+    source {
+      id
+      episodes {
+        id
+        name
+      }
+    }
+    episodes {
+      id
+      episode {
+        id
+        name
+      }
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryGiftEpisodesGQL extends Apollo.Query<DataEntryGiftEpisodesQuery, DataEntryGiftEpisodesQueryVariables> {
+    override document = DataEntryGiftEpisodesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes.graphql b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes.graphql
new file mode 100644
index 00000000..b360bb00
--- /dev/null
+++ b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes.graphql
@@ -0,0 +1,19 @@
+query DataEntryGiftEpisodes($id: ID!) {
+    giftDescription(id: $id) {
+        id
+        source {
+            id
+            episodes {
+                id
+                name
+            }
+        }
+        episodes {
+            id
+            episode {
+                id
+                name
+            }
+        }
+    }
+}

From 278a7e9a7ee5c5f5603449992b09203de63adcb2 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 16:59:23 +0200
Subject: [PATCH 550/565] fill in gift episodes form

---
 .../gift-episodes-form.component.html         |  41 ++++++-
 .../gift-episodes-form.component.ts           | 113 +++++++++++++++++-
 .../gift-form/gift-form.component.ts          |   2 +
 3 files changed, 153 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html
index 16c29ca9..f4504c3f 100644
--- a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html
+++ b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.html
@@ -1 +1,40 @@
-<p>gift-episodes-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.giftDescription">
+        <p>This gift is involved in the following episodes:</p>
+        <ul class="list-unstyled vstack gap-4">
+            <li *ngFor="let item of data.giftDescription.episodes">
+                <lc-episode-link-form [entityType]="entityType"
+                        [entityID]="data.giftDescription.id"
+                        [episodeID]="item.episode.id">
+                    <button removeControl class="btn btn-danger"
+                        [attr.aria-label]="'remove episode: ' + item.episode.name"
+                        ngbTooltip="remove this episode"
+                        (click)="removeEpisode$.next(item.episode.id)">
+                        <lc-icon [icon]="actionIcons.remove" />
+                    </button>
+                </lc-episode-link-form>
+            </li>
+        </ul>
+    </ng-container>
+</ng-container>
+
+
+<div class="mt-4 mb-4">
+    <div ngbDropdown>
+        <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
+            #dropdownToggle
+            ngbDropdownToggle>
+            Add episode
+        </button>
+        <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
+            <button *ngFor="let episode of (availableEpisodes$ | async)"
+                ngbDropdownItem (click)="addEpisode$.next(episode.id); dropdownToggle.focus()">
+                {{episode.name}}
+            </button>
+            <button ngbDropdownItem disabled>
+                <lc-icon [icon]="actionIcons.create" />
+                Create new episode
+            </button>
+        </div>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts
index 278bc57f..1fcaf534 100644
--- a/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-episodes-form/gift-episodes-form.component.ts
@@ -1,10 +1,119 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
+import { actionIcons } from '@shared/icons';
+import { CreateEpisodeEntityLinkInput, DataEntryCreateEpisodeEntityLinkGQL, DataEntryDeleteEpisodeEntityLinkGQL, DataEntryDeleteEpisodeEntityLinkMutationVariables, DataEntryGiftEpisodesGQL, DataEntryGiftEpisodesQuery, Entity } from 'generated/graphql';
+import { map, Observable, Observer, Subject, switchMap, withLatestFrom } from 'rxjs';
+import { formStatusSubject } from '../../shared/utils';
+import { MutationResult } from 'apollo-angular';
+import { ApolloCache } from '@apollo/client/core';
+import { FormService } from '../../shared/form.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { differenceBy, splat } from '@shared/utils';
 
 @Component({
   selector: 'lc-gift-episodes-form',
   templateUrl: './gift-episodes-form.component.html',
   styleUrls: ['./gift-episodes-form.component.scss']
 })
-export class GiftEpisodesFormComponent {
+export class GiftEpisodesFormComponent implements OnDestroy {
+    data$: Observable<DataEntryGiftEpisodesQuery>;
+    availableEpisodes$: Observable<{ name: string, id: string }[]>;
 
+    addEpisode$ = new Subject<string>();
+    removeEpisode$ = new Subject<string>();
+    actionIcons = actionIcons;
+    status$ = formStatusSubject();
+    formName = 'episodes';
+    entityType = Entity.Gift;
+
+    private mutationRequestObserver: Partial<Observer<MutationResult>> = {
+        next: this.onSuccess.bind(this),
+        error: this.onError.bind(this),
+    };
+
+    constructor(
+        private formService: FormService,
+        private query: DataEntryGiftEpisodesGQL,
+        private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
+        private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
+    ) {
+        this.formService.attachForm(this.formName, this.status$);
+        this.data$ = this.formService.id$.pipe(
+            switchMap(id => this.query.watch({ id }).valueChanges),
+            map(result => result.data),
+            takeUntilDestroyed(),
+        );
+        this.availableEpisodes$ = this.data$.pipe(
+            map(this.availableEpisodes)
+        );
+
+        this.addEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(splat(this.addEpisode.bind(this)));
+
+        this.removeEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(splat(this.removeEpisode.bind(this)));
+    }
+
+    ngOnDestroy(): void {
+        this.status$.complete();
+        this.addEpisode$.complete();
+        this.removeEpisode$.complete();
+        this.formService.detachForm(this.formName);
+    }
+
+    addEpisode(episodeID: string, giftID: string): void {
+        const input: CreateEpisodeEntityLinkInput = {
+            entity: giftID,
+            episode: episodeID,
+            entityType: this.entityType,
+        };
+        this.status$.next('loading');
+        this.addMutation.mutate({ input }, {
+            update: (cache) => this.updateCache(episodeID, giftID, cache),
+        }).subscribe(this.mutationRequestObserver);
+    }
+
+    removeEpisode(episodeID: string, giftID: string): void {
+        const data: DataEntryDeleteEpisodeEntityLinkMutationVariables = {
+            entity: giftID,
+            episode: episodeID,
+            entityType: this.entityType,
+        };
+        this.status$.next('loading');
+        this.removeMutation.mutate(data, {
+            update: (cache) => this.updateCache(episodeID, giftID, cache),
+        }).subscribe(this.mutationRequestObserver)
+    }
+
+    onSuccess() {
+        this.status$.next('saved');
+    }
+
+    onError(error: any) {
+        console.error(error);
+        this.status$.next('error');
+    }
+
+    private updateCache(episodeID: string, giftID: string, cache: ApolloCache<unknown>) {
+        cache.evict({
+            id: cache.identify({ __typename: "EpisodeType", id: episodeID }),
+            fieldName: 'gifts'
+        });
+        cache.evict({
+            id: cache.identify({ __typename: "GiftDescriptionType", id: giftID }),
+            fieldName: 'episodes'
+        });
+        cache.gc();
+    }
+
+    private availableEpisodes(
+        data: DataEntryGiftEpisodesQuery
+    ): { name: string, id: string }[] {
+        const allEpisodes = data.giftDescription?.source.episodes || [];
+        const linkedEpisodes = data.giftDescription?.episodes.map(link => link.episode) || [];
+        return differenceBy(allEpisodes, linkedEpisodes, 'id');
+    }
 }
diff --git a/frontend/src/app/data-entry/gift-form/gift-form.component.ts b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
index bf090ec8..ff127d72 100644
--- a/frontend/src/app/data-entry/gift-form/gift-form.component.ts
+++ b/frontend/src/app/data-entry/gift-form/gift-form.component.ts
@@ -3,11 +3,13 @@ import { ActivatedRoute } from "@angular/router";
 import { actionIcons, dataIcons } from "@shared/icons";
 import { DataEntryGiftFormGQL } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
+import { FormService } from "../shared/form.service";
 
 @Component({
     selector: "lc-gift-form",
     templateUrl: "./gift-form.component.html",
     styleUrls: ["./gift-form.component.scss"],
+    providers: [FormService],
 })
 export class GiftFormComponent {
     private id$ = this.route.params.pipe(map((params) => params["id"]));

From b35a2871c117a3eebb088807bb88d2d0f9d6bbc1 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 17:20:04 +0200
Subject: [PATCH 551/565] generate location episodes form component

---
 .../location-episodes-form.component.html     |  1 +
 .../location-episodes-form.component.scss     |  0
 .../location-episodes-form.component.spec.ts  | 25 +++++++++++++++++++
 .../location-episodes-form.component.ts       | 10 ++++++++
 .../location-form.component.html              | 10 +++++---
 .../location-form/location-form.component.ts  |  4 ++-
 .../location-form/location-form.module.ts     |  4 ++-
 7 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html
 create mode 100644 frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.scss
 create mode 100644 frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.spec.ts
 create mode 100644 frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts

diff --git a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html
new file mode 100644
index 00000000..7210dc76
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html
@@ -0,0 +1 @@
+<p>location-episodes-form works!</p>
diff --git a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.scss b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.spec.ts
new file mode 100644
index 00000000..b1bf1862
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LocationEpisodesFormComponent } from './location-episodes-form.component';
+import { FormService } from '../../shared/form.service';
+import { SharedTestingModule } from '@shared/shared-testing.module';
+
+describe('LocationEpisodesFormComponent', () => {
+    let component: LocationEpisodesFormComponent;
+    let fixture: ComponentFixture<LocationEpisodesFormComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [LocationEpisodesFormComponent],
+            imports: [SharedTestingModule],
+            providers: [FormService],
+        });
+        fixture = TestBed.createComponent(LocationEpisodesFormComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});
diff --git a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts
new file mode 100644
index 00000000..01abe5c1
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'lc-location-episodes-form',
+  templateUrl: './location-episodes-form.component.html',
+  styleUrls: ['./location-episodes-form.component.scss']
+})
+export class LocationEpisodesFormComponent {
+
+}
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index a63b8c87..e78f14c2 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -14,8 +14,12 @@ <h1 class="mb-4">
             {{spaceDescription.description}}
         </p>
 
-        <p class="alert alert-warning">
-            This form is not implemented yet!
-        </p>
     </ng-container>
 </ng-container>
+
+
+<h2 class="subform-header">Identification</h2>
+<p><i>Coming soon!</i></p>
+
+<h2 class="subform-header">Episodes</h2>
+<lc-location-episodes-form />
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
index 8d4985ea..0802e173 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -5,11 +5,13 @@ import { dataIcons } from '@shared/icons';
 import { locationIcon } from '@shared/icons-utils';
 import { DataEntrySpaceDescriptionGQL, DataEntrySpaceDescriptionQuery } from 'generated/graphql';
 import { map, Observable, switchMap } from 'rxjs';
+import { FormService } from '../shared/form.service';
 
 @Component({
     selector: 'lc-location-form',
     templateUrl: './location-form.component.html',
-    styleUrls: ['./location-form.component.scss']
+    styleUrls: ['./location-form.component.scss'],
+    providers: [FormService],
 })
 export class LocationFormComponent {
     id$: Observable<string>;
diff --git a/frontend/src/app/data-entry/location-form/location-form.module.ts b/frontend/src/app/data-entry/location-form/location-form.module.ts
index 5e82e237..777de134 100644
--- a/frontend/src/app/data-entry/location-form/location-form.module.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.module.ts
@@ -1,12 +1,14 @@
 import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared/shared.module';
 import { LocationFormComponent } from './location-form.component';
+import { LocationEpisodesFormComponent } from './location-episodes-form/location-episodes-form.component';
 
 
 
 @NgModule({
     declarations: [
-        LocationFormComponent
+        LocationFormComponent,
+        LocationEpisodesFormComponent
     ],
     imports: [
         SharedModule

From a52869db4532e3208cb893d8bea8aa4abc2b2d7f Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 17:25:03 +0200
Subject: [PATCH 552/565] fill location episodes form

Based on agent episodes form
---
 frontend/generated/graphql.ts                 |  39 ++++++
 .../location-episodes-form.component.html     |  41 ++++++-
 .../location-episodes-form.component.ts       | 113 +++++++++++++++++-
 .../location-episodes.graphql                 |  19 +++
 .../location-form/location-form.module.ts     |   4 +-
 5 files changed, 212 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index afe43d00..ff9de35e 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1256,6 +1256,13 @@ export type DataEntryUpdateLetterMutationVariables = Exact<{
 
 export type DataEntryUpdateLetterMutation = { __typename?: 'Mutation', updateLetter?: { __typename?: 'UpdateLetterMutation', ok: boolean, errors: Array<{ __typename?: 'LettercraftErrorType', field: string, messages: Array<string> }> } | null };
 
+export type DataEntryLocationEpisodesQueryVariables = Exact<{
+  id: Scalars['ID']['input'];
+}>;
+
+
+export type DataEntryLocationEpisodesQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, source: { __typename?: 'SourceType', id: string, episodes: Array<{ __typename?: 'EpisodeType', id: string, name: string }> }, episodes: Array<{ __typename?: 'EpisodeSpaceType', id: string, episode: { __typename?: 'EpisodeType', id: string, name: string } }> } | null };
+
 export type DataEntrySpaceDescriptionQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -2173,6 +2180,38 @@ export const DataEntryUpdateLetterDocument = gql`
   export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
     override document = DataEntryUpdateLetterDocument;
     
+    constructor(apollo: Apollo.Apollo) {
+      super(apollo);
+    }
+  }
+export const DataEntryLocationEpisodesDocument = gql`
+    query DataEntryLocationEpisodes($id: ID!) {
+  spaceDescription(id: $id) {
+    id
+    source {
+      id
+      episodes {
+        id
+        name
+      }
+    }
+    episodes {
+      id
+      episode {
+        id
+        name
+      }
+    }
+  }
+}
+    `;
+
+  @Injectable({
+    providedIn: 'root'
+  })
+  export class DataEntryLocationEpisodesGQL extends Apollo.Query<DataEntryLocationEpisodesQuery, DataEntryLocationEpisodesQueryVariables> {
+    override document = DataEntryLocationEpisodesDocument;
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html
index 7210dc76..ad137ade 100644
--- a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.html
@@ -1 +1,40 @@
-<p>location-episodes-form works!</p>
+<ng-container *ngIf="data$ | async as data">
+    <ng-container *ngIf="data.spaceDescription">
+        <p>This location is involved in the following episodes:</p>
+        <ul class="list-unstyled vstack gap-4">
+            <li *ngFor="let item of data.spaceDescription.episodes">
+                <lc-episode-link-form [entityType]="entityType"
+                        [entityID]="data.spaceDescription.id"
+                        [episodeID]="item.episode.id">
+                    <button removeControl class="btn btn-danger"
+                        [attr.aria-label]="'remove episode: ' + item.episode.name"
+                        ngbTooltip="remove this episode"
+                        (click)="removeEpisode$.next(item.episode.id)">
+                        <lc-icon [icon]="actionIcons.remove" />
+                    </button>
+                </lc-episode-link-form>
+            </li>
+        </ul>
+    </ng-container>
+</ng-container>
+
+
+<div class="mt-4 mb-4">
+    <div ngbDropdown>
+        <button type="button" class="btn btn-primary" id="episode-dropdown-trigger"
+            #dropdownToggle
+            ngbDropdownToggle>
+            Add episode
+        </button>
+        <div ngbDropdownMenu aria-labelledby="episode-dropdown-trigger">
+            <button *ngFor="let episode of (availableEpisodes$ | async)"
+                ngbDropdownItem (click)="addEpisode$.next(episode.id); dropdownToggle.focus()">
+                {{episode.name}}
+            </button>
+            <button ngbDropdownItem disabled>
+                <lc-icon [icon]="actionIcons.create" />
+                Create new episode
+            </button>
+        </div>
+    </div>
+</div>
diff --git a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts
index 01abe5c1..e04ffa6d 100644
--- a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes-form.component.ts
@@ -1,10 +1,119 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
+import { actionIcons } from '@shared/icons';
+import { CreateEpisodeEntityLinkInput, DataEntryCreateEpisodeEntityLinkGQL, DataEntryDeleteEpisodeEntityLinkGQL, DataEntryDeleteEpisodeEntityLinkMutationVariables, DataEntryLocationEpisodesGQL, DataEntryLocationEpisodesQuery, Entity } from 'generated/graphql';
+import { map, Observable, Observer, Subject, switchMap, withLatestFrom } from 'rxjs';
+import { formStatusSubject } from '../../shared/utils';
+import { MutationResult } from 'apollo-angular';
+import { FormService } from '../../shared/form.service';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { differenceBy, splat } from '@shared/utils';
+import { ApolloCache } from '@apollo/client/core';
 
 @Component({
   selector: 'lc-location-episodes-form',
   templateUrl: './location-episodes-form.component.html',
   styleUrls: ['./location-episodes-form.component.scss']
 })
-export class LocationEpisodesFormComponent {
+export class LocationEpisodesFormComponent implements OnDestroy {
+    data$: Observable<DataEntryLocationEpisodesQuery>;
+    availableEpisodes$: Observable<{ name: string, id: string }[]>;
 
+    addEpisode$ = new Subject<string>();
+    removeEpisode$ = new Subject<string>();
+    actionIcons = actionIcons;
+    status$ = formStatusSubject();
+    formName = 'episodes';
+    entityType = Entity.Space;
+
+    private mutationRequestObserver: Partial<Observer<MutationResult>> = {
+        next: this.onSuccess.bind(this),
+        error: this.onError.bind(this),
+    };
+
+    constructor(
+        private formService: FormService,
+        private query: DataEntryLocationEpisodesGQL,
+        private addMutation: DataEntryCreateEpisodeEntityLinkGQL,
+        private removeMutation: DataEntryDeleteEpisodeEntityLinkGQL,
+    ) {
+        this.formService.attachForm(this.formName, this.status$);
+        this.data$ = this.formService.id$.pipe(
+            switchMap(id => this.query.watch({ id }).valueChanges),
+            map(result => result.data),
+            takeUntilDestroyed(),
+        );
+        this.availableEpisodes$ = this.data$.pipe(
+            map(this.availableEpisodes)
+        );
+
+        this.addEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(splat(this.addEpisode.bind(this)));
+
+        this.removeEpisode$.pipe(
+            withLatestFrom(this.formService.id$),
+            takeUntilDestroyed(),
+        ).subscribe(splat(this.removeEpisode.bind(this)));
+    }
+
+    ngOnDestroy(): void {
+        this.status$.complete();
+        this.addEpisode$.complete();
+        this.removeEpisode$.complete();
+        this.formService.detachForm(this.formName);
+    }
+
+    addEpisode(episodeID: string, locationID: string): void {
+        const input: CreateEpisodeEntityLinkInput = {
+            entity: locationID,
+            episode: episodeID,
+            entityType: this.entityType,
+        };
+        this.status$.next('loading');
+        this.addMutation.mutate({ input }, {
+            update: (cache) => this.updateCache(episodeID, locationID, cache),
+        }).subscribe(this.mutationRequestObserver);
+    }
+
+    removeEpisode(episodeID: string, locationID: string): void {
+        const data: DataEntryDeleteEpisodeEntityLinkMutationVariables = {
+            entity: locationID,
+            episode: episodeID,
+            entityType: this.entityType,
+        };
+        this.status$.next('loading');
+        this.removeMutation.mutate(data, {
+            update: (cache) => this.updateCache(episodeID, locationID, cache),
+        }).subscribe(this.mutationRequestObserver)
+    }
+
+    onSuccess() {
+        this.status$.next('saved');
+    }
+
+    onError(error: any) {
+        console.error(error);
+        this.status$.next('error');
+    }
+
+    private updateCache(episodeID: string, locationID: string, cache: ApolloCache<unknown>) {
+        cache.evict({
+            id: cache.identify({ __typename: "EpisodeType", id: episodeID }),
+            fieldName: 'letters',
+        });
+        cache.evict({
+            id: cache.identify({ __typename: "SpaceDescriptionType", id: locationID }),
+            fieldName: 'episodes',
+        });
+        cache.gc();
+    }
+
+    private availableEpisodes(
+        data: DataEntryLocationEpisodesQuery
+    ): { name: string, id: string }[] {
+        const allEpisodes = data.spaceDescription?.source.episodes || [];
+        const linkedEpisodes = data.spaceDescription?.episodes.map(link => link.episode) || [];
+        return differenceBy(allEpisodes, linkedEpisodes, 'id');
+    }
 }
diff --git a/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes.graphql b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes.graphql
new file mode 100644
index 00000000..bb3750d2
--- /dev/null
+++ b/frontend/src/app/data-entry/location-form/location-episodes-form/location-episodes.graphql
@@ -0,0 +1,19 @@
+query DataEntryLocationEpisodes($id: ID!) {
+    spaceDescription(id: $id) {
+        id
+        source {
+            id
+            episodes {
+                id
+                name
+            }
+        }
+        episodes {
+            id
+            episode {
+                id
+                name
+            }
+        }
+    }
+}
diff --git a/frontend/src/app/data-entry/location-form/location-form.module.ts b/frontend/src/app/data-entry/location-form/location-form.module.ts
index 777de134..bd31c652 100644
--- a/frontend/src/app/data-entry/location-form/location-form.module.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { SharedModule } from '@shared/shared.module';
 import { LocationFormComponent } from './location-form.component';
 import { LocationEpisodesFormComponent } from './location-episodes-form/location-episodes-form.component';
+import { DataEntrySharedModule } from '../shared/data-entry-shared.module';
 
 
 
@@ -11,7 +12,8 @@ import { LocationEpisodesFormComponent } from './location-episodes-form/location
         LocationEpisodesFormComponent
     ],
     imports: [
-        SharedModule
+        SharedModule,
+        DataEntrySharedModule,
     ],
     exports: [
         LocationFormComponent

From 331fa79d351becee8ae81853d506ba817ccf4575 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Mon, 30 Sep 2024 17:32:37 +0200
Subject: [PATCH 553/565] fix test modules

---
 .../letter-episodes-form.component.spec.ts                  | 2 ++
 .../location-form/location-form.component.spec.ts           | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts
index 779366c7..af9d20bb 100644
--- a/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-episodes-form/letter-episodes-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LetterEpisodesFormComponent } from './letter-episodes-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { FormService } from '../../shared/form.service';
 
 describe('LetterEpisodesFormComponent', () => {
     let component: LetterEpisodesFormComponent;
@@ -11,6 +12,7 @@ describe('LetterEpisodesFormComponent', () => {
         TestBed.configureTestingModule({
             declarations: [LetterEpisodesFormComponent],
             imports: [SharedTestingModule],
+            providers: [FormService],
         });
         fixture = TestBed.createComponent(LetterEpisodesFormComponent);
         component = fixture.componentInstance;
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
index fa5bc31a..c2c00fb6 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.spec.ts
@@ -2,6 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LocationFormComponent } from './location-form.component';
 import { SharedTestingModule } from '@shared/shared-testing.module';
+import { LocationEpisodesFormComponent } from './location-episodes-form/location-episodes-form.component';
 
 describe('LocationFormComponent', () => {
     let component: LocationFormComponent;
@@ -9,7 +10,10 @@ describe('LocationFormComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            declarations: [LocationFormComponent],
+            declarations: [
+                LocationFormComponent,
+                LocationEpisodesFormComponent
+            ],
             imports: [SharedTestingModule],
         });
         fixture = TestBed.createComponent(LocationFormComponent);

From 59d308f6c144c1a992441847d7b8c614ad063557 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 11:46:36 +0200
Subject: [PATCH 554/565] Remove location subforms; add description

---
 frontend/generated/graphql.ts                 | 109 -------------
 .../location-form.component.html              |  12 +-
 .../location-form/location-form.module.ts     |   2 -
 .../location-subspace-form.component.html     |  52 ------
 .../location-subspace-form.component.scss     |   0
 .../location-subspace-form.component.spec.ts  |  21 ---
 .../location-subspace-form.component.ts       | 148 ------------------
 .../location-subspace-form.graphql            |  39 -----
 8 files changed, 10 insertions(+), 373 deletions(-)
 delete mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html
 delete mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.scss
 delete mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts
 delete mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts
 delete mode 100644 frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index bf28f3db..9816c65b 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1280,28 +1280,6 @@ export type DataEntryLocationSourceTextQueryVariables = Exact<{
 
 export type DataEntryLocationSourceTextQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
 
-export type DataEntrySubspacesQueryVariables = Exact<{
-  id: Scalars['ID']['input'];
-}>;
-
-
-export type DataEntrySubspacesQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, regions: Array<{ __typename?: 'RegionType', id: string, name: string }>, settlements: Array<{ __typename?: 'SettlementType', id: string, name: string }>, structures: Array<{ __typename?: 'StructureType', id: string, name: string }> } | null };
-
-export type DataEntryRegionsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataEntryRegionsQuery = { __typename?: 'Query', regions: Array<{ __typename?: 'RegionType', id: string, name: string }> };
-
-export type DataEntrySettlementsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataEntrySettlementsQuery = { __typename?: 'Query', settlements: Array<{ __typename?: 'SettlementType', id: string, name: string }> };
-
-export type DataEntryStructuresQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type DataEntryStructuresQuery = { __typename?: 'Query', structures: Array<{ __typename?: 'StructureType', id: string, name: string }> };
-
 export type DataEntryLocationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
 }>;
@@ -2132,93 +2110,6 @@ export const DataEntryLocationSourceTextDocument = gql`
   export class DataEntryLocationSourceTextGQL extends Apollo.Query<DataEntryLocationSourceTextQuery, DataEntryLocationSourceTextQueryVariables> {
     override document = DataEntryLocationSourceTextDocument;
     
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const DataEntrySubspacesDocument = gql`
-    query DataEntrySubspaces($id: ID!) {
-  spaceDescription(id: $id) {
-    id
-    regions {
-      id
-      name
-    }
-    settlements {
-      id
-      name
-    }
-    structures {
-      id
-      name
-    }
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySubspacesGQL extends Apollo.Query<DataEntrySubspacesQuery, DataEntrySubspacesQueryVariables> {
-    override document = DataEntrySubspacesDocument;
-    
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const DataEntryRegionsDocument = gql`
-    query DataEntryRegions {
-  regions {
-    id
-    name
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryRegionsGQL extends Apollo.Query<DataEntryRegionsQuery, DataEntryRegionsQueryVariables> {
-    override document = DataEntryRegionsDocument;
-    
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const DataEntrySettlementsDocument = gql`
-    query DataEntrySettlements {
-  settlements {
-    id
-    name
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntrySettlementsGQL extends Apollo.Query<DataEntrySettlementsQuery, DataEntrySettlementsQueryVariables> {
-    override document = DataEntrySettlementsDocument;
-    
-    constructor(apollo: Apollo.Apollo) {
-      super(apollo);
-    }
-  }
-export const DataEntryStructuresDocument = gql`
-    query DataEntryStructures {
-  structures {
-    id
-    name
-  }
-}
-    `;
-
-  @Injectable({
-    providedIn: 'root'
-  })
-  export class DataEntryStructuresGQL extends Apollo.Query<DataEntryStructuresQuery, DataEntryStructuresQueryVariables> {
-    override document = DataEntryStructuresDocument;
-    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index e2cd2f6e..4477c830 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -7,7 +7,15 @@ <h1 class="mb-4">
         <span class="text-secondary"> ({{ location.source.name }}) </span>
     </h1>
 
-    <!-- <lc-entity-description-lead [entity]="location" /> -->
+    <p class="lead mb-4">
+        <span *ngIf="location.description; else noDescription">
+            {{location.description}}
+        </span>
+        <ng-template #noDescription>
+            <i>(No description)</i>
+        </ng-template>
+    </p>
+
 
     <lc-form-status [status$]="status$" />
 
@@ -25,7 +33,7 @@ <h2 class="subform-header">Source text</h2>
 <lc-location-source-text-form />
 
 <h2 class="subform-header">Regions</h2>
-<lc-location-subspace-form subspaceType="region"/>
+<p><i>Coming soon!</i></p>
 
 <h2 class="subform-header">Settlements</h2>
 <p><i>Coming soon!</i></p>
diff --git a/frontend/src/app/data-entry/location-form/location-form.module.ts b/frontend/src/app/data-entry/location-form/location-form.module.ts
index c723458b..da396562 100644
--- a/frontend/src/app/data-entry/location-form/location-form.module.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.module.ts
@@ -4,14 +4,12 @@ import { DataEntrySharedModule } from "../shared/data-entry-shared.module";
 import { SharedModule } from "@shared/shared.module";
 import { LocationIdentificationFormComponent } from "./location-identification-form/location-identification-form.component";
 import { LocationSourceTextFormComponent } from "./location-source-text-form/location-source-text-form.component";
-import { LocationSubspaceFormComponent } from './location-subspace-form/location-subspace-form.component';
 
 @NgModule({
     declarations: [
         LocationFormComponent,
         LocationIdentificationFormComponent,
         LocationSourceTextFormComponent,
-        LocationSubspaceFormComponent,
     ],
     imports: [SharedModule, DataEntrySharedModule],
     exports: [LocationFormComponent],
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html
deleted file mode 100644
index 6232cdf2..00000000
--- a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<ng-container *ngIf="selectedSubspaces.length > 0; else noEntities">
-    <p>The following {{ subspaceName }}s are involved in this episode:</p>
-    <ul class="list-unstyled vstack gap-4">
-        <li *ngFor="let subspace of selectedSubspaces">
-            <p>{{ subspace.name }}</p>
-            <!-- <lc-episode-link-form
-                [entityType]="entityType"
-                linkTo="entity"
-                [entityID]="entity.id"
-                [episodeID]="data.episode.id"
-            >
-                <button
-                    removeControl
-                    class="btn btn-danger"
-                    [attr.aria-label]="
-                        'remove ' + subspaceName + ': ' + entity.name
-                    "
-                    [ngbTooltip]="'remove this ' + subspaceName"
-                    (click)="removeSubspace(subspace.id)"
-                >
-                    <lc-icon [icon]="actionIcons.remove" />
-                </button>
-            </lc-episode-link-form> -->
-        </li>
-    </ul>
-</ng-container>
-<ng-template #noEntities>
-    <p>No {{ subspaceName }}s have been added to this location.</p>
-</ng-template>
-
-<div class="mt-4 mb-4">
-    <div ngbDropdown>
-        <button
-            type="button"
-            class="btn btn-primary"
-            #dropdownToggle
-            [attr.id]="dropdownToggleID"
-            ngbDropdownToggle
-        >
-            Add {{ subspaceName }}
-        </button>
-        <div ngbDropdownMenu [attr.aria-labelledby]="dropdownToggleID">
-            <button
-                *ngFor="let subspace of allSubspaces"
-                ngbDropdownItem
-                (click)="addSubspace(subspace.id); dropdownToggle.focus()"
-            >
-                {{ subspace.name }}
-            </button>
-        </div>
-    </div>
-</div>
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.scss b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts
deleted file mode 100644
index 87f46046..00000000
--- a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ComponentFixture, TestBed } from "@angular/core/testing";
-
-import { LocationSubspaceFormComponent } from "./location-subspace-form.component";
-
-describe("LocationSubspaceFormComponent", () => {
-    let component: LocationSubspaceFormComponent;
-    let fixture: ComponentFixture<LocationSubspaceFormComponent>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            declarations: [LocationSubspaceFormComponent],
-        });
-        fixture = TestBed.createComponent(LocationSubspaceFormComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
-    });
-
-    it("should create", () => {
-        expect(component).toBeTruthy();
-    });
-});
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts
deleted file mode 100644
index 76f3515d..00000000
--- a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.component.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { Component, DestroyRef, Input, OnInit } from "@angular/core";
-import {
-    DataEntryRegionsGQL,
-    DataEntrySettlementsGQL,
-    DataEntryStructuresGQL,
-    DataEntrySubspacesGQL,
-    DataEntrySubspacesQuery,
-} from "generated/graphql";
-import { FormService } from "../../shared/form.service";
-import { map, Observable, switchMap } from "rxjs";
-import { actionIcons } from "@shared/icons";
-import { FormControl, FormGroup } from "@angular/forms";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-
-type SubspaceType = "region" | "settlement" | "structure";
-
-interface Subspace {
-    id: string;
-    name: string;
-}
-
-let nextID = 0;
-
-const subspaceNames: Record<SubspaceType, string> = {
-    region: "Region",
-    settlement: "Settlement",
-    structure: "Structure",
-};
-
-type SubspaceDataKey = Exclude<
-    keyof NonNullable<DataEntrySubspacesQuery["spaceDescription"]>,
-    "__typename" | "id"
->;
-
-const subspaceDataKeys: Record<SubspaceType, SubspaceDataKey> = {
-    region: "regions",
-    settlement: "settlements",
-    structure: "structures",
-};
-
-@Component({
-    selector: "lc-location-subspace-form",
-    templateUrl: "./location-subspace-form.component.html",
-    styleUrls: ["./location-subspace-form.component.scss"],
-})
-export class LocationSubspaceFormComponent implements OnInit {
-    @Input({ required: true }) subspaceType!: SubspaceType;
-
-    private id$ = this.formService.id$;
-
-    public form = new FormGroup({
-        selectedSubspaces: new FormControl<string[]>([], {
-            nonNullable: true,
-        }),
-    });
-
-    public subspaceName: string | null = null;
-    public actionIcons = actionIcons;
-
-    public allSubspaces: Subspace[] = [];
-    public selectedSubspaces: Subspace[] = [];
-
-    private formName = `${this.subspaceType}-form-${nextID++}`;
-    private subspaceDataKey: SubspaceDataKey | null = null;
-
-    get dropdownToggleID() {
-        return this.formName + "-dropdown-toggle";
-    }
-
-    constructor(
-        private destroyRef: DestroyRef,
-        private formService: FormService,
-        private subspaceQuery: DataEntrySubspacesGQL,
-        private regionsQuery: DataEntryRegionsGQL,
-        private settlementsQuery: DataEntrySettlementsGQL,
-        private structuresQuery: DataEntryStructuresGQL
-    ) {}
-
-    ngOnInit(): void {
-        this.subspaceDataKey = subspaceDataKeys[this.subspaceType];
-        this.subspaceName = subspaceNames[this.subspaceType];
-
-        // All subspace options
-        this.allSubspacesQuery(this.subspaceType)
-            .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => (this.allSubspaces = result));
-
-        // Selected subspace options for location
-        this.id$
-            .pipe(
-                switchMap(
-                    (id) => this.subspaceQuery.watch({ id }).valueChanges
-                ),
-                takeUntilDestroyed(this.destroyRef)
-            )
-            .subscribe((result) => {
-                const spaceDescription = result.data.spaceDescription;
-                const dataKey = this.subspaceDataKey;
-                if (!spaceDescription || !dataKey) {
-                    return;
-                }
-                const selectedIds = spaceDescription[dataKey].map(
-                    (subspace) => subspace.id
-                );
-                this.form.controls.selectedSubspaces.setValue(selectedIds);
-            });
-
-        // TODO: save selected subspace options
-        this.form.valueChanges.pipe(
-            map(() => this.form.getRawValue()),
-        ).subscribe();
-    }
-
-    public addSubspace(id: string): void {
-        const selectedSubspaces = this.form.controls.selectedSubspaces.value;
-        this.form.controls.selectedSubspaces.setValue([
-            ...selectedSubspaces,
-            id,
-        ]);
-    }
-
-    public removeSubspace(id: string): void {
-        const selectedSubspaces =
-            this.form.controls.selectedSubspaces.value.filter(
-                (subspaceId) => subspaceId !== id
-            );
-        this.form.controls.selectedSubspaces.setValue(selectedSubspaces);
-    }
-
-    private allSubspacesQuery(subspace: SubspaceType): Observable<Subspace[]> {
-        switch (subspace) {
-            case "region":
-                return this.regionsQuery
-                    .watch()
-                    .valueChanges.pipe(map((result) => result.data.regions));
-            case "settlement":
-                return this.settlementsQuery
-                    .watch()
-                    .valueChanges.pipe(
-                        map((result) => result.data.settlements)
-                    );
-            case "structure":
-                return this.structuresQuery
-                    .watch()
-                    .valueChanges.pipe(map((result) => result.data.structures));
-        }
-    }
-}
diff --git a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql b/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql
deleted file mode 100644
index 97d5e089..00000000
--- a/frontend/src/app/data-entry/location-form/location-subspace-form/location-subspace-form.graphql
+++ /dev/null
@@ -1,39 +0,0 @@
-query DataEntrySubspaces($id: ID!) {
-    spaceDescription(id: $id) {
-        id
-        regions {
-            id
-            name
-        }
-        settlements {
-            id
-            name
-        }
-        structures {
-            id
-            name
-        }
-    }
-}
-
-query DataEntryRegions {
-    regions {
-        id
-        name
-    }
-}
-
-query DataEntrySettlements {
-    settlements {
-        id
-        name
-    }
-}
-
-query DataEntryStructures {
-    structures {
-        id
-        name
-    }
-}
-

From c99ad4588fa6d91d84ed562d4d30cede399d39cc Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 13:44:31 +0200
Subject: [PATCH 555/565] Generated types

---
 frontend/generated/graphql.ts     | 108 ++++++++++++++----------------
 frontend/generated/schema.graphql |  10 +--
 2 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 2911d348..6049eeda 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -136,14 +136,10 @@ export type CreatePersonReferenceMutation = {
   ok: Scalars['Boolean']['output'];
 };
 
-export type CreateSpaceInput = {
-  name: Scalars['String']['input'];
-  source: Scalars['ID']['input'];
-};
-
 export type CreateSpaceMutation = {
   __typename?: 'CreateSpaceMutation';
   errors: Array<LettercraftErrorType>;
+  ok: Scalars['Boolean']['output'];
   space?: Maybe<SpaceDescriptionType>;
 };
 
@@ -500,7 +496,7 @@ export type MutationCreatePersonReferenceArgs = {
 
 
 export type MutationCreateSpaceArgs = {
-  spaceData: CreateSpaceInput;
+  spaceData: CreateEntityDescriptionInput;
 };
 
 
@@ -1423,7 +1419,7 @@ export const DataEntryAgentDescriptionDocument = gql`
   })
   export class DataEntryAgentDescriptionGQL extends Apollo.Query<DataEntryAgentDescriptionQuery, DataEntryAgentDescriptionQueryVariables> {
     override document = DataEntryAgentDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1442,7 +1438,7 @@ export const LocationsInSourceListDocument = gql`
   })
   export class LocationsInSourceListGQL extends Apollo.Query<LocationsInSourceListQuery, LocationsInSourceListQueryVariables> {
     override document = LocationsInSourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1474,7 +1470,7 @@ export const DataEntryAgentEpisodesDocument = gql`
   })
   export class DataEntryAgentEpisodesGQL extends Apollo.Query<DataEntryAgentEpisodesQuery, DataEntryAgentEpisodesQueryVariables> {
     override document = DataEntryAgentEpisodesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1496,7 +1492,7 @@ export const DataEntryCreateEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryCreateEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryCreateEpisodeEntityLinkMutation, DataEntryCreateEpisodeEntityLinkMutationVariables> {
     override document = DataEntryCreateEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1522,7 +1518,7 @@ export const DataEntryDeleteEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryDeleteEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryDeleteEpisodeEntityLinkMutation, DataEntryDeleteEpisodeEntityLinkMutationVariables> {
     override document = DataEntryDeleteEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1543,7 +1539,7 @@ export const DataEntryAgentIdentificationDocument = gql`
   })
   export class DataEntryAgentIdentificationGQL extends Apollo.Query<DataEntryAgentIdentificationQuery, DataEntryAgentIdentificationQueryVariables> {
     override document = DataEntryAgentIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1569,7 +1565,7 @@ export const DataEntryAgentDocument = gql`
   })
   export class DataEntryAgentGQL extends Apollo.Query<DataEntryAgentQuery, DataEntryAgentQueryVariables> {
     override document = DataEntryAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1591,7 +1587,7 @@ export const DataEntryUpdateAgentDocument = gql`
   })
   export class DataEntryUpdateAgentGQL extends Apollo.Mutation<DataEntryUpdateAgentMutation, DataEntryUpdateAgentMutationVariables> {
     override document = DataEntryUpdateAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1613,7 +1609,7 @@ export const DataEntryDeleteAgentDocument = gql`
   })
   export class DataEntryDeleteAgentGQL extends Apollo.Mutation<DataEntryDeleteAgentMutation, DataEntryDeleteAgentMutationVariables> {
     override document = DataEntryDeleteAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1635,7 +1631,7 @@ export const DataEntryCreateAgentDocument = gql`
   })
   export class DataEntryCreateAgentGQL extends Apollo.Mutation<DataEntryCreateAgentMutation, DataEntryCreateAgentMutationVariables> {
     override document = DataEntryCreateAgentDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1657,7 +1653,7 @@ export const DataEntryCreateGiftDocument = gql`
   })
   export class DataEntryCreateGiftGQL extends Apollo.Mutation<DataEntryCreateGiftMutation, DataEntryCreateGiftMutationVariables> {
     override document = DataEntryCreateGiftDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1679,7 +1675,7 @@ export const DataEntryCreateLetterDocument = gql`
   })
   export class DataEntryCreateLetterGQL extends Apollo.Mutation<DataEntryCreateLetterMutation, DataEntryCreateLetterMutationVariables> {
     override document = DataEntryCreateLetterDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1701,7 +1697,7 @@ export const DataEntryCreateSpaceDocument = gql`
   })
   export class DataEntryCreateSpaceGQL extends Apollo.Mutation<DataEntryCreateSpaceMutation, DataEntryCreateSpaceMutationVariables> {
     override document = DataEntryCreateSpaceDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1723,7 +1719,7 @@ export const DataEntryEpisodeContentsDocument = gql`
   })
   export class DataEntryEpisodeContentsGQL extends Apollo.Query<DataEntryEpisodeContentsQuery, DataEntryEpisodeContentsQueryVariables> {
     override document = DataEntryEpisodeContentsDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1743,7 +1739,7 @@ export const DataEntryEpisodeCategoriesDocument = gql`
   })
   export class DataEntryEpisodeCategoriesGQL extends Apollo.Query<DataEntryEpisodeCategoriesQuery, DataEntryEpisodeCategoriesQueryVariables> {
     override document = DataEntryEpisodeCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1796,7 +1792,7 @@ export const DataEntryEpisodeEntitiesDocument = gql`
   })
   export class DataEntryEpisodeEntitiesGQL extends Apollo.Query<DataEntryEpisodeEntitiesQuery, DataEntryEpisodeEntitiesQueryVariables> {
     override document = DataEntryEpisodeEntitiesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1816,7 +1812,7 @@ export const DataEntryEpisodeIdentificationDocument = gql`
   })
   export class DataEntryEpisodeIdentificationGQL extends Apollo.Query<DataEntryEpisodeIdentificationQuery, DataEntryEpisodeIdentificationQueryVariables> {
     override document = DataEntryEpisodeIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1838,7 +1834,7 @@ export const DataEntryEpisodeSourceTextMentionDocument = gql`
   })
   export class DataEntryEpisodeSourceTextMentionGQL extends Apollo.Query<DataEntryEpisodeSourceTextMentionQuery, DataEntryEpisodeSourceTextMentionQueryVariables> {
     override document = DataEntryEpisodeSourceTextMentionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1861,7 +1857,7 @@ export const DataEntryEpisodeFormDocument = gql`
   })
   export class DataEntryEpisodeFormGQL extends Apollo.Query<DataEntryEpisodeFormQuery, DataEntryEpisodeFormQueryVariables> {
     override document = DataEntryEpisodeFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1883,7 +1879,7 @@ export const DataEntryUpdateEpisodeDocument = gql`
   })
   export class DataEntryUpdateEpisodeGQL extends Apollo.Mutation<DataEntryUpdateEpisodeMutation, DataEntryUpdateEpisodeMutationVariables> {
     override document = DataEntryUpdateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1907,7 +1903,7 @@ export const DataEntryCreateEpisodeDocument = gql`
   })
   export class DataEntryCreateEpisodeGQL extends Apollo.Mutation<DataEntryCreateEpisodeMutation, DataEntryCreateEpisodeMutationVariables> {
     override document = DataEntryCreateEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1935,7 +1931,7 @@ export const DataEntryGiftCategoriesDocument = gql`
   })
   export class DataEntryGiftCategoriesGQL extends Apollo.Query<DataEntryGiftCategoriesQuery, DataEntryGiftCategoriesQueryVariables> {
     override document = DataEntryGiftCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1955,7 +1951,7 @@ export const DataEntryAllGiftCategoriesDocument = gql`
   })
   export class DataEntryAllGiftCategoriesGQL extends Apollo.Query<DataEntryAllGiftCategoriesQuery, DataEntryAllGiftCategoriesQueryVariables> {
     override document = DataEntryAllGiftCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1975,7 +1971,7 @@ export const DataEntryGiftIdentificationDocument = gql`
   })
   export class DataEntryGiftIdentificationGQL extends Apollo.Query<DataEntryGiftIdentificationQuery, DataEntryGiftIdentificationQueryVariables> {
     override document = DataEntryGiftIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -1997,7 +1993,7 @@ export const DataEntryGiftSourceTextDocument = gql`
   })
   export class DataEntryGiftSourceTextGQL extends Apollo.Query<DataEntryGiftSourceTextQuery, DataEntryGiftSourceTextQueryVariables> {
     override document = DataEntryGiftSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2021,7 +2017,7 @@ export const DataEntryGiftFormDocument = gql`
   })
   export class DataEntryGiftFormGQL extends Apollo.Query<DataEntryGiftFormQuery, DataEntryGiftFormQueryVariables> {
     override document = DataEntryGiftFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2043,7 +2039,7 @@ export const DataEntryUpdateGiftDocument = gql`
   })
   export class DataEntryUpdateGiftGQL extends Apollo.Mutation<DataEntryUpdateGiftMutation, DataEntryUpdateGiftMutationVariables> {
     override document = DataEntryUpdateGiftDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2071,7 +2067,7 @@ export const DataEntryLetterCategoriesDocument = gql`
   })
   export class DataEntryLetterCategoriesGQL extends Apollo.Query<DataEntryLetterCategoriesQuery, DataEntryLetterCategoriesQueryVariables> {
     override document = DataEntryLetterCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2091,7 +2087,7 @@ export const DataEntryAllLetterCategoriesDocument = gql`
   })
   export class DataEntryAllLetterCategoriesGQL extends Apollo.Query<DataEntryAllLetterCategoriesQuery, DataEntryAllLetterCategoriesQueryVariables> {
     override document = DataEntryAllLetterCategoriesDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2111,7 +2107,7 @@ export const DataEntryLetterIdentificationDocument = gql`
   })
   export class DataEntryLetterIdentificationGQL extends Apollo.Query<DataEntryLetterIdentificationQuery, DataEntryLetterIdentificationQueryVariables> {
     override document = DataEntryLetterIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2133,7 +2129,7 @@ export const DataEntryLetterSourceTextDocument = gql`
   })
   export class DataEntryLetterSourceTextGQL extends Apollo.Query<DataEntryLetterSourceTextQuery, DataEntryLetterSourceTextQueryVariables> {
     override document = DataEntryLetterSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2157,7 +2153,7 @@ export const DataEntryLetterFormDocument = gql`
   })
   export class DataEntryLetterFormGQL extends Apollo.Query<DataEntryLetterFormQuery, DataEntryLetterFormQueryVariables> {
     override document = DataEntryLetterFormDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2179,7 +2175,7 @@ export const DataEntryUpdateLetterDocument = gql`
   })
   export class DataEntryUpdateLetterGQL extends Apollo.Mutation<DataEntryUpdateLetterMutation, DataEntryUpdateLetterMutationVariables> {
     override document = DataEntryUpdateLetterDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2199,7 +2195,7 @@ export const DataEntryLocationIdentificationDocument = gql`
   })
   export class DataEntryLocationIdentificationGQL extends Apollo.Query<DataEntryLocationIdentificationQuery, DataEntryLocationIdentificationQueryVariables> {
     override document = DataEntryLocationIdentificationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2221,7 +2217,7 @@ export const DataEntryLocationSourceTextDocument = gql`
   })
   export class DataEntryLocationSourceTextGQL extends Apollo.Query<DataEntryLocationSourceTextQuery, DataEntryLocationSourceTextQueryVariables> {
     override document = DataEntryLocationSourceTextDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2245,7 +2241,7 @@ export const DataEntryLocationDocument = gql`
   })
   export class DataEntryLocationGQL extends Apollo.Query<DataEntryLocationQuery, DataEntryLocationQueryVariables> {
     override document = DataEntryLocationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2267,7 +2263,7 @@ export const DataEntryUpdateLocationDocument = gql`
   })
   export class DataEntryUpdateLocationGQL extends Apollo.Mutation<DataEntryUpdateLocationMutation, DataEntryUpdateLocationMutationVariables> {
     override document = DataEntryUpdateLocationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2289,7 +2285,7 @@ export const DataEntryDeleteLocationDocument = gql`
   })
   export class DataEntryDeleteLocationGQL extends Apollo.Mutation<DataEntryDeleteLocationMutation, DataEntryDeleteLocationMutationVariables> {
     override document = DataEntryDeleteLocationDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2314,7 +2310,7 @@ export const DataEntrySpaceDescriptionDocument = gql`
   })
   export class DataEntrySpaceDescriptionGQL extends Apollo.Query<DataEntrySpaceDescriptionQuery, DataEntrySpaceDescriptionQueryVariables> {
     override document = DataEntrySpaceDescriptionDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2342,7 +2338,7 @@ export const DataEntryEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryEpisodeEntityLinkGQL extends Apollo.Query<DataEntryEpisodeEntityLinkQuery, DataEntryEpisodeEntityLinkQueryVariables> {
     override document = DataEntryEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2364,7 +2360,7 @@ export const DataEntryUpdateEpisodeEntityLinkDocument = gql`
   })
   export class DataEntryUpdateEpisodeEntityLinkGQL extends Apollo.Mutation<DataEntryUpdateEpisodeEntityLinkMutation, DataEntryUpdateEpisodeEntityLinkMutationVariables> {
     override document = DataEntryUpdateEpisodeEntityLinkDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2386,7 +2382,7 @@ export const DataEntryDeleteEpisodeDocument = gql`
   })
   export class DataEntryDeleteEpisodeGQL extends Apollo.Mutation<DataEntryDeleteEpisodeMutation, DataEntryDeleteEpisodeMutationVariables> {
     override document = DataEntryDeleteEpisodeDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2437,7 +2433,7 @@ export const DataEntrySourceDetailDocument = gql`
   })
   export class DataEntrySourceDetailGQL extends Apollo.Query<DataEntrySourceDetailQuery, DataEntrySourceDetailQueryVariables> {
     override document = DataEntrySourceDetailDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2461,7 +2457,7 @@ export const DataEntrySourceListDocument = gql`
   })
   export class DataEntrySourceListGQL extends Apollo.Query<DataEntrySourceListQuery, DataEntrySourceListQueryVariables> {
     override document = DataEntrySourceListDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2480,7 +2476,7 @@ export const SourceTitleQueryDocument = gql`
   })
   export class SourceTitleQueryGQL extends Apollo.Query<SourceTitleQueryQuery, SourceTitleQueryQueryVariables> {
     override document = SourceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2503,7 +2499,7 @@ export const AgentTitleQueryDocument = gql`
   })
   export class AgentTitleQueryGQL extends Apollo.Query<AgentTitleQueryQuery, AgentTitleQueryQueryVariables> {
     override document = AgentTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2526,7 +2522,7 @@ export const LetterTitleQueryDocument = gql`
   })
   export class LetterTitleQueryGQL extends Apollo.Query<LetterTitleQueryQuery, LetterTitleQueryQueryVariables> {
     override document = LetterTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2549,7 +2545,7 @@ export const GiftTitleQueryDocument = gql`
   })
   export class GiftTitleQueryGQL extends Apollo.Query<GiftTitleQueryQuery, GiftTitleQueryQueryVariables> {
     override document = GiftTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
@@ -2572,8 +2568,8 @@ export const SpaceTitleQueryDocument = gql`
   })
   export class SpaceTitleQueryGQL extends Apollo.Query<SpaceTitleQueryQuery, SpaceTitleQueryQueryVariables> {
     override document = SpaceTitleQueryDocument;
-
+    
     constructor(apollo: Apollo.Apollo) {
       super(apollo);
     }
-  }
+  }
\ No newline at end of file
diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 8ff62fc5..56ce9ce0 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -119,13 +119,9 @@ type CreatePersonReferenceMutation {
   ok: Boolean!
 }
 
-input CreateSpaceInput {
-  name: String!
-  source: ID!
-}
-
 type CreateSpaceMutation {
   errors: [LettercraftErrorType!]!
+  ok: Boolean!
   space: SpaceDescriptionType
 }
 
@@ -446,7 +442,7 @@ type Mutation {
   createGift(giftData: CreateEntityDescriptionInput!): CreateGiftMutation
   createLetter(letterData: CreateEntityDescriptionInput!): CreateLetterMutation
   createPersonReference(referenceData: CreatePersonReferenceInput!): CreatePersonReferenceMutation
-  createSpace(spaceData: CreateSpaceInput!): CreateSpaceMutation
+  createSpace(spaceData: CreateEntityDescriptionInput!): CreateSpaceMutation
   deleteAgent(id: ID!): DeleteAgentMutation
   deleteEpisode(id: ID!): DeleteEpisodeMutation
   deleteEpisodeEntityLink(entity: ID!, entityType: Entity!, episode: ID!): DeleteEpisodeEntityLinkMutation
@@ -913,4 +909,4 @@ type UserType {
   fullName: String!
   id: ID!
   lastName: String!
-}
+}
\ No newline at end of file

From c99ecea8afd7ce95ad8f22095b47c4d3e06da833 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 13:59:17 +0200
Subject: [PATCH 556/565] Remove staticmethod decorator

---
 backend/source/types/SourceType.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/source/types/SourceType.py b/backend/source/types/SourceType.py
index 95e24170..78d0da14 100644
--- a/backend/source/types/SourceType.py
+++ b/backend/source/types/SourceType.py
@@ -17,6 +17,7 @@
 from space.models import SpaceDescription
 from space.types.SpaceDescriptionType import SpaceDescriptionType
 
+
 class SourceType(DjangoObjectType):
     episodes = List(NonNull(EpisodeType), required=True)
     num_of_episodes = Int(required=True)
@@ -38,7 +39,12 @@ class Meta:
             "edition_author",
         ]
 
-    @staticmethod
+    # It would be proper to decorate _entity_resolver() with @staticmethod,
+    # but we are running Python 3.9 on the server, which does not support
+    # calling static methods as regular functions, so the tests fail.
+    # This is solved in Python 3.10, cf. https://github.com/python/cpython/issues/87848
+
+    # @staticmethod
     def _entity_resolver(
         Model: Type[EntityDescription], OutputType: Type[DjangoObjectType]
     ):

From 4a253edb491b9a59b505de20c967d4d96ad165bf Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 16:27:28 +0200
Subject: [PATCH 557/565] Remove designators from sourceText subform

---
 .../location-source-text-form.component.html      |  3 ---
 .../location-source-text-form.component.ts        | 15 +++++++++++----
 .../location-source-text-form.graphql             |  1 -
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
index 819d7cc9..231c8300 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
@@ -1,7 +1,4 @@
 <form>
-    <lc-designators-control [formControl]="form.controls.designators" />
-
-    <h3>Location</h3>
     <p class="form-text">
         Describe the location of this gift in the source text.
     </p>
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
index c7360bae..9fc86451 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
@@ -17,10 +17,20 @@ import {
     debounceTime,
     share,
     withLatestFrom,
+    Observable,
 } from "rxjs";
 import { FormService } from "../../shared/form.service";
 import { FormStatus } from "../../shared/types";
 
+type LocationSourceText = Pick<
+    DataEntryUpdateLocationMutationVariables["spaceData"],
+    "book" | "chapter" | "page"
+>;
+
+type LocationSourceTextForm = {
+    [key in keyof LocationSourceText]: FormControl<string>;
+};
+
 @Component({
     selector: "lc-location-source-text-form",
     templateUrl: "./location-source-text-form.component.html",
@@ -35,10 +45,7 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
         shareReplay(1)
     );
 
-    public form = new FormGroup({
-        designators: new FormControl<string[]>([], {
-            nonNullable: true,
-        }),
+    public form = new FormGroup<LocationSourceTextForm>({
         book: new FormControl<string>("", {
             nonNullable: true,
         }),
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql
index 615371a8..ce68a970 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.graphql
@@ -1,7 +1,6 @@
 query DataEntryLocationSourceText($id: ID!) {
     spaceDescription(id: $id) {
         id
-        designators
         book
         chapter
         page

From ec8f78d1eebe07b7935d26b49f9ce0caa86ff121 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 16:27:52 +0200
Subject: [PATCH 558/565] Source text description correction

---
 .../location-source-text-form.component.html                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
index 231c8300..23041df8 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.html
@@ -1,6 +1,6 @@
 <form>
     <p class="form-text">
-        Describe the location of this gift in the source text.
+        Describe the location of this location in the source text.
     </p>
     <div class="row">
         <div class="form-group col">

From bf197c47089531185d74a1b71db4128b2ee0c022 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 16:28:28 +0200
Subject: [PATCH 559/565] Outfactor onMutationResult, onPerformMutation

---
 .../location-source-text-form.component.ts    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
index 9fc86451..a7ef493b 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
@@ -7,6 +7,7 @@ import {
     DataEntryLocationSourceTextGQL,
     DataEntryUpdateLocationGQL,
     DataEntryUpdateLocationMutation,
+    DataEntryUpdateLocationMutationVariables,
 } from "generated/graphql";
 import {
     switchMap,
@@ -92,11 +93,10 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
 
         const validFormSubmission$ = this.location$.pipe(
             switchMap(() =>
-                this.form.valueChanges.pipe(
-                    map(() => this.form.getRawValue()),
-                    filter(() => this.form.valid)
-                )
+                this.form.valueChanges
             ),
+            map(() => this.form.getRawValue()),
+            filter(() => this.form.valid),
             debounceTime(300),
             share()
         );
@@ -109,12 +109,7 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
             .pipe(
                 withLatestFrom(this.id$),
                 switchMap(([location, id]) =>
-                    this.updateLocation.mutate({
-                        spaceData: {
-                            ...location,
-                            id,
-                        },
-                    })
+                    this.performMutation(location, id)
                 ),
                 takeUntilDestroyed(this.destroyRef)
             )
@@ -125,6 +120,18 @@ export class LocationSourceTextFormComponent implements OnInit, OnDestroy {
         this.formService.detachForm(this.formName);
     }
 
+    private performMutation(
+        location: LocationSourceText,
+        id: string
+    ): Observable<MutationResult<DataEntryUpdateLocationMutation>> {
+        return this.updateLocation.mutate({
+            spaceData: {
+                ...location,
+                id,
+            },
+        });
+    }
+
     private onMutationResult(
         result: MutationResult<DataEntryUpdateLocationMutation>
     ): void {

From 0e3c2ca8d20dd67c5ee5c44ce6a7eb278c32681b Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 16:28:51 +0200
Subject: [PATCH 560/565] Use listWithQuotes

---
 .../location-form/location-form.component.ts  | 44 ++++++++++---------
 ...ocation-identification-form.component.html |  2 +-
 .../location-identification-form.component.ts |  6 +++
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/frontend/src/app/data-entry/location-form/location-form.component.ts b/frontend/src/app/data-entry/location-form/location-form.component.ts
index 3785733b..754b1508 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-form.component.ts
@@ -1,19 +1,19 @@
 import { Component, DestroyRef } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-import { Breadcrumb } from "@shared/breadcrumb/breadcrumb.component";
+import { Router } from "@angular/router";
 import { dataIcons } from "@shared/icons";
 import {
     DataEntryDeleteLocationGQL,
+    DataEntryDeleteLocationMutation,
     DataEntryLocationQuery,
     DataEntrySpaceDescriptionGQL,
-    DataEntrySpaceDescriptionQuery,
 } from "generated/graphql";
-import { filter, map, Observable, share, switchMap } from "rxjs";
+import { filter, map, share, switchMap } from "rxjs";
 import { FormService } from "../shared/form.service";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ApolloCache } from "@apollo/client/core";
+import { MutationResult } from "apollo-angular";
 
 type QueriedLocation = NonNullable<DataEntryLocationQuery["spaceDescription"]>
 
@@ -97,24 +97,26 @@ export class LocationFormComponent {
                 }
             )
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                this.deletingInProgress = false;
-                const errors = result.data?.deleteSpace?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Deletion failed",
-                    });
-                } else {
-                    this.toastService.show({
-                        body: "Location deleted",
-                        type: "success",
-                        header: "Success",
-                    });
-                }
-                this.router.navigate([`/data-entry/sources/${sourceId}`]);
+            .subscribe((result) => this.onMutationResult(result, sourceId));
+    }
+
+    private onMutationResult(result: MutationResult<DataEntryDeleteLocationMutation>, sourceId: string): void {
+        this.deletingInProgress = false;
+        const errors = result.data?.deleteSpace?.errors;
+        if (errors && errors.length > 0) {
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Deletion failed",
+            });
+        } else {
+            this.toastService.show({
+                body: "Location deleted",
+                type: "success",
+                header: "Success",
             });
+        }
+        this.router.navigate([`/data-entry/sources/${sourceId}`]);
     }
 
     private updateCache(cache: ApolloCache<unknown>, locationId: string): void {
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html
index c2ec5ba9..e5f1051f 100644
--- a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.html
@@ -3,7 +3,7 @@
         <label class="form-label" for="episode-name">Name</label>
         <p class="form-text">
             This is a name to identify the location in the overview of the
-            source. For example: "Kingdom of Burgundy", "Abbey of St Gall".
+            source. For example: {{ listWithQuotes(nameExamples['location']) }}.
         </p>
         <input
             id="episode-name"
diff --git a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
index bfab7e53..1ecb7fa1 100644
--- a/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-identification-form/location-identification-form.component.ts
@@ -22,6 +22,7 @@ import {
 } from "rxjs";
 import { FormService } from "../../shared/form.service";
 import { FormStatus } from "../../shared/types";
+import { listWithQuotes, nameExamples } from "../../shared/utils";
 
 interface LocationIdentification {
     name: string;
@@ -50,12 +51,17 @@ export class LocationIdentificationFormComponent implements OnInit, OnDestroy {
         name: new FormControl("", {
             validators: [Validators.required],
             nonNullable: true,
+            updateOn: "blur",
         }),
         description: new FormControl("", {
             nonNullable: true,
+            updateOn: "blur",
         }),
     });
 
+    public listWithQuotes = listWithQuotes;
+    public nameExamples = nameExamples;
+
     private formName = "identification";
     private status$ = new BehaviorSubject<FormStatus>("idle");
 

From 144c635e4921b785c8e63a4e587cf607a7988b69 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 16:32:42 +0200
Subject: [PATCH 561/565] Fix LocationSourceText type

---
 frontend/generated/graphql.ts                            | 3 +--
 .../location-source-text-form.component.ts               | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/generated/graphql.ts b/frontend/generated/graphql.ts
index 6049eeda..15b9cb62 100644
--- a/frontend/generated/graphql.ts
+++ b/frontend/generated/graphql.ts
@@ -1297,7 +1297,7 @@ export type DataEntryLocationSourceTextQueryVariables = Exact<{
 }>;
 
 
-export type DataEntryLocationSourceTextQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, designators: Array<string>, book: string, chapter: string, page: string } | null };
+export type DataEntryLocationSourceTextQuery = { __typename?: 'Query', spaceDescription?: { __typename?: 'SpaceDescriptionType', id: string, book: string, chapter: string, page: string } | null };
 
 export type DataEntryLocationQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -2204,7 +2204,6 @@ export const DataEntryLocationSourceTextDocument = gql`
     query DataEntryLocationSourceText($id: ID!) {
   spaceDescription(id: $id) {
     id
-    designators
     book
     chapter
     page
diff --git a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
index a7ef493b..d9a83b54 100644
--- a/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/location-form/location-source-text-form/location-source-text-form.component.ts
@@ -23,10 +23,11 @@ import {
 import { FormService } from "../../shared/form.service";
 import { FormStatus } from "../../shared/types";
 
-type LocationSourceText = Pick<
-    DataEntryUpdateLocationMutationVariables["spaceData"],
-    "book" | "chapter" | "page"
->;
+interface LocationSourceText {
+    book: string;
+    chapter: string;
+    page: string;
+}
 
 type LocationSourceTextForm = {
     [key in keyof LocationSourceText]: FormControl<string>;

From f491819f6a713de1183adc7880569196036f1841 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 16:52:49 +0200
Subject: [PATCH 562/565] Use formName; avoid duplicate forms

---
 .../episode-contents-form.component.ts        |  4 +-
 .../episode-form/episode-form.component.ts    | 40 ++++++++++---------
 .../episode-source-text-form.component.ts     |  4 +-
 .../letter-source-text-form.component.ts      |  1 -
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
index ce1abc7c..2484236a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-contents-form/episode-contents-form.component.ts
@@ -70,9 +70,7 @@ export class EpisodeContentsFormComponent implements OnInit, OnDestroy {
         private episodeQuery: DataEntryEpisodeContentsGQL,
         private episodeCategoriesQuery: DataEntryEpisodeCategoriesGQL,
         private updateEpisode: DataEntryUpdateEpisodeGQL
-    ) {
-        this.formService.attachForm('contents', this.status$);
-    }
+    ) { }
 
     ngOnInit(): void {
         this.formService.attachForm(this.formName, this.status$);
diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
index 7c6dbcad..2ef40a63 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.ts
@@ -1,18 +1,20 @@
 import { Component, DestroyRef } from "@angular/core";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
-import { ActivatedRoute, Router } from "@angular/router";
+import { Router } from "@angular/router";
 import { ApolloCache } from "@apollo/client/core";
 import { ModalService } from "@services/modal.service";
 import { ToastService } from "@services/toast.service";
 import { actionIcons, dataIcons } from "@shared/icons";
 import {
     DataEntryDeleteEpisodeGQL,
+    DataEntryDeleteEpisodeMutation,
     DataEntryEpisodeFormGQL,
     DataEntryEpisodeFormQuery,
     Entity
 } from "generated/graphql";
 import { filter, map, share, switchMap } from "rxjs";
 import { FormService } from "../shared/form.service";
+import { MutationResult } from "apollo-angular";
 
 
 type QueriedEpisode = NonNullable<DataEntryEpisodeFormQuery["episode"]>;
@@ -102,24 +104,26 @@ export class EpisodeFormComponent {
                 }
             )
             .pipe(takeUntilDestroyed(this.destroyRef))
-            .subscribe((result) => {
-                this.deletingInProgress = false;
-                const errors = result.data?.deleteEpisode?.errors;
-                if (errors && errors.length > 0) {
-                    this.toastService.show({
-                        body: errors.map((error) => error.messages).join("\n"),
-                        type: "danger",
-                        header: "Deletion failed",
-                    });
-                } else {
-                    this.toastService.show({
-                        body: "Episode deleted",
-                        type: "success",
-                        header: "Success",
-                    });
-                }
-                this.router.navigate([`/data-entry/sources/${sourceId}`]);
+            .subscribe((result) => this.onMutationResult(result, sourceId));
+    }
+
+    private onMutationResult(result: MutationResult<DataEntryDeleteEpisodeMutation>, sourceId: string): void {
+        this.deletingInProgress = false;
+        const errors = result.data?.deleteEpisode?.errors;
+        if (errors && errors.length > 0) {
+            this.toastService.show({
+                body: errors.map((error) => error.messages).join("\n"),
+                type: "danger",
+                header: "Deletion failed",
+            });
+        } else {
+            this.toastService.show({
+                body: "Episode deleted",
+                type: "success",
+                header: "Success",
             });
+        }
+        this.router.navigate([`/data-entry/sources/${sourceId}`]);
     }
 
     private updateCache(cache: ApolloCache<unknown>, episodeId: string): void {
diff --git a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
index 0a3c11ab..26ffa043 100644
--- a/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/episode-form/episode-source-text-form/episode-source-text-form.component.ts
@@ -52,9 +52,7 @@ export class EpisodeSourceTextFormComponent implements OnInit, OnDestroy {
         private toastService: ToastService,
         private episodeQuery: DataEntryEpisodeSourceTextMentionGQL,
         private updateEpisode: DataEntryUpdateEpisodeGQL,
-    ) {
-        this.formService.attachForm('source-text', this.status$);
-    }
+    ) { }
 
     ngOnInit(): void {
         this.formService.attachForm(this.formName, this.status$);
diff --git a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
index 26c19f01..c4f8ad6f 100644
--- a/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
+++ b/frontend/src/app/data-entry/letter-form/letter-source-text-form/letter-source-text-form.component.ts
@@ -23,7 +23,6 @@ import { FormStatus } from "../../shared/types";
 import { MutationResult } from "apollo-angular";
 
 interface LetterSourceText {
-    designators: string[];
     book: string;
     chapter: string;
     page: string;

From 2e455b7207bdd39c5e2a9630571dcb10374c39b8 Mon Sep 17 00:00:00 2001
From: Xander Vertegaal <a.j.j.vertegaal@uu.nl>
Date: Tue, 1 Oct 2024 16:57:33 +0200
Subject: [PATCH 563/565] Remove double FormStatus instance

---
 .../src/app/data-entry/episode-form/episode-form.component.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/app/data-entry/episode-form/episode-form.component.html b/frontend/src/app/data-entry/episode-form/episode-form.component.html
index 734000f2..0e57cf1a 100644
--- a/frontend/src/app/data-entry/episode-form/episode-form.component.html
+++ b/frontend/src/app/data-entry/episode-form/episode-form.component.html
@@ -16,8 +16,6 @@ <h1 class="mb-4">
     />
 </ng-container>
 
-<lc-form-status [status$]="status$" />
-
 <h2 class="subform-header">Identification</h2>
 <lc-episode-identification-form />
 

From b23883aaeb5986018ae08d09fec30222523ab585 Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 1 Oct 2024 17:23:41 +0200
Subject: [PATCH 564/565] new feature: delete locations

---
 frontend/generated/schema.graphql                             | 1 -
 .../app/data-entry/location-form/location-form.component.html | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/generated/schema.graphql b/frontend/generated/schema.graphql
index 40577364..49f128b0 100644
--- a/frontend/generated/schema.graphql
+++ b/frontend/generated/schema.graphql
@@ -876,7 +876,6 @@ input UpdateSpaceInput {
   categories: [ID!]
   chapter: String
   description: String
-  designators: [String!]
   id: ID!
   name: String
   page: String
diff --git a/frontend/src/app/data-entry/location-form/location-form.component.html b/frontend/src/app/data-entry/location-form/location-form.component.html
index e653b8bd..fb7d804d 100644
--- a/frontend/src/app/data-entry/location-form/location-form.component.html
+++ b/frontend/src/app/data-entry/location-form/location-form.component.html
@@ -18,11 +18,11 @@ <h1 class="mb-4">
 
     <lc-form-status [status$]="status$" />
 
-    <!-- <lc-delete-entity-button
+    <lc-delete-entity-button
             (clickDelete)="onClickDelete(location)"
             [deletingInProgress]="deletingInProgress"
             entityName="location"
-        /> -->
+        />
 </ng-container>
 
 <h2 class="subform-header">Identification</h2>

From 71d569fffc3752bcebd0b0097bd338393203581b Mon Sep 17 00:00:00 2001
From: Luka van der Plas <lukavdplas@mailfence.com>
Date: Tue, 1 Oct 2024 17:28:12 +0200
Subject: [PATCH 565/565] bump version number

---
 CITATION.cff | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index acd67ab2..33495ab0 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -29,5 +29,5 @@ authors:
     website: 'https://cdh.uu.nl/rsl/'
 repository-code: 'https://github.com/CentreForDigitalHumanities/lettercraft'
 license: BSD-3-Clause
-version: 0.4.0
-date-released: '2024-06-10'
+version: 0.5.0
+date-released: '2024-10-01'
diff --git a/package.json b/package.json
index 3903efe3..fbdb2739 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "lettercraft",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "description": "Lettercraft & Epistolary Performance in Medieval Europe",
     "author": "UU Centre for Digital Humanities - Research Software Lab",
     "license": "BSD-3-Clause",