Skip to content
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

[stable28] fix(files_sharing): open-in-files should open a folder and not the parent #46754

Merged
merged 5 commits into from
Aug 2, 2024
Merged

[stable28] fix(files_sharing): open-in-files should open a folder and not the parent #46754

merged 5 commits into from
Aug 2, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Jul 25, 2024 •
edited by skjnldsv
Loading

Backport of #46648

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.9 milestone Jul 25, 2024
@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jul 27, 2024
@skjnldsv skjnldsv mentioned this pull request Jul 31, 2024
Closed
8 tasks
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Aug 2, 2024
@skjnldsv skjnldsv marked this pull request as ready for review August 2, 2024 07:07
@skjnldsv
Copy link
Member

skjnldsv commented Aug 2, 2024

/compile rebase-amend /

@skjnldsv skjnldsv force-pushed the backport/46648/stable28 branch 2 times, most recently from 1a2ae17 to 4467521 Compare August 2, 2024 12:39
@susnux @skjnldsv
fix(files_sharing): open-in-files should open a folder and not the …
d190d4f 
…parent

For files this behavior is fine, but for folders the folder itself should be opened.

Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux @skjnldsv
test: Add regression test for opening shared folders
4df15b0 
Signed-off-by: Ferdinand Thiessen <[email protected]>
@skjnldsv skjnldsv enabled auto-merge August 2, 2024 14:19
@skjnldsv
Copy link
Member

skjnldsv commented Aug 2, 2024 

  1) files_sharing: Files view
       opens a shared folder when clicking on it:
     AssertionError: Timed out retrying after 4000ms: Expected to find element: `[data-cy-files-sharing-share-editor-action="save"]`, but never found it.
      at eval (webpack://nextcloud/./cypress/e2e/files_sharing/FilesSharingUtils.ts:17:7)
      at Context.eval (webpack://nextcloud/./cypress/e2e/files_sharing/files-shares-view.cy.ts:23:20)

Too tired, I fixed too many backports already today 😓

@susnux
chore: Compile assets
fdd1e39 
Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@susnux
Copy link
Contributor

susnux commented Aug 2, 2024

Caused by an incomplete backport of some other old PR. Fixed it :)

@skjnldsv skjnldsv disabled auto-merge August 2, 2024 17:43
@skjnldsv skjnldsv merged commit e655d44 into stable28 Aug 2, 2024
44 of 45 checks passed
@skjnldsv skjnldsv deleted the backport/46648/stable28 branch August 2, 2024 17:43
@Altahrim Altahrim mentioned this pull request Aug 8, 2024
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@artonge artonge artonge approved these changes

@susnux susnux Awaiting requested review from susnux

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.9
Development

Successfully merging this pull request may close these issues.
3 participants
@skjnldsv @susnux @artonge