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.

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

[stable27] fix: Close button should just exit for the edit local modal #3549

Merged
merged 1 commit into from
Mar 26, 2024

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Mar 26, 2024

This is a hotfix to avoid reopening the document if the user clicks the close button. In the old server API to open dialogs we cannot differentiate between close and the cancel action, so we use the global event object to check which one was clicked. On main (29+) this is resolved by using the spawnDialog function where we can pass our own vue component that allows us to handle this properly

Follow up fix to #3524

Steps to reproduce:

  • Open a file in Collabora
  • Click the button to open locally
  • Confirm to open locally in the first modal
  • Cancel the browser dialog to open locally
  • See the second Nextcloud dialog and press the X button to close

Before: The document reopened

After: Now the dialog is just dismissed

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
Copy link
Member Author

/backport! to stable28

@juliushaertl juliushaertl changed the title fix: Close button should just exit for the edit local modal [stable27] fix: Close button should just exit for the edit local modal Mar 26, 2024
@juliushaertl juliushaertl self-assigned this Mar 26, 2024
Copy link

cypress bot commented Mar 26, 2024

1 failed test on run #792 ↗︎

1 30 0 0 Flakiness 0

Details:

fix: Close button should just exit for the edit local modal
Project: Richdocuments Commit: 6cbe3e2c66
Status: Failed Duration: 06:37 💡
Started: Mar 26, 2024 4:08 PM Ended: Mar 26, 2024 4:15 PM
Failed  cypress/e2e/integration.spec.js • 1 failed test

View Output

Test Artifacts
Nextcloud integration > Save as Screenshots

Review all test suite changes for PR #3549 ↗︎

@juliushaertl juliushaertl merged commit c9d4c9b into stable27 Mar 26, 2024
32 of 34 checks passed
@delete-merged-branch delete-merged-branch bot deleted the fix/close-edit-local branch March 26, 2024 17:21
@juliushaertl juliushaertl added the bug Something isn't working label Mar 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants