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 @@
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 @@
{{ 'DETAILS.MESSAGES.NONE'|translate }}
{{processInstanceDetails.name}}
-
+
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
= new EventEmitter();
@Output()
- taskFormCompletedEmitter = new EventEmitter();
+ taskFormCompleted: EventEmitter = new EventEmitter();
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 = new EventEmitter();
+
+ @Output()
+ onError: EventEmitter = new EventEmitter();
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,