Consolidated commit message to v22 signals

overlord/src/app/client/client-detail/client-detail.component.html

@@ -1,30 +1,37 @@
 <h2>Client</h2>
 
-<form [formGroup]="form" class="flex-col wrapped">
-  <div class="row-container">
-    <mat-form-field class="flex-auto">
-      <mat-label>Code</mat-label>
-      <input matInput formControlName="code" />
-    </mat-form-field>
-  </div>
-  <div class="row-container">
-    <mat-form-field class="flex-auto">
-      <mat-label>Name</mat-label>
-      <input matInput #nameElement formControlName="name" />
-    </mat-form-field>
-  </div>
-  <div class="row-container">
-    <mat-checkbox formControlName="enabled" class="flex-auto">Is Enabled?</mat-checkbox>
-  </div>
-  <div class="row-container">
-    <mat-form-field class="flex-auto">
-      <mat-label>OTP</mat-label>
-      <input matInput formControlName="otp" />
-    </mat-form-field>
-  </div>
-</form>
+@if (itemResource.isLoading()) {
+  <app-skeleton-loader type="card" [count]="1" />
+  <app-skeleton-loader type="line" [count]="10" />
+} @else if (itemResource.error()) {
+  <app-error-state [message]="'Failed to load data.'" (retryAction)="itemResource.reload()" />
+} @else {
+  <form class="flex-col wrapped" [formRoot]="form">
+    <div class="row-container">
+      <mat-form-field class="flex-auto">
+        <mat-label>Code</mat-label>
+        <input matInput [formField]="form.code" />
+      </mat-form-field>
+    </div>
+    <div class="row-container">
+      <mat-form-field class="flex-auto">
+        <mat-label>Name</mat-label>
+        <input matInput [formField]="form.name" />
+      </mat-form-field>
+    </div>
+    <div class="row-container">
+      <mat-checkbox [formField]="form.enabled" class="flex-auto">Is Enabled?</mat-checkbox>
+    </div>
+    <div class="row-container">
+      <mat-form-field class="flex-auto">
+        <mat-label>OTP</mat-label>
+        <input matInput [formField]="form.otp" />
+      </mat-form-field>
+    </div>
+  </form>
 
-<div class="row-container">
-  <button mat-raised-button color="primary" (click)="save()">Save</button>
-  <button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
-</div>
+  <div class="row-container">
+    <button mat-raised-button color="primary" (click)="save()">Save</button>
+    <button mat-raised-button color="warn" (click)="confirmDelete()">Delete</button>
+  </div>
+}

overlord/src/app/client/client-detail/client-detail.component.ts

@@ -1,73 +1,71 @@
-import { AfterViewInit, Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core';
-import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { Component, inject, afterNextRender, linkedSignal, input, computed } from '@angular/core';
+import { form as createForm, FormField, FormRoot } from '@angular/forms/signals';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialog } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 
 import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
+import { ErrorStateComponent } from '../../shared/error-state/error-state.component';
+import { SkeletonLoaderComponent } from '../../shared/skeleton-loader/skeleton-loader.component';
 import { Client } from '../client';
 import { ClientService } from '../client.service';
 
+export interface ClientFormData {
+  code: string;
+  name: string;
+  enabled: boolean;
+  otp: string;
+}
+
 @Component({
   selector: 'app-client-detail',
   templateUrl: './client-detail.component.html',
   styleUrls: ['./client-detail.component.css'],
-  imports: [ReactiveFormsModule, MatFormFieldModule, MatInputModule, MatCheckboxModule, MatButtonModule],
+  imports: [
+    FormField,
+    FormRoot,
+    MatFormFieldModule,
+    MatInputModule,
+    MatCheckboxModule,
+    MatButtonModule,
+    SkeletonLoaderComponent,
+    ErrorStateComponent,
+  ],
 })
