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

[ADF-2035] Drag and drop is not working on Processes - attachment List (#2736)

Browse Source 
* fix upload for process attachment list
export ActivitiContentService
ProcessService.createOrUpdateProcessInstanceVariables has incorrect method signature

* fix signature methods

* fix test parameters
This commit is contained in:
Eugenio Romano
2017-11-27 14:39:33 +00:00
committed by GitHub
parent 2f07fa339d
commit bdc06e3eed
13 changed files with 113 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/process-services/process-list/components/process-filters.component.spec.ts
View File

@@ -56,7 +56,7 @@ describe('ActivitiFilters', () => {
});
beforeEach(() => {
processFilterService = new ProcessFilterService(null, null);
processFilterService = new ProcessFilterService(null);
appsProcessService = new AppsProcessService(null, null);
filterList = new ProcessFiltersComponent(processFilterService, appsProcessService);
});

9
lib/process-services/process-list/services/process-filter.service.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { FilterProcessRepresentationModel } from '../models/filter-process.model';
@@ -24,8 +24,7 @@ import 'rxjs/add/observable/throw';
@Injectable()
export class ProcessFilterService {
constructor(private alfrescoApiService: AlfrescoApiService,
private logService: LogService) {
constructor(private alfrescoApiService: AlfrescoApiService) {
}
getProcessFilters(appId: number): Observable<FilterProcessRepresentationModel[]> {
@@ -72,7 +71,7 @@ export class ProcessFilterService {
* @param appId
* @returns {FilterProcessRepresentationModel[]}
*/
public createDefaultFilters(appId: number): Observable<any[]> {
public createDefaultFilters(appId: number): Observable<FilterProcessRepresentationModel[]> {
let runningFilter = this.getRunningFilterInstance(appId);
let runningObservable = this.addProcessFilter(runningFilter);
@@ -103,7 +102,7 @@ export class ProcessFilterService {
observer.complete();
},
(err: any) => {
this.logService.error(err);
this.handleProcessError(err)
});
});
}

1
lib/process-services/process-list/services/process.service.spec.ts
View File

@@ -35,7 +35,6 @@ describe('ProcessService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [
ProcessService
]

12
lib/process-services/process-list/services/process.service.ts
View File

@@ -126,24 +126,24 @@ export class ProcessService {
.catch(err => this.handleProcessError(err));
}
getProcessInstanceVariables(processDefinitionId: string): Observable<ProcessInstanceVariable[]> {
getProcessInstanceVariables(processInstanceId: string): Observable<ProcessInstanceVariable[]> {
return Observable.fromPromise(
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.getProcessInstanceVariables(processDefinitionId)
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.getProcessInstanceVariables(processInstanceId)
)
.map((processVars: any[]) => processVars.map((pd) => new ProcessInstanceVariable(pd)))
.catch(err => this.handleProcessError(err));
}
createOrUpdateProcessInstanceVariables(processDefinitionId: string, variables: ProcessInstanceVariable[]): Observable<ProcessInstanceVariable[]> {
createOrUpdateProcessInstanceVariables(processInstanceId: string, variables: ProcessInstanceVariable[]): Observable<ProcessInstanceVariable[]> {
return Observable.fromPromise(
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.createOrUpdateProcessInstanceVariables(processDefinitionId, variables)
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.createOrUpdateProcessInstanceVariables(processInstanceId, variables)
)
.catch(err => this.handleProcessError(err));
}
deleteProcessInstanceVariable(processDefinitionId: string, variableName: string): Observable<void> {
deleteProcessInstanceVariable(processInstanceId: string, variableName: string): Observable<void> {
return Observable.fromPromise(
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.deleteProcessInstanceVariable(processDefinitionId, variableName)
this.alfrescoApiService.getInstance().activiti.processInstanceVariablesApi.deleteProcessInstanceVariable(processInstanceId, variableName)
)
.catch(err => this.handleProcessError(err));
}