Skip to content

[stable28] fix(files): Close sidebar and update fileid when current node is deleted - #45658

Merged
susnux merged 4 commits into
stable28from
backport/44897/stable28
Jun 10, 2024
Merged

[stable28] fix(files): Close sidebar and update fileid when current node is deleted#45658
susnux merged 4 commits into
stable28from
backport/44897/stable28

Conversation

@backportbot

@backportbotbackportbotBot commented Jun 4, 2024

Copy link
Copy Markdown

Backport of #44897

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@susnux

Copy link
Copy Markdown
Contributor

/compile amend/

@susnux
susnux marked this pull request as ready for review June 4, 2024 12:00
@susnux
susnux requested review from artonge and skjnldsvJune 4, 2024 12:29
@susnux
susnuxforce-pushed the backport/44897/stable28 branch from 40862ee to 117bcfdCompareJune 4, 2024 12:53
@susnux

Copy link
Copy Markdown
Contributor

/compile amend/

@susnux
susnux enabled auto-merge June 4, 2024 12:53
@skjnldsv

This comment was marked as resolved.

@skjnldsvskjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 7, 2024
@susnux
susnuxforce-pushed the backport/44897/stable28 branch from 4ec6bcf to 693c913CompareJune 8, 2024 14:08
@susnux

This comment was marked as resolved.

@susnuxsusnux added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Jun 8, 2024
@susnux

Copy link
Copy Markdown
Contributor

(but somehow the CI decided that stable28 is EOL?)

@skjnldsv

skjnldsv commented Jun 8, 2024

Copy link
Copy Markdown
Member
 Files: Sidebar
✓ opens the sidebar (5536ms)
✓ changes the current fileid (4316ms)
(Attempt 1 of 3) closes the sidebar on delete
(Attempt 2 of 3) closes the sidebar on delete
1) closes the sidebar on delete
(Attempt 1 of 3) changes the fileid on delete
(Attempt 2 of 3) changes the fileid on delete
2) changes the fileid on delete
2 passing (1m)
2 failing
1) Files: Sidebar
closes the sidebar on delete:
AssertionError: Timed out retrying after 4000ms: Expected to find element: `[data-cy-files-list-row-action="delete"] > button`, but never found it.
at i (webpack://nextcloud/./cypress/e2e/files/FilesUtils.ts:27:81)
at Context.eval (webpack://nextcloud/./cypress/e2e/files/files-sidebar.cy.ts:54:8)

susnux added 2 commits June 10, 2024 17:48
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
We do not change the view to the trash bin but stay in the current view,
so we need to update the current fileid on the route if that was deleted.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
susnuxforce-pushed the backport/44897/stable28 branch from 693c913 to 32997c6CompareJune 10, 2024 15:52
susnux added 2 commits June 10, 2024 18:11
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
susnuxforce-pushed the backport/44897/stable28 branch from 32997c6 to 83877b3CompareJune 10, 2024 16:11
@susnux
susnux merged commit 9286eb3 into stable28Jun 10, 2024
@susnux
susnux deleted the backport/44897/stable28 branch June 10, 2024 17:01
@blizzzblizzz mentioned this pull request Jun 11, 2024
6 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@susnux@skjnldsv@artonge