-export class ClientDetailComponent implements OnInit, AfterViewInit {
-  private route = inject(ActivatedRoute);
+export class ClientDetailComponent {
+  id = input(null, { transform: (v: string | null | undefined) => v ?? null });
+
   private router = inject(Router);
   private dialog = inject(MatDialog);
   private snackBar = inject(MatSnackBar);
   private ser = inject(ClientService);
 
-  @ViewChild('nameElement', { static: true }) nameElement!: ElementRef<HTMLInputElement>;
-  form: FormGroup<{
-    code: FormControl<number | string>;
-    name: FormControl<string | null>;
-    enabled: FormControl<boolean>;
-    otp: FormControl<number | null>;
-  }>;
+  itemResource = this.ser.get(this.id);
 
-  item: Client = new Client();
+  item = computed(() => this.itemResource.value() ?? new Client());
+
+  model = linkedSignal({
+    source: this.item,
+    computation: (item): ClientFormData => ({
+      code: item.code ? String(item.code) : '(Auto)',
+      name: item.name ?? '',
+      enabled: item.enabled ?? false,
+      otp: item.otp ? String(item.otp) : '',
+    }),
+  });
+
+  form = createForm(this.model);
 
   constructor() {
-    this.form = new FormGroup({
-      code: new FormControl<number | string>({ value: '(Auto)', disabled: true }, { nonNullable: true }),
-      name: new FormControl<string | null>(null),
-      enabled: new FormControl<boolean>(false, { nonNullable: true }),
-      otp: new FormControl<number | null>(null),
+    afterNextRender(() => {
+      this.form.name().focusBoundControl();
     });
   }
 
-  ngOnInit() {
-    this.route.data.subscribe((value) => {
-      const data = value as { item: Client };
-
-      this.showItem(data.item);
-    });
-  }
-
-  showItem(item: Client) {
-    this.item = item;
-    this.form.setValue({
-      code: this.item.code || '(Auto)',
-      name: this.item.name,
-      enabled: this.item.enabled,
-      otp: this.item.otp || null,
-    });
-  }
-
-  ngAfterViewInit() {
-    setTimeout(() => {
-      this.nameElement.nativeElement.focus();
-    }, 0);
-  }
-
   save() {
     this.ser.update(this.getItem()).subscribe({
       next: () => {
@@ -75,19 +73,19 @@ export class ClientDetailComponent implements OnInit, AfterViewInit {
         this.router.navigateByUrl('/clients');
       },
       error: (error) => {
-        this.snackBar.open(error, 'Danger');
+        this.snackBar.open(error as string, 'Danger');
       },
     });
   }
 
   delete() {
-    this.ser.delete(this.item.id).subscribe({
+    this.ser.delete(this.item().id).subscribe({
       next: () => {
         this.snackBar.open('', 'Success');
         this.router.navigateByUrl('/clients');
       },
       error: (error) => {
-        this.snackBar.open(error, 'Danger');
+        this.snackBar.open(error as string, 'Danger');
       },
     });
   }
@@ -106,10 +104,11 @@ export class ClientDetailComponent implements OnInit, AfterViewInit {
   }
 
   getItem(): Client {
-    const formModel = this.form.value;
-    this.item.name = formModel.name ?? '';
-    this.item.enabled = formModel.enabled ?? false;
-    this.item.otp = formModel.otp || undefined;
-    return this.item;
+    const formModel = this.model();
+    const item = this.item();
+    item.name = formModel.name ?? '';
+    item.enabled = formModel.enabled ?? false;
+    item.otp = formModel.otp ? Number(formModel.otp) : undefined;
+    return item;
   }
 }

overlord/src/app/client/client-list.resolver.spec.ts

@@ -1,18 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { ResolveFn } from '@angular/router';
-
-import { Client } from './client';
-import { clientListResolver } from './client-list.resolver';
-
-describe('clientListResolver', () => {
-  const executeResolver: ResolveFn<Client[]> = (...resolverParameters) =>
-    TestBed.runInInjectionContext(() => clientListResolver(...resolverParameters));
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-  });
-
-  it('should be created', () => {
-    expect(executeResolver).toBeTruthy();
-  });
-});

overlord/src/app/client/client-list.resolver.ts

@@ -1,9 +0,0 @@
-import { inject } from '@angular/core';
-import { ResolveFn } from '@angular/router';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-export const clientListResolver: ResolveFn<Client[]> = () => {
-  return inject(ClientService).list();
-};

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

@@ -1,71 +0,0 @@
-import { DataSource } from '@angular/cdk/collections';
-import { EventEmitter } from '@angular/core';
-import { MatPaginator, PageEvent } from '@angular/material/paginator';
-import { MatSort, Sort } from '@angular/material/sort';
-import { merge, Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { Client } from '../client';
-
-/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
-const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1);
-export class ClientListDataSource extends DataSource<Client> {
-  constructor(
-    public data: Client[],
-    private paginator?: MatPaginator,
-    private sort?: MatSort,
-  ) {
-    super();
-  }
-
-  connect(): Observable<Client[]> {
-    const dataMutations: (EventEmitter<PageEvent> | EventEmitter<Sort>)[] = [];
-    if (this.paginator) {
-      dataMutations.push((this.paginator as MatPaginator).page);
-    }
-    if (this.sort) {
-      dataMutations.push((this.sort as MatSort).sortChange);
-    }
-
-    // Set the paginators length
-    if (this.paginator) {
-      this.paginator.length = this.data.length;
-    }
-
-    return merge(observableOf(this.data), ...dataMutations).pipe(
-      map(() => this.getPagedData(this.getSortedData([...this.data]))),
-    );
-  }
-
-  disconnect() {}
-
-  private getPagedData(data: Client[]) {
-    if (this.paginator === undefined) {
-      return data;
-    }
-    const startIndex = this.paginator.pageIndex * this.paginator.pageSize;
-    return data.splice(startIndex, this.paginator.pageSize);
-  }
-
-  private getSortedData(data: Client[]) {
-    if (this.sort === undefined) {
-      return data;
-    }
-    if (!this.sort.active || this.sort.direction === '') {
-      return data;
-    }
-
-    const sort = this.sort as MatSort;
-    return data.sort((a, b) => {
-      const isAsc = sort.direction === 'asc';
-      switch (sort.active) {
-        case 'name':
-          return compare(a.name, b.name, isAsc);
-        case 'id':
-          return compare(+a.id, +b.id, isAsc);
-        default:
-          return 0;
-      }
-    });
-  }
-}

overlord/src/app/client/client-list/client-list.component.html

@@ -1,55 +1,61 @@
 <h2>Clients</h2>
 
-<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
-  <!-- Code Column -->
-  <ng-container matColumnDef="code">
-    <mat-header-cell *matHeaderCellDef mat-sort-header>Code</mat-header-cell>
-    <mat-cell *matCellDef="let row">{{ row.code }}</mat-cell>
-  </ng-container>
+@if (listResource.isLoading()) {
+  <app-skeleton-loader type="table" [count]="1" />
+} @else if (listResource.error()) {
+  <app-error-state [message]="'Failed to load data.'" (retryAction)="listResource.reload()" />
+} @else {
+  <mat-table #table [dataSource]="dataSource()" matSort (matSortChange)="sortData($event)">
+    <!-- Code Column -->
+    <ng-container matColumnDef="code">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>Code</mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.code }}</mat-cell>
+    </ng-container>
 
-  <!-- Name Column -->
-  <ng-container matColumnDef="name">
-    <mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
-    <mat-cell *matCellDef="let row"
-      ><a [routerLink]="['/clients', row.id]">{{ row.name }}</a></mat-cell
-    >
-  </ng-container>
+    <!-- Name Column -->
+    <ng-container matColumnDef="name">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
+      <mat-cell *matCellDef="let row"
+        ><a [routerLink]="['/clients', row.id]">{{ row.name }}</a></mat-cell
+      >
+    </ng-container>
 
-  <!-- Enabled Column -->
-  <ng-container matColumnDef="enabled">
-    <mat-header-cell *matHeaderCellDef mat-sort-header>Is Enabled?</mat-header-cell>
-    <mat-cell *matCellDef="let row">{{ row.enabled }}</mat-cell>
-  </ng-container>
+    <!-- Enabled Column -->
+    <ng-container matColumnDef="enabled">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>Is Enabled?</mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.enabled }}</mat-cell>
+    </ng-container>
 
-  <!-- OTP Column -->
-  <ng-container matColumnDef="otp">
-    <mat-header-cell *matHeaderCellDef mat-sort-header>otp</mat-header-cell>
-    <mat-cell *matCellDef="let row">{{ row.otp }}</mat-cell>
-  </ng-container>
+    <!-- OTP Column -->
+    <ng-container matColumnDef="otp">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>otp</mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.otp }}</mat-cell>
+    </ng-container>
 
