generator-jhipster 8.2.1 → 8.3.0

package/dist/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.html.ejs

@@ -18,24 +18,24 @@
 -%>
 <div>
 @if (account) {
-  <h2 id="session-page-heading" <%= jhiPrefix %>Translate="sessions.title" [translateValues]="{ username: account.login }">__jhiTransformTranslate__('sessions.title', { "username": "{{ account.login }}" })</h2>
+  <h2 id="session-page-heading">__jhiTranslateTag__('sessions.title', { "username": "account.login" })</h2>
 }
 
 @if (success) {
-  <div class="alert alert-success" <%= jhiPrefix %>Translate="sessions.messages.success">__jhiTransformTranslate__('sessions.messages.success')</div>
+  <div class="alert alert-success">__jhiTranslateTag__('sessions.messages.success')</div>
 }
 
 @if (error) {
-  <div class="alert alert-danger" <%= jhiPrefix %>Translate="sessions.messages.error">__jhiTransformTranslate__('sessions.messages.error')</div>
+  <div class="alert alert-danger">__jhiTranslateTag__('sessions.messages.error')</div>
 }
 
   <div class="table-responsive">
     <table class="table table-striped" aria-describedby="session-page-heading">
       <thead>
         <tr>
-          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.ipaddress">__jhiTransformTranslate__('sessions.table.ipaddress')</th>
-          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.useragent">__jhiTransformTranslate__('sessions.table.useragent')</th>
-          <th scope="col" <%= jhiPrefix %>Translate="sessions.table.date">__jhiTransformTranslate__('sessions.table.date')</th>
+          <th scope="col">__jhiTranslateTag__('sessions.table.ipaddress')</th>
+          <th scope="col">__jhiTranslateTag__('sessions.table.useragent')</th>
+          <th scope="col">__jhiTranslateTag__('sessions.table.date')</th>
           <th scope="col"></th>
         </tr>
       </thead>
@@ -50,8 +50,7 @@
               type="submit"
               class="btn btn-primary"
               (click)="invalidate(session.series)"
-              <%= jhiPrefix %>Translate="sessions.table.button"
-            >__jhiTransformTranslate__('sessions.table.button')</button>
+            >__jhiTranslateTag__('sessions.table.button')</button>
           </td>
         </tr>
       }

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

@@ -25,8 +25,8 @@ import { SessionsService } from './sessions.service';
 import { Account } from 'app/core/auth/account.model';
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-sessions',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-sessions',
   imports: [SharedModule],
   templateUrl: './sessions.component.html',
 })

package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs

@@ -20,11 +20,11 @@
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
     @if (settingsForm.value.login) {
-      <h2 <%= jhiPrefix %>Translate="settings.title" [translateValues]="{ username: settingsForm.value.login }">__jhiTransformTranslate__('settings.title', { "username": "{{ settingsForm.value.login }}" })</h2>
+      <h2>__jhiTranslateTag__('settings.title', { "username": "settingsForm.value.login" })</h2>
     }
 
     @if (success()) {
-      <div class="alert alert-success" <%= jhiPrefix %>Translate="settings.messages.success">__jhiTransformTranslate__('settings.messages.success')</div>
+      <div class="alert alert-success">__jhiTranslateTag__('settings.messages.success')</div>
     }
 
       <<%= jhiPrefixDashed %>-alert-error></<%= jhiPrefixDashed %>-alert-error>
@@ -32,13 +32,13 @@
     @if (settingsForm.value.login) {
       <form name="form" role="form" (ngSubmit)="save()" [formGroup]="settingsForm" novalidate>
         <div class="mb-3">
-          <label class="form-label" for="firstName" <%= jhiPrefix %>Translate="settings.form.firstname">__jhiTransformTranslate__('settings.form.firstname')</label>
+          <label class="form-label" for="firstName">__jhiTranslateTag__('settings.form.firstname')</label>
           <input
             type="text"
             class="form-control"
             id="firstName"
             name="firstName"
-            placeholder="{{ 'settings.form.firstname.placeholder' | translate }}"
+            placeholder="__jhiTranslatePipe__('settings.form.firstname.placeholder')"
             formControlName="firstName"
             data-cy="firstname"
           />
@@ -47,33 +47,30 @@
           <div>
           @if (settingsForm.get('firstName')?.errors?.required) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="settings.messages.validate.firstname.required"
-            >__jhiTransformTranslate__('settings.messages.validate.firstname.required')</small>
+            >__jhiTranslateTag__('settings.messages.validate.firstname.required')</small>
           }
 
           @if (settingsForm.get('firstName')?.errors?.minlength) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="settings.messages.validate.firstname.minlength"
