From a970ba78ffa98545176b636630e48115efcf51cc Mon Sep 17 00:00:00 2001 From: Justin Baur Date: Wed, 27 Oct 2021 11:44:00 -0400 Subject: [PATCH] Added manual routing --- .../organization-layout.component.html | 4 +- .../layouts/organization-layout.component.ts | 28 ------------ .../manage/manage-router.component.html | 0 .../manage/manage-router.component.ts | 45 +++++++++++++++++++ .../tools/tools-router.component.html | 0 .../tools/tools-router.component.ts | 28 ++++++++++++ src/app/oss-routing.module.ts | 6 ++- 7 files changed, 79 insertions(+), 32 deletions(-) create mode 100644 src/app/organizations/manage/manage-router.component.html create mode 100644 src/app/organizations/manage/manage-router.component.ts create mode 100644 src/app/organizations/tools/tools-router.component.html create mode 100644 src/app/organizations/tools/tools-router.component.ts diff --git a/src/app/layouts/organization-layout.component.html b/src/app/layouts/organization-layout.component.html index 351ab3b3..97d409e3 100644 --- a/src/app/layouts/organization-layout.component.html +++ b/src/app/layouts/organization-layout.component.html @@ -29,13 +29,13 @@
  • - + {{'manage' | i18n}}
  • - + {{'tools' | i18n}} diff --git a/src/app/layouts/organization-layout.component.ts b/src/app/layouts/organization-layout.component.ts index bb7a4880..39ba84f1 100644 --- a/src/app/layouts/organization-layout.component.ts +++ b/src/app/layouts/organization-layout.component.ts @@ -68,32 +68,4 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy { get showToolsTab(): boolean { return this.organization.canAccessImportExport || this.organization.canAccessReports; } - - get toolsRoute(): string { - return this.organization.canAccessImportExport ? - 'tools/import' : - 'tools/exposed-passwords-report'; - } - - get manageRoute(): string { - let route: string; - switch (true) { - case this.organization.canManageUsers: - route = 'manage/people'; - break; - case this.organization.canViewAssignedCollections || this.organization.canViewAllCollections: - route = 'manage/collections'; - break; - case this.organization.canManageGroups: - route = 'manage/groups'; - break; - case this.organization.canManagePolicies: - route = 'manage/policies'; - break; - case this.organization.canAccessEventLogs: - route = 'manage/events'; - break; - } - return route; - } } diff --git a/src/app/organizations/manage/manage-router.component.html b/src/app/organizations/manage/manage-router.component.html new file mode 100644 index 00000000..e69de29b diff --git a/src/app/organizations/manage/manage-router.component.ts b/src/app/organizations/manage/manage-router.component.ts new file mode 100644 index 00000000..e8453358 --- /dev/null +++ b/src/app/organizations/manage/manage-router.component.ts @@ -0,0 +1,45 @@ +import { + Component, + OnInit, +} from '@angular/core'; + +import { ActivatedRoute, Router } from '@angular/router'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +@Component({ + selector: 'app-manage-router', + templateUrl: './manage-router.component.html', +}) +export class ManageRouterComponent implements OnInit { + + constructor(private route: ActivatedRoute, private router: Router, + private userService: UserService) {} + + ngOnInit() { + this.route.params.subscribe(async params => { + console.log('Routing...'); + const org = await this.userService.getOrganization(params.organizationId); + switch (true) { + case org.canManageUsers: + this.routeTo('people'); + break; + case org.canViewAssignedCollections || org.canViewAllCollections: + this.routeTo('collections'); + break; + case org.canManageGroups: + this.routeTo('groups'); + break; + case org.canManagePolicies: + this.routeTo('policies'); + break; + case org.canAccessEventLogs: + this.routeTo('events'); + break; + } + }); + } + + routeTo(page: string) { + this.router.navigate([page], { relativeTo: this.route }); + } +} \ No newline at end of file diff --git a/src/app/organizations/tools/tools-router.component.html b/src/app/organizations/tools/tools-router.component.html new file mode 100644 index 00000000..e69de29b diff --git a/src/app/organizations/tools/tools-router.component.ts b/src/app/organizations/tools/tools-router.component.ts new file mode 100644 index 00000000..788751ad --- /dev/null +++ b/src/app/organizations/tools/tools-router.component.ts @@ -0,0 +1,28 @@ +import { + Component, + OnInit, +} from '@angular/core'; + +import { ActivatedRoute, Router } from '@angular/router'; +import { UserService } from 'jslib-common/abstractions/user.service'; + +@Component({ + selector: 'app-tools-router', + templateUrl: 'tools-router.component.html', +}) +export class ToolsRouterComponent implements OnInit { + constructor(private route: ActivatedRoute, private router: Router, + private userService: UserService) {} + + ngOnInit() { + this.route.params.subscribe(async params => { + console.log('Routing...'); + const org = await this.userService.getOrganization(params.organizationId); + this.routeTo(org.canAccessImportExport ? 'import' : 'exposed-passwords-report'); + }); + } + + routeTo(page: string) { + this.router.navigate([page], { relativeTo: this.route }); + } +} \ No newline at end of file diff --git a/src/app/oss-routing.module.ts b/src/app/oss-routing.module.ts index 303b7b5d..f33511b6 100644 --- a/src/app/oss-routing.module.ts +++ b/src/app/oss-routing.module.ts @@ -24,6 +24,8 @@ import { VerifyEmailTokenComponent } from './accounts/verify-email-token.compone import { VerifyRecoverDeleteComponent } from './accounts/verify-recover-delete.component'; import { CollectionsComponent as OrgManageCollectionsComponent } from './organizations/manage/collections.component'; +import { ManageRouterComponent } from './organizations/manage/manage-router.component'; +import { ToolsRouterComponent } from './organizations/tools/tools-router.component'; import { EventsComponent as OrgEventsComponent } from './organizations/manage/events.component'; import { GroupsComponent as OrgGroupsComponent } from './organizations/manage/groups.component'; import { ManageComponent as OrgManageComponent } from './organizations/manage/manage.component'; @@ -277,7 +279,7 @@ const routes: Routes = [ { path: '', pathMatch: 'full', - redirectTo: 'import', + component: ToolsRouterComponent, }, { path: 'import', @@ -365,7 +367,7 @@ const routes: Routes = [ { path: '', pathMatch: 'full', - redirectTo: 'people', + component: ManageRouterComponent, }, { path: 'collections',