[ADF-2645] move the service use in the upload in the right place (#3189)

[ADF-2645] move the service use in the upload in the right place 
[ADF-2687] No message is displayed when deleting a file/folder from content action
[ADF-2714] [demo shell] Not able to download a version of a file

* add spaces tslint fix

lib/content-services/upload/components/upload-button.component.spec.ts

@@ -33,13 +33,15 @@ describe('UploadButtonComponent', () => {
     };
 
     let fakeFolderNodeWithPermission = {
-        allowableOperations: [
-            'create',
-            'update'
-        ],
-        isFolder: true,
-        name: 'Folder Fake Name',
-        nodeType: 'cm:folder'
+        entry: {
+            allowableOperations: [
+                'create',
+                'update'
+            ],
+            isFolder: true,
+            name: 'Folder Fake Name',
+            nodeType: 'cm:folder'
+        }
     };
 
     let component: UploadButtonComponent;
@@ -54,6 +56,7 @@ describe('UploadButtonComponent', () => {
             ],
             providers: [
                 UploadService,
+                ContentService,
                 { provide: TranslationService, useClass: TranslationMock }
             ]
         }).compileComponents();
@@ -98,7 +101,7 @@ describe('UploadButtonComponent', () => {
         component.rootFolderId = '-root-';
         component.success = null;
 
-        spyOn(component, 'getFolderNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
+        spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
 
         component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
         uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -113,7 +116,7 @@ describe('UploadButtonComponent', () => {
         component.rootFolderId = '-my-';
         component.success = null;
 
-        spyOn(component, 'getFolderNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
+        spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
         component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
 
         uploadService.uploadFilesInTheQueue = jasmine.createSpy('uploadFilesInTheQueue');
@@ -128,7 +131,7 @@ describe('UploadButtonComponent', () => {
         component.rootFolderId = '-my-';
 
         spyOn(contentService, 'createFolder').and.returnValue(Observable.of(true));
-        spyOn(component, 'getFolderNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
+        spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeFolderNodeWithPermission));
 
         component.ngOnChanges({ rootFolderId: new SimpleChange(null, component.rootFolderId, true) });
         fixture.detectChanges();

lib/content-services/upload/components/upload-button.component.ts

@@ -15,29 +15,11 @@
  * limitations under the License.
  */
 
-import {
-    AlfrescoApiService,
-    EXTENDIBLE_COMPONENT,
-    FileModel,
-    FileUtils,
-    LogService,
-    NodePermissionSubject,
-    TranslationService,
-    UploadService
+import { ContentService, EXTENDIBLE_COMPONENT, FileModel, FileUtils,
+    LogService, NodePermissionSubject, TranslationService, UploadService
 } from '@alfresco/adf-core';
-import {
-    Component,
-    EventEmitter,
-    forwardRef,
-    Input,
-    OnChanges,
-    OnInit,
-    Output,
-    SimpleChanges,
-    ViewEncapsulation
-} from '@angular/core';
-import { MinimalNodeEntryEntity } from 'alfresco-js-api';
-import { Observable } from 'rxjs/Observable';
+import { Component, EventEmitter, forwardRef, Input,
+    OnChanges, OnInit, Output, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { Subject } from 'rxjs/Subject';
 import { PermissionModel } from '../../document-list/models/permissions.model';
 import 'rxjs/add/observable/throw';
@@ -111,7 +93,7 @@ export class UploadButtonComponent extends UploadBase implements OnInit, OnChang
     private permissionValue: Subject<boolean> = new Subject<boolean>();
 
     constructor(private uploadService: UploadService,
-                private apiService: AlfrescoApiService,
+                private contentService: ContentService,
                 protected translateService: TranslationService,
                 protected logService: LogService
             ) {
@@ -221,31 +203,18 @@ export class UploadButtonComponent extends UploadBase implements OnInit, OnChang
 
     checkPermission() {
         if (this.rootFolderId) {
-            this.getFolderNode(this.rootFolderId).subscribe(
-                res => this.permissionValue.next(this.hasCreatePermission(res)),
+            let opts: any = {
+                includeSource: true,
+                include: ['allowableOperations']
+            };
+
+            this.contentService.getNode(this.rootFolderId, opts).subscribe(
+                res => this.permissionValue.next(this.hasCreatePermission(res.entry)),
                 error => this.error.emit(error)
             );
         }
     }
 
-    // TODO: move to ContentService
-    getFolderNode(nodeId: string): Observable<MinimalNodeEntryEntity> {
-        let opts: any = {
-            includeSource: true,
-            include: ['allowableOperations']
-        };
-
-        return Observable.fromPromise(this.apiService.getInstance().nodes.getNodeInfo(nodeId, opts))
-            .catch(err => this.handleError(err));
-    }
-
-    private handleError(error: Response) {
-        // in a real world app, we may send the error to some remote logging infrastructure
-        // instead of just logging it to the console
-        this.logService.error(error);
-        return Observable.throw(error || 'Server error');
-    }
-
     private hasCreatePermission(node: any): boolean {
         if (node && node.allowableOperations) {
             return node.allowableOperations.find(permission => permission === 'create') ? true : false;