generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.ts.ejs

@@ -81,7 +81,7 @@ import { ParseLinks } from 'app/core/util/parse-links.service';
 import { FilterComponent, FilterOptions, IFilterOptions, IFilterOption } from 'app/shared/filter';
 <%_ } _%>
 <%_ if (paginationInfiniteScroll) { _%>
-import { InfiniteScrollModule } from 'ngx-infinite-scroll';
+import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
 <%_ } _%>
 
 @Component({
@@ -106,7 +106,7 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
       ItemCountComponent,
 <%_ } _%>
 <%_ if (paginationInfiniteScroll) { _%>
-      InfiniteScrollModule,
+      InfiniteScrollDirective,
 <%_ } _%>
     ],
 })

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs

@@ -20,8 +20,7 @@
 const tsKeyId = this.generateTestEntityId(primaryKey.type);
 _%>
 import { TestBed } from '@angular/core/testing';
-import { HttpResponse } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, HttpResponse } from '@angular/common/http';
 import { ActivatedRouteSnapshot, ActivatedRoute, Router, convertToParamMap } from '@angular/router';
 import { of } from 'rxjs';
 
@@ -38,8 +37,8 @@ describe('<%= entityAngularName %> routing resolve service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
       providers: [
+        provideHttpClient(),
         {
           provide: ActivatedRoute,
           useValue: {
@@ -73,7 +72,7 @@ describe('<%= entityAngularName %> routing resolve service', () => {
       });
 
       // THEN
-      expect(service.find).toBeCalledWith(<%- tsKeyId %>);
+      expect(service.find).toHaveBeenCalledWith(<%- tsKeyId %>);
       expect(result<%= entityAngularName %>).toEqual({ <%= primaryKey.name %>: <%- tsKeyId %> });
     });
 
@@ -111,7 +110,7 @@ describe('<%= entityAngularName %> routing resolve service', () => {
       });
 
       // THEN
-      expect(service.find).toBeCalledWith(<%- tsKeyId %>);
+      expect(service.find).toHaveBeenCalledWith(<%- tsKeyId %>);
       expect(result<%= entityAngularName %>).toEqual(undefined);
       expect(mockRouter.navigate).toHaveBeenCalledWith(['404']);
     });

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.spec.ts.ejs

@@ -21,7 +21,8 @@ const tsKeyId = this.generateTestEntityId(primaryKey.type);
 const enumImports = this.generateEntityClientEnumImports(fields);
 _%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 <%_ if (anyFieldIsLocalDate) { _%>
 import { DATE_FORMAT } from 'app/config/input.constants';
@@ -49,8 +50,9 @@ describe('<%= entityAngularName %> Service', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [
-                HttpClientTestingModule
+            providers: [
+                provideHttpClient(),
+                provideHttpClientTesting()
             ]
         });
         expectedResult = null;

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs

@@ -19,15 +19,14 @@
 <%_
 const tsKeyId = this.generateTestEntityId(primaryKey.type);
 const allRelationshipsByEntityNeedingOptions = Object
-  .values(differentRelationships)
-  .map(relationships => relationships.filter(rel => rel.persistableRelationship))
+  .values(relationshipsByOtherEntity)
+  .map(relationships => relationships.filter(rel => rel.persistableRelationship && !rel.otherEntity.embedded))
   .filter(relationships => relationships.length > 0);
 const testEntityPrimaryKey0 = this.generateTestEntityPrimaryKey(primaryKey, 0);
 const testEntityPrimaryKey1 = this.generateTestEntityPrimaryKey(primaryKey, 1);
 _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { HttpResponse } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, HttpResponse } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { of, Subject, from } from 'rxjs';
