diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts index 8a63ebb574..31b70f77fa 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.spec.ts @@ -29,8 +29,14 @@ describe('ActivitiFilters', () => { let logService: LogServiceMock; let fakeGlobalFilter = []; - fakeGlobalFilter.push(new FilterProcessRepresentationModel({name: 'FakeInvolvedTasks', filter: { state: 'open', assignment: 'fake-involved'}})); - fakeGlobalFilter.push(new FilterProcessRepresentationModel({name: 'FakeMyTasks', filter: { state: 'open', assignment: 'fake-assignee'}})); + fakeGlobalFilter.push(new FilterProcessRepresentationModel({ + name: 'FakeInvolvedTasks', + filter: { state: 'open', assignment: 'fake-involved' } + })); + fakeGlobalFilter.push(new FilterProcessRepresentationModel({ + name: 'FakeMyTasks', + filter: { state: 'open', assignment: 'fake-assignee' } + })); let fakeGlobalFilterPromise = new Promise(function (resolve, reject) { resolve(fakeGlobalFilter); @@ -71,7 +77,7 @@ describe('ActivitiFilters', () => { it('should return the filter task list, filtered By Name', (done) => { let fakeDeployedApplicationsPromise = new Promise(function (resolve, reject) { - resolve({}); + resolve({ id: 1 }); }); spyOn(activitiService, 'getDeployedApplications').and.returnValue(Observable.fromPromise(fakeDeployedApplicationsPromise)); @@ -121,7 +127,12 @@ describe('ActivitiFilters', () => { }); it('should emit an event when a filter is selected', (done) => { - let currentFilter = new FilterProcessRepresentationModel({filter: { state: 'open', assignment: 'fake-involved'}}); + let currentFilter = new FilterProcessRepresentationModel({ + filter: { + state: 'open', + assignment: 'fake-involved' + } + }); filterList.filterClick.subscribe((filter: FilterProcessRepresentationModel) => { expect(filter).toBeDefined(); @@ -164,7 +175,10 @@ describe('ActivitiFilters', () => { }); it('should return the current filter after one is selected', () => { - let filter = new FilterProcessRepresentationModel({name: 'FakeMyTasks', filter: { state: 'open', assignment: 'fake-assignee'}}); + let filter = new FilterProcessRepresentationModel({ + name: 'FakeMyTasks', + filter: { state: 'open', assignment: 'fake-assignee' } + }); expect(filterList.currentFilter).toBeUndefined(); filterList.selectFilter(filter); expect(filterList.getCurrentFilter()).toBe(filter); diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts index ef62ca8d14..946682fbe3 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts @@ -91,7 +91,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { * Return the filter list filtered by appId * @param appId - optional */ - getFiltersByAppId(appId?: number) { + getFiltersByAppId(appId?: string) { this.activiti.getProcessFilters(appId).subscribe( (res: FilterProcessRepresentationModel[]) => { if (res.length === 0 && this.isFilterListEmpty()) { @@ -132,7 +132,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges { getFiltersByAppName(appName: string) { this.activiti.getDeployedApplications(appName).subscribe( application => { - this.getFiltersByAppId(application.id); + this.getFiltersByAppId(application.id.toString()); this.selectTaskFilter(this.filterParam); }, (err) => { diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts index e701144dcc..ea74498be7 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts @@ -595,12 +595,12 @@ describe('ActivitiProcessService', () => { it('should call the API without an appId defined by default', () => { service.getProcessFilters(null); - expect(getFilters).toHaveBeenCalledWith({}); + expect(getFilters).toHaveBeenCalled(); }); it('should call the API with the correct appId when specified', () => { - service.getProcessFilters(226); - expect(getFilters).toHaveBeenCalledWith({appId: 226}); + service.getProcessFilters('226'); + expect(getFilters).toHaveBeenCalledWith({appId: '226'}); }); it('should return the task filter by id', (done) => { @@ -638,7 +638,7 @@ describe('ActivitiProcessService', () => { })); it('should return the default filters', (done) => { - service.createDefaultFilters(1234).subscribe( + service.createDefaultFilters('1234').subscribe( (res: FilterProcessRepresentationModel []) => { expect(res).toBeDefined(); expect(res.length).toEqual(3); diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts index 9bfdb3bf5e..2066da1463 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.ts @@ -68,11 +68,8 @@ export class ActivitiProcessService { }).catch(err => this.handleError(err)); } - getProcessFilters(appId: number): Observable { - let filterOpts = appId ? { - appId: appId - } : {}; - return Observable.fromPromise(this.callApiGetUserProcessInstanceFilters(filterOpts)) + getProcessFilters(appId: string): Observable { + return Observable.fromPromise(this.callApiProcessFilters(appId)) .map((response: any) => { let filters: FilterProcessRepresentationModel[] = []; response.data.forEach((filter: FilterProcessRepresentationModel) => { @@ -103,7 +100,7 @@ export class ActivitiProcessService { * @returns {Observable} */ getProcessFilterByName(processName: string, appId?: string): Observable { - return Observable.fromPromise(this.callApiGetUserProcessInstanceFilters(appId)) + return Observable.fromPromise(this.callApiProcessFilters(appId)) .map((response: any) => { return response.data.find(filter => filter.name === processName); }).catch(err => this.handleError(err)); @@ -114,7 +111,7 @@ export class ActivitiProcessService { * @param appId * @returns {FilterProcessRepresentationModel[]} */ - public createDefaultFilters(appId: number): Observable { + public createDefaultFilters(appId: string): Observable { let runnintFilter = this.getRunningFilterInstance(appId); let runnintObservable = this.addFilter(runnintFilter); @@ -150,13 +147,13 @@ export class ActivitiProcessService { }); } - private getRunningFilterInstance(appId: number): FilterProcessRepresentationModel { + private getRunningFilterInstance(appId: string): FilterProcessRepresentationModel { return new FilterProcessRepresentationModel({ 'name': 'Running', 'appId': appId, 'recent': true, 'icon': 'glyphicon-random', - 'filter': {'sort': 'created-desc', 'name': '', 'state': 'running'} + 'filter': { 'sort': 'created-desc', 'name': '', 'state': 'running' } }); } @@ -165,13 +162,13 @@ export class ActivitiProcessService { * @param appId * @returns {FilterProcessRepresentationModel} */ - private getCompletedFilterInstance(appId: number): FilterProcessRepresentationModel { + private getCompletedFilterInstance(appId: string): FilterProcessRepresentationModel { return new FilterProcessRepresentationModel({ 'name': 'Completed', 'appId': appId, 'recent': false, 'icon': 'glyphicon-ok-sign', - 'filter': {'sort': 'created-desc', 'name': '', 'state': 'completed'} + 'filter': { 'sort': 'created-desc', 'name': '', 'state': 'completed' } }); } @@ -180,13 +177,13 @@ export class ActivitiProcessService { * @param appId * @returns {FilterProcessRepresentationModel} */ - private getAllFilterInstance(appId: number): FilterProcessRepresentationModel { + private getAllFilterInstance(appId: string): FilterProcessRepresentationModel { return new FilterProcessRepresentationModel({ 'name': 'All', 'appId': appId, 'recent': true, 'icon': 'glyphicon-th', - 'filter': {'sort': 'created-desc', 'name': '', 'state': 'all'} + 'filter': { 'sort': 'created-desc', 'name': '', 'state': 'all' } }); } @@ -210,15 +207,15 @@ export class ActivitiProcessService { getProcessTasks(id: string, state?: string): Observable { let taskOpts = state ? { - processInstanceId: id, - state: state - } : { - processInstanceId: id - }; + processInstanceId: id, + state: state + } : { + processInstanceId: id + }; return Observable.fromPromise(this.apiService.getInstance().activiti.taskApi.listTasks(taskOpts)) .map(this.extractData) .map(tasks => tasks.map((task: any) => { - task.created = moment(task.created, 'YYYY-MM-DD').format(); + task.created = moment(task.created, 'YYYY-MM-DD').format(); return task; })) .catch(err => this.handleError(err)); @@ -255,8 +252,8 @@ export class ActivitiProcessService { */ addProcessInstanceComment(id: string, message: string): Observable { return Observable.fromPromise( - this.apiService.getInstance().activiti.commentsApi.addProcessInstanceComment({message: message}, id) - ) + this.apiService.getInstance().activiti.commentsApi.addProcessInstanceComment({ message: message }, id) + ) .map((response: Comment) => { return new Comment(response.id, response.message, response.created, response.createdBy); }).catch(err => this.handleError(err)); @@ -265,14 +262,14 @@ export class ActivitiProcessService { getProcessDefinitions(appId?: string): Observable { let opts = appId ? { - latest: true, - appDefinitionId: appId - } : { - latest: true - }; + latest: true, + appDefinitionId: appId + } : { + latest: true + }; return Observable.fromPromise( this.apiService.getInstance().activiti.processApi.getProcessDefinitions(opts) - ) + ) .map(this.extractData) .map(processDefs => processDefs.map((pd) => new ProcessDefinitionRepresentation(pd))) .catch(err => this.handleError(err)); @@ -294,7 +291,7 @@ export class ActivitiProcessService { } return Observable.fromPromise( this.apiService.getInstance().activiti.processApi.startNewProcessInstance(startRequest) - ) + ) .map((pd) => new ProcessInstance(pd)) .catch(err => this.handleError(err)); } @@ -302,14 +299,14 @@ export class ActivitiProcessService { cancelProcess(processInstanceId: string): Observable { return Observable.fromPromise( this.apiService.getInstance().activiti.processApi.deleteProcessInstance(processInstanceId) - ) + ) .catch(err => this.handleError(err)); } getProcessInstanceVariables(processDefinitionId: string): Observable { return Observable.fromPromise( this.apiService.getInstance().activiti.processInstanceVariablesApi.getProcessInstanceVariables(processDefinitionId) - ) + ) .map((processVars: any[]) => processVars.map((pd) => new ProcessInstanceVariable(pd))) .catch(err => this.handleError(err)); } @@ -317,21 +314,17 @@ export class ActivitiProcessService { createOrUpdateProcessInstanceVariables(processDefinitionId: string, variables: ProcessInstanceVariable[]): Observable { return Observable.fromPromise( this.apiService.getInstance().activiti.processInstanceVariablesApi.createOrUpdateProcessInstanceVariables(processDefinitionId, variables) - ) + ) .catch(err => this.handleError(err)); } deleteProcessInstanceVariable(processDefinitionId: string, variableName: string): Observable { return Observable.fromPromise( this.apiService.getInstance().activiti.processInstanceVariablesApi.deleteProcessInstanceVariable(processDefinitionId, variableName) - ) + ) .catch(err => this.handleError(err)); } - private callApiGetUserProcessInstanceFilters(filterOpts) { - return this.apiService.getInstance().activiti.userFiltersApi.getUserProcessInstanceFilters(filterOpts); - } - private callApiAddFilter(filter: FilterProcessRepresentationModel) { return this.apiService.getInstance().activiti.userFiltersApi.createUserProcessInstanceFilter(filter); }