From 40dddf32d4c46a8aa3f5812a89d18c5e918a8206 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Thu, 10 Nov 2016 18:55:34 +0000
Subject: [PATCH] After cancelling a process list is not refreshed #1050
 bubbling events and implements reload

---
 .../activiti/activiti-demo.component.html           |  2 +-
 .../components/activiti/activiti-demo.component.ts  |  4 ++++
 ...activiti-process-instance-details.component.html |  4 ++--
 .../activiti-process-instance-details.component.ts  | 12 ++++++------
 .../activiti-process-instance-header.component.ts   | 13 +++++++++++--
 .../components/activiti-processlist.component.ts    | 12 ++++++++----
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index ff099b246a..57c1f2d57f 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -71,7 +71,7 @@
                         </div>
                         <div class="mdl-cell mdl-cell--7-col task-column">
                             <span>Process Details</span>
-                            <activiti-process-instance-details [processInstanceId]="currentProcessInstanceId" (taskFormCompleted)="taskFormCompleted()" (processCancelled)="processCancelled()" #activitiprocessdetails></activiti-process-instance-details>
+                            <activiti-process-instance-details [processInstanceId]="currentProcessInstanceId" (activitiprocesslist)="taskFormCompleted()" (processCancelled)="processCancelled()" #activitiprocessdetails></activiti-process-instance-details>
                         </div>
                     </div>
                 </div>
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 012fb544a9..86c2a9db7e 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -181,6 +181,10 @@ export class ActivitiDemoComponent implements AfterViewChecked {
         this.activitiprocesslist.reload();
     }
 
+    onSuccessNewProcess(data: any) {
+        this.activitiprocesslist.reload();
+    }
+
     taskFormCompleted(data: any) {
         this.activitiprocesslist.reload();
     }
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
index 401bd6c011..884f329661 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
@@ -1,10 +1,10 @@
 <div *ngIf="!processInstanceDetails">{{ 'DETAILS.MESSAGES.NONE'|translate }}</div>
 <div *ngIf="processInstanceDetails">
     <h2 class="mdl-card__title-text">{{processInstanceDetails.name}}</h2>
-    <activiti-process-instance-header [processInstance]="processInstanceDetails" (processCancelled)="processCancelled()" #activitiprocessheader></activiti-process-instance-header>
+    <activiti-process-instance-header [processInstance]="processInstanceDetails" (processCancelled)="bubbleProcessCancelled()" #activitiprocessheader></activiti-process-instance-header>
     <div class="mdl-grid">
         <div class="mdl-cell mdl-cell--8-col">
-            <activiti-process-instance-tasks [processInstanceId]="processInstanceDetails.id" (taskFormCompleted)="taskFormCompleted()" #activitiprocesstasks></activiti-process-instance-tasks>
+            <activiti-process-instance-tasks [processInstanceId]="processInstanceDetails.id" (taskFormCompleted)="bubbleTaskFormCompleted()" #activitiprocesstasks></activiti-process-instance-tasks>
         </div>
         <div class="mdl-cell mdl-cell--4-col">
             <activiti-process-instance-comments [processInstanceId]="processInstanceDetails.id" #activitiprocesscomments></activiti-process-instance-comments>
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
index 3f52bbed68..a511fb37a3 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.ts
@@ -52,10 +52,10 @@ export class ActivitiProcessInstanceDetails implements OnInit, OnChanges {
     showRefreshButton: boolean = true;
 
     @Output()
-    processCancelledEmitter = new EventEmitter();
+    processCancelled: EventEmitter<string> = new EventEmitter<string>();
 
     @Output()
-    taskFormCompletedEmitter = new EventEmitter();
+    taskFormCompleted: EventEmitter<any> = new EventEmitter<any>();
 
     processInstanceDetails: ProcessInstance;
 
@@ -113,11 +113,11 @@ export class ActivitiProcessInstanceDetails implements OnInit, OnChanges {
         }
     }
 
-    processCancelled(data: any) {
-        this.processCancelledEmitter.emit(data);
+    bubbleProcessCancelled(data: any) {
+        this.processCancelled.emit(data);
     }
 
-    taskFormCompleted(data: any) {
-        this.taskFormCompletedEmitter.emit(data);
+    bubbleTaskFormCompleted(data: any) {
+        this.taskFormCompleted.emit(data);
     }
 }
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
index 7c6fd392ac..292d8a08be 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.ts
@@ -35,7 +35,10 @@ export class ActivitiProcessInstanceHeader {
     processInstance: ProcessInstance;
 
     @Output()
-    processCancelled = new EventEmitter();
+    processCancelled: EventEmitter<any> = new EventEmitter();
+
+    @Output()
+    onError: EventEmitter<any> = new EventEmitter<any>();
 
     constructor(private translate: AlfrescoTranslationService,
                 private activitiProcess: ActivitiProcessService) {
@@ -64,6 +67,12 @@ export class ActivitiProcessInstanceHeader {
     }
 
     cancelProcess() {
-        this.processCancelled.emit(this.activitiProcess.cancelProcess(this.processInstance.id));
+        this.activitiProcess.cancelProcess(this.processInstance.id).subscribe(
+            (res) => {
+                this.processCancelled.emit(res);
+            }, (err) => {
+                console.error(err);
+                this.onError.emit(err);
+            });
     }
 }
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
index 2146a0a345..5d7836cf22 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
@@ -70,10 +70,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
         if (!this.data) {
             this.data = this.initDefaultSchemaColumns();
         }
-        if (this.filter) {
-            let requestNode = this.convertProcessInstanceToTaskQuery(this.filter);
-            this.load(requestNode);
-        }
+        this.reload();
     }
 
     ngOnChanges(changes: SimpleChanges) {
@@ -192,6 +189,13 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
         return tasks;
     }
 
+    public reload() {
+        if (this.filter) {
+            let requestNode = this.convertProcessInstanceToTaskQuery(this.filter);
+            this.load(requestNode);
+        }
+    }
+
     private convertProcessInstanceToTaskQuery(processFilter: FilterRepresentationModel) {
         let requestNode = {
             appDefinitionId: processFilter.appId,