generator-jhipster 9.1.0 → 9.2.0

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.ts.ejs

@@ -22,7 +22,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
 import PasswordStrengthBar from 'app/account/password/password-strength-bar/password-strength-bar';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 <%_ } _%>
 
 import { PasswordResetFinishService } from './password-reset-finish.service';
@@ -33,7 +33,7 @@ import { PasswordResetFinishService } from './password-reset-finish.service';
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
+    TranslatePipe,
 <%_ } _%>
     RouterLink,
     ReactiveFormsModule,

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.spec.ts.ejs

@@ -16,13 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of, throwError } from 'rxjs';
 
@@ -35,11 +33,11 @@ describe('PasswordResetInit', () => {
   let service: PasswordResetInitService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
-<%_ } _%>
+    TestBed.configureTestingModule({
+      providers: [provideTranslateService()],
     });
+<%_ } _%>
     fixture = TestBed.createComponent(PasswordResetInit);
     comp = fixture.componentInstance;
     service = TestBed.inject(PasswordResetInitService);
@@ -47,7 +45,7 @@ describe('PasswordResetInit', () => {
 
   it('sets focus after the view has been initialized', () => {
     const node = {
-      focus: <%- clientTestFramework %>.fn(),
+      focus: vitest.fn(),
     };
     comp.email = signal(new ElementRef(node));
 
@@ -57,7 +55,7 @@ describe('PasswordResetInit', () => {
   });
 
   it('notifies of success upon successful requestReset', () => {
-    <%- clientTestFramework %>.spyOn(service, 'save').mockReturnValue(of({}));
+    vitest.spyOn(service, 'save').mockReturnValue(of({}));
     comp.resetRequestForm.patchValue({
       email: 'user@domain.com',
     });
@@ -70,7 +68,7 @@ describe('PasswordResetInit', () => {
 
   it('no notification of success upon error response', () => {
     const err = { status: 503, data: 'something else' };
-    <%- clientTestFramework %>.spyOn(service, 'save').mockReturnValue(throwError(() => err));
+    vitest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
     comp.resetRequestForm.patchValue({
       email: 'user@domain.com',
     });

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.ts.ejs

@@ -21,7 +21,7 @@ import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 <%_ } _%>
 import { AlertError } from 'app/shared/alert/alert-error';
 
@@ -33,7 +33,7 @@ import { PasswordResetInitService } from './password-reset-init.service';
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
+    TranslatePipe,
 <%_ } _%>
     AlertError,
     ReactiveFormsModule,

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

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.spec.ts.ejs

@@ -16,14 +16,12 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { of, throwError } from 'rxjs';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateService, provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 
 import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/shared/jhipster/error.constants';
@@ -37,10 +35,10 @@ describe('Register', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         {
           provide: ActivatedRoute,
           useValue: {}
@@ -68,9 +66,9 @@ describe('Register', () => {
   it('should update success to true after creating an account', inject(
     [RegisterService<%- enableTranslation ? ', TranslateService' : '' %>],
     (service: RegisterService<%- enableTranslation ? ', mockTranslateService: TranslateService' : '' %>) => {
-      <%- clientTestFramework %>.spyOn(service, 'save').mockReturnValue(of({}));
+      vitest.spyOn(service, 'save').mockReturnValue(of({}));
 <%_ if (enableTranslation) { _%>
-      <%- clientTestFramework %>.spyOn(mockTranslateService, 'getCurrentLang').mockReturnValue('<%- nativeLanguage %>');
+      vitest.spyOn(mockTranslateService, 'getCurrentLang').mockReturnValue('<%- nativeLanguage %>');
 <%_ } _%>
       comp.registerForm.patchValue({
         password: 'password',
@@ -96,7 +94,7 @@ describe('Register', () => {
     [RegisterService],
     (service: RegisterService) => {
       const err = { status: 400, error: { type: LOGIN_ALREADY_USED_TYPE } };
-      <%- clientTestFramework %>.spyOn(service, 'save').mockReturnValue(throwError(() => err));
+      vitest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
       comp.registerForm.patchValue({
         password: 'password',
         confirmPassword: 'password',
@@ -114,7 +112,7 @@ describe('Register', () => {
     [RegisterService],
     (service: RegisterService) => {
       const err = { status: 400, error: { type: EMAIL_ALREADY_USED_TYPE } };
-      <%- clientTestFramework %>.spyOn(service, 'save').mockReturnValue(throwError(() => err));
+      vitest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
       comp.registerForm.patchValue({
         password: 'password',
         confirmPassword: 'password',
@@ -132,7 +130,7 @@ describe('Register', () => {
     [RegisterService],
     (service: RegisterService) => {
       const err = { status: 503 };
-      <%- clientTestFramework %>.spyOn(service, 'save').mockReturnValue(throwError(() => err));
+      vitest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
       comp.registerForm.patchValue({
         password: 'password',
         confirmPassword: 'password',

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

@@ -21,7 +21,7 @@ import { HttpErrorResponse } from '@angular/common/http';
 import { RouterLink } from '@angular/router';
 import { FormGroup, FormControl, Validators, ReactiveFormsModule } from '@angular/forms';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateService, TranslatePipe } from '@ngx-translate/core';
 import { TranslateDirective } from 'app/shared/language';
 <%_ } _%>
 
@@ -35,7 +35,7 @@ import PasswordStrengthBar from '../password/password-strength-bar/password-stre
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
+    TranslatePipe,
 <%_ } _%>
     RouterLink,
     ReactiveFormsModule,
@@ -95,7 +95,7 @@ export default class Register implements AfterViewInit {
     if (password === confirmPassword) {
       const { login, email } = this.registerForm.getRawValue();
       this.registerService
-        .save({ login, email, password, langKey: <% if (enableTranslation) { %>this.translateService.getCurrentLang()<% } else { %>'<%- nativeLanguage %>'<% } %> })
+        .save({ login, email, password, langKey: <%- enableTranslation ? 'this.translateService.getCurrentLang() ?? ' : '' %>'<%- nativeLanguage %>' })
         .subscribe({ next: () => (this.success.set(true)), error: response => this.processError(response) });
     } else {
       this.doNotMatch.set(true);

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

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
 
@@ -62,8 +60,8 @@ describe('Sessions', () => {
   it('should define its initial state', inject(
     [AccountService, SessionsService],
     (mockAccountService: AccountService, service: SessionsService) => {
-      mockAccountService.identity = <%- clientTestFramework %>.fn(() => of(account));
-      <%- clientTestFramework %>.spyOn(service, 'findAll').mockReturnValue(of(sessions));
+      mockAccountService.identity = vitest.fn(() => of(account));
+      vitest.spyOn(service, 'findAll').mockReturnValue(of(sessions));
 
       comp.ngOnInit();
 
@@ -79,9 +77,9 @@ describe('Sessions', () => {
   it('should call delete on Sessions to invalidate a session', inject(
     [AccountService, SessionsService],
     (mockAccountService: AccountService, service: SessionsService) => {
-      mockAccountService.identity = <%- clientTestFramework %>.fn(() => of(account));
-      <%- clientTestFramework %>.spyOn(service, 'findAll').mockReturnValue(of(sessions));
-      <%- clientTestFramework %>.spyOn(service, 'delete').mockReturnValue(of({}));
+      mockAccountService.identity = vitest.fn(() => of(account));
+      vitest.spyOn(service, 'findAll').mockReturnValue(of(sessions));
+      vitest.spyOn(service, 'delete').mockReturnValue(of({}));
 
       comp.ngOnInit();
       comp.invalidate('xyz');
@@ -93,9 +91,9 @@ describe('Sessions', () => {
   it('should call delete on Sessions and notify of error', inject(
     [AccountService, SessionsService],
     (mockAccountService: AccountService, service: SessionsService) => {
-      mockAccountService.identity = <%- clientTestFramework %>.fn(() => of(account));
-      <%- clientTestFramework %>.spyOn(service, 'findAll').mockReturnValue(of(sessions));
-      <%- clientTestFramework %>.spyOn(service, 'delete').mockReturnValue(throwError(Error));
+      mockAccountService.identity = vitest.fn(() => of(account));
+      vitest.spyOn(service, 'findAll').mockReturnValue(of(sessions));
+      vitest.spyOn(service, 'delete').mockReturnValue(throwError(Error));
 
       comp.ngOnInit();
       comp.invalidate('xyz');
@@ -108,9 +106,9 @@ describe('Sessions', () => {
   it('should call notify of success upon session invalidation', inject(
     [AccountService, SessionsService],
     (mockAccountService: AccountService, service: SessionsService) => {
-      mockAccountService.identity = <%- clientTestFramework %>.fn(() => of(account));
-      <%- clientTestFramework %>.spyOn(service, 'findAll').mockReturnValue(of(sessions));
-      <%- clientTestFramework %>.spyOn(service, 'delete').mockReturnValue(of({}));
+      mockAccountService.identity = vitest.fn(() => of(account));
+      vitest.spyOn(service, 'findAll').mockReturnValue(of(sessions));
+      vitest.spyOn(service, 'delete').mockReturnValue(of({}));
 
       comp.ngOnInit();
       comp.invalidate('xyz');

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

@@ -21,7 +21,6 @@ import { DatePipe } from '@angular/common';
 
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 import { AccountService } from 'app/core/auth/account.service';
 import { Session } from './session.model';
@@ -31,7 +30,7 @@ import { Account } from 'app/core/auth/account.model';
 @Component({
   selector: '<%- jhiPrefixDashed %>-sessions',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [DatePipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [DatePipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
   templateUrl: './sessions.html',
 })
 export default class Sessions implements OnInit {

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

@@ -16,13 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of, throwError } from 'rxjs';
 
@@ -48,14 +46,14 @@ describe('Settings', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         {
           provide: AccountService,
           useValue: {
-            authenticate: <%- clientTestFramework %>.fn(),
+            authenticate: vitest.fn(),
           },
         },
       ],
@@ -66,12 +64,12 @@ describe('Settings', () => {
     fixture = TestBed.createComponent(Settings);
     comp = fixture.componentInstance;
     mockAccountService = TestBed.inject(AccountService);
-    mockAccountService.identity = <%- clientTestFramework %>.fn(() => of(account));
+    mockAccountService.identity = vitest.fn(() => of(account));
   });
 
   it('should send the current identity upon save', () => {
     // GIVEN
-    mockAccountService.save = <%- clientTestFramework %>.fn(() => of({}));
+    mockAccountService.save = vitest.fn(() => of({}));
     const settingsFormValues = {
       firstName: 'John',
       lastName: 'Doe',
@@ -94,7 +92,7 @@ describe('Settings', () => {
 
   it('should notify of success upon successful save', () => {
     // GIVEN
-    mockAccountService.save = <%- clientTestFramework %>.fn(() => of({}));
+    mockAccountService.save = vitest.fn(() => of({}));
 
     // WHEN
     comp.ngOnInit();
@@ -106,7 +104,7 @@ describe('Settings', () => {
 
   it('should notify of error upon failed save', () => {
     // GIVEN
-    mockAccountService.save = <%- clientTestFramework %>.fn(() => throwError(Error));
+    mockAccountService.save = vitest.fn(() => throwError(Error));
 
     // WHEN
     comp.ngOnInit();

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

@@ -19,7 +19,7 @@
 import { Component, ChangeDetectionStrategy, inject, OnInit, signal } from '@angular/core';
 import { FormGroup, FormControl, Validators, ReactiveFormsModule } from '@angular/forms';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateService, TranslatePipe } from '@ngx-translate/core';
 import { FindLanguageFromKeyPipe, TranslateDirective } from 'app/shared/language';
 <%_ } _%>
 import { catchError, of } from 'rxjs';
@@ -39,7 +39,7 @@ const initialAccount: Account = {} as Account;
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
+    TranslatePipe,
     FindLanguageFromKeyPipe,
 <%_ } _%>
     AlertError,

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

@@ -20,8 +20,8 @@
   <div>
     <h2 id="configuration-page-heading" data-cy="configurationPageHeading">__jhiTranslateTag__('configuration.title')</h2>
 
-    <span>__jhiTranslateTag__('configuration.filter')</span>
-    <input type="text" [ngModel]="beansFilter()" (ngModelChange)="beansFilter.set($event)" class="form-control" />
+    <label for="configuration-filter">__jhiTranslateTag__('configuration.filter')</label>
+    <input id="configuration-filter" type="text" [ngModel]="beansFilter()" (ngModelChange)="beansFilter.set($event)" class="form-control" />
 
     <h3 id="spring-configuration">Spring configuration</h3>
 

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

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

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

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
@@ -66,8 +64,8 @@ describe('Configuration', () => {
           },
         },
       ];
-      <%- clientTestFramework %>.spyOn(service, 'getBeans').mockReturnValue(of(beans));
-      <%- clientTestFramework %>.spyOn(service, 'getPropertySources').mockReturnValue(of(propertySources));
+      vitest.spyOn(service, 'getBeans').mockReturnValue(of(beans));
+      vitest.spyOn(service, 'getPropertySources').mockReturnValue(of(propertySources));
 
       // WHEN
       comp.ngOnInit();

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

@@ -21,7 +21,6 @@ import { FormsModule } from '@angular/forms';
 import { KeyValuePipe, JsonPipe } from '@angular/common';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@@ -33,7 +32,7 @@ import { Bean, PropertySource } from './configuration.model';
   selector: '<%- jhiPrefixDashed %>-configuration',
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: './configuration.html',
-  imports: [FontAwesomeModule, FormsModule, SortDirective, SortByDirective, KeyValuePipe, JsonPipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [FontAwesomeModule, FormsModule, SortDirective, SortByDirective, KeyValuePipe, JsonPipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export default class Configuration implements OnInit {
   readonly allBeans = signal<Bean[] | undefined>(undefined);

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

@@ -21,7 +21,6 @@ import { KeyValuePipe } from '@angular/common';
 
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { GatewayRoutesService } from './gateway-routes.service';
@@ -32,7 +31,7 @@ import { GatewayRoute } from './gateway-route.model';
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: './gateway.html',
   providers: [GatewayRoutesService],
-  imports: [KeyValuePipe, FontAwesomeModule<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [KeyValuePipe, FontAwesomeModule<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export default class Gateway implements OnInit {
   gatewayRoutes: GatewayRoute[] = [];

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

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

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

@@ -16,13 +16,11 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HttpErrorResponse } from '@angular/common/http';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of, throwError } from 'rxjs';
 
@@ -35,14 +33,14 @@ describe('Health', () => {
   let fixture: ComponentFixture<Health>;
   let service: HealthService;
 
+<%_ if (enableTranslation) { _%>
   beforeEach(() => {
     TestBed.configureTestingModule({
-<%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
-<%_ } _%>
+      providers: [provideTranslateService()],
     });
   });
 
+<%_ } _%>
   beforeEach(() => {
     fixture = TestBed.createComponent(Health);
     comp = fixture.componentInstance;
@@ -62,7 +60,7 @@ describe('Health', () => {
     it('should call refresh on init', () => {
       // GIVEN
       const health: HealthModel = { status: 'UP', components: { mail: { status: 'UP', details: { mailDetail: 'mail' } } } };
-      <%- clientTestFramework %>.spyOn(service, 'checkHealth').mockReturnValue(of(health));
+      vitest.spyOn(service, 'checkHealth').mockReturnValue(of(health));
 
       // WHEN
       comp.ngOnInit();
@@ -75,7 +73,7 @@ describe('Health', () => {
     it('should handle a 503 on refreshing health data', () => {
       // GIVEN
       const health: HealthModel = { status: 'DOWN', components: { mail: { status: 'DOWN' } } };
-      <%- clientTestFramework %>.spyOn(service, 'checkHealth').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 503, error: health })));
+      vitest.spyOn(service, 'checkHealth').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 503, error: health })));
 
       // WHEN
       comp.refresh();

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

@@ -23,7 +23,6 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap/modal';
 
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { HealthService } from './health.service';
@@ -37,7 +36,6 @@ import HealthModal from './modal/health-modal';
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
     FontAwesomeModule,
     KeyValuePipe,

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

@@ -1,6 +1,4 @@
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap/modal';
 
@@ -78,7 +76,7 @@ describe('HealthModal', () => {
       expect(result).toEqual('1024.00 MB');
     });
 
-    it('should return string value', () => {
+    it('should return number value as string when health key is not diskSpace', () => {
       // GIVEN
       comp.health = {
         key: 'mail',
@@ -98,7 +96,7 @@ describe('HealthModal', () => {
   describe('dismiss', () => {
     it('should call dismiss when dismiss modal is called', () => {
       // GIVEN
-      const spy = <%- clientTestFramework %>.spyOn(mockActiveModal, 'dismiss');
+      const spy = vitest.spyOn(mockActiveModal, 'dismiss');
 
       // WHEN
       comp.dismiss();

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

@@ -22,7 +22,6 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap/modal';
 
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 import { HealthKey, HealthDetails } from '../health.model';
 
@@ -33,7 +32,6 @@ import { HealthKey, HealthDetails } from '../health.model';
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
     KeyValuePipe,
   ],

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

@@ -35,8 +35,8 @@
 
     <p>__jhiTranslateTag__('logs.nbloggers', { "total": "loggers()?.length" })</p>
 
-    <span>__jhiTranslateTag__('logs.filter')</span>
-    <input type="text" [ngModel]="filter()" (ngModelChange)="filter.set($event)" class="form-control" />
+    <label for="logs-filter">__jhiTranslateTag__('logs.filter')</label>
+    <input id="logs-filter" 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>

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

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 

package/dist/generators/angular/templates/src/main/webapp/app/admin/logs/logs.spec.ts.ejs

@@ -16,9 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { of } from 'rxjs';
@@ -60,7 +58,7 @@ describe('Logs', () => {
     it('should call load all on init', () => {
       // GIVEN
       const log = new Log('main', 'WARN');
-      <%- clientTestFramework %>.spyOn(service, 'findAll').mockReturnValue(
+      vitest.spyOn(service, 'findAll').mockReturnValue(
         of({
           loggers: {
             main: {
@@ -83,8 +81,8 @@ describe('Logs', () => {
     it('should change log level correctly', () => {
       // GIVEN
       const log = new Log('main', 'ERROR');
-      <%- clientTestFramework %>.spyOn(service, 'changeLevel').mockReturnValue(of({}));
-      <%- clientTestFramework %>.spyOn(service, 'findAll').mockReturnValue(
+      vitest.spyOn(service, 'changeLevel').mockReturnValue(of({}));
+      vitest.spyOn(service, 'findAll').mockReturnValue(
         of({
           loggers: {
             main: {

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

@@ -27,7 +27,6 @@ import {
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 import { FormsModule } from '@angular/forms';
 import { SlicePipe } from '@angular/common';
@@ -48,7 +47,6 @@ import { GatewayRoutesService } from '../gateway/gateway-routes.service';
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
     FontAwesomeModule,
     FormsModule,