From c27273cb7d1b89ac3f390bd5467a3a31b6fea4bd Mon Sep 17 00:00:00 2001 From: Deepak Paul Date: Thu, 15 Mar 2018 05:06:39 +0530 Subject: [PATCH] [ADF-2405] Reverted service to get all process definition versions (#3079) AnalyticsService.getProcessDefinitionsValues() has same behaviour --- .../services/process.service.spec.ts | 59 ------------------- .../process-list/services/process.service.ts | 15 ----- 2 files changed, 74 deletions(-) diff --git a/lib/process-services/process-list/services/process.service.spec.ts b/lib/process-services/process-list/services/process.service.spec.ts index 4e22fa0b5f..58021d9619 100644 --- a/lib/process-services/process-list/services/process.service.spec.ts +++ b/lib/process-services/process-list/services/process.service.spec.ts @@ -341,65 +341,6 @@ describe('ProcessService', () => { }); - describe('process definition versions', () => { - - let getProcessDefinitionVersions: jasmine.Spy; - - beforeEach(() => { - getProcessDefinitionVersions = spyOn(alfrescoApi.activiti.processApi, 'getProcessDefinitions') - .and - .returnValue(Promise.resolve({ data: [ fakeProcessDef, fakeProcessDef ] })); - }); - - it('should return the correct number of process defs', async(() => { - service.getProcessDefinitionVersions().subscribe((defs) => { - expect(defs.length).toBe(2); - }); - })); - - it('should return the correct process def data', async(() => { - service.getProcessDefinitionVersions().subscribe((defs) => { - expect(defs[0].id).toBe(fakeProcessDef.id); - expect(defs[0].key).toBe(fakeProcessDef.key); - expect(defs[0].name).toBe(fakeProcessDef.name); - }); - })); - - it('should call API with correct parameters when no appId provided', () => { - service.getProcessDefinitionVersions(); - expect(getProcessDefinitionVersions).toHaveBeenCalledWith({}); - }); - - it('should call API with correct parameters when appId provided', () => { - const appId = 1; - service.getProcessDefinitionVersions(appId); - expect(getProcessDefinitionVersions).toHaveBeenCalledWith({ - appDefinitionId: appId - }); - }); - - it('should pass on any error that is returned by the API', async(() => { - getProcessDefinitionVersions = getProcessDefinitionVersions.and.returnValue(Promise.reject(mockError)); - service.getProcessDefinitionVersions().subscribe( - () => {}, - (res) => { - expect(res).toBe(mockError); - } - ); - })); - - it('should return a default error if no data is returned by the API', async(() => { - getProcessDefinitionVersions = getProcessDefinitionVersions.and.returnValue(Promise.reject(null)); - service.getProcessDefinitionVersions().subscribe( - () => {}, - (res) => { - expect(res).toBe('Server error'); - } - ); - })); - - }); - describe('process instance tasks', () => { const processId = '1001'; diff --git a/lib/process-services/process-list/services/process.service.ts b/lib/process-services/process-list/services/process.service.ts index 23df2a381e..6b1c076b96 100644 --- a/lib/process-services/process-list/services/process.service.ts +++ b/lib/process-services/process-list/services/process.service.ts @@ -119,21 +119,6 @@ export class ProcessService { .catch(err => this.handleProcessError(err)); } - /** - * Gets the versions of process definitions associated with an app. - * @param appId ID of a target app - */ - getProcessDefinitionVersions(appId?: number): Observable { - const opts = appId ? { appDefinitionId: appId } : {}; - - return Observable.fromPromise( - this.alfrescoApiService.getInstance().activiti.processApi.getProcessDefinitions(opts) - ) - .map(this.extractData) - .map(processDefs => processDefs.map((pd) => new ProcessDefinitionRepresentation(pd))) - .catch(err => this.handleProcessError(err)); - } - /** * Starts a process based on a process definition, name, form values or variables. * @param processDefinitionId Process definition ID