Merge pull request #39656 from nextcloud/fix/filename-files/master

nextcloud · Aug 3, 2023 · c7c94a3 · c7c94a3
2 parents 90bb0a2 + 7744632
commit c7c94a3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
@@ -85,7 +85,7 @@
 				<span class="files-list__row-name-text">
 					<!-- Keep the displayName stuck to the extension to avoid whitespace rendering issues-->
 					<span class="files-list__row-name-" v-text="displayName" />
-					<span class="files-list__row-name-ext" v-text="source.extension" />
+					<span class="files-list__row-name-ext" v-text="extension" />
 				</span>
 			</a>
 		</td>
@@ -157,6 +157,7 @@ import { debounce } from 'debounce'
 import { emit } from '@nextcloud/event-bus'
 import { formatFileSize, Permission } from '@nextcloud/files'
 import { Fragment } from 'vue-frag'
+import { extname } from 'path'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate } from '@nextcloud/l10n'
 import { generateUrl } from '@nextcloud/router'
@@ -290,8 +291,15 @@ export default Vue.extend({
 		fileid() {
 			return this.source?.fileid?.toString?.()
 		},
+
+		extension() {
+			if (this.source.attributes?.displayName) {
+				return extname(this.source.attributes.displayName)
+			}
+			return this.source.extension || ''
+		},
 		displayName() {
-			const ext = (this.source.extension || '')
+			const ext = this.extension
 			const name = (this.source.attributes.displayName
 				|| this.source.basename)
 

diff --git a/dist/1929-1929.js b/dist/1929-1929.js
diff --git a/dist/1929-1929.js.map b/dist/1929-1929.js.map
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map
diff --git a/dist/files_sharing-files_sharing_tab.js b/dist/files_sharing-files_sharing_tab.js
diff --git a/dist/files_sharing-files_sharing_tab.js.map b/dist/files_sharing-files_sharing_tab.js.map