Migrate from window.console to LogService

ng2-components/ng2-alfresco-webscript/demo/src/main.ts

@@ -1,120 +1,121 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { NgModule, Component, OnInit } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { CoreModule, SettingsService, AuthService, StorageService } from 'ng2-alfresco-core';
-import { DataTableModule }  from 'ng2-alfresco-datatable';
-import { WebScriptModule } from 'ng2-alfresco-webscript';
-
-@Component({
-    selector: 'alfresco-app-demo',
-    template: `
-               <label for="ticket"><b>Insert a valid access ticket / ticket:</b></label><br>
-               <input id="ticket" type="text" size="48" (change)="updateTicket()" [(ngModel)]="ticket"><br>
-               <label for="host"><b>Insert the ip of your Alfresco instance:</b></label><br>
-               <input id="host" type="text" size="48" (change)="updateHost()" [(ngModel)]="ecmHost"><br><br>
-               <div *ngIf="!authenticated" style="color:#FF2323">
-                    Authentication failed to ip {{ ecmHost }} with user: admin, admin, you can still try to add a valid ticket to perform
-                    operations.
-               </div>
-               <hr>
-                <label for="scriptPath"><b>Insert a scriptPath</b></label><br>
-                <input id="scriptPath" type="text" size="48"  [(ngModel)]="scriptPath"><br>
-                <label for="contextRoot"><b>Insert a contextRoot</b></label><br>
-                <input id="contextRoot" type="text" size="48"  [(ngModel)]="contextRoot"><br>
-                <label for="servicePath"><b>Insert a servicePath</b></label><br>
-                <input id="servicePath" type="text" size="48"  [(ngModel)]="servicePath"><br>
-        <div class="container" *ngIf="authenticated">
-            <alfresco-webscript-get [scriptPath]="scriptPath"
-                           [scriptArgs]="scriptArgs"
-                           [contextRoot]="contextRoot"
-                           [servicePath]="servicePath"
-                           [contentType]="'HTML'"
-                           (onSuccess)= "logData($event)"></alfresco-webscript-get>
-        </div>
-    `
-})
-class WebscriptDemo implements OnInit {
-
-    currentPath: string = '/';
-    authenticated: boolean;
-    ecmHost: string = 'http://127.0.0.1:8080';
-    scriptPath: string = 'sample/folder/Company%20Home';
-    contextRoot: string = 'alfresco';
-    servicePath: string = 'service';
-    scriptArgs: string = '';
-    ticket: string;
-
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { NgModule, Component, OnInit } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { CoreModule, SettingsService, AuthService, StorageService, LogService } from 'ng2-alfresco-core';
+import { DataTableModule }  from 'ng2-alfresco-datatable';
+import { WebScriptModule } from 'ng2-alfresco-webscript';
+
+@Component({
+    selector: 'alfresco-app-demo',
+    template: `
+               <label for="ticket"><b>Insert a valid access ticket / ticket:</b></label><br>
+               <input id="ticket" type="text" size="48" (change)="updateTicket()" [(ngModel)]="ticket"><br>
+               <label for="host"><b>Insert the ip of your Alfresco instance:</b></label><br>
+               <input id="host" type="text" size="48" (change)="updateHost()" [(ngModel)]="ecmHost"><br><br>
+               <div *ngIf="!authenticated" style="color:#FF2323">
+                    Authentication failed to ip {{ ecmHost }} with user: admin, admin, you can still try to add a valid ticket to perform
+                    operations.
+               </div>
+               <hr>
+                <label for="scriptPath"><b>Insert a scriptPath</b></label><br>
+                <input id="scriptPath" type="text" size="48"  [(ngModel)]="scriptPath"><br>
+                <label for="contextRoot"><b>Insert a contextRoot</b></label><br>
+                <input id="contextRoot" type="text" size="48"  [(ngModel)]="contextRoot"><br>
+                <label for="servicePath"><b>Insert a servicePath</b></label><br>
+                <input id="servicePath" type="text" size="48"  [(ngModel)]="servicePath"><br>
+        <div class="container" *ngIf="authenticated">
+            <alfresco-webscript-get [scriptPath]="scriptPath"
+                           [scriptArgs]="scriptArgs"
+                           [contextRoot]="contextRoot"
+                           [servicePath]="servicePath"
+                           [contentType]="'HTML'"
+                           (onSuccess)= "logData($event)"></alfresco-webscript-get>
+        </div>
+    `
+})
+class WebscriptDemo implements OnInit {
+
+    currentPath: string = '/';
+    authenticated: boolean;
+    ecmHost: string = 'http://127.0.0.1:8080';
+    scriptPath: string = 'sample/folder/Company%20Home';
+    contextRoot: string = 'alfresco';
+    servicePath: string = 'service';
+    scriptArgs: string = '';
+    ticket: string;
+
     constructor(private authService: AuthService,
                 private settingsService: SettingsService,
-                private storage: StorageService) {
-
-        settingsService.ecmHost = this.ecmHost;
-        settingsService.setProviders('ECM');
-
-        if (this.authService.getTicketEcm()) {
-            this.ticket = this.authService.getTicketEcm();
-        }
-    }
-
-    public updateTicket(): void {
-        this.storage.setItem('ticket-ECM', this.ticket);
-    }
-
-    public updateHost(): void {
-        this.settingsService.ecmHost = this.ecmHost;
-        this.login();
-    }
-
-    ngOnInit() {
-        this.login();
-    }
-
-    login() {
-        this.authService.login('admin', 'admin').subscribe(
-            ticket => {
-                console.log(ticket);
-                this.ticket = this.authService.getTicketEcm();
-                this.authenticated = true;
-            },
-            error => {
-                console.log(error);
-                this.authenticated = false;
-            });
-    }
-
-    logData(data) {
-        console.log(data);
-    }
-}
-
-@NgModule({
-    imports: [
-        BrowserModule,
-        CoreModule.forRoot(),
-        DataTableModule,
-        WebScriptModule
-    ],
-    declarations: [ WebscriptDemo ],
-    bootstrap:    [ WebscriptDemo ]
-})
-export class AppModule { }
-
-platformBrowserDynamic().bootstrapModule(AppModule);
+                private storage: StorageService,
+                private logService: LogService) {
+
+        settingsService.ecmHost = this.ecmHost;
+        settingsService.setProviders('ECM');
+
+        if (this.authService.getTicketEcm()) {
+            this.ticket = this.authService.getTicketEcm();
+        }
+    }
+
+    public updateTicket(): void {
+        this.storage.setItem('ticket-ECM', this.ticket);
+    }
+
+    public updateHost(): void {
+        this.settingsService.ecmHost = this.ecmHost;
+        this.login();
+    }
+
+    ngOnInit() {
+        this.login();
+    }
+
+    login() {
+        this.authService.login('admin', 'admin').subscribe(
+            ticket => {
+                this.logService.info(ticket);
+                this.ticket = this.authService.getTicketEcm();
+                this.authenticated = true;
+            },
+            error => {
+                this.logService.error(error);
+                this.authenticated = false;
+            });
+    }
+
+    logData(data) {
+        this.logService.info(data);
+    }
+}
+
+@NgModule({
+    imports: [
+        BrowserModule,
+        CoreModule.forRoot(),
+        DataTableModule,
+        WebScriptModule
+    ],
+    declarations: [ WebscriptDemo ],
+    bootstrap:    [ WebscriptDemo ]
+})
+export class AppModule { }
+
+platformBrowserDynamic().bootstrapModule(AppModule);

ng2-components/ng2-alfresco-webscript/src/webscript.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { AlfrescoApiService } from 'ng2-alfresco-core';
+import { AlfrescoApiService, LogService } from 'ng2-alfresco-core';
 import { ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
 
 /**
@@ -76,10 +76,10 @@ export class WebscriptComponent {
     onSuccess = new EventEmitter();
 
     data: any = undefined;
-
     showError: boolean = false;
 
-    constructor(private apiService: AlfrescoApiService) {
+    constructor(private apiService: AlfrescoApiService,
+                private logService: LogService) {
     }
 
     ngOnChanges(changes) {
@@ -101,8 +101,8 @@ export class WebscriptComponent {
                 this.onSuccess.emit(this.data);
 
                 resolve();
-            }, function (error) {
-                console.log('Error' + error);
+            }, (error) => {
+                this.logService.log('Error' + error);
                 reject();
             });
         });
@@ -128,7 +128,7 @@ export class WebscriptComponent {
             }
 
         } catch (e) {
-            console.log('error during the cast as datatable');
+            this.logService.error('error during the cast as datatable');
         }
 
         return datatableData;