-            >__jhiTransformTranslate__('settings.messages.validate.firstname.minlength')</small>
+            >__jhiTranslateTag__('settings.messages.validate.firstname.minlength')</small>
           }
 
           @if (settingsForm.get('firstName')?.errors?.maxlength) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="settings.messages.validate.firstname.maxlength"
-            >__jhiTransformTranslate__('settings.messages.validate.firstname.maxlength')</small>
+            >__jhiTranslateTag__('settings.messages.validate.firstname.maxlength')</small>
           }
           </div>
         }
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="lastName" <%= jhiPrefix %>Translate="settings.form.lastname">__jhiTransformTranslate__('settings.form.lastname')</label>
+          <label class="form-label" for="lastName">__jhiTranslateTag__('settings.form.lastname')</label>
           <input
             type="text"
             class="form-control"
             id="lastName"
             name="lastName"
-            placeholder="{{ 'settings.form.lastname.placeholder' | translate }}"
+            placeholder="__jhiTranslatePipe__('settings.form.lastname.placeholder')"
             formControlName="lastName"
             data-cy="lastname"
           />
@@ -82,33 +79,30 @@
           <div>
           @if (settingsForm.get('lastName')?.errors?.required) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="settings.messages.validate.lastname.required"
-            >__jhiTransformTranslate__('settings.messages.validate.lastname.required')</small>
+            >__jhiTranslateTag__('settings.messages.validate.lastname.required')</small>
           }
 
           @if (settingsForm.get('lastName')?.errors?.minlength) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="settings.messages.validate.lastname.minlength"
-            >__jhiTransformTranslate__('settings.messages.validate.lastname.minlength')</small>
+            >__jhiTranslateTag__('settings.messages.validate.lastname.minlength')</small>
           }
 
           @if (settingsForm.get('lastName')?.errors?.maxlength) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="settings.messages.validate.lastname.maxlength"
-            >__jhiTransformTranslate__('settings.messages.validate.lastname.maxlength')</small>
+            >__jhiTranslateTag__('settings.messages.validate.lastname.maxlength')</small>
           }
           </div>
         }
         </div>
 
         <div class="mb-3">
-          <label class="form-label" for="email" <%= jhiPrefix %>Translate="global.form.email.label">__jhiTransformTranslate__('global.form["email.label"]')</label>
+          <label class="form-label" for="email">__jhiTranslateTag__('global.form.email.label')</label>
           <input
             type="email"
             class="form-control"
             id="email"
             name="email"
-            placeholder="{{ 'global.form.email.placeholder' | translate }}"
+            placeholder="__jhiTranslatePipe__('global.form.email.placeholder')"
             formControlName="email"
             data-cy="email"
           />
@@ -117,26 +111,22 @@
           <div>
           @if (settingsForm.get('email')?.errors?.required) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="global.messages.validate.email.required"
-            >__jhiTransformTranslate__('global.messages.validate.email.required')</small>
+            >__jhiTranslateTag__('global.messages.validate.email.required')</small>
           }
 
           @if (settingsForm.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>
           }
 
           @if (settingsForm.get('email')?.errors?.minlength) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="global.messages.validate.email.minlength"
