From 89594769413340254da92b9efa0fdfc58628b8d6 Mon Sep 17 00:00:00 2001 From: Infad Kachancheri Date: Wed, 3 May 2017 14:53:40 +0530 Subject: [PATCH] [DW-45] Process Service - Fix the input type from string to number (#1845) Process Service - Fix the input type from string to number --- .../src/assets/activiti-process.service.mock.ts | 2 +- .../services/activiti-process.service.spec.ts | 16 ++++++++-------- .../src/services/activiti-process.service.ts | 9 +++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts b/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts index 5c16a53f14..a218c3c10e 100644 --- a/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts +++ b/ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts @@ -28,7 +28,7 @@ export var fakeFilters = { data: [new FilterProcessRepresentationModel({ 'name': 'Running', 'appId': '22', - 'id': '333', + 'id': 333, 'recent': true, 'icon': 'glyphicon-random', 'filter': {'sort': 'created-desc', 'name': '', 'state': 'running'} diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts index ed4b0123a1..61fffefa1e 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts @@ -596,13 +596,13 @@ describe('ActivitiProcessService', () => { }); it('should return the task filter by id', (done) => { - service.getProcessFilterById('333').subscribe( - (res: FilterProcessRepresentationModel) => { - expect(res).toBeDefined(); - expect(res.id).toEqual('333'); - expect(res.name).toEqual('Running'); - expect(res.filter.sort).toEqual('created-desc'); - expect(res.filter.state).toEqual('running'); + service.getProcessFilterById(333).subscribe( + (processFilter: FilterProcessRepresentationModel) => { + expect(processFilter).toBeDefined(); + expect(processFilter.id).toEqual(333); + expect(processFilter.name).toEqual('Running'); + expect(processFilter.filter.sort).toEqual('created-desc'); + expect(processFilter.filter.state).toEqual('running'); done(); } ); @@ -612,7 +612,7 @@ describe('ActivitiProcessService', () => { service.getProcessFilterByName('Running').subscribe( (res: FilterProcessRepresentationModel) => { expect(res).toBeDefined(); - expect(res.id).toEqual('333'); + expect(res.id).toEqual(333); expect(res.name).toEqual('Running'); expect(res.filter.sort).toEqual('created-desc'); expect(res.filter.state).toEqual('running'); diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts index 0da95cd609..abdb80ed37 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts @@ -72,13 +72,14 @@ export class ActivitiProcessService { /** * Retrieve the process filter by id - * @param processId - string - The id of the filter + * @param filterId - number - The id of the filter + * @param appId - string - optional - The id of app * @returns {Observable} */ - getProcessFilterById(processId: string, appId?: string): Observable { - return Observable.fromPromise(this.callApiGetUserProcessInstanceFilters(appId)) + getProcessFilterById(filterId: number, appId?: string): Observable { + return Observable.fromPromise(this.callApiProcessFilters(appId)) .map((response: any) => { - return response.data.find(filter => filter.id === processId); + return response.data.find(filter => filter.id === filterId); }).catch(err => this.handleError(err)); }