generator-jhipster 8.6.0 → 8.7.1

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs

@@ -18,17 +18,17 @@
 -%>
 <div class="d-flex justify-content-center">
   <div class="col-8">
-  @if (user()) {
+  @if (user(); as userRef) {
     <div>
       <h2>
-        <span>__jhiTranslateTag__('userManagement.detail.title')</span> [<strong>{{ user()!.login }}</strong>]
+        <span>__jhiTranslateTag__('userManagement.detail.title')</span> [<strong>{{ userRef.login }}</strong>]
       </h2>
 
       <dl class="row-md jh-entity-details">
         <dt><span>__jhiTranslateTag__('userManagement.login')</span></dt>
         <dd>
-          <span>{{ user()!.login }}</span>
-        @if (user()!.activated) {
+          <span>{{ userRef.login }}</span>
+        @if (userRef.activated) {
           <span class="badge bg-success">__jhiTranslateTag__('userManagement.activated')</span>
         } @else {
           <span class="badge bg-danger">__jhiTranslateTag__('userManagement.deactivated')</span>
@@ -36,35 +36,35 @@
         </dd>
 
         <dt><span>__jhiTranslateTag__('userManagement.firstName')</span></dt>
-        <dd>{{ user()!.firstName }}</dd>
+        <dd>{{ userRef.firstName }}</dd>
 
         <dt><span>__jhiTranslateTag__('userManagement.lastName')</span></dt>
-        <dd>{{ user()!.lastName }}</dd>
+        <dd>{{ userRef.lastName }}</dd>
 
         <dt><span>__jhiTranslateTag__('userManagement.email')</span></dt>
-        <dd>{{ user()!.email }}</dd>
+        <dd>{{ userRef.email }}</dd>
 <%_ if (enableTranslation) { _%>
 
         <dt><span>__jhiTranslateTag__('userManagement.langKey')</span></dt>
-        <dd>{{ user()!.langKey }}</dd>
+        <dd>{{ userRef.langKey }}</dd>
 <%_ } _%>
 
         <dt><span>__jhiTranslateTag__('userManagement.createdBy')</span></dt>
-        <dd>{{ user()!.createdBy }}</dd>
+        <dd>{{ userRef.createdBy }}</dd>
 
         <dt><span>__jhiTranslateTag__('userManagement.createdDate')</span></dt>
-        <dd>{{ user()!.createdDate | date: 'dd/MM/yy HH:mm' }}</dd>
+        <dd>{{ userRef.createdDate | date: 'dd/MM/yy HH:mm' }}</dd>
 
         <dt><span>__jhiTranslateTag__('userManagement.lastModifiedBy')</span></dt>
-        <dd>{{ user()!.lastModifiedBy }}</dd>
+        <dd>{{ userRef.lastModifiedBy }}</dd>
 
         <dt><span>__jhiTranslateTag__('userManagement.lastModifiedDate')</span></dt>
-        <dd>{{ user()!.lastModifiedDate | date: 'dd/MM/yy HH:mm' }}</dd>
+        <dd>{{ userRef.lastModifiedDate | date: 'dd/MM/yy HH:mm' }}</dd>
 
         <dt><span>__jhiTranslateTag__('userManagement.profiles')</span></dt>
         <dd>
           <ul class="list-unstyled">
-          @for (authority of user()!.authorities; track $index) {
+          @for (authority of userRef.authorities; track $index) {
             <li>
               <span class="badge bg-info">{{ authority }}</span>
             </li>

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs

@@ -38,7 +38,7 @@ describe('User Management Detail Component', () => {
           [
             {
               path: '**',
-              component: UserManagementDetailComponent,
+              loadComponent: () => import('./user-management-detail.component'),
               resolve: {
                 user: () => of({
                   id: <%- tsKeyId %>,
@@ -80,7 +80,7 @@ describe('User Management Detail Component', () => {
           langKey: 'en',
           authorities: [Authority.USER],
           createdBy: 'admin',
-        })
+        }),
       );
     });
   });

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs

@@ -71,7 +71,7 @@
         </tr>
       </thead>
       <tbody>
-      @for (user of users(); track trackIdentity) {
+      @for (user of users(); track trackIdentity(user)) {
         <tr>
           <td>
             <a [routerLink]="['./', user.login, 'view']">{{ user.id }}</a>

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs

@@ -45,19 +45,17 @@ describe('User Management Component', () => {
       page: '1',
       size: '1',
       sort: 'id,desc',
-    })
+    }),
   );
 
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [UserManagementComponent],
-        providers: [provideHttpClient(), { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
-      })
-        .overrideTemplate(UserManagementComponent, '')
-        .compileComponents();
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [UserManagementComponent],
+      providers: [provideHttpClient(), { provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
     })
-  );
+      .overrideTemplate(UserManagementComponent, '')
+      .compileComponents();
+  }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(UserManagementComponent);
@@ -78,8 +76,8 @@ describe('User Management Component', () => {
             new HttpResponse({
               body: [new User(<%- tsKeyId %>)],
               headers,
-            })
-          )
+            }),
+          ),
         );
 
         // WHEN
