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/product/product-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 { Product } from '../core/product';
@@ -9,7 +8,7 @@ import { ProductService } from './product.service';
 @Injectable({
   providedIn: 'root',
 })
-export class ProductListResolver implements Resolve<Product[]> {
+export class ProductListResolver {
   constructor(private ser: ProductService) {}
 
   resolve(): Observable<Product[]> {

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

@@ -26,12 +26,7 @@ export class ProductListDataSource extends DataSource<Product> {
   }
 
   connect(): Observable<Product[]> {
-    const dataMutations: (
-      | Observable<Product[]>
-      | Observable<string>
-      | EventEmitter<PageEvent>
-      | EventEmitter<Sort>
-    )[] = [observableOf(this.data), this.filter];
+    const dataMutations: (EventEmitter<PageEvent> | EventEmitter<Sort>)[] = [];
     if (this.paginator) {
       dataMutations.push((this.paginator as MatPaginator).page);
     }
@@ -39,7 +34,7 @@ export class ProductListDataSource extends DataSource<Product> {
       dataMutations.push((this.sort as MatSort).sortChange);
     }
 
-    return merge(...dataMutations).pipe(
+    return merge(observableOf(this.data), this.filter, ...dataMutations).pipe(
       map(() => this.getFilteredData([...this.data])),
       tap((x: Product[]) => {
         if (this.paginator) {

overlord/src/app/product/product-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 { Product } from '../core/product';
@@ -9,7 +9,7 @@ import { ProductService } from './product.service';
 @Injectable({
   providedIn: 'root',
 })
-export class ProductResolver implements Resolve<Product> {
+export class ProductResolver {
   constructor(private ser: ProductService) {}
 
   resolve(route: ActivatedRouteSnapshot): Observable<Product> {

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

@@ -1,49 +1,58 @@
 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 { ProductGroupListResolver } from '../product-group/product-group-list-resolver.service';
 
 import { ProductDetailComponent } from './product-detail/product-detail.component';
-import { ProductListResolver } from './product-list-resolver.service';
 import { ProductListComponent } from './product-list/product-list.component';
+import { ProductListResolver } from './product-list-resolver.service';
 import { ProductResolver } from './product-resolver.service';
 
 const productRoutes: Routes = [
   {
     path: '',
     component: ProductListComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Products',
     },
     resolve: {
-      list: ProductListResolver,
+      list: () => inject(ProductListResolver).resolve(),
     },
   },
   {
     path: 'new',
     component: ProductDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Products',
     },
     resolve: {
-      item: ProductResolver,
-      productGroups: ProductGroupListResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(ProductResolver).resolve(route),
+      productGroups: () => inject(ProductGroupListResolver).resolve(),
     },
   },
   {
     path: ':id',
     component: ProductDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Products',
     },
     resolve: {
-      item: ProductResolver,
-      productGroups: ProductGroupListResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(ProductResolver).resolve(route),
+      productGroups: () => inject(ProductGroupListResolver).resolve(),
     },
   },
 ];