Skip to content

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

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
Merged
susnux merged 4 commits into from
Jun 10, 2024
Merged

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

susnux merged 4 commits into from
Jun 10, 2024

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Jun 4, 2024 •
edited by susnux
Loading

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.

@backportbot backportbot bot added this to the Nextcloud 28.0.7 milestone Jun 4, 2024
@susnux
Copy link
Contributor

susnux commented Jun 4, 2024

/compile amend/

@susnux susnux marked this pull request as ready for review June 4, 2024 12:00
@nextcloud-command nextcloud-command force-pushed the backport/44897/stable28 branch from f725baa to 40862ee Compare June 4, 2024 12:07
@susnux susnux requested review from artonge and skjnldsv June 4, 2024 12:29
@susnux susnux force-pushed the backport/44897/stable28 branch from 40862ee to 117bcfd Compare June 4, 2024 12:53
@susnux
Copy link
Contributor

susnux commented Jun 4, 2024

/compile amend/

@susnux susnux enabled auto-merge June 4, 2024 12:53
@nextcloud-command nextcloud-command force-pushed the backport/44897/stable28 branch from 117bcfd to 4ec6bcf Compare June 4, 2024 13:08
@skjnldsv

This comment was marked as resolved.

Sign in to view
@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 7, 2024
@susnux susnux force-pushed the backport/44897/stable28 branch from 4ec6bcf to 693c913 Compare June 8, 2024 14:08
@susnux

This comment was marked as resolved.

Sign in to view
@susnux susnux 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
Contributor

susnux commented Jun 8, 2024

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

@skjnldsv
Copy link
Member

skjnldsv commented Jun 8, 2024 •
edited
Loading 

  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
@susnux
fix(files): Close sidebar if shown node is deleted
3c74559 
Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux
fix(files): Update current fileid in route if that node was deleted
3808a5b 
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 <[email protected]>
@susnux susnux force-pushed the backport/44897/stable28 branch from 693c913 to 32997c6 Compare June 10, 2024 15:52
susnux added 2 commits June 10, 2024 18:11
@susnux
feat(cypress): Add tests for files sidebar
892f17a 
Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux
chore: Compile assets
83877b3 
Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux susnux force-pushed the backport/44897/stable28 branch from 32997c6 to 83877b3 Compare June 10, 2024 16:11
@susnux susnux merged commit 9286eb3 into stable28 Jun 10, 2024
@susnux susnux deleted the backport/44897/stable28 branch June 10, 2024 17:01
@blizzz blizzz mentioned this pull request Jun 11, 2024
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@susnux susnux susnux approved these changes

@artonge artonge artonge approved these changes

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees

@susnux susnux

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: files

Projects

None yet

Milestone

Nextcloud 28.0.7

Development

Successfully merging this pull request may close these issues.

4 participants

@susnux @skjnldsv @artonge