generator-jhipster 9.1.0 → 9.2.0

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

@@ -23,15 +23,13 @@
     const testEntityPrimaryKey0 = tsPrimaryKeySamples[0];
     const testEntityPrimaryKey1 = tsPrimaryKeySamples[1];
 _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { HttpResponse } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of, Subject, from } from 'rxjs';
 
@@ -59,10 +57,10 @@ describe('<%- entityAngularName %> Management Update Component', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
+            providers: [
 <%_ if (enableTranslation) { _%>
-            imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-            providers: [
               provideHttpClientTesting(),
               {
                 provide: ActivatedRoute,
@@ -103,14 +101,14 @@ describe('<%- entityAngularName %> Management Update Component', () => {
     <%_ } _%>
 
                 const <%- otherEntity.entityInstance %>Collection: I<%- otherEntity.entityAngularName %>[] = [<%- otherEntity.tsPrimaryKeySamples[0] %>];
-                <%- clientTestFramework %>.spyOn(<%- otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%- otherEntity.entityInstance %>Collection })));
+                vitest.spyOn(<%- otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%- otherEntity.entityInstance %>Collection })));
                 const additional<%- otherEntity.entityAngularNamePlural %> = [
     <%_ for (const relationship of relationshipsWithCustomSharedOptions) { _%>
                     <%- relationship.collection ? '...' : '' %><%- relationship.propertyName %>,
     <%_ } _%>
                 ];
                 const expectedCollection: I<%- otherEntity.entityAngularName %>[] = [...additional<%- otherEntity.entityAngularNamePlural %>, ...<%- otherEntity.entityInstance %>Collection];
