[ADF-571] upload feature rework (#1922)

* upload feature rework

lots of improvements for upload dialog and underlying services

* readme update

- readme cleanup
- remove some old comments from code
- update readme with new events for Upload Service

* restore prerequisites section in readme

ng2-components/ng2-alfresco-upload/src/models/file.model.ts

@@ -15,130 +15,58 @@
  * limitations under the License.
  */
 
-/**
- *
- * This object represent the status of an uploading file.
- *
- *
- * @returns {FileModel} .
- */
-export class FileModel {
-    id: string;
-    status: number;
-    statusText: string;
-    progress: Object;
-    name: string;
-    size: string;
-    response: string;
-    done: boolean = false;
-    error: boolean = false;
-    abort: boolean = false;
-    uploading: boolean = false;
-    file: File;
-    promiseUpload: any;
-
-    options: FileUploadOptions;
-
-    constructor(file: File, options?: FileUploadOptions) {
-        this.file = file;
-        this.options = Object.assign({}, {
-            newVersion: false
-        }, options);
-        this.id = this.generateId();
-        this.name = file.name;
-        this.size = this.getFileSize(file.size);
-        this.progress = {
-            loaded: 0,
-            total: 0,
-            percent: 0
-        };
-    }
-
-    setProgres(progress: any): void {
-        this.progress = progress;
-    }
-
-    /**
-     * Emit an event progress on the promise
-     */
-    emitProgres(progress: any): void {
-        this.setProgres(progress);
-        this.promiseUpload.emit('progress', progress);
-    }
-
-    setError(): void {
-        this.error = true;
-    }
-
-    /**
-     * Emit an event progress on the promise
-     */
-    emitError(): void {
-        this.setError();
-        this.promiseUpload.emit('error');
-    }
-
-    setUploading() {
-        this.uploading = true;
-    }
-
-    setPromiseUpload(promiseUpload: any) {
-        this.promiseUpload = promiseUpload;
-    }
-
-    /**
-     * Stop the uploading of the file.
-     */
-    setAbort(): void {
-        if (!this.done && !this.error) {
-            this.abort = true;
-            this.uploading = false;
-        }
-    }
-
-    /**
-     * Emit an event abort on the promise
-     */
-    emitAbort(): void {
-        this.setAbort();
-        this.promiseUpload.abort();
-    }
-
-    /**
-     * Update status of the file when upload finish or is ended.
-     */
-    onFinished(status: number, statusText: string, response: string): void {
-        this.status = status;
-        this.statusText = statusText;
-        this.response = response;
-        this.done = true;
-        this.uploading = false;
-    }
-
-    /**
-     * Calculate the size of the file in kb,mb and gb.
-     *
-     * @param {number} sizeinbytes - size in bytes of the file.
-     */
-    private getFileSize(sizeinbytes: number): string {
-        let fSExt = new Array('Bytes', 'KB', 'MB', 'GB');
-        let size = sizeinbytes;
-        let i = 0;
-        while (size > 900) {
-            size /= 1000;
-            i++;
-        }
-        return Math.round((Math.round(size * 100) / 100)) + ' ' + fSExt[i];
-    }
-
-    private generateId(): string {
-        return 'uploading-file-' + 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-                let r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
-                return v.toString(16);
-            });
-    }
+export interface FileUploadProgress {
+    loaded: number;
+    total: number;
+    percent: number;
 }
 
 export interface FileUploadOptions {
     newVersion?: boolean;
 }
+
+export enum FileUploadStatus {
+    Pending = 0,
+    Complete = 1,
+    Starting = 2,
+    Progress = 3,
+    Cancelled = 4,
+    Aborted = 5,
+    Error = 6
+}
+
+export class FileModel {
+    readonly id: string;
+    readonly name: string;
+    readonly size: number;
+    readonly file: File;
+
+    status: FileUploadStatus = FileUploadStatus.Pending;
+    progress: FileUploadProgress;
+    options: FileUploadOptions;
+
+    constructor(file: File, options?: FileUploadOptions) {
+        this.file = file;
+
+        this.id = this.generateId();
+        this.name = file.name;
+        this.size = file.size;
+
+        this.progress = {
+            loaded: 0,
+            total: 0,
+            percent: 0
+        };
+
+        this.options = Object.assign({}, {
+            newVersion: false
+        }, options);
+    }
+
+    private generateId(): string {
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+            let r = Math.random() * 16 | 0, v = c === 'x' ? r : (r & 0x3 | 0x8);
+            return v.toString(16);
+        });
+    }
+}