From f97d31f530ee2ac44e0eec135bed5d865930dd06 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Fri, 13 May 2016 10:00:12 +0100 Subject: [PATCH] #46 Fixed build error --- .../src/components/upload-drag-area.component.ts | 7 +++++-- .../ng2-alfresco-upload/src/services/upload.service.ts | 6 +++--- .../test/components/upload-button.component.spec.ts | 4 ++-- .../test/services/upload.service.spec.ts | 8 ++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index 4cb15f85f3..7d39da46c8 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, ViewChild, ElementRef, Input } from 'angular2/core'; +import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from 'angular2/core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; import { FileUploadingDialogComponent } from './file-uploading-dialog.component'; @@ -55,6 +55,9 @@ export class UploadDragAreaComponent { @Input() uploaddirectory: string = ''; + @Output() + onSuccess = new EventEmitter(); + constructor(public el: ElementRef) { console.log('UploadComponent constructor', el); @@ -79,7 +82,7 @@ export class UploadDragAreaComponent { onFilesDropped(files: File[]): void { if (files.length) { this._uploaderService.addToQueue(files); - this._uploaderService.uploadFilesInTheQueue(this.uploaddirectory); + this._uploaderService.uploadFilesInTheQueue(this.uploaddirectory, this.onSuccess); this.filesUploadingList = this._uploaderService.getQueue(); if (this.showUploadDialog) { this._showDialog(); 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 52d7809c57..a6681b82f4 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -72,7 +72,7 @@ export class UploadService { /** * Pick all the files in the queue that are not been uploaded yet and upload it into the directory folder. */ - public uploadFilesInTheQueue(directory: string, elementEmit: EventEmitter): void { + public uploadFilesInTheQueue(directory: string, elementEmit: EventEmitter): void { let filesToUpload = this._queue.filter((uploadingFileModel) => { return !uploadingFileModel.uploading && !uploadingFileModel.done && !uploadingFileModel.abort && !uploadingFileModel.error; }); @@ -85,7 +85,7 @@ export class UploadService { /** * The method create a new XMLHttpRequest instance if doesn't exist */ - private _configureXMLHttpRequest(uploadingFileModel: any, elementEmit: EventEmitter) { + private _configureXMLHttpRequest(uploadingFileModel: any, elementEmit: EventEmitter) { if (this._xmlHttpRequest === undefined) { this._xmlHttpRequest = new XMLHttpRequest(); this._xmlHttpRequest.upload.onprogress = (e) => { @@ -128,7 +128,7 @@ export class UploadService { * @param {FileModel} - files to be uploaded. * */ - uploadFile(uploadingFileModel: FileModel, directory: string, elementEmit: EventEmitter): void { + uploadFile(uploadingFileModel: FileModel, directory: string, elementEmit: EventEmitter): void { let form = new FormData(); form.append(this._fieldName, uploadingFileModel.file, uploadingFileModel.name); Object.keys(this._formFields).forEach((key: any) => { diff --git a/ng2-components/ng2-alfresco-upload/test/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/test/components/upload-button.component.spec.ts index 48e6c0d93d..8029ba0baf 100644 --- a/ng2-components/ng2-alfresco-upload/test/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/test/components/upload-button.component.spec.ts @@ -18,9 +18,9 @@ import { TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS } from 'angular2/platform/testing/browser'; import { it, describe, expect, injectAsync, beforeEachProviders, TestComponentBuilder, setBaseTestProviders } from 'angular2/testing'; -import { Component, provide, Injector } from 'angular2/core'; +import { provide } from 'angular2/core'; import { UploadButtonComponent } from '../../src/components/upload-button.component'; -import { TranslateService, LangChangeEvent } from 'ng2-translate/ng2-translate'; +import { TranslateService } from 'ng2-translate/ng2-translate'; import { TranslationMock } from '../assets/translation.service.mock'; describe('AlfrescoUploadButton', () => { diff --git a/ng2-components/ng2-alfresco-upload/test/services/upload.service.spec.ts b/ng2-components/ng2-alfresco-upload/test/services/upload.service.spec.ts index 47b37d1fec..772f6b2475 100644 --- a/ng2-components/ng2-alfresco-upload/test/services/upload.service.spec.ts +++ b/ng2-components/ng2-alfresco-upload/test/services/upload.service.spec.ts @@ -81,7 +81,7 @@ describe('AlfrescoUploadService', () => { service.setXMLHttpRequest(xhr); let filesFake = [{name: 'fake-name', size: 10}]; service.addToQueue(filesFake); - service.uploadFilesInTheQueue(''); + service.uploadFilesInTheQueue('', null); expect(jasmine.Ajax.requests.mostRecent().url).toBe('/some/cool/url'); expect(doneFn).not.toHaveBeenCalled(); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -96,7 +96,7 @@ describe('AlfrescoUploadService', () => { service.setXMLHttpRequest(xhr); let filesFake = [{name: 'fake-name', size: 10}]; service.addToQueue(filesFake); - service.uploadFilesInTheQueue(''); + service.uploadFilesInTheQueue('', null); expect(jasmine.Ajax.requests.mostRecent().url).toBe('/some/cool/url'); expect(doneFn).not.toHaveBeenCalled(); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -111,7 +111,7 @@ describe('AlfrescoUploadService', () => { service.setXMLHttpRequest(xhr); let filesFake = [{name: 'fake-name', size: 10}]; service.addToQueue(filesFake); - service.uploadFilesInTheQueue(''); + service.uploadFilesInTheQueue('', null); let file = service.getQueue(); file[0].setAbort(); expect(xhr.abort).toHaveBeenCalled(); @@ -122,7 +122,7 @@ describe('AlfrescoUploadService', () => { let filesFake = {name: 'fake-name', size: 10}; let uploadingFileModel = new FileModel(filesFake); - service.uploadFile(uploadingFileModel); + service.uploadFile(uploadingFileModel, '', null); expect(jasmine.Ajax.requests.mostRecent().url).toBe('/some/cool/url'); expect(doneFn).not.toHaveBeenCalled();