-  <!-- Created Column -->
-  <ng-container matColumnDef="created">
-    <mat-header-cell *matHeaderCellDef mat-sort-header>Created</mat-header-cell>
-    <mat-cell *matCellDef="let row">{{ row.creationDate | localTime }}</mat-cell>
-  </ng-container>
+    <!-- Created Column -->
+    <ng-container matColumnDef="created">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>Created</mat-header-cell>
+      <mat-cell *matCellDef="let row">{{ row.creationDate | localTime }}</mat-cell>
+    </ng-container>
 
-  <!-- Last Login Column -->
-  <ng-container matColumnDef="last">
-    <mat-header-cell *matHeaderCellDef mat-sort-header>Last Login</mat-header-cell>
-    <mat-cell *matCellDef="let row"
-      >{{ row.lastUser }} &#64; {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
-    >
-  </ng-container>
+    <!-- Last Login Column -->
+    <ng-container matColumnDef="last">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>Last Login</mat-header-cell>
+      <mat-cell *matCellDef="let row"
+        >{{ row.lastUser }} &#64; {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}</mat-cell
+      >
+    </ng-container>
 
-  <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
-  <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
-</mat-table>
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
+  </mat-table>
 
-<mat-paginator
-  #paginator
-  [length]="dataSource.data.length"
-  [pageIndex]="0"
-  [pageSize]="50"
-  [pageSizeOptions]="[25, 50, 100, 250]"
->
-</mat-paginator>
+  <mat-paginator
+    (page)="handlePageEvent($event)"
+    [length]="list().length"
+    [pageIndex]="pageIndex()"
+    [pageSize]="pageSize()"
+    [pageSizeOptions]="[25, 50, 100, 250]"
+  >
+  </mat-paginator>
+}

