fix(files): fix file icon display

bimdata · Jan 18, 2022 · 8b59ba1 · 8b59ba1
1 parent 4498087
commit 8b59ba1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/src/components/specific/files/file-uploader/FileUploader.vue b/src/components/specific/files/file-uploader/FileUploader.vue
@@ -94,13 +94,13 @@ export default {
           // Only keep allowed files
           shouldUpload =
             props.allowedFileTypes.includes(file.type) ||
-            props.allowedFileTypes.includes("." + fileExtension(file.name));
+            props.allowedFileTypes.includes(fileExtension(file.name));
         }
         if (props.forbiddenFileTypes.length > 0) {
           // Discard forbidden files
           shouldUpload = !(
             props.forbiddenFileTypes.includes(file.type) ||
-            props.forbiddenFileTypes.includes("." + fileExtension(file.name))
+            props.forbiddenFileTypes.includes(fileExtension(file.name))
           );
         }
         if (!shouldUpload) {

diff --git a/src/components/specific/files/files-table/file-name-cell/FileNameCell.vue b/src/components/specific/files/files-table/file-name-cell/FileNameCell.vue
@@ -51,11 +51,6 @@
           "
           size="m"
         />
-        <BIMDataFileIcon
-          v-else-if="file.type === 'Ifc'"
-          fileName=".ifc"
-          :size="20"
-        />
         <BIMDataFileIcon
           v-else
           :fileName="fileExtension(file.name)"

diff --git a/src/components/specific/files/files-table/file-type-cell/FileTypeCell.vue b/src/components/specific/files/files-table/file-type-cell/FileTypeCell.vue
@@ -3,10 +3,8 @@
     {{
       file.type === "Folder"
         ? $t("FilesTable.folder")
-        : file.type === "Ifc"
-        ? ".ifc"
         : fileExtension(file.name)
-        ? "." + fileExtension(file.name)
+        ? fileExtension(file.name)
         : "?"
     }}
   </div>

diff --git a/src/components/specific/files/folder-selector/FolderSelector.vue b/src/components/specific/files/folder-selector/FolderSelector.vue
@@ -42,11 +42,6 @@
       >
         <span class="folder-selector__body__item__icon">
           <BIMDataIcon v-if="isFolder(file)" name="folder" size="xs" />
-          <BIMDataFileIcon
-            v-else-if="file.type === 'Ifc'"
-            fileName=".ifc"
-            :size="13"
-          />
           <BIMDataFileIcon
             v-else
             :fileName="fileExtension(file.name)"

diff --git a/src/utils/files.js b/src/utils/files.js
@@ -1,6 +1,6 @@
 function fileExtension(fileName) {
   const parts = fileName.split(".");
-  return parts.length > 1 ? parts[parts.length - 1] : "";
+  return parts.length > 1 ? `.${parts[parts.length - 1]}` : "";
 }
 
 function formatBytes(bytes, decimals = 2) {