From 0118c21bb0ca763fb353b604f2ca51f6ab6582a2 Mon Sep 17 00:00:00 2001 From: dominikiwanekhyland <141320833+dominikiwanekhyland@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:32:47 +0200 Subject: [PATCH] [ACS-9510] Tasks and processes are not displayed when About page is refreshed (#4510) * [ACS-9510] Tasks and processes are not displayed when About page is refreshed * [ACS-9510] Tasks and processes are not displayed when About page is refreshed --- .../lib/services/router.extension.service.spec.ts | 15 +++++++++------ .../src/lib/services/router.extension.service.ts | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/projects/aca-shared/src/lib/services/router.extension.service.spec.ts b/projects/aca-shared/src/lib/services/router.extension.service.spec.ts index 56d958e47..cabf8b226 100644 --- a/projects/aca-shared/src/lib/services/router.extension.service.spec.ts +++ b/projects/aca-shared/src/lib/services/router.extension.service.spec.ts @@ -41,6 +41,7 @@ describe('RouterExtensionService', () => { let guard1; let guard2; let guard3; + let guard4; beforeEach(() => { component1 = { name: 'component-1' }; @@ -50,6 +51,7 @@ describe('RouterExtensionService', () => { guard1 = { name: 'guard1' }; guard2 = { name: 'guard2' }; guard3 = { name: 'guard3' }; + guard4 = { name: 'guard4' }; TestBed.configureTestingModule({ imports: [LibTestingModule], @@ -62,6 +64,7 @@ describe('RouterExtensionService', () => { getAuthGuards: (authKeys) => { const authMapping = { 'app.auth': guard1, + 'app.extensions.dataLoaderGuard': guard4, 'ext.auth1': guard2, 'ext.auth2': guard3 }; @@ -135,18 +138,18 @@ describe('RouterExtensionService', () => { expect(service.getApplicationRoutes()[0].component).toBe(component1); }); - it('should calculate the "canActivateChild" and "canActivate" to default auth guard, if no "auth" defined for the route', () => { + it('should calculate the "canActivateChild" and "canActivate" to default guards, if no "auth" defined for the route', () => { extensionService.routes = [getDummyRoute({ auth: undefined })]; - expect(service.getApplicationRoutes()[0].canActivateChild).toEqual([guard1]); - expect(service.getApplicationRoutes()[0].canActivate).toEqual([guard1]); + expect(service.getApplicationRoutes()[0].canActivateChild).toEqual([guard1, guard4]); + expect(service.getApplicationRoutes()[0].canActivate).toEqual([guard1, guard4]); }); - it('should calculate the "canActivateChild" and "canActivate" to default auth guard, if "auth" is defined as [] for the route', () => { + it('should calculate the "canActivateChild" and "canActivate" to default guards, if "auth" is defined as [] for the route', () => { extensionService.routes = [getDummyRoute({ auth: [] })]; - expect(service.getApplicationRoutes()[0].canActivateChild).toEqual([guard1]); - expect(service.getApplicationRoutes()[0].canActivate).toEqual([guard1]); + expect(service.getApplicationRoutes()[0].canActivateChild).toEqual([guard1, guard4]); + expect(service.getApplicationRoutes()[0].canActivate).toEqual([guard1, guard4]); }); it('should calculate the "canActivateChild" and "canActivate" to the registered guard(s) matching the "auth" value of the route', () => { diff --git a/projects/aca-shared/src/lib/services/router.extension.service.ts b/projects/aca-shared/src/lib/services/router.extension.service.ts index 8167ec06a..891a96487 100644 --- a/projects/aca-shared/src/lib/services/router.extension.service.ts +++ b/projects/aca-shared/src/lib/services/router.extension.service.ts @@ -33,7 +33,7 @@ import { Router } from '@angular/router'; export class RouterExtensionService { defaults = { layout: 'app.layout.main', - auth: ['app.auth'] + auth: ['app.auth', 'app.extensions.dataLoaderGuard'] }; constructor(private router: Router, protected extensions: ExtensionService) {}