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

#1712 - Removed old private api call for wokflows users and groups (#1799)

Browse Source 
* #1712 - changed workflow api call from private to enterprise

* #1712 - removed Testbed added injector
This commit is contained in:
Vito
2017-04-05 05:25:49 -07:00
committed by Mario Romano
parent b3e2c28582
commit 25a430c933
2 changed files with 532 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

969
ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
View File

File diff suppressed because it is too large Load Diff

87
ng2-components/ng2-activiti-form/src/services/form.service.ts
View File

@@ -105,7 +105,7 @@ export class FormService {
return forms.data.find(formdata => formdata.name === name); return forms.data.find(formdata => formdata.name === name);
}) })
.catch(err => this.handleError(err) .catch(err => this.handleError(err)
); );
} }
/** /**
@@ -158,7 +158,7 @@ export class FormService {
* @returns {Observable<any>} * @returns {Observable<any>}
*/ */
saveTaskForm(taskId: string, formValues: FormValues): Observable<any> { saveTaskForm(taskId: string, formValues: FormValues): Observable<any> {
let body = JSON.stringify({values: formValues}); let body = JSON.stringify({ values: formValues });
return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.saveTaskForm(taskId, body)) return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.saveTaskForm(taskId, body))
.catch(err => this.handleError(err)); .catch(err => this.handleError(err));
@@ -172,7 +172,7 @@ export class FormService {
* @returns {Observable<any>} * @returns {Observable<any>}
*/ */
completeTaskForm(taskId: string, formValues: FormValues, outcome?: string): Observable<any> { completeTaskForm(taskId: string, formValues: FormValues, outcome?: string): Observable<any> {
let data: any = {values: formValues}; let data: any = { values: formValues };
if (outcome) { if (outcome) {
data.outcome = outcome; data.outcome = outcome;
} }
@@ -294,67 +294,34 @@ export class FormService {
return Observable.fromPromise(alfrescoApi.activiti.taskApi.getRestFieldValuesColumn(taskId, field, column)); return Observable.fromPromise(alfrescoApi.activiti.taskApi.getRestFieldValuesColumn(taskId, field, column));
} }
// TODO: uses private webApp api getWorkflowUsers(filter: string, groupId?: string): Observable<GroupUserModel[]> {
getWorkflowGroups(filter: string, groupId?: string): Observable<GroupModel[]> { let option: any = { filter: filter };
return Observable.create(observer => { if (groupId) {
option.groupId = groupId;
let xhr: XMLHttpRequest = new XMLHttpRequest(); }
xhr.withCredentials = true; return Observable.fromPromise(this.getWorkflowUserApi(option))
.map((response: any) => <GroupUserModel[]> response.data || [])
xhr.onreadystatechange = () => { .catch(err => this.handleError(err));
if (xhr.readyState === 4) {
if (xhr.status === 200) {
let json = JSON.parse(xhr.response);
let data: GroupModel[] = (json.data || []).map(item => <GroupModel> item);
observer.next(data);
observer.complete();
} else {
this.logService.error(xhr.response);
Observable.throw(new Error(xhr.response));
}
}
};
let host = this.apiService.getInstance().config.hostBpm;
let url = `${host}/activiti-app/app/rest/workflow-groups?filter=${filter}`;
if (groupId) {
url += `&groupId=${groupId}`;
}
xhr.open('GET', url, true);
xhr.setRequestHeader('Authorization', this.apiService.getInstance().getTicketBpm());
xhr.send();
});
} }
getWorkflowUsers(filter: string, groupId?: string): Observable<GroupUserModel[]> { private getWorkflowUserApi(options: any) {
return Observable.create(observer => { let alfrescoApi = this.apiService.getInstance();
return alfrescoApi.activiti.usersWorkflowApi.getUsers(options);
}
let xhr: XMLHttpRequest = new XMLHttpRequest(); getWorkflowGroups(filter: string, groupId?: string): Observable<GroupModel[]> {
xhr.withCredentials = true; let option: any = { filter: filter };
if (groupId) {
option.groupId = groupId;
}
return Observable.fromPromise(this.getWorkflowGroupsApi(option))
.map((response: any) => <GroupModel[]> response.data || [])
.catch(err => this.handleError(err));
}
xhr.onreadystatechange = () => { private getWorkflowGroupsApi(options: any) {
if (xhr.readyState === 4) { let alfrescoApi = this.apiService.getInstance();
if (xhr.status === 200) { return alfrescoApi.activiti.groupsApi.getGroups(options);
let json = JSON.parse(xhr.response);
let data: GroupUserModel[] = (json.data || []).map(item => <GroupUserModel> item);
observer.next(data);
observer.complete();
} else {
this.logService.error(xhr.response);
Observable.throw(new Error(xhr.response));
}
}
};
let host = this.apiService.getInstance().config.hostBpm;
let url = `${host}/activiti-app/app/rest/workflow-users?filter=${filter}`;
if (groupId) {
url += `&groupId=${groupId}`;
}
xhr.open('GET', url, true);
xhr.setRequestHeader('Authorization', this.apiService.getInstance().getTicketBpm());
xhr.send();
});
} }
getFormId(res: any): string { getFormId(res: any): string {