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

[ADF-2067] Not able to see the 'My tasks' filter when clicking on a newly created app. (#2792)

Browse Source 
* fixed Not able to see the 'My tasks' filter when clicking on a newly created app.
* Create default services return response with id.
This commit is contained in:
siva kumar
2017-12-21 14:31:51 +05:30
committed by Maurizio Vitale
parent 1b50094cc5
commit 1f9024d4f6
5 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/process-services/task-list/services/task-filter.service.spec.ts
View File

@@ -26,7 +26,7 @@ import { TaskFilterService } from './task-filter.service';
declare let jasmine: any;
describe('Activiti Tas filter Service', () => {
describe('Activiti Task filter Service', () => {
let service: TaskFilterService;
@@ -131,9 +131,13 @@ describe('Activiti Tas filter Service', () => {
expect(res).toBeDefined();
expect(res.length).toEqual(4);
expect(res[0].name).toEqual('Involved Tasks');
expect(res[0].id).toEqual(111);
expect(res[1].name).toEqual('My Tasks');
expect(res[1].id).toEqual(222);
expect(res[2].name).toEqual('Queued Tasks');
expect(res[2].id).toEqual(333);
expect(res[3].name).toEqual('Completed Tasks');
expect(res[3].id).toEqual(444);
done();
});
@@ -141,7 +145,7 @@ describe('Activiti Tas filter Service', () => {
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify({
id: '111', name: 'Involved Tasks', filter: { assignment: 'fake-involved' }
appId: 1001, id: '111', name: 'Involved Tasks', icon: 'fake-icon', recent: false
})
});
@@ -149,7 +153,7 @@ describe('Activiti Tas filter Service', () => {
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify({
id: '222', name: 'My Tasks', filter: { assignment: 'fake-assignee' }
appId: 1001, id: '222', name: 'My Tasks', icon: 'fake-icon', recent: false
})
});
@@ -157,7 +161,7 @@ describe('Activiti Tas filter Service', () => {
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify({
id: '333', name: 'Queued Tasks', filter: { assignment: 'fake-candidate' }
appId: 1001, id: '333', name: 'Queued Tasks', icon: 'fake-icon', recent: false
})
});
@@ -165,7 +169,7 @@ describe('Activiti Tas filter Service', () => {
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify({
id: '444', name: 'Completed Tasks', filter: { assignment: 'fake-involved' }
appId: 1001, id: '444', name: 'Completed Tasks', icon: 'fake-icon', recent: false
})
});
});

4
lib/process-services/task-list/services/task-filter.service.ts
View File

@@ -63,12 +63,16 @@ export class TaskFilterService {
let filters: FilterRepresentationModel[] = [];
res.forEach((filter) => {
if (filter.name === involvedTasksFilter.name) {
involvedTasksFilter.id = filter.id;
filters.push(involvedTasksFilter);
} else if (filter.name === myTasksFilter.name) {
myTasksFilter.id = filter.id;
filters.push(myTasksFilter);
} else if (filter.name === queuedTasksFilter.name) {
queuedTasksFilter.id = filter.id;
filters.push(queuedTasksFilter);
} else if (filter.name === completedTasksFilter.name) {
completedTasksFilter.id = filter.id;
filters.push(completedTasksFilter);
}
});