diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index d0594e8c52..151a5d824c 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -65,7 +65,7 @@ "rxjs": "5.0.0-beta.6", "zone.js": "0.6.12", "ng2-translate": "2.2.2", - "ng2-alfresco-core": "0.3.0" + "ng2-alfresco-core": "^0.3.0" }, "peerDependencies": { "material-design-icons": "^2.2.3", @@ -83,7 +83,6 @@ "karma-jasmine": "1.0.2", "karma-jasmine-ajax": "0.1.13", "karma-jasmine-html-reporter": "0.2.0", - "karma-jasmine-ajax": "0.1.13", "karma-mocha-reporter": "2.0.3", "license-check": "1.1.5", "remap-istanbul": "0.6.3", diff --git a/ng2-components/ng2-activiti-form/src/services/node.service.ts b/ng2-components/ng2-activiti-form/src/services/node.service.ts index 10a9c39815..7c52f703a0 100644 --- a/ng2-components/ng2-activiti-form/src/services/node.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/node.service.ts @@ -70,7 +70,9 @@ export class NodeService { relativePath: path }; - return Observable.fromPromise(this.authService.getAlfrescoApi().nodes.addNode('-root-', body, {})); + // TODO: requires update to alfresco-js-api typings + let apiService: any = this.authService.getAlfrescoApi(); + return Observable.fromPromise(apiService.nodes.addNode('-root-', body, {})); } private generateUuid() { diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index f98b147505..e4c661cae2 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -20,7 +20,6 @@ import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; import { AlfrescoApiService } from 'ng2-alfresco-core'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { FileModel } from '../models/file.model'; /** @@ -45,7 +44,7 @@ export class UploadService { filesUpload$: Observable; totalCompleted$: Observable; - constructor(private authService: AlfrescoAuthenticationService) { + constructor(private apiService: AlfrescoApiService) { this.filesUpload$ = new Observable(observer => this.filesUploadObserverProgressBar = observer).share(); this.totalCompleted$ = new Observable(observer => this.totalCompletedObserver = observer).share(); } @@ -106,7 +105,7 @@ export class UploadService { filesToUpload.forEach((uploadingFileModel: FileModel) => { uploadingFileModel.setUploading(); - let promiseUpload = this.authService.getAlfrescoApi().upload.uploadFile(uploadingFileModel.file, directory, null, null, opts) + let promiseUpload = this.apiService.getInstance().upload.uploadFile(uploadingFileModel.file, directory, null, null, opts) .on('progress', (progress: any) => { uploadingFileModel.setProgres(progress); this.updateFileListStream(this.queue); diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts index edc1c16db5..4df9c01460 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.ts @@ -23,7 +23,6 @@ import { NotSupportedFormat } from './notSupportedFormat.component'; import { DOCUMENT } from '@angular/platform-browser'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; import { AlfrescoApiService } from 'ng2-alfresco-core'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; declare let __moduleName: string;