-                <%- clientTestFramework %>.spyOn(<%- otherEntity.entityInstance %>Service, 'add<%- otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
+                vitest.spyOn(<%- otherEntity.entityInstance %>Service, 'add<%- otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
 
                 activatedRoute.data = of({ <%- entityInstance %> });
                 comp.ngOnInit();
@@ -132,9 +130,9 @@ describe('<%- entityAngularName %> Management Update Component', () => {
                 <%- entityInstance %>.<%- relationship.propertyName %> = <%- relationship.propertyName %>;
 
                 const <%- relationship.propertyName %>Collection: I<%- otherEntity.entityAngularName %>[] = [<%- otherEntity.tsPrimaryKeySamples[0] %>];
-                <%- clientTestFramework %>.spyOn(<%- otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%- relationship.propertyName %>Collection })));
+                vitest.spyOn(<%- otherEntity.entityInstance %>Service, 'query').mockReturnValue(of(new HttpResponse({ body: <%- relationship.propertyName %>Collection })));
                 const expectedCollection: I<%- otherEntity.entityAngularName %>[] = [<%- relationship.propertyName %>, ...<%- relationship.propertyName %>Collection];
-                <%- clientTestFramework %>.spyOn(<%- otherEntity.entityInstance %>Service, 'add<%- otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
+                vitest.spyOn(<%- otherEntity.entityInstance %>Service, 'add<%- otherEntity.entityAngularName %>ToCollectionIfMissing').mockReturnValue(expectedCollection);
 
                 activatedRoute.data = of({ <%- entityInstance %> });
                 comp.ngOnInit();
@@ -176,9 +174,9 @@ describe('<%- entityAngularName %> Management Update Component', () => {
             // GIVEN
             const saveSubject = new Subject<I<%- entityAngularName %>>();
             const <%- entityInstance %> = <%- testEntityPrimaryKey0 %>;
-            <%- clientTestFramework %>.spyOn(<%- entityInstance %>FormService, 'get<%- entityAngularName %>').mockReturnValue(<%- entityInstance %>);
-            <%- clientTestFramework %>.spyOn(<%- entityInstance %>Service, 'update').mockReturnValue(saveSubject);
-            <%- clientTestFramework %>.spyOn(comp, 'previousState');
+            vitest.spyOn(<%- entityInstance %>FormService, 'get<%- entityAngularName %>').mockReturnValue(<%- entityInstance %>);
+            vitest.spyOn(<%- entityInstance %>Service, 'update').mockReturnValue(saveSubject);
+            vitest.spyOn(comp, 'previousState');
             activatedRoute.data = of({ <%- entityInstance %> });
             comp.ngOnInit();
 
@@ -196,13 +194,14 @@ describe('<%- entityAngularName %> Management Update Component', () => {
         });
 
 <%_ } _%>
+<%_ if (primaryKey.autoGenerate || !updatableEntity) { _%>
         it('should call create service on save for new entity', () => {
             // GIVEN
             const saveSubject = new Subject<I<%- entityAngularName %>>();
             const <%- entityInstance %> = <%- testEntityPrimaryKey0 %>;
-            <%- clientTestFramework %>.spyOn(<%- entityInstance %>FormService, 'get<%- entityAngularName %>').mockReturnValue({ <%- primaryKey.name %>: null });
-            <%- clientTestFramework %>.spyOn(<%- entityInstance %>Service, 'create').mockReturnValue(saveSubject);
-            <%- clientTestFramework %>.spyOn(comp, 'previousState');
+            vitest.spyOn(<%- entityInstance %>FormService, 'get<%- entityAngularName %>').mockReturnValue({ <%- primaryKey.name %>: null });
+            vitest.spyOn(<%- entityInstance %>Service, 'create').mockReturnValue(saveSubject);
+            vitest.spyOn(comp, 'previousState');
             activatedRoute.data = of({ <%- entityInstance %>: null });
             comp.ngOnInit();
 
@@ -218,14 +217,38 @@ describe('<%- entityAngularName %> Management Update Component', () => {
             expect(comp.isSaving()).toEqual(false);
             expect(comp.previousState).toHaveBeenCalled();
         });
+<%_ } else { _%>
+        it('should call update service on save for new entity', () => {
+            // GIVEN
+            const saveSubject = new Subject<I<%- entityAngularName %>>();
+            const <%- entityInstance %> = <%- testEntityPrimaryKey0 %>;
+            vitest.spyOn(<%- entityInstance %>FormService, 'get<%- entityAngularName %>').mockReturnValue({ <%- primaryKey.name %>: null });
+            vitest.spyOn(<%- entityInstance %>Service, 'update').mockReturnValue(saveSubject);
+            vitest.spyOn(comp, 'previousState');
+            activatedRoute.data = of({ <%- entityInstance %>: null });
+            comp.ngOnInit();
+
+            // WHEN
+            comp.save();
+            expect(comp.isSaving()).toEqual(true);
+            saveSubject.next(<%- entityInstance %>);
+            saveSubject.complete();
+
+            // THEN
+            expect(<%- entityInstance %>FormService.get<%- entityAngularName %>).toHaveBeenCalled();
+            expect(<%- entityInstance %>Service.update).toHaveBeenCalledWith(expect.objectContaining({ <%- primaryKey.name %>: null }));
+            expect(comp.isSaving()).toEqual(false);
+            expect(comp.previousState).toHaveBeenCalled();
+        });
+<%_ } _%>
 <%_ if (updatableEntity) { _%>
 
         it('should set isSaving to false on error', () => {
             // GIVEN
             const saveSubject = new Subject<I<%- entityAngularName %>>();
             const <%- entityInstance %> = <%- testEntityPrimaryKey0 %>;
-            <%- clientTestFramework %>.spyOn(<%- entityInstance %>Service, 'update').mockReturnValue(saveSubject);
-            <%- clientTestFramework %>.spyOn(comp, 'previousState');
+            vitest.spyOn(<%- entityInstance %>Service, 'update').mockReturnValue(saveSubject);
+            vitest.spyOn(comp, 'previousState');
             activatedRoute.data = of({ <%- entityInstance %> });
             comp.ngOnInit();
 
@@ -252,7 +275,7 @@ describe('<%- entityAngularName %> Management Update Component', () => {
             it('should forward to <%- otherEntity.entityInstance %>Service', () => {
                 const entity = <%- otherEntity.tsPrimaryKeySamples[0] %>;
                 const entity2 = <%- otherEntity.tsPrimaryKeySamples[1] %>;
-                <%- clientTestFramework %>.spyOn(<%- otherEntity.entityInstance %>Service, 'compare<%- otherEntity.entityAngularName %>');
+                vitest.spyOn(<%- otherEntity.entityInstance %>Service, 'compare<%- otherEntity.entityAngularName %>');
                 comp.compare<%- otherEntity.entityAngularName %>(entity, entity2);
                 expect(<%- otherEntity.entityInstance %>Service.compare<%- otherEntity.entityAngularName %>).toHaveBeenCalledWith(entity, entity2);
             });

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

@@ -29,7 +29,7 @@ import { finalize<%- relationships.some(rel => rel.persistableRelationship) ? ',
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 <%_ } _%>
 <%_ const anyFieldHasTypeLocalDate = fields.some(field => !field.hidden && field.fieldTypeLocalDate); _%>
 <%_ if (anyFieldHasTypeLocalDate) { _%>
@@ -68,7 +68,7 @@ import { <%- importedType %> } from '<%- importedPath %>';
     imports: [
 <%_ if (enableTranslation) { _%>
       TranslateDirective,
-      TranslateModule,
+      TranslatePipe,
 <%_ } _%>
       FontAwesomeModule,
       AlertError,
@@ -177,14 +177,20 @@ export class <%- entityAngularName %>Update implements OnInit {
     save(): void {
         this.isSaving.set(true);
         const <%- entityInstance %> = this.<%- entityInstance %>FormService.get<%- entityAngularName %>(this.editForm);
-<%_ if (updatableEntity) { _%>
+<%_ if (primaryKey.autoGenerate) { _%>
+  <%_ if (updatableEntity) { _%>
         if (<%- entityInstance %>.<%- primaryKey.name %> === null) {
-<%_ } _%>
             this.subscribeToSaveResponse(this.<%- entityInstance %>Service.create(<%- entityInstance %>));
-<%_ if (updatableEntity) { _%>
         } else {
             this.subscribeToSaveResponse(this.<%- entityInstance %>Service.update(<%- entityInstance %>));
         }
+  <%_ } else { _%>
+        this.subscribeToSaveResponse(this.<%- entityInstance %>Service.create(<%- entityInstance %>));
+  <%_ } _%>
+<%_ } else if (updatableEntity) { _%>
+        this.subscribeToSaveResponse(this.<%- entityInstance %>Service.update(<%- entityInstance %> as I<%- entityAngularName %>));
+<%_ } else { _%>
+        this.subscribeToSaveResponse(this.<%- entityInstance %>Service.create(<%- entityInstance %>));
 <%_ } _%>
     }
 

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

@@ -17,16 +17,14 @@
  limitations under the License.
 -%>
 <%_ const tsKeyId = user.primaryKey.tsSampleValues[0]; _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { provideRouter, withComponentInputBinding } from '@angular/router';
 import { RouterTestingHarness } from '@angular/router/testing';
 import { FaIconLibrary } from '@fortawesome/angular-fontawesome';
 import { faArrowLeft } from '@fortawesome/free-solid-svg-icons';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of } from 'rxjs';
 
@@ -37,10 +35,10 @@ import { UserManagementDetail } from './user-management-detail';
 describe('User Management Detail Component', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         provideRouter(
           [
             {

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

@@ -21,7 +21,6 @@ import { Component, ChangeDetectionStrategy, input } from '@angular/core';
 
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
 import { TranslateDirective } from 'app/shared/language';
 <%_ } _%>
 
@@ -31,7 +30,7 @@ import { IUserManagement } from '../user-management.model';
   selector: '<%- jhiPrefixDashed %>-user-mgmt-detail',
   changeDetection: ChangeDetectionStrategy.OnPush,
   templateUrl: './user-management-detail.html',
-  imports: [FontAwesomeModule, DatePipe<%- enableTranslation ? ', TranslateDirective, TranslateModule' : '' %>],
+  imports: [FontAwesomeModule, DatePipe<%- enableTranslation ? ', TranslateDirective' : '' %>],
 })
 export class UserManagementDetail {
   readonly userManagement = input<IUserManagement | null>(null);

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

@@ -17,15 +17,13 @@
  limitations under the License.
 -%>
 <%_ const tsKeyId = user.primaryKey.tsSampleValues[0]; _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { ActivatedRoute, convertToParamMap } from '@angular/router';
 
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of } from 'rxjs';
 
@@ -53,10 +51,13 @@ describe('User Management Component', () => {
       }),
     );
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [AccountService, { provide: ActivatedRoute, useValue: { data, queryParamMap } }],
+        AccountService,
+        { provide: ActivatedRoute, useValue: { data, queryParamMap } },
+      ],
     });
   });
 
@@ -65,15 +66,15 @@ describe('User Management Component', () => {
     comp = fixture.componentInstance;
     service = TestBed.inject(UserManagementService);
     mockAccountService = TestBed.inject(AccountService);
-    mockAccountService.isAuthenticated = <%- clientTestFramework %>.fn(() => false);
-    mockAccountService.identity = <%- clientTestFramework %>.fn(() => of(null));
+    mockAccountService.isAuthenticated = vitest.fn(() => false);
+    mockAccountService.identity = vitest.fn(() => of(null));
   });
 
   describe('OnInit', () => {
     it('should call load all on init', inject([], () => {
       // GIVEN
       const headers = new HttpHeaders().append('link', 'link;link');
-      <%- clientTestFramework %>.spyOn(service, 'query').mockReturnValue(
+      vitest.spyOn(service, 'query').mockReturnValue(
         of(
           new HttpResponse({
             body: [{ id: <%- tsKeyId %> } as IUserManagement],
@@ -96,7 +97,7 @@ describe('User Management Component', () => {
       // GIVEN
       const headers = new HttpHeaders().append('link', 'link;link');
       const user = { id: <%- tsKeyId %> } as IUserManagement;
-      <%- clientTestFramework %>.spyOn(service, 'query').mockReturnValue(
+      vitest.spyOn(service, 'query').mockReturnValue(
         of(
           new HttpResponse({
             body: [user],
@@ -104,7 +105,7 @@ describe('User Management Component', () => {
           }),
         ),
       );
-      <%- clientTestFramework %>.spyOn(service, 'update').mockReturnValue(of(user));
+      vitest.spyOn(service, 'update').mockReturnValue(of(user));
 
       // WHEN
       comp.setActive(user, true);

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

@@ -41,7 +41,6 @@ import { AlertError } from 'app/shared/alert/alert-error';
 import { Alert } from 'app/shared/alert/alert';
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 import { NgbPagination } from '@ng-bootstrap/ng-bootstrap/pagination';
 <%_ if (!locals.databaseTypeCassandra) { _%>
@@ -68,7 +67,6 @@ import { UserManagementDeleteDialog } from '../delete/user-management-delete-dia
     NgbPagination,
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
 <%_ if (!locals.databaseTypeCassandra) { _%>
     SortDirective,

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

@@ -17,9 +17,7 @@
  limitations under the License.
 -%>
 <%_ const tsKeyId = user.primaryKey.tsSampleValues[0]; _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { TestBed } from '@angular/core/testing';
 import { HttpErrorResponse } from '@angular/common/http';
 import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';

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

@@ -17,13 +17,11 @@
  limitations under the License.
 -%>
 <%_ const tsKeyId = user.primaryKey.tsSampleValues[0]; _%>
-<%_ if (clientTestFrameworkVitest) { _%>
 import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest';
-<%_ } _%>
 import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of } from 'rxjs';
 
@@ -40,10 +38,10 @@ describe('User Management Update Component', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         {
           provide: ActivatedRoute,
           useValue: {
@@ -64,7 +62,7 @@ describe('User Management Update Component', () => {
     it('should call update service on save for existing user', inject([], () => {
       // GIVEN
       const entity = { id: <%- tsKeyId %> } as IUserManagement;
-      <%- clientTestFramework %>.spyOn(service, 'update').mockReturnValue(of(entity));
+      vitest.spyOn(service, 'update').mockReturnValue(of(entity));
       comp.editForm.patchValue(entity);
       // WHEN
       comp.save();
@@ -77,7 +75,7 @@ describe('User Management Update Component', () => {
     it('should call create service on save for new user', inject([], () => {
       // GIVEN
       const entity = { login: 'foo' } as IUserManagement;
-      <%- clientTestFramework %>.spyOn(service, 'create').mockReturnValue(of(entity));
+      vitest.spyOn(service, 'create').mockReturnValue(of(entity));
       comp.editForm.patchValue(entity);
       // WHEN
       comp.save();

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

@@ -22,7 +22,6 @@ import { ActivatedRoute } from '@angular/router';
 
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
 
 import { LANGUAGES } from 'app/config/language.constants';
 <%_ } _%>
@@ -53,7 +52,6 @@ const newUser: IUserManagement = {
 <%_ if (enableTranslation) { _%>
     FindLanguageFromKeyPipe,
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
     FontAwesomeModule,
     AlertError,

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

@@ -16,16 +16,14 @@
  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 { signal } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 <%_ if (!authenticationTypeOauth2) { _%>
 import { Router } from '@angular/router';
 <%_ } _%>
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { of<%- authenticationTypeOauth2 ? '' : ', Subject' %> } from 'rxjs';
 
@@ -48,21 +46,21 @@ describe('Home Component', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         {
           provide: AccountService,
           useValue: {
-            isAuthenticated: <%- clientTestFramework %>.fn(),
+            isAuthenticated: vitest.fn(),
           },
         },
 <%_ if (authenticationTypeOauth2) { _%>
         {
           provide: LoginService,
           useValue: {
-            login: <%- clientTestFramework %>.fn(),
+            login: vitest.fn(),
           },
         },
 <%_ } _%>
@@ -74,11 +72,11 @@ describe('Home Component', () => {
     fixture = TestBed.createComponent(Home);
     comp = fixture.componentInstance;
     mockAccountService = TestBed.inject(AccountService);
-    mockAccountService.identity = <%- clientTestFramework %>.fn(() => of(null));
+    mockAccountService.identity = vitest.fn(() => of(null));
 <%_ if (!authenticationTypeOauth2) { _%>
 
     mockRouter = TestBed.inject(Router);
-    <%- clientTestFramework %>.spyOn(mockRouter, 'navigate');
+    vitest.spyOn(mockRouter, 'navigate');
 
 <%_ } else { _%>
     mockLoginService = TestBed.inject(LoginService);

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

@@ -33,7 +33,6 @@ import { Subject, takeUntil } from 'rxjs';
 
 <%_ if (enableTranslation) { _%>
 import { TranslateDirective } from 'app/shared/language';
-import { TranslateModule } from '@ngx-translate/core';
 <%_ } _%>
 <%_ if (authenticationTypeOauth2) { _%>
 import { LoginService } from 'app/login/login.service';
@@ -49,7 +48,6 @@ import { Account } from 'app/core/auth/account.model';
   imports: [
 <%_ if (enableTranslation) { _%>
     TranslateDirective,
-    TranslateModule,
 <%_ } _%>
 <%_ if (generateUserManagement) { _%>
     RouterLink,

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

@@ -20,14 +20,14 @@ import { Component, ChangeDetectionStrategy, inject, signal, OnInit<%- enableTra
 import { ActivatedRoute } from '@angular/router';
 <%_ if (enableTranslation) { _%>
 import { Subscription } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { TranslateService } from '@ngx-translate/core';
 import { TranslateDirective } from 'app/shared/language';
 <%_ } _%>
 
 @Component({
   selector: '<%- jhiPrefixDashed %>-error',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  <%- enableTranslation ? 'imports: [TranslateDirective, TranslateModule],' : '' %>
+  <%- enableTranslation ? 'imports: [TranslateDirective],' : '' %>
   templateUrl: './error.html',
 })
 export default class Error implements OnInit<%- enableTranslation ? ', OnDestroy' : '' %> {
@@ -35,9 +35,7 @@ export default class Error implements OnInit<%- enableTranslation ? ', OnDestroy
 <%_ if (enableTranslation) { _%>
   errorKey?: string;
   langChangeSubscription?: Subscription;
-<%_ } _%>
 
-<%_ if (enableTranslation) { _%>
   private readonly translateService = inject(TranslateService);
 <%_ } _%>
   private readonly route = inject(ActivatedRoute);

package/dist/generators/angular/templates/src/main/webapp/app/layouts/main/main.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 { DOCUMENT } from '@angular/common';
 import { Component, ChangeDetectionStrategy } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
@@ -26,7 +24,7 @@ import { Title } from '@angular/platform-browser';
 import { Router, TitleStrategy } from '@angular/router';
 
 <%_ if (enableTranslation) { _%>
-import { InterpolatableTranslationObject, LangChangeEvent, TranslateModule, TranslateService } from '@ngx-translate/core';
+import { InterpolatableTranslationObject, LangChangeEvent, TranslateService, provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 import { Subject, of } from 'rxjs';
 
@@ -55,10 +53,10 @@ describe('Main', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
+      providers: [
 <%_ if (enableTranslation) { _%>
-      imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-      providers: [
         Title,
 <%_ if (enableI18nRTL) { _%>
         FindLanguageFromKeyPipe,
@@ -66,7 +64,7 @@ describe('Main', () => {
         {
           provide: AccountService,
           useValue: {
-            identity: <%- clientTestFramework %>.fn(() => of(null)),
+            identity: vitest.fn(() => of(null)),
           },
         },
         { provide: TitleStrategy, useClass: AppPageTitleStrategy },
@@ -106,10 +104,10 @@ describe('Main', () => {
     beforeEach(() => {
       routerState.snapshot.root = { data: {} };
 <%_ if (enableTranslation) { _%>
-      <%- clientTestFramework %>.spyOn(translateService, 'get').mockImplementation((key: string | string[]) => of(`${key as string} translated`));
-      <%- clientTestFramework %>.spyOn(translateService, 'getCurrentLang').mockReturnValue('<%- nativeLanguage %>');
+      vitest.spyOn(translateService, 'get').mockImplementation((key: string | string[]) => of(`${key as string} translated`));
+      vitest.spyOn(translateService, 'getCurrentLang').mockReturnValue('<%- nativeLanguage %>');
 <%_ } _%>
-      <%- clientTestFramework %>.spyOn(titleService, 'setTitle');
+      vitest.spyOn(titleService, 'setTitle');
       comp.ngOnInit();
     });
 
@@ -262,7 +260,7 @@ describe('Main', () => {
 
       // WHEN
   <%_ if (enableI18nRTL) { _%>
-      findLanguageFromKeyPipe.isRTL = <%- clientTestFramework %>.fn(() => false);
+      findLanguageFromKeyPipe.isRTL = vitest.fn(() => false);
   <%_ } _%>
       langChangeSubject.next({ lang: 'lang1', translations: {} });
 
@@ -274,7 +272,7 @@ describe('Main', () => {
 
       // WHEN
   <%_ if (enableI18nRTL) { _%>
-      findLanguageFromKeyPipe.isRTL = <%- clientTestFramework %>.fn(() => true);
+      findLanguageFromKeyPipe.isRTL = vitest.fn(() => true);
   <%_ } _%>
       langChangeSubject.next({ lang: 'lang2', translations: {} });
 

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

@@ -54,8 +54,6 @@ export default class Main implements OnInit {
   private readonly document = inject(DOCUMENT);
   private readonly translateService = inject(TranslateService);
   private readonly rootRenderer = inject(RendererFactory2);
-<%_ } _%>
-<%_ if (enableTranslation) { _%>
 
   constructor() {
     this.htmlElement = this.document.documentElement;
@@ -82,7 +80,11 @@ export default class Main implements OnInit {
 
 <%_ if (enableI18nRTL) { _%>
   private updatePageDirection(): void {
-    this.renderer.setAttribute(this.htmlElement, 'dir', this.findLanguageFromKeyPipe.isRTL(this.translateService.getCurrentLang()) ? 'rtl' : 'ltr');
+    this.renderer.setAttribute(
+      this.htmlElement,
+      'dir',
+      this.findLanguageFromKeyPipe.isRTL(this.translateService.getCurrentLang() ?? '<%- nativeLanguage %>') ? 'rtl' : 'ltr',
+    );
   }
 <%_ } _%>
 }

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs

@@ -37,7 +37,7 @@ export default class ActiveMenuDirective implements OnInit {
     this.updateActiveFlag(this.translateService.getCurrentLang());
   }
 
-  updateActiveFlag(selectedLanguage: string): void {
+  updateActiveFlag(selectedLanguage: string | null): void {
     if (this.<%- jhiPrefix %>ActiveMenu() === selectedLanguage) {
       this.renderer.addClass(this.el.nativeElement, 'active');
     } else {

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.spec.ts.ejs

@@ -16,15 +16,13 @@
  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 { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
-import { TranslateModule } from '@ngx-translate/core';
+import { provideTranslateService } from '@ngx-translate/core';
 <%_ } _%>
 
 import { ProfileInfo } from 'app/layouts/profiles/profile-info.model';
@@ -54,10 +52,10 @@ describe('Navbar Component', () => {
   beforeEach(
     () => {
       TestBed.configureTestingModule({
+        providers: [
 <%_ if (enableTranslation) { _%>
-        imports: [TranslateModule.forRoot()],
+        provideTranslateService(),
 <%_ } _%>
-        providers: [
           {
             provide: ActivatedRoute,
             useValue: {}
@@ -73,7 +71,7 @@ describe('Navbar Component', () => {
     fixture = TestBed.createComponent(Navbar);
     comp = fixture.componentInstance;
 <%_ if (applicationTypeGateway && microfrontend) { _%>
-    comp.loadMicrofrontendsEntities = <%- clientTestFramework %>.fn();
+    comp.loadMicrofrontendsEntities = vitest.fn();
 <%_ } _%>
     accountService = TestBed.inject(AccountService);
     profileService = TestBed.inject(ProfileService);
@@ -81,7 +79,7 @@ describe('Navbar Component', () => {
 
   it('should call profileService.getProfileInfo on init', () => {
     // GIVEN
-    <%- clientTestFramework %>.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
+    vitest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(new ProfileInfo()));
 
     // WHEN
     comp.ngOnInit();