Chore: Upgrade to Angular v18

Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3

bookie/src/app/tables/table-detail/table-detail.component.html

@@ -20,9 +20,11 @@
         <mat-form-field class="flex-auto">
           <mat-label>Section</mat-label>
           <mat-select formControlName="section">
-            <mat-option *ngFor="let s of sections" [value]="s.id">
-              {{ s.name }}
-            </mat-option>
+            @for (s of sections; track s) {
+              <mat-option [value]="s.id">
+                {{ s.name }}
+              </mat-option>
+            }
           </mat-select>
         </mat-form-field>
       </div>
@@ -33,6 +35,8 @@
   </mat-card-content>
   <mat-card-actions>
     <button mat-raised-button (click)="save()" class="mr-5" color="primary">Save</button>
-    <button mat-raised-button color="warn" (click)="confirmDelete()" *ngIf="!!item.id">Delete</button>
+    @if (!!item.id) {
+      <button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
+    }
   </mat-card-actions>
 </mat-card>

bookie/src/app/tables/table-detail/table-detail.component.spec.ts

@@ -8,7 +8,7 @@ describe('TableDetailComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [TableDetailComponent],
+      imports: [TableDetailComponent],
     }).compileComponents();
   }));
 

bookie/src/app/tables/table-detail/table-detail.component.ts

@@ -1,6 +1,13 @@
 import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
+import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { MatButton } from '@angular/material/button';
+import { MatCard, MatCardHeader, MatCardTitle, MatCardContent, MatCardActions } from '@angular/material/card';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MatOption } from '@angular/material/core';
 import { MatDialog } from '@angular/material/dialog';