-            >__jhiTransformTranslate__('global.messages.validate.email.minlength')</small>
+            >__jhiTranslateTag__('global.messages.validate.email.minlength')</small>
           }
 
           @if (settingsForm.get('email')?.errors?.maxlength) {
             <small class="form-text text-danger"
-              <%= jhiPrefix %>Translate="global.messages.validate.email.maxlength"
-            >__jhiTransformTranslate__('global.messages.validate.email.maxlength')</small>
+            >__jhiTranslateTag__('global.messages.validate.email.maxlength')</small>
           }
           </div>
         }
@@ -145,7 +135,7 @@
 
       @if (languages && languages.length > 0) {
         <div class="mb-3">
-          <label for="langKey" <%= jhiPrefix %>Translate="settings.form.language">__jhiTransformTranslate__('settings.form.language')</label>
+          <label for="langKey">__jhiTranslateTag__('settings.form.language')</label>
           <select class="form-control" id="langKey" name="langKey" formControlName="langKey" data-cy="langKey">
           @for (language of languages; track $index) {
             <option [value]="language">{{ language | findLanguageFromKey }}</option>
@@ -159,9 +149,8 @@
           type="submit"
           [disabled]="settingsForm.invalid"
           class="btn btn-primary"
-          <%= jhiPrefix %>Translate="settings.form.button"
           data-cy="submit"
-        >__jhiTransformTranslate__('settings.form.button')</button>
+        >__jhiTranslateTag__('settings.form.button')</button>
       </form>
     }
     </div>

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

@@ -32,8 +32,8 @@ import { LANGUAGES } from 'app/config/language.constants';
 const initialAccount: Account = {} as Account;
 
 @Component({
-  selector: '<%= jhiPrefixDashed %>-settings',
   standalone: true,
+  selector: '<%= jhiPrefixDashed %>-settings',
   imports: [SharedModule, FormsModule, ReactiveFormsModule],
   templateUrl: './settings.component.html',
 })

package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.component.html.ejs

@@ -18,9 +18,9 @@
 -%>
 @if (allBeans()) {
   <div>
-    <h2 id="configuration-page-heading" <%= jhiPrefix %>Translate="configuration.title" data-cy="configurationPageHeading">__jhiTransformTranslate__('configuration.title')</h2>
+    <h2 id="configuration-page-heading" data-cy="configurationPageHeading">__jhiTranslateTag__('configuration.title')</h2>
 
-    <span <%= jhiPrefix %>Translate="configuration.filter">__jhiTransformTranslate__('configuration.filter')</span>
+    <span>__jhiTranslateTag__('configuration.filter')</span>
     <input type="text" [ngModel]="beansFilter()" (ngModelChange)="beansFilter.set($event)" class="form-control" />
 
     <h3 id="spring-configuration">Spring configuration</h3>
@@ -29,9 +29,9 @@
       <thead>
         <tr <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="sortState.set($event)">
           <th <%= jhiPrefix %>SortBy="prefix" scope="col" class="w-40">
-            <span <%= jhiPrefix %>Translate="configuration.table.prefix">__jhiTransformTranslate__('configuration.table.prefix')</span> <fa-icon icon="sort"></fa-icon>
+            <span>__jhiTranslateTag__('configuration.table.prefix')</span> <fa-icon icon="sort"></fa-icon>
           </th>
-          <th scope="col" class="w-60"><span <%= jhiPrefix %>Translate="configuration.table.properties">__jhiTransformTranslate__('configuration.table.properties')</span></th>
+          <th scope="col" class="w-60"><span>__jhiTranslateTag__('configuration.table.properties')</span></th>
         </tr>
       </thead>
       <tbody>

package/dist/generators/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs

@@ -35,7 +35,7 @@ export class ConfigurationService {
         Object.values(
           Object.values(configProps.contexts)
             .map(context => context.beans)
-            .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }))
+            .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }), {})
         )
       )
     );

package/dist/generators/angular/templates/src/main/webapp/app/admin/gateway/gateway.component.html.ejs

@@ -18,22 +18,22 @@
 -%>
 <div>
   <h2>
-    <span id="gateway-page-heading" <%= jhiPrefix %>Translate="gateway.title">__jhiTransformTranslate__('gateway.title')</span>
+    <span id="gateway-page-heading">__jhiTranslateTag__('gateway.title')</span>
 
     <button class="btn btn-primary float-end" (click)="refresh()" (disabled)="updatingRoutes">
