Merge pull request #1977 from hmhealey/plt1685

PLT-1685 Fixed handling of files with no extension

1 files changed, 8 insertions, 3 deletions

diff --git a/web/react/components/file_info_preview.jsx b/web/react/components/file_info_preview.jsx
index 4b76cd162..45d89007f 100644
--- a/web/react/components/file_info_preview.jsx
+++ b/web/react/components/file_info_preview.jsx
@@ -5,11 +5,16 @@ import * as Utils from '../utils/utils.jsx';
 
 export default function FileInfoPreview({filename, fileUrl, fileInfo}) {
     // non-image files include a section providing details about the file
-    let infoString = 'File type ' + fileInfo.extension.toUpperCase();
-    if (fileInfo.size > 0) {
-        infoString += ', Size ' + Utils.fileSizeToString(fileInfo.size);
+    const infoParts = [];
+
+    if (fileInfo.extension !== '') {
+        infoParts.push('File type ' + fileInfo.extension.toUpperCase());
     }
 
+    infoParts.push('Size ' + Utils.fileSizeToString(fileInfo.size));
+
+    const infoString = infoParts.join(', ');
+
     const name = decodeURIComponent(Utils.getFileName(filename));
 
     return (