From 6e09b9c550d149f578968176434ed3de1c338057 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Sun, 11 Jun 2017 12:02:05 +0100
Subject: [PATCH] [ADF-643] upload enhancements (#1949)

* rework folder uploading

- flatterns hierarchy on folder upload
- performs a single traversal for the entire folder heirarchy and ends with a comple file list
- allows now dropping folders on existing folders
- overall code improvements

* fix unit tests

* readme updates

* clean old and unused code

* code cleanup

* limit concurrent uploads

* update code as per review

* fix upload button for Safari

* fixes for Safari

- Safari compatibility
- code updates based on review

* fix code

* fix unit tests
---
 demo-shell-ng2/app/components/files/files.component.ts    | 8 ++------
 .../src/components/upload-button.component.ts             | 1 +
 .../src/components/upload-drag-area.component.spec.ts     | 2 +-
 .../src/components/upload-drag-area.component.ts          | 6 ++++++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts
index d4cea8f710..6a54eac5c5 100644
--- a/demo-shell-ng2/app/components/files/files.component.ts
+++ b/demo-shell-ng2/app/components/files/files.component.ts
@@ -150,12 +150,8 @@ export class FilesComponent implements OnInit {
         dialogRef.afterClosed().subscribe(folderName => {
             if (folderName) {
                 this.contentService.createFolder('', folderName, this.documentList.currentFolderId).subscribe(
-                    node => {
-                        console.log(node);
-                    },
-                    err => {
-                        console.log(err);
-                    }
+                    node => console.log(node),
+                    err => console.log(err)
                 );
             }
         });
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
index 8f6d4538ef..0530fe1cf6 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
@@ -211,6 +211,7 @@ export class UploadButtonComponent implements OnInit, OnChanges {
         return Observable.throw(error || 'Server error');
     }
 
+    // TODO: move to AlfrescoContentService
     getFolderNode(nodeId: string): Observable<MinimalNodeEntryEntity> {
         let opts: any = {
             includeSource: true,
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
index 5f31476bdd..3df8abfbc0 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts
@@ -128,7 +128,7 @@ describe('UploadDragAreaComponent', () => {
         component.showUndoNotificationBar = jasmine.createSpy('_showUndoNotificationBar');
 
         fixture.detectChanges();
-        let fileFake = new FileModel(<File> {name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json'});
+        let fileFake = <File> {name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json'};
         let filesList = [fileFake];
 
         component.onFilesDropped(filesList);
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 54f8b299a1..de576a7637 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
@@ -39,6 +39,12 @@ export class UploadDragAreaComponent {
     @Input()
     enabled: boolean = true;
 
+    /**
+     * @deprecated Deprecated in 1.6.0, you can use UploadService events and NotificationService api instead.
+     *
+     * @type {boolean}
+     * @memberof UploadButtonComponent
+     */
     @Input()
     showNotificationBar: boolean = true;