diff --git a/demo-shell-ng2/app/app.routes.ts b/demo-shell-ng2/app/app.routes.ts index 126e5a3973..7b21e72911 100644 --- a/demo-shell-ng2/app/app.routes.ts +++ b/demo-shell-ng2/app/app.routes.ts @@ -94,7 +94,12 @@ export const appRoutes: Routes = [ canActivate: [AuthGuardBpm] }, { - path: 'activiti/diagram/:processDefinitionId', + path: 'activiti/apps/:appId/processes', + component: ActivitiDemoComponent, + canActivate: [AuthGuardBpm] + }, + { + path: 'activiti/apps/:appId/diagram/:processDefinitionId', component: ActivitiShowDiagramComponent, canActivate: [AuthGuardBpm] }, diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts index 7c8f9d36ef..d67befca08 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -149,6 +149,9 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit { } ngOnInit() { + if (this.router.url.includes('processes') ) { + this.activeTab = 'processes'; + } this.sub = this.route.params.subscribe(params => { let applicationId = params['appId']; if (applicationId && applicationId !== '0') { @@ -324,7 +327,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit { } onShowProcessDiagram(event: any): void { - this.router.navigate(['/activiti/diagram/' + event.value]); + this.router.navigate(['/activiti/apps/' + this.appId + '/diagram/' + event.value]); } onProcessDetailsTaskClick(event: TaskDetailsEvent): void { diff --git a/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.ts b/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.ts index 2f6ab81855..c71e438411 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.ts @@ -16,8 +16,8 @@ */ import { Location } from '@angular/common'; -import { Component, OnDestroy } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { Component } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs/Rx'; @Component({ @@ -25,25 +25,22 @@ import { Subscription } from 'rxjs/Rx'; templateUrl: './activiti-show-diagram.component.html', styleUrls: ['./activiti-show-diagram.component.css'] }) -export class ActivitiShowDiagramComponent implements OnDestroy { +export class ActivitiShowDiagramComponent { - sub: Subscription; processDefinitionId: string; + appId: string; constructor(private route: ActivatedRoute, + private router: Router, private location: Location) { - this.sub = this.route.params.subscribe(params => { + this.route.params.subscribe(params => { this.processDefinitionId = params['processDefinitionId']; + this.appId = params['appId']; }); - - } - - ngOnDestroy() { - this.sub.unsubscribe(); } onClickBack() { - this.location.back(); + this.router.navigate(['/activiti/apps/' + this.appId + '/processes']); } }