inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DW-45] Process Service - Fix the input type from string to number (#1845)

Browse Source 
Process Service - Fix the input type from string to number
This commit is contained in:
Infad Kachancheri
2017-05-03 14:53:40 +05:30
committed by Eugenio Romano
parent 0fa56dff23
commit 8959476941
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-processlist/src/assets/activiti-process.service.mock.ts
View File

@@ -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'}

16
ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts
View File

@@ -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');

9
ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts
View File

@@ -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<FilterProcessRepresentationModel>}
*/
getProcessFilterById(processId: string, appId?: string): Observable<FilterProcessRepresentationModel> {
return Observable.fromPromise(this.callApiGetUserProcessInstanceFilters(appId))
getProcessFilterById(filterId: number, appId?: string): Observable<FilterProcessRepresentationModel> {
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));
}