+import { MatFormField, MatLabel } from '@angular/material/form-field';
+import { MatInput } from '@angular/material/input';
+import { MatSelect } from '@angular/material/select';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { Section } from '../../core/section';
@@ -13,6 +20,22 @@ import { TableService } from '../table.service';
   selector: 'app-table-detail',
   templateUrl: './table-detail.component.html',
   styleUrls: ['./table-detail.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitle,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatSelect,
+    MatOption,
+    MatCheckbox,
+    MatCardActions,
+    MatButton,
+  ],
 })
 export class TableDetailComponent implements OnInit, AfterViewInit {
   @ViewChild('nameElement', { static: true }) nameElement?: ElementRef;
@@ -69,27 +92,27 @@ export class TableDetailComponent implements OnInit, AfterViewInit {
   }
 
   save() {
-    this.ser.saveOrUpdate(this.getItem()).subscribe(
-      () => {
+    this.ser.saveOrUpdate(this.getItem()).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/tables');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   delete() {
-    this.ser.delete(this.item.id as string).subscribe(
-      () => {
+    this.ser.delete(this.item.id as string).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
         this.router.navigateByUrl('/tables');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   confirmDelete(): void {

bookie/src/app/tables/table-list-resolver.service.ts

@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-
-import { Table } from '../core/table';
-
-import { TableService } from './table.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class TableListResolver {
-  constructor(private ser: TableService) {}
-
-  resolve(): Observable<Table[]> {
-    return this.ser.list();
-  }
-}

bookie/src/app/tables/table-list.resolver.ts

@@ -0,0 +1,10 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Table } from '../core/table';
+
+import { TableService } from './table.service';
+
+export const tableListResolver: ResolveFn<Table[]> = () => {
+  return inject(TableService).list();
+};

bookie/src/app/tables/table-list/table-list.component.spec.ts

@@ -8,7 +8,7 @@ describe('TableListComponent', () => {
 
   beforeEach(fakeAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [TableListComponent],
+      imports: [TableListComponent],
     }).compileComponents();
 
     fixture = TestBed.createComponent(TableListComponent);

bookie/src/app/tables/table-list/table-list.component.ts

@@ -1,7 +1,21 @@
-import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { CdkDragDrop, moveItemInArray, CdkDropList, CdkDrag } from '@angular/cdk/drag-drop';
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { MatTable } from '@angular/material/table';
-import { ActivatedRoute, Router } from '@angular/router';
+import { MatButton, MatAnchor } from '@angular/material/button';
+import { MatCard, MatCardHeader, MatCardTitleGroup, MatCardTitle, MatCardContent } from '@angular/material/card';
+import { MatIcon } from '@angular/material/icon';
+import {
+  MatTable,
+  MatColumnDef,
+  MatHeaderCellDef,
+  MatHeaderCell,
+  MatCellDef,
+  MatCell,
+  MatHeaderRowDef,
+  MatHeaderRow,
+  MatRowDef,
+  MatRow,
+} from '@angular/material/table';
+import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { BehaviorSubject } from 'rxjs';
 
 import { MenuCategory } from '../../core/menu-category';
@@ -15,6 +29,30 @@ import { TableListDataSource } from './table-list-datasource';
   selector: 'app-table-list',
   templateUrl: './table-list.component.html',
   styleUrls: ['./table-list.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitleGroup,
+    MatCardTitle,
+    MatButton,
+    MatAnchor,
+    RouterLink,
+    MatIcon,
+    MatCardContent,
+    MatTable,
+    CdkDropList,
+    MatColumnDef,
+    MatHeaderCellDef,
+    MatHeaderCell,
+    MatCellDef,
+    MatCell,
+    MatHeaderRowDef,
+    MatHeaderRow,
+    MatRowDef,
+    MatRow,
+    CdkDrag,
+  ],
 })
 export class TableListComponent implements OnInit {
   @ViewChild('table', { static: true }) table?: MatTable<MenuCategory>;
@@ -44,14 +82,14 @@ export class TableListComponent implements OnInit {
   }
 
   updateSortOrder() {
-    this.ser.updateSortOrder(this.list).subscribe(
-      () => {
+    this.ser.updateSortOrder(this.list).subscribe({
+      next: () => {
         this.toaster.show('Success', '');
       },
-      (error) => {
+      error: (error) => {
         this.toaster.show('Error', error);
       },
-    );
+    });
   }
 
   dropTable(event: CdkDragDrop<TableListDataSource>) {

bookie/src/app/tables/table-resolver.service.ts

@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-
-import { Table } from '../core/table';
-
-import { TableService } from './table.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class TableResolver {
-  constructor(private ser: TableService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<Table> {
-    const id = route.paramMap.get('id');
-    return this.ser.get(id);
-  }
-}

bookie/src/app/tables/table.resolver.ts

@@ -0,0 +1,11 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { Table } from '../core/table';
+
+import { TableService } from './table.service';
+
+export const tableResolver: ResolveFn<Table> = (route) => {
+  const id = route.paramMap.get('id');
+  return inject(TableService).get(id);
+};

bookie/src/app/tables/tables-routing.module.spec.ts

@@ -1,13 +0,0 @@
-import { TableRoutingModule } from './tables-routing.module';
-
-describe('TableRoutingModule', () => {
-  let tablesRoutingModule: TableRoutingModule;
-
-  beforeEach(() => {
-    tablesRoutingModule = new TableRoutingModule();
-  });
-
-  it('should create an instance', () => {
-    expect(tablesRoutingModule).toBeTruthy();
-  });
-});

bookie/src/app/tables/tables-routing.module.ts

@@ -1,56 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-import { AuthGuard } from '../auth/auth-guard.service';
-import { SectionListResolver } from '../sections/section-list-resolver.service';
-
-import { TableDetailComponent } from './table-detail/table-detail.component';
-import { TableListComponent } from './table-list/table-list.component';
-import { TableListResolver } from './table-list-resolver.service';
-import { TableResolver } from './table-resolver.service';
-
-const tablesRoutes: Routes = [
-  {
-    path: '',
-    component: TableListComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Sections',
-    },
-    resolve: {
-      list: TableListResolver,
-    },
-  },
-  {
-    path: 'new',
-    component: TableDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Sections',
-    },
-    resolve: {
-      item: TableResolver,
-      sections: SectionListResolver,
-    },
-  },
-  {
-    path: ':id',
-    component: TableDetailComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Sections',
-    },
-    resolve: {
-      item: TableResolver,
-      sections: SectionListResolver,
-    },
-  },
-];
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(tablesRoutes)],
-  exports: [RouterModule],
-  providers: [TableListResolver, TableResolver],
-})
-export class TableRoutingModule {}

bookie/src/app/tables/tables.module.spec.ts

@@ -1,13 +0,0 @@
-import { TableModule } from './tables.module';
-
-describe('TableModule', () => {
-  let tablesModule: TableModule;
-
-  beforeEach(() => {
-    tablesModule = new TableModule();
-  });
-
-  it('should create an instance', () => {
-    expect(tablesModule).toBeTruthy();
-  });
-});

bookie/src/app/tables/tables.module.ts

@@ -1,39 +0,0 @@
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { CdkTableModule } from '@angular/cdk/table';
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { MatOptionModule } from '@angular/material/core';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
-import { MatSelectModule } from '@angular/material/select';
-import { MatTableModule } from '@angular/material/table';
-
-import { TableDetailComponent } from './table-detail/table-detail.component';
-import { TableListComponent } from './table-list/table-list.component';
-import { TableRoutingModule } from './tables-routing.module';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CdkTableModule,
-    DragDropModule,
-    MatButtonModule,
-    MatCardModule,
-    MatCheckboxModule,
-    MatIconModule,
-    MatInputModule,
-    MatOptionModule,
-    MatProgressSpinnerModule,
-    MatSelectModule,
-    MatTableModule,
-    ReactiveFormsModule,
-    TableRoutingModule,
-  ],
-  declarations: [TableListComponent, TableDetailComponent],
-})
-export class TableModule {}

bookie/src/app/tables/tables.routes.ts

@@ -0,0 +1,47 @@
+import { Routes } from '@angular/router';
+
+import { authGuard } from '../auth/auth-guard.service';
+import { sectionListResolver } from '../sections/section-list.resolver';
+
+import { TableDetailComponent } from './table-detail/table-detail.component';
+import { TableListComponent } from './table-list/table-list.component';
+import { tableListResolver } from './table-list.resolver';
+import { tableResolver } from './table.resolver';
+
+export const routes: Routes = [
+  {
+    path: '',
+    component: TableListComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Sections',
+    },
+    resolve: {
+      list: tableListResolver,
+    },
+  },
+  {
+    path: 'new',
+    component: TableDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Sections',
+    },
+    resolve: {
+      item: tableResolver,
+      sections: sectionListResolver,
+    },
+  },
+  {
+    path: ':id',
+    component: TableDetailComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Sections',
+    },
+    resolve: {
+      item: tableResolver,
+      sections: sectionListResolver,
+    },
+  },
+];