generator-jhipster 8.7.2 → 8.8.0

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs

@@ -92,12 +92,7 @@ export interface GarbageCollector {
   classesUnloaded: number;
 }
 
-export type Services = Record<
-  string,
-  {
-    [key in HttpMethod]?: MaxMeanCount;
-  }
->;
+export type Services = Record<string, Record<HttpMethod, MaxMeanCount>>;
 
 export enum HttpMethod {
   Post = 'POST',

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

@@ -24,7 +24,6 @@ import { TrackerActivity } from 'app/core/tracker/tracker-activity.model';
 import SharedModule from 'app/shared/shared.module';
 
 @Component({
-  standalone: true,
   selector: '<%= jhiPrefixDashed %>-tracker',
   imports: [SharedModule],
   templateUrl: './tracker.component.html',

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

@@ -25,7 +25,6 @@ import { User } from '../user-management.model';
 import { UserManagementService } from '../service/user-management.service';
 
 @Component({
-  standalone: true,
   selector: '<%= jhiPrefixDashed %>-user-mgmt-delete-dialog',
   templateUrl: './user-management-delete-dialog.component.html',
   imports: [SharedModule, FormsModule],

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
+const tsKeyId = user.primaryKey.tsSampleValues[0];
 _%>
 import { TestBed } from '@angular/core/testing';
 import { provideRouter, withComponentInputBinding } from '@angular/router';

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

@@ -23,7 +23,6 @@ import SharedModule from 'app/shared/shared.module';
 import { User } from '../user-management.model';
 
 @Component({
-  standalone: true,
   selector: '<%= jhiPrefixDashed %>-user-mgmt-detail',
   templateUrl: './user-management-detail.component.html',
   imports: [RouterModule, SharedModule],

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

@@ -39,7 +39,7 @@
   <div class="table-responsive">
     <table class="table table-striped" aria-describedby="user-management-page-heading">
       <thead>
-        <tr<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="transition($event)"<% } %>>
+        <tr<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>Sort [(sortState)]="sortState" (sortChange)="transition($event)"<% } %>>
           <th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="id"<% } %>>
             <span>__jhiTranslateTag__('global.field.id')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
           </th>

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
+const tsKeyId = user.primaryKey.tsSampleValues[0];
 _%>
 jest.mock('app/core/auth/account.service');
 

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

@@ -38,13 +38,11 @@ import { User } from '../user-management.model';
 import UserManagementDeleteDialogComponent from '../delete/user-management-delete-dialog.component';
 
 @Component({
-  standalone: true,
   selector: '<%= jhiPrefixDashed %>-user-mgmt',
   templateUrl: './user-management.component.html',
   imports: [
     RouterModule,
     SharedModule,
-    UserManagementDeleteDialogComponent,
 <%_ if (!databaseTypeCassandra) { _%>
     SortDirective,
     SortByDirective,
@@ -83,7 +81,7 @@ export default class UserManagementComponent implements OnInit {
     this.userService.update({ ...user, activated: isActivated }).subscribe(() => this.loadAll());
   }
 
-  trackIdentity(item: User): <%= this.getTypescriptKeyType(user.primaryKey.type) %> {
+  trackIdentity(item: User): <%= user.primaryKey.tsType %> {
     return item.id!;
   }
 

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
+const tsKeyId = user.primaryKey.tsSampleValues[0];
 _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClient, HttpErrorResponse } from '@angular/common/http';

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
+const tsKeyId = user.primaryKey.tsSampleValues[0];
 _%>
 import { ComponentFixture, TestBed, waitForAsync, inject, fakeAsync, tick } from '@angular/core/testing';
 import { provideHttpClient } from '@angular/common/http';

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

@@ -37,7 +37,6 @@ const newUser: IUser = {
 } as IUser;
 
 @Component({
-  standalone: true,
   selector: '<%= jhiPrefixDashed %>-user-mgmt-update',
   templateUrl: './user-management-update.component.html',
   imports: [SharedModule, FormsModule, ReactiveFormsModule],

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-  const idType = this.getTypescriptKeyType(user.primaryKey.type);
+  const idType = user.primaryKey.tsType;
 _%>
 export interface IUser {
   id: <%= idType %> | null;

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

@@ -37,7 +37,6 @@ import { TrackerService } from './core/tracker/tracker.service';
 <%_ } _%>
 
 @Component({
-  standalone: true,
   selector: '<%= jhiPrefixDashed %>-app',
   template: '<<%= jhiPrefixDashed %>-main></<%= jhiPrefixDashed %>-main>',
   imports: [

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

@@ -24,11 +24,11 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 
 import { NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap';
 
-import { DEBUG_INFO_ENABLED } from 'app/app.constants';
 import './config/dayjs';
 <%_ if (enableTranslation) { _%>
 import { TranslationModule } from 'app/shared/language/translation.module';
 <%_ } _%>
+import { environment } from 'environments/environment';
 import { httpInterceptorProviders } from './core/interceptor';
 import FindLanguageFromKeyPipe from 'app/shared/language/find-language-from-key.pipe';
 import routes from './app.routes';
@@ -51,7 +51,7 @@ const routerFeatures: RouterFeatures[] = [
     }
   }),
 ];
-if (DEBUG_INFO_ENABLED) {
+if (environment.DEBUG_INFO_ENABLED) {
   routerFeatures.push(withDebugTracing());
 }
 

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

@@ -16,9 +16,14 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { HttpClient } from '@angular/common/http';
 import { MissingTranslationHandler, MissingTranslationHandlerParams, TranslateLoader } from '@ngx-translate/core';
+<%_ if (clientBundlerExperimentalEsbuild) { _%>
+import { loadLocale } from 'i18n';
+import { Observable, from } from 'rxjs';
+<%_ } else { _%>
+import { HttpClient } from '@angular/common/http';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+<%_ } _%>
 
 export const translationNotFoundMessage = 'translation-not-found';
 
@@ -29,9 +34,19 @@ export class MissingTranslationHandlerImpl implements MissingTranslationHandler
   }
 }
 
+<%_ if (clientBundlerExperimentalEsbuild) { _%>
+export function translatePartialLoader(): TranslateLoader {
+  return {
+    getTranslation(lang: string): Observable<any> {
+      return from(loadLocale(lang as any));
+    },
+  };
+}
+<%_ } else { _%>
 export function translatePartialLoader(http: HttpClient): TranslateLoader {
   return new TranslateHttpLoader(http, 'i18n/', `.json?_=${I18N_HASH}`);
 }
+<%_ } _%>
 
 export function missingTranslationHandler(): MissingTranslationHandler {
   return new MissingTranslationHandlerImpl();

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

@@ -23,7 +23,7 @@ import { provideHttpClientTesting, HttpTestingController } from '@angular/common
 import { provideHttpClient } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { InterpolatableTranslationObject, TranslateModule, TranslateService } from '@ngx-translate/core';
 import { of } from 'rxjs';
 <%_ } _%>
 
@@ -88,7 +88,7 @@ describe('Account Service', () => {
 <%_ if (enableTranslation) { _%>
 
     mockTranslateService = TestBed.inject(TranslateService);
-    jest.spyOn(mockTranslateService, 'use').mockImplementation(() => of(''));
+    jest.spyOn(mockTranslateService, 'use').mockImplementation(() => of({} as InterpolatableTranslationObject));
 <%_ } _%>
   });
 

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

@@ -81,7 +81,7 @@ export class AccountService {
 
           // After retrieve the account info, the language will be changed to
           // the user's preferred language configured in the account setting
-          // unless user have choosed other language in the current session
+          // unless user have chosen other language in the current session
           if (!this.stateStorageService.getLocale()) {
             this.translateService.use(account.langKey);
           }

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%
-const enumImports = this.generateEntityClientEnumImports(fields);
+const enumImports = generateEntityClientEnumImports(fields);
 %>
 <%_ if (anyFieldIsDateDerived) { _%>
 import dayjs from 'dayjs/esm';

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-  const enumImports = this.generateEntityClientEnumImports(fields);
+  const enumImports = generateEntityClientEnumImports(fields);
 _%>
 <%_ if (anyFieldIsDateDerived) { _%>
 import dayjs from 'dayjs/esm';
@@ -29,14 +29,14 @@ import { <%- importedType %> } from '<%- importedPath %>';
 
 import { I<%= entityAngularName %><% if (!readOnly && primaryKey) { %>, New<%= entityAngularName %><% } %> } from './<%= entityFileName %>.model';
 
-export const sampleWithRequiredData: I<%= entityAngularName %> = <%- this.generateTypescriptTestEntity(fields.filter(field => field.id || field.fieldValidationRequired).map(field => field.reference)) %>;
+export const sampleWithRequiredData: I<%= entityAngularName %> = <%- tsSampleWithRequiredData %>;
 
-export const sampleWithPartialData: I<%= entityAngularName %> = <%- this.generateTypescriptTestEntity(fields.filter(field => field.id || field.fieldValidationRequired || (!field.transient && faker.datatype.boolean())).map(field => field.reference)) %>;
+export const sampleWithPartialData: I<%= entityAngularName %> = <%- tsSampleWithPartialData %>;
 
-export const sampleWithFullData: I<%= entityAngularName %> = <%- this.generateTypescriptTestEntity(fields.filter(field => !field.transient).map(field => field.reference)) %>;
+export const sampleWithFullData: I<%= entityAngularName %> = <%- tsSampleWithFullData %>;
 <%_ if (!readOnly && primaryKey) { _%>
 
-export const sampleWithNewData: New<%= entityAngularName %> = <%- this.generateTypescriptTestEntity(fields.filter(field => !field.id && field.fieldValidationRequired).map(field => field.reference), { [primaryKey.name]: null }) %>;
+export const sampleWithNewData: New<%= entityAngularName %> = <%- tsSampleWithNewData %>;
 
 Object.freeze(sampleWithNewData);
 <%_ } _%>

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(primaryKey.type);
+const tsKeyId = primaryKey.tsSampleValues[0];
 _%>
 jest.mock('@ng-bootstrap/ng-bootstrap');
 

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

@@ -26,7 +26,6 @@ import { <%= entityAngularName %>Service } from '../service/<%= entityFileName %
 import { ITEM_DELETED_EVENT } from 'app/config/navigation.constants';
 
 @Component({
-    standalone: true,
     templateUrl: './<%= entityFileName %>-delete-dialog.component.html',
     imports: [SharedModule, FormsModule],
 })

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

@@ -41,17 +41,17 @@ _%>
     <%_ } else if (field.fieldTypeBinary && field.blobContentTypeImage) { _%>
         @if (<%= entityInstance %>Ref.<%= fieldName %>) {
           <div>
-            <a (click)="openFile(<%= entityInstance %>Ref.<%= fieldName %> ?? '', <%= entityInstance %>Ref.<%= fieldName %>ContentType)">
+            <a (click)="openFile(<%= entityInstance %>Ref.<%= fieldName %><% if (!field.fieldValidationRequired) { %> ?? ''<% } %>, <%= entityInstance %>Ref.<%= fieldName %>ContentType)">
               <img [src]="'data:' + <%= entityInstance %>Ref.<%= fieldName %>ContentType + ';base64,' + <%= entityInstance %>Ref.<%= fieldName %>" style="max-width: 100%;" alt="<%= entityInstance %>"/>
             </a>
-            {{ <%= entityInstance %>Ref.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>Ref.<%= fieldName %> ?? '') }}
+            {{ <%= entityInstance %>Ref.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>Ref.<%= fieldName %><% if (!field.fieldValidationRequired) { %> ?? ''<% } %>) }}
           </div>
         }
     <%_ } else if (field.fieldTypeBinary && field.blobContentTypeAny) { _%>
         @if (<%= entityInstance %>Ref.<%= fieldName %>) {
           <div>
-            <a (click)="openFile(<%= entityInstance %>Ref.<%= fieldName %> ?? '', <%= entityInstance %>Ref.<%= fieldName %>ContentType)">__jhiTranslateTag__('entity.action.open')</a>
-            {{ <%= entityInstance %>Ref.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>Ref.<%= fieldName %> ?? '') }}
+            <a (click)="openFile(<%= entityInstance %>Ref.<%= fieldName %><% if (!field.fieldValidationRequired) { %> ?? ''<% } %>, <%= entityInstance %>Ref.<%= fieldName %>ContentType)">__jhiTranslateTag__('entity.action.open')</a>
+            {{ <%= entityInstance %>Ref.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>Ref.<%= fieldName %><% if (!field.fieldValidationRequired) { %> ?? ''<% } %>) }}
           </div>
         }
     <%_ } else if (field.fieldTypeDuration) { _%>

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

@@ -17,8 +17,8 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(primaryKey.type);
-const testEntity = this.generateTestEntityPrimaryKey(primaryKey, 0);
+const tsKeyId = primaryKey.tsSampleValues[0];
+const testEntity = tsPrimaryKeySamples[0];
 _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideRouter, withComponentInputBinding } from '@angular/router';

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

@@ -27,10 +27,21 @@ import { DataUtils } from 'app/core/util/data-util.service';
 <%_ } _%>
 
 @Component({
-    standalone: true,
     selector: '<%= jhiPrefixDashed %>-<%= entityFileName %>-detail',
     templateUrl: './<%= entityFileName %>-detail.component.html',
-    imports: [SharedModule, RouterModule, DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe],
+    imports: [
+      SharedModule,
+      RouterModule,
+<%_ if (anyFieldIsDuration) { _%>
+      DurationPipe,
+<%_ } _%>
+<%_ if (anyFieldIsTimeDerived) { _%>
+      FormatMediumDatetimePipe,
+<%_ } _%>
+<%_ if (anyFieldIsLocalDate) { _%>
+      FormatMediumDatePipe,
+<%_ } _%>
+    ],
 })
 export class <%= entityAngularName %>DetailComponent {
     <%= entityInstance %> = input<I<%= entityAngularName %> | null>(null);

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

@@ -64,17 +64,15 @@
     <<%= jhiPrefixDashed %>-filter [filters]="filters"></<%= jhiPrefixDashed %>-filter>
 <%_ } _%>
 
-@if (<%= entityInstancePlural %>?.length === 0) {
+@if (<%= entityInstancePlural %>().length === 0) {
     <div class="alert alert-warning" id="no-result">
         <span>__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.notFound')</span>
     </div>
-}
-
-@if (<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0) {
+} @else {
     <div class="table-responsive table-entities" id="entities">
         <table class="table table-striped" aria-describedby="page-heading">
             <thead>
-                <tr <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="navigateToWithComponentValues($event)">
+                <tr <%= jhiPrefix %>Sort [(sortState)]="sortState" (sortChange)="navigateToWithComponentValues($event)">
 <%_ for (const field of fields.filter(field => !field.hidden)) { _%>
                     <th scope="col" <%= jhiPrefix %>SortBy="<%= field.fieldName %>">
                         <div class="d-flex">
@@ -103,7 +101,7 @@
                 </tr>
             </thead>
             <tbody<% if (paginationInfiniteScroll) { %> infinite-scroll (scrolled)="loadNextPage()" [infiniteScrollDisabled]="!hasMorePage()" [infiniteScrollDistance]="0"<% } %>>
-            @for (<%= entityInstance %> of <%= entityInstancePlural %>; track track<%= primaryKey.nameCapitalized %>(<%= entityInstance %>)) {
+            @for (<%= entityInstance %> of <%= entityInstancePlural %>(); track track<%= primaryKey.nameCapitalized %>(<%= entityInstance %>)) {
                 <tr data-cy="entityTable">
 <%_
 const routerLink = ` [routerLink]="['/${ entityPage }', ${entityInstance}.${primaryKey.name}, 'view']"`;
@@ -220,7 +218,7 @@ _%>
     </div>
 }
 <%_ if (paginationPagination) { _%>
-@if (<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0) {
+@if (<%= entityInstancePlural %>().length > 0) {
     <div>
         <div class="d-flex justify-content-center">
             <<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }"></<%= jhiPrefixDashed %>-item-count>

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

@@ -17,10 +17,9 @@
  limitations under the License.
 -%>
 <%_
-const entityArrayOptionalChainSymbol = '?.';
 const order = 'desc';
-const testEntityPrimaryKey = this.generateTestEntityPrimaryKey(primaryKey, 0);
-const testEntityPrimaryKey2 = this.generateTestEntityPrimaryKey(primaryKey, 1);
+const testEntityPrimaryKey = tsPrimaryKeySamples[0];
+const testEntityPrimaryKey2 = tsPrimaryKeySamples[1];
 _%>
 
 import {
@@ -131,12 +130,12 @@ describe('<%= entityAngularName %> Management Component', () => {
 
         // THEN
         expect(service.query).toHaveBeenCalled();
-        expect(comp.<%= entityInstancePlural %><%= entityArrayOptionalChainSymbol %>[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
+        expect(comp.<%= entityInstancePlural %>()[0]).toEqual(expect.objectContaining(<%- testEntityPrimaryKey %>));
     });
 
     describe('track<%= primaryKey.nameCapitalized %>', () => {
         it('Should forward to <%= entityInstance %>Service', () => {
-            const entity = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
+            const entity = <%- tsPrimaryKeySamples[0] %>;
             jest.spyOn(service, 'get<%= entityAngularName %>Identifier');
             const <%= primaryKey.name %> = comp.track<%= primaryKey.nameCapitalized %>(entity);
             expect(service.get<%= entityAngularName %>Identifier).toHaveBeenCalledWith(entity);

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

@@ -29,7 +29,7 @@
 
   const componentName = entityAngularName + 'Component';
 _%>
-import { Component, computed, NgZone, inject, OnInit, signal, WritableSignal } from '@angular/core';
+import { Component, computed, effect, NgZone, inject, OnInit, signal, WritableSignal } from '@angular/core';
 <%_ if (!paginationNo) { _%>
 import { HttpHeaders } from '@angular/common/http';
 <%_ } _%>
@@ -85,7 +85,6 @@ import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
 <%_ } _%>
 
 @Component({
-    standalone: true,
     selector: '<%= jhiPrefixDashed %>-<%= entityFileName %>',
     templateUrl: './<%= entityFileName %>.component.html',
     imports: [
@@ -96,9 +95,15 @@ import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
       SharedModule,
       SortDirective,
       SortByDirective,
+<%_ if (anyFieldIsDuration) { _%>
       DurationPipe,
+<%_ } _%>
+<%_ if (anyFieldIsTimeDerived) { _%>
       FormatMediumDatetimePipe,
+<%_ } _%>
+<%_ if (anyFieldIsLocalDate) { _%>
       FormatMediumDatePipe,
+<%_ } _%>
 <%_ if (jpaMetamodelFiltering && paginationPagination) { _%>
       FilterComponent,
 <%_ } _%>
@@ -117,7 +122,7 @@ export class <%= componentName %> implements OnInit {
 
 <%_ } _%>
     subscription: Subscription | null = null;
-    <%= entityInstancePlural %>?: I<%= entityAngularName %>[];
+    <%= entityInstancePlural %> = signal<I<%= entityAngularName %>[]>([]);
     isLoading = false;
 
     sortState = sortStateSignal({});
@@ -129,7 +134,9 @@ export class <%= componentName %> implements OnInit {
 <%_ } _%>
 
 <%_ if (paginationPagination) { _%>
-<%- include('pagination-template'); -%>
+  itemsPerPage = ITEMS_PER_PAGE;
+  totalItems = 0;
+  page = 1;
 <%_ } else if (paginationInfiniteScroll) { _%>
     itemsPerPage = ITEMS_PER_PAGE;
     links: WritableSignal<Record<string, undefined | Record<string, string | undefined>>> = signal({});
@@ -166,8 +173,10 @@ export class <%= componentName %> implements OnInit {
         tap(() => this.load()),
 <%_ } else { _%>
         tap(() => {
-          if (!this.<%= entityInstancePlural %> || this.<%= entityInstancePlural %>.length === 0) {
+          if (this.<%= entityInstancePlural %>().length === 0) {
             this.load();
+          } else {
+            this.<%= entityInstancePlural %>.set(this.refineData(this.<%= entityInstancePlural %>()));
           }
         }),
 <%_ } _%>
@@ -180,7 +189,7 @@ export class <%= componentName %> implements OnInit {
 
 <%_ if (paginationInfiniteScroll) { _%>
     reset(): void {
-      this.<%= entityInstancePlural %> = [];
+      this.<%= entityInstancePlural %>.set([]);
     }
 
     loadNextPage(): void {
@@ -190,24 +199,25 @@ export class <%= componentName %> implements OnInit {
 <%_ } _%>
 <%_ if (searchEngineAny) { _%>
     search(query: string): void {
+  <%_ if (paginationPagination) { _%>
+      this.page = 1;
+  <%_ } _%>
+      this.currentSearch = query;
   <%_ if (notSortableFieldsAfterSearch) { _%>
       const { predicate } = this.sortState();
       if (query && predicate && <%= componentName %>.NOT_SORTABLE_FIELDS_AFTER_SEARCH.includes(predicate)) {
-        this.loadDefaultSortState();
+        this.navigateToWithComponentValues(this.getDefaultSortState());
+        return;
       }
   <%_ } _%>
-  <%_ if (paginationPagination) { _%>
-      this.page = 1;
-  <%_ } _%>
-      this.currentSearch = query;
       this.navigateToWithComponentValues(this.sortState());
     }
 
-    loadDefaultSortState(): void {
+    getDefaultSortState(): SortState {
   <%_ if (notSortableFieldsAfterSearchFieldNames.includes(primaryKey.name)) { _%>
-      this.sortState.set({});
+      return {};
   <%_ } else { _%>
-      this.sortState.set(this.sortService.parseSortParam(this.activatedRoute.snapshot.data[DEFAULT_SORT_DATA]));
+      return this.sortService.parseSortParam(this.activatedRoute.snapshot.data[DEFAULT_SORT_DATA]);
   <%_ } _%>
     }
 <%_ } _%>
@@ -281,9 +291,9 @@ export class <%= componentName %> implements OnInit {
 <%_ } _%>
       const dataFromBody = this.fillComponentAttributesFromResponseBody(response.body);
 <%_ if (paginationNo) { _%>
-      this.<%= entityInstancePlural %> = this.refineData(dataFromBody);
+      this.<%= entityInstancePlural %>.set(this.refineData(dataFromBody));
 <%_ } else { _%>
-      this.<%= entityInstancePlural %> = dataFromBody;
+      this.<%= entityInstancePlural %>.set(dataFromBody);
 <%_ } _%>
     }
 
@@ -298,7 +308,7 @@ export class <%= componentName %> implements OnInit {
 <%_ if (paginationInfiniteScroll) { _%>
       // If there is previous link, data is a infinite scroll pagination content.
       if (this.links().prev) {
-        const <%= entityInstancePlural %>New = this.<%= entityInstancePlural %> ?? [];
+        const <%= entityInstancePlural %>New = this.<%= entityInstancePlural %>();
         if (data) {
           for (const d of data) {
   <%_ if (primaryKey) { _%>

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

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(primaryKey.type);
+const tsKeyId = primaryKey.tsSampleValues[0];
 _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClient, HttpResponse } from '@angular/common/http';

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

@@ -17,8 +17,8 @@
  limitations under the License.
 -%>
 <%_
-const tsKeyId = this.generateTestEntityId(primaryKey.type);
-const enumImports = this.generateEntityClientEnumImports(fields);
+const tsKeyId = primaryKey.tsSampleValues[0];
+const enumImports = generateEntityClientEnumImports(fields);
 _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
@@ -219,7 +219,7 @@ describe('<%= entityAngularName %> Service', () => {
             });
 
             it('Should return false if one entity is null', () => {
-                const entity1 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
+                const entity1 = <%- tsPrimaryKeySamples[0] %>;
                 const entity2 = null;
 
                 const compareResult1 = service.compare<%= entityAngularName %>(entity1, entity2);
@@ -230,8 +230,8 @@ describe('<%= entityAngularName %> Service', () => {
             });
 
             it('Should return false if primaryKey differs', () => {
-                const entity1 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
-                const entity2 = <%- this.generateTestEntityPrimaryKey(primaryKey, 1) %>;
+                const entity1 = <%- tsPrimaryKeySamples[0] %>;
+                const entity2 = <%- tsPrimaryKeySamples[1] %>;
 
                 const compareResult1 = service.compare<%= entityAngularName %>(entity1, entity2);
                 const compareResult2 = service.compare<%= entityAngularName %>(entity2, entity1);
@@ -241,8 +241,8 @@ describe('<%= entityAngularName %> Service', () => {
             });
 
             it('Should return false if primaryKey matches', () => {
-                const entity1 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
-                const entity2 = <%- this.generateTestEntityPrimaryKey(primaryKey, 0) %>;
+                const entity1 = <%- tsPrimaryKeySamples[0] %>;
+                const entity2 = <%- tsPrimaryKeySamples[0] %>;
 
                 const compareResult1 = service.compare<%= entityAngularName %>(entity1, entity2);
                 const compareResult2 = service.compare<%= entityAngularName %>(entity2, entity1);

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

@@ -175,7 +175,7 @@ _%>
                         <option [ngValue]="null" selected></option>
                     }
     <%_ } else { _%>
-                    @if (editForm.get([<%- this.buildAngularFormPath(relationship.reference) %>])!.value == null) {
+                    @if (editForm.get(['<%- relationship.propertyName %>'])!.value == null) {
                         <option [ngValue]="null" selected></option>
                     }
     <%_ } _%>
@@ -196,10 +196,10 @@ _%>
                 </div>
   <%_ } _%>
   <%_ if (relationship.relationshipValidate && relationship.persistableRelationship) { _%>
-            @if (editForm.get([<%- this.buildAngularFormPath(relationship.reference) %>])!.invalid && (editForm.get([<%- this.buildAngularFormPath(relationship.reference) %>])!.dirty || editForm.get([<%- this.buildAngularFormPath(relationship.reference) %>])!.touched)) {
+            @if (editForm.get(['<%- relationship.propertyName %>'])!.invalid && (editForm.get(['<%- relationship.propertyName %>'])!.dirty || editForm.get(['<%- relationship.propertyName %>'])!.touched)) {
                 <div>
     <%_ if (relationshipRequired) { _%>
-                @if (editForm.get([<%- this.buildAngularFormPath(relationship.reference) %>])?.errors?.required) {
+                @if (editForm.get(['<%- relationship.propertyName %>'])?.errors?.required) {
                     <small class="form-text text-danger">__jhiTranslateTag__('entity.validation.required')</small>
                 }
     <%_ } _%>