mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-05-26 17:24:56 +00:00
After cancelling a process list is not refreshed #1050 bubbling events and implements reload
This commit is contained in:
parent
3c7817a44e
commit
40dddf32d4
@ -71,7 +71,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="mdl-cell mdl-cell--7-col task-column">
|
<div class="mdl-cell mdl-cell--7-col task-column">
|
||||||
<span>Process Details</span>
|
<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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -181,6 +181,10 @@ export class ActivitiDemoComponent implements AfterViewChecked {
|
|||||||
this.activitiprocesslist.reload();
|
this.activitiprocesslist.reload();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onSuccessNewProcess(data: any) {
|
||||||
|
this.activitiprocesslist.reload();
|
||||||
|
}
|
||||||
|
|
||||||
taskFormCompleted(data: any) {
|
taskFormCompleted(data: any) {
|
||||||
this.activitiprocesslist.reload();
|
this.activitiprocesslist.reload();
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
<div *ngIf="!processInstanceDetails">{{ 'DETAILS.MESSAGES.NONE'|translate }}</div>
|
<div *ngIf="!processInstanceDetails">{{ 'DETAILS.MESSAGES.NONE'|translate }}</div>
|
||||||
<div *ngIf="processInstanceDetails">
|
<div *ngIf="processInstanceDetails">
|
||||||
<h2 class="mdl-card__title-text">{{processInstanceDetails.name}}</h2>
|
<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-grid">
|
||||||
<div class="mdl-cell mdl-cell--8-col">
|
<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>
|
||||||
<div class="mdl-cell mdl-cell--4-col">
|
<div class="mdl-cell mdl-cell--4-col">
|
||||||
<activiti-process-instance-comments [processInstanceId]="processInstanceDetails.id" #activitiprocesscomments></activiti-process-instance-comments>
|
<activiti-process-instance-comments [processInstanceId]="processInstanceDetails.id" #activitiprocesscomments></activiti-process-instance-comments>
|
||||||
|
@ -52,10 +52,10 @@ export class ActivitiProcessInstanceDetails implements OnInit, OnChanges {
|
|||||||
showRefreshButton: boolean = true;
|
showRefreshButton: boolean = true;
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
processCancelledEmitter = new EventEmitter();
|
processCancelled: EventEmitter<string> = new EventEmitter<string>();
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
taskFormCompletedEmitter = new EventEmitter();
|
taskFormCompleted: EventEmitter<any> = new EventEmitter<any>();
|
||||||
|
|
||||||
processInstanceDetails: ProcessInstance;
|
processInstanceDetails: ProcessInstance;
|
||||||
|
|
||||||
@ -113,11 +113,11 @@ export class ActivitiProcessInstanceDetails implements OnInit, OnChanges {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
processCancelled(data: any) {
|
bubbleProcessCancelled(data: any) {
|
||||||
this.processCancelledEmitter.emit(data);
|
this.processCancelled.emit(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
taskFormCompleted(data: any) {
|
bubbleTaskFormCompleted(data: any) {
|
||||||
this.taskFormCompletedEmitter.emit(data);
|
this.taskFormCompleted.emit(data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,10 @@ export class ActivitiProcessInstanceHeader {
|
|||||||
processInstance: ProcessInstance;
|
processInstance: ProcessInstance;
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
processCancelled = new EventEmitter();
|
processCancelled: EventEmitter<any> = new EventEmitter();
|
||||||
|
|
||||||
|
@Output()
|
||||||
|
onError: EventEmitter<any> = new EventEmitter<any>();
|
||||||
|
|
||||||
constructor(private translate: AlfrescoTranslationService,
|
constructor(private translate: AlfrescoTranslationService,
|
||||||
private activitiProcess: ActivitiProcessService) {
|
private activitiProcess: ActivitiProcessService) {
|
||||||
@ -64,6 +67,12 @@ export class ActivitiProcessInstanceHeader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cancelProcess() {
|
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);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,10 +70,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
|
|||||||
if (!this.data) {
|
if (!this.data) {
|
||||||
this.data = this.initDefaultSchemaColumns();
|
this.data = this.initDefaultSchemaColumns();
|
||||||
}
|
}
|
||||||
if (this.filter) {
|
this.reload();
|
||||||
let requestNode = this.convertProcessInstanceToTaskQuery(this.filter);
|
|
||||||
this.load(requestNode);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnChanges(changes: SimpleChanges) {
|
ngOnChanges(changes: SimpleChanges) {
|
||||||
@ -192,6 +189,13 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
|
|||||||
return tasks;
|
return tasks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public reload() {
|
||||||
|
if (this.filter) {
|
||||||
|
let requestNode = this.convertProcessInstanceToTaskQuery(this.filter);
|
||||||
|
this.load(requestNode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private convertProcessInstanceToTaskQuery(processFilter: FilterRepresentationModel) {
|
private convertProcessInstanceToTaskQuery(processFilter: FilterRepresentationModel) {
|
||||||
let requestNode = {
|
let requestNode = {
|
||||||
appDefinitionId: processFilter.appId,
|
appDefinitionId: processFilter.appId,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user