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-3065] TaskList component - Deprecate the processDefinitionKey (#3369)

Browse Source 
* Deprecate the processDefinitionKey property.
remove unused tasklist code. It was needed with the old pagination component

* Remove nosense test

* Use adf version
This commit is contained in:
Maurizio Vitale
2018-05-23 11:53:56 +01:00
committed by Eugenio Romano
parent b9e888ac11
commit 86f4c23afa
6 changed files with 6 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/process-services/task-list/components/task-list.component.ts
View File

@@ -50,7 +50,9 @@ export class TaskListComponent implements OnChanges, AfterContentInit, Paginated
@Input()
processInstanceId: string;
/** The Definition Key of the process. */
/** The Definition Key of the process.
* @deprecated 2.4.0
*/
@Input()
processDefinitionKey: string;

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

@@ -18,20 +18,14 @@
import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { FilterRepresentationModel } from '../models/filter.model';
import { TaskListModel } from '../models/task-list.model';
import 'rxjs/add/observable/throw';
@Injectable()
export class TaskFilterService {
private tasksListSubject = new Subject<TaskListModel>();
public tasksList$: Observable<TaskListModel>;
constructor(private apiService: AlfrescoApiService,
private logService: LogService) {
this.tasksList$ = this.tasksListSubject.asObservable();
}
/**
@@ -216,7 +210,6 @@ export class TaskFilterService {
private handleError(error: any) {
this.logService.error(error);
this.tasksListSubject.error(error);
return Observable.throw(error || 'Server error');
}

21
lib/process-services/task-list/services/tasklist.service.spec.ts
View File

@@ -76,27 +76,6 @@ describe('Activiti TaskList Service', () => {
});
});
it('should return the task list filtered by processDefinitionKey', (done) => {
service.getTasks(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
expect(res).toBeDefined();
expect(res.size).toEqual(2);
expect(res.start).toEqual(0);
expect(res.data).toBeDefined();
expect(res.data.length).toEqual(2);
expect(res.data[0].name).toEqual('FakeNameTask');
expect(res.data[0].assignee.email).toEqual('fake-email@dom.com');
expect(res.data[0].assignee.firstName).toEqual('firstName');
expect(res.data[0].assignee.lastName).toEqual('lastName');
done();
});
jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200,
contentType: 'application/json',
responseText: JSON.stringify(fakeTaskListDifferentProcessDefinitionKey)
});
});
it('should return the task list with all tasks filtered by state', (done) => {
spyOn(service, 'getTasks').and.returnValue(Observable.of(fakeTaskList));
spyOn(service, 'getTotalTasks').and.returnValue(Observable.of(fakeTaskList));

10
lib/process-services/task-list/services/tasklist.service.ts
View File

@@ -18,7 +18,6 @@
import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
import { Form } from '../models/form.model';
import { TaskDetailsModel } from '../models/task-details.model';
@@ -31,13 +30,9 @@ import 'rxjs/add/observable/from';
@Injectable()
export class TaskListService {
private tasksListSubject = new Subject<TaskListModel>();
public tasksList$: Observable<TaskListModel>;
constructor(private apiService: AlfrescoApiService,
private logService: LogService) {
this.tasksList$ = this.tasksListSubject.asObservable();
}
/**
@@ -88,8 +83,7 @@ export class TaskListService {
*/
getTasks(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskListModel> {
return Observable.fromPromise(this.callApiTasksFiltered(requestNode))
.map((res: any) => {
this.tasksListSubject.next(res);
.map((res: TaskListModel) => {
return res;
}).catch(err => this.handleError(err));
}
@@ -136,7 +130,6 @@ export class TaskListService {
const tasks = Object.assign({}, activeTasks);
tasks.total += completedTasks.total;
tasks.data = tasks.data.concat(completedTasks.data);
this.tasksListSubject.next(tasks);
return tasks;
}
);
@@ -374,7 +367,6 @@ export class TaskListService {
private handleError(error: any) {
this.logService.error(error);
this.tasksListSubject.error(error);
return Observable.throw(error || 'Server error');
}