overlord/src/app/client/client-list/client-list.component.ts

@@ -1,35 +1,81 @@
-import { Component, inject, OnInit, ViewChild } from '@angular/core';
-import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
-import { MatSort, MatSortModule } from '@angular/material/sort';
+import { Component, computed, inject, signal } from '@angular/core';
+import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
+import { MatSortModule, Sort } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
-import { ActivatedRoute, RouterModule } from '@angular/router';
+import { RouterModule } from '@angular/router';
 
+import { ErrorStateComponent } from '../../shared/error-state/error-state.component';
 import { LocalTimePipe } from '../../shared/local-time.pipe';
-import { Client } from '../client';
-import { ClientListDataSource } from './client-list-datasource';
+import { SkeletonLoaderComponent } from '../../shared/skeleton-loader/skeleton-loader.component';
+import { ClientService } from '../client.service';
 
 @Component({
   selector: 'app-client-list',
   templateUrl: './client-list.component.html',
   styleUrls: ['./client-list.component.css'],
-  imports: [MatTableModule, MatSortModule, RouterModule, MatPaginatorModule, LocalTimePipe],
+  imports: [
+    MatTableModule,
+    MatSortModule,
+    RouterModule,
+    MatPaginatorModule,
+    LocalTimePipe,
+    SkeletonLoaderComponent,
+    ErrorStateComponent,
+  ],
 })
-export class ClientListComponent implements OnInit {
-  private route = inject(ActivatedRoute);
+export class ClientListComponent {
+  private ser = inject(ClientService);
+
+  pageSize = signal(50);
+  pageIndex = signal(0);
+  sortActive = signal('');
+  sortDirection = signal('');
+  listResource = this.ser.list();
+  list = computed(() => this.listResource.value() ?? []);
+  sortedList = computed(() => {
+    const data = this.list();
+    const active = this.sortActive();
+    const direction = this.sortDirection();
+
+    if (!active || direction === '') {
+      return data;
+    }
+
+    return [...data].sort((a, b) => {
+      const isAsc = direction === 'asc';
+      switch (active) {
+        case 'name':
+          return compare(a.name, b.name, isAsc);
+        case 'enabled':
+          return compare(a.enabled, b.enabled, isAsc);
+        case 'creationDate':
+          return compare(a.creationDate, b.creationDate, isAsc);
+        case 'lastDate':
+          return compare(a.lastDate ?? 0, b.lastDate ?? 0, isAsc);
+        default:
+          return 0;
+      }
+    });
+  });
+
+  dataSource = computed(() => {
+    const data = this.sortedList();
+    const pageIndex = this.pageIndex();
+    const pageSize = this.pageSize();
+    return data.slice(pageIndex * pageSize, (pageIndex + 1) * pageSize);
+  });
 
-  @ViewChild(MatPaginator, { static: true }) paginator!: MatPaginator;
-  @ViewChild(MatSort, { static: true }) sort!: MatSort;
-  list: Client[] = [];
-  dataSource: ClientListDataSource = new ClientListDataSource(this.list, this.paginator, this.sort);
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   displayedColumns = ['code', 'name', 'enabled', 'otp', 'created', 'last'];
+  handlePageEvent(e: PageEvent) {
+    this.pageSize.set(e.pageSize);
+    this.pageIndex.set(e.pageIndex);
+  }
 
-  ngOnInit() {
-    this.route.data.subscribe((value) => {
-      const data = value as { list: Client[] };
-
-      this.list = data.list;
-    });
-    this.dataSource = new ClientListDataSource(this.list, this.paginator, this.sort);
+  sortData(sort: Sort) {
+    this.sortActive.set(sort.active);
+    this.sortDirection.set(sort.direction);
   }
 }
+const compare = (a: string | number | boolean, b: string | number | boolean, isAsc: boolean) =>
+  (a < b ? -1 : 1) * (isAsc ? 1 : -1);

overlord/src/app/client/client.resolver.spec.ts

@@ -1,18 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { ResolveFn } from '@angular/router';
-
-import { Client } from './client';
-import { clientResolver } from './client.resolver';
-
-describe('clientResolver', () => {
-  const executeResolver: ResolveFn<Client> = (...resolverParameters) =>
-    TestBed.runInInjectionContext(() => clientResolver(...resolverParameters));
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-  });
-
-  it('should be created', () => {
-    expect(executeResolver).toBeTruthy();
-  });
-});

