Skip to content

fix: always use the node displayname prop #2179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 1 commit into from
Dec 17, 2025
Merged

fix: always use the node displayname prop #2179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/components/ConflictPicker/ConflictPickerEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function validate() {

<template>
<fieldset :class="$style.pickerEntry">
<legend>{{ existing.basename }}</legend>
<legend>{{ existing.displayname }}</legend>

<!-- Incoming file -->
<NcCheckboxRadioSwitch
Expand Down
6 changes: 3 additions & 3 deletions lib/components/FilePicker/FileListRow.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const node = new File({
mime: 'text/plain',
source: 'https://example.com/remote.php/dav/alice/a.txt',
root: '/',
attributes: { displayName: 'test' },
attributes: { displayname: 'test' },
})

const folder = new Folder({
Expand All @@ -69,7 +69,7 @@ const folder = new Folder({
source: 'https://example.com/remote.php/dav/alice/b',
root: '/',
permissions: Permission.ALL,
attributes: { displayName: 'test folder' },
attributes: { displayname: 'test folder' },
})

const folderNonReadable = new Folder({
Expand All @@ -79,7 +79,7 @@ const folderNonReadable = new Folder({
source: 'https://example.com/remote.php/dav/alice/b',
root: '/',
permissions: Permission.ALL & ~Permission.READ,
attributes: { displayName: 'test folder' },
attributes: { displayname: 'test folder' },
})

const defaultOptions = {
Expand Down
9 changes: 5 additions & 4 deletions lib/components/FilePicker/FileListRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import type { INode } from '@nextcloud/files'

import { FileType, formatFileSize, Permission } from '@nextcloud/files'
import { extname } from '@nextcloud/paths'
import { computed } from 'vue'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcDateTime from '@nextcloud/vue/components/NcDateTime'
Expand Down Expand Up @@ -80,14 +81,14 @@ const emit = defineEmits<{
const timestamp = computed(() => props.node.mtime ?? 0)

/**
* The displayname of the current node (excluding file extension)
* The file extension of the file
*/
const displayName = computed(() => props.node.attributes?.displayName || props.node.basename.slice(0, props.node.extension ? -props.node.extension.length : undefined))
const fileExtension = computed(() => extname(props.node.displayname))

/**
* The file extension of the file
* The displayname of the current node (excluding file extension)
*/
const fileExtension = computed(() => props.node.extension)
const displayName = computed(() => props.node.displayname.slice(0, fileExtension.value ? -fileExtension.value.length : undefined))

/**
* Check if the node is a directory
Expand Down
6 changes: 3 additions & 3 deletions lib/filepicker-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,13 @@ export class FilePickerBuilder<IsMultiSelect extends boolean> {
public setType(type: FilePickerType) {
this.buttons = (nodes, path) => {
const buttons: IFilePickerButton[] = []
const node = nodes?.[0]?.attributes?.displayName || nodes?.[0]?.basename
const target = node || basename(path)
const node = nodes[0]
const target = node?.displayname || basename(path)

if (type === FilePickerType.Choose) {
let label = t('Choose')
if (nodes.length === 1) {
label = t('Choose {file}', { file: node })
label = t('Choose {file}', { file: target })
} else if (this.multiSelect) {
label = n('Choose %n file', 'Choose %n files', nodes.length)
}
Expand Down