diff --git a/src/app/base/core.component.spec.ts b/src/app/base/core.component.spec.ts index d318d63be..37b95ddb8 100644 --- a/src/app/base/core.component.spec.ts +++ b/src/app/base/core.component.spec.ts @@ -2,14 +2,14 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { LoggerTestingModule } from 'ngx-logger/testing'; -import { Injector, PLATFORM_ID } from '@angular/core'; +import { Injector, PLATFORM_ID, signal } from '@angular/core'; import { Router, RouterModule } from '@angular/router'; import { REQUEST, RESPONSE } from '../../express.tokens'; import { EmptyMockComponent, SERVER_REQUEST, SERVER_RESPONSE } from '@tests/app.mocks'; import { AppInjector, CoreModule } from '@modules/core'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { CoreComponent } from './core.component'; @@ -108,7 +108,7 @@ describe('App/Base/CoreComponent running CLIENT side', () => { let router: Router; let routerSpy: jest.SpyInstance; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let component: CoreComponent; let fixture: ComponentFixture; @@ -131,7 +131,7 @@ describe('App/Base/CoreComponent running CLIENT side', () => { router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); }); it('should create the component', () => { @@ -231,7 +231,7 @@ describe('App/Base/CoreComponent running CLIENT side', () => { // })); it(`should run userUrlBasePath()`, () => { - authenticationStore.userUrlBasePath = () => 'innovator'; + ctx.user.userUrlBasePath = signal('innovator'); fixture = TestBed.createComponent(CoreComponent); component = fixture.componentInstance; diff --git a/src/app/base/core.component.ts b/src/app/base/core.component.ts index cbdb23578..bd51e28d3 100644 --- a/src/app/base/core.component.ts +++ b/src/app/base/core.component.ts @@ -12,7 +12,6 @@ import { REQUEST, RESPONSE } from '../../express.tokens'; import { AppInjector } from '@modules/core/injectors/app-injector'; import { EnvironmentVariablesStore } from '@modules/core/stores/environment-variables.store'; -import { AuthenticationStore } from '@modules/stores/authentication/authentication.store'; import { AlertType, LinkType, MappedObjectType } from '@modules/core/interfaces/base.interfaces'; import { URLS } from './constants'; @@ -50,10 +49,6 @@ export class CoreComponent implements OnDestroy { URLS: typeof URLS; }; - protected stores: { - authentication: AuthenticationStore; - }; - protected ctx: CtxStore; protected subscriptions: Subscription[] = []; @@ -91,10 +86,6 @@ export class CoreComponent implements OnDestroy { URLS: URLS }; - this.stores = { - authentication: injector.get(AuthenticationStore) - }; - this.ctx = injector.get(CtxStore); this.ctx.layout.setCurrentUrl(this.location.path()); @@ -190,7 +181,7 @@ export class CoreComponent implements OnDestroy { // If no url is provided, use the previous url or default to the dashboard to avoid getting out of the app. if (!urlOrCallback) { - urlOrCallback = this.ctx.layout.previousUrl() ?? `/${this.stores.authentication.userUrlBasePath()}/dashboard`; + urlOrCallback = this.ctx.layout.previousUrl() ?? `/${this.ctx.user.userUrlBasePath()}/dashboard`; } this.ctx.layout.update({ backLink: { label, callback: urlOrCallback, hiddenLabel } }); @@ -264,8 +255,9 @@ export class CoreComponent implements OnDestroy { // } // } + // TODO: this could return a signal or be a computed from the store userUrlBasePath(): string { - return this.stores.authentication.userUrlBasePath(); + return this.ctx.user.userUrlBasePath(); } redirectTo(url: string, queryParams: MappedObjectType = {}): void { diff --git a/src/app/base/core.service.spec.ts b/src/app/base/core.service.spec.ts index 78588c31f..303a13b55 100644 --- a/src/app/base/core.service.spec.ts +++ b/src/app/base/core.service.spec.ts @@ -2,17 +2,17 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; import { LoggerTestingModule } from 'ngx-logger/testing'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { AppInjector, CoreModule } from '@modules/core'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { UserRoleEnum } from './enums'; import { CoreService } from './core.service'; describe('App/Base/CoreService', () => { - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let service: CoreService; @@ -24,7 +24,7 @@ describe('App/Base/CoreService', () => { AppInjector.setInjector(TestBed.inject(Injector)); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); service = TestBed.inject(CoreService); }); @@ -34,28 +34,28 @@ describe('App/Base/CoreService', () => { }); it(`should run apiUserBasePath() as Admin`, () => { - authenticationStore.getUserType = () => UserRoleEnum.ADMIN; + ctx.user.getUserType = signal(UserRoleEnum.ADMIN); expect(service.apiUserBasePath()).toBe('user-admin'); }); it(`should run apiUserBasePath() as NA`, () => { - authenticationStore.getUserType = () => UserRoleEnum.ASSESSMENT; + ctx.user.getUserType = signal(UserRoleEnum.ASSESSMENT); expect(service.apiUserBasePath()).toBe('assessments'); }); it(`should run apiUserBasePath() as Accessor`, () => { - authenticationStore.getUserType = () => UserRoleEnum.ACCESSOR; + ctx.user.getUserType = signal(UserRoleEnum.ACCESSOR); expect(service.apiUserBasePath()).toBe('accessors'); }); it(`should run apiUserBasePath() as Innovator`, () => { - authenticationStore.getUserType = () => UserRoleEnum.INNOVATOR; + ctx.user.getUserType = signal(UserRoleEnum.INNOVATOR); expect(service.apiUserBasePath()).toBe('innovators'); }); it(`should run apiUserBasePath() as nothing`, () => { - authenticationStore.getUserType = () => undefined; + ctx.user.getUserType = signal(undefined); expect(service.apiUserBasePath()).toBe(''); }); it(`should run userUrlBasePath()`, () => { - authenticationStore.userUrlBasePath = () => 'innovator'; + ctx.user.userUrlBasePath = signal('innovator'); expect(service.userUrlBasePath()).toBe('innovator'); }); diff --git a/src/app/base/core.service.ts b/src/app/base/core.service.ts index 49fad44f6..02abd282a 100644 --- a/src/app/base/core.service.ts +++ b/src/app/base/core.service.ts @@ -6,9 +6,7 @@ import { NGXLogger } from 'ngx-logger'; import { AppInjector } from '@modules/core/injectors/app-injector'; import { EnvironmentVariablesStore } from '@modules/core/stores/environment-variables.store'; -import { AuthenticationStore } from '@modules/stores/authentication/authentication.store'; -import { UserRoleEnum } from '@modules/stores/authentication/authentication.enums'; -import { ContextLayoutType, CtxStore } from '@modules/stores'; +import { ContextLayoutType, CtxStore, UserRoleEnum } from '@modules/stores'; @Injectable() export class CoreService { @@ -18,10 +16,6 @@ export class CoreService { protected translateService: TranslateService; protected logger: NGXLogger; - protected stores: { - authentication: AuthenticationStore; - }; - protected ctx: CtxStore; protected APP_URL: string; @@ -38,10 +32,6 @@ export class CoreService { this.translateService = injector.get(TranslateService); this.logger = injector.get(NGXLogger); - this.stores = { - authentication: injector.get(AuthenticationStore) - }; - this.ctx = injector.get(CtxStore); this.APP_URL = this.envVariablesStore.APP_URL; this.API_URL = this.envVariablesStore.API_URL; @@ -60,7 +50,7 @@ export class CoreService { } apiUserBasePath(): string { - switch (this.stores.authentication.getUserType()) { + switch (this.ctx.user.getUserType()) { case UserRoleEnum.ADMIN: return 'user-admin'; case UserRoleEnum.ASSESSMENT: @@ -75,8 +65,9 @@ export class CoreService { } } + // TODO: could return a computed from the store userUrlBasePath(): string { - return this.stores.authentication.userUrlBasePath(); + return this.ctx.user.userUrlBasePath(); } translate(translation: string, params?: object): string { diff --git a/src/app/base/enums.ts b/src/app/base/enums.ts index b7d4547e4..2399b74c9 100644 --- a/src/app/base/enums.ts +++ b/src/app/base/enums.ts @@ -1,12 +1,5 @@ -// Authentication store. -export { - UserRoleEnum, - InnovatorOrganisationRoleEnum, - AccessorOrganisationRoleEnum -} from '@modules/stores/authentication/authentication.enums'; - -// Authentication store. -export { TermsOfUseTypeEnum } from '@modules/stores/authentication/authentication.enums'; +// Stores +export { UserRoleEnum, TermsOfUseTypeEnum } from '@modules/stores'; // Environment store. export { diff --git a/src/modules/core/guards/authentication-redirection.guard.spec.ts b/src/modules/core/guards/authentication-redirection.guard.spec.ts index ca3bfceb2..90ba910a0 100644 --- a/src/modules/core/guards/authentication-redirection.guard.spec.ts +++ b/src/modules/core/guards/authentication-redirection.guard.spec.ts @@ -6,15 +6,15 @@ import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot } from '@angu import { EmptyMockComponent } from '@tests/app.mocks'; import { CoreModule } from '@modules/core'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { UserRoleEnum } from '@app/base/enums'; -import { PLATFORM_ID } from '@angular/core'; +import { PLATFORM_ID, signal } from '@angular/core'; import { AuthenticationRedirectionGuard } from './authentication-redirection.guard'; describe('Core/Guards/AuthenticationRedirectionGuard', () => { - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let guard: AuthenticationRedirectionGuard; @@ -37,7 +37,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { providers: [{ provide: PLATFORM_ID, useValue: 'browser' }] }); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); guard = TestBed.inject(AuthenticationRedirectionGuard); @@ -49,8 +49,8 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'terms-of-use' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.INNOVATOR; - authenticationStore.isTermsOfUseAccepted = () => false; + ctx.user.getUserType = signal(UserRoleEnum.INNOVATOR); + ctx.user.isTermsOfUseAccepted = signal(false); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); @@ -58,7 +58,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { const activatedRouteSnapshotMock: Partial = { queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => undefined; + ctx.user.getUserType = signal(undefined); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); @@ -67,7 +67,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'dashboard' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.ASSESSMENT; + ctx.user.getUserType = signal(UserRoleEnum.ASSESSMENT); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); it('should deny access and redirect when user type is ACCESSOR', () => { @@ -75,7 +75,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'dashboard' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.ACCESSOR; + ctx.user.getUserType = signal(UserRoleEnum.ACCESSOR); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); it('should deny access and redirect when user type is INNOVATOR', () => { @@ -83,7 +83,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'dashboard' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.INNOVATOR; + ctx.user.getUserType = signal(UserRoleEnum.INNOVATOR); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); it('should deny access and redirect when user type is ADMIN', () => { @@ -91,7 +91,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'dashboard' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.ADMIN; + ctx.user.getUserType = signal(UserRoleEnum.ADMIN); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); @@ -100,7 +100,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'innovator' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.ASSESSMENT; + ctx.user.getUserType = signal(UserRoleEnum.ASSESSMENT); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); it('should deny access and redirect when user type is ACCESSOR', () => { @@ -108,7 +108,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'innovator' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.ACCESSOR; + ctx.user.getUserType = signal(UserRoleEnum.ACCESSOR); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); it('should deny access and redirect when user type is INNOVATOR', () => { @@ -116,7 +116,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'accessor' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.INNOVATOR; + ctx.user.getUserType = signal(UserRoleEnum.INNOVATOR); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); it('should deny access and redirect when user type is ADMIN', () => { @@ -124,7 +124,7 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'innovator' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.ADMIN; + ctx.user.getUserType = signal(UserRoleEnum.ADMIN); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(false); }); @@ -133,11 +133,9 @@ describe('Core/Guards/AuthenticationRedirectionGuard', () => { routeConfig: { path: 'innovator' }, queryParams: { dismissNotification: undefined } }; - authenticationStore.getUserType = () => UserRoleEnum.INNOVATOR; - authenticationStore.isTermsOfUseAccepted = () => true; - authenticationStore.getUserContextInfo = () => { - return { id: 'userId', roleId: 'id', type: UserRoleEnum.INNOVATOR }; - }; + ctx.user.getUserType = signal(UserRoleEnum.INNOVATOR); + ctx.user.isTermsOfUseAccepted = signal(true); + ctx.user.getUserContext = signal({ id: 'userId', roleId: 'id', type: UserRoleEnum.INNOVATOR }); expect(guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any)).toBe(true); }); }); diff --git a/src/modules/core/guards/authentication-redirection.guard.ts b/src/modules/core/guards/authentication-redirection.guard.ts index 959bbddc4..d85114b4b 100644 --- a/src/modules/core/guards/authentication-redirection.guard.ts +++ b/src/modules/core/guards/authentication-redirection.guard.ts @@ -3,20 +3,17 @@ import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; import { CtxStore } from '@modules/stores'; -import { AuthenticationStore } from '@modules/stores/authentication/authentication.store'; - @Injectable() export class AuthenticationRedirectionGuard { constructor( @Inject(PLATFORM_ID) private platformId: object, private router: Router, - private authentication: AuthenticationStore, private ctx: CtxStore ) {} canActivate(activatedRouteSnapshot: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { const pathSegment = activatedRouteSnapshot.routeConfig?.path || ''; - const userContext = this.authentication.getUserContextInfo(); + const userContext = this.ctx.user.getUserContext(); const dismissNotification = activatedRouteSnapshot.queryParams.dismissNotification; if (isPlatformServer(this.platformId)) { @@ -33,12 +30,8 @@ export class AuthenticationRedirectionGuard { this.ctx.notifications.dismiss({ notificationIds: [dismissNotification] }); } - if ( - !state.url.endsWith('terms-of-use') && - userContext?.type !== 'ADMIN' && - !this.authentication.isTermsOfUseAccepted() - ) { - const path = this.authentication.userUrlBasePath() + '/terms-of-use'; + if (!state.url.endsWith('terms-of-use') && userContext?.type !== 'ADMIN' && !this.ctx.user.isTermsOfUseAccepted()) { + const path = this.ctx.user.userUrlBasePath() + '/terms-of-use'; this.router.navigateByUrl(path); return false; } @@ -47,7 +40,7 @@ export class AuthenticationRedirectionGuard { !state.url.endsWith('announcements') && !state.url.includes('terms-of-use') && userContext.type !== 'ADMIN' && - this.authentication.hasAnnouncements() + this.ctx.user.hasAnnouncements() ) { this.router.navigate(['announcements']); return false; @@ -60,21 +53,21 @@ export class AuthenticationRedirectionGuard { alert: activatedRouteSnapshot.queryParams.state } : undefined; - this.router.navigateByUrl(this.authentication.userUrlBasePath(), alert && { state: alert }); + this.router.navigateByUrl(this.ctx.user.userUrlBasePath(), alert && { state: alert }); return false; } if (pathSegment === 'account/email-notifications') { - const url = `${this.authentication.userUrlBasePath()}/${pathSegment}`; + const url = `${this.ctx.user.userUrlBasePath()}/${pathSegment}`; this.router.navigateByUrl(url); return false; } - if (pathSegment === this.authentication.userUrlBasePath()) { + if (pathSegment === this.ctx.user.userUrlBasePath()) { this.ctx.notifications.fetchUnread$.next(); return true; } else { - this.router.navigateByUrl(this.authentication.userUrlBasePath()); + this.router.navigateByUrl(this.ctx.user.userUrlBasePath()); return false; } } diff --git a/src/modules/core/guards/authentication.guard.spec.ts b/src/modules/core/guards/authentication.guard.spec.ts index 1b4bf3209..babf06335 100644 --- a/src/modules/core/guards/authentication.guard.spec.ts +++ b/src/modules/core/guards/authentication.guard.spec.ts @@ -8,13 +8,13 @@ import { of, throwError } from 'rxjs'; import { SERVER_REQUEST, SERVER_RESPONSE } from '@tests/app.mocks'; import { CoreModule } from '@modules/core'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot } from '@angular/router'; import { AuthenticationGuard } from './authentication.guard'; describe('Core/Guards/AuthenticationGuard running SERVER side', () => { - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let guard: AuthenticationGuard; @@ -30,7 +30,7 @@ describe('Core/Guards/AuthenticationGuard running SERVER side', () => { ] }); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); guard = TestBed.inject(AuthenticationGuard); @@ -42,7 +42,7 @@ describe('Core/Guards/AuthenticationGuard running SERVER side', () => { const activatedRouteSnapshotMock: Partial = {}; - authenticationStore.initializeAuthentication$ = () => throwError('error'); + ctx.user.initializeAuthentication$ = () => throwError('error'); guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any).subscribe(response => { expected = response; @@ -53,7 +53,7 @@ describe('Core/Guards/AuthenticationGuard running SERVER side', () => { }); describe('Core/Guards/AuthenticationGuard running CLIENT side', () => { - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let guard: AuthenticationGuard; @@ -65,7 +65,7 @@ describe('Core/Guards/AuthenticationGuard running CLIENT side', () => { providers: [{ provide: PLATFORM_ID, useValue: 'browser' }] }); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); guard = TestBed.inject(AuthenticationGuard); @@ -77,7 +77,7 @@ describe('Core/Guards/AuthenticationGuard running CLIENT side', () => { const activatedRouteSnapshotMock: Partial = {}; - authenticationStore.initializeAuthentication$ = () => of(true); + ctx.user.initializeAuthentication$ = () => of(true); guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any).subscribe(response => { expected = response; @@ -93,7 +93,7 @@ describe('Core/Guards/AuthenticationGuard running CLIENT side', () => { const activatedRouteSnapshotMock: Partial = {}; - authenticationStore.initializeAuthentication$ = () => throwError('error'); + ctx.user.initializeAuthentication$ = () => throwError('error'); guard.canActivate(activatedRouteSnapshotMock as any, routerStateSnapshopMock as any).subscribe(response => { expected = response; }); diff --git a/src/modules/core/guards/authentication.guard.ts b/src/modules/core/guards/authentication.guard.ts index b1032db16..2df3b06f6 100644 --- a/src/modules/core/guards/authentication.guard.ts +++ b/src/modules/core/guards/authentication.guard.ts @@ -8,9 +8,9 @@ import { catchError, map } from 'rxjs/operators'; import { RESPONSE } from '../../../express.tokens'; import { Response } from 'express'; -import { AuthenticationStore } from '../../stores/authentication/authentication.store'; import { LoggerService, Severity } from '../services/logger.service'; import { EnvironmentVariablesStore } from '../stores/environment-variables.store'; +import { CtxStore } from '@modules/stores'; @Injectable() export class AuthenticationGuard { @@ -18,12 +18,12 @@ export class AuthenticationGuard { @Inject(PLATFORM_ID) private platformId: object, @Optional() @Inject(RESPONSE) private serverResponse: Response, private environmentStore: EnvironmentVariablesStore, - private authentication: AuthenticationStore, + private ctx: CtxStore, private loggerService: LoggerService ) {} canActivate(_route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return this.authentication.initializeAuthentication$().pipe( + return this.ctx.user.initializeAuthentication$().pipe( map(response => response), catchError((e: HttpErrorResponse) => { this.loggerService.trackTrace( diff --git a/src/modules/core/helpers/utils.helper.ts b/src/modules/core/helpers/utils.helper.ts index 9e9373cff..5d20ac060 100644 --- a/src/modules/core/helpers/utils.helper.ts +++ b/src/modules/core/helpers/utils.helper.ts @@ -8,8 +8,7 @@ import { SupportUpdatedResponseDTO } from '@modules/feature-modules/accessor/services/accessor.service'; import { OrganisationsListDTO } from '@modules/shared/services/organisations.service'; -import { SchemaContextStore } from '@modules/stores'; -import { PhoneUserPreferenceEnum } from '@modules/stores/authentication/authentication.service'; +import { PhoneUserPreferenceEnum, SchemaContextStore } from '@modules/stores'; export class UtilsHelper { static isEmpty(value: any) { diff --git a/src/modules/core/interceptors/api-out.interceptor.spec.ts b/src/modules/core/interceptors/api-out.interceptor.spec.ts index e8c44e3b2..9d0e281b0 100644 --- a/src/modules/core/interceptors/api-out.interceptor.spec.ts +++ b/src/modules/core/interceptors/api-out.interceptor.spec.ts @@ -1,27 +1,30 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { PLATFORM_ID } from '@angular/core'; +import { PLATFORM_ID, signal } from '@angular/core'; import { REQUEST, RESPONSE } from '../../../express.tokens'; import { ENV, SERVER_REQUEST, SERVER_RESPONSE } from '@tests/app.mocks'; import { UserRoleEnum } from '@app/base/enums'; import { CoreModule, EnvironmentVariablesStore } from '@modules/core'; -import { AuthenticationService, AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { RouterModule } from '@angular/router'; +import { UserContextStore } from '@modules/stores/ctx/user/user.store'; +import { UserContextService } from '@modules/stores/ctx/user/user.service'; describe('Core/Interceptors/ApiOutInterceptor running SERVER side', () => { let httpMock: HttpTestingController; let envVariablesStore: EnvironmentVariablesStore; - let authenticationService: AuthenticationService; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, RouterModule, CoreModule, StoresModule], providers: [ - AuthenticationService, + CtxStore, + UserContextStore, + UserContextService, { provide: 'APP_SERVER_ENVIRONMENT_VARIABLES', useValue: ENV }, { provide: PLATFORM_ID, useValue: 'server' }, { provide: REQUEST, useValue: SERVER_REQUEST }, @@ -31,8 +34,7 @@ describe('Core/Interceptors/ApiOutInterceptor running SERVER side', () => { httpMock = TestBed.inject(HttpTestingController); envVariablesStore = TestBed.inject(EnvironmentVariablesStore); - authenticationStore = TestBed.inject(AuthenticationStore); - authenticationService = TestBed.inject(AuthenticationService); + ctx = TestBed.inject(CtxStore); }); afterEach(() => { @@ -43,13 +45,13 @@ describe('Core/Interceptors/ApiOutInterceptor running SERVER side', () => { const responseMock = true; let response: any = null; - authenticationStore.getUserContextInfo = () => ({ + ctx.user.getUserContext = signal({ id: 'userId', roleId: '123', type: UserRoleEnum.ADMIN }); - authenticationService - .verifyUserSession() + ctx.user + .verifyUserSession$() .subscribe({ next: success => (response = success), error: error => (response = error) }); const httpRequest = httpMock.expectOne(`${envVariablesStore.APP_URL}/session`); @@ -63,13 +65,15 @@ describe('Core/Interceptors/ApiOutInterceptor running SERVER side', () => { describe('Core/Interceptors/ApiOutInterceptor running CLIENT side', () => { let httpMock: HttpTestingController; let environmentStore: EnvironmentVariablesStore; - let authenticationService: AuthenticationService; + let ctx: CtxStore; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule, RouterModule, CoreModule, StoresModule], providers: [ - AuthenticationService, + CtxStore, + UserContextStore, + UserContextService, { provide: 'APP_SERVER_ENVIRONMENT_VARIABLES', useValue: ENV }, { provide: PLATFORM_ID, useValue: 'browser' } @@ -78,7 +82,7 @@ describe('Core/Interceptors/ApiOutInterceptor running CLIENT side', () => { httpMock = TestBed.inject(HttpTestingController); environmentStore = TestBed.inject(EnvironmentVariablesStore); - authenticationService = TestBed.inject(AuthenticationService); + ctx = TestBed.inject(CtxStore); }); afterEach(() => { @@ -89,8 +93,8 @@ describe('Core/Interceptors/ApiOutInterceptor running CLIENT side', () => { const responseMock = true; let response: any = null; - authenticationService - .verifyUserSession() + ctx.user + .verifyUserSession$() .subscribe({ next: success => (response = success), error: error => (response = error) }); const httpRequest = httpMock.expectOne(`${environmentStore.APP_URL}/session`); diff --git a/src/modules/core/interceptors/api-out.interceptor.ts b/src/modules/core/interceptors/api-out.interceptor.ts index 1d258f311..4b655c93d 100644 --- a/src/modules/core/interceptors/api-out.interceptor.ts +++ b/src/modules/core/interceptors/api-out.interceptor.ts @@ -1,7 +1,7 @@ import { isPlatformServer } from '@angular/common'; import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpXsrfTokenExtractor } from '@angular/common/http'; import { Inject, Injectable, Optional, PLATFORM_ID } from '@angular/core'; -import { AuthenticationStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; import { Request } from 'express'; import { Observable } from 'rxjs'; import { REQUEST } from '../../../express.tokens'; @@ -13,13 +13,13 @@ export class ApiOutInterceptor implements HttpInterceptor { constructor( @Inject(PLATFORM_ID) private platformId: object, @Optional() @Inject(REQUEST) private serverRequest: Request, - private authentication: AuthenticationStore, + private ctx: CtxStore, private envVariablesStore: EnvironmentVariablesStore, private tokenExtractor: HttpXsrfTokenExtractor ) {} intercept(request: HttpRequest, next: HttpHandler): Observable> { - const userContext = this.authentication.getUserContextInfo(); + const userContext = this.ctx.user.getUserContext(); if (isPlatformServer(this.platformId)) { request = request.clone({ diff --git a/src/modules/feature-modules/accessor/base/sidebar-innovation-menu-outlet.component.ts b/src/modules/feature-modules/accessor/base/sidebar-innovation-menu-outlet.component.ts index 6ea10c7f2..5a0ae6bac 100644 --- a/src/modules/feature-modules/accessor/base/sidebar-innovation-menu-outlet.component.ts +++ b/src/modules/feature-modules/accessor/base/sidebar-innovation-menu-outlet.component.ts @@ -4,7 +4,7 @@ import { Subscription } from 'rxjs'; import { filter } from 'rxjs/operators'; import { ViewportScroller } from '@angular/common'; -import { AuthenticationStore, CtxStore, InnovationStatusEnum } from '@modules/stores'; +import { CtxStore, InnovationStatusEnum } from '@modules/stores'; @Component({ selector: 'app-base-sidebar-innovation-menu-outlet', @@ -18,8 +18,6 @@ export class SidebarInnovationMenuOutletComponent implements OnInit, OnDestroy { showHeading = false; isAllSectionsDetailsPage = false; isInnovationRecordPage = false; - isQualifyingAccessorRole: boolean; - private sectionsSidebar: { label: string; url: string; children?: { label: string; id: string; url: string }[] }[] = []; private _sidebarItems: { label: string; url: string; id?: string }[] = []; @@ -27,11 +25,8 @@ export class SidebarInnovationMenuOutletComponent implements OnInit, OnDestroy { constructor( private router: Router, readonly ctx: CtxStore, - private scroller: ViewportScroller, - private authenticationStore: AuthenticationStore + private scroller: ViewportScroller ) { - this.isQualifyingAccessorRole = this.authenticationStore.isQualifyingAccessorRole(); - this.subscriptions.add( this.router.events .pipe(filter((e): e is NavigationEnd => e instanceof NavigationEnd)) @@ -66,7 +61,7 @@ export class SidebarInnovationMenuOutletComponent implements OnInit, OnDestroy { ? [{ label: 'Support summary', url: `/accessor/innovations/${innovation.id}/support-summary` }] : []), { - label: this.isQualifyingAccessorRole ? 'Suggest support' : 'Data sharing preferences', + label: this.ctx.user.isQualifyingAccessor() ? 'Suggest support' : 'Data sharing preferences', url: `/accessor/innovations/${innovation.id}/support` }, { label: 'Activity log', url: `/accessor/innovations/${innovation.id}/activity-log` }, diff --git a/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.spec.ts b/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.spec.ts index 6b0ede76b..0e2edea01 100644 --- a/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.spec.ts +++ b/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.spec.ts @@ -3,10 +3,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Injector } from '@angular/core'; -import { USER_INFO_INNOVATOR } from '@tests/data.mocks'; - import { CoreModule, AppInjector } from '@modules/core'; -import { StoresModule, AuthenticationStore } from '@modules/stores'; +import { StoresModule } from '@modules/stores'; import { AccessorModule } from '@modules/feature-modules/accessor/accessor.module'; @@ -14,8 +12,6 @@ import { DashboardComponent } from './dashboard.component'; import { RouterModule } from '@angular/router'; describe('FeatureModules/Accessor/Dashboard/DashboardComponent', () => { - let authenticationStore: AuthenticationStore; - let component: DashboardComponent; let fixture: ComponentFixture; @@ -25,8 +21,6 @@ describe('FeatureModules/Accessor/Dashboard/DashboardComponent', () => { }); AppInjector.setInjector(TestBed.inject(Injector)); - - authenticationStore = TestBed.inject(AuthenticationStore); }); it('should create the component', () => { diff --git a/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.ts b/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.ts index f3e84c68e..8ba47abdd 100644 --- a/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.ts +++ b/src/modules/feature-modules/accessor/pages/dashboard/dashboard.component.ts @@ -28,8 +28,6 @@ export class DashboardComponent extends CoreComponent implements OnInit { cardsList: StatisticsCardType[] = []; - isQualifyingAccessorRole = false; - announcements: AnnouncementType[] = []; constructor( @@ -38,14 +36,13 @@ export class DashboardComponent extends CoreComponent implements OnInit { ) { super(); - this.setPageTitle('Home', { hint: `Hello ${this.stores.authentication.getUserInfo().displayName}` }); - this.isQualifyingAccessorRole = this.stores.authentication.isQualifyingAccessorRole(); + this.setPageTitle('Home', { hint: `Hello ${this.ctx.user.getDisplayName()}` }); this.user = { - displayName: this.stores.authentication.getUserInfo().displayName, - organisation: this.stores.authentication.getUserContextInfo()?.organisationUnit?.name || '', - passwordResetAt: this.stores.authentication.getUserInfo().passwordResetAt, - firstTimeSignInAt: this.stores.authentication.getUserInfo().firstTimeSignInAt + displayName: this.ctx.user.getDisplayName(), + organisation: this.ctx.user.getUserContext()?.organisationUnit?.name || '', + passwordResetAt: this.ctx.user.getUserInfo().passwordResetAt, + firstTimeSignInAt: this.ctx.user.getUserInfo().firstTimeSignInAt }; } @@ -55,7 +52,7 @@ export class DashboardComponent extends CoreComponent implements OnInit { const newState = history.state; delete newState.alert; history.replaceState(newState, ''); - this.stores.authentication.userPasswordSuccessfullyUpdated(); + this.ctx.user.updateInfo({ passwordChangeSinceLastSignIn: true }); } const qp: { statistics: UserStatisticsTypeEnum[] } = { @@ -95,7 +92,7 @@ export class DashboardComponent extends CoreComponent implements OnInit { } ]; - if (this.isQualifyingAccessorRole) { + if (this.ctx.user.isQualifyingAccessor()) { this.cardsList.unshift({ title: 'Review innovations', label: `Suggested innovations awaiting status assignment from your organisation unit`, diff --git a/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/custom-notifications-entrypoint.component.ts b/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/custom-notifications-entrypoint.component.ts index 6476dd18c..043a16239 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/custom-notifications-entrypoint.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/custom-notifications-entrypoint.component.ts @@ -2,7 +2,6 @@ import { Component, Input } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { CoreComponent } from '@app/base'; import { NotificationEnum } from '@modules/feature-modules/accessor/services/accessor.service'; -import { AuthenticationStore } from '@modules/stores'; export type CustomNotificationEntrypointComponentLinksType = { label: string; action: NotificationEnum }[]; @@ -14,16 +13,13 @@ export class CustomNotificationsEntrypointComponent extends CoreComponent { @Input() links: CustomNotificationEntrypointComponentLinksType = []; innovationId: string; - constructor( - private activatedRoute: ActivatedRoute, - private authenticationStore: AuthenticationStore - ) { + constructor(private activatedRoute: ActivatedRoute) { super(); this.innovationId = this.activatedRoute.snapshot.params.innovationId; } onNotify(customNotificationAction: NotificationEnum) { - const url = `/${this.authenticationStore.userUrlBasePath()}/innovations/${this.innovationId}/custom-notifications/new`; + const url = `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/custom-notifications/new`; this.router.navigateByUrl(url, { state: { customNotificationAction } }); } } diff --git a/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-delete/custom-notification-delete.component.ts b/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-delete/custom-notification-delete.component.ts index 71eced030..09cd271de 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-delete/custom-notification-delete.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-delete/custom-notification-delete.component.ts @@ -384,18 +384,16 @@ export class WizardInnovationCustomNotificationDeleteComponent extends CoreCompo } private redirectToManageCustomNotifications(): void { - this.redirectTo(`${this.stores.authentication.userUrlBasePath()}/account/manage-custom-notifications`); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/account/manage-custom-notifications`); } private redirectToInnovationCustomNotifications(): void { - this.redirectTo( - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}/custom-notifications` - ); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/custom-notifications`); } private redirectToEditCustomNotification(): void { this.redirectTo( - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}/custom-notifications/${this.subscriptionId}/edit` + `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/custom-notifications/${this.subscriptionId}/edit` ); } } diff --git a/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-new/custom-notification-new.component.ts b/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-new/custom-notification-new.component.ts index f5265aa5f..3c6b1fd31 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-new/custom-notification-new.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/custom-notifications/wizard-custom-notification-new/custom-notification-new.component.ts @@ -814,7 +814,7 @@ export class WizardInnovationCustomNotificationNewComponent extends CoreComponen private redirectInnovationCustomNotifications(): void { this.redirectTo( this.ctx.layout.previousUrl() ?? - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}/custom-notifications` + `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/custom-notifications` ); } } diff --git a/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.html b/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.html index 8bf463179..99db4df56 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.html +++ b/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.html @@ -6,7 +6,7 @@

Please note that the innovator {{ innovation.owner.name }} is currently locked.

- +

{{ innovationSupport.organisationUnit }}

@@ -20,7 +20,7 @@ >
- Change support status
@@ -37,7 +37,9 @@
- Change accessors
@@ -50,7 +52,7 @@
@@ -62,7 +64,7 @@

{{ "features.accessor.cant_do_while_in_assessment" | translate }}

- + Request status update diff --git a/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.ts b/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.ts index 0e3b35fbd..b89ea3c5c 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/overview/overview.component.ts @@ -23,9 +23,6 @@ export class InnovationOverviewComponent extends CoreComponent implements OnInit qaSuggestions: InnovationUnitSuggestionsType = []; - isQualifyingAccessorRole = false; - isAccessorRole = false; - innovationSummary: { label: string; value: null | string }[] = []; innovatorSummary: { label: string; value: string }[] = []; cardsList: StatisticsCardType[] = []; @@ -63,8 +60,6 @@ export class InnovationOverviewComponent extends CoreComponent implements OnInit this.search = this.activatedRoute.snapshot.queryParams.search; this.innovation = this.ctx.innovation.info(); - this.isQualifyingAccessorRole = this.stores.authentication.isQualifyingAccessorRole(); - this.isAccessorRole = this.stores.authentication.isAccessorRole(); this.isInAssessment = [ InnovationStatusEnum.AWAITING_NEEDS_REASSESSMENT, InnovationStatusEnum.NEEDS_ASSESSMENT, @@ -90,7 +85,7 @@ export class InnovationOverviewComponent extends CoreComponent implements OnInit ...(this.innovation.support?.id && { support: this.innovationsService.getInnovationSupportInfo(this.innovationId, this.innovation.support.id) }), - ...(this.isQualifyingAccessorRole && { + ...(this.ctx.user.isQualifyingAccessor() && { unitsSuggestions: this.innovationService.getInnovationQASuggestions(this.innovation.id) }), innovationProgress: this.innovationsService.getInnovationProgress(this.innovationId, true), @@ -102,7 +97,7 @@ export class InnovationOverviewComponent extends CoreComponent implements OnInit const innovationInfo = this.innovation; this.innovationSupport = { - organisationUnit: this.stores.authentication.getAccessorOrganisationUnitName(), + organisationUnit: this.ctx.user.getAccessorUnitName() ?? '', status: support?.status ?? InnovationSupportStatusEnum.UNASSIGNED, engagingAccessors: support?.engagingAccessors ?? [] }; diff --git a/src/modules/feature-modules/accessor/pages/innovation/support/organisations-support-status-suggest.component.ts b/src/modules/feature-modules/accessor/pages/innovation/support/organisations-support-status-suggest.component.ts index 5b2ecf502..95255bbfb 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/support/organisations-support-status-suggest.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/support/organisations-support-status-suggest.component.ts @@ -100,7 +100,7 @@ export class InnovationSupportOrganisationsSupportStatusSuggestComponent extends next: ([organisations, innovationSupports]) => { this.organisations = organisations; - const userUnitId = this.stores.authentication.getUserContextInfo()?.organisationUnit?.id ?? ''; + const userUnitId = this.ctx.user.getUserContext()?.organisationUnit?.id ?? ''; this.previousOrganisationsSuggestions = JSON.parse(sessionStorage.getItem('organisationsSuggestions') ?? '{}'); diff --git a/src/modules/feature-modules/accessor/pages/innovation/support/support-change-accessors.component.ts b/src/modules/feature-modules/accessor/pages/innovation/support/support-change-accessors.component.ts index 07ff0419b..a3d7de2f5 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/support/support-change-accessors.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/support/support-change-accessors.component.ts @@ -55,7 +55,7 @@ export class InnovationChangeAccessorsComponent extends CoreComponent implements this.stepNumber = 1; - this.userOrganisationUnit = this.stores.authentication.getUserContextInfo()?.organisationUnit || null; + this.userOrganisationUnit = this.ctx.user.getUserContext()?.organisationUnit || null; } ngOnInit(): void { @@ -94,7 +94,7 @@ export class InnovationChangeAccessorsComponent extends CoreComponent implements if (this.innovationSupportStatus === InnovationSupportStatusEnum.WAITING) { // add this user by default, and disable input - const userId = this.stores.authentication.getUserId(); + const userId = this.ctx.user.getUserId(); (this.form.get('accessors') as FormArray).push(new FormControl(userId)); this.disabledCheckboxAccessors = [userId]; } diff --git a/src/modules/feature-modules/accessor/pages/innovation/support/support-request-update-status.component.spec.ts b/src/modules/feature-modules/accessor/pages/innovation/support/support-request-update-status.component.spec.ts index a613323ca..ea5561d2f 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/support/support-request-update-status.component.spec.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/support/support-request-update-status.component.spec.ts @@ -1,11 +1,11 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { AppInjector, CoreModule } from '@modules/core'; import { AccessorModule } from '@modules/feature-modules/accessor/accessor.module'; import { AccessorService } from '@modules/feature-modules/accessor/services/accessor.service'; -import { AuthenticationStore, StoresModule, InnovationSupportStatusEnum } from '@modules/stores'; +import { StoresModule, InnovationSupportStatusEnum, CtxStore } from '@modules/stores'; import { USER_INFO_ACCESSOR } from '@tests/data.mocks'; import { InnovationSupportRequestUpdateStatusComponent } from './support-request-update-status.component'; @@ -18,7 +18,7 @@ describe('SupportUpdateStatusComponent', () => { let router: Router; let routerSpy: jest.SpyInstance; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let accessorService: AccessorService; beforeEach(async () => { @@ -33,12 +33,12 @@ describe('SupportUpdateStatusComponent', () => { router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); accessorService = TestBed.inject(AccessorService); activatedRoute.snapshot.params = { innovationId: 'Inno01', supportId: 'SupportId01' }; - authenticationStore.getUserInfo = () => USER_INFO_ACCESSOR; + ctx.user.getUserInfo = signal(USER_INFO_ACCESSOR); fixture = TestBed.createComponent(InnovationSupportRequestUpdateStatusComponent); component = fixture.componentInstance; diff --git a/src/modules/feature-modules/accessor/pages/innovation/support/support-update.component.ts b/src/modules/feature-modules/accessor/pages/innovation/support/support-update.component.ts index b0a3c1663..91bebf09f 100644 --- a/src/modules/feature-modules/accessor/pages/innovation/support/support-update.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovation/support/support-update.component.ts @@ -121,7 +121,7 @@ export class InnovationSupportUpdateComponent extends CoreComponent implements O this.stepNumber = 1; - this.userOrganisationUnit = this.stores.authentication.getUserContextInfo()?.organisationUnit || null; + this.userOrganisationUnit = this.ctx.user.getUserContext()?.organisationUnit || null; this.messageStatusUpdated = { [InnovationSupportStatusEnum.ENGAGING]: { @@ -291,7 +291,7 @@ export class InnovationSupportUpdateComponent extends CoreComponent implements O this.formAccessorsList = this.qualifyingAccessorsList.map(i => ({ value: i.id, label: i.name })); // add this user by default, and disable input - const userId = this.stores.authentication.getUserId(); + const userId = this.ctx.user.getUserId(); formSelectedAcessorsList.clear(); formSelectedAcessorsList.push(new FormControl(userId)); @@ -377,7 +377,7 @@ export class InnovationSupportUpdateComponent extends CoreComponent implements O } private uploadFileAndSaveStatus(file: any, body: ChangeSupportStatusDocumentType): void { - const httpUploadBody = { userId: this.stores.authentication.getUserId(), innovationId: this.innovationId }; + const httpUploadBody = { userId: this.ctx.user.getUserId(), innovationId: this.innovationId }; this.fileUploadService .uploadFile(httpUploadBody, file) diff --git a/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.spec.ts b/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.spec.ts index e4f5d8662..db98ac3ef 100644 --- a/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.spec.ts +++ b/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.spec.ts @@ -5,7 +5,7 @@ import { Injector } from '@angular/core'; import { ActivatedRoute, RouterModule } from '@angular/router'; import { CoreModule, AppInjector } from '@modules/core'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { StoresModule } from '@modules/stores'; import { AccessorModule } from '@modules/feature-modules/accessor/accessor.module'; import { InnovationsReviewComponent } from './innovations-review.component'; @@ -16,7 +16,6 @@ import { NotificationsService } from '@modules/shared/services/notifications.ser describe('FeatureModules/Accessor/Innovations/ReviewInnovationsComponent', () => { let activatedRoute: ActivatedRoute; - let authenticationStore: AuthenticationStore; let accessorService: AccessorService; let notificationsService: NotificationsService; @@ -32,7 +31,6 @@ describe('FeatureModules/Accessor/Innovations/ReviewInnovationsComponent', () => activatedRoute = TestBed.inject(ActivatedRoute); - authenticationStore = TestBed.inject(AuthenticationStore); accessorService = TestBed.inject(AccessorService); notificationsService = TestBed.inject(NotificationsService); }); diff --git a/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.ts b/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.ts index 3c37843c1..b866f8bd1 100644 --- a/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.ts +++ b/src/modules/feature-modules/accessor/pages/innovations/innovations-review.component.ts @@ -89,12 +89,12 @@ export class InnovationsReviewComponent extends CoreComponent implements OnInit private innovationsService: InnovationsService ) { super(); - this.userUnitAcronym = this.stores.authentication.state.userContext?.organisationUnit?.acronym ?? ''; - this.userUnit = this.stores.authentication.state.userContext?.organisationUnit?.name ?? ''; + this.userUnitAcronym = this.ctx.user.getUserContext()?.organisationUnit?.acronym ?? ''; + this.userUnit = this.ctx.user.getAccessorUnitName() ?? ''; this.setPageTitle('Innovations', { hint: `${this.userUnit}` }); - if (this.stores.authentication.isAccessorRole()) { + if (this.ctx.user.isAccessor()) { this.defaultStatus = 'ENGAGING'; this.tabs = [ { @@ -148,7 +148,7 @@ export class InnovationsReviewComponent extends CoreComponent implements OnInit notifications: null } ]; - } else if (this.stores.authentication.isQualifyingAccessorRole()) { + } else if (this.ctx.user.isQualifyingAccessor()) { this.defaultStatus = 'SUGGESTED'; this.tabs = [ { diff --git a/src/modules/feature-modules/accessor/pages/unit/accessor-and-innovation-list.component.ts b/src/modules/feature-modules/accessor/pages/unit/accessor-and-innovation-list.component.ts index c9ae9d02b..3cc9aaaf8 100644 --- a/src/modules/feature-modules/accessor/pages/unit/accessor-and-innovation-list.component.ts +++ b/src/modules/feature-modules/accessor/pages/unit/accessor-and-innovation-list.component.ts @@ -35,11 +35,11 @@ export class AccessorAndInnovationListComponent extends CoreComponent implements ngOnInit(): void { this.setPageStatus('LOADING'); - const ctx = this.stores.authentication.getUserContextInfo(); + const ctx = this.ctx.user.getUserContext(); const unit = ctx?.organisationUnit; const org = ctx?.organisation; if (!unit || !org) { - this.redirectTo(this.stores.authentication.userUrlBasePath()); + this.redirectTo(this.ctx.user.userUrlBasePath()); return; } @@ -50,7 +50,7 @@ export class AccessorAndInnovationListComponent extends CoreComponent implements this.onPageChange({ pageNumber: 1 }); this.setPageTitle('List of accessors and supported innovations', { - hint: this.stores.authentication.getAccessorOrganisationUnitName() + hint: this.ctx.user.getAccessorUnitName() }); this.setBackLink(); diff --git a/src/modules/feature-modules/accessor/services/accessor.service.spec.ts b/src/modules/feature-modules/accessor/services/accessor.service.spec.ts index 816633d2e..cb4493d1f 100644 --- a/src/modules/feature-modules/accessor/services/accessor.service.spec.ts +++ b/src/modules/feature-modules/accessor/services/accessor.service.spec.ts @@ -3,20 +3,19 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { ENV } from '@tests/app.mocks'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { AppInjector, CoreModule, EnvironmentVariablesStore } from '@modules/core'; -import { StoresModule, AuthenticationStore } from '@modules/stores'; +import { StoresModule, CtxStore } from '@modules/stores'; import { AccessorModule } from '@modules/feature-modules/accessor/accessor.module'; import { AccessorService } from './accessor.service'; -import { SupportLogType } from '@modules/shared/services/innovations.dtos'; describe('FeatureModules/Accessor/Services/AccessorService', () => { let httpMock: HttpTestingController; let envVariablesStore: EnvironmentVariablesStore; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let service: AccessorService; @@ -31,11 +30,11 @@ describe('FeatureModules/Accessor/Services/AccessorService', () => { httpMock = TestBed.inject(HttpTestingController); envVariablesStore = TestBed.inject(EnvironmentVariablesStore); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); service = TestBed.inject(AccessorService); - authenticationStore.getUserId = () => 'UserId01'; + ctx.user.getUserId = signal('UserId01'); }); afterEach(() => { diff --git a/src/modules/feature-modules/admin/pages/announcements/announcement-details.component.ts b/src/modules/feature-modules/admin/pages/announcements/announcement-details.component.ts index f35f2ffec..cd82cce90 100644 --- a/src/modules/feature-modules/admin/pages/announcements/announcement-details.component.ts +++ b/src/modules/feature-modules/admin/pages/announcements/announcement-details.component.ts @@ -51,9 +51,7 @@ export class PageAnnouncementDetailsComponent extends CoreComponent implements O next: response => { this.announcement = { ...response, - userGroupsLabels: response.userRoles - .map(item => this.stores.authentication.getRoleDescription(item, true)) - .join('\n'), + userGroupsLabels: response.userRoles.map(item => this.ctx.user.getRoleDescription(item, true)).join('\n'), isScheduled: response.status === AnnouncementStatusEnum.SCHEDULED, isActive: response.status === AnnouncementStatusEnum.ACTIVE, diff --git a/src/modules/feature-modules/admin/pages/announcements/announcement-newdit.component.ts b/src/modules/feature-modules/admin/pages/announcements/announcement-newdit.component.ts index 7bfd7c2bb..e7281494c 100644 --- a/src/modules/feature-modules/admin/pages/announcements/announcement-newdit.component.ts +++ b/src/modules/feature-modules/admin/pages/announcements/announcement-newdit.component.ts @@ -237,9 +237,7 @@ export class PageAnnouncementNewditComponent extends CoreComponent implements On content: outboundPayload.params.content, linkLabel: outboundPayload.params.link?.label ?? '', linkUrl: outboundPayload.params.link?.url ?? '', - userRoles: outboundPayload.userRoles - .map(item => this.stores.authentication.getRoleDescription(item, true)) - .join('\n'), + userRoles: outboundPayload.userRoles.map(item => this.ctx.user.getRoleDescription(item, true)).join('\n'), showToWhom: outboundPayload.userRoles.includes(UserRoleEnum.INNOVATOR) ? outboundPayload.filters?.length ? 'Specific types of innovations' diff --git a/src/modules/feature-modules/admin/pages/dashboard/dashboard.component.spec.ts b/src/modules/feature-modules/admin/pages/dashboard/dashboard.component.spec.ts deleted file mode 100644 index d59c0507e..000000000 --- a/src/modules/feature-modules/admin/pages/dashboard/dashboard.component.spec.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { Injector } from '@angular/core'; -import { ActivatedRoute, RouterModule } from '@angular/router'; - -import { AppInjector, CoreModule } from '@modules/core'; -import { AdminModule } from '@modules/feature-modules/admin/admin.module'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; -import { USER_INFO_INNOVATOR } from '@tests/data.mocks'; - -import { PageDashboardComponent } from './dashboard.component'; - -describe('FeatureModules/Admin/Pages/Dashboard/PageDashboardComponent', () => { - let activatedRoute: ActivatedRoute; - - let authenticationStore: AuthenticationStore; - - let component: PageDashboardComponent; - let fixture: ComponentFixture; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, RouterModule.forRoot([]), CoreModule, StoresModule, AdminModule] - }); - - AppInjector.setInjector(TestBed.inject(Injector)); - - activatedRoute = TestBed.inject(ActivatedRoute); - - authenticationStore = TestBed.inject(AuthenticationStore); - - authenticationStore.getUserInfo = () => USER_INFO_INNOVATOR; - }); - - it('should create the component', () => { - fixture = TestBed.createComponent(PageDashboardComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - expect(component).toBeTruthy(); - }); - - // it('should have alert when password changed', () => { - - // authenticationStore.getUserInfo = () => ({ - // ...USER_INFO_INNOVATOR, - // type: UserRoleEnum.ADMIN, - // passwordResetAt: new Date(new Date().getTime() - 1 * 60000).toString() - // }); - - // const expected = { type: 'SUCCESS', title: 'You have successfully changed your password.', setFocus: true }; - - // fixture = TestBed.createComponent(PageDashboardComponent); - // component = fixture.componentInstance; - // fixture.detectChanges(); - // expect(component.alert).toEqual(expected); - - // }); -}); diff --git a/src/modules/feature-modules/admin/pages/dashboard/dashboard.component.ts b/src/modules/feature-modules/admin/pages/dashboard/dashboard.component.ts index c33084db4..3ebd5eea0 100644 --- a/src/modules/feature-modules/admin/pages/dashboard/dashboard.component.ts +++ b/src/modules/feature-modules/admin/pages/dashboard/dashboard.component.ts @@ -18,7 +18,7 @@ export class PageDashboardComponent extends CoreComponent implements OnInit { const newState = history.state; delete newState.alert; history.replaceState(newState, ''); - this.stores.authentication.userPasswordSuccessfullyUpdated(); + this.ctx.user.updateInfo({ passwordChangeSinceLastSignIn: true }); } this.setPageStatus('READY'); diff --git a/src/modules/feature-modules/admin/pages/innovation/overview/overview.component.ts b/src/modules/feature-modules/admin/pages/innovation/overview/overview.component.ts index 1abe05690..e74cb94a7 100644 --- a/src/modules/feature-modules/admin/pages/innovation/overview/overview.component.ts +++ b/src/modules/feature-modules/admin/pages/innovation/overview/overview.component.ts @@ -73,8 +73,8 @@ export class InnovationOverviewComponent extends CoreComponent implements OnInit innovationProgress: this.innovationsService.getInnovationProgress(this.innovationId, true) }).subscribe(({ innovation, innovationCollaborators, innovationProgress }) => { this.innovationSupport = { - organisationUnit: this.stores.authentication.getAccessorOrganisationUnitName(), - status: this.innovation.support?.status || InnovationSupportStatusEnum.UNASSIGNED + organisationUnit: this.ctx.user.getAccessorUnitName() ?? '', + status: this.innovation.support?.status ?? InnovationSupportStatusEnum.UNASSIGNED }; this.innovationSummary = [ diff --git a/src/modules/feature-modules/admin/pages/organisations/organisation-edit.component.spec.ts b/src/modules/feature-modules/admin/pages/organisations/organisation-edit.component.spec.ts index 8895d2cc9..6c5f4988d 100644 --- a/src/modules/feature-modules/admin/pages/organisations/organisation-edit.component.spec.ts +++ b/src/modules/feature-modules/admin/pages/organisations/organisation-edit.component.spec.ts @@ -8,7 +8,7 @@ import { of, throwError } from 'rxjs'; import { AppInjector, CoreModule } from '@modules/core'; import { AdminModule } from '@modules/feature-modules/admin/admin.module'; import { FormEngineComponent } from '@modules/shared/forms'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { PageOrganisationEditComponent } from './organisation-edit.component'; @@ -22,7 +22,7 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationEditComponent let router: Router; let routerSpy: jest.SpyInstance; let activatedRoute: ActivatedRoute; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let usersService: AdminUsersService; let organisationsService: OrganisationsService; let adminOrganisationsService: AdminOrganisationsService; @@ -37,7 +37,7 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationEditComponent router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); activatedRoute = TestBed.inject(ActivatedRoute); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); usersService = TestBed.inject(AdminUsersService); organisationsService = TestBed.inject(OrganisationsService); adminOrganisationsService = TestBed.inject(AdminOrganisationsService); @@ -144,7 +144,7 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationEditComponent it('should run onSubmitWizard() with API success when updating organisation', () => { activatedRoute.snapshot.data = { module: 'Organisation' }; - authenticationStore.initializeAuthentication$ = () => of(true); + ctx.user.initializeAuthentication$ = () => of(true); adminOrganisationsService.updateOrganisation = () => of({ organisationId: 'Org01', status: 'OK' }); fixture = TestBed.createComponent(PageOrganisationEditComponent); @@ -159,7 +159,7 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationEditComponent it('should run onSubmitWizard() with API success when updating unit', () => { activatedRoute.snapshot.params = { organisationId: 'Org01', organisationUnitId: 'Unit01' }; activatedRoute.snapshot.data = { module: 'Unit' }; - authenticationStore.initializeAuthentication$ = () => of(true); + ctx.user.initializeAuthentication$ = () => of(true); adminOrganisationsService.updateUnit = () => of({ unitId: 'Unit01' }); fixture = TestBed.createComponent(PageOrganisationEditComponent); diff --git a/src/modules/feature-modules/admin/pages/organisations/organisation-info.component.spec.ts b/src/modules/feature-modules/admin/pages/organisations/organisation-info.component.spec.ts index c309f5d0d..2dff64a87 100644 --- a/src/modules/feature-modules/admin/pages/organisations/organisation-info.component.spec.ts +++ b/src/modules/feature-modules/admin/pages/organisations/organisation-info.component.spec.ts @@ -7,13 +7,12 @@ import { of, throwError } from 'rxjs'; import { AppInjector, CoreModule } from '@modules/core'; import { AdminModule } from '@modules/feature-modules/admin/admin.module'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { StoresModule } from '@modules/stores'; import { PageOrganisationInfoComponent } from './organisation-info.component'; import { OrganisationsService } from '@modules/shared/services/organisations.service'; import { UsersService } from '@modules/shared/services/users.service'; -import { USER_INFO_ADMIN } from '@tests/data.mocks'; describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationInfoComponent', () => { let component: PageOrganisationInfoComponent; @@ -21,7 +20,6 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationInfoComponent let activatedRoute: ActivatedRoute; let organisationsService: OrganisationsService; let usersService: UsersService; - let authenticationStore: AuthenticationStore; beforeEach(() => { TestBed.configureTestingModule({ @@ -30,12 +28,9 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationInfoComponent AppInjector.setInjector(TestBed.inject(Injector)); - authenticationStore = TestBed.inject(AuthenticationStore); activatedRoute = TestBed.inject(ActivatedRoute); organisationsService = TestBed.inject(OrganisationsService); usersService = TestBed.inject(UsersService); - - authenticationStore.getUserInfo = () => USER_INFO_ADMIN; }); it('should create the component', () => { diff --git a/src/modules/feature-modules/admin/pages/organisations/organisation-new.component.spec.ts b/src/modules/feature-modules/admin/pages/organisations/organisation-new.component.spec.ts index c7f552c68..0e5142888 100644 --- a/src/modules/feature-modules/admin/pages/organisations/organisation-new.component.spec.ts +++ b/src/modules/feature-modules/admin/pages/organisations/organisation-new.component.spec.ts @@ -6,7 +6,7 @@ import { Router, RouterModule } from '@angular/router'; import { AppInjector, CoreModule } from '@modules/core'; import { AdminModule } from '@modules/feature-modules/admin/admin.module'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { StoresModule } from '@modules/stores'; import { AdminOrganisationsService } from '../../services/admin-organisations.service'; import { AdminUsersService } from '../../services/users.service'; @@ -18,7 +18,6 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationNewComponent' let router: Router; let routerSpy: jest.SpyInstance; - let authenticationStore: AuthenticationStore; let adminOrganisationsService: AdminOrganisationsService; let usersService: AdminUsersService; @@ -32,7 +31,6 @@ describe('FeatureModules/Admin/Pages/Organisations/PageOrganisationNewComponent' router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); - authenticationStore = TestBed.inject(AuthenticationStore); usersService = TestBed.inject(AdminUsersService); adminOrganisationsService = TestBed.inject(AdminOrganisationsService); }); diff --git a/src/modules/feature-modules/admin/pages/organisations/organisation-unit-new/organisation-unit-new.component.ts b/src/modules/feature-modules/admin/pages/organisations/organisation-unit-new/organisation-unit-new.component.ts index 6f66a87a2..4a533e667 100644 --- a/src/modules/feature-modules/admin/pages/organisations/organisation-unit-new/organisation-unit-new.component.ts +++ b/src/modules/feature-modules/admin/pages/organisations/organisation-unit-new/organisation-unit-new.component.ts @@ -50,7 +50,7 @@ export class PageOrganisationUnitNewComponent extends CoreComponent implements O switch (action) { case 'previous': if (this.wizard.isFirstStep()) { - this.redirectTo(`${this.stores.authentication.userUrlBasePath()}/organisations/${this.organisationId}`); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/organisations/${this.organisationId}`); } else { this.wizard.previousStep(); this.setPageTitle(this.wizard.currentStepTitle(), { showPage: false }); @@ -91,7 +91,7 @@ export class PageOrganisationUnitNewComponent extends CoreComponent implements O this.setRedirectAlertSuccess( 'You have successfully created a new organisation unit attached to this organisation' ); - this.redirectTo(`${this.stores.authentication.userUrlBasePath()}/organisations/${this.organisationId}`); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/organisations/${this.organisationId}`); }, error: () => { this.submitButton = { isActive: true, label: 'Submit' }; diff --git a/src/modules/feature-modules/admin/pages/users/roles/role-activate.component.ts b/src/modules/feature-modules/admin/pages/users/roles/role-activate.component.ts index 0aabd29ed..dffe0bcb5 100644 --- a/src/modules/feature-modules/admin/pages/users/roles/role-activate.component.ts +++ b/src/modules/feature-modules/admin/pages/users/roles/role-activate.component.ts @@ -62,8 +62,8 @@ export class PageUsersRoleActivateComponent extends CoreComponent implements OnI .map(r => ({ id: r.id, description: r.displayTeam - ? `${this.stores.authentication.getRoleDescription(r.role).toLowerCase()} (${r.displayTeam})` - : `${this.stores.authentication.getRoleDescription(r.role).toLowerCase()}` + ? `${this.ctx.user.getRoleDescription(r.role).toLowerCase()} (${r.displayTeam})` + : `${this.ctx.user.getRoleDescription(r.role).toLowerCase()}` }))[0] ?? { id: '', description: '' } }; diff --git a/src/modules/feature-modules/admin/pages/users/roles/role-change.component.ts b/src/modules/feature-modules/admin/pages/users/roles/role-change.component.ts index aebe6bb0f..22822ef93 100644 --- a/src/modules/feature-modules/admin/pages/users/roles/role-change.component.ts +++ b/src/modules/feature-modules/admin/pages/users/roles/role-change.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { CoreComponent } from '@app/base'; -import { AccessorOrganisationRoleEnum, UserRoleEnum } from '@app/base/enums'; +import { UserRoleEnum } from '@app/base/enums'; import { UserInfo } from '@modules/shared/dtos/users.dto'; import { AdminUsersService, changeUserRoleDTO, GetInnovationsByInnovatorIdDTO } from '../../../services/users.service'; @@ -57,7 +57,7 @@ export class PageUsersRoleChangeComponent extends CoreComponent implements OnIni this.user = { ...userInfo, rolesDescription: userInfo.roles.map(r => { - let roleDescription = this.stores.authentication.getRoleDescription(r.role); + let roleDescription = this.ctx.user.getRoleDescription(r.role); if (r.displayTeam) { roleDescription += ` (${r.displayTeam})`; } @@ -95,8 +95,8 @@ export class PageUsersRoleChangeComponent extends CoreComponent implements OnIni role: { name: this.user.roles[0].role === UserRoleEnum.QUALIFYING_ACCESSOR - ? AccessorOrganisationRoleEnum.ACCESSOR - : AccessorOrganisationRoleEnum.QUALIFYING_ACCESSOR, + ? UserRoleEnum.ACCESSOR + : UserRoleEnum.QUALIFYING_ACCESSOR, organisationId: this.user.roles[0].organisation?.id ?? '' } }; diff --git a/src/modules/feature-modules/admin/pages/users/roles/role-inactivate.component.ts b/src/modules/feature-modules/admin/pages/users/roles/role-inactivate.component.ts index 3aa92e980..794a92a72 100644 --- a/src/modules/feature-modules/admin/pages/users/roles/role-inactivate.component.ts +++ b/src/modules/feature-modules/admin/pages/users/roles/role-inactivate.component.ts @@ -61,8 +61,8 @@ export class PageUsersRoleInactivateComponent extends CoreComponent implements O .map(r => ({ id: r.id, description: r.displayTeam - ? `${this.stores.authentication.getRoleDescription(r.role).toLowerCase()} (${r.displayTeam})` - : `${this.stores.authentication.getRoleDescription(r.role).toLowerCase()}` + ? `${this.ctx.user.getRoleDescription(r.role).toLowerCase()} (${r.displayTeam})` + : `${this.ctx.user.getRoleDescription(r.role).toLowerCase()}` }))[0] ?? { id: '', description: '' } }; diff --git a/src/modules/feature-modules/admin/pages/users/roles/role-new.config.ts b/src/modules/feature-modules/admin/pages/users/roles/role-new.config.ts index 0ae3f6b88..a7df48e25 100644 --- a/src/modules/feature-modules/admin/pages/users/roles/role-new.config.ts +++ b/src/modules/feature-modules/admin/pages/users/roles/role-new.config.ts @@ -3,7 +3,7 @@ import { AppInjector } from '@modules/core'; import { UserRoleEnum } from '@app/base/enums'; import { FormEngineModel, WizardEngineModel, WizardStepType, WizardSummaryType } from '@modules/shared/forms'; -import { AuthenticationStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; // Labels. const stepsLabels = { @@ -54,7 +54,7 @@ export type OutboundPayloadType = CreateRolesType; // consts. const injector = AppInjector.getInjector(); -const authenticationStore = injector?.get(AuthenticationStore); +const ctx = injector?.get(CtxStore); export const WIZARD_ADD_ROLE: WizardEngineModel = new WizardEngineModel({ steps: [], @@ -77,7 +77,7 @@ function wizardRuntimeRules(steps: WizardStepType[], data: StepPayloadType): voi dataType: 'radio-group', label: stepsLabels.l1.label, validations: { isRequired: [true, 'Choose one role'] }, - items: data.availableRoles.map(r => ({ value: r, label: authenticationStore?.getRoleDescription(r) })) + items: data.availableRoles.map(r => ({ value: r, label: ctx.user?.getRoleDescription(r) })) } ] }) @@ -202,7 +202,7 @@ function summaryParsing(data: StepPayloadType): WizardSummaryType[] { toReturn.push({ label: 'Email', value: data.email }, { label: 'Name', value: data.name }); - const role = authenticationStore.getRoleDescription(data.role!); // Reaching this point role will be defined + const role = ctx.user.getRoleDescription(data.role!); // Reaching this point role will be defined if (data.role === UserRoleEnum.ASSESSMENT) { toReturn.push({ label: 'Role', value: role, editStepNumber: editStepNumber++ }); diff --git a/src/modules/feature-modules/admin/pages/users/user-find.component.ts b/src/modules/feature-modules/admin/pages/users/user-find.component.ts index 86de01f95..0cc4cd5e3 100644 --- a/src/modules/feature-modules/admin/pages/users/user-find.component.ts +++ b/src/modules/feature-modules/admin/pages/users/user-find.component.ts @@ -49,9 +49,7 @@ export class PageUserFindComponent extends CoreComponent implements OnInit { next: response => { this.searchUser = { ...response, - rolesDescription: [...new Set(response.roles.map(r => r.role))].map(r => - this.stores.authentication.getRoleDescription(r) - ) + rolesDescription: [...new Set(response.roles.map(r => r.role))].map(r => this.ctx.user.getRoleDescription(r)) }; this.setPageStatus('READY'); }, diff --git a/src/modules/feature-modules/admin/pages/users/user-info.component.ts b/src/modules/feature-modules/admin/pages/users/user-info.component.ts index 072c66706..f4e922a08 100644 --- a/src/modules/feature-modules/admin/pages/users/user-info.component.ts +++ b/src/modules/feature-modules/admin/pages/users/user-info.component.ts @@ -84,7 +84,7 @@ export class PageUserInfoComponent extends CoreComponent implements OnInit { this.user = { ...userInfo, rolesDescription: userInfo.roles.map(r => { - let roleDescription = this.stores.authentication.getRoleDescription(r.role); + let roleDescription = this.ctx.user.getRoleDescription(r.role); if (r.displayTeam) { roleDescription += ` (${r.displayTeam})`; } diff --git a/src/modules/feature-modules/admin/pages/users/user-manage.component.ts b/src/modules/feature-modules/admin/pages/users/user-manage.component.ts index 68d1dee5f..1b7d078ad 100644 --- a/src/modules/feature-modules/admin/pages/users/user-manage.component.ts +++ b/src/modules/feature-modules/admin/pages/users/user-manage.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { CoreComponent } from '@app/base'; import { UsersService } from '@modules/shared/services/users.service'; -import { MFAInfoDTO } from '@modules/stores/authentication/authentication.service'; +import { MFAInfo } from '@modules/stores/ctx/user/user.service'; @Component({ selector: 'app-admin-pages-users-user-manage', @@ -13,7 +13,7 @@ export class PageUserManageComponent extends CoreComponent implements OnInit { isInnovator: boolean; userId: string; - MFAInfo: MFAInfoDTO | null = null; + MFAInfo: MFAInfo | null = null; constructor( private route: ActivatedRoute, diff --git a/src/modules/feature-modules/admin/pages/users/user-new.component.spec.ts b/src/modules/feature-modules/admin/pages/users/user-new.component.spec.ts index a4a93e44e..8c61734f3 100644 --- a/src/modules/feature-modules/admin/pages/users/user-new.component.spec.ts +++ b/src/modules/feature-modules/admin/pages/users/user-new.component.spec.ts @@ -1,17 +1,18 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { Router, RouterModule } from '@angular/router'; import { of } from 'rxjs'; import { AppInjector, CoreModule } from '@modules/core'; import { AdminModule } from '@modules/feature-modules/admin/admin.module'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { AdminUsersService } from '@modules/feature-modules/admin/services/users.service'; import { OrganisationsService } from '@modules/shared/services/organisations.service'; import { PageUserNewComponent } from './user-new.component'; +import { UserContextStore } from '@modules/stores/ctx/user/user.store'; describe('FeatureModules/Admin/Pages/AdminUsers/PageAdminUserNewComponent', () => { let component: PageUserNewComponent; @@ -19,7 +20,8 @@ describe('FeatureModules/Admin/Pages/AdminUsers/PageAdminUserNewComponent', () = let router: Router; let routerSpy: jest.SpyInstance; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; + let userCtx: UserContextStore; let usersService: AdminUsersService; let organisationsService: OrganisationsService; @@ -33,9 +35,12 @@ describe('FeatureModules/Admin/Pages/AdminUsers/PageAdminUserNewComponent', () = router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); - authenticationStore = TestBed.inject(AuthenticationStore); usersService = TestBed.inject(AdminUsersService); organisationsService = TestBed.inject(OrganisationsService); + ctx = TestBed.inject(CtxStore); + userCtx = TestBed.inject(UserContextStore); + userCtx.getRoleDescription = signal('ADMIN'); + ctx.user.getRoleDescription = userCtx.getRoleDescription; organisationsService.getOrganisationsList = () => of([ diff --git a/src/modules/feature-modules/admin/pages/users/user-new.component.ts b/src/modules/feature-modules/admin/pages/users/user-new.component.ts index 464370a83..53bf8c538 100644 --- a/src/modules/feature-modules/admin/pages/users/user-new.component.ts +++ b/src/modules/feature-modules/admin/pages/users/user-new.component.ts @@ -118,7 +118,7 @@ export class PageUserNewComponent extends CoreComponent implements OnInit { this.user = { ...response, rolesDescription: response.roles.map(r => { - let roleDescription = this.stores.authentication.getRoleDescription(r.role); + let roleDescription = this.ctx.user.getRoleDescription(r.role); if (r.displayTeam) { roleDescription += ` (${r.displayTeam})`; } diff --git a/src/modules/feature-modules/admin/pages/users/user-new.config.ts b/src/modules/feature-modules/admin/pages/users/user-new.config.ts index e2191aa60..b2545ad97 100644 --- a/src/modules/feature-modules/admin/pages/users/user-new.config.ts +++ b/src/modules/feature-modules/admin/pages/users/user-new.config.ts @@ -3,7 +3,9 @@ import { AppInjector } from '@modules/core'; import { UserRoleEnum } from '@app/base/enums'; import { FormEngineModel, WizardEngineModel, WizardStepType, WizardSummaryType } from '@modules/shared/forms'; -import { AuthenticationStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; +import { inject } from '@angular/core'; +import { UserContextStore } from '@modules/stores/ctx/user/user.store'; // Labels. const stepsLabels = { @@ -55,10 +57,10 @@ export type OutboundPayloadType = CreateUserType; // consts. const injector = AppInjector.getInjector(); -const authenticationStore = injector?.get(AuthenticationStore); +const userCtx = injector?.get(UserContextStore); const roles = [UserRoleEnum.QUALIFYING_ACCESSOR, UserRoleEnum.ACCESSOR, UserRoleEnum.ASSESSMENT, UserRoleEnum.ADMIN]; -const roleItems = roles.map(r => ({ value: r, label: authenticationStore?.getRoleDescription(r) })); +const roleItems = roles.map(r => ({ value: r, label: userCtx?.getRoleDescription(r) })); export const WIZARD_CREATE_USER: WizardEngineModel = new WizardEngineModel({ steps: [ @@ -204,7 +206,7 @@ function summaryParsing(data: StepPayloadType): WizardSummaryType[] { { label: 'Name', value: data.name, editStepNumber: editStepNumber++ } ); - const role = authenticationStore.getRoleDescription(data.role ?? UserRoleEnum.ASSESSMENT); // Reaching this point role will be defined + const role = userCtx.getRoleDescription(data.role ?? UserRoleEnum.ASSESSMENT); // Reaching this point role will be defined if (data.role === UserRoleEnum.ADMIN || data.role === UserRoleEnum.ASSESSMENT) { toReturn.push({ diff --git a/src/modules/feature-modules/admin/resolvers/organisation-data.resolver.spec.ts b/src/modules/feature-modules/admin/resolvers/organisation-data.resolver.spec.ts index 65c0a2de6..8eff0743a 100644 --- a/src/modules/feature-modules/admin/resolvers/organisation-data.resolver.spec.ts +++ b/src/modules/feature-modules/admin/resolvers/organisation-data.resolver.spec.ts @@ -6,7 +6,7 @@ import { ActivatedRouteSnapshot, RouterModule } from '@angular/router'; import { of, throwError } from 'rxjs'; import { AppInjector, CoreModule } from '@modules/core'; -import { StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { AdminModule } from '@modules/feature-modules/admin/admin.module'; import { OrganisationsService } from '@modules/shared/services/organisations.service'; import { OrganisationDataResolver } from './organisation-data.resolver'; diff --git a/src/modules/feature-modules/admin/services/admin-organisations.service.ts b/src/modules/feature-modules/admin/services/admin-organisations.service.ts index da14557fa..c13dbc0a9 100644 --- a/src/modules/feature-modules/admin/services/admin-organisations.service.ts +++ b/src/modules/feature-modules/admin/services/admin-organisations.service.ts @@ -6,8 +6,6 @@ import { CoreService } from '@app/base'; import { UrlModel } from '@app/base/models'; import { MappedObjectType } from '@app/base/types'; -import { AccessorOrganisationRoleEnum } from '@modules/stores/authentication/authentication.enums'; - export type updateOrganisationDTO = { organisationId: string; }; @@ -16,13 +14,6 @@ export type updateOrganisationUnitDTO = { unitId: string; }; -export type organisationUsersInDTO = { - id: string; - name: string; - role: AccessorOrganisationRoleEnum; -}; -export type organisationUsersOutDTO = organisationUsersInDTO & { roleDescription: string }; - export type CreateOrganisationBodyDTO = { name: string; acronym: string; diff --git a/src/modules/feature-modules/admin/services/users.service.ts b/src/modules/feature-modules/admin/services/users.service.ts index 5460ef446..caf177924 100644 --- a/src/modules/feature-modules/admin/services/users.service.ts +++ b/src/modules/feature-modules/admin/services/users.service.ts @@ -3,7 +3,7 @@ import { Observable, throwError } from 'rxjs'; import { catchError, map, take } from 'rxjs/operators'; import { CoreService } from '@app/base'; -import { AccessorOrganisationRoleEnum, TermsOfUseTypeEnum, UserRoleEnum } from '@app/base/enums'; +import { TermsOfUseTypeEnum, UserRoleEnum } from '@app/base/enums'; import { UrlModel } from '@app/base/models'; import { APIQueryParamsType, DateISOType, MappedObjectType } from '@app/base/types'; import { UserInfo } from '@modules/shared/dtos/users.dto'; @@ -15,7 +15,7 @@ export type changeUserTypeDTO = { export type changeUserRoleDTO = { role: { - name: AccessorOrganisationRoleEnum; + name: UserRoleEnum.ACCESSOR | UserRoleEnum.QUALIFYING_ACCESSOR; organisationId: string; }; }; diff --git a/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.spec.ts b/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.spec.ts index 340ba4814..069b838d1 100644 --- a/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.spec.ts +++ b/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Injector } from '@angular/core'; @@ -7,14 +6,14 @@ import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { of } from 'rxjs'; import { CoreModule, AppInjector } from '@modules/core'; -import { StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { AdminModule } from '@modules/feature-modules/admin/admin.module'; import { WizardOrganisationUnitActivateComponent } from './organisation-unit-activate.component'; -import { WizardOrganisationUnitActivateUsersStepComponent } from './steps/users-step.component'; -import { WizardSummaryWithConfirmStepComponent } from '@modules/shared/wizards/steps/summary-with-confirm-step.component'; import { OrganisationsService } from '@modules/shared/services/organisations.service'; +import { UserContextStore } from '@modules/stores/ctx/user/user.store'; +import { UserContextService } from '@modules/stores/ctx/user/user.service'; describe('FeatureModules/Admin/Wizards//WizardOrganisationUnitActivateComponent', () => { let activatedRoute: ActivatedRoute; @@ -28,7 +27,8 @@ describe('FeatureModules/Admin/Wizards//WizardOrganisationUnitActivateComponent' beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, RouterModule.forRoot([]), CoreModule, StoresModule, AdminModule] + imports: [HttpClientTestingModule, RouterModule.forRoot([]), CoreModule, StoresModule, AdminModule], + providers: [CtxStore, UserContextStore, UserContextService] }); AppInjector.setInjector(TestBed.inject(Injector)); diff --git a/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.ts b/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.ts index 7eea69d77..46fe4a3c8 100644 --- a/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.ts +++ b/src/modules/feature-modules/admin/wizards/organisation-unit-activate/organisation-unit-activate.component.ts @@ -137,7 +137,7 @@ export class WizardOrganisationUnitActivateComponent extends CoreComponent imple { label: 'Users', value: this.wizard.data.usersStep.users - .map(item => `${item.name} (${this.stores.authentication.getRoleDescription(item.organisationRole)})`) + .map(item => `${item.name} (${this.ctx.user.getRoleDescription(item.organisationRole)})`) .join('\n') } ], diff --git a/src/modules/feature-modules/admin/wizards/organisation-unit-activate/steps/users-step.component.ts b/src/modules/feature-modules/admin/wizards/organisation-unit-activate/steps/users-step.component.ts index c3140cc8d..aaf67ea95 100644 --- a/src/modules/feature-modules/admin/wizards/organisation-unit-activate/steps/users-step.component.ts +++ b/src/modules/feature-modules/admin/wizards/organisation-unit-activate/steps/users-step.component.ts @@ -8,9 +8,9 @@ import { MappedObjectType, WizardStepComponentType, WizardStepEventType } from ' import { UsersStepInputType, UsersStepOutputType } from './users-step.types'; -import { UserRoleEnum } from '@modules/stores/authentication/authentication.enums'; import { UserListFiltersType, UsersService } from '@modules/shared/services/users.service'; import { UsersListDTO } from '@modules/shared/dtos/users.dto'; +import { UserRoleEnum } from '@app/base/enums'; @Component({ selector: 'app-admin-wizards-organisation-unit-activate-users-step', diff --git a/src/modules/feature-modules/announcements/guards/announcements-access.guard.ts b/src/modules/feature-modules/announcements/guards/announcements-access.guard.ts index ebd7dcafc..62324f54a 100644 --- a/src/modules/feature-modules/announcements/guards/announcements-access.guard.ts +++ b/src/modules/feature-modules/announcements/guards/announcements-access.guard.ts @@ -1,31 +1,30 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; - -import { AuthenticationStore } from '@modules/stores/authentication/authentication.store'; +import { CtxStore } from '@modules/stores'; @Injectable() export class AnnouncementsAccessGuard { constructor( private router: Router, - private authentication: AuthenticationStore + private ctx: CtxStore ) {} canActivate(): boolean { - const userContext = this.authentication.getUserContextInfo(); + const userContext = this.ctx.user.getUserContext(); if (!userContext) { this.router.navigate(['/switch-user-context']); return false; } - if (!this.authentication.isTermsOfUseAccepted()) { - const path = this.authentication.userUrlBasePath() + '/terms-of-use'; + if (!this.ctx.user.isTermsOfUseAccepted()) { + const path = this.ctx.user.userUrlBasePath() + '/terms-of-use'; this.router.navigateByUrl(path); return false; } - if (!this.authentication.hasAnnouncements()) { - this.router.navigateByUrl(this.authentication.userUrlBasePath()); + if (!this.ctx.user.hasAnnouncements()) { + this.router.navigateByUrl(this.ctx.user.userUrlBasePath()); return false; } diff --git a/src/modules/feature-modules/assessment/pages/dashboard/dashboard.component.ts b/src/modules/feature-modules/assessment/pages/dashboard/dashboard.component.ts index fea589b80..0880a81cb 100644 --- a/src/modules/feature-modules/assessment/pages/dashboard/dashboard.component.ts +++ b/src/modules/feature-modules/assessment/pages/dashboard/dashboard.component.ts @@ -39,13 +39,13 @@ export class DashboardComponent extends CoreComponent implements OnInit { private announcementsService: AnnouncementsService ) { super(); - this.setPageTitle('Home', { hint: `Hello ${this.stores.authentication.getUserInfo().displayName}` }); + this.setPageTitle('Home', { hint: `Hello ${this.ctx.user.getDisplayName()}` }); this.user = { - displayName: this.stores.authentication.getUserInfo().displayName, + displayName: this.ctx.user.getDisplayName(), organisation: 'Needs assessment team', - passwordResetAt: this.stores.authentication.getUserInfo().passwordResetAt || '', - firstTimeSignInAt: this.stores.authentication.getUserInfo().firstTimeSignInAt + passwordResetAt: this.ctx.user.getUserInfo().passwordResetAt ?? '', + firstTimeSignInAt: this.ctx.user.getUserInfo().firstTimeSignInAt }; this.latestInnovations = new TableModel({ pageSize: 5 }); @@ -57,7 +57,7 @@ export class DashboardComponent extends CoreComponent implements OnInit { const newState = history.state; delete newState.alert; history.replaceState(newState, ''); - this.stores.authentication.userPasswordSuccessfullyUpdated(); + this.ctx.user.updateInfo({ passwordChangeSinceLastSignIn: true }); } const qp: { statistics: UserStatisticsTypeEnum[] } = { diff --git a/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-info.component.ts b/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-info.component.ts index 48eb511fa..a4a541ec1 100644 --- a/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-info.component.ts +++ b/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-info.component.ts @@ -26,10 +26,7 @@ export class InnovationAssessmentExemptionInfoComponent extends CoreComponent im this.innovationId = this.activatedRoute.snapshot.params.innovationId; this.assessmentId = this.activatedRoute.snapshot.params.assessmentId; - this.setBackLink( - 'Go back', - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/overview` - ); + this.setBackLink('Go back', `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/overview`); this.setPageTitle('Innovation exempt from key performance indicator (KPI) reports'); } diff --git a/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-upsert.component.ts b/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-upsert.component.ts index 685cbb3eb..da26c2bc2 100644 --- a/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-upsert.component.ts +++ b/src/modules/feature-modules/assessment/pages/innovation/assessment/exemption-upsert.component.ts @@ -32,7 +32,7 @@ export class InnovationAssessmentExemptionUpsertComponent extends CoreComponent this.innovationId = this.activatedRoute.snapshot.params.innovationId; this.assessmentId = this.activatedRoute.snapshot.params.assessmentId; - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/overview`; + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/overview`; this.setBackLink(); this.setPageTitle('Exempt this innovation from KPI reports'); diff --git a/src/modules/feature-modules/assessment/services/assessment.service.spec.ts b/src/modules/feature-modules/assessment/services/assessment.service.spec.ts index 3ec386fb2..a02e0d099 100644 --- a/src/modules/feature-modules/assessment/services/assessment.service.spec.ts +++ b/src/modules/feature-modules/assessment/services/assessment.service.spec.ts @@ -3,10 +3,10 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import { ENV } from '@tests/app.mocks'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { AppInjector, CoreModule, EnvironmentVariablesStore } from '@modules/core'; -import { StoresModule, AuthenticationStore } from '@modules/stores'; +import { StoresModule, CtxStore } from '@modules/stores'; import { AssessmentModule } from '@modules/feature-modules/assessment/assessment.module'; import { AssessmentService } from './assessment.service'; @@ -15,7 +15,7 @@ describe('FeatureModules/Assessment/Services/AssessmentService', () => { let httpMock: HttpTestingController; let envVariablesStore: EnvironmentVariablesStore; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let service: AssessmentService; @@ -30,11 +30,11 @@ describe('FeatureModules/Assessment/Services/AssessmentService', () => { httpMock = TestBed.inject(HttpTestingController); envVariablesStore = TestBed.inject(EnvironmentVariablesStore); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); service = TestBed.inject(AssessmentService); - authenticationStore.getUserId = () => 'UserId01'; + ctx.user.getUserId = signal('UserId01'); }); afterEach(() => { diff --git a/src/modules/feature-modules/innovator/guards/check-role.guard.ts b/src/modules/feature-modules/innovator/guards/check-role.guard.ts index 77656da7d..04a95dfe9 100644 --- a/src/modules/feature-modules/innovator/guards/check-role.guard.ts +++ b/src/modules/feature-modules/innovator/guards/check-role.guard.ts @@ -1,14 +1,14 @@ import { inject } from '@angular/core'; import { CanActivateFn, Router } from '@angular/router'; import { UserRoleEnum } from '@app/base/enums'; -import { AuthenticationStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; export function checkRoleGuard(roles: UserRoleEnum[]): CanActivateFn { return () => { const router: Router = inject(Router); - const authenticationStore: AuthenticationStore = inject(AuthenticationStore); + const ctx: CtxStore = inject(CtxStore); - const userType: UserRoleEnum | undefined = authenticationStore.getUserType(); + const userType: UserRoleEnum | undefined = ctx.user.getUserType(); if (userType !== undefined && roles.includes(userType)) { return true; diff --git a/src/modules/feature-modules/innovator/guards/check-status.guard.ts b/src/modules/feature-modules/innovator/guards/check-status.guard.ts index 1467a7344..6486d5eea 100644 --- a/src/modules/feature-modules/innovator/guards/check-status.guard.ts +++ b/src/modules/feature-modules/innovator/guards/check-status.guard.ts @@ -1,5 +1,5 @@ import { inject } from '@angular/core'; -import { AuthenticationStore, CtxStore, InnovationStatusEnum } from '@modules/stores'; +import { CtxStore, InnovationStatusEnum } from '@modules/stores'; import { ActivatedRouteSnapshot, CanActivateFn, Router } from '@angular/router'; import { catchError, map } from 'rxjs/operators'; import { of } from 'rxjs'; @@ -8,27 +8,24 @@ export function checkStatusGuard(statusList: InnovationStatusEnum[], blockList = return (route: ActivatedRouteSnapshot) => { const router: Router = inject(Router); const ctx: CtxStore = inject(CtxStore); - const authenticationStore: AuthenticationStore = inject(AuthenticationStore); - return ctx.innovation - .getOrLoadInnovation$(route.params.innovationId, authenticationStore.getUserContextInfo()) - .pipe( - map(contextInfo => { - const allowStatusCheck = blockList - ? !statusList.includes(contextInfo.status) - : statusList.includes(contextInfo.status); + return ctx.innovation.getOrLoadInnovation$(route.params.innovationId, ctx.user.getUserContext()).pipe( + map(contextInfo => { + const allowStatusCheck = blockList + ? !statusList.includes(contextInfo.status) + : statusList.includes(contextInfo.status); - if (allowStatusCheck) { - return true; - } else { - router.navigateByUrl('error/forbidden-innovation'); - return false; - } - }), - catchError(() => { - router.navigateByUrl('error/generic'); - return of(false); - }) - ); + if (allowStatusCheck) { + return true; + } else { + router.navigateByUrl('error/forbidden-innovation'); + return false; + } + }), + catchError(() => { + router.navigateByUrl('error/generic'); + return of(false); + }) + ); }; } diff --git a/src/modules/feature-modules/innovator/guards/first-time-signin.guard.spec.ts b/src/modules/feature-modules/innovator/guards/first-time-signin.guard.spec.ts index 3ce1e32ac..c35f59c3d 100644 --- a/src/modules/feature-modules/innovator/guards/first-time-signin.guard.spec.ts +++ b/src/modules/feature-modules/innovator/guards/first-time-signin.guard.spec.ts @@ -1,17 +1,17 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { ActivatedRouteSnapshot, Router, RouterModule, RouterStateSnapshot } from '@angular/router'; import { AppInjector, CoreModule } from '@modules/core'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; import { FirstTimeSigninGuard } from './first-time-signin.guard'; describe('FeatureModules/Innovator/Guards/FirstTimeSigninGuard', () => { let guard: FirstTimeSigninGuard; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let routerStateSnapshopMock: Partial; @@ -24,7 +24,7 @@ describe('FeatureModules/Innovator/Guards/FirstTimeSigninGuard', () => { AppInjector.setInjector(TestBed.inject(Injector)); guard = TestBed.inject(FirstTimeSigninGuard); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); routerStateSnapshopMock = { url: '' }; }); @@ -62,7 +62,7 @@ describe('FeatureModules/Innovator/Guards/FirstTimeSigninGuard', () => { const routerSpy = jest.spyOn(TestBed.inject(Router), 'navigate'); let expected: null | boolean = null; - authenticationStore.hasInnovationTransfers = () => true; + ctx.user.hasInnovationTransfers = signal(true); guard.canActivateChild(routeMock as any, routerStateSnapshopMock as any).subscribe(response => { expected = response; @@ -76,7 +76,7 @@ describe('FeatureModules/Innovator/Guards/FirstTimeSigninGuard', () => { const routeMock: Partial = { routeConfig: { path: 'first-time-signin' } }; let expected: null | boolean = null; - authenticationStore.hasInnovationTransfers = () => false; + ctx.user.hasInnovationTransfers = signal(false); guard.canActivateChild(routeMock as any, routerStateSnapshopMock as any).subscribe(response => { expected = response; @@ -89,7 +89,7 @@ describe('FeatureModules/Innovator/Guards/FirstTimeSigninGuard', () => { const routerSpy = jest.spyOn(TestBed.inject(Router), 'navigate'); let expected: null | boolean = null; - authenticationStore.hasInnovationTransfers = () => false; + ctx.user.hasInnovationTransfers = signal(false); guard.canActivateChild(routeMock as any, routerStateSnapshopMock as any).subscribe(response => { expected = response; @@ -105,7 +105,7 @@ describe('FeatureModules/Innovator/Guards/FirstTimeSigninGuard', () => { const routerStateSnapshopMock: Partial = { url: 'terms-of-use' }; let expected: null | boolean = null; - authenticationStore.hasInnovationTransfers = () => false; + ctx.user.hasInnovationTransfers = signal(false); guard.canActivateChild(routeMock as any, routerStateSnapshopMock as any).subscribe(response => { expected = response; diff --git a/src/modules/feature-modules/innovator/guards/first-time-signin.guard.ts b/src/modules/feature-modules/innovator/guards/first-time-signin.guard.ts index 9eaa72f35..598ff571b 100644 --- a/src/modules/feature-modules/innovator/guards/first-time-signin.guard.ts +++ b/src/modules/feature-modules/innovator/guards/first-time-signin.guard.ts @@ -2,13 +2,13 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; import { Observable, of } from 'rxjs'; -import { AuthenticationStore } from '@modules/stores/authentication/authentication.store'; +import { CtxStore } from '@modules/stores'; @Injectable() export class FirstTimeSigninGuard { constructor( private router: Router, - private authenticationStore: AuthenticationStore + private ctx: CtxStore ) {} canActivateChild(activatedRouteSnapshot: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { @@ -16,7 +16,7 @@ export class FirstTimeSigninGuard { return of(true); } - if (this.authenticationStore.isFirstTimeSignInDone()) { + if (this.ctx.user.isFirstTimeSignInDone()) { // Don't allow to access First Time Signin, if already has been done. if (!['first-time-signin', ':id'].includes(activatedRouteSnapshot.routeConfig?.path || '')) { return of(true); diff --git a/src/modules/feature-modules/innovator/guards/manage.guard.ts b/src/modules/feature-modules/innovator/guards/manage.guard.ts index 126dbd176..08e13d696 100644 --- a/src/modules/feature-modules/innovator/guards/manage.guard.ts +++ b/src/modules/feature-modules/innovator/guards/manage.guard.ts @@ -2,14 +2,14 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router'; import { catchError, map, Observable, of } from 'rxjs'; -import { AuthenticationStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; import { InnovationsService } from '@modules/shared/services/innovations.service'; @Injectable() export class ManageGuard { constructor( private router: Router, - private authenticationStore: AuthenticationStore, + private ctx: CtxStore, private innovationsService: InnovationsService ) {} @@ -19,7 +19,7 @@ export class ManageGuard { // For now, it must be like this as guards run always before resolvers on refresh (even if on children like this one) return this.innovationsService.getInnovationInfo(route.params.innovationId).pipe( map(response => { - const userContext = this.authenticationStore.getUserContextInfo(); + const userContext = this.ctx.user.getUserContext(); const loggedUser = { isOwner: response.owner ? response.owner.id === userContext?.id : false }; if (state.url.includes('manage/innovation')) { diff --git a/src/modules/feature-modules/innovator/pages/account/account-delete.component.spec.ts b/src/modules/feature-modules/innovator/pages/account/account-delete.component.spec.ts index a9fad68cc..e3ede2e91 100644 --- a/src/modules/feature-modules/innovator/pages/account/account-delete.component.spec.ts +++ b/src/modules/feature-modules/innovator/pages/account/account-delete.component.spec.ts @@ -4,15 +4,13 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Injector } from '@angular/core'; import { CoreModule, AppInjector } from '@modules/core'; -import { StoresModule, AuthenticationStore } from '@modules/stores'; +import { StoresModule } from '@modules/stores'; import { InnovatorModule } from '@modules/feature-modules/innovator/innovator.module'; import { PageAccountDeleteComponent } from './account-delete.component'; import { RouterModule } from '@angular/router'; describe('FeatureModules/Innovator/Pages/Account/PageAccountDeleteComponent', () => { - let authenticationStore: AuthenticationStore; - let component: PageAccountDeleteComponent; let fixture: ComponentFixture; @@ -22,8 +20,6 @@ describe('FeatureModules/Innovator/Pages/Account/PageAccountDeleteComponent', () }); AppInjector.setInjector(TestBed.inject(Injector)); - - authenticationStore = TestBed.inject(AuthenticationStore); }); it('should create the component', () => { diff --git a/src/modules/feature-modules/innovator/pages/account/account-delete.component.ts b/src/modules/feature-modules/innovator/pages/account/account-delete.component.ts index 948a4221d..68f5d525f 100644 --- a/src/modules/feature-modules/innovator/pages/account/account-delete.component.ts +++ b/src/modules/feature-modules/innovator/pages/account/account-delete.component.ts @@ -48,13 +48,13 @@ export class PageAccountDeleteComponent extends CoreComponent implements OnInit this.setBackLink('Go back', this.onSubmitStep.bind(this, 'previous')); - const email = this.stores.authentication.getUserInfo().email; - const roleId = this.stores.authentication.getUserContextInfo()?.roleId; + const email = this.ctx.user.getUserInfo().email; + const roleId = this.ctx.user.getUserContext()?.roleId; this.innovator = { email: email, roleId: roleId, isOwner: false, - isCollaborator: this.stores.authentication.hasInnovationCollaborations(), + isCollaborator: this.ctx.user.hasInnovationCollaborations(), hasCollaborators: false, hasPendingTransfer: false, hasOnlyPendingTransfers: false, @@ -125,7 +125,7 @@ export class PageAccountDeleteComponent extends CoreComponent implements OnInit this.redirectTo(previousUrl); } } else { - this.redirectTo(`/${this.stores.authentication.userUrlBasePath()}/dashboard`); + this.redirectTo(`/${this.ctx.user.userUrlBasePath()}/dashboard`); } return; } else if (this.stepNumber === 3 && !this.innovator.hasPendingTransfer) { diff --git a/src/modules/feature-modules/innovator/pages/dashboard/dashboard.component.ts b/src/modules/feature-modules/innovator/pages/dashboard/dashboard.component.ts index 4131e057d..333d820d0 100644 --- a/src/modules/feature-modules/innovator/pages/dashboard/dashboard.component.ts +++ b/src/modules/feature-modules/innovator/pages/dashboard/dashboard.component.ts @@ -63,7 +63,7 @@ export class PageDashboardComponent extends CoreComponent implements OnInit { ) { super(); - const user = this.stores.authentication.getUserInfo(); + const user = this.ctx.user.getUserInfo(); this.user = { displayName: user.displayName, innovationsOwner: [], @@ -82,7 +82,7 @@ export class PageDashboardComponent extends CoreComponent implements OnInit { const newState = history.state; delete newState.alert; history.replaceState(newState, ''); - this.stores.authentication.userPasswordSuccessfullyUpdated(); + this.ctx.user.updateInfo({ passwordChangeSinceLastSignIn: true }); } forkJoin([ @@ -162,7 +162,7 @@ export class PageDashboardComponent extends CoreComponent implements OnInit { } }), concatMap( - () => this.stores.authentication.initializeAuthentication$() // Initialize authentication in order to update First Time SignIn information. + () => this.ctx.user.initializeAuthentication$() // Initialize authentication in order to update First Time SignIn information. ), concatMap(() => forkJoin([ diff --git a/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.spec.ts b/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.spec.ts index 181c061e0..a8e119787 100644 --- a/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.spec.ts +++ b/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.spec.ts @@ -6,7 +6,7 @@ import { Router, RouterModule } from '@angular/router'; import { AppInjector, CoreModule } from '@modules/core'; import { InnovatorModule } from '@modules/feature-modules/innovator/innovator.module'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { StoresModule } from '@modules/stores'; import { FirstTimeSigninComponent } from './first-time-signin.component'; @@ -16,7 +16,6 @@ describe('FeatureModules/Innovator/Pages/FirstTimeSignin/FirstTimeSigninComponen let router: Router; let routerSpy: jest.SpyInstance; - let authenticationStore: AuthenticationStore; let innovatorService: InnovatorService; let component: FirstTimeSigninComponent; @@ -32,7 +31,6 @@ describe('FeatureModules/Innovator/Pages/FirstTimeSignin/FirstTimeSigninComponen router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); - authenticationStore = TestBed.inject(AuthenticationStore); innovatorService = TestBed.inject(InnovatorService); }); diff --git a/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.ts b/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.ts index f0dd2352b..0be78be5b 100644 --- a/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.ts +++ b/src/modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.component.ts @@ -68,13 +68,13 @@ export class FirstTimeSigninComponent extends CoreComponent implements OnInit { of(true) .pipe( concatMap(() => - this.stores.authentication.updateUserInfo$({ + this.ctx.user.updateUserInfo$({ displayName: wizardData.innovatorName, mobilePhone: UtilsHelper.isEmpty(wizardData.mobilePhone) ? null : wizardData.mobilePhone, organisation: wizardData.organisation ? { - id: this.stores.authentication.getUserInfo().organisations[0].id, + id: this.ctx.user.getUserInfo().organisations[0].id, isShadow: false, name: wizardData.organisation.name, size: wizardData.organisation.size, @@ -82,7 +82,7 @@ export class FirstTimeSigninComponent extends CoreComponent implements OnInit { registrationNumber: wizardData.organisation.registrationNumber } : { - id: this.stores.authentication.getUserInfo().organisations[0].id, + id: this.ctx.user.getUserInfo().organisations[0].id, isShadow: true }, howDidYouFindUsAnswers: wizardData.howDidYouFindUsAnswers @@ -90,7 +90,8 @@ export class FirstTimeSigninComponent extends CoreComponent implements OnInit { ), // Initialize authentication in order to update First Time SignIn information. - concatMap(() => this.stores.authentication.initializeAuthentication$()) + // TODO: try to remove this by updating the state when calling updateUserInfo$ + concatMap(() => this.ctx.user.initializeAuthentication$()) ) .subscribe({ next: () => { diff --git a/src/modules/feature-modules/innovator/pages/innovation-new/innovation-new.component.ts b/src/modules/feature-modules/innovator/pages/innovation-new/innovation-new.component.ts index d6ab226bf..784ea734a 100644 --- a/src/modules/feature-modules/innovator/pages/innovation-new/innovation-new.component.ts +++ b/src/modules/feature-modules/innovator/pages/innovation-new/innovation-new.component.ts @@ -65,7 +65,7 @@ export class InnovationNewComponent extends CoreComponent implements OnInit { .createInnovation(body) .pipe( concatMap(response => { - this.stores.authentication.initializeAuthentication$(); // Initialize authentication in order to update innovations information. + this.ctx.user.initializeAuthentication$(); // Initialize authentication in order to update innovations information. return of(response); }) ) diff --git a/src/modules/feature-modules/innovator/pages/innovation/manage/manage-collaborators-overview.component.ts b/src/modules/feature-modules/innovator/pages/innovation/manage/manage-collaborators-overview.component.ts index 5b3c9c428..ff7ce4c88 100644 --- a/src/modules/feature-modules/innovator/pages/innovation/manage/manage-collaborators-overview.component.ts +++ b/src/modules/feature-modules/innovator/pages/innovation/manage/manage-collaborators-overview.component.ts @@ -31,7 +31,7 @@ export class PageInnovationManageCollaboratorsOverviewComponent extends CoreComp this.innovation = this.ctx.innovation.info(); - const user = this.stores.authentication.getUserInfo(); + const user = this.ctx.user.getUserInfo(); this.user = { id: user.id, name: user.displayName, email: user.email }; this.setPageTitle('Invite or manage collaborators'); diff --git a/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.spec.ts b/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.spec.ts index 3b1cee20c..ecc588673 100644 --- a/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.spec.ts +++ b/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.spec.ts @@ -3,10 +3,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Injector } from '@angular/core'; import { Router, RouterModule } from '@angular/router'; -import { of, throwError } from 'rxjs'; import { CoreModule, AppInjector } from '@modules/core'; -import { StoresModule, AuthenticationStore } from '@modules/stores'; +import { StoresModule } from '@modules/stores'; import { InnovatorModule } from '@modules/feature-modules/innovator/innovator.module'; import { InnovationsService } from '@modules/shared/services/innovations.service'; @@ -17,7 +16,6 @@ describe('FeatureModules/Innovator/Pages/Account/ManageInnovations/PageAccountIn let router: Router; let routerSpy: jest.SpyInstance; - let authenticationStore: AuthenticationStore; let innovationsService: InnovationsService; let innovatorService: InnovatorService; @@ -34,7 +32,6 @@ describe('FeatureModules/Innovator/Pages/Account/ManageInnovations/PageAccountIn router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); - authenticationStore = TestBed.inject(AuthenticationStore); innovationsService = TestBed.inject(InnovationsService); innovatorService = TestBed.inject(InnovatorService); }); diff --git a/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.ts b/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.ts index f5c519c01..394e1d2ad 100644 --- a/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.ts +++ b/src/modules/feature-modules/innovator/pages/innovation/manage/manage-transfer.component.ts @@ -54,7 +54,7 @@ export class PageInnovationManageTransferComponent extends CoreComponent impleme } ngOnInit(): void { - const myEmail = this.stores.authentication.getUserInfo().email; + const myEmail = this.ctx.user.getUserInfo().email; this.wizard = cloneDeep(NO_COLLABORATORS_TRANSFERS(myEmail)); this.innovationsService.getInnovationCollaboratorsList(this.innovationId, ['active']).subscribe(response => { diff --git a/src/modules/feature-modules/innovator/pages/innovation/manage/wizard-manage-archive/steps/confirmation-step.component.ts b/src/modules/feature-modules/innovator/pages/innovation/manage/wizard-manage-archive/steps/confirmation-step.component.ts index 0f86830a6..aba089a49 100644 --- a/src/modules/feature-modules/innovator/pages/innovation/manage/wizard-manage-archive/steps/confirmation-step.component.ts +++ b/src/modules/feature-modules/innovator/pages/innovation/manage/wizard-manage-archive/steps/confirmation-step.component.ts @@ -44,7 +44,7 @@ export class WizardInnovationManageArchiveConfirmationStepComponent super(); this.innovationId = this.activatedRoute.snapshot.params.innovationId; - this.userEmail = this.stores.authentication.getUserInfo().email; + this.userEmail = this.ctx.user.getUserInfo().email; this.form.controls.email.addValidators(CustomValidators.equalTo(this.userEmail)); diff --git a/src/modules/feature-modules/innovator/pages/innovation/needs-reassessment/needs-reassessment-send.component.ts b/src/modules/feature-modules/innovator/pages/innovation/needs-reassessment/needs-reassessment-send.component.ts index 86ca0cbcd..8f32d7bd0 100644 --- a/src/modules/feature-modules/innovator/pages/innovation/needs-reassessment/needs-reassessment-send.component.ts +++ b/src/modules/feature-modules/innovator/pages/innovation/needs-reassessment/needs-reassessment-send.component.ts @@ -91,7 +91,7 @@ export class PageInnovationNeedsReassessmentSendComponent extends CoreComponent if (previousUrl) { this.redirectTo(previousUrl); } else { - this.redirectTo(`/${this.stores.authentication.userUrlBasePath()}/dashboard`); + this.redirectTo(`/${this.ctx.user.userUrlBasePath()}/dashboard`); } } else { this.wizard.previousStep(); diff --git a/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.html b/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.html index 6314a2c9a..27cd53740 100644 --- a/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.html +++ b/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.html @@ -1,4 +1,5 @@ -
+ +
@@ -25,7 +26,7 @@
diff --git a/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.ts b/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.ts index 0e85d0d78..2d9af0e50 100644 --- a/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.ts +++ b/src/modules/feature-modules/innovator/pages/innovation/record/section-edit.component.ts @@ -42,9 +42,6 @@ export class InnovationSectionEditComponent extends CoreComponent implements OnI displayChangeButtonList: number[] = []; - // Flags - isInnovatorType: boolean; - constructor(private activatedRoute: ActivatedRoute) { super(); @@ -60,9 +57,6 @@ export class InnovationSectionEditComponent extends CoreComponent implements OnI this.isArchived = this.ctx.innovation.isArchived(); - // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.setBackLink('Go back', this.onSubmitStep.bind(this, 'previous')); } diff --git a/src/modules/feature-modules/innovator/services/innovator.service.spec.ts b/src/modules/feature-modules/innovator/services/innovator.service.spec.ts index 373a422ab..9f4683952 100644 --- a/src/modules/feature-modules/innovator/services/innovator.service.spec.ts +++ b/src/modules/feature-modules/innovator/services/innovator.service.spec.ts @@ -3,10 +3,10 @@ import { TestBed } from '@angular/core/testing'; import { ENV } from '@tests/app.mocks'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { AppInjector, CoreModule, EnvironmentVariablesStore } from '@modules/core'; -import { AuthenticationStore, StoresModule, InnovationTransferStatusEnum } from '@modules/stores'; +import { StoresModule, InnovationTransferStatusEnum, CtxStore } from '@modules/stores'; import { InnovatorService } from './innovator.service'; @@ -14,7 +14,7 @@ describe('FeatureModules/Innovator/InnovatorService', () => { let httpMock: HttpTestingController; let envVariablesStore: EnvironmentVariablesStore; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let service: InnovatorService; beforeEach(() => { @@ -28,10 +28,10 @@ describe('FeatureModules/Innovator/InnovatorService', () => { httpMock = TestBed.inject(HttpTestingController); envVariablesStore = TestBed.inject(EnvironmentVariablesStore); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); service = TestBed.inject(InnovatorService); - authenticationStore.getUserId = () => 'UserId01'; + ctx.user.getUserId = signal('UserId01'); }); afterEach(() => { diff --git a/src/modules/feature-modules/innovator/services/innovator.service.ts b/src/modules/feature-modules/innovator/services/innovator.service.ts index b6130473e..60a710998 100644 --- a/src/modules/feature-modules/innovator/services/innovator.service.ts +++ b/src/modules/feature-modules/innovator/services/innovator.service.ts @@ -85,7 +85,7 @@ export class InnovatorService extends CoreService { submitOrganisationSharing(innovationId: string, body: MappedObjectType): Observable<{ id: string }> { const url = new UrlModel(this.API_INNOVATIONS_URL) .addPath('v1/:innovationId/shares') - .setPathParams({ userId: this.stores.authentication.getUserId(), innovationId }); + .setPathParams({ userId: this.ctx.user.getUserId(), innovationId }); return this.http.put<{ id: string }>(url.buildUrl(), body).pipe( take(1), map(response => response) diff --git a/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.html b/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.html index 633b4db74..b95e31eb4 100644 --- a/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.html +++ b/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.html @@ -1,12 +1,13 @@ -
-
+ + +
Important: You could miss time sensitive service reminders
-

+

If you do not select 'innovator submits innovation record' or 'assigned needs assessor' notifications, you could miss time sensitive service reminders.

-

If you do not select 'suggestions to support', you could miss time sensitive service reminders.

+

If you do not select 'suggestions to support', you could miss time sensitive service reminders.

diff --git a/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.spec.ts b/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.spec.ts index 7eaf83f50..1190b7c54 100644 --- a/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.spec.ts +++ b/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.spec.ts @@ -1,14 +1,14 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { ActivatedRoute, Router, RouterModule } from '@angular/router'; import { AppInjector, CoreModule } from '@modules/core'; import { SharedModule } from '@modules/shared/shared.module'; -import { AuthenticationStore, StoresModule } from '@modules/stores'; +import { CtxStore, StoresModule } from '@modules/stores'; -import { NotificationCategoryTypeEnum, NotificationsService } from '@modules/shared/services/notifications.service'; +import { NotificationCategoryTypeEnum } from '@modules/shared/services/notifications.service'; import { PageAccountEmailNotificationsEditComponent } from './email-notifications-edit.component'; @@ -17,8 +17,7 @@ describe('Shared/Pages/Account/EmailNotifications/PageAccountEmailNotificationsE let router: Router; let routerSpy: jest.SpyInstance; - let authenticationStore: AuthenticationStore; - let notificationsService: NotificationsService; + let ctx: CtxStore; let component: PageAccountEmailNotificationsEditComponent; let fixture: ComponentFixture; @@ -34,10 +33,9 @@ describe('Shared/Pages/Account/EmailNotifications/PageAccountEmailNotificationsE router = TestBed.inject(Router); routerSpy = jest.spyOn(router, 'navigate'); - authenticationStore = TestBed.inject(AuthenticationStore); - notificationsService = TestBed.inject(NotificationsService); + ctx = TestBed.inject(CtxStore); - authenticationStore.userUrlBasePath = () => 'innovator'; + ctx.user.userUrlBasePath = signal('innovator'); activatedRoute.snapshot.params = { notificationType: NotificationCategoryTypeEnum.SUPPORT }; }); diff --git a/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.ts b/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.ts index db4d505d1..53702e7c5 100644 --- a/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.ts +++ b/src/modules/shared/pages/account/email-notifications/email-notifications-edit.component.ts @@ -9,8 +9,7 @@ import { NotificationPreferenceEnum, NotificationsService } from '@modules/shared/services/notifications.service'; -import { AuthenticationStore } from '@modules/stores'; -import { AuthenticationModel } from '@modules/stores/authentication/authentication.models'; +import { UserContextType } from '@modules/stores/ctx/user/user.types'; @Component({ selector: 'shared-pages-account-email-notifications-edit', @@ -19,11 +18,7 @@ import { AuthenticationModel } from '@modules/stores/authentication/authenticati export class PageAccountEmailNotificationsEditComponent extends CoreComponent implements OnInit { notificationListLink: string; - // Flags - isAssessmentType: boolean; - isQualifyingAccessorRole: boolean; - - currentUserContext: AuthenticationModel['userContext']; + currentUserContext: UserContextType['domainContext']; formPreferencesList: { value: string; label: string; description: string }[] = []; preferencesResponse: EmailNotificationPreferencesDTO = {}; @@ -35,18 +30,12 @@ export class PageAccountEmailNotificationsEditComponent extends CoreComponent im { updateOn: 'blur' } ); - constructor( - private notificationsService: NotificationsService, - private authenticationStore: AuthenticationStore - ) { + constructor(private notificationsService: NotificationsService) { super(); - this.notificationListLink = `/${this.stores.authentication.userUrlBasePath()}/account/email-notifications`; - - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - this.isQualifyingAccessorRole = this.stores.authentication.isQualifyingAccessorRole(); + this.notificationListLink = `/${this.ctx.user.userUrlBasePath()}/account/email-notifications`; - this.currentUserContext = this.authenticationStore.getUserContextInfo(); + this.currentUserContext = this.ctx.user.getUserContext(); this.setPageTitle('Select the email notifications you want to receive', { width: '2.thirds', size: 'l' }); diff --git a/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.html b/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.html index 9736328de..2ff6eec25 100644 --- a/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.html +++ b/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.html @@ -1,8 +1,9 @@ -

Email notification preferences by category

+ +

Email notification preferences by category

-
+

If you update your email preferences they will only apply to the profile you are logged in with.

You are logged in as {{ this.displayName }}, {{ currentRole.description }}.

diff --git a/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.ts b/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.ts index 85c4666df..9bbf52dff 100644 --- a/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.ts +++ b/src/modules/shared/pages/account/email-notifications/email-notifications-list.component.ts @@ -7,8 +7,7 @@ import { NotificationPreferenceEnum, NotificationsService } from '@modules/shared/services/notifications.service'; -import { AuthenticationStore } from '@modules/stores'; -import { AuthenticationModel } from '@modules/stores/authentication/authentication.models'; +import { UserContextType } from '@modules/stores/ctx/user/user.types'; @Component({ selector: 'app-assessment-account-email-notifications-list', @@ -20,34 +19,29 @@ export class PageAccountEmailNotificationsListComponent extends CoreComponent im currentRole: null | { id: string; description: string }; displayName: string; - currentUserContext: AuthenticationModel['userContext']; + currentUserContext: UserContextType['domainContext']; formPreferencesList: { value: string; cssClass: string; preference: string; title: string; description: string }[] = []; preferencesResponse: EmailNotificationPreferencesDTO; - constructor( - private notificationsService: NotificationsService, - private authenticationStore: AuthenticationStore - ) { + constructor(private notificationsService: NotificationsService) { super(); this.setPageTitle('Email preferences'); - this.displayName = this.authenticationStore.getUserInfo().displayName; + this.displayName = this.ctx.user.getDisplayName(); - this.currentUserContext = this.authenticationStore.getUserContextInfo(); + this.currentUserContext = this.ctx.user.getUserContext(); if (!this.currentUserContext) { this.currentRole = null; } else { this.currentRole = { id: this.currentUserContext.roleId, - description: `${this.authenticationStore.getRoleDescription(this.currentUserContext.type)}${ - this.authenticationStore.isAccessorType() - ? ` (${this.currentUserContext.organisationUnit?.name.trimEnd()})` - : '' + description: `${this.ctx.user.getRoleDescription(this.currentUserContext.type)}${ + this.ctx.user.isAccessorType() ? ` (${this.currentUserContext.organisationUnit?.name.trimEnd()})` : '' }` }; } @@ -57,7 +51,6 @@ export class PageAccountEmailNotificationsListComponent extends CoreComponent im ngOnInit(): void { this.getEmailNotificationTypes(); - this.checkMultipleRoles(); } private getEmailNotificationTypes(): void { @@ -104,14 +97,6 @@ export class PageAccountEmailNotificationsListComponent extends CoreComponent im }); } - private checkMultipleRoles(): void { - this.setPageStatus('LOADING'); - - const user = this.authenticationStore.getUserInfo(); - - this.hasMultipleRoles = user.roles.length > 1; - } - private getCategoryMessages(category: string): { title: string; description: string } { const role = this.currentUserContext?.type; diff --git a/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.html b/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.html index 774440ae0..6dfb1e391 100644 --- a/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.html +++ b/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.html @@ -11,7 +11,7 @@

Change your password

-
+

Delete your account

You will need to confirm your email address to delete your account.

diff --git a/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.ts b/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.ts index a5c1700e5..414921f52 100644 --- a/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.ts +++ b/src/modules/shared/pages/account/manage-account-info/manage-account-info.component.ts @@ -2,8 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { CoreComponent } from '@app/base'; import { DateISOType } from '@app/base/types'; -import { AuthenticationService } from '@modules/stores'; -import { MFAInfoDTO } from '@modules/stores/authentication/authentication.service'; +import { MFAInfo, UserContextService } from '@modules/stores/ctx/user/user.service'; @Component({ selector: 'shared-pages-account-manage-account-info', @@ -16,22 +15,21 @@ export class PageSharedAccountManageAccountInfoComponent extends CoreComponent i passwordResetAt: null | DateISOType; }; - MFAInfo: MFAInfoDTO | null = null; + MFAInfo: MFAInfo | null = null; - isInnovator: boolean = this.stores.authentication.isInnovatorType(); - - constructor(private authenticationService: AuthenticationService) { + constructor(private userCtxService: UserContextService) { super(); this.setPageTitle('Manage account'); - const user = this.stores.authentication.getUserInfo(); + // TODO: Check this component, can problem remove all of this calls and just use the state. + const user = this.ctx.user.getUserInfo(); this.user = { passwordResetAt: user.passwordResetAt }; if (user.passwordChangeSinceLastSignIn) { - this.authenticationService.getUserInfo(true).subscribe({ + this.userCtxService.getUserInfo(true).subscribe({ next: updatedUser => { this.user = { passwordResetAt: updatedUser.passwordResetAt @@ -45,7 +43,7 @@ export class PageSharedAccountManageAccountInfoComponent extends CoreComponent i } ngOnInit(): void { - this.authenticationService.getUserMFAInfo().subscribe({ + this.userCtxService.getUserMFAInfo().subscribe({ next: response => { this.MFAInfo = response; this.setPageStatus('READY'); diff --git a/src/modules/shared/pages/account/manage-details/manage-details-edit-accessor.config.ts b/src/modules/shared/pages/account/manage-details/manage-details-edit-accessor.config.ts index a135b79c1..6842136a6 100644 --- a/src/modules/shared/pages/account/manage-details/manage-details-edit-accessor.config.ts +++ b/src/modules/shared/pages/account/manage-details/manage-details-edit-accessor.config.ts @@ -1,9 +1,8 @@ -import { AuthenticationModel } from '@modules/stores/authentication/authentication.models'; - import { FormEngineModel, WizardSummaryType, WizardEngineModel } from '@modules/shared/forms'; +import { UserContextType } from '@modules/stores'; // Types. -type InboundPayloadType = Required['user']; +type InboundPayloadType = Required['user']; type StepPayloadType = { displayName: string; diff --git a/src/modules/shared/pages/account/manage-details/manage-details-edit-admin.config.ts b/src/modules/shared/pages/account/manage-details/manage-details-edit-admin.config.ts index 967e737ba..56ab607a3 100644 --- a/src/modules/shared/pages/account/manage-details/manage-details-edit-admin.config.ts +++ b/src/modules/shared/pages/account/manage-details/manage-details-edit-admin.config.ts @@ -1,9 +1,8 @@ -import { AuthenticationModel } from '@modules/stores/authentication/authentication.models'; - import { FormEngineModel, WizardSummaryType, WizardEngineModel } from '@modules/shared/forms'; +import { UserContextType } from '@modules/stores'; // Types. -type InboundPayloadType = Required['user']; +type InboundPayloadType = Required['user']; type StepPayloadType = { displayName: string; diff --git a/src/modules/shared/pages/account/manage-details/manage-details-edit-innovator.config.ts b/src/modules/shared/pages/account/manage-details/manage-details-edit-innovator.config.ts index ee48dbb3e..4a227207a 100644 --- a/src/modules/shared/pages/account/manage-details/manage-details-edit-innovator.config.ts +++ b/src/modules/shared/pages/account/manage-details/manage-details-edit-innovator.config.ts @@ -1,11 +1,6 @@ -import { AuthenticationModel } from '@modules/stores/authentication/authentication.models'; - import { UtilsHelper } from '@app/base/helpers'; import { FormEngineModel, FormEngineParameterModel, WizardEngineModel, WizardSummaryType } from '@modules/shared/forms'; -import { - ContactUserPreferenceEnum, - PhoneUserPreferenceEnum -} from '@modules/stores/authentication/authentication.service'; +import { ContactUserPreferenceEnum, PhoneUserPreferenceEnum, UserContextType } from '@modules/stores'; const organisationDescriptions = [ 'Sole trader', @@ -22,7 +17,7 @@ const organisationDescriptions = [ ] as const; // Types. -type InboundPayloadType = Required['user']; +type InboundPayloadType = Required['user']; type StepPayloadType = { displayName: string; diff --git a/src/modules/shared/pages/account/manage-details/manage-details-edit.component.spec.ts b/src/modules/shared/pages/account/manage-details/manage-details-edit.component.spec.ts index 41c64994b..d3eabe020 100644 --- a/src/modules/shared/pages/account/manage-details/manage-details-edit.component.spec.ts +++ b/src/modules/shared/pages/account/manage-details/manage-details-edit.component.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Injector } from '@angular/core'; +import { Injector, signal } from '@angular/core'; import { ActivatedRoute, RouterModule } from '@angular/router'; import { of } from 'rxjs'; @@ -11,8 +11,6 @@ import { AppInjector, CoreModule } from '@modules/core'; import { FormEngineComponent } from '@modules/shared/forms'; import { SharedModule } from '@modules/shared/shared.module'; import { - AuthenticationService, - AuthenticationStore, CtxStore, InnovationContextService, InnovationContextStore, @@ -30,10 +28,12 @@ import { PageAccountManageDetailsEditComponent } from './manage-details-edit.com import { ACCOUNT_DETAILS_ACCESSOR } from './manage-details-edit-accessor.config'; import { ACCOUNT_DETAILS_INNOVATOR } from './manage-details-edit-innovator.config'; import { ENV } from '@tests/app.mocks'; +import { UserContextService } from '@modules/stores/ctx/user/user.service'; +import { UserContextStore } from '@modules/stores/ctx/user/user.store'; describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditComponent', () => { let activatedRoute: ActivatedRoute; - let authenticationStore: AuthenticationStore; + let ctx: CtxStore; let component: PageAccountManageDetailsEditComponent; let fixture: ComponentFixture; @@ -42,8 +42,6 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone TestBed.configureTestingModule({ imports: [HttpClientTestingModule, RouterModule.forRoot([]), CoreModule, SharedModule], providers: [ - AuthenticationStore, - AuthenticationService, CtxStore, InnovationContextStore, InnovationContextService, @@ -54,16 +52,18 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone LayoutContextStore, NotificationsContextStore, NotificationsContextService, + UserContextStore, + UserContextService, { provide: 'APP_SERVER_ENVIRONMENT_VARIABLES', useValue: ENV } ] }); AppInjector.setInjector(TestBed.inject(Injector)); - authenticationStore = TestBed.inject(AuthenticationStore); + ctx = TestBed.inject(CtxStore); activatedRoute = TestBed.inject(ActivatedRoute); - authenticationStore.getUserInfo = () => USER_INFO_ACCESSOR; + ctx.user.getUserInfo = signal(USER_INFO_ACCESSOR); }); it('should create the component', () => { @@ -75,7 +75,7 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone it('should be a question step', () => { activatedRoute.snapshot.params = { stepId: 1 }; - authenticationStore.isInnovatorType = () => true; + ctx.user.isInnovator = signal(true); fixture = TestBed.createComponent(PageAccountManageDetailsEditComponent); component = fixture.componentInstance; @@ -87,7 +87,7 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone it('should be summary step', () => { activatedRoute.snapshot.params = { stepId: 'summary' }; activatedRoute.params = of({ stepId: 'summary' }); // Simulate activatedRoute.params subscription. - authenticationStore.isInnovatorType = () => true; + ctx.user.isInnovator = signal(true); fixture = TestBed.createComponent(PageAccountManageDetailsEditComponent); component = fixture.componentInstance; @@ -99,7 +99,7 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone it('should load innovator information', () => { activatedRoute.snapshot.params = { stepId: 1 }; activatedRoute.params = of({ stepId: 1 }); // Simulate activatedRoute.params subscription. - authenticationStore.isInnovatorType = () => true; + ctx.user.isInnovator = signal(true); fixture = TestBed.createComponent(PageAccountManageDetailsEditComponent); component = fixture.componentInstance; @@ -111,7 +111,7 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone it('should load accessor information', () => { activatedRoute.snapshot.params = { stepId: 1 }; activatedRoute.params = of({ stepId: 1 }); // Simulate activatedRoute.params subscription. - authenticationStore.isAccessorType = () => true; + ctx.user.isAccessorOrAssessment = signal(true); fixture = TestBed.createComponent(PageAccountManageDetailsEditComponent); component = fixture.componentInstance; @@ -123,7 +123,7 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone it('should load assessment information', () => { activatedRoute.snapshot.params = { stepId: 1 }; activatedRoute.params = of({ stepId: 1 }); // Simulate activatedRoute.params subscription. - authenticationStore.isAssessmentType = () => true; + ctx.user.isAccessorOrAssessment = signal(true); fixture = TestBed.createComponent(PageAccountManageDetailsEditComponent); component = fixture.componentInstance; @@ -135,7 +135,7 @@ describe('Shared/Pages/Account/ManageDetails/PageAccountManageDetailsEditCompone it('should do nothing when submitting a step and form not is valid', () => { activatedRoute.snapshot.params = { stepId: 1 }; activatedRoute.params = of({ stepId: 1 }); // Simulate activatedRoute.params subscription. - authenticationStore.isInnovatorType = () => true; + ctx.user.isInnovator = signal(true); const expected = { displayName: 'Test qualifying Accessor', diff --git a/src/modules/shared/pages/account/manage-details/manage-details-edit.component.ts b/src/modules/shared/pages/account/manage-details/manage-details-edit.component.ts index 13a2e04d0..625599a13 100644 --- a/src/modules/shared/pages/account/manage-details/manage-details-edit.component.ts +++ b/src/modules/shared/pages/account/manage-details/manage-details-edit.component.ts @@ -11,7 +11,7 @@ import { WizardSummaryType } from '@modules/shared/forms'; import { ACCOUNT_DETAILS_INNOVATOR } from './manage-details-edit-innovator.config'; import { ACCOUNT_DETAILS_ACCESSOR } from './manage-details-edit-accessor.config'; import { ACCOUNT_DETAILS_ADMIN } from './manage-details-edit-admin.config'; -import { UpdateUserInfoDTO } from '@modules/stores/authentication/authentication.service'; +import { UpdateUserInfo } from '@modules/stores/ctx/user/user.service'; @Component({ selector: 'shared-pages-account-manage-details-edit', @@ -40,15 +40,15 @@ export class PageAccountManageDetailsEditComponent extends CoreComponent impleme } ngOnInit(): void { - if (this.stores.authentication.isInnovatorType()) { + if (this.ctx.user.isInnovator()) { this.wizard = ACCOUNT_DETAILS_INNOVATOR; - } else if (this.stores.authentication.isAccessorType() || this.stores.authentication.isAssessmentType()) { + } else if (this.ctx.user.isAccessorOrAssessment()) { this.wizard = ACCOUNT_DETAILS_ACCESSOR; - } else if (this.stores.authentication.isAdminRole()) { + } else if (this.ctx.user.isAdmin()) { this.wizard = ACCOUNT_DETAILS_ADMIN; } - const user = this.stores.authentication.getUserInfo(); + const user = this.ctx.user.getUserInfo(); this.wizard.setAnswers(this.wizard.runInboundParsing(user)).runRules(); this.subscriptions.push( @@ -93,11 +93,11 @@ export class PageAccountManageDetailsEditComponent extends CoreComponent impleme onSubmitWizard(): void { const wizardData = this.wizard.runOutboundParsing(); - let body: UpdateUserInfoDTO = { + let body: UpdateUserInfo = { displayName: wizardData.displayName }; - if (this.stores.authentication.isInnovatorType()) { + if (this.ctx.user.isInnovator()) { body = { displayName: wizardData.displayName, contactByPhone: wizardData.contactByPhone, @@ -110,10 +110,11 @@ export class PageAccountManageDetailsEditComponent extends CoreComponent impleme }; } - this.stores.authentication + this.ctx.user .updateUserInfo$(body) .pipe( - concatMap(() => this.stores.authentication.initializeAuthentication$()) // Fetch all new information. + // TODO: try to remove this by updating the state when calling updateUserInfo$ + concatMap(() => this.ctx.user.initializeAuthentication$()) ) .subscribe({ next: () => { diff --git a/src/modules/shared/pages/account/manage-details/manage-details-info.component.ts b/src/modules/shared/pages/account/manage-details/manage-details-info.component.ts index ebdefd282..ce77d15e0 100644 --- a/src/modules/shared/pages/account/manage-details/manage-details-info.component.ts +++ b/src/modules/shared/pages/account/manage-details/manage-details-info.component.ts @@ -22,9 +22,9 @@ export class PageAccountManageDetailsInfoComponent extends CoreComponent impleme } ngOnInit(): void { - const user = this.stores.authentication.getUserInfo(); + const user = this.ctx.user.getUserInfo(); - if (this.stores.authentication.isInnovatorType()) { + if (this.ctx.user.isInnovator()) { this.summaryList = [ { label: 'Name', value: user.displayName, editStepNumber: 1 }, { label: 'Email address', value: user.email }, @@ -55,12 +55,12 @@ export class PageAccountManageDetailsInfoComponent extends CoreComponent impleme editStepNumber: 8 }); } - } else if (this.stores.authentication.isAccessorType() || this.stores.authentication.isAssessmentType()) { + } else if (this.ctx.user.isAccessorOrAssessment()) { // this assumes that the user only has one organisation as it's currently the business case const organisation = user.roles.find( (r): r is UserRoleType & { organisation: { name: string } } => r.organisation !== undefined )?.organisation?.name; - const roles = [...new Set(user.roles.map(r => this.stores.authentication.getRoleDescription(r.role)))].join('\n'); + const roles = [...new Set(user.roles.map(r => this.ctx.user.getRoleDescription(r.role)))].join('\n'); this.summaryList = [ { label: 'Name', value: user.displayName, editStepNumber: 1 }, @@ -68,11 +68,11 @@ export class PageAccountManageDetailsInfoComponent extends CoreComponent impleme ...(organisation ? [{ label: 'Organisation', value: organisation }] : []), { label: 'Service roles', value: roles } ]; - } else if (this.stores.authentication.isAdminRole()) { + } else if (this.ctx.user.isAdmin()) { this.summaryList = [ { label: 'Name', value: user.displayName, editStepNumber: 1 }, { label: 'Email address', value: user.email }, - { label: 'User type', value: this.stores.authentication.getRoleDescription(user.roles[0].role as 'ADMIN') } + { label: 'User type', value: this.ctx.user.getRoleDescription(user.roles[0].role as 'ADMIN') } ]; } diff --git a/src/modules/shared/pages/account/mfa/mfa-edit.component.html b/src/modules/shared/pages/account/mfa/mfa-edit.component.html index bf70734f5..1fc0dd3e0 100644 --- a/src/modules/shared/pages/account/mfa/mfa-edit.component.html +++ b/src/modules/shared/pages/account/mfa/mfa-edit.component.html @@ -1,11 +1,12 @@ -
+ +

{{ wizard.currentStep().description }}{{ this.userEmail }}

-

Enter {{isAdmin ? 'the user\'s' : 'your'}} email to confirm

+

Enter {{ ctx.user.isAdmin() ? "the user's" : "your" }} email to confirm

{{ wizard.currentStep().description }}

diff --git a/src/modules/shared/pages/account/mfa/mfa-edit.component.ts b/src/modules/shared/pages/account/mfa/mfa-edit.component.ts index 5578c1d13..d02a1cb54 100644 --- a/src/modules/shared/pages/account/mfa/mfa-edit.component.ts +++ b/src/modules/shared/pages/account/mfa/mfa-edit.component.ts @@ -4,10 +4,9 @@ import { ActivatedRoute } from '@angular/router'; import { CoreComponent } from '@app/base'; import { FormEngineComponent, WizardEngineModel } from '@modules/shared/forms'; import { UsersService } from '@modules/shared/services/users.service'; -import { AuthenticationService } from '@modules/stores'; -import { MFAInfoDTO } from '@modules/stores/authentication/authentication.service'; import { combineLatest, Observable } from 'rxjs'; import { MFA_EMAIL, MFA_PHONE, MFA_SET_UP, MFA_TURN_OFF, MFAWizardModeType } from './mfa-edit.config'; +import { MFAInfo, UserContextService } from '@modules/stores/ctx/user/user.service'; export type CurrentMFAModeType = 'phone' | 'email' | 'none'; @@ -30,14 +29,14 @@ export class PageAccountMFAEditComponent extends CoreComponent implements OnInit manageAccountPageUrl: string; // Configurations - getUserMFAInfo: () => Observable; - updateUserMFAInfo: (mfaInfo: MFAInfoDTO) => Observable; + getUserMFAInfo: () => Observable; + updateUserMFAInfo: (mfaInfo: MFAInfo) => Observable; - isAdmin = this.stores.authentication.isAdminRole(); + isAdmin = this.ctx.user.isAdmin(); constructor( private activatedRoute: ActivatedRoute, - private authenticationService: AuthenticationService, + private userCtxService: UserContextService, private usersService: UsersService ) { super(); @@ -56,10 +55,10 @@ export class PageAccountMFAEditComponent extends CoreComponent implements OnInit this.getUserMFAInfo = this.usersService.getUserMFAInfo(user.id).bind(this.usersService); this.updateUserMFAInfo = this.usersService.updateUserMFAInfo(user.id).bind(this.usersService); } else { - this.userEmail = this.stores.authentication.getUserInfo().email; - this.manageAccountPageUrl = `${this.stores.authentication.userUrlBasePath()}/account/manage-account`; - this.getUserMFAInfo = this.authenticationService.getUserMFAInfo.bind(this.authenticationService); - this.updateUserMFAInfo = this.authenticationService.updateUserMFAInfo.bind(this.authenticationService); + this.userEmail = this.ctx.user.getUserInfo().email; + this.manageAccountPageUrl = `${this.ctx.user.userUrlBasePath()}/account/manage-account`; + this.getUserMFAInfo = this.userCtxService.getUserMFAInfo.bind(this.userCtxService); + this.updateUserMFAInfo = this.userCtxService.updateUserMFAInfo.bind(this.userCtxService); } } @@ -150,7 +149,7 @@ export class PageAccountMFAEditComponent extends CoreComponent implements OnInit } onSubmitWizard() { - const wizardData = this.wizard.runOutboundParsing() as { mfaInfo: MFAInfoDTO; turnOff: boolean }; + const wizardData = this.wizard.runOutboundParsing() as { mfaInfo: MFAInfo; turnOff: boolean }; this.formButton.isActive = false; diff --git a/src/modules/shared/pages/account/mfa/mfa-edit.config.ts b/src/modules/shared/pages/account/mfa/mfa-edit.config.ts index 612db01b6..83daf6827 100644 --- a/src/modules/shared/pages/account/mfa/mfa-edit.config.ts +++ b/src/modules/shared/pages/account/mfa/mfa-edit.config.ts @@ -1,9 +1,9 @@ import { FormEngineModel, WizardEngineModel } from '@modules/shared/forms'; import { CustomFormGroupValidators } from '@modules/shared/forms/validators/custom-validators'; -import { MFAInfoDTO } from '@modules/stores/authentication/authentication.service'; import { SelectComponentInputType } from '@modules/theme/components/search/select.component'; import { fullCountryCodeList } from './mfa-country-lists'; import { CurrentMFAModeType } from './mfa-edit.component'; +import { MFAInfo } from '@modules/stores/ctx/user/user.service'; // Payloads definitions @@ -263,7 +263,7 @@ function inboundParsing(data: InboundPayloadType): StepPayloadType { }; } -function outboundParsing(data: StepPayloadType): { mfaInfo: MFAInfoDTO; turnOff: boolean } { +function outboundParsing(data: StepPayloadType): { mfaInfo: MFAInfo; turnOff: boolean } { const parsedPhone = `${data.countryCode} ${data.phoneNumber}`; return { diff --git a/src/modules/shared/pages/account/mfa/mfa-list.component.ts b/src/modules/shared/pages/account/mfa/mfa-list.component.ts index f87f71abf..a654e0a94 100644 --- a/src/modules/shared/pages/account/mfa/mfa-list.component.ts +++ b/src/modules/shared/pages/account/mfa/mfa-list.component.ts @@ -1,15 +1,15 @@ import { Component, Input, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { CoreComponent } from '@app/base'; -import { MFAInfoDTO } from '@modules/stores/authentication/authentication.service'; import { getCensoredPhoneNumber } from './mfa-edit.component'; +import { MFAInfo } from '@modules/stores/ctx/user/user.service'; @Component({ selector: 'app-account-mfa-list', templateUrl: './mfa-list.component.html' }) export class AccountMFAListComponent extends CoreComponent implements OnInit { - @Input({ required: true }) MFAInfo!: MFAInfoDTO; + @Input({ required: true }) MFAInfo!: MFAInfo; isMFAOn = false; currentCensoredPhoneNumber = ''; userEmail: string; @@ -17,10 +17,8 @@ export class AccountMFAListComponent extends CoreComponent implements OnInit { constructor(private activatedRoute: ActivatedRoute) { super(); - const isAdmin = this.stores.authentication.isAdminRole(); - this.userEmail = isAdmin - ? this.activatedRoute.snapshot.data.user.email - : this.stores.authentication.getUserInfo().email; + const isAdmin = this.ctx.user.isAdmin(); + this.userEmail = isAdmin ? this.activatedRoute.snapshot.data.user.email : this.ctx.user.getUserInfo().email; this.description = isAdmin ? 'Two-step verification adds a layer of security to the account.' : 'Two-step verification adds a layer of security to your account. We will send you a security code to your phone or email for you to use when logging in.'; diff --git a/src/modules/shared/pages/innovation/activity-log/innovation-activity-log.component.spec.ts b/src/modules/shared/pages/innovation/activity-log/innovation-activity-log.component.spec.ts index b971555ad..3ecee7083 100644 --- a/src/modules/shared/pages/innovation/activity-log/innovation-activity-log.component.spec.ts +++ b/src/modules/shared/pages/innovation/activity-log/innovation-activity-log.component.spec.ts @@ -29,11 +29,8 @@ describe('Shared/Pages/Innovation/PageInnovationActivityLogComponent', () => { activatedRoute = TestBed.inject(ActivatedRoute); - // authenticationStore = TestBed.inject(AuthenticationStore); organisationsService = TestBed.inject(OrganisationsService); - // authenticationStore.getUserInfo = () => USER_INFO_INNOVATOR; - // activatedRoute.snapshot.params = { innovationId: 'Inno01' }; activatedRoute.snapshot.data = { innovationData: { id: 'Inno01', name: 'Innovation 01', assessment: {} } }; // activatedRoute.snapshot.queryParams = { alert: 'actionCreationSuccess' }; diff --git a/src/modules/shared/pages/innovation/assessment/assessment-overview.component.html b/src/modules/shared/pages/innovation/assessment/assessment-overview.component.html index cf4dcbd16..ac70462b7 100644 --- a/src/modules/shared/pages/innovation/assessment/assessment-overview.component.html +++ b/src/modules/shared/pages/innovation/assessment/assessment-overview.component.html @@ -1,9 +1,10 @@ -
+ +
- +
-
+

Updated: {{ assessment?.updatedAt | date: ("app.date_formats.long_date" | translate) }}

{{ assessment?.updatedBy?.name }}

@@ -15,13 +16,13 @@

Needs assessment team

- +

{{ assessment?.finishedAt | date: ("app.date_formats.long_date" | translate) }}

{{ assessment?.assignTo?.name }}

Needs assessment team

 - +

Updated: {{ assessment?.updatedAt | date: ("app.date_formats.long_date" | translate) }}

{{ assessment?.updatedBy?.name }}

Needs assessment team

@@ -48,7 +49,7 @@
-
+ diff --git a/src/modules/shared/pages/innovation/assessment/assessment-overview.component.ts b/src/modules/shared/pages/innovation/assessment/assessment-overview.component.ts index 2abae5f1c..e6c158fce 100644 --- a/src/modules/shared/pages/innovation/assessment/assessment-overview.component.ts +++ b/src/modules/shared/pages/innovation/assessment/assessment-overview.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, signal } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { CoreComponent } from '@app/base'; @@ -29,12 +29,6 @@ export class PageInnovationAssessmentOverviewComponent extends CoreComponent imp innovatorSummary: { label?: string; value: null | string; comment: string }[] = []; // Flags - isAdminType: boolean; - isAssessmentType: boolean; - isAccessorType: boolean; - isInnovatorType: boolean; - isQualifyingAccessorRole: boolean; - isInProgress: boolean; assessmentHasBeenSubmitted = false; @@ -58,12 +52,6 @@ export class PageInnovationAssessmentOverviewComponent extends CoreComponent imp this.innovation = this.ctx.innovation.info(); - this.isAdminType = this.stores.authentication.isAdminRole(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isQualifyingAccessorRole = this.isAccessorType && this.stores.authentication.isQualifyingAccessorRole(); - this.isInProgress = this.innovation.status === 'IN_PROGRESS'; } @@ -128,7 +116,7 @@ export class PageInnovationAssessmentOverviewComponent extends CoreComponent imp } ]; - if (this.isAccessorType) { + if (this.ctx.user.isAccessorType()) { this.updateSupportUrlNewOrSupport = this.innovation.support && [InnovationSupportStatusEnum.WAITING, InnovationSupportStatusEnum.ENGAGING].includes( @@ -155,7 +143,7 @@ export class PageInnovationAssessmentOverviewComponent extends CoreComponent imp } setGoBackLink(): void { - if (this.isAssessmentType) { + if (this.ctx.user.isAssessment()) { let goBackUrl = undefined; const assessmentEditUrl = `/assessment/innovations/${this.innovationId}/assessments/${this.innovation.assessment?.id}/edit`; switch (this.assessmentQueryParam) { diff --git a/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.html b/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.html index ef567e3af..f8c2011cc 100644 --- a/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.html +++ b/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.html @@ -1,6 +1,7 @@ -
+ +
- +
@@ -9,7 +10,7 @@
- +
Important: User Locked @@ -20,7 +21,7 @@ -

+

You can suggest organisations to help support this innovation. You cannot suggest your own organisation, or an organisation that is already engaging with this innovation.

@@ -33,7 +34,7 @@ Organisations that do not have access to the innovation.

-
    +
    • What does each organisation do? (opens in a new window)
      • @@ -49,7 +50,7 @@
      Support status
      Support status key @@ -71,7 +72,7 @@
      {{ organisation.info.name }}
      {{ organisation.info.suggestedByPhrase }} @@ -109,7 +110,7 @@
      {{ organisationUnit.name }}
      -
      +
      {{ organisationUnit.suggestedByPhrase }}
      @@ -133,21 +134,17 @@
      - - -
      +
      Information:

      {{ "features.accessor.cant_do_while_in_assessment" | translate }}

      -
      +
      Suggest other organisations to support this innovation diff --git a/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.ts b/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.ts index ab8a2d96c..99c2a909d 100644 --- a/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.ts +++ b/src/modules/shared/pages/innovation/data-sharing-and-support/data-sharing-and-support.component.ts @@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router'; import { ObservableInput, forkJoin } from 'rxjs'; import { CoreComponent } from '@app/base'; -import { UserRoleEnum } from '@app/base/enums'; import { ContextInnovationType, @@ -27,8 +26,6 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent innovation: ContextInnovationType; - userType: '' | UserRoleEnum; - organisations: { info: { id: string; @@ -53,13 +50,6 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent organisationSuggestions: OrganisationSuggestionModel | undefined; shares: { organisationId: string }[] = []; - // Flags - isQualifyingAccessorRole: boolean; - isInnovatorType: boolean; - isAssessmentType: boolean; - isAccessorType: boolean; - isArchived: boolean; - showSuggestOrganisationsToSupportLink = false; constructor( @@ -70,18 +60,12 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent ) { super(); - this.userType = this.stores.authentication.getUserType() ?? ''; this.innovationId = this.activatedRoute.snapshot.params.innovationId; this.innovation = this.ctx.innovation.info(); // Flags - this.isQualifyingAccessorRole = this.stores.authentication.isQualifyingAccessorRole(); - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isArchived = this.ctx.innovation.isArchived(); - if (this.isQualifyingAccessorRole) { + if (this.ctx.user.isQualifyingAccessor()) { this.setPageTitle('Suggest organisations to support'); } else { this.setPageTitle('Data sharing preferences', { hint: 'All organisations' }); @@ -99,7 +83,7 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent innovationSupports: this.innovationsService.getInnovationSupportsList(this.innovationId, false) }; - if (this.isInnovatorType) { + if (this.ctx.user.isInnovator()) { subscriptions.innovationShares = this.innovationsService.getInnovationSharesList(this.innovationId); subscriptions.organisationSuggestions = this.innovationService.getInnovationOrganisationSuggestions( this.innovationId, @@ -111,7 +95,7 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent ); } - if (this.isAccessorType) { + if (this.ctx.user.isAccessorType()) { // TODO: Make sure we want this here subscriptions.organisationSuggestions = this.innovationService.getInnovationOrganisationSuggestions( this.innovationId, @@ -123,27 +107,17 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent ); } - if ( - this.userType === UserRoleEnum.ADMIN || - this.userType === UserRoleEnum.ASSESSMENT || - this.userType === UserRoleEnum.ACCESSOR || - this.userType === UserRoleEnum.QUALIFYING_ACCESSOR - ) { + if (!this.ctx.user.isInnovator()) { subscriptions.innovationShares = this.innovationsService.getInnovationSharesList(this.innovationId); } forkJoin(subscriptions).subscribe(results => { - if (this.userType === UserRoleEnum.INNOVATOR) { + if (this.ctx.user.isInnovator()) { this.organisationSuggestions = results.organisationSuggestions; this.shares = (results.innovationShares ?? []).map(item => ({ organisationId: item.organisation.id })); } - if ( - this.userType === UserRoleEnum.ADMIN || - this.userType === UserRoleEnum.ASSESSMENT || - this.userType === UserRoleEnum.ACCESSOR || - this.userType === UserRoleEnum.QUALIFYING_ACCESSOR - ) { + if (!this.ctx.user.isInnovator()) { this.shares = (results.innovationShares ?? []).map(item => ({ organisationId: item.organisation.id })); } @@ -174,18 +148,7 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent InnovationSupportStatusEnum.UNASSIGNED, suggestedByPhrase: this.createSubmittedByPhrase(suggestedBy) }, - ...([ - UserRoleEnum.ADMIN, - UserRoleEnum.INNOVATOR, - UserRoleEnum.ASSESSMENT, - UserRoleEnum.ACCESSOR, - UserRoleEnum.QUALIFYING_ACCESSOR - ].includes(this.userType as UserRoleEnum) - ? { - shared: - (results.innovationShares ?? []).findIndex(item => item.organisation.id === organisation.id) > -1 - } - : {}), + shared: (results.innovationShares ?? []).findIndex(item => item.organisation.id === organisation.id) > -1, showHideStatus: 'hidden', showHideText: null, showHideDescription: null @@ -227,18 +190,7 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent suggestedByPhrase: null, organisationUnits }, - ...([ - UserRoleEnum.ADMIN, - UserRoleEnum.INNOVATOR, - UserRoleEnum.ASSESSMENT, - UserRoleEnum.ACCESSOR, - UserRoleEnum.QUALIFYING_ACCESSOR - ].includes(this.userType as UserRoleEnum) - ? { - shared: - (results.innovationShares ?? []).findIndex(item => item.organisation.id === organisation.id) > -1 - } - : {}), + shared: (results.innovationShares ?? []).findIndex(item => item.organisation.id === organisation.id) > -1, showHideStatus: 'closed', showHideText: organisation.organisationUnits.length === 0 @@ -250,8 +202,8 @@ export class PageInnovationDataSharingAndSupportComponent extends CoreComponent }); // Check if there are organisations to be suggested by the qualifying accessor - if (this.userType === UserRoleEnum.QUALIFYING_ACCESSOR) { - const userUnitId = this.stores.authentication.getUserContextInfo()?.organisationUnit?.id ?? ''; + if (this.ctx.user.isQualifyingAccessor()) { + const userUnitId = this.ctx.user.getUserContext()?.organisationUnit?.id ?? ''; const engagingUnitsIds = results.innovationSupports .filter(support => support.status === InnovationSupportStatusEnum.ENGAGING) diff --git a/src/modules/shared/pages/innovation/documents/document-info.component.html b/src/modules/shared/pages/innovation/documents/document-info.component.html index 6604d522e..32b3f3185 100644 --- a/src/modules/shared/pages/innovation/documents/document-info.component.html +++ b/src/modules/shared/pages/innovation/documents/document-info.component.html @@ -1,4 +1,5 @@ -
      + +
      diff --git a/src/modules/shared/pages/innovation/documents/document-info.component.ts b/src/modules/shared/pages/innovation/documents/document-info.component.ts index 2e6840ca7..a15b183dd 100644 --- a/src/modules/shared/pages/innovation/documents/document-info.component.ts +++ b/src/modules/shared/pages/innovation/documents/document-info.component.ts @@ -25,7 +25,6 @@ export class PageInnovationDocumentInfoComponent extends CoreComponent implement // Flags canDelete = false; - isArchived: boolean; constructor( private activatedRoute: ActivatedRoute, @@ -36,9 +35,7 @@ export class PageInnovationDocumentInfoComponent extends CoreComponent implement this.innovation = this.ctx.innovation.info(); this.innovationId = this.activatedRoute.snapshot.params.innovationId; this.documentId = this.activatedRoute.snapshot.params.documentId; - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}`; - - this.isArchived = this.ctx.innovation.isArchived(); + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}`; } ngOnInit(): void { diff --git a/src/modules/shared/pages/innovation/documents/document-newdit.component.ts b/src/modules/shared/pages/innovation/documents/document-newdit.component.ts index d9613c21a..6a71df391 100644 --- a/src/modules/shared/pages/innovation/documents/document-newdit.component.ts +++ b/src/modules/shared/pages/innovation/documents/document-newdit.component.ts @@ -56,7 +56,7 @@ export class PageInnovationDocumentsNewditComponent extends CoreComponent implem ngOnInit(): void { if (this.pageData.isCreation) { - if (this.stores.authentication.isInnovatorType()) { + if (this.ctx.user.isInnovator()) { if (this.pageData.queryParams.sectionId) { this.wizard = new WizardEngineModel(WIZARD_BASE_QUESTIONS); this.wizard.setInboundParsedAnswers({ @@ -112,7 +112,7 @@ export class PageInnovationDocumentsNewditComponent extends CoreComponent implem if (this.wizard.currentStep().parameters[0].dataType === 'file-upload') { this.wizard.currentStep().parameters[0].fileUploadConfig = { httpUploadUrl: new UrlModel(this.CONSTANTS.APP_URL).addPath('upload-file').buildUrl(), - httpUploadBody: { innovatorId: this.stores.authentication.getUserId(), innovationId: this.innovationId }, + httpUploadBody: { innovatorId: this.ctx.user.getUserId(), innovationId: this.innovationId }, maxFileSize: 20, acceptedFiles: [FileTypes.CSV, FileTypes.DOCX, FileTypes.XLSX, FileTypes.PDF] }; @@ -197,7 +197,7 @@ export class PageInnovationDocumentsNewditComponent extends CoreComponent implem } redirectUrl(data?: { documentId?: string; sectionId?: string; evidenceId?: string }): string { - const baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}`; + const baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}`; if (data?.evidenceId) { return `${baseUrl}/record/sections/EVIDENCE_OF_EFFECTIVENESS/evidences/${data.evidenceId}`; diff --git a/src/modules/shared/pages/innovation/documents/documents-list.component.html b/src/modules/shared/pages/innovation/documents/documents-list.component.html index 242218cc4..84fe9eb96 100644 --- a/src/modules/shared/pages/innovation/documents/documents-list.component.html +++ b/src/modules/shared/pages/innovation/documents/documents-list.component.html @@ -1,17 +1,23 @@
      -

      You cannot upload documents in this section as your innovation is archived. You can add documents on your innovation record.

      +

      + You cannot upload documents in this section as your innovation is archived. You can add documents on your innovation record. +

      - -

      - Everyone who has access to your innovation will be able to view and download your documents. If you want to stop sharing your innovation with an organisation, update your - data sharing preferences. -

      -
      - Information: -

      If you want to upload evidence of impact and benefit, go to this section of your innovation record.

      -
      - + + @if (ctx.user.isInnovator()) { +

      + Everyone who has access to your innovation will be able to view and download your documents. If you want to stop sharing your innovation with an organisation, update your + data sharing preferences. +

      +
      + Information: +

      + If you want to upload evidence of impact and benefit, go to this section of your innovation record. +

      +
      + } +       @@ -163,7 +169,7 @@

      No documents were uploaded yet.

      - +

      diff --git a/src/modules/shared/pages/innovation/documents/documents-list.component.ts b/src/modules/shared/pages/innovation/documents/documents-list.component.ts index 4051ee13d..c9b098cb6 100644 --- a/src/modules/shared/pages/innovation/documents/documents-list.component.ts +++ b/src/modules/shared/pages/innovation/documents/documents-list.component.ts @@ -34,12 +34,6 @@ export class PageInnovationDocumentsListComponent extends CoreComponent implemen pageSize: 10 }); - // Flags - isAdmin: boolean; - isInnovatorType: boolean; - isAccessorType: boolean; - isArchived: boolean; - // Filter form = new FormGroup( { @@ -71,13 +65,8 @@ export class PageInnovationDocumentsListComponent extends CoreComponent implemen this.setPageTitle('Documents'); this.innovation = this.ctx.innovation.info(); - this.isArchived = this.ctx.innovation.isArchived(); - - this.isAdmin = this.stores.authentication.isAdminRole(); - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - if (this.isAdmin) { + if (this.ctx.user.isAdmin()) { this.setPageTitle('Documents', { hint: `Innovation ${this.innovation.name}` }); } } diff --git a/src/modules/shared/pages/innovation/export-requests/export-request-info.component.html b/src/modules/shared/pages/innovation/export-requests/export-request-info.component.html index 5df398d5d..f8a08b42a 100644 --- a/src/modules/shared/pages/innovation/export-requests/export-request-info.component.html +++ b/src/modules/shared/pages/innovation/export-requests/export-request-info.component.html @@ -1,4 +1,5 @@ -
      + +
      @@ -32,12 +33,12 @@
      - + - + diff --git a/src/modules/shared/pages/innovation/export-requests/export-request-info.component.ts b/src/modules/shared/pages/innovation/export-requests/export-request-info.component.ts index a77e1119c..0d4a8c8eb 100644 --- a/src/modules/shared/pages/innovation/export-requests/export-request-info.component.ts +++ b/src/modules/shared/pages/innovation/export-requests/export-request-info.component.ts @@ -17,10 +17,6 @@ export class PageInnovationExportRequestInfoComponent extends CoreComponent impl requestId: string; innovationRequest?: InnovationExportRequestInfoDTO; - // Flags - isInnovatorType: boolean; - isSupportTeamType: boolean; - constructor( private activatedRoute: ActivatedRoute, private innovationsService: InnovationsService @@ -31,10 +27,6 @@ export class PageInnovationExportRequestInfoComponent extends CoreComponent impl this.innovationId = this.activatedRoute.snapshot.params.innovationId; this.requestId = this.activatedRoute.snapshot.params.requestId; - - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isSupportTeamType = - this.stores.authentication.isAssessmentType() || this.stores.authentication.isAccessorType(); } ngOnInit(): void { @@ -69,9 +61,7 @@ export class PageInnovationExportRequestInfoComponent extends CoreComponent impl } this.redirectTo( - `/${this.stores.authentication.userUrlBasePath()}/innovations/${ - this.innovationId - }/record/export-requests/list` + `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests/list` ); }, error: () => { @@ -82,23 +72,22 @@ export class PageInnovationExportRequestInfoComponent extends CoreComponent impl } rejectRequestRedirect() { - if (!this.isInnovatorType) { + if (!this.ctx.user.isInnovator()) { return; } this.redirectTo( - `/${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests/${ + `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests/${ this.innovationRequest?.id }/reject` ); } requestAgainRedirect() { - if (!this.isSupportTeamType) { + if (!this.ctx.user.isAccessorOrAssessment()) { return; } - this.redirectTo( - `/${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests/new`, - { requestAgainId: this.innovationRequest?.id } - ); + this.redirectTo(`/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests/new`, { + requestAgainId: this.innovationRequest?.id + }); } } diff --git a/src/modules/shared/pages/innovation/export-requests/export-request-new.component.ts b/src/modules/shared/pages/innovation/export-requests/export-request-new.component.ts index 49ddd8887..26f4ddb07 100644 --- a/src/modules/shared/pages/innovation/export-requests/export-request-new.component.ts +++ b/src/modules/shared/pages/innovation/export-requests/export-request-new.component.ts @@ -31,16 +31,14 @@ export class PageInnovationExportRequestNewComponent extends CoreComponent imple super(); this.innovationId = this.activatedRoute.snapshot.params.innovationId; - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${ - this.innovationId - }/record/export-requests`; + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests`; this.requestAgainId = this.activatedRoute.snapshot.queryParams.requestAgainId; this.setPageTitle('Explain why you want to share this innovation record', { showPage: false }); this.setBackLink( 'Go back', - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests` + `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record/export-requests` ); } diff --git a/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.html b/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.html index 355c0cc71..0cb9178a9 100644 --- a/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.html +++ b/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.html @@ -1,4 +1,5 @@ -
      + +

      @@ -19,9 +20,9 @@
      - Request permission + Request permission - +

      Pending requests

      No new requests.

      diff --git a/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.ts b/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.ts index b6ae6e302..5cb5cd1dd 100644 --- a/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.ts +++ b/src/modules/shared/pages/innovation/export-requests/export-requests-list.component.ts @@ -40,8 +40,6 @@ export class PageInnovationExportRequestsListComponent extends CoreComponent imp pageInformation: { title: string; leadText: string; historyTableTitle: string }; - isInnovatorType: boolean; - isSupportTeamType: boolean; isHistoryLoading = false; constructor( @@ -51,17 +49,13 @@ export class PageInnovationExportRequestsListComponent extends CoreComponent imp super(); this.innovationId = this.activatedRoute.snapshot.params.innovationId; - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/record`; + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record`; - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isSupportTeamType = - this.stores.authentication.isAssessmentType() || this.stores.authentication.isAccessorType(); - - this.touUrl = this.isInnovatorType + this.touUrl = this.ctx.user.isInnovator() ? this.CONSTANTS.URLS.TOU_INNOVATOR : this.CONSTANTS.URLS.TOU_SUPPORT_ORGANISATION; - switch (this.stores.authentication.getUserType()) { + switch (this.ctx.user.getUserType()) { case UserRoleEnum.ASSESSMENT: this.pageInformation = { title: 'Request permission to use the data in this innovation record', @@ -94,7 +88,7 @@ export class PageInnovationExportRequestsListComponent extends CoreComponent imp this.setPageTitle(this.pageInformation.title); this.setBackLink('Innovation Record', this.baseUrl); - if (this.isInnovatorType) { + if (this.ctx.user.isInnovator()) { const queryParams = { ...this.pendingTable.getAPIQueryParams() }; queryParams.filters = { statuses: [InnovationExportRequestStatusEnum.PENDING] }; @@ -111,7 +105,7 @@ export class PageInnovationExportRequestsListComponent extends CoreComponent imp const queryParams = { ...this.historyTable.getAPIQueryParams() }; - if (this.stores.authentication.isInnovatorType()) { + if (this.ctx.user.isInnovator()) { queryParams.filters = { statuses: [ InnovationExportRequestStatusEnum.APPROVED, diff --git a/src/modules/shared/pages/innovation/messages/thread-message-edit.component.ts b/src/modules/shared/pages/innovation/messages/thread-message-edit.component.ts index 8345c6e0f..0e77f42e4 100644 --- a/src/modules/shared/pages/innovation/messages/thread-message-edit.component.ts +++ b/src/modules/shared/pages/innovation/messages/thread-message-edit.component.ts @@ -13,7 +13,6 @@ import { UntypedFormControl } from '@angular/forms'; templateUrl: './thread-message-edit.component.html' }) export class PageInnovationThreadMessageEditComponent extends CoreComponent implements OnInit { - selfUser: { id: string; urlBasePath: string }; innovation: ContextInnovationType; threadId: string; messageId: string; @@ -29,11 +28,6 @@ export class PageInnovationThreadMessageEditComponent extends CoreComponent impl super(); this.setPageTitle('Edit message'); - this.selfUser = { - id: this.stores.authentication.getUserId(), - urlBasePath: this.stores.authentication.userUrlBasePath() - }; - this.innovation = this.ctx.innovation.info(); this.threadId = this.activatedRoute.snapshot.params.threadId; this.messageId = this.activatedRoute.snapshot.params.messageId; @@ -61,7 +55,9 @@ export class PageInnovationThreadMessageEditComponent extends CoreComponent impl this.innovationsService.editThreadMessage(this.innovation.id, this.threadId, this.messageId, body).subscribe({ next: () => { this.setRedirectAlertSuccess('You have successfully updated a message'); - this.redirectTo(`/${this.selfUser.urlBasePath}/innovations/${this.innovation.id}/threads/${this.threadId}`); + this.redirectTo( + `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/threads/${this.threadId}` + ); }, error: () => this.setAlertUnknownError() }); diff --git a/src/modules/shared/pages/innovation/messages/thread-messages-list.component.html b/src/modules/shared/pages/innovation/messages/thread-messages-list.component.html index 053ee8eda..8ca7aa113 100644 --- a/src/modules/shared/pages/innovation/messages/thread-messages-list.component.html +++ b/src/modules/shared/pages/innovation/messages/thread-messages-list.component.html @@ -1,4 +1,5 @@ -
      + +

      Subject: {{ threadInfo?.subject }}

      @@ -6,12 +7,12 @@

      Subject: {{ threadInfo?.subj Go to task

      -
      +
      Information:

      {{ "features.accessor.cant_do_while_in_assessment" | translate }}

      - +

      Unfollow this message thread if you do not want to be notified about new replies.

      @@ -21,7 +22,7 @@

      Subject: {{ threadInfo?.subj

      - +

      {{ threadFollowers?.length?.toLocaleString() }} {{ followerNumberText }}. {{ showFollowersText }} of recipients @@ -35,7 +36,7 @@

      Subject: {{ threadInfo?.subj > {{ follower.name }} ({{ follower.isOwner ? "Owner" : "Collaborator" }}) - {{ follower.name }}, {{ follower.organisationUnit?.name ?? stores.authentication.getRoleDescription(follower.role.role) }} + {{ follower.name }}, {{ follower.organisationUnit?.name ?? ctx.user.getRoleDescription(follower.role.role) }}
      Upload a document (optional)

      + +
      Important: User Locked

      Please note that the innovator {{ innovation.owner.name }} is currently locked.

      - +

      Once you submit your innovation record, and the needs assessment starts, you can use this space to talk about your innovation with those who are supporting you.

      @@ -21,15 +22,18 @@ - +

      You cannot send or reply to messages about this innovation as it is archived.
      - -

      Messages is your space to ask questions and discuss your innovation with the organisations that are supporting you.

      -

      Use messages to talk to the innovator and other organisations supporting this innovation.

      + + @if (ctx.user.isInnovator()) { +

      Messages is your space to ask questions and discuss your innovation with the organisations that are supporting you.

      + } @else { +

      Use messages to talk to the innovator and other organisations supporting this innovation.

      + }
      Information:

      @@ -40,9 +44,9 @@ -

      +
      Information: -

      {{ "features.accessor.cant_do_while_in_assessment" | translate}}

      +

      {{ "features.accessor.cant_do_while_in_assessment" | translate }}

      @@ -59,7 +63,7 @@ -
      +
      diff --git a/src/modules/shared/pages/innovation/messages/threads-list.component.ts b/src/modules/shared/pages/innovation/messages/threads-list.component.ts index 2d6cec590..a046e7e27 100644 --- a/src/modules/shared/pages/innovation/messages/threads-list.component.ts +++ b/src/modules/shared/pages/innovation/messages/threads-list.component.ts @@ -28,12 +28,8 @@ export class PageInnovationThreadsListComponent extends CoreComponent implements }); // Flags - isInnovatorType: boolean; - isAccessorType: boolean; - isAdmin: boolean; isInnovationSubmitted: boolean; canCreateThread = false; - isArchived: boolean; isInAssessment: boolean; constructor(private innovationsService: InnovationsService) { @@ -41,26 +37,22 @@ export class PageInnovationThreadsListComponent extends CoreComponent implements this.setPageTitle('Messages'); this.selfUser = { - id: this.stores.authentication.getUserId(), - organisationUnitId: this.stores.authentication.getUserContextInfo()?.organisationUnit?.id + id: this.ctx.user.getUserId(), + organisationUnitId: this.ctx.user.getUserContext()?.organisationUnit?.id }; this.innovation = this.ctx.innovation.info(); // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAdmin = this.stores.authentication.isAdminRole(); - this.isAccessorType = this.stores.authentication.isAccessorType(); this.isInnovationSubmitted = this.innovation.status !== InnovationStatusEnum.CREATED; - this.isArchived = this.ctx.innovation.isArchived(); this.isInAssessment = this.innovation.status.includes('ASSESSMENT'); - if (this.stores.authentication.isAssessmentType()) { + if (this.ctx.user.isAssessment()) { this.canCreateThread = this.innovation.owner != null; - } else if (this.stores.authentication.isAccessorType()) { + } else if (this.ctx.user.isAccessorType()) { this.canCreateThread = this.innovation.owner != null && this.innovation.status === InnovationStatusEnum.IN_PROGRESS; - } else if (this.stores.authentication.isInnovatorType()) { + } else if (this.ctx.user.isInnovator()) { if ( this.innovation.status === InnovationStatusEnum.IN_PROGRESS || ([InnovationStatusEnum.NEEDS_ASSESSMENT, InnovationStatusEnum.AWAITING_NEEDS_REASSESSMENT].includes( @@ -74,7 +66,7 @@ export class PageInnovationThreadsListComponent extends CoreComponent implements } } - if (this.isAdmin) { + if (this.ctx.user.isAdmin()) { this.setPageTitle('Messages', { hint: `Innovation ${this.innovation.name}` }); } diff --git a/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.html b/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.html index 384bda729..19e15f017 100644 --- a/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.html +++ b/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.html @@ -1,6 +1,14 @@ -
      + +
      -

      {{ leadText }}

      + @if (ctx.user.isInnovator()) { +

      These organisations are either currently supporting your innovation, have been suggested or are waiting to support, or have supported you in the past.

      + } @else { +

      + You can select other organisations that are either currently supporting this innovation, have been suggested or are waiting to support, or have supported this innovation + in the past. +

      + }
      diff --git a/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.ts b/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.ts index 2b9be9bee..2dd7bada0 100644 --- a/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.ts +++ b/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/organisations-step.component.ts @@ -32,7 +32,6 @@ export class WizardInnovationThreadNewOrganisationsStepComponent @Output() nextStepEvent = new EventEmitter>(); @Output() submitEvent = new EventEmitter>(); - leadText = ''; formValidationMessage = ''; form = new FormGroup( @@ -44,28 +43,14 @@ export class WizardInnovationThreadNewOrganisationsStepComponent formOrganisationUnitsItems: Required['items'] = []; - // Flags - isInnovatorType: boolean; - isAssessmentType: boolean; - isAccessorType: boolean; - constructor() { super(); - // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.setBackLink('Go back', this.onPreviousStep.bind(this)); } ngOnInit(): void { - this.leadText = this.isInnovatorType - ? 'These organisations are either currently supporting your innovation, have been suggested or are waiting to support, or have supported you in the past.' - : `You can select other organisations that are either currently supporting this innovation, have been suggested or are waiting to support, or have supported this innovation in the past.`; - - if (this.isInnovatorType || !(this.data.activeInnovators && (this.isAssessmentType || this.isAccessorType))) { + if (this.ctx.user.isInnovator() || !(this.data.activeInnovators && this.ctx.user.isAccessorOrAssessment())) { this.formValidationMessage = 'Select the organisations you want to notify about this message'; } else { this.formValidationMessage = `Select other organisations, or select 'No, I only want to notify the innovator about this message'`; @@ -135,7 +120,7 @@ export class WizardInnovationThreadNewOrganisationsStepComponent ); } - if (this.data.activeInnovators && (this.isAssessmentType || this.isAccessorType)) { + if (this.data.activeInnovators && this.ctx.user.isAccessorOrAssessment()) { this.formOrganisationUnitsItems.push( { value: 'SEPARATOR', label: 'SEPARATOR' }, { value: 'NO_CHOICE', label: 'No, I only want to notify the innovator about this message' } diff --git a/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/subject-message-step.component.html b/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/subject-message-step.component.html index b0f042fc7..7b2270fee 100644 --- a/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/subject-message-step.component.html +++ b/src/modules/shared/pages/innovation/messages/wizard-thread-new/steps/subject-message-step.component.html @@ -1,4 +1,5 @@ -
      + +

      @@ -32,7 +33,7 @@

      Your message

      controlName="subject" label="Enter a subject for your thread" width="full" - [isEditable]="isInnovatorType && sectionId ? false : true" + [isEditable]="ctx.user.isInnovator() && sectionId ? false : true" [pageUniqueField]="false" > @@ -46,7 +47,7 @@

      Upload a document (optional) [config]="configInputFile" > -
      +
      ('', [ @@ -65,8 +63,6 @@ export class WizardInnovationThreadNewSubjectMessageStepComponent super(); this.sectionId = this.activatedRoute.snapshot.queryParams.sectionId; - - this.isInnovatorType = this.stores.authentication.isInnovatorType(); } ngOnInit(): void { @@ -77,14 +73,14 @@ export class WizardInnovationThreadNewSubjectMessageStepComponent this.form.get('message')?.setValue(this.data.message); this.form.get('file')?.setValue(this.data.file); this.form.get('fileName')?.setValue(this.data.fileName); - if (!this.stores.authentication.isInnovatorType()) { + if (!this.ctx.user.isInnovator()) { this.form.get('confirmation')?.setValue(true); } this.formConfirmationField = { label: 'I understand that for transparency reasons, this message can be seen and replied by everyone who has access to this innovation.', - description: `View a list of this innovation's data sharing preferences (opens in a new window).` }; diff --git a/src/modules/shared/pages/innovation/messages/wizard-thread-new/thread-new.component.ts b/src/modules/shared/pages/innovation/messages/wizard-thread-new/thread-new.component.ts index ec05263f3..9d313554f 100644 --- a/src/modules/shared/pages/innovation/messages/wizard-thread-new/thread-new.component.ts +++ b/src/modules/shared/pages/innovation/messages/wizard-thread-new/thread-new.component.ts @@ -30,7 +30,6 @@ import { ActivatedRoute } from '@angular/router'; export class WizardInnovationThreadNewComponent extends CoreComponent implements OnInit { sectionId?: string; innovation: ContextInnovationType; - isInnovatorType: boolean; wizard = new WizardModel<{ innovationOwnerAndCollaborators: { name: string; role: string }[]; @@ -60,8 +59,6 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements this.innovation = this.ctx.innovation.info(); - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.wizard.data = { innovationOwnerAndCollaborators: this.innovation.owner && this.innovation.owner.isActive @@ -85,13 +82,13 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements empty: of(null) }; - if (this.stores.authentication.isAssessmentType() || this.stores.authentication.isAccessorType()) { + if (this.ctx.user.isAccessorOrAssessment()) { subscriptions.collaborators = this.innovationsService.getInnovationCollaboratorsList(this.innovation.id, [ 'active' ]); } - if (this.innovation.status === InnovationStatusEnum.IN_PROGRESS && !this.stores.authentication.isAdminRole()) { + if (this.innovation.status === InnovationStatusEnum.IN_PROGRESS && !this.ctx.user.isAdmin()) { subscriptions.threadAvailableRecipients = this.innovationsService.getThreadAvailableRecipients( this.innovation.id ); @@ -112,15 +109,14 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements this.datasets.organisationUnits = response.threadAvailableRecipients; // Filter out the user unit, if accessor. - if (this.stores.authentication.isAccessorType()) { + if (this.ctx.user.isAccessorType()) { this.datasets.organisationUnits = this.datasets.organisationUnits.filter( - item => - item.organisation.unit.id !== this.stores.authentication.getUserContextInfo()?.organisationUnit?.id + item => item.organisation.unit.id !== this.ctx.user.getUserContext()?.organisationUnit?.id ); } // Show warning step if there's no units to display. - if (this.isInnovatorType && this.datasets.organisationUnits.length === 0) { + if (this.ctx.user.isInnovator() && this.datasets.organisationUnits.length === 0) { this.wizard.addStep( new WizardStepModel({ id: 'WarningStep', @@ -136,7 +132,7 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements this.wizard.addStep( new WizardStepModel({ id: 'organisationsStep', - title: this.isInnovatorType + title: this.ctx.user.isInnovator() ? 'Select the support organisations you want to message' : 'Would you like to notify other support organisations about this message?', component: WizardInnovationThreadNewOrganisationsStepComponent, @@ -200,7 +196,7 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements getThreadSubject(): string { let subject = this.wizard.data.subjectMessageStep.subject; - if (this.isInnovatorType && this.sectionId && !subject) { + if (this.ctx.user.isInnovator() && this.sectionId && !subject) { const sectionIdentification = this.ctx.schema.getIrSchemaSectionIdentificationV3(this.sectionId); subject = sectionIdentification ? `Innovation record update to section ${this.getSubmittedSectionText()}` : ''; } @@ -211,7 +207,7 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements getThreadMessage(): string { let message = this.wizard.data.subjectMessageStep.message; - if (this.isInnovatorType && this.sectionId && !message) { + if (this.ctx.user.isInnovator() && this.sectionId && !message) { message = `Please take a look at the changes I have made to section ${this.getSubmittedSectionText()}. \n\nThe main changes I have made are: `; } @@ -222,9 +218,9 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements this.resetAlert(); if (this.wizard.currentStepNumber() === 1) { - if (this.isInnovatorType && this.sectionId) { + if (this.ctx.user.isInnovator() && this.sectionId) { this.redirectTo( - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}/record/sections/${this.sectionId}/submitted` + `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/record/sections/${this.sectionId}/submitted` ); } else { this.redirectToThreadsList(); @@ -297,7 +293,7 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements }; if (file) { - const httpUploadBody = { userId: this.stores.authentication.getUserId(), innovationId: this.innovation.id }; + const httpUploadBody = { userId: this.ctx.user.getUserId(), innovationId: this.innovation.id }; this.fileUploadService .uploadFile(httpUploadBody, file) @@ -348,7 +344,7 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements followersUserRoleIds: string[]; visibleList: SubjectMessageStepInputType['teams']; } { - if (this.stores.authentication.isAssessmentType() || this.stores.authentication.isAccessorType()) { + if (this.ctx.user.isAccessorOrAssessment()) { return { followersUserRoleIds: this.wizard.data.organisationsStep.organisationUnits.flatMap(item => item.users.map(u => u.roleId) @@ -363,7 +359,7 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements ...this.wizard.data.organisationsStep.organisationUnits.map(item => ({ name: item.name, users: item.users })) ] }; - } else if (this.stores.authentication.isInnovatorType()) { + } else if (this.ctx.user.isInnovator()) { if ( [InnovationStatusEnum.NEEDS_ASSESSMENT, InnovationStatusEnum.AWAITING_NEEDS_REASSESSMENT].includes( this.innovation.status @@ -399,6 +395,6 @@ export class WizardInnovationThreadNewComponent extends CoreComponent implements } private redirectToThreadsList(): void { - this.redirectTo(`${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}/threads`); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/threads`); } } diff --git a/src/modules/shared/pages/innovation/record/innovation-record-download.component.ts b/src/modules/shared/pages/innovation/record/innovation-record-download.component.ts index 6f0aceab7..14d2511f9 100644 --- a/src/modules/shared/pages/innovation/record/innovation-record-download.component.ts +++ b/src/modules/shared/pages/innovation/record/innovation-record-download.component.ts @@ -23,7 +23,7 @@ export class PageInnovationRecordDownloadComponent extends CoreComponent impleme this.pdfDocumentUrl = `${this.CONSTANTS.APP_URL}/exports/${ this.innovationId - }/pdf?role=${this.stores.authentication.getUserContextInfo()?.roleId}`; + }/pdf?role=${this.ctx.user.getUserContext()?.roleId}`; this.setPageTitle(`Download ${this.innovation.name} innovation record`); this.setBackLink(); diff --git a/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.html b/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.html index c46be15a0..13642050a 100644 --- a/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.html +++ b/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.html @@ -1,3 +1,5 @@ - - - +@if (showAllSectionsInfo()) { + +} @else { + +} diff --git a/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.ts b/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.ts index 988e25572..9b8208ebe 100644 --- a/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.ts +++ b/src/modules/shared/pages/innovation/record/innovation-record-wrapper.component.ts @@ -1,28 +1,15 @@ -import { Component } from '@angular/core'; +import { Component, computed } from '@angular/core'; import { CoreComponent } from '@app/base'; -import { ContextInnovationType } from '@modules/stores'; @Component({ selector: 'shared-pages-innovation-record-wrapper', templateUrl: './innovation-record-wrapper.component.html' }) export class PageInnovationRecordWrapperComponent extends CoreComponent { - innovation: ContextInnovationType; - - // Flags - isInnovatorType: boolean; - isInnovationInArchivedStatus: boolean; - showAllSectionsInfo: boolean; + // Innovators don't have access to this component, but to make sure. + showAllSectionsInfo = computed(() => this.ctx.innovation.isArchived() && !this.ctx.user.isInnovator()); constructor() { super(); - - this.innovation = this.ctx.innovation.info(); - - // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isInnovationInArchivedStatus = this.ctx.innovation.isArchived(); - // Innovators don't have access to this component, but to make sure. - this.showAllSectionsInfo = this.isInnovationInArchivedStatus && !this.isInnovatorType; } } diff --git a/src/modules/shared/pages/innovation/record/innovation-record.component.html b/src/modules/shared/pages/innovation/record/innovation-record.component.html index df5138d01..26e4d6196 100644 --- a/src/modules/shared/pages/innovation/record/innovation-record.component.html +++ b/src/modules/shared/pages/innovation/record/innovation-record.component.html @@ -9,7 +9,7 @@
      - +
      @@ -53,7 +53,7 @@ {{ sections.notStarted }} {{ "dictionary.section" | pluralTranslate: sections.notStarted | translate }} not started

      - +
      Information:

      @@ -97,7 +97,7 @@

      All sections

      - +

      This is a live document for you to update as you develop your innovation. You can make changes to your innovation record even after submitting it for a needs assessment.

      @@ -126,7 +126,7 @@

      - + ({{ section.submittedBy?.isOwner ? "Owner" : "Collaborator" }}) on {{ section.submittedAt | date: ("app.date_formats.long_date" | translate) }} - + In draft - last submitted by {{ section.submittedBy?.name }} ({{ section.submittedBy?.isOwner ? "Owner" : "Collaborator" }}) on {{ section.submittedAt | date: ("app.date_formats.long_date" | translate) }} - + This section is in draft. You can view the last version submitted by the innovator. @@ -162,7 +162,7 @@

      - +

      - +
      @@ -193,7 +193,7 @@

      - +
      diff --git a/src/modules/shared/pages/innovation/record/innovation-record.component.ts b/src/modules/shared/pages/innovation/record/innovation-record.component.ts index 526ec62b5..765c9308f 100644 --- a/src/modules/shared/pages/innovation/record/innovation-record.component.ts +++ b/src/modules/shared/pages/innovation/record/innovation-record.component.ts @@ -38,9 +38,6 @@ export class PageInnovationRecordComponent extends CoreComponent implements OnIn } = { progressBar: [], submitted: 0, draft: 0, notStarted: 0, withOpenTasksCount: 0, openTasksCount: 0 }; // Flags. - isInnovatorType: boolean; - isAccessorType: boolean; - isAssessmentType: boolean; isLoggedUserOwner: boolean; isInnovationInCreatedStatus: boolean; isInnovationInArchivedStatus: boolean; @@ -50,7 +47,6 @@ export class PageInnovationRecordComponent extends CoreComponent implements OnIn isArchiveBeforeShare: boolean; allSectionsSubmitted = false; - isAdminType: boolean; customNotificationLinks: CustomNotificationEntrypointComponentLinksType = []; @@ -62,25 +58,19 @@ export class PageInnovationRecordComponent extends CoreComponent implements OnIn this.innovationId = this.activatedRoute.snapshot.params.innovationId; - this.baseUrl = `/${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/record/sections`; + this.baseUrl = `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record/sections`; this.documentUrl = `${this.CONSTANTS.APP_ASSETS_URL}/NHS-innovation-service-record.docx`; this.pdfDocumentUrl = `${this.CONSTANTS.APP_URL}/exports/${ this.innovationId - }/pdf?role=${this.stores.authentication.getUserContextInfo()?.roleId}`; + }/pdf?role=${this.ctx.user.getUserContext()?.roleId}`; this.innovation = this.ctx.innovation.info(); - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - this.isAdminType = this.stores.authentication.isAdminRole(); this.isLoggedUserOwner = this.innovation.loggedUser.isOwner; this.isInnovationInCreatedStatus = this.innovation.status === InnovationStatusEnum.CREATED; this.isInnovationInArchivedStatus = this.ctx.innovation.isArchived(); - this.showSupportingTeamsShareRequestSection = - this.stores.authentication.isAccessorType() || this.stores.authentication.isAssessmentType(); - this.showInnovatorShareRequestSection = - this.stores.authentication.isInnovatorType() && !this.isInnovationInCreatedStatus; + this.showSupportingTeamsShareRequestSection = this.ctx.user.isAccessorOrAssessment(); + this.showInnovatorShareRequestSection = this.ctx.user.isInnovator() && !this.isInnovationInCreatedStatus; this.isArchiveBeforeShare = this.isInnovationInArchivedStatus && !this.innovation.assessment; } @@ -89,7 +79,7 @@ export class PageInnovationRecordComponent extends CoreComponent implements OnIn forkJoin([ this.ctx.innovation.getSectionsSummary$(this.activatedRoute.snapshot.params.innovationId), - ...(this.isInnovatorType + ...(this.ctx.user.isInnovator() ? [ this.statisticsService.getInnovationStatisticsInfo(this.innovationId, { statistics: [InnovationStatisticsEnum.PENDING_EXPORT_REQUESTS_COUNTER] @@ -99,7 +89,7 @@ export class PageInnovationRecordComponent extends CoreComponent implements OnIn ]).subscribe({ next: ([response, statistics]) => { this.innovationSections = response; - this.pendingExportRequests = this.isInnovatorType ? statistics.PENDING_EXPORT_REQUESTS_COUNTER.count : 0; + this.pendingExportRequests = this.ctx.user.isInnovator() ? statistics.PENDING_EXPORT_REQUESTS_COUNTER.count : 0; this.sections.progressBar = this.innovationSections.reduce((acc: ProgressBarType[], item) => { return [ diff --git a/src/modules/shared/pages/innovation/sections/section-evidence-info.component.html b/src/modules/shared/pages/innovation/sections/section-evidence-info.component.html index 46302958c..af0b2fefa 100644 --- a/src/modules/shared/pages/innovation/sections/section-evidence-info.component.html +++ b/src/modules/shared/pages/innovation/sections/section-evidence-info.component.html @@ -1,6 +1,7 @@ -
      + +
      -

      {{ isInnovatorType ? "Your" : "Submitted" }} answers

      +

      {{ ctx.user.isInnovator() ? "Your" : "Submitted" }} answers

      {{ item.label }}
      @@ -8,7 +9,7 @@

      {{ isInnovatorType ? "Your" : "Submitted" }} answers

      {{ item.value }} -
      +
      Change {{ item.label | lowercase }} @@ -17,7 +18,7 @@

      {{ isInnovatorType ? "Your" : "Submitted" }} answers

      Documents

      -

      There are no documents uploaded to this evidence.

      @@ -36,7 +37,7 @@

      Documents

      - +
      diff --git a/src/modules/shared/pages/innovation/sections/section-evidence-info.component.ts b/src/modules/shared/pages/innovation/sections/section-evidence-info.component.ts index 0585a1153..124e6221f 100644 --- a/src/modules/shared/pages/innovation/sections/section-evidence-info.component.ts +++ b/src/modules/shared/pages/innovation/sections/section-evidence-info.component.ts @@ -25,9 +25,6 @@ export class PageInnovationSectionEvidenceInfoComponent extends CoreComponent im summaryList: WizardSummaryType[] = []; documentsList: InnovationDocumentsListOutDTO['data'] = []; - // Flags - isInnovatorType: boolean; - constructor( private activatedRoute: ActivatedRoute, private innovationDocumentsService: InnovationDocumentsService @@ -37,7 +34,7 @@ export class PageInnovationSectionEvidenceInfoComponent extends CoreComponent im this.innovation = this.ctx.innovation.info(); this.sectionId = this.activatedRoute.snapshot.params.sectionId; this.evidenceId = this.activatedRoute.snapshot.params.evidenceId; - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}`; + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}`; this.wizard = this.ctx.innovation.getInnovationRecordSectionEvidencesWizard(this.sectionId) ?? new WizardEngineModel({}); @@ -46,8 +43,6 @@ export class PageInnovationSectionEvidenceInfoComponent extends CoreComponent im if (this.wizard.steps.length === 0) { this.redirectTo(`${this.baseUrl}/record/sections/${this.sectionId}`); } - - this.isInnovatorType = this.stores.authentication.isInnovatorType(); } ngOnInit(): void { diff --git a/src/modules/shared/pages/innovation/sections/section-info-all.component.html b/src/modules/shared/pages/innovation/sections/section-info-all.component.html index 53498c2ab..e5f9dc4e9 100644 --- a/src/modules/shared/pages/innovation/sections/section-info-all.component.html +++ b/src/modules/shared/pages/innovation/sections/section-info-all.component.html @@ -6,7 +6,7 @@

      Please note that the innovator {{ innovation.owner.name }} is currently locked.

      -
      +
      Information:
        @@ -34,7 +34,7 @@

        {{ i + 1 }}. {{ item.title }}

        - + {{ i + 1 }}.{{ j + 1 }} {{ section.id | irv3translate: "subsections" }} @@ -43,7 +43,7 @@

        -
        +
        Information:

        @@ -55,7 +55,7 @@

        - + This section is in draft. You need to complete the section before you can submit your record for needs assessment. @@ -65,7 +65,7 @@

        - + This section is in draft. @@ -86,7 +86,7 @@

        -
        +

        - +
        Information: diff --git a/src/modules/shared/pages/innovation/sections/section-info-all.component.ts b/src/modules/shared/pages/innovation/sections/section-info-all.component.ts index 84f267c7b..94d6d8ee4 100644 --- a/src/modules/shared/pages/innovation/sections/section-info-all.component.ts +++ b/src/modules/shared/pages/innovation/sections/section-info-all.component.ts @@ -47,13 +47,7 @@ export class PageInnovationAllSectionsInfoComponent extends CoreComponent implem } = { progressBar: [], submitted: 0, draft: 0, notStarted: 0, withOpenTasksCount: 0, openTasksCount: 0 }; // Flags. - isInnovatorType: boolean; - isAccessorType: boolean; - isAssessmentType: boolean; - isAdmin: boolean; - isInnovationInCreatedStatus: boolean; - isInnovationInArchivedStatus: boolean; showSupportingTeamsShareRequestSection: boolean; showInnovatorShareRequestSection: boolean; @@ -90,24 +84,17 @@ export class PageInnovationAllSectionsInfoComponent extends CoreComponent implem this.assessmentQueryParam = this.activatedRoute.snapshot.queryParams.assessment; this.editPageQueryParam = this.activatedRoute.snapshot.queryParams.editPage; - this.baseUrl = `/${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}`; + this.baseUrl = `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}`; this.documentUrl = `${this.CONSTANTS.APP_ASSETS_URL}/NHS-innovation-service-record.docx`; this.pdfDocumentUrl = `${this.CONSTANTS.APP_URL}/exports/${ this.innovationId - }/pdf?role=${this.stores.authentication.getUserContextInfo()?.roleId}`; + }/pdf?role=${this.ctx.user.getUserContext()?.roleId}`; this.assessmentUrl = `${this.baseUrl}/assessments/${this.innovation.assessment?.id}`; // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - this.isAdmin = this.stores.authentication.isAdminRole(); this.isInnovationInCreatedStatus = this.innovation.status === InnovationStatusEnum.CREATED; - this.isInnovationInArchivedStatus = this.ctx.innovation.isArchived(); - this.showSupportingTeamsShareRequestSection = - this.stores.authentication.isAccessorType() || this.stores.authentication.isAssessmentType(); - this.showInnovatorShareRequestSection = - this.stores.authentication.isInnovatorType() && !this.isInnovationInCreatedStatus; + this.showSupportingTeamsShareRequestSection = this.ctx.user.isAccessorOrAssessment(); + this.showInnovatorShareRequestSection = this.ctx.user.isInnovator() && !this.isInnovationInCreatedStatus; } ngOnInit(): void { @@ -291,7 +278,7 @@ export class PageInnovationAllSectionsInfoComponent extends CoreComponent implem } setGoBackLink(): void { - if (this.isAssessmentType && this.assessmentQueryParam) { + if (this.ctx.user.isAssessment() && this.assessmentQueryParam) { let goBackUrl = undefined; switch (this.assessmentQueryParam) { case 'editReason': @@ -308,7 +295,7 @@ export class PageInnovationAllSectionsInfoComponent extends CoreComponent implem if (goBackUrl) { this.setBackLink('Back to needs (re)assessment', goBackUrl); } - } else if (this.isInnovatorType || !this.isInnovationInArchivedStatus) { + } else if (this.ctx.user.isInnovator() || !this.ctx.innovation.isArchived()) { this.setBackLink('Innovation Record', `${this.baseUrl}/record`); } } diff --git a/src/modules/shared/pages/innovation/sections/section-info.component.html b/src/modules/shared/pages/innovation/sections/section-info.component.html index ba788b29b..84ce752a2 100644 --- a/src/modules/shared/pages/innovation/sections/section-info.component.html +++ b/src/modules/shared/pages/innovation/sections/section-info.component.html @@ -3,7 +3,7 @@
        Information: - +

        @@ -15,7 +15,7 @@ - + This section is in draft. Any changes you make to this section will not be visible to others until you submit updates. @@ -30,7 +30,7 @@ - + This section is in draft. @@ -42,7 +42,7 @@ This section was last submitted by {{ this.sectionSummaryData.sectionInfo.submittedBy.name }} on {{ this.sectionSummaryData.sectionInfo.date | date: ("app.date_formats.long_date" | translate) }}. - You can update this section at any time. + You can update this section at any time. @@ -50,7 +50,7 @@

        -
        +

        - + @@ -72,7 +72,7 @@

        Evidence

        - +

        There are no evidences on this section.

        @@ -88,7 +88,7 @@

        Evidence

        Documents

        -
        +
        @@ -121,8 +121,8 @@

        Documents

      Information:

      {{ "features.accessor.cant_do_while_in_assessment" | translate }}

      - + @@ -162,7 +162,7 @@

      Documents

       - +
      - + Start section
      @@ -20,7 +20,7 @@ - +
      Information:

      This is the last submitted version of this section. You cannot see any updates the innovator makes to the section, while it is in draft.

      @@ -35,7 +35,7 @@

      {{ title }}

      -
      +
      {{ item.label | irv3translate: "questions" }}
      @@ -53,7 +53,7 @@

      {{ title }}

      href="javascript:void(0);" routerLink="/{{ baseUrl }}/record/sections/{{ sectionInfo.id }}/edit/{{ item.editStepNumber }}" [queryParams]="!item.value && !item.isNotMandatory ? {} : { isChangeMode: true }" - *ngIf="isInnovatorType && item.editStepNumber && displayChangeButtonList.includes(i)" + *ngIf="ctx.user.isInnovator() && item.editStepNumber && displayChangeButtonList.includes(i)" > Change {{ item.label | lowercase }} diff --git a/src/modules/shared/pages/innovation/sections/section-summary.component.ts b/src/modules/shared/pages/innovation/sections/section-summary.component.ts index 9ac4b1637..216d9dedf 100644 --- a/src/modules/shared/pages/innovation/sections/section-summary.component.ts +++ b/src/modules/shared/pages/innovation/sections/section-summary.component.ts @@ -53,11 +53,6 @@ export class InnovationSectionSummaryComponent extends CoreComponent implements displayChangeButtonList: number[] = []; - // Flags - isInnovatorType: boolean; - isAccessorType: boolean; - isAssessmentType: boolean; - search?: string; constructor(private activatedRoute: ActivatedRoute) { @@ -73,12 +68,7 @@ export class InnovationSectionSummaryComponent extends CoreComponent implements status: { id: InnovationSectionStatusEnum.NOT_STARTED, label: '' } }; - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}`; - - // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}`; } ngOnInit(): void { diff --git a/src/modules/shared/pages/innovation/support/support-summary-list.component.html b/src/modules/shared/pages/innovation/support/support-summary-list.component.html index e384e94c9..268427080 100644 --- a/src/modules/shared/pages/innovation/support/support-summary-list.component.html +++ b/src/modules/shared/pages/innovation/support/support-summary-list.component.html @@ -1,7 +1,7 @@
      -
      +
      Information:

      If you want to stop sharing your innovation with an organisation, update your data sharing preferences.

      @@ -238,9 +238,9 @@

      Needs assessment

      - + -
      +
      Information:

      {{ "features.accessor.cant_do_while_in_assessment" | translate }}

      diff --git a/src/modules/shared/pages/innovation/support/support-summary-list.component.ts b/src/modules/shared/pages/innovation/support/support-summary-list.component.ts index f016b37bc..fe70f02b0 100644 --- a/src/modules/shared/pages/innovation/support/support-summary-list.component.ts +++ b/src/modules/shared/pages/innovation/support/support-summary-list.component.ts @@ -48,12 +48,6 @@ export class PageInnovationSupportSummaryListComponent extends CoreComponent imp lsCache: Set; innovationAssessmentsList: innovationAssessmentListType[] = []; - // Flags - isQualifyingAccessorRole: boolean; - isAdmin: boolean; - isInnovatorType: boolean; - isAccessorType: boolean; - isSuggestionsListEmpty = true; showSuggestOrganisationsToSupportLink = false; @@ -83,12 +77,7 @@ export class PageInnovationSupportSummaryListComponent extends CoreComponent imp this.lsCache = new Set([]); } - this.isAdmin = this.stores.authentication.isAdminRole(); - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isQualifyingAccessorRole = this.stores.authentication.isQualifyingAccessorRole(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - - if (this.isAdmin) { + if (this.ctx.user.isAdmin()) { this.setPageTitle('Support summary', { hint: `Innovation ${this.innovation.name}` }); } } @@ -103,7 +92,7 @@ export class PageInnovationSupportSummaryListComponent extends CoreComponent imp innovationAssessmentsObservable: this.innovationsService.getInnovationAssessmentsList(this.innovation.id) }; - if (this.isQualifyingAccessorRole) { + if (this.ctx.user.isQualifyingAccessor()) { subscriptions.organisationsList = this.organisationsService.getOrganisationsList({ unitsInformation: true }); } @@ -173,8 +162,8 @@ export class PageInnovationSupportSummaryListComponent extends CoreComponent imp LocalStorageHelper.setObjectItem(lsCacheId, Array.from(this.lsCache)); // Check if there are organisations to be suggested by the qualifying accessor - if (this.isQualifyingAccessorRole) { - const userUnitId = this.stores.authentication.getUserContextInfo()?.organisationUnit?.id ?? ''; + if (this.ctx.user.isQualifyingAccessor()) { + const userUnitId = this.ctx.user.getUserContext()?.organisationUnit?.id ?? ''; const engagingUnitsIds = this.sectionsList[1].unitsList.map(unit => unit.id); @@ -255,7 +244,7 @@ export class PageInnovationSupportSummaryListComponent extends CoreComponent imp const minStart = new Date(minStartSupport).setHours(0, 0, 0, 0); const today = new Date().setHours(0, 0, 0, 0); - if (this.stores.authentication.getUserContextInfo()?.organisationUnit?.id === unitId && today >= minStart) { + if (this.ctx.user.getUserContext()?.organisationUnit?.id === unitId && today >= minStart) { return true; } else { return false; diff --git a/src/modules/shared/pages/innovation/support/support-summary-progress-update-delete.component.ts b/src/modules/shared/pages/innovation/support/support-summary-progress-update-delete.component.ts index cd0eab24c..9b00c7c81 100644 --- a/src/modules/shared/pages/innovation/support/support-summary-progress-update-delete.component.ts +++ b/src/modules/shared/pages/innovation/support/support-summary-progress-update-delete.component.ts @@ -22,7 +22,7 @@ export class PageInnovationSupportSummaryProgressUpdateDeleteComponent extends C this.innovationId = this.activatedRoute.snapshot.params.innovationId; this.supportSummaryHistoryId = this.activatedRoute.snapshot.params.supportSummaryHistoryId; - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovationId}/support-summary`; + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/support-summary`; } ngOnInit(): void { diff --git a/src/modules/shared/pages/innovation/support/support-summary-progress-update-wrapper.component.ts b/src/modules/shared/pages/innovation/support/support-summary-progress-update-wrapper.component.ts index ac177ce09..00cb3d59e 100644 --- a/src/modules/shared/pages/innovation/support/support-summary-progress-update-wrapper.component.ts +++ b/src/modules/shared/pages/innovation/support/support-summary-progress-update-wrapper.component.ts @@ -15,7 +15,7 @@ export class PageInnovationSupportSummaryProgressUpdateWrapperComponent extends super(); this.userOrgHasMilestones = Object.keys(SUPPORT_SUMMARY_MILESTONES).includes( - this.stores.authentication.getUserContextInfo()?.organisation?.acronym || '' + this.ctx.user.getUserContext()?.organisation?.acronym || '' ); } } diff --git a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/steps/date-step.component.ts b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/steps/date-step.component.ts index 7e2919cd9..bfd70bb62 100644 --- a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/steps/date-step.component.ts +++ b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/steps/date-step.component.ts @@ -101,7 +101,7 @@ export class WizardInnovationSupportSummaryProgressUpdateMilestonesDateStepCompo const dateString = `${date.year}-${date.month}-${date.day}`; const data = { - unitId: this.stores.authentication.getUserContextInfo()?.organisationUnit?.id ?? '', + unitId: this.ctx.user.getUserContext()?.organisationUnit?.id ?? '', date: dateString }; diff --git a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/support-summary-progress-update-milestones.component.ts b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/support-summary-progress-update-milestones.component.ts index 68f9162d1..06b1e9052 100644 --- a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/support-summary-progress-update-milestones.component.ts +++ b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update-milestones/support-summary-progress-update-milestones.component.ts @@ -62,7 +62,7 @@ export class WizardInnovationSupportSummaryProgressUpdateMilestonesComponent ext this.innovation = this.ctx.innovation.info(); - this.userOrgAcronym = this.stores.authentication.getUserContextInfo()?.organisation?.acronym ?? ''; + this.userOrgAcronym = this.ctx.user.getUserContext()?.organisation?.acronym ?? ''; this.milestonesType = SUPPORT_SUMMARY_MILESTONES[this.userOrgAcronym].some(org => org.subcategories !== undefined) ? 'TWO_LEVEL' @@ -414,7 +414,7 @@ export class WizardInnovationSupportSummaryProgressUpdateMilestonesComponent ext // If a file was provided, upload it and create a support summary progress update, otherwise, only create a support summary progress update const file = this.wizard.data.descriptionStep.file; if (file) { - const httpUploadBody = { userId: this.stores.authentication.getUserId(), innovationId: this.innovation.id }; + const httpUploadBody = { userId: this.ctx.user.getUserId(), innovationId: this.innovation.id }; this.fileUploadService .uploadFile(httpUploadBody, file) @@ -462,8 +462,6 @@ export class WizardInnovationSupportSummaryProgressUpdateMilestonesComponent ext } private redirectToSupportSummaryList(): void { - this.redirectTo( - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}/support-summary` - ); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/support-summary`); } } diff --git a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/steps/document-file-step.component.ts b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/steps/document-file-step.component.ts index 1740ddbd4..056bf6e37 100644 --- a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/steps/document-file-step.component.ts +++ b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/steps/document-file-step.component.ts @@ -32,7 +32,7 @@ export class WizardInnovationSupportSummaryProgressUpdateDocumentFileStepCompone fileUploadConfig = { httpUploadUrl: new UrlModel(this.CONSTANTS.APP_URL).addPath('upload-file').buildUrl(), httpUploadBody: { - innovatorId: this.stores.authentication.getUserId(), + innovatorId: this.ctx.user.getUserId(), innovationId: this.ctx.innovation.info().id }, maxFileSize: 20, diff --git a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/support-summary-progress-update.component.ts b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/support-summary-progress-update.component.ts index 2170a3d3d..0ab399249 100644 --- a/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/support-summary-progress-update.component.ts +++ b/src/modules/shared/pages/innovation/support/wizard-support-summary-progress-update/support-summary-progress-update.component.ts @@ -494,8 +494,6 @@ export class WizardInnovationSupportSummaryProgressUpdateComponent extends CoreC } private redirectToSupportSummaryList(): void { - this.redirectTo( - `${this.stores.authentication.userUrlBasePath()}/innovations/${this.innovation.id}/support-summary` - ); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/innovations/${this.innovation.id}/support-summary`); } } diff --git a/src/modules/shared/pages/innovation/tasks/task-details.component.html b/src/modules/shared/pages/innovation/tasks/task-details.component.html index c0d93243c..b4f803688 100644 --- a/src/modules/shared/pages/innovation/tasks/task-details.component.html +++ b/src/modules/shared/pages/innovation/tasks/task-details.component.html @@ -9,11 +9,7 @@ type="{{ 'shared.catalog.innovation.task_status.' + task.status + '.cssColorClass' | translate }}" label="{{ 'shared.catalog.innovation.task_status.' + task.status + '.name' | translate }}" > - + What does this mean? @@ -84,11 +80,11 @@
      -
      +

      What you can do

      - +

    • Go to section to complete this task
      • -
    • +
    • Go to section to review
      • - +

      >View messages about this task and send a reply -
    • +
    • Go to section to review
      • diff --git a/src/modules/shared/pages/innovation/tasks/task-details.component.ts b/src/modules/shared/pages/innovation/tasks/task-details.component.ts index d0185fb86..c88fb1c65 100644 --- a/src/modules/shared/pages/innovation/tasks/task-details.component.ts +++ b/src/modules/shared/pages/innovation/tasks/task-details.component.ts @@ -26,11 +26,6 @@ export class PageInnovationTaskDetailsComponent extends CoreComponent implements userUrlBase = ''; // Flags - isInnovatorType: boolean; - isAccessorType: boolean; - isAssessmentType: boolean; - isAdmin: boolean; - isArchived: boolean; canCancel = false; canReopen = false; canSendMessage = false; @@ -49,13 +44,6 @@ export class PageInnovationTaskDetailsComponent extends CoreComponent implements this.taskId = this.activatedRoute.snapshot.params.taskId; this.userUrlBase = this.userUrlBasePath(); - - // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - this.isAdmin = this.stores.authentication.isAdminRole(); - this.isArchived = this.ctx.innovation.isArchived(); } ngOnInit(): void { @@ -144,21 +132,23 @@ export class PageInnovationTaskDetailsComponent extends CoreComponent implements private setAllowedActions() { this.canReopen = !!this.task && - !this.isArchived && + !this.ctx.innovation.isArchived() && ['DONE', 'DECLINED'].includes(this.task.status) && this.task.sameOrganisation && - (this.isAssessmentType || (this.isAccessorType && this.innovation.status === InnovationStatusEnum.IN_PROGRESS)); + (this.ctx.user.isAssessment() || + (this.ctx.user.isAccessorType() && this.innovation.status === InnovationStatusEnum.IN_PROGRESS)); this.canCancel = !!this.task && this.task.status === 'OPEN' && this.task.sameOrganisation && - (this.isAssessmentType || (this.isAccessorType && this.innovation.status === InnovationStatusEnum.IN_PROGRESS)); + (this.ctx.user.isAssessment() || + (this.ctx.user.isAccessorType() && this.innovation.status === InnovationStatusEnum.IN_PROGRESS)); this.canSendMessage = - !this.isArchived && - (this.isInnovatorType || - this.isAssessmentType || - (this.isAccessorType && this.innovation.status === InnovationStatusEnum.IN_PROGRESS)); + !this.ctx.innovation.isArchived() && + (this.ctx.user.isInnovator() || + this.ctx.user.isAssessment() || + (this.ctx.user.isAccessorType() && this.innovation.status === InnovationStatusEnum.IN_PROGRESS)); } } diff --git a/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.html b/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.html index 48e2240a1..6e50ec52e 100644 --- a/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.html +++ b/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.html @@ -1,4 +1,5 @@ -
      + +
      Important: User Locked
      @@ -25,10 +26,12 @@ - +
      Information: -

      {{ "features.accessor.cant_do_while_in_assessment" | translate}}

      +

      {{ "features.accessor.cant_do_while_in_assessment" | translate }}

      diff --git a/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.ts b/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.ts index 418f7ea95..b53bde736 100644 --- a/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.ts +++ b/src/modules/shared/pages/innovation/tasks/task-to-do-list.component.ts @@ -27,7 +27,6 @@ export class PageInnovationTaskToDoListComponent extends CoreComponent implement // Flags isClosedActionsLoading = false; - isInnovatorType: boolean; isArchived: boolean; constructor( @@ -36,9 +35,8 @@ export class PageInnovationTaskToDoListComponent extends CoreComponent implement ) { super(); // Flags - this.isInnovatorType = this.stores.authentication.isInnovatorType(); - this.setPageTitle(this.isInnovatorType ? 'Tasks to do' : 'Tasks'); + this.setPageTitle(this.ctx.user.isInnovator() ? 'Tasks to do' : 'Tasks'); this.tablesTitles = { topTableTitle: '', bottomTableTitle: '' }; @@ -113,9 +111,7 @@ export class PageInnovationTaskToDoListComponent extends CoreComponent implement } getUserType() { - return this.stores.authentication.isAccessorType() - ? UserRoleEnum.ACCESSOR - : this.stores.authentication.getUserType(); + return this.ctx.user.isAccessorType() ? UserRoleEnum.ACCESSOR : this.ctx.user.getUserType(); } getTablesTitles(): { topTableTitle: string; bottomTableTitle: string } { diff --git a/src/modules/shared/pages/innovation/tasks/wizard-task-new/task-new.component.ts b/src/modules/shared/pages/innovation/tasks/wizard-task-new/task-new.component.ts index 8e2284b8e..da5fb092b 100644 --- a/src/modules/shared/pages/innovation/tasks/wizard-task-new/task-new.component.ts +++ b/src/modules/shared/pages/innovation/tasks/wizard-task-new/task-new.component.ts @@ -17,7 +17,6 @@ export class PageInnovationTaskNewComponent extends CoreComponent implements OnI innovationId: string; sectionId: string; - baseUrl: string; taskUrl: string; sectionUrl: string; @@ -38,11 +37,9 @@ export class PageInnovationTaskNewComponent extends CoreComponent implements OnI this.sectionId = this.activatedRoute.snapshot.queryParams.section; - this.baseUrl = this.stores.authentication.userUrlBasePath(); + this.taskUrl = `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/tasks`; - this.taskUrl = `/${this.baseUrl}/innovations/${this.innovationId}/tasks`; - - this.sectionUrl = `/${this.baseUrl}/innovations/${this.innovationId}/record/sections/${this.sectionId}`; + this.sectionUrl = `/${this.ctx.user.userUrlBasePath()}/innovations/${this.innovationId}/record/sections/${this.sectionId}`; this.sections = this.ctx.schema.getIrSchemaNumberedSubSectionsList(); diff --git a/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.html b/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.html index 890fd8956..646f8c83f 100644 --- a/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.html +++ b/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.html @@ -44,7 +44,7 @@ {{ diseasesAndConditionsList }} - +
    • Health inequalities: {{ keyHealthInequalitiesList }} @@ -66,7 +66,7 @@
      • -
    • +
    • Support status:
      • -
    • +
    • Innovation status: - + Record last updated on {{ innovationCardData.updatedAt | date: ("app.date_formats.long_date" | translate) }} - + Status updated on {{ innovationCardData.statusUpdatedAt | date: ("app.date_formats.long_date" | translate) }}
      • diff --git a/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.ts b/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.ts index bf618bbf7..63cd79159 100644 --- a/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.ts +++ b/src/modules/shared/pages/innovations/innovation-advanced-search-card.component.ts @@ -42,10 +42,6 @@ export class InnovationAdvancedSearchCardComponent extends CoreComponent impleme baseUrl: string; - isAdminType: boolean; - isAccessorType: boolean; - isAssessmentType: boolean; - isInnovationInArchivedStatus = false; isAccessorTypeAndArchivedInnovation = false; @@ -67,19 +63,15 @@ export class InnovationAdvancedSearchCardComponent extends CoreComponent impleme constructor() { super(); - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/`; - - this.isAdminType = this.stores.authentication.isAdminRole(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations/`; } ngOnInit(): void { this.isInnovationInArchivedStatus = this.innovationCardData.status === InnovationStatusEnum.ARCHIVED; - this.isAccessorTypeAndArchivedInnovation = this.isAccessorType && this.isInnovationInArchivedStatus; + this.isAccessorTypeAndArchivedInnovation = this.ctx.user.isAccessorType() && this.isInnovationInArchivedStatus; this.isAccessorTypeAndStoppedSharingInnovation = - this.isAccessorType && this.innovationCardData.support?.closeReason === 'STOP_SHARE'; + this.ctx.user.isAccessorType() && this.innovationCardData.support?.closeReason === 'STOP_SHARE'; this.categoriesList = this.getFormattedList(this.innovationCardData.categories); this.careSettingsList = this.getFormattedList(this.innovationCardData.careSettings); diff --git a/src/modules/shared/pages/innovations/innovations-advanced-review.component.ts b/src/modules/shared/pages/innovations/innovations-advanced-review.component.ts index 7762a80bc..c59e5f811 100644 --- a/src/modules/shared/pages/innovations/innovations-advanced-review.component.ts +++ b/src/modules/shared/pages/innovations/innovations-advanced-review.component.ts @@ -14,7 +14,6 @@ import { FiltersModel } from '@modules/core/models/filters/filters.model'; import { InnovationCardData } from './innovation-advanced-search-card.component'; import { getConfig } from './innovations-advanced-review.config'; import { ActivatedRoute } from '@angular/router'; -import { UserRoleEnum } from '@app/base/enums'; import { IrSchemaTranslatorItemMapType } from '@modules/stores/ctx/schema/schema.types'; type AdvancedReviewSortByKeys = @@ -41,10 +40,6 @@ type AdvancedReviewSortByKeysType = Record< export class PageInnovationsAdvancedReviewComponent extends CoreComponent implements OnInit { baseUrl: string; - isAdminType: boolean; - isAccessorType: boolean; - isAssessmentType: boolean; - pageSize = 20; pageNumber = 1; orderBy: AdvancedReviewSortByKeys = 'relevance'; @@ -81,16 +76,12 @@ export class PageInnovationsAdvancedReviewComponent extends CoreComponent implem ) { super(); - this.isAdminType = this.stores.authentication.isAdminRole(); - this.isAccessorType = this.stores.authentication.isAccessorType(); - this.isAssessmentType = this.stores.authentication.isAssessmentType(); - // Force reload if running on server because of SSR and session storage if (this.isRunningOnServer()) { this.router.navigate([]); } - this.baseUrl = `${this.stores.authentication.userUrlBasePath()}/innovations`; + this.baseUrl = `${this.ctx.user.userUrlBasePath()}/innovations`; this.setPageTitle('Advanced search'); @@ -112,15 +103,15 @@ export class PageInnovationsAdvancedReviewComponent extends CoreComponent implem ]; this.orderBy = 'relevance'; - if (this.isAdminType) { + if (this.ctx.user.isAdmin()) { this.setPageTitle('Innovations'); this.sortByComponentInputList.splice(1, 0, { key: 'updatedAt', text: this.sortByData.updatedAt.text }); - } else if (this.isAccessorType) { + } else if (this.ctx.user.isAccessorType()) { this.sortByComponentInputList.splice(1, 0, { key: 'support.updatedAt', text: this.sortByData['support.updatedAt'].text }); - } else if (this.isAssessmentType) { + } else if (this.ctx.user.isAssessment()) { this.sortByComponentInputList.splice(1, 0, { key: 'statusUpdatedAt', text: this.sortByData['statusUpdatedAt'].text @@ -131,12 +122,9 @@ export class PageInnovationsAdvancedReviewComponent extends CoreComponent implem ngOnInit(): void { this.organisationsService.getOrganisationsList({ unitsInformation: false }).subscribe({ next: response => { - const { filters, datasets } = getConfig( - this.ctx.schema.irSchemaInfo(), - this.stores.authentication.state.userContext?.type - ); + const { filters, datasets } = getConfig(this.ctx.schema.irSchemaInfo(), this.ctx.user.getUserType()); - const isAccessor = this.stores.authentication.state.userContext?.type === UserRoleEnum.ACCESSOR; + const isAccessor = this.ctx.user.isAccessor(); datasets.engagingOrganisations = response.map(o => ({ value: o.id, label: o.name })); datasets.supportStatuses = Object.keys(InnovationSupportStatusEnum) .filter( @@ -149,13 +137,13 @@ export class PageInnovationsAdvancedReviewComponent extends CoreComponent implem value: status })); - if (this.isAdminType) { + if (this.ctx.user.isAdmin()) { datasets.supportStatuses = []; datasets.groupedStatuses = Object.keys(InnovationGroupedStatusEnum).map(status => ({ label: this.translate(`shared.catalog.innovation.grouped_status.${status}.name`), value: status })); - } else if (this.isAssessmentType) { + } else if (this.ctx.user.isAssessment()) { datasets.supportStatuses = []; datasets.groupedStatuses = Object.keys(InnovationGroupedStatusEnum) .filter( @@ -235,15 +223,15 @@ export class PageInnovationsAdvancedReviewComponent extends CoreComponent implem 'support.closeReason' ]; - if (this.isAdminType) { + if (this.ctx.user.isAdmin()) { // filter out unavailable fields if Admin queryFields = queryFields.filter( item => !['support.status', 'support.updatedAt', 'support.closeReason'].includes(item) ); - } else if (this.isAccessorType) { + } else if (this.ctx.user.isAccessorType()) { // filter out unavailable fields for QA/A queryFields = queryFields.filter(item => !['involvedAACProgrammes', 'keyHealthInequalities'].includes(item)); - } else if (this.isAssessmentType) { + } else if (this.ctx.user.isAssessment()) { // filter out unavailable fields for Assessment queryFields = queryFields.filter( item => @@ -380,7 +368,7 @@ export class PageInnovationsAdvancedReviewComponent extends CoreComponent implem this.location.replaceState(url); // To update 'search' query param. - if (this.isAdminType) { + if (this.ctx.user.isAdmin()) { this.redirectTo(`${this.baseUrl}`, { search: currentSearch }); } else { this.redirectTo(`${this.baseUrl}/advanced-search`, { diff --git a/src/modules/shared/pages/notifications/notifications-list.component.html b/src/modules/shared/pages/notifications/notifications-list.component.html index b2d1058e3..d67e4dacd 100644 --- a/src/modules/shared/pages/notifications/notifications-list.component.html +++ b/src/modules/shared/pages/notifications/notifications-list.component.html @@ -2,7 +2,7 @@
      Change your email preferences
      -
      +
      Manage your custom notifications
      diff --git a/src/modules/shared/pages/notifications/notifications-list.component.spec.ts b/src/modules/shared/pages/notifications/notifications-list.component.spec.ts index 0c56a8f19..642c447bc 100644 --- a/src/modules/shared/pages/notifications/notifications-list.component.spec.ts +++ b/src/modules/shared/pages/notifications/notifications-list.component.spec.ts @@ -5,7 +5,7 @@ import { Injector } from '@angular/core'; import { of } from 'rxjs'; import { CoreModule, AppInjector } from '@modules/core'; -import { AuthenticationStore, StoresModule, InnovationStatusEnum } from '@modules/stores'; +import { StoresModule, InnovationStatusEnum } from '@modules/stores'; import { SharedModule } from '@modules/shared/shared.module'; import { NotificationContextDetailEnum, @@ -18,8 +18,6 @@ import { PageNotificationsListComponent } from './notifications-list.component'; import { RouterModule } from '@angular/router'; describe('Shared/Pages/Notifications/PageNotificationsListComponent', () => { - let authenticationStore: AuthenticationStore; - let notificationsService: NotificationsService; let component: PageNotificationsListComponent; @@ -32,8 +30,6 @@ describe('Shared/Pages/Notifications/PageNotificationsListComponent', () => { AppInjector.setInjector(TestBed.inject(Injector)); - authenticationStore = TestBed.inject(AuthenticationStore); - notificationsService = TestBed.inject(NotificationsService); notificationsService.getNotificationsList = () => diff --git a/src/modules/shared/pages/notifications/notifications-list.component.ts b/src/modules/shared/pages/notifications/notifications-list.component.ts index 3735e9f17..a99e9701d 100644 --- a/src/modules/shared/pages/notifications/notifications-list.component.ts +++ b/src/modules/shared/pages/notifications/notifications-list.component.ts @@ -14,9 +14,9 @@ import { } from '@modules/stores/ctx/notifications/notifications.types'; import { NotificationsListOutDTO, NotificationsService } from '@modules/shared/services/notifications.service'; -import { UserRoleEnum } from '@modules/stores/authentication/authentication.enums'; import { FiltersModel } from '@modules/core/models/filters/filters.model'; import { getConfig } from './notifications-list.config'; +import { UserRoleEnum } from '@modules/stores'; @Component({ selector: 'shared-pages-notifications-list', @@ -31,24 +31,16 @@ export class PageNotificationsListComponent extends CoreComponent implements OnI filtersModel!: FiltersModel; form!: FormGroup; - isAccessorType = false; - constructor(private notificationsService: NotificationsService) { super(); this.setPageTitle('Notifications'); - this.isAccessorType = this.stores.authentication.isAccessorType(); - - if ( - ['QUALIFYING_ACCESSOR', 'ACCESSOR', 'INNOVATOR', 'ASSESSMENT'].includes( - this.stores.authentication.getUserType() ?? '' - ) - ) { - this.emailNotificationPreferencesLink = `/${this.stores.authentication.userUrlBasePath()}/account/email-notifications`; + if (['QUALIFYING_ACCESSOR', 'ACCESSOR', 'INNOVATOR', 'ASSESSMENT'].includes(this.ctx.user.getUserType() ?? '')) { + this.emailNotificationPreferencesLink = `/${this.ctx.user.userUrlBasePath()}/account/email-notifications`; } - if (this.isAccessorType) { - this.customNotificationPreferencesLink = `/${this.stores.authentication.userUrlBasePath()}/account/manage-custom-notifications`; + if (this.ctx.user.isAccessorType()) { + this.customNotificationPreferencesLink = `/${this.ctx.user.userUrlBasePath()}/account/manage-custom-notifications`; } this.notificationsList @@ -61,7 +53,7 @@ export class PageNotificationsListComponent extends CoreComponent implements OnI } ngOnInit(): void { - const role = this.stores.authentication.getUserType(); + const role = this.ctx.user.getUserType(); let categories: NotificationCategoryTypeEnum[] = []; switch (role) { diff --git a/src/modules/shared/pages/progress-categories/progress-categories-wrapper.component.ts b/src/modules/shared/pages/progress-categories/progress-categories-wrapper.component.ts index 2697ea6da..8b60c2e0b 100644 --- a/src/modules/shared/pages/progress-categories/progress-categories-wrapper.component.ts +++ b/src/modules/shared/pages/progress-categories/progress-categories-wrapper.component.ts @@ -38,7 +38,7 @@ export class PageProgressCategoriesWrapperComponent extends CoreComponent implem const userOrgHasMilestones = Object.keys(SUPPORT_SUMMARY_MILESTONES).includes(organisation.acronym); if (!userOrgHasMilestones) { - this.redirectTo(this.previousUrl || `/${this.stores.authentication.userUrlBasePath()}/dashboard`); + this.redirectTo(this.previousUrl || `/${this.ctx.user.userUrlBasePath()}/dashboard`); } this.milestoneType = SUPPORT_SUMMARY_MILESTONES[organisation.acronym].some( diff --git a/src/modules/shared/pages/switch-context/switch-context.component.ts b/src/modules/shared/pages/switch-context/switch-context.component.ts index 388542cc8..413aeff23 100644 --- a/src/modules/shared/pages/switch-context/switch-context.component.ts +++ b/src/modules/shared/pages/switch-context/switch-context.component.ts @@ -5,8 +5,6 @@ import { Component } from '@angular/core'; import { CoreComponent } from '@app/base'; import { UserRoleEnum } from '@app/base/enums'; -import { AuthenticationStore } from '@modules/stores'; - @Component({ selector: 'shared-pages-switch-context', templateUrl: './switch-context.component.html' @@ -25,28 +23,28 @@ export class PageSwitchContextComponent extends CoreComponent { }[]; }; - constructor(private authenticationStore: AuthenticationStore) { + constructor() { super(); - const currentUserContext = this.authenticationStore.getUserContextInfo(); + const currentUserContext = this.ctx.user.getUserContext(); if (!currentUserContext) { this.currentRole = null; } else { this.currentRole = { id: currentUserContext.roleId, - description: `${this.authenticationStore.getRoleDescription(currentUserContext.type)}${ - this.authenticationStore.isAccessorType() ? ` (${currentUserContext.organisationUnit?.name.trimEnd()})` : '' + description: `${this.ctx.user.getRoleDescription(currentUserContext.type)}${ + this.ctx.user.isAccessorType() ? ` (${currentUserContext.organisationUnit?.name.trimEnd()})` : '' }` }; } - const user = this.authenticationStore.getUserInfo(); + const user = this.ctx.user.getUserInfo(); this.user = { id: user.id, roles: sortBy(user.roles, ['organisation', 'organisationUnit']).map(role => { - let label = `${this.authenticationStore.getRoleDescription(role.role)}${ + let label = `${this.ctx.user.getRoleDescription(role.role)}${ role.organisationUnit ? ` (${this.displayNameOrAcronym(role.organisationUnit.name, role.organisationUnit.acronym)})` : '' @@ -80,7 +78,7 @@ export class PageSwitchContextComponent extends CoreComponent { if (this.currentRole?.id !== role.id) { sessionStorage.clear(); - this.authenticationStore.setUserContext({ + this.ctx.user.setUserContext({ id: this.user.id, roleId: role.id, type: role.type, @@ -88,22 +86,22 @@ export class PageSwitchContextComponent extends CoreComponent { organisationUnit: role.organisationUnit }); - const roleDescription = `${this.authenticationStore.getRoleDescription(role.type).toLowerCase()}${ + const roleDescription = `${this.ctx.user.getRoleDescription(role.type).toLowerCase()}${ role.organisationUnit ? `, ${role.organisationUnit.name}` : '' }`; this.setRedirectAlertSuccess(`You are now logged in as ${roleDescription}`); - this.stores.authentication.initializeAuthentication$().subscribe(() => { - if (this.stores.authentication.hasAnnouncements()) { + this.ctx.user.initializeAuthentication$().subscribe(() => { + if (this.ctx.user.hasAnnouncements()) { this.redirectTo('announcements'); } - this.redirectTo(`${this.authenticationStore.userUrlBasePath()}/dashboard`); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/dashboard`); }); return; } - this.redirectTo(`${this.authenticationStore.userUrlBasePath()}/dashboard`); + this.redirectTo(`${this.ctx.user.userUrlBasePath()}/dashboard`); } displayNameOrAcronym(name: string, acronym: string): string { diff --git a/src/modules/shared/pages/tasks/tasks-advanced-search.component.html b/src/modules/shared/pages/tasks/tasks-advanced-search.component.html index dc7a42039..f67d6243d 100644 --- a/src/modules/shared/pages/tasks/tasks-advanced-search.component.html +++ b/src/modules/shared/pages/tasks/tasks-advanced-search.component.html @@ -1,6 +1,11 @@ -
      + +
      -

      {{ pageInformation.leadText }}

      + @if (ctx.user.isAssessment()) { +

      Tasks assigned by needs assessment team

      + } @else { +

      Tasks assigned by {{ ctx.user.getAccessorUnitName() }}

      + }
      diff --git a/src/modules/shared/pages/tasks/tasks-advanced-search.component.ts b/src/modules/shared/pages/tasks/tasks-advanced-search.component.ts index 9097c88c1..5f6d4934f 100644 --- a/src/modules/shared/pages/tasks/tasks-advanced-search.component.ts +++ b/src/modules/shared/pages/tasks/tasks-advanced-search.component.ts @@ -18,8 +18,6 @@ import { getConfig } from './task-advanced-search.config'; export class PageTasksAdvancedSearchComponent extends CoreComponent implements OnInit { tasksList = new TableModel({}); - pageInformation: { leadText: string }; - filtersModel!: FiltersModel; form!: FormGroup; @@ -36,16 +34,10 @@ export class PageTasksAdvancedSearchComponent extends CoreComponent implements O status: { label: 'Status', align: 'right', orderable: true } }) .setOrderBy('updatedAt', 'descending'); - - this.pageInformation = { - leadText: this.stores.authentication.isAssessmentType() - ? 'Tasks assigned by needs assessment team' - : `Tasks assigned by ${this.stores.authentication.getAccessorOrganisationUnitName()}` - }; } ngOnInit(): void { - const userType = this.stores.authentication.state.userContext?.type; + const userType = this.ctx.user.getUserType(); if (!userType) { return; } diff --git a/src/modules/shared/pages/terms-of-use/terms-of-use-acceptance.component.ts b/src/modules/shared/pages/terms-of-use/terms-of-use-acceptance.component.ts index 8831c2985..22c54d5e1 100644 --- a/src/modules/shared/pages/terms-of-use/terms-of-use-acceptance.component.ts +++ b/src/modules/shared/pages/terms-of-use/terms-of-use-acceptance.component.ts @@ -29,7 +29,7 @@ export class PageTermsOfUseAcceptanceComponent extends CoreComponent implements rightItems: [{ key: 'signOut', label: 'Sign out', link: `${this.appUrl}/signout`, fullReload: true }] }; - if (this.stores.authentication.getUserType() === 'INNOVATOR') { + if (this.ctx.user.isInnovator()) { this.policyURL = this.CONSTANTS.URLS.TOU_INNOVATOR; } else { this.policyURL = this.CONSTANTS.URLS.TOU_SUPPORT_ORGANISATION; diff --git a/src/modules/shared/resolvers/innovation-data.resolver.ts b/src/modules/shared/resolvers/innovation-data.resolver.ts index 29e4f3a83..530b4e3c6 100644 --- a/src/modules/shared/resolvers/innovation-data.resolver.ts +++ b/src/modules/shared/resolvers/innovation-data.resolver.ts @@ -4,7 +4,7 @@ import { NGXLogger } from 'ngx-logger'; import { Observable, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; -import { AuthenticationStore, CtxStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; /** * Note: With the creation of the context store, this can be changed to a guard in the future, @@ -15,21 +15,18 @@ export class InnovationDataResolver { constructor( private router: Router, private logger: NGXLogger, - private authenticationStore: AuthenticationStore, private ctx: CtxStore ) {} resolve(route: ActivatedRouteSnapshot): Observable { - return this.ctx.innovation - .getOrLoadInnovation$(route.params.innovationId, this.authenticationStore.getUserContextInfo()) - .pipe( - map(response => ({ id: response.id, name: response.name })), - catchError(error => { - this.ctx.innovation.clear(); - this.router.navigateByUrl('error/forbidden-innovation'); - this.logger.error('Error fetching data innovation data', error); - return of(null); - }) - ); + return this.ctx.innovation.getOrLoadInnovation$(route.params.innovationId, this.ctx.user.getUserContext()).pipe( + map(response => ({ id: response.id, name: response.name })), + catchError(error => { + this.ctx.innovation.clear(); + this.router.navigateByUrl('error/forbidden-innovation'); + this.logger.error('Error fetching data innovation data', error); + return of(null); + }) + ); } } diff --git a/src/modules/shared/services/innovation-documents.service.ts b/src/modules/shared/services/innovation-documents.service.ts index ed68048d9..4118f6119 100644 --- a/src/modules/shared/services/innovation-documents.service.ts +++ b/src/modules/shared/services/innovation-documents.service.ts @@ -116,9 +116,7 @@ export class InnovationDocumentsService extends CoreService { break; } - let userDescription = `${item.createdBy.name}, ${this.stores.authentication.getRoleDescription( - item.createdBy.role - )}`; + let userDescription = `${item.createdBy.name}, ${this.ctx.user.getRoleDescription(item.createdBy.role)}`; if (item.createdBy.role === UserRoleEnum.INNOVATOR) { item.createdBy.name === '[deleted user]' ? userDescription @@ -158,18 +156,18 @@ export class InnovationDocumentsService extends CoreService { description = section ?? '[archived section]'; descriptionUrl = (section && - `${this.stores.authentication.userUrlBasePath()}/innovations/${innovationId}/record/sections/${item.context.id}`) ?? + `${this.ctx.user.userUrlBasePath()}/innovations/${innovationId}/record/sections/${item.context.id}`) ?? null; break; case 'INNOVATION_EVIDENCE': description = item.context.name ?? ''; - descriptionUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${innovationId}/record/sections/EVIDENCE_OF_EFFECTIVENESS/evidences/${ + descriptionUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${innovationId}/record/sections/EVIDENCE_OF_EFFECTIVENESS/evidences/${ item.context.id }`; break; case 'INNOVATION_MESSAGE': description = item.context.name ?? ''; - descriptionUrl = `${this.stores.authentication.userUrlBasePath()}/innovations/${innovationId}/threads/${ + descriptionUrl = `${this.ctx.user.userUrlBasePath()}/innovations/${innovationId}/threads/${ item.context.threadId }`; break; @@ -177,13 +175,11 @@ export class InnovationDocumentsService extends CoreService { break; } - let userDescription = `${item.createdBy.name}, ${this.stores.authentication.getRoleDescription( - item.createdBy.role - )}`; + let userDescription = `${item.createdBy.name}, ${this.ctx.user.getRoleDescription(item.createdBy.role)}`; if (item.createdBy.role === UserRoleEnum.INNOVATOR) { - item.createdBy.name === '[deleted user]' - ? userDescription - : (userDescription += item.createdBy.isOwner ? ' (Owner)' : ' (Collaborator)'); + if (item.createdBy.name !== '[deleted user]') { + userDescription += item.createdBy.isOwner ? ' (Owner)' : ' (Collaborator)'; + } } else { userDescription += item.createdBy.orgUnitName ? ` at ${item.createdBy.orgUnitName}` : ''; } diff --git a/src/modules/shared/services/innovations.dtos.ts b/src/modules/shared/services/innovations.dtos.ts index 35b7f81f3..8adc2dd67 100644 --- a/src/modules/shared/services/innovations.dtos.ts +++ b/src/modules/shared/services/innovations.dtos.ts @@ -2,8 +2,6 @@ import { FileUploadType } from '@app/base/forms'; import { DateISOType } from '@app/base/types'; import { ReassessmentSendType } from '@modules/feature-modules/innovator/pages/innovation/needs-reassessment/needs-reassessment-send.config'; -import { PhoneUserPreferenceEnum } from '@modules/stores/authentication/authentication.service'; - import { ActivityLogItemsEnum, InnovationCollaboratorStatusEnum, @@ -12,7 +10,8 @@ import { InnovationStatusEnum, InnovationSupportCloseReasonEnum, InnovationSupportStatusEnum, - InnovationTaskStatusEnum + InnovationTaskStatusEnum, + PhoneUserPreferenceEnum } from '@modules/stores'; // Innovations. diff --git a/src/modules/shared/services/innovations.service.ts b/src/modules/shared/services/innovations.service.ts index a0a54490b..c10f0dad9 100644 --- a/src/modules/shared/services/innovations.service.ts +++ b/src/modules/shared/services/innovations.service.ts @@ -1,13 +1,11 @@ import { Injectable } from '@angular/core'; -import { Observable, of } from 'rxjs'; +import { Observable } from 'rxjs'; import { finalize, map, take } from 'rxjs/operators'; import { CoreService } from '@app/base'; import { UrlModel } from '@app/base/models'; import { APIQueryParamsType, DateISOType } from '@app/base/types'; -import { UserRoleEnum } from '@modules/stores/authentication/authentication.enums'; - import { KeysUnion } from '@modules/core/helpers/types.helper'; import { APIListResponse, Paginated } from '@modules/core/models/api.model'; import { @@ -17,7 +15,8 @@ import { InnovationExportRequestStatusEnum, InnovationStatusEnum, InnovationSupportStatusEnum, - InnovationTaskStatusEnum + InnovationTaskStatusEnum, + UserRoleEnum } from '@modules/stores'; import { ACTIVITY_LOG_ITEMS, InnovationSectionInfoDTO } from '@modules/stores/ctx/innovation/innovation.models'; import { FileUploadType } from '../forms/engine/config/form-engine.config'; @@ -259,7 +258,7 @@ export class InnovationsService extends CoreService { } getInnovationInfo(innovationId: string): Observable { - const requestUserType = this.stores.authentication.getUserType(); + const requestUserType = this.ctx.user.getUserType(); const qp: { fields: ('assessment' | 'supports')[] } = { fields: [] }; switch (requestUserType) { @@ -695,7 +694,7 @@ export class InnovationsService extends CoreService { ? message.createdBy.isOwner ? 'Owner' : 'Collaborator' - : this.stores.authentication.getRoleDescription(message.createdBy.role) + : this.ctx.user.getRoleDescription(message.createdBy.role) } })) })) @@ -748,7 +747,7 @@ export class InnovationsService extends CoreService { }> ): Observable { const { filters, ...qParams } = queryParams; - const userUrlBasePath = this.stores.authentication.userUrlBasePath(); + const userUrlBasePath = this.ctx.user.userUrlBasePath(); const url = new UrlModel(this.API_INNOVATIONS_URL) .addPath('v1/:innovationId/activities') .setPathParams({ innovationId }) @@ -841,7 +840,7 @@ export class InnovationsService extends CoreService { innovationName: response.innovation.name, sectionTitle: sectionIdentification ? `${sectionIdentification.section.title}` : '', actionUserRole: i.params.actionUserRole - ? `(${this.stores.authentication.getRoleDescription(i.params.actionUserRole)})` + ? `(${this.ctx.user.getRoleDescription(i.params.actionUserRole)})` : '' }, link diff --git a/src/modules/shared/services/users.service.ts b/src/modules/shared/services/users.service.ts index 85978b5a1..1ab87c5bc 100644 --- a/src/modules/shared/services/users.service.ts +++ b/src/modules/shared/services/users.service.ts @@ -7,8 +7,8 @@ import { UserRoleEnum } from '@app/base/enums'; import { UrlModel } from '@app/base/models'; import { APIQueryParamsType } from '@app/base/types'; -import { MFAInfoDTO } from '@modules/stores/authentication/authentication.service'; import { GetUsersRequestDTO, UsersListDTO } from '../dtos/users.dto'; +import { MFAInfo } from '@modules/stores/ctx/user/user.service'; export type UserListFiltersType = { onlyActive: boolean; @@ -55,7 +55,7 @@ export class UsersService extends CoreService { lockedAt: item.lockedAt, role: item.roles[0].role, roleId: item.roles[0].id, - roleDescription: this.stores.authentication.getRoleDescription(item.roles[0].role), + roleDescription: this.ctx.user.getRoleDescription(item.roles[0].role), email: item.email ?? '', organisationUnitUserId: item.organisationUnitUserId ?? '' })) @@ -64,18 +64,18 @@ export class UsersService extends CoreService { } // these are only used by the admin module but are used by admin module but are used in a share component - getUserMFAInfo(userId: string): () => Observable { + getUserMFAInfo(userId: string): () => Observable { return () => { const url = new UrlModel(this.API_ADMIN_URL).addPath(`v1/${userId}/mfa`); - return this.http.get(url.buildUrl()).pipe( + return this.http.get(url.buildUrl()).pipe( take(1), map(response => response) ); }; } - updateUserMFAInfo(userId: string): (body: MFAInfoDTO) => Observable { - return (body: MFAInfoDTO) => { + updateUserMFAInfo(userId: string): (body: MFAInfo) => Observable { + return (body: MFAInfo) => { const url = new UrlModel(this.API_ADMIN_URL).addPath(`v1/${userId}/mfa`); return this.http.put(url.buildUrl(), body).pipe(take(1)); }; diff --git a/src/modules/stores/authentication/authentication.enums.ts b/src/modules/stores/authentication/authentication.enums.ts deleted file mode 100644 index c6c4ed81d..000000000 --- a/src/modules/stores/authentication/authentication.enums.ts +++ /dev/null @@ -1,21 +0,0 @@ -export enum UserRoleEnum { - ADMIN = 'ADMIN', - INNOVATOR = 'INNOVATOR', - ACCESSOR = 'ACCESSOR', - ASSESSMENT = 'ASSESSMENT', - QUALIFYING_ACCESSOR = 'QUALIFYING_ACCESSOR' -} - -export enum InnovatorOrganisationRoleEnum { - INNOVATOR_OWNER = 'INNOVATOR_OWNER' -} - -export enum AccessorOrganisationRoleEnum { - ACCESSOR = 'ACCESSOR', - QUALIFYING_ACCESSOR = 'QUALIFYING_ACCESSOR' -} - -export enum TermsOfUseTypeEnum { - INNOVATOR = 'INNOVATOR', - SUPPORT_ORGANISATION = 'SUPPORT_ORGANISATION' -} diff --git a/src/modules/stores/authentication/authentication.models.ts b/src/modules/stores/authentication/authentication.models.ts deleted file mode 100644 index 6e496fafd..000000000 --- a/src/modules/stores/authentication/authentication.models.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { DateISOType } from '@modules/core/interfaces/base.interfaces'; -import { UserRoleType } from '@modules/shared/dtos/roles.dto'; - -import { AccessorOrganisationRoleEnum, InnovatorOrganisationRoleEnum, UserRoleEnum } from './authentication.enums'; -import { PhoneUserPreferenceEnum } from './authentication.service'; - -export class AuthenticationModel { - isSignIn = false; - - userContext?: { - id: string; - roleId: string; - type: UserRoleEnum; - organisation?: { id: string; name: string; acronym: null | string }; - organisationUnit?: { id: string; name: string; acronym: string }; - }; - - user?: { - id: string; - email: string; - displayName: string; - roles: UserRoleType[]; - contactByPhone: boolean; - contactByEmail: boolean; - contactByPhoneTimeframe: PhoneUserPreferenceEnum | null; - phone: string | null; - contactDetails: string | null; - termsOfUseAccepted: boolean; - hasInnovationTransfers: boolean; - hasInnovationCollaborations: boolean; - hasLoginAnnouncements: Record; - passwordResetAt: null | DateISOType; - passwordChangeSinceLastSignIn?: boolean; - firstTimeSignInAt: null | DateISOType; - organisations: { - id: string; - name: string; - acronym: string; - role: InnovatorOrganisationRoleEnum | AccessorOrganisationRoleEnum; - isShadow: boolean; - size: null | string; - registrationNumber: null | string; - description: null | string; - organisationUnits: { id: string; name: string; acronym: string }[]; - }[]; - }; -} diff --git a/src/modules/stores/authentication/authentication.service.spec.ts b/src/modules/stores/authentication/authentication.service.spec.ts deleted file mode 100644 index ad306d0df..000000000 --- a/src/modules/stores/authentication/authentication.service.spec.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; - -import { ENV } from '@tests/app.mocks'; - -import { CoreModule, EnvironmentVariablesStore } from '@modules/core'; -import { AuthenticationService } from './authentication.service'; -import { StoresModule } from '../stores.module'; - -describe('Stores/AuthenticationStore/AuthenticationService', () => { - let httpMock: HttpTestingController; - let envVaraiblesStore: EnvironmentVariablesStore; - let service: AuthenticationService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, CoreModule, StoresModule], - providers: [AuthenticationService, { provide: 'APP_SERVER_ENVIRONMENT_VARIABLES', useValue: ENV }] - }); - - httpMock = TestBed.inject(HttpTestingController); - envVaraiblesStore = TestBed.inject(EnvironmentVariablesStore); - service = TestBed.inject(AuthenticationService); - }); - - afterEach(() => { - httpMock.verify(); - }); - - it('should run verifyUserSession() and return success', () => { - const responseMock = true; - const expected = true; - let response: any = null; - - service - .verifyUserSession() - .subscribe({ next: success => (response = success), error: error => (response = error) }); - - const httpRequest = httpMock.expectOne(`${envVaraiblesStore.APP_URL}/session`); - httpRequest.flush(responseMock); - - expect(httpRequest.request.method).toBe('HEAD'); - expect(response).toBe(expected); - }); - - // it('should run verifyUserSession() and return error', () => { - - // const responseMock = ''; - // let response: any = {}; - - // service.verifyUserSession().subscribe({ next: success => response = success, error: error => response = error}); - - // const httpRequest = httpMock.expectOne(`${envVaraiblesStore.APP_URL}/session`); - // httpRequest.flush(responseMock, { status: 400, statusText: 'Bad Request' }); - - // expect(httpRequest.request.method).toBe('HEAD'); - // expect(response.status).toBe(400); - - // }); - - // it('should run getUserInfo() method and return success', () => { - - // const responseMock = { id: 'id', displayName: 'John Doe', type: 'INNOVATOR', roles: [], organisations: [] }; - // const expected = { id: 'id', displayName: 'John Doe', type: 'INNOVATOR', roles: [], organisations: [] }; - // let response: any = null; - - // service.getUserInfo().subscribe({ next: success => response = success, error: error => response = error}); - - // const httpRequest = httpMock.expectOne(`${envVaraiblesStore.API_URL}/me`); - // httpRequest.flush(responseMock); - - // expect(httpRequest.request.method).toBe('GET'); - // expect(response).toEqual(expected); - - // }); -}); diff --git a/src/modules/stores/authentication/authentication.store.spec.ts b/src/modules/stores/authentication/authentication.store.spec.ts deleted file mode 100644 index a42379fc7..000000000 --- a/src/modules/stores/authentication/authentication.store.spec.ts +++ /dev/null @@ -1,206 +0,0 @@ -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { TestBed } from '@angular/core/testing'; - -import { of } from 'rxjs'; - -import { CoreModule } from '@modules/core'; - -import { AuthenticationModel } from './authentication.models'; -import { AuthenticationService } from './authentication.service'; -import { AuthenticationStore } from './authentication.store'; - -describe('Stores/AuthenticationStore/AuthenticationStore', () => { - let authenticationStore: AuthenticationStore; - let authenticationService: AuthenticationService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, CoreModule], - providers: [AuthenticationStore, AuthenticationService] - }); - - authenticationStore = TestBed.inject(AuthenticationStore); - authenticationService = TestBed.inject(AuthenticationService); - }); - - it('should run initializeAuthentication$() and return success', () => { - authenticationService.verifyUserSession = () => of(true); - authenticationService.getUserInfo = () => - of({ - id: 'id', - email: 'john.doe@mail.com', - displayName: 'John Doe', - roles: [], - contactByEmail: false, - contactByPhone: false, - contactByPhoneTimeframe: null, - contactDetails: null, - phone: null, - termsOfUseAccepted: false, - hasInnovationTransfers: false, - hasInnovationCollaborations: false, - hasLoginAnnouncements: {}, - passwordResetAt: null, - firstTimeSignInAt: null, - organisations: [] - }); - - const expectedResponse = true; - const expectedState: AuthenticationModel = { - isSignIn: true, - user: { - id: 'id', - email: 'john.doe@mail.com', - displayName: 'John Doe', - roles: [], - contactByEmail: false, - contactByPhone: false, - contactByPhoneTimeframe: null, - contactDetails: null, - phone: null, - termsOfUseAccepted: false, - hasInnovationTransfers: false, - hasInnovationCollaborations: false, - hasLoginAnnouncements: {}, - passwordResetAt: null, - firstTimeSignInAt: null, - organisations: [] - }, - userContext: undefined - }; - let response: any = null; - - authenticationStore - .initializeAuthentication$() - .subscribe({ next: success => (response = success), error: error => (response = error) }); - - expect(response).toBe(expectedResponse); - expect(authenticationStore.state.isSignIn).toEqual(expectedState.isSignIn); - expect(authenticationStore.state.user).toEqual(expectedState.user); - }); - - // it('should run initializeAuthentication$() and return success not being first time signin', () => { - - // authenticationService.verifyUserSession = () => of(true); - // authenticationService.getUserInfo = () => of({ id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] }); - // authenticationService.userTermsOfUseInfo = () => of(null); - - // const expectedResponse = true; - // const expectedState: AuthenticationModel = { - // isSignIn: true, - // user: { id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] } - // }; - // let response: any = null; - - // authenticationStore.initializeAuthentication$().subscribe({ next: success => response = success, error: error => response = error }); - - // expect(response).toBe(expectedResponse); - // expect(authenticationStore.state.isSignIn).toEqual(expectedState.isSignIn); - // expect(authenticationStore.state.user).toEqual(expectedState.user); - // expect(authenticationStore.state.isTermsOfUseAccepted).toEqual(expectedState.isTermsOfUseAccepted); - // }); - - // it('should run initializeAuthentication$() and return error', () => { - - // authenticationService.verifyUserSession = () => of(false); - - // const expectedResponse = null; - // const expectedState: AuthenticationModel = { - // isSignIn: false - // }; - // let response: any = null; - - // authenticationStore.initializeAuthentication$().subscribe({ next: success => response = success, error: error => response = error }); - - // expect(response).toBe(expectedResponse); - // expect(authenticationStore.state.isSignIn).toEqual(expectedState.isSignIn); - - // }); - - // it('should run isInnovatorType() and return true', () => { - // authenticationStore.state.user = { id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] }; - // expect(authenticationStore.isInnovatorType()).toBe(true); - // }); - - // it('should run isAccessorType() and return true', () => { - // authenticationStore.state.user = { id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.ACCESSOR, roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] }; - // expect(authenticationStore.isAccessorType()).toBe(true); - // }); - - // it('should run isInnovatorType() + isAccessorType() and return false', () => { - // expect(authenticationStore.isInnovatorType()).toBe(false); - // expect(authenticationStore.isAccessorType()).toBe(false); - // }); - - // it('should run isAccessorRole() and return true', () => { - // authenticationStore.state.user = { - // id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.ACCESSOR, roles: [], - // phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, - // organisations: [{ id: 'id01', name: 'Organisation Name', size: '1 to 5 employees', role: AccessorOrganisationRoleEnum.ACCESSOR, isShadow: false, organisationUnits: [] }] - // }; - // expect(authenticationStore.isAccessorRole()).toBe(true); - // }); - - // it('should run isAccessorRole() and return false', () => { - // // authenticationStore.state.user = { id: 'id', displayName: 'John Doe', type: UserRoleEnum.ACCESSOR, organisations: [{ id: 'id01', name: 'Organisation Name', role: AccessorOrganisationRoleEnum.QUALIFYING_ACCESSOR }] }; - // expect(authenticationStore.isQualifyingAccessorRole()).toBe(false); - // }); - - // it('should run isQualifyingAccessorRole() and return true', () => { - // authenticationStore.state.user = { - // id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.ACCESSOR, roles: [], - // phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, - // organisations: [{ id: 'id01', name: 'Organisation Name', size: '1 to 5 employees', role: AccessorOrganisationRoleEnum.QUALIFYING_ACCESSOR, isShadow: false, organisationUnits: [] }] - // }; - // expect(authenticationStore.isQualifyingAccessorRole()).toBe(true); - // }); - - // it('should run isQualifyingAccessorRole() and return false', () => { - // // authenticationStore.state.user = { id: 'id', displayName: 'John Doe', type: UserRoleEnum.ACCESSOR, organisations: [{ id: 'id01', name: 'Organisation Name', role: AccessorOrganisationRoleEnum.QUALIFYING_ACCESSOR }], innovations: [] }; - // expect(authenticationStore.isQualifyingAccessorRole()).toBe(false); - // }); - - // it('should run getUserId() and return true', () => { - // authenticationStore.state.user = { id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] }; - // expect(authenticationStore.getUserId()).toBe('010101'); - // }); - - // it('should run getUserId() and return false', () => { - // // authenticationStore.state.user = { id: '010101', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, organisations: [], innovations: [] } - // expect(authenticationStore.getUserId()).toBe(''); - // }); - - // it('should run getUserType() and return true', () => { - // authenticationStore.state.user = { id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] }; - // expect(authenticationStore.getUserType()).toBe('INNOVATOR'); - // }); - - // it('should run getUserType() and return false', () => { - // // authenticationStore.state.user = { id: '010101', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, organisations: [], innovations: [] } - // expect(authenticationStore.getUserType()).toBe(''); - // }); - - // it('should run getAccessorOrganisationUnitName() and return empty name', () => { - // const expected = ''; - // expect(authenticationStore.getAccessorOrganisationUnitName()).toEqual(expected); - // }); - - // it('should run getAccessorOrganisationUnitName() and return a valid name', () => { - // authenticationStore.state.user = { - // id: '010101', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, roles: [], - // organisations: [{ id: 'Org01', name: 'Org name 01', size: '1 to 5 employees', role: InnovatorOrganisationRoleEnum.INNOVATOR_OWNER, isShadow: false, organisationUnits: [{ id: 'OrgUnit01', name: 'Org. Unit 01', acronym: 'ack' }] }], - // passwordResetAt: '', phone: '' - // }; - // expect(authenticationStore.getAccessorOrganisationUnitName()).toEqual('Org. Unit 01'); - // }); - - // it('should run getUserInfo() and return empty user', () => { - // const expected = { id: '', email: '', displayName: '', type: '', roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] }; - // expect(authenticationStore.getUserInfo()).toEqual(expected); - // }); - - // it('should run getUserInfo() and return a valid user', () => { - // const expected = authenticationStore.state.user = { id: 'id', email: 'john.doe@mail.com', displayName: 'John Doe', type: UserRoleEnum.INNOVATOR, roles: [], phone: null, termsOfUseAccepted: false, hasInnovationTransfers: false, passwordResetAt: null, firstTimeSignInAt: null, organisations: [] }; - // expect(authenticationStore.getUserInfo()).toEqual(expected); - // }); -}); diff --git a/src/modules/stores/authentication/authentication.store.ts b/src/modules/stores/authentication/authentication.store.ts deleted file mode 100644 index 95feda6cc..000000000 --- a/src/modules/stores/authentication/authentication.store.ts +++ /dev/null @@ -1,235 +0,0 @@ -import { isPlatformBrowser } from '@angular/common'; -import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; -import { catchError, map, tap } from 'rxjs/operators'; - -import { LocalStorageHelper } from '@modules/core/helpers/local-storage.helper'; -import { EnvironmentVariablesStore } from '@modules/core/stores/environment-variables.store'; - -import { Store } from '../store.class'; - -import { UserRoleEnum } from './authentication.enums'; -import { AuthenticationModel } from './authentication.models'; -import { AuthenticationService, MFAInfoDTO, UpdateUserInfoDTO } from './authentication.service'; - -@Injectable() -export class AuthenticationStore extends Store { - constructor( - @Inject(PLATFORM_ID) private platformId: object, - private envVariablesStore: EnvironmentVariablesStore, - private authenticationService: AuthenticationService - ) { - super('store::authentication', new AuthenticationModel()); - } - - initializeAuthentication$(): Observable { - return this.authenticationService.getUserInfo().pipe( - tap(user => { - this.state.user = user; - this.state.isSignIn = true; - - if (user.roles.length === 1) { - this.setUserContext({ - id: user.id, - roleId: user.roles[0].id, - type: user.roles[0].role, - ...(user.roles[0].organisation && { organisation: user.roles[0].organisation }), - ...(user.roles[0].organisationUnit && { organisationUnit: user.roles[0].organisationUnit }) - }); - } else { - this.setUserContextFromStorage(); - } - }), - tap(() => this.setState(this.state)), - map(() => true), - catchError(error => { - this.setState(this.state); - return throwError(() => error); - }) - ); - } - - signOut() { - LocalStorageHelper.removeItem('userContext'); - sessionStorage.clear(); - window.location.replace(`${this.envVariablesStore.APP_URL}/signout`); // Full reload to hit SSR. - } - - isSignIn(): boolean { - return this.state.isSignIn; - } - isTermsOfUseAccepted(): boolean { - return this.state.user?.termsOfUseAccepted ?? false; - } - isFirstTimeSignInDone(): boolean { - return !!this.state.user?.firstTimeSignInAt; - } - hasInnovationTransfers(): boolean { - return this.state.user?.hasInnovationTransfers ?? false; - } - hasInnovationCollaborations(): boolean { - return this.state.user?.hasInnovationCollaborations ?? false; - } - hasAnnouncements(): boolean { - const role = this.state.userContext?.type; - const hasLoginAnnouncements = this.state.user?.hasLoginAnnouncements; - if (role && hasLoginAnnouncements) { - return hasLoginAnnouncements[role] ?? false; - } - return false; - } - - isAccessorType(): boolean { - return [UserRoleEnum.ACCESSOR, UserRoleEnum.QUALIFYING_ACCESSOR].includes( - this.state.userContext?.type as UserRoleEnum - ); - } - - isInnovatorType(): boolean { - return this.state.userContext?.type === UserRoleEnum.INNOVATOR; - } - isAssessmentType(): boolean { - return this.state.userContext?.type === UserRoleEnum.ASSESSMENT; - } - isAccessorRole(): boolean { - return this.state.userContext?.type === UserRoleEnum.ACCESSOR; - } - isQualifyingAccessorRole(): boolean { - return this.state.userContext?.type === UserRoleEnum.QUALIFYING_ACCESSOR; - } - isAdminRole(): boolean { - return this.state.userContext?.type === UserRoleEnum.ADMIN; - } - // remove and or change logic to use the other roles - // isServiceTeamRole(): boolean { return this.state.userContext?.type.includes(UserRoleEnum.SERVICE_TEAM) || false; } - - isFromOrganisationUnit(orgUnitId?: string): boolean { - return orgUnitId !== undefined && this.state.userContext?.organisationUnit?.id === orgUnitId; - } - - hasMultipleRoles(): boolean { - return (this.state.user && this.state.user?.roles.length > 1) ?? false; - } - - getUserId(): string { - return this.state.user?.id || ''; - } - getUserType(): UserRoleEnum | undefined { - return this.state.userContext?.type; - } - - getUserRole() { - switch (this.state.userContext?.type) { - case UserRoleEnum.ADMIN: - return 'Administrator'; - case UserRoleEnum.ASSESSMENT: - return 'Needs Assessor'; - case UserRoleEnum.INNOVATOR: - return 'Innovator'; - case UserRoleEnum.ACCESSOR: - case UserRoleEnum.QUALIFYING_ACCESSOR: - return this.getRoleDescription(this.state.userContext?.type); - default: - return ''; - } - } - - getAccessorOrganisationUnitName(): string { - return this.state.userContext?.organisationUnit?.name || ''; - } - - getUserInfo(): Required['user'] { - return ( - this.state.user || { - id: '', - email: '', - displayName: '', - roles: [], - contactByEmail: false, - contactByPhone: false, - contactByPhoneTimeframe: null, - phone: null, - contactDetails: null, - termsOfUseAccepted: false, - hasInnovationTransfers: false, - hasInnovationCollaborations: false, - hasLoginAnnouncements: {}, - passwordResetAt: null, - firstTimeSignInAt: null, - organisations: [] - } - ); - } - - userPasswordSuccessfullyUpdated() { - if (this.state.user) { - this.state.user.passwordChangeSinceLastSignIn = true; - } - } - - updateUserInfo$(body: UpdateUserInfoDTO): Observable<{ id: string }> { - return this.authenticationService.updateUserInfo(body); - } - - updateMfaInfo$(body: MFAInfoDTO): Observable { - return this.authenticationService.updateUserMFAInfo(body); - } - - getUserContextInfo(): AuthenticationModel['userContext'] { - return this.state.userContext; - } - - setUserContextFromStorage(): void { - const currentRole = LocalStorageHelper.getObjectItem('userContext'); - - if (currentRole && this.state.user?.roles.find(i => i.id === currentRole.roleId)) { - this.setUserContext(currentRole); - } else { - this.state.userContext = undefined; - } - } - - setUserContext(userContext: Required['userContext']): void { - if (isPlatformBrowser(this.platformId)) { - LocalStorageHelper.setObjectItem('userContext', userContext); - } - - this.state.userContext = userContext; - } - - getRoleDescription(role: string, plural = false): string { - switch (role) { - case 'ADMIN': - return !plural ? 'Administrator' : 'Administrators'; - // Think this one is not used - case 'INNOVATOR_OWNER': - return !plural ? 'Owner' : 'Owners'; - case 'ASSESSMENT': - return !plural ? 'Needs assessor' : 'Needs assessors'; - case 'INNOVATOR': - return !plural ? 'Innovator' : 'Innovators'; - case 'ACCESSOR': - return !plural ? 'Accessor' : 'Accessors'; - case 'QUALIFYING_ACCESSOR': - return !plural ? 'Qualifying accessor' : 'Qualifying accessors'; - default: - return ''; - } - } - - userUrlBasePath(): string { - switch (this.getUserType()) { - case UserRoleEnum.ADMIN: - return 'admin'; - case UserRoleEnum.ASSESSMENT: - return 'assessment'; - case UserRoleEnum.QUALIFYING_ACCESSOR: - case UserRoleEnum.ACCESSOR: - return 'accessor'; - case UserRoleEnum.INNOVATOR: - return 'innovator'; - default: - return ''; - } - } -} diff --git a/src/modules/stores/ctx/ctx.store.ts b/src/modules/stores/ctx/ctx.store.ts index 9161f7a09..eeb7b01c2 100644 --- a/src/modules/stores/ctx/ctx.store.ts +++ b/src/modules/stores/ctx/ctx.store.ts @@ -5,9 +5,11 @@ import { AssessmentContextStore } from './assessment/assessment-context.store'; import { SchemaContextStore } from './schema/schema.store'; import { LayoutContextStore } from './layout/layout.store'; import { NotificationsContextStore } from './notifications/notifications.store'; +import { UserContextStore } from './user/user.store'; @Injectable() export class CtxStore { + readonly user: UserContextStore; readonly innovation: InnovationContextStore; readonly assessment: AssessmentContextStore; readonly schema: SchemaContextStore; @@ -15,6 +17,7 @@ export class CtxStore { readonly notifications: NotificationsContextStore; constructor() { + this.user = inject(UserContextStore); this.innovation = inject(InnovationContextStore); this.assessment = inject(AssessmentContextStore); this.schema = inject(SchemaContextStore); diff --git a/src/modules/stores/ctx/innovation/innovation-context.service.ts b/src/modules/stores/ctx/innovation/innovation-context.service.ts index 7b47a7f87..64b3dd231 100644 --- a/src/modules/stores/ctx/innovation/innovation-context.service.ts +++ b/src/modules/stores/ctx/innovation/innovation-context.service.ts @@ -9,7 +9,6 @@ import { EnvironmentVariablesStore } from '@modules/core/stores/environment-vari import { UserRoleEnum } from '@app/base/enums'; import { MappedObjectType } from '@app/base/types'; import { InnovationInfoDTO } from '@modules/shared/services/innovations.dtos'; -import { AuthenticationModel } from '../../authentication/authentication.models'; import { ContextInnovationType } from './innovation-context.types'; import { InnovationGroupedStatusEnum, InnovationStatusEnum, InnovationSupportStatusEnum } from './innovation.enums'; import { @@ -20,6 +19,7 @@ import { InnovationUnitSuggestionsType, OrganisationSuggestionModel } from './innovation.models'; +import { UserContextType } from '../user/user.types'; @Injectable() export class InnovationContextService { @@ -33,7 +33,7 @@ export class InnovationContextService { // TODO: Think about having an endpoint on BE that contains this logic. getContextInfo( innovationId: string, - userContext: AuthenticationModel['userContext'] + userContext: UserContextType['domainContext'] ): Observable { const qp: { fields: ('assessment' | 'supports')[] } = { fields: [] }; diff --git a/src/modules/stores/ctx/innovation/innovation-context.store.ts b/src/modules/stores/ctx/innovation/innovation-context.store.ts index ba6d4be4c..168d9ba84 100644 --- a/src/modules/stores/ctx/innovation/innovation-context.store.ts +++ b/src/modules/stores/ctx/innovation/innovation-context.store.ts @@ -16,7 +16,6 @@ import { } from 'rxjs'; import { omitBy, cloneDeep, isUndefined } from 'lodash'; -import { AuthenticationModel } from '../../authentication/authentication.models'; import { InnovationContextService } from './innovation-context.service'; import { InnovationSectionStatusEnum, InnovationStatusEnum } from './innovation.enums'; import { ContextInnovationType, EMPTY_CONTEXT } from './innovation-context.types'; @@ -33,6 +32,7 @@ import { INNOVATION_SECTIONS_EVIDENCES_WIZARD } from '../../innovation/innovatio import { toObservable } from '@angular/core/rxjs-interop'; import { SchemaContextStore } from '../schema/schema.store'; import { HttpErrorResponse } from '@angular/common/http'; +import { UserContextType } from '../user/user.types'; @Injectable() export class InnovationContextStore { @@ -54,7 +54,7 @@ export class InnovationContextStore { hasError$ = toObservable(this.hasError); // Actions - fetch$ = new Subject<{ innovationId: string; userContext: AuthenticationModel['userContext'] }>(); + fetch$ = new Subject<{ innovationId: string; userContext: UserContextType['domainContext'] }>(); constructor( private innovationService: InnovationContextService, @@ -96,7 +96,7 @@ export class InnovationContextStore { getOrLoadInnovation$( innovationId: string, - context: AuthenticationModel['userContext'] + context: UserContextType['domainContext'] ): Observable { const innovation = this.state().innovation; if (innovation && innovation.id === innovationId && Date.now() < innovation.expiryAt) { diff --git a/src/modules/stores/authentication/authentication.service.ts b/src/modules/stores/ctx/user/user.service.ts similarity index 54% rename from src/modules/stores/authentication/authentication.service.ts rename to src/modules/stores/ctx/user/user.service.ts index caa59ed28..1fd22a481 100644 --- a/src/modules/stores/authentication/authentication.service.ts +++ b/src/modules/stores/ctx/user/user.service.ts @@ -1,48 +1,16 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable, of, throwError } from 'rxjs'; -import { catchError, concatMap, map, take } from 'rxjs/operators'; +import { Observable, catchError, take, map, concatMap, throwError } from 'rxjs'; -import { DateISOType } from '@modules/core/interfaces/base.interfaces'; -import { UrlModel } from '@modules/core/models/url.model'; -import { EnvironmentVariablesStore } from '@modules/core/stores/environment-variables.store'; +import { EnvironmentVariablesStore } from '@modules/core'; +import { UrlModel } from '@app/base/models'; +import { PhoneUserPreferenceEnum, UserInfo } from './user.types'; import { HowDidYouFindUsAnswersType } from '@modules/feature-modules/innovator/pages/first-time-signin/first-time-signin.config'; -import { UserRoleType } from '@modules/shared/dtos/roles.dto'; -import { AccessorOrganisationRoleEnum, InnovatorOrganisationRoleEnum } from './authentication.enums'; -type GetUserInfoDTO = { - id: string; - email: string; - displayName: string; - roles: UserRoleType[]; - contactByPhone: boolean; - contactByEmail: boolean; - contactByPhoneTimeframe: PhoneUserPreferenceEnum | null; - phone: string | null; - contactDetails: string | null; - termsOfUseAccepted: boolean; - hasInnovationTransfers: boolean; - hasInnovationCollaborations: boolean; - hasLoginAnnouncements: Record; - passwordResetAt: null | DateISOType; - firstTimeSignInAt: null | DateISOType; - organisations: { - id: string; - name: string; - role: InnovatorOrganisationRoleEnum | AccessorOrganisationRoleEnum; - acronym: string; - isShadow: boolean; - size: null | string; - registrationNumber: null | string; - description: null | string; - organisationUnits: { id: string; name: string; acronym: string }[]; - }[]; -}; - -export type MFAInfoDTO = { type: 'none' } | { type: 'email' } | { type: 'phone'; phoneNumber: string | undefined }; +export type MFAInfo = { type: 'none' } | { type: 'email' } | { type: 'phone'; phoneNumber: string | undefined }; -export type UpdateUserInfoDTO = { +export type UpdateUserInfo = { displayName: string; contactByPhone?: boolean; contactByEmail?: boolean; @@ -60,27 +28,8 @@ export type UpdateUserInfoDTO = { howDidYouFindUsAnswers?: null | HowDidYouFindUsAnswersType; }; -export type GetTermsOfUseLastVersionInfoDTO = { - id: string; - name: string; - summary: string; - releasedAt?: string; - isAccepted: boolean; -}; - -export enum ContactUserPreferenceEnum { - PHONE = 'PHONE', - EMAIL = 'EMAIL' -} - -export enum PhoneUserPreferenceEnum { - MORNING = 'MORNING', - AFTERNOON = 'AFTERNOON', - DAILY = 'DAILY' -} - @Injectable() -export class AuthenticationService { +export class UserContextService { private APP_URL = this.envVariablesStore.APP_URL; private API_USERS_URL = this.envVariablesStore.API_USERS_URL; @@ -97,27 +46,17 @@ export class AuthenticationService { ); } - getUserMFAInfo(): Observable { - const url = new UrlModel(this.API_USERS_URL).addPath('v1/me/mfa'); - return this.http.get(url.buildUrl()).pipe( - take(1), - map(response => response) - ); - } - - getUserInfo(forceRefresh?: boolean): Observable { + getUserInfo(forceRefresh?: boolean): Observable { const qp = forceRefresh ? { forceRefresh: true } : {}; const url = new UrlModel(this.API_USERS_URL).addPath(`v1/me`).setQueryParams(qp); - return this.http.get(url.buildUrl()).pipe( + return this.http.get(url.buildUrl()).pipe( take(1), // if for some reason the user is authenticated but v1/me returns 404 and user not found we need to create the user // this can happen if user cancels b2c after sign up and then tries to sign in after catchError(e => { if (e.status === 404 && e.error.error === 'U.0003') { const url = new UrlModel(this.API_USERS_URL).addPath('v1/me'); - return this.http - .post(url.buildUrl(), {}) - .pipe(concatMap(() => this.http.get(url.buildUrl()))); + return this.http.post(url.buildUrl(), {}).pipe(concatMap(() => this.http.get(url.buildUrl()))); } else { return throwError(() => { throw e; @@ -128,7 +67,7 @@ export class AuthenticationService { id: response.id, email: response.email, displayName: ['unknown'].includes(response.displayName) ? '' : response.displayName, - roles: response.roles || [], + roles: response.roles ?? [], contactByPhone: response.contactByPhone, contactByEmail: response.contactByEmail, contactByPhoneTimeframe: response.contactByPhoneTimeframe, @@ -145,7 +84,7 @@ export class AuthenticationService { ); } - updateUserInfo(body: UpdateUserInfoDTO): Observable<{ id: string }> { + updateUserInfo(body: UpdateUserInfo): Observable<{ id: string }> { const url = new UrlModel(this.API_USERS_URL).addPath('v1/me'); return this.http.put<{ id: string }>(url.buildUrl(), body).pipe( take(1), @@ -153,7 +92,12 @@ export class AuthenticationService { ); } - updateUserMFAInfo(body: MFAInfoDTO): Observable { + getUserMFAInfo(): Observable { + const url = new UrlModel(this.API_USERS_URL).addPath('v1/me/mfa'); + return this.http.get(url.buildUrl()).pipe(take(1)); + } + + updateUserMFAInfo(body: MFAInfo): Observable { const url = new UrlModel(this.API_USERS_URL).addPath('v1/me/mfa'); return this.http.put(url.buildUrl(), body).pipe(take(1)); } diff --git a/src/modules/stores/ctx/user/user.store.ts b/src/modules/stores/ctx/user/user.store.ts new file mode 100644 index 000000000..036ca70f9 --- /dev/null +++ b/src/modules/stores/ctx/user/user.store.ts @@ -0,0 +1,224 @@ +import { Inject, Injectable, PLATFORM_ID, computed, signal } from '@angular/core'; +import { toObservable } from '@angular/core/rxjs-interop'; + +import { + Observable, + Subject, + catchError, + combineLatest, + debounceTime, + filter, + of, + switchMap, + take, + tap, + throwError +} from 'rxjs'; +import { DomainUserContext, EMPTY_USER_INFO, UserContextType, UserInfo } from './user.types'; +import { UpdateUserInfo, UserContextService } from './user.service'; +import { LocalStorageHelper } from '@app/base/helpers'; +import { UserRoleEnum } from '@app/base/enums'; +import { isPlatformBrowser } from '@angular/common'; +import { EnvironmentVariablesStore } from '@modules/core'; +import { DeepPartial } from '@app/base/types'; +import { isUndefined, omitBy } from 'lodash'; + +@Injectable() +export class UserContextStore { + // State + private state = signal({ + user: EMPTY_USER_INFO, + domainContext: null, + isStateLoaded: false, + expiresAt: 0 + }); + + // Selectors + getUserInfo = computed(() => this.state().user); + getUserContext = computed(() => this.state().domainContext); + + isTermsOfUseAccepted = computed(() => this.getUserInfo().termsOfUseAccepted); + isFirstTimeSignInDone = computed(() => !!this.getUserInfo().firstTimeSignInAt); + hasInnovationTransfers = computed(() => this.getUserInfo().hasInnovationTransfers); + hasInnovationCollaborations = computed(() => this.getUserInfo().hasInnovationCollaborations); + hasAnnouncements = computed(() => this.mapHasAnnouncements(this.getUserInfo(), this.getUserType())); + + getUserId = computed(() => this.getUserInfo().id); + getUserType = computed(() => this.getUserContext()?.type); // TODO: Change this to be role instead of type. + getUserRoleTranslation = computed(() => this.getRoleDescription(this.getUserType() ?? '')); + getDisplayName = computed(() => this.getUserInfo().displayName); + hasMultipleRoles = computed(() => this.getUserInfo().roles.length > 1); + getAccessorUnitName = computed(() => this.getUserContext()?.organisationUnit?.name); + + isAccessorType = computed(() => + [UserRoleEnum.ACCESSOR, UserRoleEnum.QUALIFYING_ACCESSOR].includes(this.getUserType() as UserRoleEnum) + ); + isInnovator = computed(() => this.getUserType() === UserRoleEnum.INNOVATOR); + isAssessment = computed(() => this.getUserType() === UserRoleEnum.ASSESSMENT); + isAccessor = computed(() => this.getUserType() === UserRoleEnum.ACCESSOR); + isQualifyingAccessor = computed(() => this.getUserType() === UserRoleEnum.QUALIFYING_ACCESSOR); + isAdmin = computed(() => this.getUserType() === UserRoleEnum.ADMIN); + isAccessorOrAssessment = computed(() => this.isAccessorType() || this.isAssessment()); + + userUrlBasePath = computed(() => this.mapUserUrlBasePath(this.getUserType())); + + // // State + isStateLoaded = computed(() => this.state().isStateLoaded); + isStateLoaded$ = toObservable(this.isStateLoaded); + hasError = computed(() => this.state().error); + hasError$ = toObservable(this.hasError); + + // Actions + fetch$ = new Subject(); + + constructor( + @Inject(PLATFORM_ID) private platformId: object, + private envVariablesStore: EnvironmentVariablesStore, + private userCtxService: UserContextService + ) { + // Reducers + this.fetch$ + .pipe( + debounceTime(100), + tap(() => { + this.state.update(state => ({ ...state, isStateLoaded: false, error: undefined })); + }), + switchMap(() => + this.userCtxService.getUserInfo().pipe( + catchError(error => { + this.state.update(state => ({ ...state, error })); + return of(null); + }) + ) + ) + ) + .subscribe(user => { + if (user) { + this.state.update(state => ({ + ...state, + user, + isStateLoaded: true + })); + this.calculateUserContext(user); + } + }); + } + + initializeAuthentication$(): Observable { + this.fetch$.next(); + return combineLatest([this.isStateLoaded$, this.hasError$]).pipe( + filter(() => this.isStateLoaded() || this.hasError() !== undefined), + switchMap(() => { + if (this.hasError()) { + return throwError(() => this.hasError()); + } + return of(true); + }), + take(1) + ); + } + + // TODO: try to make this payload match the UserContextType so we don't need to make a new initializeAuth on call. + updateUserInfo$(body: UpdateUserInfo): Observable<{ id: string }> { + return this.userCtxService.updateUserInfo(body); + } + + verifyUserSession$(): Observable { + return this.userCtxService.verifyUserSession(); + } + + updateInfo(info: DeepPartial): void { + const dataToUpdate = omitBy>(info, isUndefined); + this.state.update(state => ({ ...state, user: { ...state.user, ...dataToUpdate } })); + } + + clear(): void { + this.state.set({ + user: EMPTY_USER_INFO, + domainContext: null, + isStateLoaded: false, + error: undefined, + expiresAt: 0 + }); + } + + signOut(): void { + LocalStorageHelper.removeItem('userContext'); + sessionStorage.clear(); + this.clear(); + window.location.replace(`${this.envVariablesStore.APP_URL}/signout`); // Full reload to hit SSR. + } + + setUserContext(domainContext: UserContextType['domainContext']): void { + if (isPlatformBrowser(this.platformId)) { + if (domainContext) { + LocalStorageHelper.setObjectItem('userContext', domainContext); + } else { + LocalStorageHelper.removeItem('userContext'); + } + } + this.state.update(state => ({ ...state, domainContext })); + } + + getRoleDescription(role: string, plural = false): string { + switch (role) { + case 'ADMIN': + return !plural ? 'Administrator' : 'Administrators'; + case 'ASSESSMENT': + return !plural ? 'Needs assessor' : 'Needs assessors'; + case 'INNOVATOR': + return !plural ? 'Innovator' : 'Innovators'; + case 'ACCESSOR': + return !plural ? 'Accessor' : 'Accessors'; + case 'QUALIFYING_ACCESSOR': + return !plural ? 'Qualifying accessor' : 'Qualifying accessors'; + default: + return ''; + } + } + + private calculateUserContext(user: UserInfo): void { + let context: null | DomainUserContext = null; + if (user.roles.length === 1) { + context = { + id: user.id, + roleId: user.roles[0].id, + type: user.roles[0].role, + ...(user.roles[0].organisation && { organisation: user.roles[0].organisation }), + ...(user.roles[0].organisationUnit && { organisationUnit: user.roles[0].organisationUnit }) + }; + } + + // Check on local storage + const currentRole = LocalStorageHelper.getObjectItem('userContext'); + if (currentRole && user.roles.find(i => i.id === currentRole.roleId)) { + context = currentRole; + } + + this.setUserContext(context); + } + + private mapUserUrlBasePath(userType?: UserRoleEnum): string { + switch (userType) { + case UserRoleEnum.ADMIN: + return 'admin'; + case UserRoleEnum.ASSESSMENT: + return 'assessment'; + case UserRoleEnum.QUALIFYING_ACCESSOR: + case UserRoleEnum.ACCESSOR: + return 'accessor'; + case UserRoleEnum.INNOVATOR: + return 'innovator'; + default: + return ''; + } + } + + private mapHasAnnouncements(userInfo: UserInfo, role?: UserRoleEnum) { + const hasLoginAnnouncements = userInfo.hasLoginAnnouncements; + if (role && hasLoginAnnouncements) { + return hasLoginAnnouncements[role] ?? false; + } + return false; + } +} diff --git a/src/modules/stores/ctx/user/user.types.ts b/src/modules/stores/ctx/user/user.types.ts new file mode 100644 index 000000000..905383f46 --- /dev/null +++ b/src/modules/stores/ctx/user/user.types.ts @@ -0,0 +1,91 @@ +import { DateISOType } from '@app/base/types'; +import { UserRoleType } from '@modules/shared/dtos/roles.dto'; +import { BaseContextType } from '../ctx.types'; + +export type UserContextType = { + user: UserInfo; + domainContext: null | DomainUserContext; +} & BaseContextType; + +export type DomainUserContext = { + id: string; + roleId: string; + type: UserRoleEnum; + organisation?: { id: string; name: string; acronym: null | string }; + organisationUnit?: { id: string; name: string; acronym: string }; +}; + +export type UserInfo = { + id: string; + email: string; + displayName: string; + roles: UserRoleType[]; + contactByPhone: boolean; + contactByEmail: boolean; + contactByPhoneTimeframe: PhoneUserPreferenceEnum | null; + phone: string | null; + contactDetails: string | null; + termsOfUseAccepted: boolean; + hasInnovationTransfers: boolean; + hasInnovationCollaborations: boolean; + hasLoginAnnouncements: Record; + passwordResetAt: null | DateISOType; + passwordChangeSinceLastSignIn?: boolean; + firstTimeSignInAt: null | DateISOType; + organisations: { + id: string; + name: string; + acronym: string; + isShadow: boolean; + size: null | string; + registrationNumber: null | string; + description: null | string; + organisationUnits: { id: string; name: string; acronym: string }[]; + }[]; +}; + +export const EMPTY_USER_INFO: UserInfo = { + id: '', + email: '', + displayName: '', + roles: [], + contactByEmail: false, + contactByPhone: false, + contactByPhoneTimeframe: null, + phone: null, + contactDetails: null, + termsOfUseAccepted: false, + hasInnovationTransfers: false, + hasInnovationCollaborations: false, + hasLoginAnnouncements: {}, + passwordResetAt: null, + firstTimeSignInAt: null, + organisations: [] +}; + +/** + * ENUM + */ +export enum UserRoleEnum { + ADMIN = 'ADMIN', + INNOVATOR = 'INNOVATOR', + ACCESSOR = 'ACCESSOR', + ASSESSMENT = 'ASSESSMENT', + QUALIFYING_ACCESSOR = 'QUALIFYING_ACCESSOR' +} + +export enum ContactUserPreferenceEnum { + PHONE = 'PHONE', + EMAIL = 'EMAIL' +} + +export enum PhoneUserPreferenceEnum { + MORNING = 'MORNING', + AFTERNOON = 'AFTERNOON', + DAILY = 'DAILY' +} + +export enum TermsOfUseTypeEnum { + INNOVATOR = 'INNOVATOR', + SUPPORT_ORGANISATION = 'SUPPORT_ORGANISATION' +} diff --git a/src/modules/stores/index.ts b/src/modules/stores/index.ts index 50463dd17..dd9a5d65b 100644 --- a/src/modules/stores/index.ts +++ b/src/modules/stores/index.ts @@ -1,10 +1,6 @@ // Module. export { StoresModule } from './stores.module'; -// // Authentication Store. -export { AuthenticationStore } from './authentication/authentication.store'; -export { AuthenticationService } from './authentication/authentication.service'; - // Ctx export { CtxStore } from './ctx/ctx.store'; // // Assessment @@ -26,3 +22,7 @@ export { ContextLayoutType } from './ctx/layout/layout.types'; // // Notifications export { NotificationsContextStore } from './ctx/notifications/notifications.store'; export { NotificationsContextService } from './ctx/notifications/notifications.service'; +// // User +export { UserContextStore } from './ctx/user/user.store'; +export { UserContextService } from './ctx/user/user.service'; +export * from './ctx/user/user.types'; diff --git a/src/modules/stores/store.class.spec.ts b/src/modules/stores/store.class.spec.ts deleted file mode 100644 index 4dafca55a..000000000 --- a/src/modules/stores/store.class.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; - -import { Store } from './store.class'; - -describe('Stores/StoreClass', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule] - }); - }); - - it('should return static variables', () => { - const store = new Store('storeId', { storeName: 'Initial value' }); - - store.setStoreId('aNewStoreId'); - store.setState({ storeName: 'A new store name' }); - - let expectedSubscription = { storeName: '' }; - store.state$.subscribe(s => (expectedSubscription = s)); - - expect(store.getStoreId()).toBe('aNewStoreId'); - expect(store.state).toEqual({ storeName: 'A new store name' }); - expect(expectedSubscription).toEqual({ storeName: 'A new store name' }); - }); -}); diff --git a/src/modules/stores/store.class.ts b/src/modules/stores/store.class.ts deleted file mode 100644 index 3e3080d72..000000000 --- a/src/modules/stores/store.class.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Observable, BehaviorSubject } from 'rxjs'; - -export class Store { - private storeId: string; - private stateBS: BehaviorSubject; // Using a behavior subject so we can provide a default value. - private stateO$: Observable; - - get state(): T { - return this.stateBS.getValue(); - } - get state$(): Observable { - return this.stateO$; - } - - constructor(storeId: string, initialState: T) { - this.storeId = storeId; - this.stateBS = new BehaviorSubject(initialState); - this.stateO$ = this.stateBS.asObservable(); - } - - getStoreId(): string { - return this.storeId; - } - setStoreId(s: string): void { - this.storeId = s; - } - - setState(nextState?: T): void { - this.stateBS.next(nextState ?? this.state); - } - - // getStorageState(storeId: string): T { - // const ls = localStorage.getItem(storeId); - // return ls ? JSON.parse(ls) : null; - // } - - // setStateAndSave(nextState: T): void { - // this.stateBS.next(nextState); - // // localStorage.setItem(this.storeId, JSON.stringify(this.state)); - // } -} diff --git a/src/modules/stores/stores.module.ts b/src/modules/stores/stores.module.ts index f794dfd73..21fc2e149 100644 --- a/src/modules/stores/stores.module.ts +++ b/src/modules/stores/stores.module.ts @@ -1,8 +1,5 @@ import { NgModule, Optional, SkipSelf } from '@angular/core'; -import { AuthenticationStore } from './authentication/authentication.store'; -import { AuthenticationService } from './authentication/authentication.service'; - import { InnovationContextStore } from './ctx/innovation/innovation-context.store'; import { InnovationContextService } from './ctx/innovation/innovation-context.service'; import { CtxStore } from './ctx/ctx.store'; @@ -13,12 +10,11 @@ import { SchemaContextService } from './ctx/schema/schema.service'; import { LayoutContextStore } from './ctx/layout/layout.store'; import { NotificationsContextStore } from './ctx/notifications/notifications.store'; import { NotificationsContextService } from './ctx/notifications/notifications.service'; +import { UserContextStore } from './ctx/user/user.store'; +import { UserContextService } from './ctx/user/user.service'; @NgModule({ providers: [ - AuthenticationStore, - AuthenticationService, - CtxStore, InnovationContextStore, @@ -29,7 +25,9 @@ import { NotificationsContextService } from './ctx/notifications/notifications.s SchemaContextService, LayoutContextStore, NotificationsContextStore, - NotificationsContextService + NotificationsContextService, + UserContextStore, + UserContextService ] }) export class StoresModule { diff --git a/src/modules/theme/components/footer/footer.component.html b/src/modules/theme/components/footer/footer.component.html index 5e68d7d54..60152db4b 100644 --- a/src/modules/theme/components/footer/footer.component.html +++ b/src/modules/theme/components/footer/footer.component.html @@ -14,4 +14,4 @@

      Support links

      - + diff --git a/src/modules/theme/components/footer/footer.component.ts b/src/modules/theme/components/footer/footer.component.ts index f4d88aeb6..abd7379f9 100644 --- a/src/modules/theme/components/footer/footer.component.ts +++ b/src/modules/theme/components/footer/footer.component.ts @@ -1,25 +1,19 @@ import { Component } from '@angular/core'; import { URLS } from '@app/base/constants'; - -import { AuthenticationStore } from '@modules/stores/authentication/authentication.store'; +import { CtxStore } from '@modules/stores'; @Component({ selector: 'theme-footer', templateUrl: './footer.component.html' }) export class FooterComponent { - applySignOutTimeout: boolean; - URLS: typeof URLS; - constructor(private authenticationStore: AuthenticationStore) { - // This can be done on the contructor as all sign in/out, refreshes the entire app. - this.applySignOutTimeout = this.authenticationStore.isSignIn(); - + constructor(protected ctx: CtxStore) { this.URLS = URLS; } onTimeout(): void { - this.authenticationStore.signOut(); + this.ctx.user.signOut(); } } diff --git a/src/modules/theme/components/header/header-archived-banner.component.html b/src/modules/theme/components/header/header-archived-banner.component.html index 7a8faf237..c5236fcea 100644 --- a/src/modules/theme/components/header/header-archived-banner.component.html +++ b/src/modules/theme/components/header/header-archived-banner.component.html @@ -1,13 +1,15 @@ -
      +
      This innovation was archived by the innovator on {{ statusUpdatedAt() | date: ("app.date_formats.long_date" | translate) }}. - + You can view an archived version of the innovation record, support summary, tasks, messages and documents. All open tasks have been cancelled. You cannot send or reply to messages. - You can view an archived version of the innovation record, support summary, tasks, messages and documents. All open tasks have been cancelled. + + You can view an archived version of the innovation record, support summary, tasks, messages and documents. All open tasks have been cancelled. +
      diff --git a/src/modules/theme/components/header/header-archived-banner.component.ts b/src/modules/theme/components/header/header-archived-banner.component.ts index 81ccc514b..66cb98d48 100644 --- a/src/modules/theme/components/header/header-archived-banner.component.ts +++ b/src/modules/theme/components/header/header-archived-banner.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, signal } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; -import { AuthenticationStore, CtxStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; import { filter } from 'rxjs'; @Component({ @@ -13,17 +13,12 @@ export class HeaderArchivedBannerComponent implements OnInit { regEx = RegExp(''); isOwner = signal(false); - isAdmin = signal(false); - isInnovator = signal(false); statusUpdatedAt = signal(null); constructor( private router: Router, - private authentication: AuthenticationStore, - private ctx: CtxStore + protected ctx: CtxStore ) { - this.isInnovator.set(this.authentication.isInnovatorType()); - this.isAdmin.set(this.authentication.isAdminRole()); const innovation = this.ctx.innovation.info(); this.statusUpdatedAt.set(innovation.statusUpdatedAt); this.isOwner.set(this.ctx.innovation.isOwner()); diff --git a/src/modules/theme/components/header/header.component.ts b/src/modules/theme/components/header/header.component.ts index 655d008e6..255735f78 100644 --- a/src/modules/theme/components/header/header.component.ts +++ b/src/modules/theme/components/header/header.component.ts @@ -6,8 +6,8 @@ import { filter } from 'rxjs/operators'; import { CookiesService } from '@modules/core/services/cookies.service'; -import { AuthenticationStore } from '@modules/stores/authentication/authentication.store'; import { URLS } from '@app/base/constants'; +import { CtxStore } from '@modules/stores'; export type HeaderMenuBarItemType = { id: string; @@ -55,7 +55,7 @@ export class HeaderComponent implements OnInit, AfterViewInit, OnDestroy { constructor( @Inject(PLATFORM_ID) private platformId: object, private router: Router, - private authenticationStore: AuthenticationStore, + private ctx: CtxStore, private coockiesService: CookiesService ) { this.subscriptions.add( @@ -74,14 +74,15 @@ export class HeaderComponent implements OnInit, AfterViewInit, OnDestroy { isChildrenOpened: false }; - this.authenticationStore.state$.subscribe(state => { - const hasMultipleRoles = (state.user && state.user?.roles.length > 1) ?? false; - const userRole = this.authenticationStore.getUserRole(); - const orgUnitName = state.userContext?.organisationUnit?.name; + // TODO: change this entire component. + this.ctx.user.isStateLoaded$.pipe(filter(isLoaded => isLoaded)).subscribe(() => { + const hasMultipleRoles = this.ctx.user.hasMultipleRoles(); + const userRole = this.ctx.user.getUserRoleTranslation(); + const orgUnitName = this.ctx.user.getUserContext()?.organisationUnit?.name; this.user = { - displayName: state.user?.displayName ?? '', - description: this.authenticationStore.isAccessorType() + displayName: this.ctx.user.getUserInfo().displayName ?? '', + description: this.ctx.user.isAccessorType() ? `Logged in as ${userRole}, ${orgUnitName}` : `Logged in as ${userRole}`, showSwitchProfile: hasMultipleRoles @@ -155,7 +156,7 @@ export class HeaderComponent implements OnInit, AfterViewInit, OnDestroy { } signOut(): void { - this.authenticationStore.signOut(); + this.ctx.user.signOut(); } ngOnDestroy(): void { diff --git a/src/modules/theme/components/innovation-record-export/innovation-record-export.component.ts b/src/modules/theme/components/innovation-record-export/innovation-record-export.component.ts index a99712cba..ad5c0bf28 100644 --- a/src/modules/theme/components/innovation-record-export/innovation-record-export.component.ts +++ b/src/modules/theme/components/innovation-record-export/innovation-record-export.component.ts @@ -23,12 +23,12 @@ export class InnovationRecordExportComponent extends CoreComponent implements On case 'pdf': this.exportDocumentUrl = `${this.CONSTANTS.APP_URL}/exports/${ this.innovationId - }/pdf?role=${this.stores.authentication.getUserContextInfo()?.roleId}`; + }/pdf?role=${this.ctx.user.getUserContext()?.roleId}`; break; case 'csv': this.exportDocumentUrl = `${this.CONSTANTS.APP_URL}/exports/${ this.innovationId - }/csv?role=${this.stores.authentication.getUserContextInfo()?.roleId}`; + }/csv?role=${this.ctx.user.getUserContext()?.roleId}`; break; } } diff --git a/src/modules/theme/components/suggestions-cards/suggestions-cards-component.ts b/src/modules/theme/components/suggestions-cards/suggestions-cards-component.ts index 26b28f150..63d329c4e 100644 --- a/src/modules/theme/components/suggestions-cards/suggestions-cards-component.ts +++ b/src/modules/theme/components/suggestions-cards/suggestions-cards-component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { AuthenticationStore } from '@modules/stores'; +import { CtxStore } from '@modules/stores'; import { InnovationStatusEnum } from '@modules/stores'; import { InnovationUnitSuggestionsType } from '@modules/stores/ctx/innovation/innovation.models'; @@ -12,9 +12,5 @@ export class SuggestionsCardsComponent { @Input({ required: true }) innovationStatus!: InnovationStatusEnum; @Input({ required: true }) suggestions!: InnovationUnitSuggestionsType; - baseUrl: string; - - constructor(authenticationStore: AuthenticationStore) { - this.baseUrl = `${authenticationStore.userUrlBasePath()}`; - } + constructor(protected ctx: CtxStore) {} } diff --git a/src/modules/theme/components/suggestions-cards/suggestions-cards.component.html b/src/modules/theme/components/suggestions-cards/suggestions-cards.component.html index 29a49a1dd..859d7656d 100644 --- a/src/modules/theme/components/suggestions-cards/suggestions-cards.component.html +++ b/src/modules/theme/components/suggestions-cards/suggestions-cards.component.html @@ -10,7 +10,7 @@

      {{ suggestion.suggestorUnit }} has suggested your or
    • -

      Send a reply in messages

      +

      Send a reply in messages

      • diff --git a/src/tests/data.mocks.ts b/src/tests/data.mocks.ts index b461451b8..c7c4c64bc 100644 --- a/src/tests/data.mocks.ts +++ b/src/tests/data.mocks.ts @@ -1,12 +1,6 @@ -import { - AccessorOrganisationRoleEnum, - InnovatorOrganisationRoleEnum, - UserRoleEnum -} from '@modules/stores/authentication/authentication.enums'; -import { AuthenticationModel } from '@modules/stores/authentication/authentication.models'; -import { ContextInnovationType, InnovationStatusEnum } from '@modules/stores'; +import { ContextInnovationType, InnovationStatusEnum, UserContextType, UserRoleEnum } from '@modules/stores'; -export const USER_INFO_ACCESSOR: Required['user'] = { +export const USER_INFO_ACCESSOR: Required['user'] = { id: '_id', email: 'tqa@email.com', displayName: 'Test qualifying Accessor', @@ -31,13 +25,12 @@ export const USER_INFO_ACCESSOR: Required['user'] = { size: '', description: 'Sole trader', registrationNumber: null, - role: AccessorOrganisationRoleEnum.QUALIFYING_ACCESSOR, organisationUnits: [{ id: '_unit_id', name: 'ORG_UNIT', acronym: 'ORG' }] } ] }; -export const USER_INFO_INNOVATOR: Required['user'] = { +export const USER_INFO_INNOVATOR: Required['user'] = { id: '_id', email: 'some@email.com', displayName: 'Test innovator', @@ -62,13 +55,12 @@ export const USER_INFO_INNOVATOR: Required['user'] = { acronym: 'O1', description: null, registrationNumber: null, - role: InnovatorOrganisationRoleEnum.INNOVATOR_OWNER, organisationUnits: [] } ] }; -export const USER_INFO_ADMIN: Required['user'] = { +export const USER_INFO_ADMIN: Required['user'] = { id: '_id', email: 'a@gmail.com', displayName: 'Test admin ',