Upgraded Uppy lib, added Uppy restrictions object into the form config.

redbox-mint · Sep 6, 2021 · e08d88c · e08d88c
1 parent 55bd03b
commit e08d88c
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 96 deletions.
diff --git a/angular/package-lock.json b/angular/package-lock.json
diff --git a/angular/package.json b/angular/package.json
@@ -45,7 +45,7 @@
     "owasp-password-strength-test": "1.3.0",
     "rxjs": "^5.4.1",
     "ts-smart-logger": "^0.0.4",
-    "uppy": "^0.23.3",
+    "uppy": "^0.25.6",
     "zone.js": "^0.8.14"
   },
   "devDependencies": {

diff --git a/angular/shared/form/field-datalocation.component.ts b/angular/shared/form/field-datalocation.component.ts
@@ -72,6 +72,7 @@ export class DataLocationField extends FieldBase<any> {
   maxFileSize: number; // in bytes
   maxNumberOfFiles: number;
   allowedFileTypes: any[];
+  restrictions: any;
   locationAddText: string;
   editNotesButtonText: string;
   editNotesTitle: string;
@@ -99,9 +100,7 @@ export class DataLocationField extends FieldBase<any> {
     this.uppyDashboardNote = this.getTranslated(options['uppyDashboardNote'], 'Maximum upload size: 1 Gb per file');
     this.columns = options['columns'] || [];
 
-    this.maxFileSize = options['maxFileSize'] || null;
-    this.maxNumberOfFiles = options['maxNumberOfFiles'] || null;
-    this.allowedFileTypes = options['allowedFileTypes'] || null;
+    this.restrictions = options['restrictions'] || null;
 
     this.value = options['value'] || this.setEmptyValue();
     this.recordsService = this.getFromInjector(RecordsService);
@@ -230,11 +229,7 @@ export class DataLocationComponent extends SimpleComponent {
     const uppyConfig = {
       debug: true,
       autoProceed: false,
-      restrictions: {
-        maxFileSize: this.field.maxFileSize,
-        maxNumberOfFiles: this.field.maxNumberOfFiles,
-        allowedFileTypes: this.field.allowedFileTypes
-      }
+      restrictions: this.field.restrictions
     };
     const uppyDashboardNote = this.field.uppyDashboardNote;
     console.debug(`Using Uppy config:`);