From 9c8adefece8481803e55033e2ab8810bd08eaac8 Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Mon, 11 Jun 2018 16:21:48 +0100 Subject: [PATCH] [ADF-3144] Error component displayed when closing file viewer in process tab (#3469) --- demo-shell/src/app/app.routes.ts | 7 ++++++- .../process-service/process-service.component.ts | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/demo-shell/src/app/app.routes.ts b/demo-shell/src/app/app.routes.ts index 7849946b19..d9485f9c6a 100644 --- a/demo-shell/src/app/app.routes.ts +++ b/demo-shell/src/app/app.routes.ts @@ -154,6 +154,11 @@ export const appRoutes: Routes = [ component: ProcessServiceComponent, canActivate: [AuthGuardBpm] }, + { + path: 'activiti/apps/:appId/processes/:filterId', + component: ProcessServiceComponent, + canActivate: [AuthGuardBpm] + }, { path: 'activiti/apps/:appId/diagram/:processDefinitionId', component: ShowDiagramComponent, @@ -164,7 +169,7 @@ export const appRoutes: Routes = [ component: ProcessServiceComponent, canActivate: [AuthGuardBpm] }, - // TODO: check if neeeded + // TODO: check if needed { path: 'activiti/appId/:appId', component: ProcessServiceComponent, diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts index 8ebe770057..e1be2c175f 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.ts +++ b/demo-shell/src/app/components/process-service/process-service.component.ts @@ -142,8 +142,8 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit presetColoum = 'default'; - showTaskTab = true; - showProcessTab = false; + showTaskTab: boolean; + showProcessTab: boolean; fieldValidators = [ ...FORM_FIELD_VALIDATORS, @@ -208,6 +208,8 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit if (this.router.url.includes('processes')) { this.activeTab = this.tabs.processes; } + this.showProcessTab = this.activeTab === this.tabs.processes; + this.showTaskTab = this.activeTab === this.tabs.tasks; this.route.params.subscribe(params => { const applicationId = params['appId'];