Merge pull request #2467 from intersective/prerelease

Hotfix 2.4.5.1

Author: shawnm0705

projects/v3/src/app/components/file-upload/file-upload.component.ts

@@ -1,4 +1,4 @@
-import { UppyUploaderService } from './../uppy-uploader/uppy-uploader.service';
+import { UppyUploaderService, ALLOWED_FILE_TYPES } from './../uppy-uploader/uppy-uploader.service';
 import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
 import { Subject } from 'rxjs';
@@ -10,14 +10,6 @@ import { DashboardOptions } from '@uppy/dashboard';
 type FileMetadata = { [key: string]: any };
 type FileBody = { [key: string]: any };
 
-const ALLOWED_FILE_TYPES = [
-  'image/*',
-  'video/*',
-  '.jpeg',
-  '.png',
-  'application/pdf',
-];
-
 const UPPY_PROPS: DashboardOptions<any, any> = {
   inline: true,
   width: '100%',

projects/v3/src/app/components/uppy-uploader/uppy-uploader.component.ts

@@ -1,11 +1,10 @@
-import { UppyFileData, UppyUploaderService } from './uppy-uploader.service';
+import { UppyFileData, UppyUploaderService, ALLOWED_FILE_TYPES } from './uppy-uploader.service';
 import { environment } from '@v3/environments/environment';
 import { NotificationsService } from './../../services/notifications.service';
 import { Component, OnInit, Input, Output, EventEmitter, OnDestroy } from '@angular/core';
 import { Uppy, UppyFile, UppyOptions, } from '@uppy/core';
 import { ModalController } from '@ionic/angular';
 import { BrowserStorageService } from '../../services/storage.service';
-import { UtilsService } from '../../services/utils.service';
 
 type FileMetadata = { [key: string]: any };
 type FileBody = { [key: string]: any };
@@ -18,13 +17,6 @@ type FileBody = { [key: string]: any };
 export class UppyUploaderComponent implements OnInit, OnDestroy {
   @Input() source!: "chat" | "profile" | "assessment" | "any" | "video" | "document" | "image";
   @Input() tusEndpoint?: string = environment.uppyConfig.tusUrl; // tusUrl
-  @Input() allowedFileTypes: string[] = [
-    "image/*",
-    "video/*",
-    ".jpeg",
-    ".png",
-    "application/pdf",
-  ];
   @Output() uploadComplete = new EventEmitter<any>();
 
   uploadedFile: UppyFile<any, any> | null = null;
@@ -44,7 +36,6 @@ export class UppyUploaderComponent implements OnInit, OnDestroy {
     private modalController: ModalController,
     private storageService: BrowserStorageService,
     private uppyUploaderService: UppyUploaderService,
-    private utils: UtilsService,
   ) {
     this.uppyProps.height = '500px';
     this.uppyProps.note = "Upload a file here";
@@ -59,13 +50,11 @@ export class UppyUploaderComponent implements OnInit, OnDestroy {
       throw new Error("source is required.");
     }
 
-    this.allowedFileTypes = this.loadAllowedFileTypes();
-
     this.uppy = this.uppyUploaderService.createUppyInstance(this.source, this.tusEndpoint, {
       onAfterResponse: this.onAfterResponse.bind(this),
       onUploadSuccess: this.onUploadSuccess.bind(this),
     }, {
-      allowedFileTypes: this.allowedFileTypes,
+      allowedFileTypes: this.loadAllowedFileTypes(),
     });
   }
 
@@ -85,11 +74,7 @@ export class UppyUploaderComponent implements OnInit, OnDestroy {
       case "chat":
       case "any":
       default:
-        return [
-          "image/*",
-          "video/*",
-          "application/*"
-        ];
+        return ALLOWED_FILE_TYPES;
     }
   }
 

projects/v3/src/app/components/uppy-uploader/uppy-uploader.service.ts

@@ -73,6 +73,22 @@ const UPPY_PROPS = {
   doneButtonHandler: null,
 };
 
+export const ALLOWED_FILE_TYPES = [
+  'image/*',
+  'video/*',
+  '.jpeg',
+  '.png',
+  'application/pdf',
+  'text/plain', // .txt
+  'text/csv', // .csv
+  'application/msword', // .doc
+  'application/vnd.ms-excel', // .xls
+  'application/vnd.ms-powerpoint', // .ppt
+  'application/vnd.openxmlformats-officedocument.wordprocessingml.document', // .docx
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', // .xlsx
+  'application/vnd.openxmlformats-officedocument.presentationml.presentation', // .pptx
+];
+
 @Injectable({
   providedIn: 'root'
 })