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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

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 77.41935% with 21 lines in your changes missing coverage. Please review.

Project coverage is 38.36%. Comparing base (35db36e) to head (678cd9e).
Report is 7 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% 2 Missing โš ๏ธ
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6903      +/-   ##
==========================================
+ Coverage   37.82%   38.36%   +0.54%     
==========================================
  Files         750      929     +179     
  Lines       42691    42410     -281     
  Branches     1273     1468     +195     
==========================================
+ Hits        16146    16271     +125     
+ Misses      25923    25376     -547     
- Partials      622      763     +141     

โ˜” 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
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 f14eb27 to 678cd9e Compare March 6, 2025 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-request bug Something isn't working
Projects
Status: ๐Ÿ‘€ In review
Development

Successfully merging this pull request may close these issues.

3 participants