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

Migrate from window.console to LogService

Browse Source
This commit is contained in:
Denys Vuika
2017-01-05 21:06:30 +00:00
parent 2d98a04f87
commit d42f41ec00
106 changed files with 1177 additions and 1171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@
import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core';
import 'rxjs/Rx';
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
import { UploadService } from '../services/upload.service';
import { FileModel } from '../models/file.model';
@@ -88,9 +88,10 @@ export class UploadButtonComponent {
@Output()
createFolder = new EventEmitter();
constructor(public el: ElementRef,
constructor(private el: ElementRef,
private uploadService: UploadService,
private translateService: AlfrescoTranslateService) {
private translateService: AlfrescoTranslateService,
private logService: LogService) {
if (translateService) {
translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src');
}
@@ -141,7 +142,7 @@ export class UploadButtonComponent {
this._showErrorNotificationBar(errorMessage);
}
}
console.log(error);
this.logService.error(error);
}
);
});

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

@@ -16,9 +16,8 @@
*/
import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { EventEmitter } from '@angular/core';
import { DebugElement } from '@angular/core';
import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import { EventEmitter, DebugElement } from '@angular/core';
import { AlfrescoTranslateService, CoreModule, LogService } from 'ng2-alfresco-core';
import { UploadDragAreaComponent } from './upload-drag-area.component';
import { TranslationMock } from '../assets/translation.service.mock';
@@ -31,6 +30,7 @@ describe('UploadDragAreaComponent', () => {
let debug: DebugElement;
let element: HTMLElement;
let uploadService: UploadService;
let logService: LogService;
beforeEach(async(() => {
TestBed.configureTestingModule({
@@ -48,6 +48,7 @@ describe('UploadDragAreaComponent', () => {
}));
beforeEach(() => {
logService = TestBed.get(LogService);
fixture = TestBed.createComponent(UploadDragAreaComponent);
uploadService = TestBed.get(UploadService);
@@ -64,12 +65,12 @@ describe('UploadDragAreaComponent', () => {
it('should show an folder non supported error in console when the file type is empty', () => {
component.showUdoNotificationBar = false;
spyOn(console, 'error');
spyOn(logService, 'error');
let fileFake = new File([''], 'folder-fake', {type: ''});
component.onFilesDropped([fileFake]);
expect(console.error).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED');
expect(logService.error).toHaveBeenCalledWith('FILE_UPLOAD.MESSAGES.FOLDER_NOT_SUPPORTED');
});
it('should show an folder non supported error in the notification bar when the file type is empty', () => {

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

@@ -16,8 +16,8 @@
*/
import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core';
import { AlfrescoTranslateService, LogService } from 'ng2-alfresco-core';
import { UploadService } from '../services/upload.service';
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { FileModel } from '../models/file.model';
declare let componentHandler: any;
@@ -62,7 +62,8 @@ export class UploadDragAreaComponent {
onSuccess = new EventEmitter();
constructor(private uploadService: UploadService,
private translateService: AlfrescoTranslateService) {
private translateService: AlfrescoTranslateService,
private logService: LogService) {
if (translateService) {
translateService.addTranslationFolder('ng2-alfresco-upload', 'node_modules/ng2-alfresco-upload/src');
}
@@ -93,7 +94,7 @@ export class UploadDragAreaComponent {
if (this.showUdoNotificationBar) {
this.showErrorNotificationBar(errorMessage.value);
} else {
console.error(errorMessage.value);
this.logService.error(errorMessage.value);
}
}
}
@@ -156,7 +157,7 @@ export class UploadDragAreaComponent {
if (this.showUdoNotificationBar) {
this.showErrorNotificationBar(errorMessage);
} else {
console.error(errorMessage);
this.logService.error(errorMessage);
}
}