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

Keep layout on sync errors #6903

Merged
merged 10 commits into from
Mar 12, 2025
Merged

Keep layout on sync errors #6903

merged 10 commits into from
Mar 12, 2025

Conversation

max-nextcloud
Copy link
Collaborator

@max-nextcloud max-nextcloud commented Feb 14, 2025

See #6877

Ui changes

  • fix(ui): move document status to the bottom

πŸ–ΌοΈ Screenshots

🏚️ before 🏑 after
Sync error Bildschirmfoto vom 2025-02-14 12-56-16 grafik
Conflict view Bildschirmfoto vom 2025-02-14 00-00-36 Bildschirmfoto vom 2025-02-14 00-00-21
Notifications Bildschirmfoto vom 2025-02-14 13-19-12 Bildschirmfoto vom 2025-02-14 13-18-25

Other commits

  • fix(vite): allow hostnames used for hmr via docker-dev

β˜‘οΈ TODO

  • make sure that the margin from the bottom is of size --clickable-area

@max-nextcloud max-nextcloud requested a review from mejo- as a code owner February 14, 2025 11:11
Copy link

codecov bot commented Feb 14, 2025

Codecov Report

Attention: Patch coverage is 76.59574% with 22 lines in your changes missing coverage. Please review.

Project coverage is 38.31%. Comparing base (3225682) to head (64d9887).
Report is 12 commits behind head on main.

Files with missing lines Patch % Lines
src/components/Editor/DocumentStatus.vue 0.00% 12 Missing ⚠️
...rc/components/Editor/DocumentStatus/SyncStatus.vue 91.13% 6 Missing and 1 partial ⚠️
src/components/Editor.vue 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6903      +/-   ##
==========================================
+ Coverage   37.43%   38.31%   +0.87%     
==========================================
  Files         939      925      -14     
  Lines       42404    42310      -94     
  Branches     1464     1466       +2     
==========================================
+ Hits        15874    16210     +336     
+ Misses      25753    25338     -415     
+ Partials      777      762      -15     

β˜” View full report in Codecov by Sentry.
πŸ“’ Have feedback on the report? Share it here.

πŸš€ New features to boost your workflow:
  • ❄ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • πŸ“¦ JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@max-nextcloud max-nextcloud requested review from marcoambrosini and a team February 14, 2025 12:35
@max-nextcloud max-nextcloud self-assigned this Feb 14, 2025
@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch from af40cfd to d9d2506 Compare February 14, 2025 14:23
Copy link
Member

@marcoambrosini marcoambrosini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good @max-nextcloud, let's just make sure that the margin from the bottom is of size --clickable-area

@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch 2 times, most recently from bff0826 to adc0bdb Compare February 17, 2025 21:54
@max-nextcloud
Copy link
Collaborator Author

/backport to stable30

@max-nextcloud
Copy link
Collaborator Author

/backport to stable29

@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch from adc0bdb to f14eb27 Compare February 18, 2025 07:12
@max-nextcloud

This comment was marked as resolved.

@marcoambrosini

This comment was marked as resolved.

@max-nextcloud

This comment was marked as resolved.

@marcoambrosini

This comment was marked as resolved.

@juliusknorr juliusknorr added the bug Something isn't working label Feb 27, 2025
@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch 2 times, most recently from 678cd9e to 7e84bcc Compare March 12, 2025 06:41
The document status div is full width.
Its background hides the text behind it and scrollbars on the side.

Introduce a new .status-wrapper div that sets the background
and only has the size of the actual message.

Also move the message to the very bottom of the screen on mobile.

Signed-off-by: Max <[email protected]>
@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch from 7e84bcc to 51cb02c Compare March 12, 2025 07:24
@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch from 51cb02c to b47c6b5 Compare March 12, 2025 07:59
@max-nextcloud
Copy link
Collaborator Author

max-nextcloud commented Mar 12, 2025

@marcoambrosini This should be ready for another review. I have not added screenshots for small screens yet though.
If you have difficulties getting it to run locally please ping me in talk.

@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch from a555700 to 4beb32e Compare March 12, 2025 10:27
Otherwise unpacking the tar file failed on github runners
if the cache was created by garm runners
and the binary could not be found on garm runners
if the cache was created by github runners.

Signed-off-by: Max <[email protected]>
@max-nextcloud max-nextcloud force-pushed the enh/keep-layout-on-sync-errors branch from 4beb32e to 64d9887 Compare March 12, 2025 10:50
@max-nextcloud max-nextcloud merged commit 1b81c5c into main Mar 12, 2025
67 of 68 checks passed
@max-nextcloud max-nextcloud deleted the enh/keep-layout-on-sync-errors branch March 12, 2025 11:11
@max-nextcloud
Copy link
Collaborator Author

ouch... did not remember that this was still on automerge.

@max-nextcloud
Copy link
Collaborator Author

/backport to stable31

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
Status: β˜‘οΈ Done
Development

Successfully merging this pull request may close these issues.

3 participants