Skip to content

Commit 742e588

Browse files
fix[frontend](federation/email_conf): removed route guard on email configuration
1 parent 0ce0a54 commit 742e588

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

frontend/src/app/app-routing.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ const routes: Routes = [
169169
{
170170
path: 'email-config',
171171
component: FederationEmailConfigPageComponent,
172-
canActivate: [UserRouteAccessService],
173172
data: {authorities: [ADMIN_ROLE]}
174173
}
175174
]

frontend/src/app/core/auth/account.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ export class AccountService {
187187
}
188188
const redirectTo = (account.authorities.includes(ADMIN_ROLE) && account.email === ADMIN_DEFAULT_EMAIL)
189189
? '/getting-started' : !!path ? path : '/dashboard/overview';
190-
console.log(redirectTo);
191190
this.router.navigate([redirectTo], {queryParams})
192191
.then(() => this.spinner.hide());
193192
} else {

frontend/src/app/shared/components/layout/header/header-menu-navigation/header-menu-navigation.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {stringParamToQueryParams} from '../../../../util/query-params-to-filter.
1111
import {filter, takeUntil, tap} from 'rxjs/operators';
1212
import {OpenAlertsService} from '../../../../../data-management/alert-management/shared/services/open-alerts.service';
1313
import {UtmToastService} from '../../../../alert/utm-toast.service';
14+
import {FederationModeService} from '../../../../../federation/services/federation-mode.service';
1415

1516
@Component({
1617
selector: 'app-header-menu-navigation',
@@ -32,7 +33,8 @@ export class HeaderMenuNavigationComponent implements OnInit, OnDestroy {
3233
private menuBehavior: MenuBehavior,
3334
private openAlertsService: OpenAlertsService,
3435
private menuService: MenuService,
35-
private toast: UtmToastService) {
36+
private toast: UtmToastService,
37+
private federationModeService: FederationModeService) {
3638
}
3739

3840
ngOnInit() {
@@ -72,6 +74,9 @@ export class HeaderMenuNavigationComponent implements OnInit, OnDestroy {
7274
}
7375

7476
loadMenus() {
77+
if (this.federationModeService.isActive) {
78+
return;
79+
}
7580
this.menuService.getMenuStructure(true).subscribe(reponse => {
7681
this.menus = reponse.body;
7782
this.defaultStructureMenu = reponse.body;

0 commit comments

Comments
 (0)