Use correct process-related typings for processlist filters

Refs #1307
This commit is contained in:
Will Abson 2017-01-05 09:28:11 +00:00
parent 94f11a1aae
commit 099c32c667

View File

@ -18,7 +18,7 @@
import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable';
import { TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist'; import { ProcessFilterRequestRepresentation } from '../models/process-instance-filter.model';
import { ProcessInstance } from '../models/process-instance.model'; import { ProcessInstance } from '../models/process-instance.model';
import { ActivitiProcessService } from '../services/activiti-process.service'; import { ActivitiProcessService } from '../services/activiti-process.service';
@ -46,7 +46,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
@Input() @Input()
name: string; name: string;
requestNode: TaskQueryRequestRepresentationModel; requestNode: ProcessFilterRequestRepresentation;
@Input() @Input()
data: DataTableAdapter; data: DataTableAdapter;
@ -130,7 +130,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
); );
} }
private load(requestNode: TaskQueryRequestRepresentationModel) { private load(requestNode: ProcessFilterRequestRepresentation) {
this.processService.getProcessInstances(requestNode) this.processService.getProcessInstances(requestNode)
.subscribe( .subscribe(
(response) => { (response) => {
@ -226,10 +226,9 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
let requestNode = { let requestNode = {
appDefinitionId: this.appId, appDefinitionId: this.appId,
processDefinitionKey: this.processDefinitionKey, processDefinitionKey: this.processDefinitionKey,
text: this.name,
state: this.state, state: this.state,
sort: this.sort sort: this.sort
}; };
return new TaskQueryRequestRepresentationModel(requestNode); return new ProcessFilterRequestRepresentation(requestNode);
} }
} }