mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
tslint arrow-parens rule (#4003)
This commit is contained in:
@@ -74,7 +74,7 @@ export class AppsListComponent implements OnInit, AfterContentInit {
|
||||
constructor(
|
||||
private appsProcessService: AppsProcessService,
|
||||
private translationService: TranslationService) {
|
||||
this.apps$ = new Observable<AppDefinitionRepresentationModel>(observer => this.appsObserver = observer)
|
||||
this.apps$ = new Observable<AppDefinitionRepresentationModel>((observer) => this.appsObserver = observer)
|
||||
.pipe(share());
|
||||
}
|
||||
|
||||
|
@@ -43,7 +43,7 @@ export class DialogSelectAppTestComponent {
|
||||
width: '630px'
|
||||
});
|
||||
|
||||
this.dialogRef.afterClosed().subscribe(selectedProcess => {
|
||||
this.dialogRef.afterClosed().subscribe((selectedProcess) => {
|
||||
this.processId = selectedProcess.id;
|
||||
});
|
||||
}
|
||||
|
@@ -51,7 +51,7 @@ export class CreateProcessAttachmentComponent implements OnChanges {
|
||||
}
|
||||
|
||||
onFileUpload(event: any) {
|
||||
let filesList: File[] = event.detail.files.map(obj => obj.file);
|
||||
let filesList: File[] = event.detail.files.map((obj) => obj.file);
|
||||
|
||||
for (let fileInfoObj of filesList) {
|
||||
let file: File = fileInfoObj;
|
||||
|
@@ -51,7 +51,7 @@ export class AttachmentComponent implements OnChanges {
|
||||
}
|
||||
|
||||
onFileUpload(event: any) {
|
||||
let filesList: File[] = event.detail.files.map(obj => obj.file);
|
||||
let filesList: File[] = event.detail.files.map((obj) => obj.file);
|
||||
|
||||
for (let fileInfoObj of filesList) {
|
||||
let file: File = fileInfoObj;
|
||||
|
@@ -113,7 +113,7 @@ export class ProcessAttachmentListComponent implements OnChanges, AfterContentIn
|
||||
this.isLoading = true;
|
||||
this.activitiContentService.getProcessRelatedContent(processInstanceId).subscribe(
|
||||
(res: any) => {
|
||||
res.data.forEach(content => {
|
||||
res.data.forEach((content) => {
|
||||
this.attachments.push({
|
||||
id: content.id,
|
||||
name: content.name,
|
||||
@@ -136,7 +136,7 @@ export class ProcessAttachmentListComponent implements OnChanges, AfterContentIn
|
||||
if (contentId) {
|
||||
this.activitiContentService.deleteRelatedContent(contentId).subscribe(
|
||||
(res: any) => {
|
||||
this.attachments = this.attachments.filter(content => {
|
||||
this.attachments = this.attachments.filter((content) => {
|
||||
return content.id !== contentId;
|
||||
});
|
||||
},
|
||||
|
@@ -111,7 +111,7 @@ export class TaskAttachmentListComponent implements OnChanges, AfterContentInit
|
||||
this.activitiContentService.getTaskRelatedContent(taskId).subscribe(
|
||||
(res: any) => {
|
||||
let attachList = [];
|
||||
res.data.forEach(content => {
|
||||
res.data.forEach((content) => {
|
||||
attachList.push({
|
||||
id: content.id,
|
||||
name: content.name,
|
||||
@@ -135,7 +135,7 @@ export class TaskAttachmentListComponent implements OnChanges, AfterContentInit
|
||||
if (contentId) {
|
||||
this.activitiContentService.deleteRelatedContent(contentId).subscribe(
|
||||
(res: any) => {
|
||||
this.attachments = this.attachments.filter(content => {
|
||||
this.attachments = this.attachments.filter((content) => {
|
||||
return content.id !== contentId;
|
||||
});
|
||||
},
|
||||
|
@@ -205,7 +205,7 @@ export class AttachFileWidgetComponent extends UploadWidgetComponent implements
|
||||
private uploadFileFromCS(fileNodeList: any[], accountId: string, siteId?: string) {
|
||||
const filesSaved = [];
|
||||
from(fileNodeList).pipe(
|
||||
mergeMap(node =>
|
||||
mergeMap((node) =>
|
||||
zip(
|
||||
of(node.content.mimeType),
|
||||
this.activitiContentService.applyAlfrescoNode(node, siteId, accountId),
|
||||
|
@@ -48,7 +48,7 @@ describe('PeopleListComponent', () => {
|
||||
let row = new ObjectDataRow(fakeUser);
|
||||
let rowEvent = new DataRowEvent(row, null);
|
||||
|
||||
peopleListComponent.clickRow.subscribe(selectedUser => {
|
||||
peopleListComponent.clickRow.subscribe((selectedUser) => {
|
||||
expect(selectedUser.id).toEqual(1);
|
||||
expect(selectedUser.email).toEqual('fake@mail.com');
|
||||
expect(peopleListComponent.user.id).toEqual(1);
|
||||
|
@@ -59,7 +59,7 @@ export class PeopleSearchComponent implements OnInit {
|
||||
this.filteredResults$ = this.results
|
||||
.pipe(
|
||||
map((users) => {
|
||||
return users.filter(user => user.id !== this.selectedUser.id);
|
||||
return users.filter((user) => user.id !== this.selectedUser.id);
|
||||
})
|
||||
);
|
||||
this.performSearch = this.performSearchCallback.bind(this);
|
||||
|
@@ -51,7 +51,7 @@ export class PeopleComponent implements OnInit, AfterViewInit {
|
||||
peopleSearch$: Observable<UserProcessModel[]>;
|
||||
|
||||
constructor(private logService: LogService, public peopleProcessService: PeopleProcessService) {
|
||||
this.peopleSearch$ = new Observable<UserProcessModel[]>(observer => this.peopleSearchObserver = observer)
|
||||
this.peopleSearch$ = new Observable<UserProcessModel[]>((observer) => this.peopleSearchObserver = observer)
|
||||
.pipe(
|
||||
share()
|
||||
);
|
||||
@@ -79,14 +79,14 @@ export class PeopleComponent implements OnInit, AfterViewInit {
|
||||
this.peopleProcessService.getWorkflowUsers(this.taskId, searchedWord)
|
||||
.subscribe((users) => {
|
||||
this.peopleSearchObserver.next(users);
|
||||
}, error => this.logService.error(error));
|
||||
}, (error) => this.logService.error(error));
|
||||
}
|
||||
|
||||
involveUser(user: UserProcessModel) {
|
||||
this.peopleProcessService.involveUserWithTask(this.taskId, user.id.toString())
|
||||
.subscribe(() => {
|
||||
this.people = [...this.people, user];
|
||||
}, error => this.logService.error('Impossible to involve user with task'));
|
||||
}, (error) => this.logService.error('Impossible to involve user with task'));
|
||||
}
|
||||
|
||||
removeInvolvedUser(user: UserProcessModel) {
|
||||
@@ -95,7 +95,7 @@ export class PeopleComponent implements OnInit, AfterViewInit {
|
||||
this.people = this.people.filter((involvedUser) => {
|
||||
return involvedUser.id !== user.id;
|
||||
});
|
||||
}, error => this.logService.error('Impossible to remove involved user from task'));
|
||||
}, (error) => this.logService.error('Impossible to remove involved user from task'));
|
||||
}
|
||||
|
||||
getDisplayUser(firstName: string, lastName: string, delimiter: string = '-'): string {
|
||||
|
@@ -49,7 +49,7 @@ export class ProcessCommentsComponent implements OnChanges {
|
||||
beingAdded: boolean = false;
|
||||
|
||||
constructor(private commentProcessService: CommentProcessService) {
|
||||
this.comment$ = new Observable<CommentModel>(observer => this.commentObserver = observer)
|
||||
this.comment$ = new Observable<CommentModel>((observer) => this.commentObserver = observer)
|
||||
.pipe(share());
|
||||
this.comment$.subscribe((comment: CommentModel) => {
|
||||
this.comments.push(comment);
|
||||
|
@@ -132,7 +132,7 @@ export class ProcessFiltersComponent implements OnInit, OnChanges {
|
||||
*/
|
||||
getFiltersByAppName(appName: string) {
|
||||
this.appsProcessService.getDeployedApplicationsByName(appName).subscribe(
|
||||
application => {
|
||||
(application) => {
|
||||
this.getFiltersByAppId(application.id);
|
||||
this.selectProcessFilter(this.filterParam);
|
||||
},
|
||||
|
@@ -71,9 +71,9 @@ export class ProcessInstanceTasksComponent implements OnInit, OnChanges {
|
||||
constructor(private activitiProcess: ProcessService,
|
||||
private logService: LogService,
|
||||
private dialog: MatDialog) {
|
||||
this.task$ = new Observable<TaskDetailsModel>(observer => this.taskObserver = observer)
|
||||
this.task$ = new Observable<TaskDetailsModel>((observer) => this.taskObserver = observer)
|
||||
.pipe(share());
|
||||
this.completedTask$ = new Observable<TaskDetailsModel>(observer => this.completedTaskObserver = observer)
|
||||
this.completedTask$ = new Observable<TaskDetailsModel>((observer) => this.completedTaskObserver = observer)
|
||||
.pipe(share());
|
||||
}
|
||||
|
||||
|
@@ -232,7 +232,7 @@ describe('ProcessInstanceListComponent', () => {
|
||||
});
|
||||
let rowEvent = new DataRowEvent(row, null);
|
||||
|
||||
component.rowClick.subscribe(taskId => {
|
||||
component.rowClick.subscribe((taskId) => {
|
||||
expect(taskId).toEqual('999');
|
||||
expect(component.getCurrentId()).toEqual('999');
|
||||
done();
|
||||
|
@@ -224,7 +224,7 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On
|
||||
totalItems: response.total
|
||||
});
|
||||
},
|
||||
error => {
|
||||
(error) => {
|
||||
this.error.emit(error);
|
||||
this.isLoading = false;
|
||||
});
|
||||
@@ -286,7 +286,7 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On
|
||||
* @param instances
|
||||
*/
|
||||
private optimizeProcessDetails(instances: any[]): any[] {
|
||||
instances = instances.map(instance => {
|
||||
instances = instances.map((instance) => {
|
||||
instance.name = this.getProcessNameOrDescription(instance, 'medium');
|
||||
if (instance.started) {
|
||||
instance.started = moment(instance.started).format(this.FORMAT_DATE);
|
||||
|
@@ -115,10 +115,10 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit {
|
||||
|
||||
this.loadStartProcess();
|
||||
|
||||
this.processNameInput.valueChanges.subscribe(name => this.name = name);
|
||||
this.processNameInput.valueChanges.subscribe((name) => this.name = name);
|
||||
this.filteredProcesses = this.processDefinitionInput.valueChanges
|
||||
.pipe(
|
||||
map(value => this._filter(value))
|
||||
map((value) => this._filter(value))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit {
|
||||
private _filter(value: string): ProcessDefinitionRepresentation[] {
|
||||
if (value !== null && value !== undefined) {
|
||||
const filterValue = value.toLowerCase();
|
||||
let filteredProcess = this.processDefinitions.filter(option => option.name.toLowerCase().includes(filterValue));
|
||||
let filteredProcess = this.processDefinitions.filter((option) => option.name.toLowerCase().includes(filterValue));
|
||||
|
||||
if (this.processFilterSelector) {
|
||||
this.selectedProcessDef = this.getSelectedProcess(filterValue);
|
||||
@@ -147,7 +147,7 @@ export class StartProcessInstanceComponent implements OnChanges, OnInit {
|
||||
}
|
||||
|
||||
getSelectedProcess(selectedProcess) {
|
||||
let processSelected = this.processDefinitions.find(process => process.name.toLowerCase() === selectedProcess);
|
||||
let processSelected = this.processDefinitions.find((process) => process.name.toLowerCase() === selectedProcess);
|
||||
|
||||
if (!processSelected) {
|
||||
processSelected = new ProcessDefinitionRepresentation();
|
||||
|
@@ -45,7 +45,7 @@ export class ProcessFilterService {
|
||||
});
|
||||
return filters;
|
||||
}),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -59,9 +59,9 @@ export class ProcessFilterService {
|
||||
return from(this.callApiProcessFilters(appId))
|
||||
.pipe(
|
||||
map((response: any) => {
|
||||
return response.data.find(filter => filter.id === filterId);
|
||||
return response.data.find((filter) => filter.id === filterId);
|
||||
}),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -75,9 +75,9 @@ export class ProcessFilterService {
|
||||
return from(this.callApiProcessFilters(appId))
|
||||
.pipe(
|
||||
map((response: any) => {
|
||||
return response.data.find(filter => filter.name === filterName);
|
||||
return response.data.find((filter) => filter.name === filterName);
|
||||
}),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ export class ProcessFilterService {
|
||||
let allFilter = this.getAllFilterInstance(appId);
|
||||
let allObservable = this.addProcessFilter(allFilter);
|
||||
|
||||
return new Observable(observer => {
|
||||
return new Observable((observer) => {
|
||||
forkJoin(
|
||||
runningObservable,
|
||||
completedObservable,
|
||||
@@ -181,7 +181,7 @@ export class ProcessFilterService {
|
||||
map((response: FilterProcessRepresentationModel) => {
|
||||
return response;
|
||||
}),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
|
@@ -47,14 +47,14 @@ export class ProcessService {
|
||||
.pipe(
|
||||
map((res: any) => {
|
||||
if (processDefinitionKey) {
|
||||
const filtered = res.data.filter(process => process.processDefinitionKey === processDefinitionKey);
|
||||
const filtered = res.data.filter((process) => process.processDefinitionKey === processDefinitionKey);
|
||||
res.data = filtered;
|
||||
return res;
|
||||
} else {
|
||||
return res;
|
||||
}
|
||||
}),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ export class ProcessService {
|
||||
fetchProcessAuditPdfById(processId: string): Observable<Blob> {
|
||||
return from<Blob>(this.alfrescoApiService.getInstance().activiti.processApi.getProcessAuditPdf(processId))
|
||||
.pipe(
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ export class ProcessService {
|
||||
fetchProcessAuditJsonById(processId: string): Observable<any> {
|
||||
return from(this.alfrescoApiService.getInstance().activiti.processApi.getProcessAuditJson(processId))
|
||||
.pipe(
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ export class ProcessService {
|
||||
getProcess(processInstanceId: string): Observable<ProcessInstance> {
|
||||
return from(this.alfrescoApiService.getInstance().activiti.processApi.getProcessInstance(processInstanceId))
|
||||
.pipe(
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -117,11 +117,11 @@ export class ProcessService {
|
||||
return from(this.alfrescoApiService.getInstance().activiti.taskApi.listTasks(taskOpts))
|
||||
.pipe(
|
||||
map(this.extractData),
|
||||
map(tasks => tasks.map((task: any) => {
|
||||
map((tasks) => tasks.map((task: any) => {
|
||||
task.created = moment(task.created, 'YYYY-MM-DD').format();
|
||||
return task;
|
||||
})),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -142,8 +142,8 @@ export class ProcessService {
|
||||
)
|
||||
.pipe(
|
||||
map(this.extractData),
|
||||
map(processDefs => processDefs.map((pd) => new ProcessDefinitionRepresentation(pd))),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
map((processDefs) => processDefs.map((pd) => new ProcessDefinitionRepresentation(pd))),
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -175,7 +175,7 @@ export class ProcessService {
|
||||
)
|
||||
.pipe(
|
||||
map((pd) => new ProcessInstance(pd)),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ export class ProcessService {
|
||||
this.alfrescoApiService.getInstance().activiti.processApi.deleteProcessInstance(processInstanceId)
|
||||
)
|
||||
.pipe(
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ export class ProcessService {
|
||||
)
|
||||
.pipe(
|
||||
map((processVars: any[]) => processVars.map((pd) => new ProcessInstanceVariable(pd))),
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -219,7 +219,7 @@ export class ProcessService {
|
||||
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.createOrUpdateProcessInstanceVariables(processInstanceId, variables)
|
||||
)
|
||||
.pipe(
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ export class ProcessService {
|
||||
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.deleteProcessInstanceVariable(processInstanceId, variableName)
|
||||
)
|
||||
.pipe(
|
||||
catchError(err => this.handleProcessError(err))
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
);
|
||||
}
|
||||
|
||||
|
@@ -123,7 +123,7 @@ export class ChecklistComponent implements OnChanges {
|
||||
public delete(taskId: string) {
|
||||
this.activitiTaskList.deleteTask(taskId).subscribe(
|
||||
() => {
|
||||
this.checklist = this.checklist.filter(check => check.id !== taskId);
|
||||
this.checklist = this.checklist.filter((check) => check.id !== taskId);
|
||||
this.checklistTaskDeleted.emit(taskId);
|
||||
},
|
||||
(error) => {
|
||||
|
@@ -268,7 +268,7 @@ describe('StartTaskComponent', () => {
|
||||
let attachFormToATask = spyOn(service, 'attachFormToATask').and.returnValue(of());
|
||||
spyOn(service, 'createNewTask').and.callFake(
|
||||
function() {
|
||||
return new Observable(observer => {
|
||||
return new Observable((observer) => {
|
||||
observer.next({ id: 'task-id'});
|
||||
observer.complete();
|
||||
});
|
||||
|
@@ -195,7 +195,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
|
||||
|
||||
this.formRenderingService.setComponentTypeResolver('select-folder', () => AttachFolderWidgetComponent, true);
|
||||
this.formRenderingService.setComponentTypeResolver('upload', () => AttachFileWidgetComponent, true);
|
||||
this.peopleSearch = new Observable<UserProcessModel[]>(observer => this.peopleSearchObserver = observer)
|
||||
this.peopleSearch = new Observable<UserProcessModel[]>((observer) => this.peopleSearchObserver = observer)
|
||||
.pipe(share());
|
||||
this.authService.getBpmLoggedUser().subscribe((user: UserRepresentation) => {
|
||||
this.currentLoggedUser = user;
|
||||
@@ -469,7 +469,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
|
||||
.subscribe((users) => {
|
||||
users = users.filter((user) => user.id !== this.taskDetails.assignee.id);
|
||||
this.peopleSearchObserver.next(users);
|
||||
}, error => this.logService.error('Could not load users'));
|
||||
}, (error) => this.logService.error('Could not load users'));
|
||||
}
|
||||
|
||||
onCloseSearch() {
|
||||
|
@@ -130,7 +130,7 @@ export class TaskFiltersComponent implements OnInit, OnChanges {
|
||||
*/
|
||||
getFiltersByAppName(appName: string) {
|
||||
this.appsProcessService.getDeployedApplicationsByName(appName).subscribe(
|
||||
application => {
|
||||
(application) => {
|
||||
this.getFiltersByAppId(application.id);
|
||||
},
|
||||
(err) => {
|
||||
|
@@ -322,7 +322,7 @@ describe('TaskListComponent', () => {
|
||||
});
|
||||
let rowEvent = new DataRowEvent(row, null);
|
||||
|
||||
component.rowClick.subscribe(taskId => {
|
||||
component.rowClick.subscribe((taskId) => {
|
||||
expect(taskId).toEqual('999');
|
||||
expect(component.getCurrentId()).toEqual('999');
|
||||
done();
|
||||
|
@@ -347,7 +347,7 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft
|
||||
* @param instances
|
||||
*/
|
||||
private optimizeTaskDetails(instances: any[]): any[] {
|
||||
instances = instances.map(task => {
|
||||
instances = instances.map((task) => {
|
||||
if (!task.name) {
|
||||
task.name = 'No name';
|
||||
}
|
||||
|
@@ -35,7 +35,7 @@ export class ProcessUploadService extends UploadService {
|
||||
let processInstanceId = file.options.parentId;
|
||||
let promise = this.apiService.getInstance().activiti.contentApi.createRelatedContentOnProcessInstance(processInstanceId, file.file, opts);
|
||||
|
||||
promise.catch(err => this.handleError(err));
|
||||
promise.catch((err) => this.handleError(err));
|
||||
|
||||
return promise;
|
||||
}
|
||||
|
@@ -48,7 +48,7 @@ export class TaskFilterService {
|
||||
let completedTasksFilter = this.getCompletedTasksFilterInstance(appId);
|
||||
let completeObservable = this.addFilter(completedTasksFilter);
|
||||
|
||||
return new Observable(observer => {
|
||||
return new Observable((observer) => {
|
||||
forkJoin(
|
||||
involvedObservable,
|
||||
myTaskObservable,
|
||||
@@ -97,7 +97,7 @@ export class TaskFilterService {
|
||||
});
|
||||
return filters;
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -109,8 +109,8 @@ export class TaskFilterService {
|
||||
*/
|
||||
getTaskFilterById(filterId: number, appId?: number): Observable<FilterRepresentationModel> {
|
||||
return from(this.callApiTaskFilters(appId)).pipe(
|
||||
map(response => response.data.find(filter => filter.id === filterId)),
|
||||
catchError(err => this.handleError(err))
|
||||
map((response) => response.data.find((filter) => filter.id === filterId)),
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -122,8 +122,8 @@ export class TaskFilterService {
|
||||
*/
|
||||
getTaskFilterByName(taskName: string, appId?: number): Observable<FilterRepresentationModel> {
|
||||
return from(this.callApiTaskFilters(appId)).pipe(
|
||||
map(response => response.data.find(filter => filter.name === taskName)),
|
||||
catchError(err => this.handleError(err))
|
||||
map((response) => response.data.find((filter) => filter.name === taskName)),
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -138,7 +138,7 @@ export class TaskFilterService {
|
||||
map((response: FilterRepresentationModel) => {
|
||||
return response;
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
|
@@ -35,7 +35,7 @@ export class TaskUploadService extends UploadService {
|
||||
let taskId = file.options.parentId;
|
||||
let promise = this.apiService.getInstance().activiti.contentApi.createRelatedContentOnTask(taskId, file.file, opts);
|
||||
|
||||
promise.catch(err => this.handleError(err));
|
||||
promise.catch((err) => this.handleError(err));
|
||||
|
||||
return promise;
|
||||
}
|
||||
|
@@ -61,7 +61,7 @@ describe('Activiti TaskList Service', () => {
|
||||
describe('Content tests', () => {
|
||||
|
||||
it('should return the task list filtered', (done) => {
|
||||
service.getTasks(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
|
||||
service.getTasks(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe((res) => {
|
||||
expect(res).toBeDefined();
|
||||
expect(res.size).toEqual(1);
|
||||
expect(res.start).toEqual(0);
|
||||
@@ -85,7 +85,7 @@ describe('Activiti TaskList Service', () => {
|
||||
spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
|
||||
spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
|
||||
|
||||
service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter, 'open').subscribe(res => {
|
||||
service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter, 'open').subscribe((res) => {
|
||||
|
||||
expect(res).toBeDefined();
|
||||
expect(res.size).toEqual(1);
|
||||
@@ -104,7 +104,7 @@ describe('Activiti TaskList Service', () => {
|
||||
spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
|
||||
spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
|
||||
|
||||
service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
|
||||
service.findAllTaskByState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe((res) => {
|
||||
expect(res).toBeDefined();
|
||||
expect(res.size).toEqual(1);
|
||||
expect(res.start).toEqual(0);
|
||||
@@ -119,7 +119,7 @@ describe('Activiti TaskList Service', () => {
|
||||
});
|
||||
|
||||
it('should return the task list filtered by state', (done) => {
|
||||
service.findTasksByState(<TaskQueryRequestRepresentationModel> fakeFilter, 'open').subscribe(res => {
|
||||
service.findTasksByState(<TaskQueryRequestRepresentationModel> fakeFilter, 'open').subscribe((res) => {
|
||||
expect(res).toBeDefined();
|
||||
expect(res.size).toEqual(1);
|
||||
expect(res.start).toEqual(0);
|
||||
@@ -140,7 +140,7 @@ describe('Activiti TaskList Service', () => {
|
||||
});
|
||||
|
||||
it('should return the task list filtered', (done) => {
|
||||
service.findTasksByState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
|
||||
service.findTasksByState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe((res) => {
|
||||
expect(res.size).toEqual(1);
|
||||
expect(res.start).toEqual(0);
|
||||
expect(res.data).toBeDefined();
|
||||
@@ -163,7 +163,7 @@ describe('Activiti TaskList Service', () => {
|
||||
spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
|
||||
spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
|
||||
|
||||
service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
|
||||
service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe((res) => {
|
||||
expect(res).toBeDefined();
|
||||
expect(res.data).toBeDefined();
|
||||
expect(res.data.length).toEqual(2);
|
||||
@@ -183,7 +183,7 @@ describe('Activiti TaskList Service', () => {
|
||||
it('Should return both open and completed task', (done) => {
|
||||
spyOn(service, 'findTasksByState').and.returnValue(of(fakeOpenTaskList));
|
||||
spyOn(service, 'findAllTaskByState').and.returnValue(of(fakeCompletedTaskList));
|
||||
service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
|
||||
service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe((res) => {
|
||||
expect(res).toBeDefined();
|
||||
expect(res.data).toBeDefined();
|
||||
expect(res.data.length).toEqual(4);
|
||||
@@ -200,7 +200,7 @@ describe('Activiti TaskList Service', () => {
|
||||
spyOn(service, 'getTasks').and.returnValue(of(fakeTaskList));
|
||||
spyOn(service, 'getTotalTasks').and.returnValue(of(fakeTaskList));
|
||||
|
||||
service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe(res => {
|
||||
service.findAllTasksWithoutState(<TaskQueryRequestRepresentationModel> fakeFilter).subscribe((res) => {
|
||||
expect(res).toBeDefined();
|
||||
expect(res.data).toBeDefined();
|
||||
expect(res.data.length).toEqual(2);
|
||||
|
@@ -73,9 +73,9 @@ export class TaskListService {
|
||||
return from(this.callApiTasksFiltered(requestNodeForFilter))
|
||||
.pipe(
|
||||
map((res: any) => {
|
||||
return res.data.find(element => element.id === taskId) ? filterModel : null;
|
||||
return res.data.find((element) => element.id === taskId) ? filterModel : null;
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ export class TaskListService {
|
||||
getTasks(requestNode: TaskQueryRequestRepresentationModel): Observable<TaskListModel> {
|
||||
return from<TaskListModel>(this.callApiTasksFiltered(requestNode))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ export class TaskListService {
|
||||
map((details: any) => {
|
||||
return new TaskDetailsModel(details);
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ export class TaskListService {
|
||||
});
|
||||
return checklists;
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ export class TaskListService {
|
||||
});
|
||||
return forms;
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ export class TaskListService {
|
||||
attachFormToATask(taskId: string, formId: number): Observable<any> {
|
||||
return from(this.apiService.taskApi.attachForm(taskId, { 'formId': formId }))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ export class TaskListService {
|
||||
map((response: TaskDetailsModel) => {
|
||||
return new TaskDetailsModel(response);
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -236,7 +236,7 @@ export class TaskListService {
|
||||
deleteTask(taskId: string): Observable<TaskDetailsModel> {
|
||||
return from<TaskDetailsModel>(this.callApiDeleteTask(taskId))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -248,7 +248,7 @@ export class TaskListService {
|
||||
deleteForm(taskId: string): Observable<TaskDetailsModel> {
|
||||
return from<TaskDetailsModel>(this.callApiDeleteForm(taskId))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -260,7 +260,7 @@ export class TaskListService {
|
||||
completeTask(taskId: string) {
|
||||
return from(this.apiService.taskApi.completeTask(taskId))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@ export class TaskListService {
|
||||
map((res: any) => {
|
||||
return res;
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -291,7 +291,7 @@ export class TaskListService {
|
||||
map((response: TaskDetailsModel) => {
|
||||
return new TaskDetailsModel(response);
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -308,7 +308,7 @@ export class TaskListService {
|
||||
map((response: TaskDetailsModel) => {
|
||||
return new TaskDetailsModel(response);
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -325,7 +325,7 @@ export class TaskListService {
|
||||
map((response: TaskDetailsModel) => {
|
||||
return new TaskDetailsModel(response);
|
||||
}),
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -337,7 +337,7 @@ export class TaskListService {
|
||||
claimTask(taskId: string): Observable<TaskDetailsModel> {
|
||||
return from<TaskDetailsModel>(this.apiService.taskApi.claimTask(taskId))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -349,7 +349,7 @@ export class TaskListService {
|
||||
unclaimTask(taskId: string): Observable<TaskDetailsModel> {
|
||||
return from<TaskDetailsModel>(this.apiService.taskApi.unclaimTask(taskId))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -362,8 +362,8 @@ export class TaskListService {
|
||||
updateTask(taskId: any, updated): Observable<TaskDetailsModel> {
|
||||
return from(this.apiService.taskApi.updateTask(taskId, updated))
|
||||
.pipe(
|
||||
map(result => <TaskDetailsModel> result),
|
||||
catchError(err => this.handleError(err))
|
||||
map((result) => <TaskDetailsModel> result),
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -375,8 +375,8 @@ export class TaskListService {
|
||||
fetchTaskAuditPdfById(taskId: string): Observable<Blob> {
|
||||
return from(this.apiService.taskApi.getTaskAuditPdf(taskId))
|
||||
.pipe(
|
||||
map(data => <Blob> data),
|
||||
catchError(err => this.handleError(err))
|
||||
map((data) => <Blob> data),
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -388,7 +388,7 @@ export class TaskListService {
|
||||
fetchTaskAuditJsonById(taskId: string): Observable<any> {
|
||||
return from(this.apiService.taskApi.getTaskAuditJson(taskId))
|
||||
.pipe(
|
||||
catchError(err => this.handleError(err))
|
||||
catchError((err) => this.handleError(err))
|
||||
);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user