diff --git a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts index 5933903f5514..ca1bd13f937c 100644 --- a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts +++ b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.ts @@ -1,10 +1,13 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, inject } from '@angular/core'; import { faUser } from '@fortawesome/free-solid-svg-icons'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_LOCALVC } from 'app/app.constants'; import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; import { tap } from 'rxjs'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { RouterModule } from '@angular/router'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; /** * UserSettingsContainerComponent serves as the common ground for different settings @@ -12,9 +15,14 @@ import { tap } from 'rxjs'; @Component({ selector: 'jhi-user-settings', templateUrl: 'user-settings-container.component.html', + standalone: true, styleUrls: ['user-settings-container.component.scss'], + imports: [TranslateDirective, RouterModule, FontAwesomeModule], }) export class UserSettingsContainerComponent implements OnInit { + private readonly profileService = inject(ProfileService); + private readonly accountService = inject(AccountService); + // Icons faUser = faUser; @@ -22,11 +30,6 @@ export class UserSettingsContainerComponent implements OnInit { localVCEnabled = false; isAtLeastTutor = false; - constructor( - private profileService: ProfileService, - private accountService: AccountService, - ) {} - ngOnInit() { this.profileService.getProfileInfo().subscribe((profileInfo) => { this.localVCEnabled = profileInfo.activeProfiles.includes(PROFILE_LOCALVC); @@ -38,7 +41,6 @@ export class UserSettingsContainerComponent implements OnInit { tap((user: User) => { this.currentUser = user; this.authorizeTutor(); - console.log(this.currentUser.authorities); return this.currentUser; }), ) diff --git a/src/main/webapp/app/shared/user-settings/user-settings.module.ts b/src/main/webapp/app/shared/user-settings/user-settings.module.ts index bc91e586ecb2..869e8cea1c35 100644 --- a/src/main/webapp/app/shared/user-settings/user-settings.module.ts +++ b/src/main/webapp/app/shared/user-settings/user-settings.module.ts @@ -1,5 +1,4 @@ import { NgModule } from '@angular/core'; -import { UserSettingsContainerComponent } from 'app/shared/user-settings/user-settings-container/user-settings-container.component'; import { AccountInformationComponent } from 'app/shared/user-settings/account-information/account-information.component'; import { NotificationSettingsComponent } from 'app/shared/user-settings/notification-settings/notification-settings.component'; import { ArtemisSharedModule } from 'app/shared/shared.module'; @@ -16,7 +15,6 @@ import { IdeSettingsComponent } from 'app/shared/user-settings/ide-preferences/i @NgModule({ imports: [RouterModule.forChild(userSettingsState), ArtemisSharedModule, ArtemisSharedComponentModule, ClipboardModule, FormDateTimePickerModule], declarations: [ - UserSettingsContainerComponent, AccountInformationComponent, NotificationSettingsComponent, ScienceSettingsComponent, diff --git a/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts b/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts index 48ee21c6a6e8..d82f0614375c 100644 --- a/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts +++ b/src/test/javascript/spec/component/account/user-settings-container.component.spec.ts @@ -4,7 +4,7 @@ import { of } from 'rxjs'; import { Router, RouterModule } from '@angular/router'; import { ArtemisTestModule } from '../../test.module'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; -import { MockTranslateService, TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; +import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { PROFILE_LOCALVC } from 'app/app.constants'; @@ -27,8 +27,7 @@ describe('UserSettingsContainerComponent', () => { }; await TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterModule], - declarations: [UserSettingsContainerComponent, TranslatePipeMock], + imports: [UserSettingsContainerComponent, ArtemisTestModule, RouterModule], providers: [ { provide: ProfileService, useValue: profileServiceMock }, { provide: TranslateService, useClass: MockTranslateService },