generator-jhipster 8.2.1 → 8.4.0

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

@@ -19,7 +19,7 @@
 @if (user) {
 <form name="deleteForm" (ngSubmit)="confirmDelete(user.login!)">
   <div class="modal-header">
-    <h4 class="modal-title" <%= jhiPrefix %>Translate="entity.delete.title">__jhiTransformTranslate__('entity.delete.title')</h4>
+    <h4 class="modal-title">__jhiTranslateTag__('entity.delete.title')</h4>
 
     <span class="btn btn-close" data-dismiss="modal" aria-hidden="true" (click)="cancel()"></span>
   </div>
@@ -27,16 +27,16 @@
   <div class="modal-body">
     <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
-    <p <%= jhiPrefix %>Translate="userManagement.delete.question" [translateValues]="{ login: user.login }">__jhiTransformTranslate__('userManagement.delete.question', { "login": "{{ user.login }}" })</p>
+    <p>__jhiTranslateTag__('userManagement.delete.question', { "login": "user.login" })</p>
   </div>
 
   <div class="modal-footer">
     <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
-      <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel">__jhiTransformTranslate__('entity.action.cancel')</span>
+      <fa-icon icon="ban"></fa-icon>&nbsp;<span>__jhiTranslateTag__('entity.action.cancel')</span>
     </button>
 
     <button type="submit" class="btn btn-danger">
-      <fa-icon icon="times"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.delete">__jhiTransformTranslate__('entity.action.delete')</span>
+      <fa-icon icon="times"></fa-icon>&nbsp;<span>__jhiTranslateTag__('entity.action.delete')</span>
     </button>
   </div>
 </form>

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

@@ -18,53 +18,53 @@
 -%>
 <div class="d-flex justify-content-center">
   <div class="col-8">
-  @if (user) {
+  @if (user()) {
     <div>
       <h2>
-        <span <%= jhiPrefix %>Translate="userManagement.detail.title">__jhiTransformTranslate__('userManagement.detail.title')</span> [<strong>{{ user.login }}</strong>]
+        <span>__jhiTranslateTag__('userManagement.detail.title')</span> [<strong>{{ user()!.login }}</strong>]
       </h2>
 
       <dl class="row-md jh-entity-details">
-        <dt><span <%= jhiPrefix %>Translate="userManagement.login">__jhiTransformTranslate__('userManagement.login')</span></dt>
+        <dt><span>__jhiTranslateTag__('userManagement.login')</span></dt>
         <dd>
-          <span>{{ user.login }}</span>
-        @if (user.activated) {
-          <span class="badge bg-success" <%= jhiPrefix %>Translate="userManagement.activated">__jhiTransformTranslate__('userManagement.activated')</span>
+          <span>{{ user()!.login }}</span>
+        @if (user()!.activated) {
+          <span class="badge bg-success">__jhiTranslateTag__('userManagement.activated')</span>
         } @else {
-          <span class="badge bg-danger" <%= jhiPrefix %>Translate="userManagement.deactivated">__jhiTransformTranslate__('userManagement.deactivated')</span>
+          <span class="badge bg-danger">__jhiTranslateTag__('userManagement.deactivated')</span>
         }
         </dd>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.firstName">__jhiTransformTranslate__('userManagement.firstName')</span></dt>
-        <dd>{{ user.firstName }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.firstName')</span></dt>
+        <dd>{{ user()!.firstName }}</dd>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.lastName">__jhiTransformTranslate__('userManagement.lastName')</span></dt>
-        <dd>{{ user.lastName }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.lastName')</span></dt>
+        <dd>{{ user()!.lastName }}</dd>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.email">__jhiTransformTranslate__('userManagement.email')</span></dt>
-        <dd>{{ user.email }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.email')</span></dt>
+        <dd>{{ user()!.email }}</dd>
 <%_ if (enableTranslation) { _%>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.langKey">__jhiTransformTranslate__('userManagement.langKey')</span></dt>
-        <dd>{{ user.langKey }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.langKey')</span></dt>
+        <dd>{{ user()!.langKey }}</dd>
 <%_ } _%>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.createdBy">__jhiTransformTranslate__('userManagement.createdBy')</span></dt>
-        <dd>{{ user.createdBy }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.createdBy')</span></dt>
+        <dd>{{ user()!.createdBy }}</dd>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.createdDate">__jhiTransformTranslate__('userManagement.createdDate')</span></dt>
-        <dd>{{ user.createdDate | date: 'dd/MM/yy HH:mm' }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.createdDate')</span></dt>
+        <dd>{{ user()!.createdDate | date: 'dd/MM/yy HH:mm' }}</dd>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.lastModifiedBy">__jhiTransformTranslate__('userManagement.lastModifiedBy')</span></dt>
-        <dd>{{ user.lastModifiedBy }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.lastModifiedBy')</span></dt>
+        <dd>{{ user()!.lastModifiedBy }}</dd>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.lastModifiedDate">__jhiTransformTranslate__('userManagement.lastModifiedDate')</span></dt>
-        <dd>{{ user.lastModifiedDate | date: 'dd/MM/yy HH:mm' }}</dd>
+        <dt><span>__jhiTranslateTag__('userManagement.lastModifiedDate')</span></dt>
+        <dd>{{ user()!.lastModifiedDate | date: 'dd/MM/yy HH:mm' }}</dd>
 
-        <dt><span <%= jhiPrefix %>Translate="userManagement.profiles">__jhiTransformTranslate__('userManagement.profiles')</span></dt>
+        <dt><span>__jhiTranslateTag__('userManagement.profiles')</span></dt>
         <dd>
           <ul class="list-unstyled">
-          @for (authority of user.authorities; track $index) {
+          @for (authority of user()!.authorities; track $index) {
             <li>
               <span class="badge bg-info">{{ authority }}</span>
             </li>
@@ -74,7 +74,7 @@
       </dl>
 
       <button type="submit" routerLink="../../" class="btn btn-info">
-        <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.back">__jhiTransformTranslate__('entity.action.back')</span>
+        <fa-icon icon="arrow-left"></fa-icon>&nbsp;<span>__jhiTranslateTag__('entity.action.back')</span>
       </button>
     </div>
   }

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

@@ -21,7 +21,7 @@ const tsKeyId = this.generateTestEntityId(user.primaryKey.type);
 _%>
 import { TestBed } from '@angular/core/testing';
 import { provideRouter, withComponentInputBinding } from '@angular/router';
-import { RouterTestingHarness, RouterTestingModule } from '@angular/router/testing';
+import { RouterTestingHarness } from '@angular/router/testing';
 import { of } from 'rxjs';
 
 import { Authority } from 'app/config/authority.constants';
@@ -32,7 +32,7 @@ import UserManagementDetailComponent from './user-management-detail.component';
 describe('User Management Detail Component', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [UserManagementDetailComponent, RouterTestingModule.withRoutes([], { bindToComponentInputs: true })],
+      imports: [UserManagementDetailComponent],
       providers: [
         provideRouter(
           [
@@ -69,7 +69,7 @@ describe('User Management Detail Component', () => {
       const instance = await harness.navigateByUrl('/', UserManagementDetailComponent);
 
       // THEN
-      expect(instance.user).toEqual(
+      expect(instance.user()).toEqual(
         expect.objectContaining({
           id: <%- tsKeyId %>,
           login: 'user',

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

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { Component, Input } from '@angular/core';
+import { Component, input } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import SharedModule from 'app/shared/shared.module';
 
@@ -29,5 +29,5 @@ import { User } from '../user-management.model';
   imports: [RouterModule, SharedModule],
 })
 export default class UserManagementDetailComponent {
-  @Input() user: User | null = null;
+  user = input<User | null>(null);
 }

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

@@ -18,15 +18,15 @@
 -%>
 <div>
   <h2>
-    <span id="user-management-page-heading" <%= jhiPrefix %>Translate="userManagement.home.title" data-cy="userManagementPageHeading">__jhiTransformTranslate__('userManagement.home.title')</span>
+    <span id="user-management-page-heading" data-cy="userManagementPageHeading">__jhiTranslateTag__('userManagement.home.title')</span>
 
     <div class="d-flex justify-content-end">
       <button class="btn btn-info me-2" (click)="loadAll()" [disabled]="isLoading()">
         <fa-icon icon="sync" [spin]="isLoading()"></fa-icon>
-        <span <%= jhiPrefix %>Translate="userManagement.home.refreshListLabel">__jhiTransformTranslate__('userManagement.home.refreshListLabel')</span>
+        <span>__jhiTranslateTag__('userManagement.home.refreshListLabel')</span>
       </button>
       <button class="btn btn-primary jh-create-entity" [routerLink]="['./new']">
-        <fa-icon icon="plus"></fa-icon> <span <%= jhiPrefix %>Translate="userManagement.home.createLabel">__jhiTransformTranslate__('userManagement.home.createLabel')</span>
+        <fa-icon icon="plus"></fa-icon> <span>__jhiTranslateTag__('userManagement.home.createLabel')</span>
       </button>
     </div>
   </h2>
@@ -41,30 +41,30 @@
       <thead>
         <tr<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="transition($event)"<% } %>>
           <th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="id"<% } %>>
-            <span <%= jhiPrefix %>Translate="global.field.id">__jhiTransformTranslate__('global.field.id')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
+            <span>__jhiTranslateTag__('global.field.id')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
           </th>
           <th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="login"<% } %>>
-            <span <%= jhiPrefix %>Translate="userManagement.login">__jhiTransformTranslate__('userManagement.login')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
+            <span>__jhiTranslateTag__('userManagement.login')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
           </th>
           <th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="email"<% } %>>
-            <span <%= jhiPrefix %>Translate="userManagement.email">__jhiTransformTranslate__('userManagement.email')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
+            <span>__jhiTranslateTag__('userManagement.email')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
           </th>
           <th scope="col"></th>
 <%_ if (enableTranslation) { _%>
           <th scope="col"<% if (!databaseTypeCassandra) { %> <%= jhiPrefix %>SortBy="langKey"<% } %>>
-            <span <%= jhiPrefix %>Translate="userManagement.langKey">__jhiTransformTranslate__('userManagement.langKey')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
+            <span>__jhiTranslateTag__('userManagement.langKey')</span><% if (databaseType !== 'cassandra') { %> <fa-icon icon="sort"></fa-icon><% } %>
           </th>
 <%_ } _%>
-          <th scope="col"><span <%= jhiPrefix %>Translate="userManagement.profiles">__jhiTransformTranslate__('userManagement.profiles')</span></th>
+          <th scope="col"><span>__jhiTranslateTag__('userManagement.profiles')</span></th>
 <%_ if (!databaseTypeCassandra) { _%>
           <th scope="col" <%= jhiPrefix %>SortBy="createdDate">
-            <span <%= jhiPrefix %>Translate="userManagement.createdDate">__jhiTransformTranslate__('userManagement.createdDate')</span> <fa-icon icon="sort"></fa-icon>
+            <span>__jhiTranslateTag__('userManagement.createdDate')</span> <fa-icon icon="sort"></fa-icon>
           </th>
           <th scope="col" <%= jhiPrefix %>SortBy="lastModifiedBy">
-            <span <%= jhiPrefix %>Translate="userManagement.lastModifiedBy">__jhiTransformTranslate__('userManagement.lastModifiedBy')</span> <fa-icon icon="sort"></fa-icon>
+            <span>__jhiTranslateTag__('userManagement.lastModifiedBy')</span> <fa-icon icon="sort"></fa-icon>
           </th>
           <th scope="col" <%= jhiPrefix %>SortBy="lastModifiedDate">
-            <span <%= jhiPrefix %>Translate="userManagement.lastModifiedDate">__jhiTransformTranslate__('userManagement.lastModifiedDate')</span> <fa-icon icon="sort"></fa-icon>
+            <span>__jhiTranslateTag__('userManagement.lastModifiedDate')</span> <fa-icon icon="sort"></fa-icon>
           </th>
 <%_ } _%>
           <th scope="col"></th>
@@ -82,14 +82,12 @@
           @if (!user.activated) {
             <button class="btn btn-danger btn-sm"
               (click)="setActive(user, true)"
-              <%= jhiPrefix %>Translate="userManagement.deactivated"
-            >__jhiTransformTranslate__('userManagement.deactivated')</button>
+            >__jhiTranslateTag__('userManagement.deactivated')</button>
           } @else {
             <button class="btn btn-success btn-sm"
               (click)="setActive(user, false)"
               [disabled]="!currentAccount() || currentAccount()?.login === user.login"
-              <%= jhiPrefix %>Translate="userManagement.activated"
-            >__jhiTransformTranslate__('userManagement.activated')</button>
+            >__jhiTranslateTag__('userManagement.activated')</button>
           }
           </td>
 <%_ if (enableTranslation) { _%>
@@ -111,12 +109,12 @@
             <div class="btn-group">
               <button type="submit" [routerLink]="['./', user.login, 'view']" class="btn btn-info btn-sm">
                 <fa-icon icon="eye"></fa-icon>
-                <span class="d-none d-md-inline" <%= jhiPrefix %>Translate="entity.action.view">__jhiTransformTranslate__('entity.action.view')</span>
+                <span class="d-none d-md-inline">__jhiTranslateTag__('entity.action.view')</span>
               </button>
 
               <button type="submit" [routerLink]="['./', user.login, 'edit']" queryParamsHandling="merge" class="btn btn-primary btn-sm">
                 <fa-icon icon="pencil-alt"></fa-icon>
-                <span class="d-none d-md-inline" <%= jhiPrefix %>Translate="entity.action.edit">__jhiTransformTranslate__('entity.action.edit')</span>
+                <span class="d-none d-md-inline">__jhiTranslateTag__('entity.action.edit')</span>
               </button>
 
               <button
@@ -126,7 +124,7 @@
                 [disabled]="!currentAccount() || currentAccount()?.login === user.login"
               >
                 <fa-icon icon="times"></fa-icon>
-                <span class="d-none d-md-inline" <%= jhiPrefix %>Translate="entity.action.delete">__jhiTransformTranslate__('entity.action.delete')</span>
+                <span class="d-none d-md-inline">__jhiTranslateTag__('entity.action.delete')</span>
               </button>
             </div>
           </td>

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

@@ -25,7 +25,6 @@ import { ComponentFixture, TestBed, waitForAsync, inject, fakeAsync, tick } from
 import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ActivatedRoute } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
 import { UserManagementService } from '../service/user-management.service';
@@ -53,7 +52,7 @@ describe('User Management Component', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, RouterTestingModule.withRoutes([]), UserManagementComponent],
+        imports: [HttpClientTestingModule, UserManagementComponent],
         providers: [{ provide: ActivatedRoute, useValue: { data, queryParamMap } }, AccountService],
       })
         .overrideTemplate(UserManagementComponent, '')

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

@@ -18,106 +18,92 @@
 -%>
 <div class="d-flex justify-content-center">
   <div class="col-8">
-    <form name="editForm" role="form" novalidate (ngSubmit)="save()" [formGroup]="editForm">
-      <h2 id="myUserLabel" <%= jhiPrefix %>Translate="userManagement.home.createOrEditLabel">__jhiTransformTranslate__('userManagement.home.createOrEditLabel')</h2>
+    <form name="editForm" novalidate (ngSubmit)="save()" [formGroup]="editForm">
+      <h2 id="myUserLabel">__jhiTranslateTag__('userManagement.home.createOrEditLabel')</h2>
 
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
 
       <div class="mb-3" [hidden]="!editForm.value.id">
-        <label class="form-label" for="field_id" <%= jhiPrefix %>Translate="global.field.id">__jhiTransformTranslate__('global.field.id')</label>
+        <label class="form-label" for="field_id">__jhiTranslateTag__('global.field.id')</label>
         <input type="text" id="field_id" class="form-control" name="id" formControlName="id" readonly />
       </div>
 
       <div class="mb-3">
-        <label class="form-label" for="field_login" <%= jhiPrefix %>Translate="userManagement.login">__jhiTransformTranslate__('userManagement.login')</label>
+        <label class="form-label" for="field_login">__jhiTranslateTag__('userManagement.login')</label>
         <input type="text" id="field_login" class="form-control" name="login" formControlName="login" />
 
       @if (editForm.get('login')!.invalid && (editForm.get('login')!.dirty || editForm.get('login')!.touched)) {
         <div>
         @if (editForm.get('login')?.errors?.required) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.required"
-          >__jhiTransformTranslate__('entity.validation.required')</small>
+          >__jhiTranslateTag__('entity.validation.required')</small>
         }
 
         @if (editForm.get('login')?.errors?.maxlength) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.maxlength"
-            [translateValues]="{ max: 50 }"
-          >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
+          >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
         }
 
         @if (editForm.get('login')?.errors?.pattern) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.patternLogin"
-          >__jhiTransformTranslate__('entity.validation.patternLogin')</small>
+          >__jhiTranslateTag__('entity.validation.patternLogin')</small>
         }
         </div>
       }
       </div>
 
       <div class="mb-3">
-        <label class="form-label" for="field_firstName" <%= jhiPrefix %>Translate="userManagement.firstName">__jhiTransformTranslate__('userManagement.firstName')</label>
+        <label class="form-label" for="field_firstName">__jhiTranslateTag__('userManagement.firstName')</label>
         <input type="text" id="field_firstName" class="form-control" name="firstName" formControlName="firstName" />
 
       @if (editForm.get('firstName')!.invalid && (editForm.get('firstName')!.dirty || editForm.get('firstName')!.touched)) {
         <div>
         @if (editForm.get('firstName')?.errors?.maxlength) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.maxlength"
-            [translateValues]="{ max: 50 }"
-          >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
+          >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
         }
         </div>
       }
       </div>
 
       <div class="mb-3">
-        <label class="form-label" for="field_lastName" <%= jhiPrefix %>Translate="userManagement.lastName">__jhiTransformTranslate__('userManagement.lastName')</label>
+        <label class="form-label" for="field_lastName">__jhiTranslateTag__('userManagement.lastName')</label>
         <input type="text" id="field_lastName" class="form-control" name="lastName" formControlName="lastName" />
 
       @if (editForm.get('lastName')!.invalid && (editForm.get('lastName')!.dirty || editForm.get('lastName')!.touched)) {
         <div>
         @if (editForm.get('lastName')?.errors?.maxlength) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.maxlength"
-            [translateValues]="{ max: 50 }"
-          >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 50 })</small>
+          >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 50 })</small>
         }
         </div>
       }
       </div>
 
       <div class="mb-3">
-        <label class="form-label" for="field_email" <%= jhiPrefix %>Translate="userManagement.email">__jhiTransformTranslate__('userManagement.email')</label>
+        <label class="form-label" for="field_email">__jhiTranslateTag__('userManagement.email')</label>
         <input type="email" id="field_email" class="form-control" name="email" formControlName="email" />
 
       @if (editForm.get('email')!.invalid && (editForm.get('email')!.dirty || editForm.get('email')!.touched)) {
         <div>
         @if (editForm.get('email')?.errors?.required) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.required"
-          >__jhiTransformTranslate__('entity.validation.required')</small>
+          >__jhiTranslateTag__('entity.validation.required')</small>
         }
 
         @if (editForm.get('email')?.errors?.maxlength) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.maxlength"
-            [translateValues]="{ max: 100 }"
-          >__jhiTransformTranslate__('entity.validation.maxlength', { "max": 100 })</small>
+          >__jhiTranslateValidationTag__('entity.validation.maxlength', { "max": 100 })</small>
         }
 
         @if (editForm.get('email')?.errors?.minlength) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="entity.validation.minlength"
-            [translateValues]="{ min: 5 }"
-          >__jhiTransformTranslate__('entity.validation.minlength', { "min": 5 })</small>
+          >__jhiTranslateValidationTag__('entity.validation.minlength', { "min": 5 })</small>
         }
 
         @if (editForm.get('email')?.errors?.email) {
           <small class="form-text text-danger"
-            <%= jhiPrefix %>Translate="global.messages.validate.email.invalid"
-          >__jhiTransformTranslate__('global.messages.validate.email.invalid')</small>
+          >__jhiTranslateTag__('global.messages.validate.email.invalid')</small>
         }
         </div>
       }
@@ -133,14 +119,14 @@
             name="activated"
             formControlName="activated"
           />
-          <span <%= jhiPrefix %>Translate="userManagement.activated">__jhiTransformTranslate__('userManagement.activated')</span>
+          <span>__jhiTranslateTag__('userManagement.activated')</span>
         </label>
       </div>
 <%_ if (enableTranslation) { _%>
 
     @if (languages && languages.length > 0) {
       <div class="mb-3">
-        <label class="form-label" for="langKey" <%= jhiPrefix %>Translate="userManagement.langKey">__jhiTransformTranslate__('userManagement.langKey')</label>
+        <label class="form-label" for="langKey">__jhiTranslateTag__('userManagement.langKey')</label>
         <select class="form-control" id="langKey" name="langKey" formControlName="langKey">
         @for (language of languages; track $index) {
           <option [value]="language">{{ language | findLanguageFromKey }}</option>
@@ -151,7 +137,7 @@
 <%_ } _%>
 
       <div class="mb-3">
-        <label class="form-label" for="field_authority" <%= jhiPrefix %>Translate="userManagement.profiles">__jhiTransformTranslate__('userManagement.profiles')</label>
+        <label class="form-label" for="field_authority">__jhiTranslateTag__('userManagement.profiles')</label>
         <select class="form-control" id="field_authority" multiple name="authority" formControlName="authorities">
         @for (authority of authorities(); track $index) {
           <option [value]="authority">{{ authority }}</option>
@@ -159,11 +145,11 @@
         </select>
       </div>
       <button type="button" class="btn btn-secondary" (click)="previousState()">
-        <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel">__jhiTransformTranslate__('entity.action.cancel')</span>
+        <fa-icon icon="ban"></fa-icon>&nbsp;<span>__jhiTranslateTag__('entity.action.cancel')</span>
       </button>
 
       <button type="submit" [disabled]="editForm.invalid || isSaving()" class="btn btn-primary">
-        <fa-icon icon="save"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.save">__jhiTransformTranslate__('entity.action.save')</span>
+        <fa-icon icon="save"></fa-icon>&nbsp;<span>__jhiTranslateTag__('entity.action.save')</span>
       </button>
     </form>
   </div>

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

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

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

@@ -19,7 +19,6 @@
 jest.mock('app/core/auth/state-storage.service');
 
 import { Router } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 <%_ if (enableTranslation) { _%>
@@ -65,7 +64,6 @@ describe('Account Service', () => {
     TestBed.configureTestingModule({
       imports: [
         HttpClientTestingModule,
-        RouterTestingModule.withRoutes([]),
 <%_ if (enableTranslation) { _%>
         TranslateModule.forRoot(),
 <%_ } _%>

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

@@ -95,6 +95,13 @@ export class TrackerService {
     );
   }
 
+  sendActivity(): void {
+    this.stomp.publish({
+      destination: DESTINATION_ACTIVITY,
+      body: JSON.stringify({ page: this.router.routerState.snapshot.url }),
+    });
+  }
+
   private connect(): void {
     this.updateCredentials();
     return this.stomp.activate();
@@ -131,11 +138,4 @@ export class TrackerService {
 <%_ } _%>
     });
   }
-
-  private sendActivity(): void {
-    this.stomp.publish({
-      destination: DESTINATION_ACTIVITY,
-      body: JSON.stringify({ page: this.router.routerState.snapshot.url }),
-    });
-  }
 }

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

@@ -19,7 +19,7 @@
 @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>
+        <h4 class="modal-title" data-cy="<%= entityInstance %>DeleteDialogHeading">__jhiTranslateTag__('entity.delete.title')</h4>
 
         <span class="btn btn-close" data-dismiss="modal" aria-hidden="true"
                 (click)="cancel()"></span>
@@ -27,16 +27,16 @@
 
     <div class="modal-body">
         <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
-        <p id="<%= jhiPrefixDashed %>-delete-<%= entityInstance %>-heading" <%= jhiPrefix %>Translate="<%= i18nKeyPrefix %>.delete.question" [translateValues]="{ id: <%= entityInstance %>.<%= primaryKey.name %> }">__jhiTransformTranslate__('<%- i18nKeyPrefix %>.delete.question', { "id": "{{ <%- entityInstance%>.<%- primaryKey.name%> }}" })</p>
+        <p id="<%= jhiPrefixDashed %>-delete-<%= entityInstance %>-heading">__jhiTranslateTag__('<%- i18nKeyPrefix %>.delete.question', { "id": "<%- entityInstance%>.<%- primaryKey.name%>" })</p>
     </div>
 
     <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-dismiss="modal" (click)="cancel()">
-            <fa-icon icon="ban"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.cancel">__jhiTransformTranslate__('entity.action.cancel')</span>
+            <fa-icon icon="ban"></fa-icon>&nbsp;<span>__jhiTranslateTag__('entity.action.cancel')</span>
         </button>
 
         <button id="<%= jhiPrefixDashed %>-confirm-delete-<%= entityInstance %>" data-cy="entityConfirmDeleteButton" type="submit" class="btn btn-danger">
-            <fa-icon icon="times"></fa-icon>&nbsp;<span <%= jhiPrefix %>Translate="entity.action.delete">__jhiTransformTranslate__('entity.action.delete')</span>
+            <fa-icon icon="times"></fa-icon>&nbsp;<span>__jhiTranslateTag__('entity.action.delete')</span>
         </button>
     </div>
 </form>