generator-jhipster 8.0.0 → 8.1.0

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

@@ -0,0 +1,67 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed 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
+
+      https://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 { ApplicationConfig, LOCALE_ID, importProvidersFrom } from '@angular/core';
+import { BrowserModule, Title } from '@angular/platform-browser';
+import { RouterFeatures, TitleStrategy, provideRouter, withComponentInputBinding, withDebugTracing } from '@angular/router';
+import { ServiceWorkerModule } from '@angular/service-worker';
+import { HttpClientModule } 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 { httpInterceptorProviders } from 'app/core/interceptor/index';
+import FindLanguageFromKeyPipe from 'app/shared/language/find-language-from-key.pipe';
+import routes from './app.routes';
+// jhipster-needle-angular-add-module-import JHipster will add new module here
+import { NgbDateDayjsAdapter } from './config/datepicker-adapter';
+import { AppPageTitleStrategy } from './app-page-title-strategy';
+
+const routerFeatures: Array<RouterFeatures> = [withComponentInputBinding()];
+if (DEBUG_INFO_ENABLED) {
+  routerFeatures.push(withDebugTracing());
+}
+
+export const appConfig: ApplicationConfig = {
+  providers: [
+    provideRouter(routes, ...routerFeatures),
+    importProvidersFrom(BrowserModule),
+    // Set this to true to enable service worker (PWA)
+    importProvidersFrom(ServiceWorkerModule.register('ngsw-worker.js', { enabled: false })),
+<%_ if (enableTranslation) { _%>
+    importProvidersFrom(TranslationModule),
+<%_ } _%>
+    importProvidersFrom(HttpClientModule),
+    Title,
+<%_ if (authenticationTypeSession && communicationSpringWebsocket) { _%>
+    CookieService,
+<%_ } _%>
+    { provide: LOCALE_ID, useValue: '<%= angularLocaleId %>' },
+    { provide: NgbDateAdapter, useClass: NgbDateDayjsAdapter },
+<%_ if (enableI18nRTL) { _%>
+    FindLanguageFromKeyPipe,
+<%_ } _%>
+    httpInterceptorProviders,
+    { provide: TitleStrategy, useClass: AppPageTitleStrategy },
+    // jhipster-needle-angular-add-module JHipster will add new module here
+  ],
+};

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

@@ -0,0 +1,85 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed 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
+
+      https://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 { NgModule } from '@angular/core';
+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';
+<%_ } _%>
+
+import { UserRouteAccessService } from 'app/core/auth/user-route-access.service';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: HomeComponent,
+    title: 'home.title',
+  },
+  {
+    path: '',
+    component: NavbarComponent,
+    outlet: 'navbar',
+  },
+<%_ if (!applicationTypeMicroservice) { _%>
+  {
+    path: 'admin',
+    data: {
+      authorities: [Authority.ADMIN],
+    },
+    canActivate: [UserRouteAccessService],
+    loadChildren: () => import('./admin/admin.routes'),
+  },
+<%_ } _%>
+<%_ if (generateUserManagement) { _%>
+  {
+    path: 'account',
+    loadChildren: () => import('./account/account.route'),
+  },
+<%_ } _%>
+<%_ if (!authenticationTypeOauth2) { _%>
+  {
+    path: 'login',
+    component: LoginComponent,
+    title: 'login.title',
+  },
+<%_ } _%>
+  {
+    path: '<%= applicationTypeMicroservice ? lowercaseBaseName : '' %>',
+    loadChildren: () => import(`./entities/entity.routes`),
+  },
+<%_ if (applicationTypeGateway && microfrontend) { _%>
+  <%_ for (const remote of microfrontends) { _%>
+  {
+    path: '<%= remote.lowercaseBaseName %>',
+    loadChildren: () => loadEntityRoutes('<%= remote.lowercaseBaseName %>'),
+  },
+  <%_ } _%>
+<%_ } _%>
+  ...errorRoute,
+];
+
+export default routes;

package/dist/generators/angular/templates/src/main/webapp/app/core/microfrontend/index.ts.ejs

@@ -16,6 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
+// eslint-disable @typescript-eslint/no-unsafe-return
 import { Type } from '@angular/core';
 import { loadRemoteModule } from '@angular-architects/module-federation-runtime';
 
