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

Keep both conflict #9915

Merged
merged 4 commits into from
Nov 9, 2023
Merged

Keep both conflict #9915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b1f90e
keep both conflict fix
jacob-nv Nov 7, 2023
8d5b7e8
keep both conflict cleanup
jacob-nv Nov 7, 2023
9a8551c
added changelog, keep both conflict
jacob-nv Nov 9, 2023
9b6c8dd
fixed changelog, keep both conflict
jacob-nv Nov 9, 2023
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: 6 additions & 0 deletions changelog/unreleased/bugfix-keep-both-conflict
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Keep both folders conflict in same-named folders

Parsing has been adjusted to account for edge case of multiple folders and sub-folders with the same name

https://github.com/owncloud/web/pull/9915
https://github.com/owncloud/web/issues/9158
6 changes: 3 additions & 3 deletions packages/web-app-files/src/helpers/resource/actions/upload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,18 @@ export class ResourceConflict extends ConflictDialog {
`/${newFolderName}/`
)
file.meta.tusEndpoint = file.meta.tusEndpoint.replace(
new RegExp(`/${encodeURIComponent(folder)}`),
new RegExp(`/${encodeURIComponent(folder)}$`),
`/${encodeURIComponent(newFolderName)}`
)
if (file.xhrUpload?.endpoint) {
file.xhrUpload.endpoint = file.xhrUpload.endpoint.replace(
new RegExp(`/${encodeURIComponent(folder)}`),
new RegExp(`/${encodeURIComponent(folder)}$`),
`/${encodeURIComponent(newFolderName)}`
)
}
if (file.tus?.endpoint) {
file.tus.endpoint = file.tus.endpoint.replace(
new RegExp(`/${encodeURIComponent(folder)}`),
new RegExp(`/${encodeURIComponent(folder)}$`),
`/${encodeURIComponent(newFolderName)}`
)
}
Expand Down