Feature: Adding recipe templates to print recipes.

Feautre: Recipe export to xlsx
Chore: Python 11 style type annotations
Chore: Moved to sqlalchemy 2.0
Chore: Minimum python is 3.11
Fix: Fix nullability of a lot of fields in the database.

overlord/src/app/role/role-list-resolver.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { Resolve } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { Role } from './role';
@@ -8,7 +7,7 @@ import { RoleService } from './role.service';
 @Injectable({
   providedIn: 'root',
 })
-export class RoleListResolver implements Resolve<Role[]> {
+export class RoleListResolver {
   constructor(private ser: RoleService) {}
 
   resolve(): Observable<Role[]> {

overlord/src/app/role/role-list/role-list-datasource.ts

@@ -16,9 +16,7 @@ export class RoleListDatasource extends DataSource<Role> {
   }
 
   connect(): Observable<Role[]> {
-    const dataMutations: (Observable<Role[]> | EventEmitter<PageEvent> | EventEmitter<Sort>)[] = [
-      observableOf(this.data),
-    ];
+    const dataMutations: (EventEmitter<PageEvent> | EventEmitter<Sort>)[] = [];
     if (this.paginator) {
       dataMutations.push((this.paginator as MatPaginator).page);
     }
@@ -31,7 +29,7 @@ export class RoleListDatasource extends DataSource<Role> {
       this.paginator.length = this.data.length;
     }
 
-    return merge(...dataMutations).pipe(
+    return merge(observableOf(this.data), ...dataMutations).pipe(
       map(() => this.getPagedData(this.getSortedData([...this.data]))),
     );
   }

overlord/src/app/role/role-resolver.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { Role } from './role';
@@ -8,7 +8,7 @@ import { RoleService } from './role.service';
 @Injectable({
   providedIn: 'root',
 })
-export class RoleResolver implements Resolve<Role> {
+export class RoleResolver {
   constructor(private ser: RoleService) {}
 
   resolve(route: ActivatedRouteSnapshot): Observable<Role> {

overlord/src/app/role/role-routing.module.ts

@@ -1,46 +1,55 @@
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { NgModule, inject } from '@angular/core';
+import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
 
 import { RoleDetailComponent } from './role-detail/role-detail.component';
-import { RoleListResolver } from './role-list-resolver.service';
 import { RoleListComponent } from './role-list/role-list.component';
+import { RoleListResolver } from './role-list-resolver.service';
 import { RoleResolver } from './role-resolver.service';
 
 const roleRoutes: Routes = [
   {
     path: '',
     component: RoleListComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Users',
     },
     resolve: {
-      list: RoleListResolver,
+      list: () => inject(RoleListResolver).resolve(),
     },
   },
   {
     path: 'new',
     component: RoleDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Users',
     },
     resolve: {
-      item: RoleResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(RoleResolver).resolve(route),
     },
   },
   {
     path: ':id',
     component: RoleDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Users',
     },
     resolve: {
-      item: RoleResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(RoleResolver).resolve(route),
     },
   },
 ];