@@ -57,10 +56,10 @@ describe('<%= entityAngularName %> Management Update Component', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [
-                HttpClientTestingModule,
                 <%= entityAngularName %>UpdateComponent,
             ],
             providers: [
+              provideHttpClient(),
               FormBuilder,
               {
                 provide: ActivatedRoute,
@@ -245,7 +244,7 @@ describe('<%= entityAngularName %> Management Update Component', () => {
 <%_ } _%>
     });
 
-<%_ const trackedRelationships = Object.values(differentRelationships).filter(arr => arr.some(rel => rel.persistableRelationship && rel.otherEntity.primaryKey));
+<%_ const trackedRelationships = Object.values(relationshipsByOtherEntity).filter(arr => arr.some(rel => rel.persistableRelationship && !rel.otherEntity.embedded));
     if (trackedRelationships.length > 0) {
 _%>
 

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs

@@ -18,8 +18,8 @@
 -%>
 <%_
   const allRelationshipsByEntityNeedingOptions = Object
-    .values(differentRelationships)
-    .map(relationships => relationships.filter(rel => rel.persistableRelationship))
+    .values(relationshipsByOtherEntity)
+    .map(relationships => relationships.filter(rel => rel.persistableRelationship && !rel.otherEntity.embedded))
     .filter(relationships => relationships.length > 0);
 _%>
 import { Component, inject, OnInit<% if (anyFieldHasImageContentType) { %>, ElementRef<% } %> } from '@angular/core';
@@ -39,10 +39,8 @@ import { AlertError } from 'app/shared/alert/alert-error.model';
 import { EventManager, EventWithContent } from 'app/core/util/event-manager.service';
 import { DataUtils, FileLoadError } from 'app/core/util/data-util.service';
 <%_ } _%>
-<%_
-Object.keys(differentRelationships).forEach(key => {
-  if (differentRelationships[key].some(rel => rel.persistableRelationship)) {
-    const uniqueRel = differentRelationships[key][0];
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) {
+    const uniqueRel = relationshipsByEntityNeedingOptions[0];
     if (uniqueRel.otherEntityAngularName !== entityAngularName) {
 _%>
 import { I<%= uniqueRel.otherEntityAngularName %> } from 'app/entities/<%= uniqueRel.otherEntityPath %>/<%= uniqueRel.otherEntityFileName %>.model';
@@ -50,7 +48,6 @@ import { <%= uniqueRel.otherEntityAngularName %>Service } from 'app/entities/<%=
 <%_
     }
   }
-});
 _%>
 <%_ const enumImports = this.generateEntityClientEnumImports(fields); _%>
 <%_ enumImports.forEach( (importedPath, importedType) => { _%>
@@ -70,7 +67,7 @@ export class <%= entityAngularName %>UpdateComponent implements OnInit {
     <%- this._.lowerFirst(importedType) %>Values = Object.keys(<%- importedType %>);
 <%_ }); _%>
 
-<%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.persistableRelationship)).filter(relationships => relationships.length > 0)) { _%>
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
   <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); _%>
   <%_ if (relationshipsByEntityNeedingOptions.length > relationshipsWithCustomUniqueOptions.length) { _%>
     <%_ const otherEntity = relationshipsByEntityNeedingOptions[0].otherEntity _%>
@@ -87,17 +84,14 @@ export class <%= entityAngularName %>UpdateComponent implements OnInit {
 <%_ } _%>
     protected <%= entityInstance %>Service = inject(<%= entityAngularName %>Service);
     protected <%= entityInstance %>FormService = inject(<%= entityAngularName %>FormService);
-<%_
-Object.keys(differentRelationships).forEach(key => {
-  if (differentRelationships[key].some(rel => rel.persistableRelationship)) {
-    const uniqueRel = differentRelationships[key][0];
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) {
+    const uniqueRel = relationshipsByEntityNeedingOptions[0];
     if (uniqueRel.otherEntityAngularName !== entityAngularName) {
 _%>
     protected <%= uniqueRel.otherEntity.entityInstance %>Service = inject(<%= uniqueRel.otherEntityAngularName %>Service);
 <%_
     }
   }
-});
 _%>
 <%_ if (anyFieldHasImageContentType) { _%>
     protected elementRef = inject(ElementRef);
@@ -107,8 +101,8 @@ _%>
     // eslint-disable-next-line @typescript-eslint/member-ordering
     editForm: <%= entityAngularName %>FormGroup = this.<%= entityInstance %>FormService.create<%= entityAngularName %>FormGroup();
 
-<%_ for (const relationshipsByEntity of Object.values(differentRelationships).filter(arr => arr.some(rel => rel.persistableRelationship && rel.otherEntity.primaryKey))) {
-      const { otherEntity } = relationshipsByEntity[0];
+<%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) {
+      const { otherEntity } = relationshipsByEntityNeedingOptions[0];
 _%>
 
     compare<%= otherEntity.entityAngularName %> = (o1: I<%= otherEntity.entityAngularName %> | null, o2: I<%= otherEntity.entityAngularName %> | null): boolean =>
@@ -122,7 +116,7 @@ _%>
                 this.updateForm(<%= entityInstance %>);
             }
 
-<%_ if (relationships.filter(rel => rel.persistableRelationship && !rel.otherEntityIsEmbedded).length > 0) { _%>
+<%_ if (relationships.filter(rel => rel.persistableRelationship && !rel.otherEntity.embedded).length > 0) { _%>
             this.loadRelationshipsOptions();
 <%_ } _%>
         });
@@ -225,7 +219,7 @@ _%>
 
 <%_ if (relationships.filter(rel => rel.persistableRelationship && !rel.otherEntityIsEmbedded).length > 0) { _%>
     protected loadRelationshipsOptions(): void {
-  <%_ for (const relationshipsByEntityNeedingOptions of Object.values(differentRelationships).map(relationships => relationships.filter(rel => rel.persistableRelationship)).filter(relationships => relationships.length > 0)) { _%>
+  <%_ for (const relationshipsByEntityNeedingOptions of allRelationshipsByEntityNeedingOptions) { _%>
     <%_ const relationshipsWithCustomUniqueOptions = relationshipsByEntityNeedingOptions.filter(rel => rel.relationshipOneToOne && rel.otherRelationship); %>
     <%_ const relationshipsWithCustomSharedOptions = relationshipsByEntityNeedingOptions.filter(rel => !relationshipsWithCustomUniqueOptions.includes(rel)); %>
     <%_ const { otherEntity } = relationshipsByEntityNeedingOptions[0] _%>

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

@@ -38,9 +38,9 @@ export default class ErrorComponent implements OnInit<% if (enableTranslation) {
 <%_ } _%>
 
 <%_ if (enableTranslation) { _%>
-  private translateService = inject(TranslateService);
+  private readonly translateService = inject(TranslateService);
 <%_ } _%>
-  private route = inject(ActivatedRoute);
+  private readonly route = inject(ActivatedRoute);
 
   ngOnInit(): void {
     this.route.data.subscribe(routeData => {

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Directive, OnInit, ElementRef, Renderer2, inject, Input } from '@angular/core';
+import { Directive, OnInit, ElementRef, Renderer2, inject, input } from '@angular/core';
 import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
 
 @Directive({
@@ -24,11 +24,11 @@ import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
   selector: '[<%= jhiPrefix %>ActiveMenu]',
 })
 export default class ActiveMenuDirective implements OnInit {
-  @Input() <%= jhiPrefix %>ActiveMenu?: string;
+  <%= jhiPrefix %>ActiveMenu = input();
 
-  private el = inject(ElementRef);
-  private renderer = inject(Renderer2);
-  private translateService = inject(TranslateService);
+  private readonly el = inject(ElementRef);
+  private readonly renderer = inject(Renderer2);
+  private readonly translateService = inject(TranslateService);
 
   ngOnInit(): void {
     this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
@@ -39,7 +39,7 @@ export default class ActiveMenuDirective implements OnInit {
   }
 
   updateActiveFlag(selectedLanguage: string): void {
-    if (this.<%= jhiPrefix %>ActiveMenu === selectedLanguage) {
+    if (this.<%= jhiPrefix %>ActiveMenu() === selectedLanguage) {
       this.renderer.addClass(this.el.nativeElement, 'active');
     } else {
       this.renderer.removeClass(this.el.nativeElement, 'active');

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

@@ -19,7 +19,8 @@
 jest.mock('app/login/login.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
 import { TranslateModule } from '@ngx-translate/core';
@@ -54,12 +55,11 @@ describe('Navbar Component', () => {
       TestBed.configureTestingModule({
         imports: [
           NavbarComponent,
-          HttpClientTestingModule,
 <%_ if (enableTranslation) { _%>
           TranslateModule.forRoot(),
 <%_ } _%>
         ],
-        providers: [LoginService],
+        providers: [provideHttpClient(), provideHttpClientTesting(), LoginService],
       })
         .overrideTemplate(NavbarComponent, '')
         .compileComponents();

package/dist/generators/angular/templates/src/main/webapp/app/layouts/profiles/page-ribbon.component.spec.ts.ejs

@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 
 import { ProfileInfo } from 'app/layouts/profiles/profile-info.model';
@@ -15,7 +15,8 @@ describe('Page Ribbon Component', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, PageRibbonComponent],
+        imports: [PageRibbonComponent],
+        providers: [provideHttpClient()],
       })
         .overrideTemplate(PageRibbonComponent, '')
         .compileComponents();

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

@@ -19,7 +19,7 @@
 jest.mock('app/core/auth/account.service');
 jest.mock('app/login/login.service');
 
-import { ElementRef } from '@angular/core';
+import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { Router, Navigation } from '@angular/router';
@@ -110,7 +110,7 @@ describe('LoginComponent', () => {
       const node = {
         focus: jest.fn(),
       };
-      comp.username = new ElementRef(node);
+      comp.username = signal<ElementRef>(new ElementRef(node));
 
       // WHEN
       comp.ngAfterViewInit();

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, ViewChild, OnInit, AfterViewInit, ElementRef, inject, signal } from '@angular/core';
+import { Component, OnInit, AfterViewInit, ElementRef, inject, signal, viewChild } from '@angular/core';
 import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { Router, RouterModule } from '@angular/router';
 
@@ -31,8 +31,7 @@ import { AccountService } from 'app/core/auth/account.service';
   templateUrl: './login.component.html',
 })
 export default class LoginComponent implements OnInit, AfterViewInit {
-  @ViewChild('username', { static: false })
-  username!: ElementRef;
+  username = viewChild.required<ElementRef>('username');
 
   authenticationError = signal(false);
 
@@ -56,7 +55,7 @@ export default class LoginComponent implements OnInit, AfterViewInit {
   }
 
   ngAfterViewInit(): void {
-    this.username.nativeElement.focus();
+    this.username().nativeElement.focus();
   }
 
   login(): void {

package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs

@@ -100,7 +100,7 @@ describe('Alert Error Component', () => {
         status: 400,
         statusText: 'Bad Request',
         error: {
-          type: 'https://www.jhipster.tech/problem/constraint-violation',
+          type: 'https://www.jhipster.tech/problem/problem-with-message',
           title: 'Bad Request',
           status: 400,
           path: '/api/foos',
@@ -135,7 +135,7 @@ describe('Alert Error Component', () => {
         status: 400,
         statusText: 'Bad Request',
         error: {
-          type: 'https://www.jhipster.tech/problem/constraint-violation',
+          type: 'https://www.jhipster.tech/problem/problem-with-message',
           title: 'Method argument not valid',
           status: 400,
           path: '/api/foos',

package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs

@@ -18,9 +18,12 @@
 -%>
 jest.mock('app/core/auth/account.service');
 
-import { Component, ElementRef, Signal, ViewChild, WritableSignal, signal } from '@angular/core';
+import { Component, ElementRef, WritableSignal, signal, viewChild } from '@angular/core';
+import { provideHttpClient } from '@angular/common/http';
 import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Subject } from 'rxjs';
+<%_ if (enableTranslation) { _%>
+import { TranslateModule } from '@ngx-translate/core';
+<%_ } _%>
 
 import { AccountService } from 'app/core/auth/account.service';
 import { Account } from 'app/core/auth/account.model';
@@ -31,8 +34,7 @@ import HasAnyAuthorityDirective from './has-any-authority.directive';
   template: ` <div *<%= jhiPrefix %>HasAnyAuthority="'ROLE_ADMIN'" #content></div> `,
 })
 class TestHasAnyAuthorityDirectiveComponent {
-  @ViewChild('content', { static: false })
-  content?: ElementRef;
+  content = viewChild<ElementRef>('content');
 }
 
 describe('HasAnyAuthorityDirective tests', () => {
@@ -41,9 +43,9 @@ describe('HasAnyAuthorityDirective tests', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [HasAnyAuthorityDirective],
+      imports: [HasAnyAuthorityDirective<%_ if (enableTranslation) { _%>, TranslateModule.forRoot()<%_ } _%>],
       declarations: [TestHasAnyAuthorityDirectiveComponent],
-      providers: [AccountService],
+      providers: [provideHttpClient(), AccountService],
     });
   }));
 
@@ -79,7 +81,7 @@ describe('HasAnyAuthorityDirective tests', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.content).toBeUndefined();
+      expect(comp.content()).toBeUndefined();
     });
   });
 
@@ -95,7 +97,7 @@ describe('HasAnyAuthorityDirective tests', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.content).toBeDefined();
+      expect(comp.content()).toBeDefined();
 
       // GIVEN
       currentAccount.set(null);
@@ -104,7 +106,7 @@ describe('HasAnyAuthorityDirective tests', () => {
       fixture.detectChanges();
 
       // THEN
-      expect(comp.content).toBeUndefined();
+      expect(comp.content()).toBeUndefined();
 
       // WHEN
       currentAccount.set({ activated: true, authorities: ['foo'] } as any);

package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Directive, inject, Input, TemplateRef, ViewContainerRef, effect, signal, computed } from '@angular/core';
+import { Directive, inject, input, TemplateRef, ViewContainerRef, effect, computed } from '@angular/core';
 
 import { AccountService } from 'app/core/auth/account.service';
 
@@ -36,7 +36,7 @@ import { AccountService } from 'app/core/auth/account.service';
   selector: '[<%= jhiPrefix %>HasAnyAuthority]',
 })
 export default class HasAnyAuthorityDirective {
-  private authorities = signal<string | string[]>([]);
+  public authorities = input<string | string[]>([], { alias: '<%= jhiPrefix %>HasAnyAuthority' });
 
   private templateRef = inject(TemplateRef<any>);
   private viewContainerRef = inject(ViewContainerRef);
@@ -52,11 +52,6 @@ export default class HasAnyAuthorityDirective {
       } else {
         this.viewContainerRef.clear();
       }
-    });
-  }
-
-  @Input()
-  set <%= jhiPrefix %>HasAnyAuthority(value: string | string[]) {
-    this.authorities.set(value);
+    }, { allowSignalWrites: true });
   }
 }

package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs

@@ -1,13 +1,17 @@
 @if (filters.hasAnyFilterSet()) {
 <div class="filter-display">
   <span>__jhiTranslateTag__('entity.filters.set')</span>
-  <fa-icon icon="times" (click)="clearAllFilters()" title="__jhiTranslatePipe__('entity.filters.clearAll')"></fa-icon>
+  <button class="btn" (click)="clearAllFilters()" (keydown.enter)="clearAllFilters()">
+    <fa-icon icon="times" title="__jhiTranslatePipe__('entity.filters.clearAll')"></fa-icon>
+  </button>
   <ul>
 @for (filterOption of filters.filterOptions; track filterOption.name) {
   @for (value of filterOption.values; track value) {
     <li>
       <span>{{ filterOption.name }}:</span> {{ value }}
-      <fa-icon icon="times" (click)="clearFilter(filterOption.name, value)" title="__jhiTranslatePipe__('entity.filters.clear')"></fa-icon>
+      <button class="btn" (click)="clearFilter(filterOption.name, value)" (keydown.enter)="clearFilter(filterOption.name, value)">
+        <fa-icon icon="times" title="__jhiTranslatePipe__('entity.filters.clear')"></fa-icon>
+      </button>
     </li>
   }
 }

package/dist/generators/angular/templates/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs

@@ -23,7 +23,7 @@ import { Pipe, PipeTransform } from '@angular/core';
   name: 'findLanguageFromKey',
 })
 export default class FindLanguageFromKeyPipe implements PipeTransform {
-  private languages: { [key: string]: { name: string; rtl?: boolean } } = {
+  private readonly languages: { [key: string]: { name: string; rtl?: boolean } } = {
     // jhipster-needle-i18n-language-key-pipe - JHipster will add/remove languages in this object
   };
 

package/dist/generators/angular/templates/src/main/webapp/app/shared/language/translation.module.ts.ejs

@@ -71,8 +71,8 @@ export class LazyTranslationModule {
   ],
 })
 export class TranslationModule {
-  private translateService = inject(TranslateService);
-  private stateStorageService = inject(StateStorageService);
+  private readonly translateService = inject(TranslateService);
+  private readonly stateStorageService = inject(StateStorageService);
 
   constructor() {
     this.translateService.setDefaultLang('<%= nativeLanguage %>');

package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, DebugElement, inject } from '@angular/core';
+import { Component, DebugElement, Type, inject } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { FaIconComponent, FaIconLibrary } from '@fortawesome/angular-fontawesome';
@@ -72,58 +72,58 @@ describe('Directive: SortByDirective', () => {
   it('should have a neutral state for predicate column and undefined order value', () => {
     // GIVEN
     component.sortState.set({ predicate: 'name' });
-    const sortByDirective = tableHead.injector.get(SortByDirective);
+    const sortByDirective = tableHead.injector.get(SortByDirective as Type<SortByDirective>);
 
     // WHEN
     fixture.detectChanges();
 
     // THEN
     expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
-    expect(sortByDirective.iconComponent?.icon).toEqual(faSort.iconName);
+    expect(sortByDirective.iconComponent()?.icon).toEqual(faSort.iconName);
   });
 
   it('should have an asc state for predicate column and true asc value', () => {
     // GIVEN
     component.sortState.set({ predicate: 'name', order: 'asc' });
-    const sortByDirective = tableHead.injector.get(SortByDirective);
+    const sortByDirective = tableHead.injector.get(SortByDirective as Type<SortByDirective>);
 
     // WHEN
     fixture.detectChanges();
 
     // THEN
     expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
-    expect(sortByDirective.iconComponent?.icon).toEqual(faSortUp.iconName);
+    expect(sortByDirective.iconComponent()?.icon).toEqual(faSortUp.iconName);
   });
 
   it('should have a desc state for predicate column and desc value', () => {
     // GIVEN
     component.sortState.set({ predicate: 'name', order: 'desc' });
-    const sortByDirective = tableHead.injector.get(SortByDirective);
+    const sortByDirective = tableHead.injector.get(SortByDirective as Type<SortByDirective>);
 
     // WHEN
     fixture.detectChanges();
 
     // THEN
     expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
-    expect(sortByDirective.iconComponent?.icon).toEqual(faSortDown.iconName);
+    expect(sortByDirective.iconComponent()?.icon).toEqual(faSortDown.iconName);
   });
 
   it('should have a neutral state for non-predicate column', () => {
     // GIVEN
     component.sortState.set({ predicate: 'non-existing-column', order: 'asc' });
-    const sortByDirective = tableHead.injector.get(SortByDirective);
+    const sortByDirective = tableHead.injector.get(SortByDirective as Type<SortByDirective>);
 
     // WHEN
     fixture.detectChanges();
 
     // THEN
     expect(sortByDirective.<%= jhiPrefix %>SortBy).toEqual('name');
-    expect(sortByDirective.iconComponent?.icon).toEqual(faSort.iconName);
+    expect(sortByDirective.iconComponent()?.icon).toEqual(faSort.iconName);
   });
 
   it('multiple clicks at same component, should call SortDirective sort', () => {
     // GIVEN
-    const sortDirective = tableHead.injector.get(SortDirective);
+    const sortDirective = tableHead.injector.get(SortDirective as Type<SortDirective>);
     sortDirective.sort = jest.fn();
 
     // WHEN

package/dist/generators/angular/templates/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { ContentChild, Directive, Host, HostListener, Input, effect } from '@angular/core';
+import { Directive, Host, HostListener, Input, contentChild, effect } from '@angular/core';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { faSort, faSortDown, faSortUp, IconDefinition } from '@fortawesome/free-solid-svg-icons';
 
@@ -29,8 +29,7 @@ import { SortDirective } from './sort.directive';
 export class SortByDirective {
   @Input() <%= jhiPrefix %>SortBy!: string;
 
-  @ContentChild(FaIconComponent, { static: false })
-  iconComponent?: FaIconComponent;
+  iconComponent = contentChild(FaIconComponent);
 
   protected sortIcon = faSort;
   protected sortAscIcon = faSortUp;
@@ -38,21 +37,21 @@ export class SortByDirective {
 
   constructor(@Host() private sort: SortDirective) {
     effect(() => {
-      if (this.iconComponent) {
+      if (this.iconComponent()) {
         let icon: IconDefinition = this.sortIcon;
         const { predicate, order } = this.sort.sortState();
         if (predicate === this.<%= jhiPrefix %>SortBy && order !== undefined) {
           icon = order === 'asc' ? this.sortAscIcon : this.sortDescIcon;
         }
-        this.iconComponent.icon = icon.iconName;
-        this.iconComponent.render();
+        this.iconComponent()!.icon = icon.iconName;
+        this.iconComponent()!.render();
       }
     });
   }
 
   @HostListener('click')
   onClick(): void {
-    if (this.iconComponent) {
+    if (this.iconComponent()) {
       this.sort.sort(this.<%= jhiPrefix %>SortBy);
     }
   }