chore: roll up five unsigned contributor PRs onto signed commits

src/app/features/accounting/charges/charges-list.component.spec.ts

@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { provideNoopAnimations } from '@angular/platform-browser/animations';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { of, throwError } from 'rxjs';
+
+import { ChargesListComponent } from './charges-list.component';
+import { ChargesService } from '../../../api';
+import { provideIonicTesting } from '../../../testing/ionic-testing';
+import { provideTranslateTesting } from '../../../testing/i18n-testing';
+
+describe('ChargesListComponent', () => {
+  let component: ChargesListComponent;
+  let fixture: ComponentFixture<ChargesListComponent>;
+  let serviceSpy: jasmine.SpyObj<ChargesService>;
+
+  const charges = [{ id: 1, name: 'Processing fee', amount: 10 }];
+
+  beforeEach(async () => {
+    serviceSpy = jasmine.createSpyObj('ChargesService', ['getCharges']);
+    serviceSpy.getCharges.and.returnValue(
+      of(charges) as unknown as ReturnType<ChargesService['getCharges']>,
+    );
+
+    await TestBed.configureTestingModule({
+      imports: [ChargesListComponent],
+      providers: [
+        provideNoopAnimations(),
+        provideIonicTesting(),
+        ...provideTranslateTesting(),
+        { provide: ChargesService, useValue: serviceSpy },
+        { provide: Router, useValue: jasmine.createSpyObj('Router', ['navigate']) },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ChargesListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('loads charges on init', () => {
+    expect(serviceSpy.getCharges).toHaveBeenCalledTimes(1);
+    expect(component.charges()).toEqual(charges);
+    expect(component.hasError()).toBeFalse();
+  });
+
+  it('shows a load error instead of an empty table', () => {
+    serviceSpy.getCharges.and.returnValue(
+      throwError(() => new Error('boom')) as unknown as ReturnType<ChargesService['getCharges']>,
+    );
+
+    component.onRetry();
+    fixture.detectChanges();
+
+    expect(component.hasError()).toBeTrue();
+    expect(component.charges()).toEqual([]);
+    expect(fixture.nativeElement.querySelector('[data-testid="data-table-error"]')).not.toBeNull();
+  });
+
+  it('clears the error after a successful retry', () => {
+    serviceSpy.getCharges.and.returnValue(
+      throwError(() => new Error('boom')) as unknown as ReturnType<ChargesService['getCharges']>,
+    );
+    component.onRetry();
+    expect(component.hasError()).toBeTrue();
+
+    serviceSpy.getCharges.and.returnValue(
+      of(charges) as unknown as ReturnType<ChargesService['getCharges']>,
+    );
+
+    component.onRetry();
+
+    expect(component.hasError()).toBeFalse();
+    expect(component.charges()).toEqual(charges);
+  });
+});

src/app/features/accounting/charges/charges-list.component.ts

@@ -54,9 +54,11 @@ import { IonButton, IonIcon } from '@ionic/angular/standalone';
       [columns]="columns"
       [data]="charges()"
       [totalRecords]="charges().length"
+      [hasError]="hasError()"
       [showSearch]="true"
       [localLogic]="true"
       (create)="onCreateCharge()"
+      (retry)="onRetry()"
     >
       <ng-template appCellTemplate="amount" let-charge>
         @if (
@@ -104,6 +106,7 @@ export class ChargesListComponent implements OnInit {
   ];
 
   readonly charges = signal<ChargeData[]>([]);
+  readonly hasError = signal(false);
 
   ngOnInit(): void {
     this.loadCharges();
@@ -112,12 +115,20 @@ export class ChargesListComponent implements OnInit {
   private loadCharges(): void {
     this.chargesService.getCharges().subscribe({
       next: (data) => {
+        this.hasError.set(false);
         this.charges.set(data || []);
       },
-      error: (err) => console.error('Failed to load charges', err),
+      error: () => {
+        this.hasError.set(true);
+        this.charges.set([]);
+      },
     });
   }
 
+  onRetry(): void {
+    this.loadCharges();
+  }
+
   onCreateCharge(): void {
     this.router.navigate(['/accounting/charges/create']);
   }

src/app/features/accounting/provisioning-categories/provisioning-categories-list.component.spec.ts

@@ -24,19 +24,23 @@ import { Router } from '@angular/router';
 import { of } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
 import { provideNoopAnimations } from '@angular/platform-browser/animations';
+import { DialogService } from '../../../core/services/dialog.service';
 
 describe('ProvisioningCategoriesListComponent', () => {
   let component: ProvisioningCategoriesListComponent;
   let fixture: ComponentFixture<ProvisioningCategoriesListComponent>;
   let serviceSpy: jasmine.SpyObj<ProvisioningCategoryService>;
   let routerSpy: jasmine.SpyObj<Router>;
+  let dialogService: jasmine.SpyObj<DialogService>;
 
   beforeEach(async () => {
     serviceSpy = jasmine.createSpyObj('ProvisioningCategoryService', [
       'getProvisioningcategory',
       'deleteProvisioningcategoryCategoryId',
     ]);
     routerSpy = jasmine.createSpyObj('Router', ['navigate']);
+    dialogService = jasmine.createSpyObj('DialogService', ['confirm']);
+    dialogService.confirm.and.resolveTo(true);
     serviceSpy.getProvisioningcategory.and.returnValue(
       of([
         { id: 1, categoryName: 'STANDARD', categoryDescription: 'Standard' },
@@ -48,6 +52,7 @@ describe('ProvisioningCategoriesListComponent', () => {
       providers: [
         { provide: ProvisioningCategoryService, useValue: serviceSpy },
         { provide: Router, useValue: routerSpy },
+        { provide: DialogService, useValue: dialogService },
         provideNoopAnimations(),
       ],
     }).compileComponents();
@@ -71,23 +76,25 @@ describe('ProvisioningCategoriesListComponent', () => {
     ]);
   });
 
-  it('should delete after confirmation and reload', () => {
-    spyOn(window, 'confirm').and.returnValue(true);
+  it('should delete after confirmation and reload', async () => {
+    dialogService.confirm.and.resolveTo(true);
     serviceSpy.deleteProvisioningcategoryCategoryId.and.returnValue(
       of({}) as unknown as ReturnType<
         ProvisioningCategoryService['deleteProvisioningcategoryCategoryId']
       >,
     );
 
     component.onDelete({ id: 5, categoryName: 'Y' });
+    await fixture.whenStable();
 
     expect(serviceSpy.deleteProvisioningcategoryCategoryId).toHaveBeenCalledWith(5);
     expect(serviceSpy.getProvisioningcategory).toHaveBeenCalledTimes(2);
   });
 
-  it('should not delete when cancelled', () => {
-    spyOn(window, 'confirm').and.returnValue(false);
+  it('should not delete when cancelled', async () => {
+    dialogService.confirm.and.resolveTo(false);
     component.onDelete({ id: 5, categoryName: 'Y' });
+    await fixture.whenStable();
     expect(serviceSpy.deleteProvisioningcategoryCategoryId).not.toHaveBeenCalled();
   });
 });

src/app/features/accounting/provisioning-categories/provisioning-categories-list.component.ts

@@ -19,12 +19,13 @@
 
 import { Component, OnInit, inject, signal } from '@angular/core';
 import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ColumnDef, CellTemplateDirective } from '../../../shared';
 import { DataTableComponent } from '../../../shared/components/data-table/data-table.component';
 import { ProvisioningCategoryService, ProvisioningCategoryData } from '../../../api';
 import { IonButton, IonIcon } from '@ionic/angular/standalone';
 import { TooltipDirective } from '../../../shared/directives/tooltip.directive';
+import { DialogService } from '../../../core/services/dialog.service';
 
 /**
  * Lists provisioning categories. Categories are small master-data records
@@ -79,6 +80,8 @@ import { TooltipDirective } from '../../../shared/directives/tooltip.directive';
 export class ProvisioningCategoriesListComponent implements OnInit {
   private readonly categoryService = inject(ProvisioningCategoryService);
   private readonly router = inject(Router);
+  private readonly dialogService = inject(DialogService);
+  private readonly translate = inject(TranslateService);
 
   readonly columns: ColumnDef[] = [
     { key: 'categoryName', label: 'PROVISIONING_CATEGORIES.NAME', sortable: true },
@@ -112,10 +115,21 @@ export class ProvisioningCategoriesListComponent implements OnInit {
   }
 
   onDelete(row: ProvisioningCategoryData): void {
-    if (!row.id || !window.confirm('Delete this provisioning category?')) return;
-    this.categoryService.deleteProvisioningcategoryCategoryId(row.id).subscribe({
-      next: () => this.load(),
-      error: (err: unknown) => console.error('Failed to delete provisioning category', err),
-    });
+    if (!row.id) return;
+    void this.dialogService
+      .confirm({
+        title: this.translate.instant('PROVISIONING_CATEGORIES.DELETE'),
+        message: this.translate.instant('PROVISIONING_CATEGORIES.CONFIRM_DELETE', {
+          name: row.categoryName,
+        }),
+        destructive: true,
+      })
+      .then((confirmed) => {
+        if (!confirmed) return;
+        this.categoryService.deleteProvisioningcategoryCategoryId(row.id!).subscribe({
+          next: () => this.load(),
+          error: (err: unknown) => console.error('Failed to delete provisioning category', err),
+        });
+      });
   }
 }

src/app/features/accounting/provisioning-criteria/provisioning-criteria-list.component.spec.ts

@@ -24,19 +24,23 @@ import { Router } from '@angular/router';
 import { of } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
 import { provideNoopAnimations } from '@angular/platform-browser/animations';
+import { DialogService } from '../../../core/services/dialog.service';
 
 describe('ProvisioningCriteriaListComponent', () => {
   let component: ProvisioningCriteriaListComponent;
   let fixture: ComponentFixture<ProvisioningCriteriaListComponent>;
   let serviceSpy: jasmine.SpyObj<ProvisioningCriteriaService>;
   let routerSpy: jasmine.SpyObj<Router>;
+  let dialogService: jasmine.SpyObj<DialogService>;
 
   beforeEach(async () => {
     serviceSpy = jasmine.createSpyObj('ProvisioningCriteriaService', [
       'getProvisioningcriteria',
       'deleteProvisioningcriteriaCriteriaId',
     ]);
     routerSpy = jasmine.createSpyObj('Router', ['navigate']);
+    dialogService = jasmine.createSpyObj('DialogService', ['confirm']);
+    dialogService.confirm.and.resolveTo(true);
     serviceSpy.getProvisioningcriteria.and.returnValue(
       of([{ criteriaId: 1, criteriaName: 'Default', createdBy: 'admin' }]) as unknown as ReturnType<
         ProvisioningCriteriaService['getProvisioningcriteria']
@@ -48,6 +52,7 @@ describe('ProvisioningCriteriaListComponent', () => {
       providers: [
         { provide: ProvisioningCriteriaService, useValue: serviceSpy },
         { provide: Router, useValue: routerSpy },
+        { provide: DialogService, useValue: dialogService },
         provideNoopAnimations(),
       ],
     }).compileComponents();
@@ -68,23 +73,25 @@ describe('ProvisioningCriteriaListComponent', () => {
     expect(routerSpy.navigate).toHaveBeenCalledWith(['/accounting/provisioning-criteria/edit', 3]);
   });
 
-  it('should delete after confirmation and reload', () => {
-    spyOn(window, 'confirm').and.returnValue(true);
+  it('should delete after confirmation and reload', async () => {
+    dialogService.confirm.and.resolveTo(true);
     serviceSpy.deleteProvisioningcriteriaCriteriaId.and.returnValue(
       of({}) as unknown as ReturnType<
         ProvisioningCriteriaService['deleteProvisioningcriteriaCriteriaId']
       >,
     );
 
     component.onDelete({ criteriaId: 5, criteriaName: 'Y' });
+    await fixture.whenStable();
 
     expect(serviceSpy.deleteProvisioningcriteriaCriteriaId).toHaveBeenCalledWith(5);
     expect(serviceSpy.getProvisioningcriteria).toHaveBeenCalledTimes(2);
   });
 
-  it('should not delete when cancelled', () => {
-    spyOn(window, 'confirm').and.returnValue(false);
+  it('should not delete when cancelled', async () => {
+    dialogService.confirm.and.resolveTo(false);
     component.onDelete({ criteriaId: 5, criteriaName: 'Y' });
+    await fixture.whenStable();
     expect(serviceSpy.deleteProvisioningcriteriaCriteriaId).not.toHaveBeenCalled();
   });
 });

src/app/features/accounting/provisioning-criteria/provisioning-criteria-list.component.ts

@@ -19,12 +19,13 @@
 
 import { Component, OnInit, inject, signal } from '@angular/core';
 import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { ColumnDef, CellTemplateDirective } from '../../../shared';
 import { DataTableComponent } from '../../../shared/components/data-table/data-table.component';
 import { ProvisioningCriteriaService, GetProvisioningCriteriaResponse } from '../../../api';
 import { IonButton, IonIcon } from '@ionic/angular/standalone';
 import { TooltipDirective } from '../../../shared/directives/tooltip.directive';
+import { DialogService } from '../../../core/services/dialog.service';
 
 /**
  * Lists provisioning criteria. The list response carries the criteria name and
@@ -79,6 +80,8 @@ import { TooltipDirective } from '../../../shared/directives/tooltip.directive';
 export class ProvisioningCriteriaListComponent implements OnInit {
   private readonly criteriaService = inject(ProvisioningCriteriaService);
   private readonly router = inject(Router);
+  private readonly dialogService = inject(DialogService);
+  private readonly translate = inject(TranslateService);
 
   readonly columns: ColumnDef[] = [
     { key: 'criteriaName', label: 'PROVISIONING_CRITERIA.NAME', sortable: true },
@@ -112,10 +115,21 @@ export class ProvisioningCriteriaListComponent implements OnInit {
   }
 
   onDelete(row: GetProvisioningCriteriaResponse): void {
-    if (!row.criteriaId || !window.confirm('Delete this provisioning criteria?')) return;
-    this.criteriaService.deleteProvisioningcriteriaCriteriaId(row.criteriaId).subscribe({
-      next: () => this.load(),
-      error: (err: unknown) => console.error('Failed to delete provisioning criteria', err),
-    });
+    if (!row.criteriaId) return;
+    void this.dialogService
+      .confirm({
+        title: this.translate.instant('PROVISIONING_CRITERIA.DELETE'),
+        message: this.translate.instant('PROVISIONING_CRITERIA.CONFIRM_DELETE', {
+          name: row.criteriaName,
+        }),
+        destructive: true,
+      })
+      .then((confirmed) => {
+        if (!confirmed) return;
+        this.criteriaService.deleteProvisioningcriteriaCriteriaId(row.criteriaId!).subscribe({
+          next: () => this.load(),
+          error: (err: unknown) => console.error('Failed to delete provisioning criteria', err),
+        });
+      });
   }
 }