Skip to content
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

Jump to bottom

[stable29] fix(files): handling numbered type owner name & id #45764

Merged
merged 1 commit into from
Jun 12, 2024
Merged

[stable29] fix(files): handling numbered type owner name & id #45764

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
6 changes: 4 additions & 2 deletions apps/files/src/services/Files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const resultToNode = function(node: FileStat): File | Folder {

const props = node.props as ResponseProps
const permissions = davParsePermissions(props?.permissions)
const owner = (props['owner-id'] || userId).toString()
const owner = String(props['owner-id'] || userId)

const source = generateRemoteUrl('dav' + rootPath + node.filename)
const id = props?.fileid < 0
Expand All @@ -66,7 +66,9 @@ export const resultToNode = function(node: FileStat): File | Folder {
attributes: {
...node,
...props,
hasPreview: props?.['has-preview'],
'owner-id': owner,
'owner-display-name': String(props['owner-display-name']),
Comment on lines +69 to +70
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That should not be needed 🤔

Copy link
Member

@skjnldsv skjnldsv Jun 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see we made some mistake and used it in a few locations, I would suggest we fix the usage instead of providing owner-id as extra attributes 🤔

owner-display-name on the other hand is fine I think

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, we fixed it for NC30 and above, I think we can merge for older branches as a safety measure.
I'll create a PR for master 🚀

hasPreview: !!props?.['has-preview'],
failed: props?.fileid < 0,
},
}
Expand Down
4 changes: 2 additions & 2 deletions dist/files-init.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-init.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/systemtags-init.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/systemtags-init.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading