From 60c779308283c081e76be4af9183c8d38c109319 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 30 Jan 2024 14:50:54 +0200 Subject: [PATCH] RED-8354: fixed rerouting for application admins. --- apps/red-ui/src/app/utils/main.guard.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/utils/main.guard.ts b/apps/red-ui/src/app/utils/main.guard.ts index 824ece853..0c8874d5c 100644 --- a/apps/red-ui/src/app/utils/main.guard.ts +++ b/apps/red-ui/src/app/utils/main.guard.ts @@ -23,7 +23,7 @@ async function redirectToLastDossierTemplate(router: Router, state: RouterStateS } export function mainGuard(): AsyncGuard { - return async (route, state) => { + return async (_, state) => { const logger = inject(NGXLogger); logger.info('[ROUTES] Main resolver started...'); @@ -45,7 +45,7 @@ export function mainGuard(): AsyncGuard { const generalConfig$ = inject(GeneralSettingsService).getGeneralConfigurations(); const updatedDisplayName$ = generalConfig$.pipe(tap(config => configService.updateDisplayName(config.displayName))); const currentUser = getCurrentUser(); - const isUsersAdminOnly = currentUser.isUserAdmin && currentUser.roles.length === 1; + const isUsersAdminOnly = currentUser.isUserAdmin && !currentUser.isUser && !currentUser.isManager; await Promise.all([ systemPreferencesService.loadPreferencesIfNeeded(),