Skip to content

[stable34] fix(files): Open the sidebar for the current folder, not a stale child#61606

Merged
AndyScherzinger merged 2 commits into
stable34from
backport/61330/stable34
Jul 15, 2026
Merged

[stable34] fix(files): Open the sidebar for the current folder, not a stale child#61606
AndyScherzinger merged 2 commits into
stable34from
backport/61330/stable34

Conversation

@backportbot

@backportbot backportbot Bot commented Jun 26, 2026 •
edited
Loading

Copy link
Copy Markdown

Backport of #61330

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

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Remove all the empty commits

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

@backportbot backportbot Bot requested review from nfebe, pringelmann and susnux June 26, 2026 10:38
@backportbot backportbot Bot added the 3. to review Waiting for reviews label Jun 26, 2026
@backportbot backportbot Bot added this to the Nextcloud 34.0.2 milestone Jun 26, 2026
@kyteinsky kyteinsky marked this pull request as ready for review June 30, 2026 12:55
@kyteinsky kyteinsky requested review from a team and skjnldsv as code owners June 30, 2026 12:55
@kyteinsky

kyteinsky commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

/compile

@kyteinsky kyteinsky force-pushed the backport/61330/stable34 branch from 5001ece to 0ce733c Compare June 30, 2026 13:19
@nfebe

nfebe commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

/compile

@kyteinsky

kyteinsky commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Not sure if the cypress tests are flaky or really failing.
In runner 6's test files/files-sidebar.cy.ts,

  1) Files: Sidebar
       changes the fileid on delete:
     CypressError: Timed out retrying after 4000ms: `cy.find()` failed because the page updated as a result of this command, but you tried to continue the command chain. The subject is no longer attached to the DOM, and Cypress cannot requery the page after commands such as `cy.find()`.

@janepie

janepie commented Jul 13, 2026

Copy link
Copy Markdown
Member

@nfebe can you check and rebase?

@nextcloud-bot nextcloud-bot mentioned this pull request Jul 14, 2026
Open
@nfebe @AndyScherzinger
fix(files): Open the sidebar for the current folder, not a stale child
a8d8c21 
When opening the sidebar for a folder, the route still referenced the file id of a previously opened subfolder. Because that subfolder is listed inside the current folder, the sidebar restored its share and details context instead of the current folder's. The active file id is now kept in sync with the route, so a stale id can no longer be restored.

Signed-off-by: nfebe <fenn25.fn@gmail.com>
@AndyScherzinger AndyScherzinger force-pushed the backport/61330/stable34 branch from 0ce733c to a8d8c21 Compare July 14, 2026 21:41
@AndyScherzinger

AndyScherzinger commented Jul 14, 2026

Copy link
Copy Markdown
Member

/compile

@nextcloud-command
chore(assets): Recompile assets
24011cf 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@AndyScherzinger AndyScherzinger merged commit 6eec91a into stable34 Jul 15, 2026
123 of 131 checks passed
@AndyScherzinger AndyScherzinger deleted the backport/61330/stable34 branch July 15, 2026 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nfebe nfebe nfebe approved these changes
@kyteinsky kyteinsky kyteinsky approved these changes
@pringelmann pringelmann Awaiting requested review from pringelmann
@susnux susnux Awaiting requested review from susnux
@skjnldsv skjnldsv Awaiting requested review from skjnldsv skjnldsv is a code owner

Assignees

@nfebe nfebe

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 34.0.2

Development

Successfully merging this pull request may close these issues.

5 participants

@kyteinsky @nfebe @janepie @AndyScherzinger @nextcloud-command