-      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="gateway.refresh.button">__jhiTransformTranslate__('gateway.refresh.button')</span>
+      <fa-icon icon="sync"></fa-icon> <span>__jhiTranslateTag__('gateway.refresh.button')</span>
     </button>
   </h2>
 
-  <h3 <%= jhiPrefix %>Translate="gateway.routes.title">__jhiTransformTranslate__('gateway.routes.title')</h3>
+  <h3>__jhiTranslateTag__('gateway.routes.title')</h3>
 
   <div class="table-responsive">
     <table class="table table-striped" aria-describedby="gateway-page-heading">
       <thead>
         <tr>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.url">__jhiTransformTranslate__('gateway.routes.url')</th>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.service">__jhiTransformTranslate__('gateway.routes.service')</th>
-          <th scope="col" <%= jhiPrefix %>Translate="gateway.routes.servers">__jhiTransformTranslate__('gateway.routes.servers')</th>
+          <th scope="col">__jhiTranslateTag__('gateway.routes.url')</th>
+          <th scope="col">__jhiTranslateTag__('gateway.routes.service')</th>
+          <th scope="col">__jhiTranslateTag__('gateway.routes.servers')</th>
         </tr>
       </thead>
       <tbody>
@@ -43,7 +43,7 @@
           <td>{{ route.serviceId }}</td>
           <td>
           @if (route.serviceInstances.length === 0) {
-            <div class="label label-danger" <%= jhiPrefix %>Translate="gateway.routes.error">__jhiTransformTranslate__('gateway.routes.error')</div>
+            <div class="label label-danger">__jhiTranslateTag__('gateway.routes.error')</div>
           }
 
             <div class="table-responsive">

package/dist/generators/angular/templates/src/main/webapp/app/admin/health/health.component.html.ejs

@@ -18,10 +18,10 @@
 -%>
 <div>
   <h2>
-    <span id="health-page-heading" <%= jhiPrefix %>Translate="health.title" data-cy="healthPageHeading">__jhiTransformTranslate__('health.title')</span>
+    <span id="health-page-heading" data-cy="healthPageHeading">__jhiTranslateTag__('health.title')</span>
 
     <button class="btn btn-primary float-end" (click)="refresh()">
-      <fa-icon icon="sync"></fa-icon> <span <%= jhiPrefix %>Translate="health.refresh.button">__jhiTransformTranslate__('health["refresh.button"]')</span>
+      <fa-icon icon="sync"></fa-icon> <span>__jhiTranslateTag__('health.refresh.button')</span>
     </button>
   </h2>
 
@@ -29,9 +29,9 @@
     <table id="healthCheck" class="table table-striped" aria-describedby="health-page-heading">
       <thead>
         <tr>