@@ -105,8 +103,8 @@ describe('User Management Component', () => {
             new HttpResponse({
               body: [user],
               headers,
-            })
-          )
+            }),
+          ),
         );
         jest.spyOn(service, 'update').mockReturnValue(of(user));
 

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs

@@ -83,7 +83,7 @@ export default class UserManagementComponent implements OnInit {
     this.userService.update({ ...user, activated: isActivated }).subscribe(() => this.loadAll());
   }
 
-  trackIdentity(_index: number, item: User): <%= this.getTypescriptKeyType(user.primaryKey.type) %> {
+  trackIdentity(item: User): <%= this.getTypescriptKeyType(user.primaryKey.type) %> {
     return item.id!;
   }
 
@@ -130,7 +130,7 @@ export default class UserManagementComponent implements OnInit {
     combineLatest([this.activatedRoute.data, this.activatedRoute.queryParamMap]).subscribe(([data, params]) => {
       const page = params.get('page');
       this.page = +(page ?? 1);
-      this.sortState.set(this.sortService.parseSortParam(params.get(SORT) ?? data['defaultSort']));
+      this.sortState.set(this.sortService.parseSortParam(params.get(SORT) ?? data.defaultSort));
       this.loadAll();
     });
   }
@@ -138,7 +138,7 @@ export default class UserManagementComponent implements OnInit {
 
   private onSuccess(users: User[] | null<% if (!databaseTypeCassandra) { %>, headers: HttpHeaders<% } %>): void {
 <%_ if (!databaseTypeCassandra) { _%>
-    this.totalItems.set(Number(headers.get('X-Total-Count')));    
+    this.totalItems.set(Number(headers.get('X-Total-Count')));
 <%_ } _%>
     this.users.set(users);
   }

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.spec.ts.ejs

@@ -78,7 +78,7 @@ describe('User Service', () => {
       let expectedResult = 0;
 
       service.find('user').subscribe({
-        error: (error: HttpErrorResponse) => expectedResult = error.status
+        error: (error: HttpErrorResponse) => (expectedResult = error.status),
       });
 
       const req = httpMock.expectOne({ method: 'GET' });

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/service/user-management.service.ts.ejs

@@ -62,7 +62,7 @@ export class UserManagementService {
   authorities(): Observable<string[]> {
   <%_ if (generateBuiltInAuthorityEntity) { _%>
     return this.http
-      .get<Array<{ name: string }>>(this.applicationConfigService.getEndpointFor('api/authorities'))
+      .get<{ name: string }[]>(this.applicationConfigService.getEndpointFor('api/authorities'))
       .pipe(map(authorities => authorities.map(a => a.name)));
   <%_ } else { _%>
     return of([Authority.ADMIN, Authority.USER]);

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs

@@ -32,19 +32,20 @@
         <label class="form-label" for="field_login">__jhiTranslateTag__('userManagement.login')</label>
         <input type="text" id="field_login" class="form-control" name="login" formControlName="login" />
 
-      @if (editForm.get('login')!.invalid && (editForm.get('login')!.dirty || editForm.get('login')!.touched)) {
+      @let loginRef = editForm.get('login')!;
+      @if (loginRef.invalid && (loginRef.dirty || loginRef.touched)) {
         <div>
-        @if (editForm.get('login')?.errors?.required) {
+        @if (loginRef?.errors?.required) {
           <small class="form-text text-danger"
           >__jhiTranslateTag__('entity.validation.required')</small>
         }
 
-        @if (editForm.get('login')?.errors?.maxlength) {
+        @if (loginRef?.errors?.maxlength) {
           <small class="form-text text-danger"
           >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
         }
 
-        @if (editForm.get('login')?.errors?.pattern) {
+        @if (loginRef?.errors?.pattern) {
           <small class="form-text text-danger"
           >__jhiTranslateTag__('entity.validation.patternLogin')</small>
         }
@@ -56,9 +57,10 @@
         <label class="form-label" for="field_firstName">__jhiTranslateTag__('userManagement.firstName')</label>
         <input type="text" id="field_firstName" class="form-control" name="firstName" formControlName="firstName" />
 
-      @if (editForm.get('firstName')!.invalid && (editForm.get('firstName')!.dirty || editForm.get('firstName')!.touched)) {
+      @let firstNameRef = editForm.get('firstName')!;
+      @if (firstNameRef.invalid && (firstNameRef.dirty || firstNameRef.touched)) {
         <div>
-        @if (editForm.get('firstName')?.errors?.maxlength) {
+        @if (firstNameRef?.errors?.maxlength) {
           <small class="form-text text-danger"
           >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
         }
@@ -70,9 +72,10 @@
         <label class="form-label" for="field_lastName">__jhiTranslateTag__('userManagement.lastName')</label>
         <input type="text" id="field_lastName" class="form-control" name="lastName" formControlName="lastName" />
 
-      @if (editForm.get('lastName')!.invalid && (editForm.get('lastName')!.dirty || editForm.get('lastName')!.touched)) {
+      @let lastNameRef = editForm.get('lastName')!;
+      @if (lastNameRef.invalid && (lastNameRef.dirty || lastNameRef.touched)) {
         <div>
-        @if (editForm.get('lastName')?.errors?.maxlength) {
+        @if (lastNameRef?.errors?.maxlength) {
           <small class="form-text text-danger"
           >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
         }
@@ -84,24 +87,25 @@
         <label class="form-label" for="field_email">__jhiTranslateTag__('userManagement.email')</label>
         <input type="email" id="field_email" class="form-control" name="email" formControlName="email" />
 
-      @if (editForm.get('email')!.invalid && (editForm.get('email')!.dirty || editForm.get('email')!.touched)) {
+      @let emailRef = editForm.get('email')!;
+      @if (emailRef.invalid && (emailRef.dirty || emailRef.touched)) {
         <div>
-        @if (editForm.get('email')?.errors?.required) {
+        @if (emailRef?.errors?.required) {
           <small class="form-text text-danger"
           >__jhiTranslateTag__('entity.validation.required')</small>
         }
 
-        @if (editForm.get('email')?.errors?.maxlength) {
+        @if (emailRef?.errors?.maxlength) {
           <small class="form-text text-danger"
           >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 100 })</small>
         }
 
-        @if (editForm.get('email')?.errors?.minlength) {
+        @if (emailRef?.errors?.minlength) {
           <small class="form-text text-danger"
           >__jhiTranslateValidationTag__('entity.validation.minlength', { "min": 5 })</small>
         }
 
-        @if (editForm.get('email')?.errors?.email) {
+        @if (emailRef?.errors?.email) {
           <small class="form-text text-danger"
           >__jhiTranslateTag__('global.messages.validate.email.invalid')</small>
         }

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs

@@ -73,7 +73,7 @@ describe('User Management Update Component', () => {
         // THEN
         expect(service.authorities).toHaveBeenCalled();
         expect(comp.authorities()).toEqual(['USER']);
-      })
+      }),
     ));
   });
 
@@ -92,7 +92,7 @@ describe('User Management Update Component', () => {
         // THEN
         expect(service.update).toHaveBeenCalledWith(expect.objectContaining(entity));
         expect(comp.isSaving()).toEqual(false);
-      })
+      }),
     ));
 
     it('Should call create service on save for new user', inject(
@@ -110,7 +110,7 @@ describe('User Management Update Component', () => {
         expect(comp.editForm.getRawValue().id).toBeNull();
         expect(service.create).toHaveBeenCalledWith(expect.objectContaining(entity));
         expect(comp.isSaving()).toEqual(false);
-      })
+      }),
     ));
   });
 });

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs

@@ -84,7 +84,7 @@ export default class UserManagementUpdateComponent implements OnInit {
         this.editForm.reset(newUser);
       }
     });
-    this.userService.authorities().subscribe(authorities => (this.authorities.set(authorities)));
+    this.userService.authorities().subscribe(authorities => this.authorities.set(authorities));
   }
 
   previousState(): void {

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.model.ts.ejs

@@ -47,6 +47,6 @@ export class User implements IUser {
     public createdBy?: string,
     public createdDate?: Date,
     public lastModifiedBy?: string,
-    public lastModifiedDate?: Date
+    public lastModifiedDate?: Date,
   ) {}
 }

package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs

@@ -22,11 +22,8 @@ import { of } from 'rxjs';
 
 import { IUser } from './user-management.model';
 import { UserManagementService } from './service/user-management.service';
-import UserManagementComponent from './list/user-management.component';
-import UserManagementDetailComponent from './detail/user-management-detail.component';
-import UserManagementUpdateComponent from './update/user-management-update.component';
 
-export const UserManagementResolve: ResolveFn<IUser | null> = (route: ActivatedRouteSnapshot) => {
+export const userManagementResolve: ResolveFn<IUser | null> = (route: ActivatedRouteSnapshot) => {
   const login = route.paramMap.get('login');
   if (login) {
     return inject(UserManagementService).find(login);
@@ -37,30 +34,30 @@ export const UserManagementResolve: ResolveFn<IUser | null> = (route: ActivatedR
 const userManagementRoute: Routes = [
   {
     path: '',
-    component: UserManagementComponent,
+    loadComponent: () => import('./list/user-management.component'),
     data: {
       defaultSort: 'id,asc',
     },
   },
   {
     path: ':login/view',
-    component: UserManagementDetailComponent,
+    loadComponent: () => import('./detail/user-management-detail.component'),
     resolve: {
-      user: UserManagementResolve,
+      user: userManagementResolve,
     },
   },
   {
     path: 'new',
-    component: UserManagementUpdateComponent,
+    loadComponent: () => import('./update/user-management-update.component'),
     resolve: {
-      user: UserManagementResolve,
+      user: userManagementResolve,
     },
   },
   {
     path: ':login/edit',
-    component: UserManagementUpdateComponent,
+    loadComponent: () => import('./update/user-management-update.component'),
     resolve: {
-      user: UserManagementResolve,
+      user: userManagementResolve,
     },
   },
 ];

package/dist/generators/angular/templates/src/main/webapp/app/app.component.ts.ejs

@@ -22,10 +22,7 @@ import dayjs from 'dayjs/esm';
 import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import { NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap';
 import { provideRouter } from '@angular/router';
-import { registerLocaleData } from '@angular/common';
 import locale from '@angular/common/locales/<%= angularLocaleId %>';
-import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
-import dayjs from 'dayjs/esm';
 import appRoutes from './app.routes';
 // jhipster-needle-angular-add-module-import JHipster will add new module here
 

package/dist/generators/angular/templates/src/main/webapp/app/app.config.ts.ejs

@@ -36,19 +36,21 @@ import routes from './app.routes';
 import { NgbDateDayjsAdapter } from './config/datepicker-adapter';
 import { AppPageTitleStrategy } from './app-page-title-strategy';
 
-const routerFeatures: Array<RouterFeatures> = [withComponentInputBinding(),
+const routerFeatures: RouterFeatures[] = [
+  withComponentInputBinding(),
   withNavigationErrorHandler((e: NavigationError) => {
     const router = inject(Router);
     if (e.error.status === 403) {
-      router.navigate(['/accessdenied'])
+      router.navigate(['/accessdenied']);
     } else if (e.error.status === 404) {
-      router.navigate(['/404'])
+      router.navigate(['/404']);
     } else if (e.error.status === 401) {
       router.navigate(['/login']);
     } else {
       router.navigate(['/error']);
     }
-  })];
+  }),
+];
 if (DEBUG_INFO_ENABLED) {
   routerFeatures.push(withDebugTracing());
 }

package/dist/generators/angular/templates/src/main/webapp/app/app.routes.ts.ejs

@@ -22,11 +22,6 @@ import { Routes } from '@angular/router';
 import { errorRoute } from './layouts/error/error.route';
 import { Authority } from 'app/config/authority.constants';
 
-import HomeComponent from './home/home.component';
-import NavbarComponent from './layouts/navbar/navbar.component';
-<%_ if (!authenticationTypeOauth2) { _%>
-import LoginComponent from './login/login.component';
-<%_ } _%>
 <%_ if (applicationTypeGateway && microfrontend) { _%>
 import { loadEntityRoutes } from './core/microfrontend';
 <%_ } _%>
@@ -36,12 +31,12 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'
 const routes: Routes = [
   {
     path: '',
-    component: HomeComponent,
+    loadComponent: () => import('./home/home.component'),
     title: 'home.title',
   },
   {
     path: '',
-    component: NavbarComponent,
+    loadComponent: () => import('./layouts/navbar/navbar.component'),
     outlet: 'navbar',
   },
 <%_ if (!applicationTypeMicroservice) { _%>
@@ -63,7 +58,7 @@ const routes: Routes = [
 <%_ if (!authenticationTypeOauth2) { _%>
   {
     path: 'login',
-    component: LoginComponent,
+    loadComponent: () => import('./login/login.component'),
     title: 'login.title',
   },
 <%_ } _%>

package/dist/generators/angular/templates/src/main/webapp/app/config/navigation.constants.ts.ejs

@@ -19,5 +19,5 @@
 export const ASC = 'asc';
 export const DESC = 'desc';
 export const SORT = 'sort';
-export const ITEM_DELETED_EVENT = 'deleted'
-export const DEFAULT_SORT_DATA = 'defaultSort'
+export const ITEM_DELETED_EVENT = 'deleted';
+export const DEFAULT_SORT_DATA = 'defaultSort';

package/dist/generators/angular/templates/src/main/webapp/app/config/translation.config.ts.ejs

@@ -24,7 +24,7 @@ export const translationNotFoundMessage = 'translation-not-found';
 
 export class MissingTranslationHandlerImpl implements MissingTranslationHandler {
   handle(params: MissingTranslationHandlerParams): string {
-    const key = params.key;
+    const { key } = params;
     return `${translationNotFoundMessage}[${key}]`;
   }
 }

package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.model.ts.ejs

@@ -25,6 +25,6 @@ export class Account {
     public langKey: string,
     public lastName: string | null,
     public login: string,
-    public imageUrl: string | null
+    public imageUrl: string | null,
   ) {}
 }

package/dist/generators/angular/templates/src/main/webapp/app/core/auth/account.service.spec.ts.ejs

@@ -49,6 +49,8 @@ function accountWithAuthorities(authorities: string[]): Account {
   };
 }
 
+const mockFn = (value: string | null): jest.Mock<string | null> => jest.fn(() => value);
+
 describe('Account Service', () => {
   let service: AccountService;
 <%_ if (generateUserManagement) { _%>
@@ -174,7 +176,7 @@ describe('save', () => {
     describe('should change the language on authentication if necessary', () => {
       it('should change language if user has not changed language manually', () => {
         // GIVEN
-        mockStorageService.getLocale = jest.fn(() => null);
+        mockStorageService.getLocale = mockFn(null);
 
         // WHEN
         service.identity().subscribe();
@@ -186,7 +188,7 @@ describe('save', () => {
 
       it('should not change language if user has changed language manually', () => {
         // GIVEN
-        mockStorageService.getLocale = jest.fn(() => 'sessionLang');
+        mockStorageService.getLocale = mockFn('sessionLang');
 
         // WHEN
         service.identity().subscribe();
@@ -201,7 +203,7 @@ describe('save', () => {
     describe('navigateToStoredUrl', () => {
       it('should navigate to the previous stored url post successful authentication', () => {
         // GIVEN
-        mockStorageService.getUrl = jest.fn(() => 'admin/users?page=0');
+        mockStorageService.getUrl = mockFn('admin/users?page=0');
 
         // WHEN
         service.identity().subscribe();
@@ -226,7 +228,7 @@ describe('save', () => {
 
       it('should not navigate to the previous stored url when no such url exists post successful authentication', () => {
         // GIVEN
-        mockStorageService.getUrl = jest.fn(() => null);
+        mockStorageService.getUrl = mockFn(null);
 
         // WHEN
         service.identity().subscribe();

package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs

@@ -36,7 +36,7 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh
   return accountService.identity().pipe(
     map(account => {
       if (account) {
-        const authorities = next.data['authorities'];
+        const { authorities } = next.data;
 
         if (!authorities || authorities.length === 0 || accountService.hasAnyAuthority(authorities)) {
           return true;
@@ -56,6 +56,6 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh
       loginService.login();
 <%_ } _%>
       return false;
-    })
+    }),
   );
 };

package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs

@@ -51,7 +51,7 @@ export class AuthExpiredInterceptor implements HttpInterceptor {
 <%_ } _%>
           }
         },
-      })
+      }),
     );
   }
 }

package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs

@@ -35,7 +35,7 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
             this.eventManager.broadcast(new EventWithContent('<%= frontendAppName %>.httpError', err));
           }
         },
-      })
+      }),
     );
   }
 }

package/dist/generators/angular/templates/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs

@@ -58,7 +58,7 @@ export class NotificationInterceptor implements HttpInterceptor {
             });
           }
         }
-      })
+      }),
     );
   }
 }