Introduce UPSERT_RESOURCE to files mutations #5130

pascalwengerter · 2021-05-20T13:27:01Z

Description

Merged PUSH_NEW_RESOURCE and UPDATE_RESOURCE to UPSERT_RESOURCE that checks if a file already exists and then either inserts or updates the resource

Related Issue

Fixes Creating a new version of a file shows it duplicated in the file list (until page reload) #4996

ownclouders · 2021-05-20T13:41:54Z

💥 Acceptance tests webUISharingInternalUsersRoot2 failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15561/

webUISharingInternalUsersToRootPreviews-shareWithUsers-feature-54.png

ownclouders · 2021-05-20T13:42:23Z

💥 Acceptance tests webUISharingInternalUsersRoot1 failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15561/

webUISharingInternalUsersToRoot-shareWithUsers-feature-260.png

ownclouders · 2021-05-20T13:44:56Z

💥 Acceptance tests SharingPublicBasic failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15561/

webUISharingPublicBasic-publicLinkPublicActions-feature-12.png

kulmann

good simplification 🤩

ownclouders · 2021-05-20T14:32:22Z

💥 Acceptance tests Favorites failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15566/

webUIFavorites-favoritesFile-feature-58.png

ownclouders · 2021-05-20T14:39:13Z

💥 Acceptance tests webUIBasic failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15566/

webUILogin-adminBlocksUser-feature-20.png

webUIPreview-imageMediaViewer-feature-140.png

webUIPreview-imageMediaViewer-feature-158.png

webUIPreview-imageMediaViewer-feature-83.png

webUIPreview-imageMediaViewer-feature-90.png

ownclouders · 2021-05-20T14:41:42Z

💥 Acceptance tests webUIRename failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15566/

webUIRenameFiles-renameFiles-feature-186.png

ownclouders · 2021-05-20T14:52:59Z

💥 Acceptance tests Favorites failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15567/

webUIFavorites-favoritesFile-feature-58.png

ownclouders · 2021-05-20T15:54:15Z

💥 Acceptance tests Favorites failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15572/

webUIFavorites-favoritesFile-feature-58.png

webUIFavorites-favoritesFile-feature-80.png

ownclouders · 2021-05-20T16:02:33Z

💥 Acceptance tests webUIRename failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15572/

webUIRenameFiles-renameFiles-feature-186.png

ownclouders · 2021-05-21T08:24:24Z

💥 Acceptance tests Favorites failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15575/

webUIFavorites-favoritesFile-feature-58.png

webUIFavorites-favoritesFile-feature-80.png

kulmann · 2021-05-21T09:04:54Z

Test scenario webUIFavorites/favoritesFile.feature:58 is an actual failure, not a random one. Needs to be fixed. It's succeeding on current master.

pascalwengerter · 2021-05-21T09:05:39Z

Test scenario webUIFavorites/favoritesFile.feature:58 is an actual failure, not a random one. Needs to be fixed. It's succeeding on current master.

Thanks, will take care of this now!

pascalwengerter · 2021-05-21T10:51:22Z

Test scenario webUIFavorites/favoritesFile.feature:58 is an actual failure, not a random one. Needs to be fixed. It's succeeding on current master.

Thanks, will take care of this now!

Can't really figure why this should be an actual failure 🤔 the CI is waiting (and then timing out) for .files-empty which I can see when navigation to the page myself - and the changes in this PR don't touch anything related to it AFAIK

ownclouders · 2021-05-21T11:11:26Z

💥 Acceptance tests webUIRename failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15583/

webUIRenameFiles-renameFiles-feature-186.png

kulmann · 2021-05-21T11:14:31Z

Test scenario webUIFavorites/favoritesFile.feature:58 is an actual failure, not a random one. Needs to be fixed. It's succeeding on current master.

Thanks, will take care of this now!

Can't really figure why this should be an actual failure 🤔 the CI is waiting (and then timing out) for .files-empty which I can see when navigation to the page myself - and the changes in this PR don't touch anything related to it AFAIK

When I run the test locally I see a file in the favorites list. No idea why though. But it has to be related to the changes. UDATE_RESOURCE didn't do anything before if the id of the resource in the params was not found. Maybe that's the case for some favorites list update action and then it now inserts it while it shouldn't. Or a test (fixture?) bug related to this which didn't surface before.

ownclouders · 2021-05-21T11:31:54Z

💥 Acceptance tests Favorites failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15586/

webUIFavorites-favoritesFile-feature-80.png

ownclouders · 2021-05-21T11:42:52Z

💥 Acceptance tests webUIRename failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15586/

webUIRenameFiles-renameFiles-feature-186.png

kulmann · 2021-05-26T19:13:40Z

The issue why the test is failing is a sneaky bug, that was already pointed out by @labkode in #5085

You can reproduce it by clicking very fast on the All Files menu item, not waiting until it's fully rendered but directly clicking on Favorites again. What you can observe then, is that the files that have async preview requests will appear in the Favorites view. Because they get inserted now with this PR (as it switches from update to upsert for the preview responses).

ownclouders · 2021-05-26T19:31:39Z

💥 Acceptance tests webUIRename failed. Please find the screenshots inside ...