overlord/src/app/client/client.resolver.ts

@@ -1,10 +0,0 @@
-import { inject } from '@angular/core';
-import { ResolveFn } from '@angular/router';
-
-import { Client } from './client';
-import { ClientService } from './client.service';
-
-export const clientResolver: ResolveFn<Client> = (route) => {
-  const id = route.paramMap.get('id');
-  return inject(ClientService).get(id);
-};

overlord/src/app/client/client.routes.ts

@@ -2,9 +2,7 @@ import { Routes } from '@angular/router';
 
 import { authGuard } from '../auth/auth-guard.service';
 import { ClientDetailComponent } from './client-detail/client-detail.component';
-import { clientListResolver } from './client-list.resolver';
 import { ClientListComponent } from './client-list/client-list.component';
-import { clientResolver } from './client.resolver';
 
 export const routes: Routes = [
   {
@@ -14,9 +12,6 @@ export const routes: Routes = [
     data: {
       permission: 'Cost Centres',
     },
-    resolve: {
-      list: clientListResolver,
-    },
   },
   {
     path: ':id',
@@ -25,8 +20,5 @@ export const routes: Routes = [
     data: {
       permission: 'Cost Centres',
     },
-    resolve: {
-      item: clientResolver,
-    },
   },
 ];

overlord/src/app/client/client.service.ts

@@ -1,5 +1,5 @@
-import { HttpClient } from '@angular/common/http';
-import { inject, Injectable } from '@angular/core';
+import { HttpClient, httpResource } from '@angular/common/http';
+import { inject, Injectable, Signal } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { catchError } from 'rxjs/operators';
 
@@ -7,8 +7,6 @@ import { ErrorLoggerService } from '../core/error-logger.service';
 import { Client } from './client';
 
 const url = '/api/clients';
-const serviceName = 'ClientService';
-
 @Injectable({
   providedIn: 'root',
 })
@@ -16,28 +14,26 @@ export class ClientService {
   private http = inject(HttpClient);
   private log = inject(ErrorLoggerService);
 
-  get(id: string | null): Observable<Client> {
-    const getUrl: string = id === null ? url : `${url}/${id}`;
-    return this.http
-      .get<Client>(getUrl)
-      .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable<Client>;
+  get(id: Signal<string | null>) {
+    return httpResource<Client>(() => {
+      const getUrl: string = id() === null ? url : `${url}/${id()}`;
+      return getUrl;
+    });
   }
 
-  list(): Observable<Client[]> {
-    return this.http
-      .get<Client[]>(`${url}/list`)
-      .pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable<Client[]>;
+  list() {
+    return httpResource<Client[]>(() => `${url}/list`);
   }
 
   update(client: Client): Observable<Client> {
     return this.http
       .put<Client>(`${url}/${client.id}`, client)
-      .pipe(catchError(this.log.handleError(serviceName, 'update'))) as Observable<Client>;
+      .pipe(catchError(this.log.handleError('ClientService', 'update'))) as Observable<Client>;
   }
 
   delete(id: string): Observable<Client> {
     return this.http
       .delete<Client>(`${url}/${id}`)
-      .pipe(catchError(this.log.handleError(serviceName, 'delete'))) as Observable<Client>;
+      .pipe(catchError(this.log.handleError('ClientService', 'delete'))) as Observable<Client>;
   }
 }