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

Load filelist before uploading contents #7387

Closed

JammingBen wants to merge 1 commit into master from conflict-window

Contributor

JammingBen commented Aug 2, 2022

Description

Load the filelist before uploading contents to ensure the conflict modal shows if a resource already exists on the server side.

Related Issue

Fixes Dubious overwrite logic with etag / server side conflict handling #3262

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)
Technical debt
Tests


          Load filelist before uploading contents

c5d8fc2

JammingBen self-assigned this

update-docs bot commented Aug 2, 2022

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

Contributor Author

JammingBen commented Aug 2, 2022 •

edited

Loading

@kulmann I took some time to evaluate the best solutions here, unfortunately the best way I see is to load the file list before uploading by adding an additional publish method to our event bus which can be awaited. Do you have any other ideas here?

Still missing in this PR if we decide for this approach:

Add await statement in other file lists
Do the same before creating a folder

Edit: Oh well, this approach does not look too good in folders with many files 😞 Maybe only retrieve the files via a PROPFIND (without reloading the file list) and handle the conflict-search internally?

sonarqubecloud bot commented Aug 2, 2022

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

0.0% Coverage
0.0% Duplication

Contributor

ownclouders commented Aug 2, 2022

Results for e2e-tests oCIS https://drone.owncloud.com/owncloud/web/27276/12/1

💥 To see the trace, please open the link in the console ...

npx playwright show-trace https://cache.owncloud.com/public/owncloud/web/27276/tracing/unstructured-collection-of-testable-space-interactions-alice-2022-8-2-11-07-00.zip

npx playwright show-trace https://cache.owncloud.com/public/owncloud/web/27276/tracing/unstructured-collection-of-testable-space-interactions-anonymous-2022-8-2-11-08-04.zip

npx playwright show-trace https://cache.owncloud.com/public/owncloud/web/27276/tracing/unstructured-collection-of-testable-space-interactions-brian-2022-8-2-11-08-07.zip

Contributor Author

JammingBen commented Sep 20, 2022

Superseded by #7664.

JammingBen closed this

kulmann deleted the conflict-window branch

September 5, 2024 19:55

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet