fix: missing global metadata option

kukhariev · Mar 12, 2019 · d868e78 · d868e78
1 parent 2dfca70
commit d868e78
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/app/directive-way/directive-way.component.ts b/src/app/directive-way/directive-way.component.ts
@@ -26,6 +26,7 @@ export class DirectiveWayComponent implements OnDestroy {
       token: () => {
         return 'sometoken';
       },
+      metadata: (f: File) => ({ title: f.name }),
       autoUpload: true,
       withCredentials: false,
       chunkSize: 1024 * 256 * 8,

diff --git a/src/uploadx/src/interfaces.ts b/src/uploadx/src/interfaces.ts
@@ -76,7 +76,7 @@ export interface UploadItem {
    * @defaultValue
    * { name: File.Filename, mimeType: File.type }
    */
-  metadata?: any;
+  metadata?: { [key: string]: any } | ((file?: File) => { [key: string]: any });
   /**
    * Authorization Bearer token
    */
@@ -116,6 +116,12 @@ export class UploadxOptions {
    * @defaultValue 'POST'
    */
   method?: string;
+  /**
+   * Upload meta
+   * @defaultValue
+   * { name: File.Filename, mimeType: File.type }
+   */
+  metadata?: { [key: string]: any } | ((file?: File) => { [key: string]: any });
   /**
    * Authorization Bearer token
    */

diff --git a/src/uploadx/src/uploader.ts b/src/uploadx/src/uploader.ts
@@ -299,7 +299,7 @@ export class Uploader {
         resolve();
       };
       xhr.onerror = () => reject();
-      const body = typeof payload === 'object' ? JSON.stringify(payload) : null;
+      const body = payload ? JSON.stringify(payload) : null;
       xhr.send(body);
     });
   }

diff --git a/src/uploadx/src/uploadx.service.ts b/src/uploadx/src/uploadx.service.ts
@@ -30,6 +30,7 @@ export class UploadxService {
       // tslint:disable-next-line: deprecation
       endpoint: this.options.endpoint || this.options.url || '/upload/',
       headers: this.options.headers,
+      metadata: this.options.metadata,
       token: this.options.token,
       chunkSize: this.options.chunkSize,
       withCredentials: this.options.withCredentials,