inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update upload service with Api service

Browse Source
This commit is contained in:
Denys Vuika
2016-08-30 14:38:28 +01:00
parent dee7166a26
commit 3c662de36d
5 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
View File

@@ -17,14 +17,21 @@
import { describe, expect, it, inject, beforeEach, beforeEachProviders } from '@angular/core/testing'; import { describe, expect, it, inject, beforeEach, beforeEachProviders } from '@angular/core/testing';
import { TestComponentBuilder } from '@angular/compiler/testing'; import { TestComponentBuilder } from '@angular/compiler/testing';
import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
import { FileModel } from '../models/file.model';
import { AlfrescoTranslationService, AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { TranslationMock } from '../assets/translation.service.mock';
import { UploadService } from '../services/upload.service';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { HTTP_PROVIDERS } from '@angular/http'; import { HTTP_PROVIDERS } from '@angular/http';
import {
AlfrescoTranslationService,
AlfrescoSettingsService,
AlfrescoAuthenticationService,
AlfrescoApiService
} from 'ng2-alfresco-core';
import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
import { FileModel } from '../models/file.model';
import { TranslationMock } from '../assets/translation.service.mock';
import { UploadService } from '../services/upload.service';
describe('FileUploadDialog', () => { describe('FileUploadDialog', () => {
let componentFixture; let componentFixture;
@@ -33,6 +40,7 @@ describe('FileUploadDialog', () => {
beforeEachProviders(() => { beforeEachProviders(() => {
return [ return [
HTTP_PROVIDERS, HTTP_PROVIDERS,
AlfrescoApiService,
AlfrescoSettingsService, AlfrescoSettingsService,
AlfrescoAuthenticationService, AlfrescoAuthenticationService,
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslationService, useClass: TranslationMock },

12
ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
View File

@@ -17,11 +17,18 @@
import { describe, expect, it, inject, beforeEach, beforeEachProviders } from '@angular/core/testing'; import { describe, expect, it, inject, beforeEach, beforeEachProviders } from '@angular/core/testing';
import { TestComponentBuilder } from '@angular/compiler/testing'; import { TestComponentBuilder } from '@angular/compiler/testing';
import { HTTP_PROVIDERS } from '@angular/http';
import {
AlfrescoTranslationService,
AlfrescoSettingsService,
AlfrescoAuthenticationService,
AlfrescoApiService
} from 'ng2-alfresco-core';
import { UploadButtonComponent } from './upload-button.component'; import { UploadButtonComponent } from './upload-button.component';
import { AlfrescoTranslationService, AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { TranslationMock } from '../assets/translation.service.mock'; import { TranslationMock } from '../assets/translation.service.mock';
import { UploadService } from '../services/upload.service'; import { UploadService } from '../services/upload.service';
import { HTTP_PROVIDERS } from '@angular/http';
declare var AlfrescoApi: any; declare var AlfrescoApi: any;
@@ -71,6 +78,7 @@ describe('AlfrescoUploadButton', () => {
HTTP_PROVIDERS, HTTP_PROVIDERS,
AlfrescoSettingsService, AlfrescoSettingsService,
AlfrescoAuthenticationService, AlfrescoAuthenticationService,
AlfrescoApiService,
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslationService, useClass: TranslationMock },
UploadService UploadService
]; ];

3
ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
View File

@@ -18,7 +18,7 @@
import { describe, expect, it, inject, beforeEach, beforeEachProviders } from '@angular/core/testing'; import { describe, expect, it, inject, beforeEach, beforeEachProviders } from '@angular/core/testing';
import { TestComponentBuilder } from '@angular/compiler/testing'; import { TestComponentBuilder } from '@angular/compiler/testing';
import { UploadDragAreaComponent } from './upload-drag-area.component'; import { UploadDragAreaComponent } from './upload-drag-area.component';
import { AlfrescoTranslationService, AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { AlfrescoTranslationService, AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core';
import { TranslationMock } from '../assets/translation.service.mock'; import { TranslationMock } from '../assets/translation.service.mock';
import { UploadService } from '../services/upload.service'; import { UploadService } from '../services/upload.service';
import { HTTP_PROVIDERS } from '@angular/http'; import { HTTP_PROVIDERS } from '@angular/http';
@@ -39,6 +39,7 @@ describe('AlfrescoUploadDragArea', () => {
HTTP_PROVIDERS, HTTP_PROVIDERS,
AlfrescoSettingsService, AlfrescoSettingsService,
AlfrescoAuthenticationService, AlfrescoAuthenticationService,
AlfrescoApiService,
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslationService, useClass: TranslationMock },
UploadService UploadService
]; ];

10
ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts
View File

@@ -18,7 +18,7 @@
import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing'; import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing';
import { EventEmitter } from '@angular/core'; import { EventEmitter } from '@angular/core';
import { UploadService } from './upload.service'; import { UploadService } from './upload.service';
import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { AlfrescoSettingsService, AlfrescoApiService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
declare let AlfrescoApi: any; declare let AlfrescoApi: any;
declare let jasmine: any; declare let jasmine: any;
@@ -39,14 +39,16 @@ describe('AlfrescoUploadService', () => {
beforeEachProviders(() => { beforeEachProviders(() => {
return [ return [
AlfrescoSettingsService, AlfrescoSettingsService,
AlfrescoApiService,
AlfrescoAuthenticationService, AlfrescoAuthenticationService,
UploadService UploadService
]; ];
}); });
beforeEach( inject([UploadService], (uploadService: UploadService) => { beforeEach( inject([UploadService, AlfrescoApiService], (uploadService: UploadService, apiService: AlfrescoApiService) => {
jasmine.Ajax.install(); jasmine.Ajax.install();
service = uploadService; service = uploadService;
apiService.setInstance(new AlfrescoApi({}));
})); }));
afterEach(() => { afterEach(() => {
@@ -85,7 +87,7 @@ describe('AlfrescoUploadService', () => {
service.uploadFilesInTheQueue('fake-dir', emitter); service.uploadFilesInTheQueue('fake-dir', emitter);
let request = jasmine.Ajax.requests.mostRecent(); let request = jasmine.Ajax.requests.mostRecent();
expect(request.url).toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children'); expect(request.url).toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children');
expect(request.method).toBe('POST'); expect(request.method).toBe('POST');
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
@@ -107,7 +109,7 @@ describe('AlfrescoUploadService', () => {
service.addToQueue(filesFake); service.addToQueue(filesFake);
service.uploadFilesInTheQueue('', emitter); service.uploadFilesInTheQueue('', emitter);
expect(jasmine.Ajax.requests.mostRecent().url) expect(jasmine.Ajax.requests.mostRecent().url)
.toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children'); .toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children');
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
'status': 404, 'status': 404,
contentType: 'text/plain', contentType: 'text/plain',

8
ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
View File

@@ -19,7 +19,7 @@ import { EventEmitter, Injectable } from '@angular/core';
import { Response } from '@angular/http'; import { Response } from '@angular/http';
import { Observable } from 'rxjs/Observable'; import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer'; import { Observer } from 'rxjs/Observer';
import { AlfrescoAuthenticationService} from 'ng2-alfresco-core'; import { AlfrescoApiService } from 'ng2-alfresco-core';
import { FileModel } from '../models/file.model'; import { FileModel } from '../models/file.model';
/** /**
@@ -42,7 +42,7 @@ export class UploadService {
filesUpload$: Observable<FileModel[]>; filesUpload$: Observable<FileModel[]>;
totalCompleted$: Observable<any>; totalCompleted$: Observable<any>;
constructor(private authService: AlfrescoAuthenticationService) { constructor(private apiService: AlfrescoApiService) {
this.filesUpload$ = new Observable<FileModel[]>(observer => this.filesUploadObserverProgressBar = observer).share(); this.filesUpload$ = new Observable<FileModel[]>(observer => this.filesUploadObserverProgressBar = observer).share();
this.totalCompleted$ = new Observable<number>(observer => this.totalCompletedObserver = observer).share(); this.totalCompleted$ = new Observable<number>(observer => this.totalCompletedObserver = observer).share();
} }
@@ -91,7 +91,7 @@ export class UploadService {
filesToUpload.forEach((uploadingFileModel: FileModel) => { filesToUpload.forEach((uploadingFileModel: FileModel) => {
uploadingFileModel.setUploading(); uploadingFileModel.setUploading();
let promiseUpload = this.authService.getAlfrescoApi(). let promiseUpload = this.apiService.getInstance().
upload.uploadFile(uploadingFileModel.file, directory, null, null, {renditions: 'doclib'}) upload.uploadFile(uploadingFileModel.file, directory, null, null, {renditions: 'doclib'})
.on('progress', (progress: any) => { .on('progress', (progress: any) => {
uploadingFileModel.setProgres(progress); uploadingFileModel.setProgres(progress);
@@ -161,7 +161,7 @@ export class UploadService {
} }
private callApiCreateFolder(relativePath: string, name: string) { private callApiCreateFolder(relativePath: string, name: string) {
return this.authService.getAlfrescoApi().node.createFolder(name, relativePath); return this.apiService.getInstance().nodes.createFolder(name, relativePath);
} }
/** /**