https://drone.owncloud.com/owncloud/web/15730/

webUIRenameFiles-renameFiles-feature-186.png

fschade · 2021-05-28T07:41:34Z

the request cancelation bug is tracked in #5163

kulmann · 2021-06-11T09:03:16Z

Re-introduced the UPDATE_RESOURCE store mutation, because in most of the situations we don't want to allow an insert. But for the upload scenarios the UPSERT_RESOURCE makes sense and solves the bug with two versions of the same file being displayed as two files in the list.

sonarcloud · 2021-06-11T17:05:55Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

81.2% Coverage
5.3% Duplication

micbar · 2021-06-12T19:49:00Z

❤️ Unit tests

fschade

👍 LGTM

pascalwengerter requested a review from kulmann May 20, 2021 13:27

pascalwengerter force-pushed the 20052021_correctly-update-resource-in-filestable branch 2 times, most recently from b7f522a to 9c525bb Compare May 20, 2021 13:59

kulmann approved these changes May 20, 2021

View reviewed changes

kulmann assigned pascalwengerter May 20, 2021

pascalwengerter force-pushed the 20052021_correctly-update-resource-in-filestable branch from 9c525bb to 6580cc8 Compare May 20, 2021 14:42

kulmann force-pushed the 20052021_correctly-update-resource-in-filestable branch from 6580cc8 to d7c2371 Compare May 26, 2021 18:59

fschade mentioned this pull request May 28, 2021

Request cancelation #5163

Closed

Introduce UPSERT_RESOURCE to files mutations

fd15cfb

Re-introduce UPDATE_RESOURCE for when inserting is not allowed

7b0c3d8

kulmann force-pushed the 20052021_correctly-update-resource-in-filestable branch from 82a442a to 7b0c3d8 Compare June 11, 2021 09:04

Add unit tests for UPSERT_RESOURCE and UPDATE_RESOURCE

9c6c6bb

kulmann requested a review from fschade June 11, 2021 17:07

exalate-issue-sync bot mentioned this pull request Jun 11, 2021

Creating a new version of a file shows it duplicated in the file list (until page reload) #4996

Closed

fschade approved these changes Jun 14, 2021

View reviewed changes

kulmann merged commit d966b62 into master Jun 14, 2021

delete-merged-branch bot deleted the 20052021_correctly-update-resource-in-filestable branch June 14, 2021 14:24

fschade mentioned this pull request Jun 15, 2021

uploading a new version of a file creates a second entry with the same name in the list #4895

Closed

pascalwengerter mentioned this pull request Jun 15, 2021

after accepting a remote share the files-list is not reloaded #1774

Closed

Introduce UPSERT_RESOURCE to files mutations #5130

Introduce UPSERT_RESOURCE to files mutations #5130

Conversation

pascalwengerter commented May 20, 2021

Description

Related Issue

ownclouders commented May 20, 2021

webUISharingInternalUsersToRootPreviews-shareWithUsers-feature-54.png

ownclouders commented May 20, 2021

webUISharingInternalUsersToRoot-shareWithUsers-feature-260.png

ownclouders commented May 20, 2021

webUISharingPublicBasic-publicLinkPublicActions-feature-12.png

kulmann left a comment

Choose a reason for hiding this comment

ownclouders commented May 20, 2021

webUIFavorites-favoritesFile-feature-58.png

ownclouders commented May 20, 2021

webUILogin-adminBlocksUser-feature-20.png

webUIPreview-imageMediaViewer-feature-140.png

webUIPreview-imageMediaViewer-feature-158.png

webUIPreview-imageMediaViewer-feature-83.png

webUIPreview-imageMediaViewer-feature-90.png

ownclouders commented May 20, 2021

webUIRenameFiles-renameFiles-feature-186.png

ownclouders commented May 20, 2021

webUIFavorites-favoritesFile-feature-58.png

ownclouders commented May 20, 2021

webUIFavorites-favoritesFile-feature-58.png

webUIFavorites-favoritesFile-feature-80.png

ownclouders commented May 20, 2021

webUIRenameFiles-renameFiles-feature-186.png

ownclouders commented May 21, 2021

webUIFavorites-favoritesFile-feature-58.png

webUIFavorites-favoritesFile-feature-80.png

kulmann commented May 21, 2021 • edited Loading

pascalwengerter commented May 21, 2021

pascalwengerter commented May 21, 2021

ownclouders commented May 21, 2021

webUIRenameFiles-renameFiles-feature-186.png

kulmann commented May 21, 2021

ownclouders commented May 21, 2021

webUIFavorites-favoritesFile-feature-80.png

ownclouders commented May 21, 2021

webUIRenameFiles-renameFiles-feature-186.png

kulmann commented May 26, 2021

ownclouders commented May 26, 2021

webUIRenameFiles-renameFiles-feature-186.png

fschade commented May 28, 2021

kulmann commented Jun 11, 2021 • edited Loading

sonarcloud bot commented Jun 11, 2021

micbar commented Jun 12, 2021

fschade left a comment

Choose a reason for hiding this comment

kulmann commented May 21, 2021 •

edited

Loading

kulmann commented Jun 11, 2021 •

edited

Loading