From 87412a459008de663c2f9eb7a0a02e70d65f52a1 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 23 Nov 2016 16:47:07 +0000 Subject: [PATCH] Do not reload process instances in list after starting new instance Refs #1048 --- .../components/activiti/activiti-demo.component.ts | 1 - .../activiti-processlist.component.spec.ts | 13 ------------- .../components/activiti-processlist.component.ts | 11 ++++------- 3 files changed, 4 insertions(+), 21 deletions(-) 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 c003ba0c36..82feddfefd 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts @@ -200,7 +200,6 @@ export class ActivitiDemoComponent implements AfterViewChecked { onStartProcessInstance(instance: ProcessInstance) { this.currentProcessInstanceId = instance.id; - this.activitiprocesslist.reload(false); this.activitiStartProcess.reset(); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts index 6aef4b4cd4..def2d37107 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts @@ -199,19 +199,6 @@ describe('ActivitiProcessInstanceListComponent', () => { component.reload(); }); - it('should avoid emitting onSuccess event when reload() called with emit=false', fakeAsync(() => { - spyOn(service, 'getProcessInstances').and.returnValue(Observable.of(fakeGlobalProcesses)); - component.appId = '1'; - component.state = 'open'; - component.processDefinitionKey = null; - fixture.detectChanges(); - tick(); - let emitSpy = spyOn(component.onSuccess, 'emit'); - component.reload(false); - tick(); - expect(emitSpy).not.toHaveBeenCalled(); - })); - it('should emit row click event', (done) => { let row = new ObjectDataRow({ id: 999 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 90b49f05ba..84c1253b0a 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 @@ -111,9 +111,9 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { return changed; } - public reload(emit?: boolean) { + public reload() { this.requestNode = this.createRequestNode(); - this.load(this.requestNode, emit); + this.load(this.requestNode); } /** @@ -127,17 +127,14 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges { ); } - private load(requestNode: TaskQueryRequestRepresentationModel, emit?: boolean) { - emit = emit !== false; + private load(requestNode: TaskQueryRequestRepresentationModel) { this.processService.getProcessInstances(requestNode) .subscribe( (response) => { let instancesRow = this.createDataRow(response); this.renderInstances(instancesRow); this.selectFirst(); - if (emit) { - this.onSuccess.emit(response); - } + this.onSuccess.emit(response); }, error => { this.onError.emit(error);