fix tests

Author: barais

.github/workflows/cloudfare.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Install Dependencies
         if: steps.cache-nodemodules.outputs.cache-hit != 'true'
         run: |
-          npm ci
+          npm ci --legacy-peer-deps
       - name: Build
         run: |
           npm run webapp:build:prodcloudfare

.github/workflows/netlify.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Install Dependencies
         if: steps.cache-nodemodules.outputs.cache-hit != 'true'
         run: |
-          npm ci
+          npm ci --legacy-peer-deps
       - name: Build
         run: |
           npm run webapp:build:prodnetlify

.github/workflows/node.js.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Install Dependencies
         if: steps.cache-nodemodules.outputs.cache-hit != 'true'
         run: |
-          npm ci
+          npm ci --legacy-peer-deps
 #      - name: Copy patch primeng
 #        run: |
 #          cp ./src/main/resources/primeng-galleria.mjs ./node_modules/primeng/fesm2022/primeng-galleria.mjs

package-lock.json

@@ -11,6 +11,7 @@ import { AccountService } from 'app/core/auth/account.service';
 import { PasswordComponent } from './password.component';
 import { PasswordService } from './password.service';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('PasswordComponent', () => {
   let comp: PasswordComponent;
@@ -19,7 +20,7 @@ describe('PasswordComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [ReactiveFormsModule, FormsModule, PasswordComponent],
+      imports: [ReactiveFormsModule, FormsModule, PasswordComponent, TranslateModule.forRoot()],
       declarations: [],
       providers: [FormBuilder, AccountService, provideHttpClient(), provideHttpClientTesting()],
     })

src/main/webapp/app/account/password/password.component.spec.ts

@@ -7,7 +7,7 @@ import { Account } from 'app/core/auth/account.model';
 import { PasswordService } from './password.service';
 import { PasswordStrengthBarComponent } from './password-strength-bar/password-strength-bar.component';
 import { AsyncPipe } from '@angular/common';
-import { TranslateDirective, TranslatePipe } from '@ngx-translate/core';
+import { TranslateDirective, TranslatePipe, TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'jhi-password',
@@ -26,6 +26,7 @@ export class PasswordComponent implements OnInit {
     private passwordService: PasswordService,
     private accountService: AccountService,
     private fb: UntypedFormBuilder,
+    private translateService: TranslateService,
   ) {
     this.passwordForm = this.fb.group({
       currentPassword: ['', [Validators.required]],
@@ -36,6 +37,11 @@ export class PasswordComponent implements OnInit {
 
   ngOnInit(): void {
     this.account$ = this.accountService.identity();
+    this.account$.subscribe(account => {
+      if (account?.langKey) {
+        this.translateService.use(account.langKey);
+      }
+    });
   }
 
   changePassword(): void {

src/main/webapp/app/account/password/password.component.ts

@@ -45,7 +45,7 @@ describe('RegisterComponent', () => {
     [RegisterService, TranslateService],
     fakeAsync((service: RegisterService, mockTranslateService: TranslateService) => {
       jest.spyOn(service, 'save').mockReturnValue(of({}));
-      mockTranslateService.currentLang = 'fr';
+      mockTranslateService.use('fr');
       comp.registerForm.patchValue({
         password: 'password',
         confirmPassword: 'password',

src/main/webapp/app/account/register/register.component.spec.ts

@@ -35,6 +35,10 @@ export class SettingsComponent implements OnInit {
 
   ngOnInit(): void {
     this.accountService.identity().subscribe(account => {
+      if (account?.langKey) {
+        this.translateService.use(account.langKey);
+      }
+
       if (account) {
         this.settingsForm.patchValue({
           firstName: account.firstName,

src/main/webapp/app/account/settings/settings.component.ts

@@ -12,6 +12,7 @@ import { AccountService } from 'app/core/auth/account.service';
 
 import { UserManagementComponent } from './user-management.component';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
 describe('User Management Component', () => {
   let comp: UserManagementComponent;
@@ -31,7 +32,7 @@ describe('User Management Component', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [UserManagementComponent],
+      imports: [UserManagementComponent, TranslateModule.forRoot()],
       declarations: [],
       providers: [
         provideHttpClient(),

src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts

@@ -17,6 +17,7 @@ import { DatePipe } from '@angular/common';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertErrorComponent } from '../../../shared/alert/alert-error.component';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'jhi-user-mgmt',
@@ -51,10 +52,16 @@ export class UserManagementComponent implements OnInit {
     private router: Router,
     private modalService: NgbModal,
     private zone: NgZone,
+    private translateService: TranslateService,
   ) {}
 
   ngOnInit(): void {
-    this.accountService.identity().subscribe(account => (this.currentAccount = account));
+    this.accountService.identity().subscribe(account => {
+      this.currentAccount = account;
+      if (account?.langKey) {
+        this.translateService.use(account.langKey);
+      }
+    });
     this.handleNavigation();
   }