diff --git a/console/src/app/app-routing.module.ts b/console/src/app/app-routing.module.ts index 13f2e6fe91..9366305aee 100644 --- a/console/src/app/app-routing.module.ts +++ b/console/src/app/app-routing.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { authGuard } from './guards/auth.guard'; -import { homeGuard } from './guards/home.guard'; import { roleGuard } from './guards/role-guard'; import { UserGrantContext } from './modules/user-grants/user-grants-datasource'; import { OrgCreateComponent } from './pages/org-create/org-create.component'; @@ -11,7 +10,7 @@ const routes: Routes = [ { path: '', loadChildren: () => import('./pages/home/home.module'), - canActivate: [authGuard, homeGuard], + canActivate: [authGuard], data: { roles: ['.'], }, diff --git a/console/src/app/guards/home.guard.ts b/console/src/app/guards/home.guard.ts deleted file mode 100644 index 26610341ed..0000000000 --- a/console/src/app/guards/home.guard.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { inject } from '@angular/core'; -import { CanActivateFn, Router } from '@angular/router'; -import { map } from 'rxjs/operators'; - -import { GrpcAuthService } from '../services/grpc-auth.service'; - -export const homeGuard: CanActivateFn = (route) => { - const authService = inject(GrpcAuthService); - const router = inject(Router); - - // Check if user has any roles (using the same logic as roleGuard) - return authService.isAllowed(route.data['roles'], route.data['requiresAll']).pipe( - map((hasRoles) => { - if (!hasRoles) { - // User has no roles, redirect to /users/me - router.navigate(['/users/me']); - return false; - } - return true; - }), - ); -}; diff --git a/console/src/app/modules/new-header/new-header.component.ts b/console/src/app/modules/new-header/new-header.component.ts index 291c783208..f93cd7598f 100644 --- a/console/src/app/modules/new-header/new-header.component.ts +++ b/console/src/app/modules/new-header/new-header.component.ts @@ -108,7 +108,6 @@ export class NewHeaderComponent { private isOnInstanceLevel() { return computed(() => { - console.log(this.breadcrumbs()); return this.breadcrumbs().length === 1 && this.breadcrumbs()[0].type === BreadcrumbType.INSTANCE; }); }