Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-8164: fixed UsersAdmin stuck in infinite loop.

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2024-01-05 13:08:53 +02:00
parent 333700073b
commit 7d72d6c755
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/red-ui/src/app/utils/main.guard.ts
View File

@ -13,6 +13,7 @@ import { NGXLogger } from 'ngx-logger';
import { firstValueFrom } from 'rxjs'; import { firstValueFrom } from 'rxjs';
import { tap } from 'rxjs/operators'; import { tap } from 'rxjs/operators';
import { APP_BASE_HREF } from '@angular/common'; import { APP_BASE_HREF } from '@angular/common';
import { getCurrentUser } from '@users/user.service';
async function redirectToLastDossierTemplate(router: Router, state: RouterStateSnapshot, baseHref: string, lastDossierTemplate: string) { async function redirectToLastDossierTemplate(router: Router, state: RouterStateSnapshot, baseHref: string, lastDossierTemplate: string) {
const lastUrlSegment = window.location.pathname.split('/').filter(Boolean).pop(); const lastUrlSegment = window.location.pathname.split('/').filter(Boolean).pop();
@ -43,6 +44,8 @@ export function mainGuard(): AsyncGuard {
const generalConfig$ = inject(GeneralSettingsService).getGeneralConfigurations(); const generalConfig$ = inject(GeneralSettingsService).getGeneralConfigurations();
const updatedDisplayName$ = generalConfig$.pipe(tap(config => configService.updateDisplayName(config.displayName))); const updatedDisplayName$ = generalConfig$.pipe(tap(config => configService.updateDisplayName(config.displayName)));
const currentUser = getCurrentUser();
const isUsersAdminOnly = currentUser.isUserAdmin && currentUser.roles.length === 1;
await Promise.all([ await Promise.all([
systemPreferencesService.loadPreferencesIfNeeded(), systemPreferencesService.loadPreferencesIfNeeded(),
@ -52,7 +55,7 @@ export function mainGuard(): AsyncGuard {
const lastDossierTemplate = userPreferenceService.getLastDossierTemplate(); const lastDossierTemplate = userPreferenceService.getLastDossierTemplate();
if (lastDossierTemplate) { if (lastDossierTemplate && !isUsersAdminOnly) {
await redirectToLastDossierTemplate(router, state, baseHref, lastDossierTemplate); await redirectToLastDossierTemplate(router, state, baseHref, lastDossierTemplate);
} }

2
libs/common-ui

@ -1 +1 @@
Subproject commit da086cdaa648d1d35a9eb16ee23cb223e1de2316 Subproject commit bd77067dc7a10bad1b21a3e0807f4ea6413da4ad