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

Remove deprecated use of getAlfrescoApi() #1094

Browse Source 
remove getAlfrescoApi from auth #1094
This commit is contained in:
Eugenio Romano
2016-11-28 14:04:58 +00:00
parent eed6902428
commit d87a768d20
18 changed files with 73 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
View File

@@ -42,7 +42,7 @@ describe('ActivitiFilters', () => {
});
beforeEach(() => {
let activitiService = new ActivitiTaskListService(null);
let activitiService = new ActivitiTaskListService(null, null);
filterList = new ActivitiFilters(null, null, activitiService);
});

28
ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts
View File

@@ -16,7 +16,7 @@
*/
import {Injectable} from '@angular/core';
import {AlfrescoAuthenticationService} from 'ng2-alfresco-core';
import {AlfrescoAuthenticationService, AlfrescoApiService} from 'ng2-alfresco-core';
import {Observable} from 'rxjs/Rx';
import {FilterRepresentationModel} from '../models/filter.model';
import {TaskQueryRequestRepresentationModel} from '../models/filter.model';
@@ -27,7 +27,7 @@ import {TaskDetailsModel} from '../models/task-details.model';
@Injectable()
export class ActivitiTaskListService {
constructor(public authService: AlfrescoAuthenticationService) {
constructor(public authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) {
}
/**
@@ -35,7 +35,7 @@ export class ActivitiTaskListService {
* @returns {Observable<any>}
*/
getDeployedApplications(name?: string): Observable<any> {
return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.appsApi.getAppDefinitions())
return Observable.fromPromise(this.apiService.getInstance().activiti.appsApi.getAppDefinitions())
.map((response: any) => {
if (name) {
return response.data.find(p => p.name === name);
@@ -233,47 +233,47 @@ export class ActivitiTaskListService {
}
private callApiTasksFiltered(requestNode: TaskQueryRequestRepresentationModel) {
return this.authService.getAlfrescoApi().activiti.taskApi.listTasks(requestNode);
return this.apiService.getInstance().activiti.taskApi.listTasks(requestNode);
}
private callApiTaskFilters(appId?: string) {
if (appId) {
return this.authService.getAlfrescoApi().activiti.userFiltersApi.getUserTaskFilters({appId: appId});
return this.apiService.getInstance().activiti.userFiltersApi.getUserTaskFilters({appId: appId});
} else {
return this.authService.getAlfrescoApi().activiti.userFiltersApi.getUserTaskFilters();
return this.apiService.getInstance().activiti.userFiltersApi.getUserTaskFilters();
}
}
private callApiTaskDetails(id: string) {
return this.authService.getAlfrescoApi().activiti.taskApi.getTask(id);
return this.apiService.getInstance().activiti.taskApi.getTask(id);
}
private callApiTaskComments(id: string) {
return this.authService.getAlfrescoApi().activiti.taskApi.getTaskComments(id);
return this.apiService.getInstance().activiti.taskApi.getTaskComments(id);
}
private callApiAddTaskComment(id: string, message: string) {
return this.authService.getAlfrescoApi().activiti.taskApi.addTaskComment({message: message}, id);
return this.apiService.getInstance().activiti.taskApi.addTaskComment({message: message}, id);
}
private callApiAddTask(task: TaskDetailsModel) {
return this.authService.getAlfrescoApi().activiti.taskApi.addSubtask(task.parentTaskId, task);
return this.apiService.getInstance().activiti.taskApi.addSubtask(task.parentTaskId, task);
}
private callApiAddFilter(filter: FilterRepresentationModel) {
return this.authService.getAlfrescoApi().activiti.userFiltersApi.createUserTaskFilter(filter);
return this.apiService.getInstance().activiti.userFiltersApi.createUserTaskFilter(filter);
}
private callApiTaskChecklist(id: string) {
return this.authService.getAlfrescoApi().activiti.taskApi.getChecklist(id);
return this.apiService.getInstance().activiti.taskApi.getChecklist(id);
}
private callApiCompleteTask(id: string) {
return this.authService.getAlfrescoApi().activiti.taskApi.completeTask(id);
return this.apiService.getInstance().activiti.taskApi.completeTask(id);
}
private callApiCreateTask(task: TaskDetailsModel) {
return this.authService.getAlfrescoApi().activiti.taskApi.createNewTask(task);
return this.apiService.getInstance().activiti.taskApi.createNewTask(task);
}
private handleError(error: any) {