-          <th scope="col" <%= jhiPrefix %>Translate="health.table.service">__jhiTransformTranslate__('health.table.service')</th>
-          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.table.status">__jhiTransformTranslate__('health.table.status')</th>
-          <th scope="col" class="text-center" <%= jhiPrefix %>Translate="health.details.details">__jhiTransformTranslate__('health.details.details')</th>
+          <th scope="col">__jhiTranslateTag__('health.table.service')</th>
+          <th scope="col" class="text-center">__jhiTranslateTag__('health.table.status')</th>
+          <th scope="col" class="text-center">__jhiTranslateTag__('health.details.details')</th>
         </tr>
       </thead>
     @if (health) {
@@ -39,19 +39,14 @@
       @for (componentHealth of health.components | keyvalue; track componentHealth.key) {
         <tr>
           <td>
-            <%_ if (enableTranslation) { _%>
-            {{ 'health.indicator.' + componentHealth.key | translate }}
-            <%_ } else { _%>
-            <span class="text-capitalize">{{ componentHealth.key }}</span>
-            <%_ } _%>
+            __jhiTranslateTagEnum__('health.indicator', { "value": "componentHealth.key", "fallback": "componentHealth.key" })
           </td>
           <td class="text-center">
             <span
               class="badge"
               [ngClass]="getBadgeClass(componentHealth.value!.status)"
-              <%= jhiPrefix %>Translate="{{ 'health.status.' + componentHealth.value!.status }}"
             >
-              {{ __jhiTransformTranslateStringify__('health.status')[componentHealth.value!.status || 'UNKNOWN'] }}
+              __jhiTranslateTagEnum__('health.status', { "value": "componentHealth.value?.status ?? 'UNKNOWN'" })
             </span>
           </td>
           <td class="text-center">

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

@@ -39,15 +39,19 @@ export type HealthKey =
   <%_ if (searchEngineElasticsearch) { _%>
   | 'elasticsearch'
   <%_ } _%>
-  <%_ if (databaseTypeSql) { _%>
+<%_ if (databaseTypeSql) { _%>
+  <%_ if (reactive) { _%>
+  | 'r2dbc'
+  <%_ } else { _%>
   | 'db'
-  <%_ } else if (databaseTypeMongodb) { _%>
+  <%_ } _%>
+<%_ } else if (databaseTypeMongodb) { _%>
   | 'mongo'
-  <%_ } else if (databaseTypeCassandra) { _%>
+<%_ } else if (databaseTypeCassandra) { _%>
   | 'cassandra'
-  <%_ } else if (databaseTypeCouchbase) { _%>
+<%_ } else if (databaseTypeCouchbase) { _%>
   | 'couchbase'
-  <%_ } _%>
+<%_ } _%>
   ;
 
 export interface Health {

package/dist/generators/angular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs

@@ -19,30 +19,26 @@
 <div class="modal-header">
 @if (health) {
   <h4 class="modal-title" id="showHealthLabel">
-    <%_ if (enableTranslation) { _%>
-    {{ 'health.indicator.' + health.key | translate }}
-    <%_ } else { _%>
-    <span class="text-capitalize">{{ health.key }}</span>
-    <%_ } _%>
+    __jhiTranslateTagEnum__('health.indicator', { "value": "health.key", "fallback": "health.key" })
   </h4>
 }
 
   <button aria-label="Close" data-dismiss="modal" class="btn-close" type="button" (click)="dismiss()">
-    <span aria-hidden="true">&times;</span>
+    <span aria-hidden="true">&nbsp;</span>
   </button>
 </div>
 
 <div class="modal-body pad">
 @if (health) {
   <div>
-    <h5 <%= jhiPrefix %>Translate="health.details.properties">__jhiTransformTranslate__('health.details.properties')</h5>
+    <h5>__jhiTranslateTag__('health.details.properties')</h5>
 
     <div class="table-responsive">
       <table class="table table-striped" aria-describedby="showHealthLabel">
         <thead>
           <tr>
-            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.name">__jhiTransformTranslate__('health.details.name')</th>
-            <th scope="col" class="text-start" <%= jhiPrefix %>Translate="health.details.value">__jhiTransformTranslate__('health.details.value')</th>
+            <th scope="col" class="text-start">__jhiTranslateTag__('health.details.name')</th>
+            <th scope="col" class="text-start">__jhiTranslateTag__('health.details.value')</th>
           </tr>
         </thead>
         <tbody>

package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.html.ejs

@@ -18,7 +18,7 @@
 -%>
 @defer (when loggers() && !isLoading()) {
   <div class="table-responsive">
-    <h2 id="logs-page-heading" <%= jhiPrefix %>Translate="logs.title" data-cy="logsPageHeading">__jhiTransformTranslate__('logs.title')</h2>
+    <h2 id="logs-page-heading" data-cy="logsPageHeading">__jhiTranslateTag__('logs.title')</h2>
 
 <%_ if (applicationTypeGateway && serviceDiscoveryAny) { _%>
     <div class="float-end">
@@ -33,16 +33,16 @@
     </div>
     <%_ } _%>
 
-    <p <%= jhiPrefix %>Translate="logs.nbloggers" [translateValues]="{ total: loggers()?.length }">__jhiTransformTranslate__('logs.nbloggers', { "total": "{{ loggers()?.length }}" })</p>
+    <p>__jhiTranslateTag__('logs.nbloggers', { "total": "loggers()?.length" })</p>
 
-    <span <%= jhiPrefix %>Translate="logs.filter">__jhiTransformTranslate__('logs.filter')</span>
+    <span>__jhiTranslateTag__('logs.filter')</span>
     <input type="text" [ngModel]="filter()" (ngModelChange)="filter.set($event)" class="form-control" />
 
     <table class="table table-sm table-striped table-bordered" aria-describedby="logs-page-heading">
       <thead>
         <tr <%= jhiPrefix %>Sort [sortState]="sortState" (sortChange)="sortState.set($event)">
-          <th <%= jhiPrefix %>SortBy="name" scope="col"><span <%= jhiPrefix %>Translate="logs.table.name">__jhiTransformTranslate__('logs.table.name')</span> <fa-icon icon="sort"></fa-icon></th>
-          <th <%= jhiPrefix %>SortBy="level" scope="col"><span <%= jhiPrefix %>Translate="logs.table.level">__jhiTransformTranslate__('logs.table.level')</span> <fa-icon icon="sort"></fa-icon></th>
+          <th <%= jhiPrefix %>SortBy="name" scope="col"><span>__jhiTranslateTag__('logs.table.name')</span> <fa-icon icon="sort"></fa-icon></th>
+          <th <%= jhiPrefix %>SortBy="level" scope="col"><span>__jhiTranslateTag__('logs.table.level')</span> <fa-icon icon="sort"></fa-icon></th>
         </tr>
       </thead>
 

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs

@@ -16,11 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h4 <%= jhiPrefix %>Translate="metrics.jvm.memory.title">__jhiTransformTranslate__('metrics.jvm.memory.title')</h4>
+<h4>__jhiTranslateTag__('metrics.jvm.memory.title')</h4>
 
-@if (!updating && jvmMemoryMetrics) {
+@if (!updating() && jvmMemoryMetrics()) {
 <div>
-  @for (entry of jvmMemoryMetrics | keyvalue; track $index) {
+  @for (entry of jvmMemoryMetrics() | keyvalue; track $index) {
   <div>
   @if (entry.value.max !== -1) {
     <span>

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.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 SharedModule from 'app/shared/shared.module';
 import { JvmMetrics } from 'app/admin/metrics/metrics.model';
@@ -31,10 +31,10 @@ export class JvmMemoryComponent {
   /**
    * object containing all jvm memory metrics
    */
-  @Input() jvmMemoryMetrics?: { [key: string]: JvmMetrics };
+  jvmMemoryMetrics = input<{ [key: string]: JvmMetrics }>();
 
   /**
    * boolean field saying if the metrics are in the process of being updated
    */
-  @Input() updating?: boolean;
+  updating = input<boolean>();
 }

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs

@@ -16,9 +16,9 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h4 <%= jhiPrefix %>Translate="metrics.jvm.threads.title">__jhiTransformTranslate__('metrics.jvm.threads.title')</h4>
+<h4>__jhiTranslateTag__('metrics.jvm.threads.title')</h4>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.runnable">__jhiTransformTranslate__('metrics.jvm.threads.runnable')</span> {{ threadStats.threadDumpRunnable }}</span>
+<span><span>__jhiTranslateTag__('metrics.jvm.threads.runnable')</span> {{ threadStats.threadDumpRunnable }}</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpRunnable"
@@ -30,7 +30,7 @@
   <span>{{ (threadStats.threadDumpRunnable * 100) / threadStats.threadDumpAll | number: '1.0-0' }}%</span>
 </ngb-progressbar>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.timedwaiting">__jhiTransformTranslate__('metrics.jvm.threads.timedwaiting')</span> ({{ threadStats.threadDumpTimedWaiting }})</span>
+<span><span>__jhiTranslateTag__('metrics.jvm.threads.timedwaiting')</span> ({{ threadStats.threadDumpTimedWaiting }})</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpTimedWaiting"
@@ -42,7 +42,7 @@
   <span>{{ (threadStats.threadDumpTimedWaiting * 100) / threadStats.threadDumpAll | number: '1.0-0' }}%</span>
 </ngb-progressbar>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.waiting">__jhiTransformTranslate__('metrics.jvm.threads.waiting')</span> ({{ threadStats.threadDumpWaiting }})</span>
+<span><span>__jhiTranslateTag__('metrics.jvm.threads.waiting')</span> ({{ threadStats.threadDumpWaiting }})</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpWaiting"
@@ -54,7 +54,7 @@
   <span>{{ (threadStats.threadDumpWaiting * 100) / threadStats.threadDumpAll | number: '1.0-0' }}%</span>
 </ngb-progressbar>
 
-<span><span <%= jhiPrefix %>Translate="metrics.jvm.threads.blocked">__jhiTransformTranslate__('metrics.jvm.threads.blocked')</span> ({{ threadStats.threadDumpBlocked }})</span>
+<span><span>__jhiTranslateTag__('metrics.jvm.threads.blocked')</span> ({{ threadStats.threadDumpBlocked }})</span>
 
 <ngb-progressbar
   [value]="threadStats.threadDumpBlocked"

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs

@@ -16,26 +16,26 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<h3 id="cacheMetrics" <%= jhiPrefix %>Translate="metrics.cache.title">__jhiTransformTranslate__('metrics.cache.title')</h3>
+<h3 id="cacheMetrics()">__jhiTranslateTag__('metrics.cache.title')</h3>
 
-@if (!updating && cacheMetrics) {
+@if (!updating() && cacheMetrics()) {
 <div class="table-responsive">
   <table class="table table-striped" aria-describedby="cacheMetrics">
     <thead>
       <tr>
-        <th scope="col" <%= jhiPrefix %>Translate="metrics.cache.cachename">__jhiTransformTranslate__('metrics.cache.cachename')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hits">__jhiTransformTranslate__('metrics.cache.hits')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.misses">__jhiTransformTranslate__('metrics.cache.misses')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.gets">__jhiTransformTranslate__('metrics.cache.gets')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.puts">__jhiTransformTranslate__('metrics.cache.puts')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.removals">__jhiTransformTranslate__('metrics.cache.removals')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.evictions">__jhiTransformTranslate__('metrics.cache.evictions')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.hitPercent">__jhiTransformTranslate__('metrics.cache.hitPercent')</th>
-        <th scope="col" class="text-end" <%= jhiPrefix %>Translate="metrics.cache.missPercent">__jhiTransformTranslate__('metrics.cache.missPercent')</th>
+        <th scope="col">__jhiTranslateTag__('metrics.cache.cachename')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.hits')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.misses')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.gets')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.puts')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.removals')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.evictions')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.hitPercent')</th>
+        <th scope="col" class="text-end">__jhiTranslateTag__('metrics.cache.missPercent')</th>
       </tr>
     </thead>
     <tbody>
-    @for (entry of cacheMetrics | keyvalue; track entry.key) {
+    @for (entry of cacheMetrics() | keyvalue; track entry.key) {
       <tr>
         <td>{{ entry.key }}</td>
         <td class="text-end">{{ entry.value['cache.gets.hit'] }}</td>

package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs

@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 
 import SharedModule from 'app/shared/shared.module';
 import { CacheMetrics } from 'app/admin/metrics/metrics.model';
@@ -33,12 +33,12 @@ export class MetricsCacheComponent {
   /**
    * object containing all cache related metrics
    */
-  @Input() cacheMetrics?: { [key: string]: CacheMetrics };
+  cacheMetrics = input<{ [key: string]: CacheMetrics }>();
 
   /**
    * boolean field saying if the metrics are in the process of being updated
    */
-  @Input() updating?: boolean;
+  updating = input<boolean>();
 
-  filterNaN = (input: number): number => filterNaN(input);
+  filterNaN = (n: number): number => filterNaN(n);
 }