@@ -35,9 +36,9 @@ export const loadTranslationModule = async (service: string): Promise<Type<any>>
     exposedModule: './translation-module',
   }).then(({ LazyTranslationModule }) => LazyTranslationModule);
 
-export const loadEntityModule = async (service: string): Promise<Type<any>> =>
-  loadRemoteModule<{ EntityRoutingModule: Type<any> }>({
+export const loadEntityRoutes = (service: string): Promise<Type<any>> =>
+  loadRemoteModule<Type<any>>({
     type: 'module',
     remoteEntry: `./services/${service}/remoteEntry.js`,
-    exposedModule: './entity-routing',
-  }).then(({ EntityRoutingModule }) => EntityRoutingModule);
+    exposedModule: './entity-routes',
+  });

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

@@ -296,7 +296,7 @@ describe('Alert service test', () => {
       }
     ));
 
-    it('should produce a info message with provided key if transltion key does not exist in translations and message is not provided', inject(
+    it('should produce a info message with provided key if translation key does not exist in translations and message is not provided', inject(
       [AlertService, TranslateService],
       (service: AlertService) => {
         expect(service.addAlert({ type: 'info', translationKey: 'hello.jhipster' })).toEqual(

package/dist/generators/angular/templates/src/main/webapp/app/core/util/data-util.service.ts.ejs

@@ -48,7 +48,7 @@ export class DataUtils {
    */
   openFile(data: string, contentType: string | null | undefined): void {
     contentType = contentType ?? '';
-    
+
     const byteCharacters = Buffer.from(data, 'base64').toString('binary');
     const byteNumbers = new Array(byteCharacters.length);
     for (let i = 0; i < byteCharacters.length; i++) {
@@ -73,7 +73,7 @@ export class DataUtils {
    * @param editForm the form group where the input field is located
    * @param field the field name to set the file's 'base 64 data' on
    * @param isImage boolean representing if the file represented by the event is an image
-   * @returns an observable that loads file to form field and completes if sussessful
+   * @returns an observable that loads file to form field and completes if successful
    *      or returns error as FileLoadError on failure
    */
   loadFileToForm(event: Event, editForm: FormGroup, field: string, isImage: boolean): Observable<void> {

package/dist/generators/angular/templates/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs

@@ -32,13 +32,13 @@ describe('Event Manager tests', () => {
   });
 
   describe('EventManager', () => {
-    let recievedEvent: EventWithContent<unknown> | string | null;
+    let receivedEvent: EventWithContent<unknown> | string | null;
 
     beforeEach(() => {
       TestBed.configureTestingModule({
         providers: [EventManager],
       });
-      recievedEvent = null;
+      receivedEvent = null;
     });
 
     it('should not fail when nosubscriber and broadcasting', inject([EventManager], (eventManager: EventManager) => {
@@ -50,53 +50,53 @@ describe('Event Manager tests', () => {
       [EventManager],
       (eventManager: EventManager) => {
         // GIVEN
-        eventManager.subscribe('modifier', (event: EventWithContent<unknown> | string) => (recievedEvent = event));
+        eventManager.subscribe('modifier', (event: EventWithContent<unknown> | string) => (receivedEvent = event));
 
         // WHEN
         eventManager.broadcast({ name: 'unrelatedModifier', content: 'unrelated modification' });
         // THEN
-        expect(recievedEvent).toBeNull();
+        expect(receivedEvent).toBeNull();
 
         // WHEN
         eventManager.broadcast({ name: 'modifier', content: 'modified something' });
         // THEN
-        expect(recievedEvent).toEqual({ name: 'modifier', content: 'modified something' });
+        expect(receivedEvent).toEqual({ name: 'modifier', content: 'modified something' });
       }
     ));
 
     it('should create an observable and callback when broadcasted string', inject([EventManager], (eventManager: EventManager) => {
       // GIVEN
-      eventManager.subscribe('modifier', (event: EventWithContent<unknown> | string) => (recievedEvent = event));
+      eventManager.subscribe('modifier', (event: EventWithContent<unknown> | string) => (receivedEvent = event));
 
       // WHEN
       eventManager.broadcast('unrelatedModifier');
       // THEN
-      expect(recievedEvent).toBeNull();
+      expect(receivedEvent).toBeNull();
 
       // WHEN
       eventManager.broadcast('modifier');
       // THEN
-      expect(recievedEvent).toEqual('modifier');
+      expect(receivedEvent).toEqual('modifier');
     }));
 
     it('should subscribe to multiple events', inject([EventManager], (eventManager: EventManager) => {
       // GIVEN
-      eventManager.subscribe(['modifier', 'modifier2'], (event: EventWithContent<unknown> | string) => (recievedEvent = event));
+      eventManager.subscribe(['modifier', 'modifier2'], (event: EventWithContent<unknown> | string) => (receivedEvent = event));
 
       // WHEN
       eventManager.broadcast('unrelatedModifier');
       // THEN
-      expect(recievedEvent).toBeNull();
+      expect(receivedEvent).toBeNull();
 
       // WHEN
       eventManager.broadcast({ name: 'modifier', content: 'modified something' });
       // THEN
-      expect(recievedEvent).toEqual({ name: 'modifier', content: 'modified something' });
+      expect(receivedEvent).toEqual({ name: 'modifier', content: 'modified something' });
 
       // WHEN
       eventManager.broadcast('modifier2');
       // THEN
-      expect(recievedEvent).toEqual('modifier2');
+      expect(receivedEvent).toEqual('modifier2');
     }));
   });
 });

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

@@ -22,7 +22,7 @@ const enumImports = this.generateEntityClientEnumImports(fields);
 <%_ if (anyFieldIsDateDerived) { _%>
 import dayjs from 'dayjs/esm';
 <%_ } _%>
-<%_ for (const relationshipsByType of Object.values(differentRelationships).filter(relationshipsByType => relationshipsByType.some(relationship => (relationship.ownerSide || relationship.relationshipManyToMany) && relationship.otherEntity.entityAngularName !== entityAngularName))) {
+<%_ for (const relationshipsByType of Object.values(differentRelationships).filter(relationshipsByType => relationshipsByType.some(relationship => relationship.otherEntity.entityAngularName !== entityAngularName))) {
       const { otherEntity } = relationshipsByType[0];
 _%>
 import { I<%- otherEntity.entityAngularName %> } from 'app/entities/<%= otherEntity.entityClientRootFolder %><%= otherEntity.entityFolderName %>/<%= otherEntity.entityFileName %>.model';
@@ -41,10 +41,10 @@ _%>
   <%= fieldName %>ContentType<% if (!id /* && !fieldValidationRequired */) { %>?<% } %>: string<% if (!id /* && !fieldValidationRequired */) { %> | null<% } %>,
   <%_ } _%>
 <%_ } _%>
-<%_ for (const relationship of relationships.filter(relationship => relationship.ownerSide || relationship.relationshipManyToMany)) {
-      const { propertyName, relationshipRequired, otherEntity, id, collection, otherEntityField } = relationship;
+<%_ for (const relationship of relationships) {
+      const { propertyName, relationshipRequired, otherEntity, collection, otherEntityField } = relationship;
 _%>
-  <%= propertyName %>?: Pick<I<%= otherEntity.entityAngularName %>, '<%= otherEntity.primaryKey.name %>'<% if (otherEntity.primaryKey.name !== otherEntityField) { %> | '<%= otherEntityField %>'<% } %>><% if (collection) { %>[]<% } %> | null;
+  <%= propertyName %>?: <% if (!otherEntity.embedded && (dtoMapstruct || otherEntity.builtInUser)) { %>Pick<<% } %>I<%= otherEntity.entityAngularName %><% if (!otherEntity.embedded && (dtoMapstruct || otherEntity.builtInUser)) { %>, '<%= otherEntity.primaryKey.name %>'<% if (otherEntity.primaryKey.name !== otherEntityField) { %> | '<%= otherEntityField %>'<% } %>><% } %><% if (collection) { %>[]<% } %> | null;
 <%_ } _%>
 }
 <%_ if (primaryKey) { _%>

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

@@ -16,7 +16,8 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<form *ngIf="<%= entityInstance %>" name="deleteForm" (ngSubmit)="confirmDelete(<%= entityInstance %>.<%= primaryKey.name %>!)">
+@if (<%= entityInstance %>) {
+<form name="deleteForm" (ngSubmit)="confirmDelete(<%= entityInstance %>.<%= primaryKey.name %>!)">
     <div class="modal-header">
         <h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading" <%= jhiPrefix %>Translate="entity.delete.title">__jhiTransformTranslate__('entity.delete.title')</h4>
 
@@ -39,3 +40,4 @@
         </button>
     </div>
 </form>
+}

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

@@ -18,7 +18,8 @@
 -%>
 <div class="d-flex justify-content-center">
   <div class="col-8">
-    <div *ngIf="<%= entityInstance %>">
+  @if (<%= entityInstance %>) {
+    <div>
       <h2 data-cy="<%= entityInstance %>DetailsHeading"><span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.detail.title">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.detail.title')</span></h2>
 
       <hr>
@@ -38,17 +39,21 @@ _%>
           <%# TODO: import enum and use its key as label _%>
           <span <%= jhiPrefix %>Translate="{{ '<%= frontendAppName %>.<%= fieldType %>.' + <%= entityInstance %>.<%= fieldName %> }}">{{ <%= entityInstance %>.<%= fieldName %> }}</span>
     <%_ } else if (field.fieldTypeBinary && field.blobContentTypeImage) { _%>
-          <div *ngIf="<%= entityInstance %>.<%= fieldName %>">
-          <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)">
-            <img [src]="'data:' + <%= entityInstance %>.<%= fieldName %>ContentType + ';base64,' + <%= entityInstance %>.<%= fieldName %>" style="max-width: 100%;" alt="<%= entityInstance %> image"/>
-          </a>
-          {{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}
+        @if (<%= entityInstance %>.<%= fieldName %>) {
+          <div>
+            <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)">
+              <img [src]="'data:' + <%= entityInstance %>.<%= fieldName %>ContentType + ';base64,' + <%= entityInstance %>.<%= fieldName %>" style="max-width: 100%;" alt="<%= entityInstance %> image"/>
+            </a>
+            {{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}
           </div>
+        }
     <%_ } else if (field.fieldTypeBinary && field.blobContentTypeAny) { _%>
-          <div *ngIf="<%= entityInstance %>.<%= fieldName %>">
-          <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)" <%= jhiPrefix %>Translate="entity.action.open">__jhiTransformTranslate__('entity.action.open')</a>
-          {{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}
+        @if (<%= entityInstance %>.<%= fieldName %>) {
+          <div>
+            <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)" <%= jhiPrefix %>Translate="entity.action.open">__jhiTransformTranslate__('entity.action.open')</a>
+            {{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}
           </div>
+        }
     <%_ } else if (field.fieldTypeDuration) { _%>
           <span>{{ <%= entityInstance %>.<%= fieldName %> | duration }} ({{<%= entityInstance %>.<%= fieldName %> }})</span>
     <%_ } else if (field.fieldTypeTimed) { _%>
@@ -62,34 +67,40 @@ _%>
 <%_ } _%>
 <%_
 for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) {
-    const ownerSide = relationship.ownerSide;
+    const { persistableRelationship } = relationship;
     const relationshipName = relationship.relationshipName;
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
     const relationshipNameHumanized = relationship.relationshipNameHumanized;
     const otherEntityStateName = relationship.otherEntityStateName;
     const otherEntityField = relationship.otherEntityField;
-    if (ownerSide) {
+    if (persistableRelationship) {
 _%>
         <dt><span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.<%= relationshipName %>">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.<%- relationshipName %>')</span></dt>
         <dd>
     <%_ if (relationship.otherEntityUser) { _%>
       <%_ if (relationship.collection) { _%>
-          <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
+        @for (<%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; track $index; let last = $last) {
+          <span>
             {{ <%= relationshipFieldName %>.<%= otherEntityField %> }}{{ last ? '' : ', ' }}
           </span>
+        }
       <%_ } else { _%>
           <span>{{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}</span>
       <%_ } _%>
     <%_ } else { _%>
       <%_ if (relationship.collection) { _%>
-          <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
+        @for (<%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; track $index; let last = $last) {
+          <span>
             <a [routerLink]="['/<%= otherEntityStateName %>', <%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= relationshipFieldName %>.<%= otherEntityField %> }}</a>{{ last ? '' : ', ' }}
           </span>
+        }
       <%_ } else { _%>
-          <div *ngIf="<%= entityInstance + '.' + relationshipFieldName %>">
+        @if (<%= entityInstance + '.' + relationshipFieldName %>) {
+          <div>
             <a [routerLink]="['/<%= otherEntityStateName %>', <%= entityInstance + '.' + relationshipFieldName + '.' + relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>.<%= otherEntityField %> }}</a>
           </div>
+        }
       <%_ } _%>
     <%_ } _%>
         </dd>
@@ -114,5 +125,6 @@ _%>
       </button>
 <%_ } _%>
     </div>
+    }
   </div>
 </div>

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

@@ -50,9 +50,11 @@
                     <fa-icon icon="search"></fa-icon>
                 </button>
 
-                <button class="btn btn-danger" (click)="search('')" *ngIf="currentSearch">
+            @if (currentSearch) {
+                <button class="btn btn-danger" (click)="search('')">
                     <fa-icon icon="trash-alt"></fa-icon>
                 </button>
+            }
             </div>
         </div>
     </form>
@@ -62,11 +64,14 @@
     <<%= jhiPrefixDashed %>-filter [filters]="filters"></<%= jhiPrefixDashed %>-filter>
 <%_ } _%>
 
-    <div class="alert alert-warning" id="no-result" *ngIf="<%= entityInstancePlural %>?.length === 0">
+@if (<%= entityInstancePlural %>?.length === 0) {
+    <div class="alert alert-warning" id="no-result">
         <span <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.home.notFound">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.home.notFound')</span>
     </div>
+}
 
-    <div class="table-responsive table-entities" id="entities" *ngIf="<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0">
+@if (<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0) {
+    <div class="table-responsive table-entities" id="entities">
         <table class="table table-striped" aria-describedby="page-heading">
             <thead>
                 <tr <%= jhiPrefix %>Sort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="navigateToWithComponentValues()">
@@ -75,15 +80,15 @@
                         <div class="d-flex">
                             <span <%= jhiPrefix %>Translate="<%= field.fieldTranslationKey %>">__jhiTransformTranslate__('<%- field.fieldTranslationKey %>')</span>
   <%_ if (!field.transient) { _%>
-                            <fa-icon class="p-1" <% if (searchEngineAny && !field.fieldTypeBoolean && !field.fieldTypeNumeric && !field.fieldTypeTemporal) { %>*ngIf="!currentSearch" <% } %>icon="sort"></fa-icon>
+                        <% if (searchEngineAny && !field.fieldTypeBoolean && !field.fieldTypeNumeric && !field.fieldTypeTemporal) { %>@if (!currentSearch) {<% } %>
+                            <fa-icon class="p-1" icon="sort"></fa-icon>
+                        <% if (searchEngineAny && !field.fieldTypeBoolean && !field.fieldTypeNumeric && !field.fieldTypeTemporal) { %>}<% } %>
   <%_ } _%>
                         </div>
                     </th>
 <%_ } _%>
 <%_ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) { _%>
-  <%_ if (relationship.relationshipManyToOne
-    || (relationship.relationshipOneToOne && relationship.ownerSide)
-    || (relationship.relationshipManyToMany && relationship.ownerSide && paginationNo)) {
+  <%_ if (relationship.persistableRelationship && (!relationship.collection || paginationNo)) {
     const fieldName = "." + relationship.otherEntityField;
   _%>
                     <th scope="col" <%= jhiPrefix %>SortBy="<%= relationship.relationshipName + (fieldName) %>">
@@ -98,7 +103,8 @@
                 </tr>
             </thead>
             <tbody<% if (paginationInfiniteScroll) { %> infinite-scroll (scrolled)="loadPage(page + 1)" [infiniteScrollDisabled]="page - 1 >= links['last']" [infiniteScrollDistance]="0"<% } %>>
-                <tr *ngFor="let <%= entityInstance %> of <%= entityInstancePlural %>; trackBy: track<%= primaryKey.nameCapitalized %>" data-cy="entityTable">
+            @for (<%= entityInstance %> of <%= entityInstancePlural %>; track track<%= primaryKey.nameCapitalized %>) {
+                <tr data-cy="entityTable">
 <%_
 const routerLink = ` [routerLink]="['/${ entityPage }', ${entityInstance}.${primaryKey.name}, 'view']"`;
 for (field of fields.filter(field => !field.hidden)) {
@@ -107,15 +113,19 @@ for (field of fields.filter(field => !field.hidden)) {
 _%>
     <%_ if (field.fieldTypeBinary && field.blobContentTypeImage) { _%>
                     <td>
-                        <a *ngIf="<%= entityInstance %>.<%= fieldName %>" (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)">
+                    @if (<%= entityInstance %>.<%= fieldName %>) {
+                        <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)">
                             <img [src]="'data:' + <%= entityInstance %>.<%= fieldName %>ContentType + ';base64,' + <%= entityInstance %>.<%= fieldName %>" style="max-height: 30px;" alt="<%= entityInstance %> image"/>
                         </a>
-                        <span *ngIf="<%= entityInstance %>.<%= fieldName %>">{{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}</span>
+                        <span>{{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}</span>
+                    }
                     </td>
     <%_ } else if (field.fieldTypeBinary && field.blobContentTypeAny) { _%>
                     <td>
-                        <a *ngIf="<%= entityInstance %>.<%= fieldName %>" (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)" <%= jhiPrefix %>Translate="entity.action.open">__jhiTransformTranslate__('entity.action.open')</a>
-                        <span *ngIf="<%= entityInstance %>.<%= fieldName %>">{{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}</span>
+                    @if (<%= entityInstance %>.<%= fieldName %>) {
+                        <a (click)="openFile(<%= entityInstance %>.<%= fieldName %>, <%= entityInstance %>.<%= fieldName %>ContentType)" <%= jhiPrefix %>Translate="entity.action.open">__jhiTransformTranslate__('entity.action.open')</a>
+                        <span>{{ <%= entityInstance %>.<%= fieldName %>ContentType }}, {{ byteSize(<%= entityInstance %>.<%= fieldName %>) }}</span>
+                    }
                     </td>
     <%_ } else if (field.fieldIsEnum) { _%>
                     <%# TODO: import enum and use its key as label _%>
@@ -131,33 +141,33 @@ _%>
     <%_ } _%>
 <%_ } _%>
 <%_ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) {
-    const ownerSide = relationship.ownerSide;
     const relationshipFieldName = relationship.relationshipFieldName;
     const relationshipFieldNamePlural = relationship.relationshipFieldNamePlural;
     const otherEntityField = relationship.otherEntityField;
 _%>
-    <%_ if (relationship.relationshipManyToOne
-            || (relationship.relationshipOneToOne && ownerSide)
-            || (relationship.relationshipManyToMany && ownerSide && paginationNo)) {
-    _%>
+    <%_ if (relationship.persistableRelationship && (!relationship.collection || paginationNo)) { _%>
                     <td>
         <%_ if (relationship.otherEntityUser) { _%>
             <%_ if (relationship.collection) { _%>
-                        <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
-                            {{ <%= relationshipFieldName %>.<%= otherEntityField %> }}{{ last ? '' : ', ' }}
-                        </span>
+                    @for (<%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; track $index; let last = $last) {
+                        <span>{{ <%= relationshipFieldName %>.<%= otherEntityField %> }}{{ last ? '' : ', ' }}</span>
+                    }
             <%_ } else { _%>
                         {{ <%= entityInstance %>.<%= relationshipFieldName %>?.<%= otherEntityField %> }}
             <%_ } _%>
         <%_ } else { _%>
             <%_ if (relationship.collection) { _%>
-                        <span *ngFor="let <%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; let last = last">
+                    @for (<%= relationshipFieldName %> of <%= entityInstance %>.<%= relationshipFieldNamePlural %>; track $index; let last = $last) {
+                        <span>
                             <a class="form-control-static" [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= relationshipFieldName %>.<%= otherEntityField %> }}</a>{{ last ? '' : ', ' }}
                         </span>
+                    }
             <%_ } else { _%>
-                        <div *ngIf="<%= entityInstance + "." + relationshipFieldName %>">
+                    @if (<%= entityInstance + "." + relationshipFieldName %>) {
+                        <div>
                             <a [routerLink]="['/<%= relationship.otherEntity.entityPage %>', <%= entityInstance %>.<%= relationshipFieldName %>.<%= relationship.otherEntity.primaryKey.name %>, 'view']">{{ <%= entityInstance %>.<%= relationshipFieldName %>.<%= otherEntityField %> }}</a>
                         </div>
+                    }
             <%_ } _%>
         <%_ } _%>
                     </td>
@@ -166,7 +176,7 @@ _%>
                     <td class="text-end">
                         <div class="btn-group">
 <%_ for (const relationship of relationships.filter(rel => !rel.otherEntityIsEmbedded)) { _%>
-    <%_ if (relationship.otherEntity.jpaMetamodelFiltering && relationship.otherEntity.paginationPagination && (relationship.relationshipOneToMany || relationship.relationshipManyToMany) && !relationship.ownerSide) {
+    <%_ if (relationship.otherEntity.jpaMetamodelFiltering && relationship.otherEntity.paginationPagination && relationship.collection && !relationship.persistableRelationship) {
         const otherEntityTranslationKey = i18nKeyPrefix + '.' + relationship.relationshipName;
     _%>
                             <button type="submit"
@@ -202,12 +212,14 @@ _%>
                         </div>
                     </td>
                 </tr>
+            }
             </tbody>
         </table>
     </div>
+}
 <%_ if (paginationPagination) { _%>
-
-    <div *ngIf="<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0">
+@if (<%= entityInstancePlural %> && <%= entityInstancePlural %>.length > 0) {
+    <div>
         <div class="d-flex justify-content-center">
             <<%= jhiPrefixDashed %>-item-count [params]="{ page: page, totalItems: totalItems, itemsPerPage: itemsPerPage }"></<%= jhiPrefixDashed %>-item-count>
         </div>
@@ -216,5 +228,6 @@ _%>
             <ngb-pagination [collectionSize]="totalItems" [page]="page" [pageSize]="itemsPerPage" [maxSize]="5" [rotate]="true" [boundaryLinks]="true" (pageChange)="navigateToPage($event)"></ngb-pagination>
         </div>
     </div>
+}
 <%_ } _%>
 </div>

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

@@ -299,7 +299,7 @@ export class <%= componentName %> implements OnInit {
 <%_ } _%>
     protected fillComponentAttributesFromResponseBody(data: I<%= entityAngularName %>[] | null): I<%= entityAngularName %>[] {
 <%_ if (paginationInfiniteScroll) { _%>
-      // If there is previus link, data is a infinite scroll pagination content.
+      // If there is previous link, data is a infinite scroll pagination content.
       if ('prev' in this.links) {
         const <%= entityInstancePlural %>New = this.<%= entityInstancePlural %> ?? [];
         if (data) {

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

@@ -40,7 +40,7 @@ describe('<%= entityAngularName %> Form Service', () => {
 <%_ for (const field of fields) { _%>
             <%= field.fieldName %>: expect.any(Object),
 <%_ } _%>
-<%_ for (const relationship of relationships.filter(relationship => relationship.ownerSide || relationship.relationshipManyToMany)) { _%>
+<%_ for (const relationship of relationships.filter(relationship => relationship.persistableRelationship)) { _%>
             <%= relationship.propertyName %>: expect.any(Object),
 <%_ } _%>
           })
@@ -54,7 +54,7 @@ describe('<%= entityAngularName %> Form Service', () => {
 <%_ for (const field of fields) { _%>
           <%= field.fieldName %>: expect.any(Object),
 <%_ } _%>
-<%_ for (const relationship of relationships.filter(relationship => relationship.ownerSide || relationship.relationshipManyToMany)) { _%>
+<%_ for (const relationship of relationships.filter(relationship => relationship.persistableRelationship)) { _%>
           <%= relationship.propertyName %>: expect.any(Object),
 <%_ } _%>
         }));