Skip to content

Keep layout on sync errors - #6903

Merged
max-nextcloud merged 10 commits into
mainfrom
enh/keep-layout-on-sync-errors
Mar 12, 2025
Merged

Keep layout on sync errors#6903
max-nextcloud merged 10 commits into
mainfrom
enh/keep-layout-on-sync-errors

Conversation

@max-nextcloud

@max-nextcloudmax-nextcloud commented Feb 14, 2025

Copy link
Copy Markdown
Collaborator

See #6877 and #2240

Ui changes

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

🖼️ Screenshots

🏚️ before🏡 after
Sync errorBildschirmfoto vom 2025-02-14 12-56-16grafik
Conflict viewBildschirmfoto vom 2025-02-14 00-00-36Bildschirmfoto vom 2025-02-14 00-00-21
NotificationsBildschirmfoto vom 2025-02-14 13-19-12Bildschirmfoto 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

@codecov

codecovBot commented Feb 14, 2025

Copy link
Copy Markdown

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 71 commits behind head on main.

Files with missing linesPatch %Lines
src/components/Editor/DocumentStatus.vue0.00%12 Missing ⚠️
...rc/components/Editor/DocumentStatus/SyncStatus.vue91.13%6 Missing and 1 partial ⚠️
src/components/Editor.vue0.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 a team and marcoambrosiniFebruary 14, 2025 12:35
@max-nextcloudmax-nextcloud self-assigned this Feb 14, 2025
@max-nextcloud
max-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch from af40cfd to d9d2506CompareFebruary 14, 2025 14:23

@marcoambrosinimarcoambrosini left a comment

Copy link
Copy Markdown
Member

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-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch 2 times, most recently from bff0826 to adc0bdbCompareFebruary 17, 2025 21:54
@max-nextcloud

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable30

@max-nextcloud

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable29

@max-nextcloud
max-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch from adc0bdb to f14eb27CompareFebruary 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.

@juliusknorrjuliusknorr added the bug Something isn't working label Feb 27, 2025
@max-nextcloud
max-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch 2 times, most recently from 678cd9e to 7e84bccCompareMarch 12, 2025 06:41
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Max <max@nextcloud.com>
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 <max@nextcloud.com>
@max-nextcloud
max-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch from 7e84bcc to 51cb02cCompareMarch 12, 2025 07:24
Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud
max-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch from 51cb02c to b47c6b5CompareMarch 12, 2025 07:59
@max-nextcloud

max-nextcloud commented Mar 12, 2025

Copy link
Copy Markdown
CollaboratorAuthor

@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-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch from a555700 to 4beb32eCompareMarch 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 <max@nextcloud.com>
@max-nextcloud
max-nextcloudforce-pushed the enh/keep-layout-on-sync-errors branch from 4beb32e to 64d9887CompareMarch 12, 2025 10:50
@max-nextcloud
max-nextcloud merged commit 1b81c5c into mainMar 12, 2025
@max-nextcloud
max-nextcloud deleted the enh/keep-layout-on-sync-errors branch March 12, 2025 11:11
@github-project-automationgithub-project-automationBot moved this from 👀 In review to ☑️ Done in 📝 Productivity teamMar 12, 2025
@max-nextcloud

Copy link
Copy Markdown
CollaboratorAuthor

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

@max-nextcloud

Copy link
Copy Markdown
CollaboratorAuthor

/backport to stable31

@juliusknorr

Copy link
Copy Markdown
Member

/backport 64d9887 to stable30

@juliusknorr

Copy link
Copy Markdown
Member

/backport 64d9887 to stable29

@backportbot

Copy link
Copy Markdown

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30
# Create the new backport branch
git checkout -b backport/6903/stable30
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts, resolve them
git cherry-pick 64d9887
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6903/stable30

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/6903/stable30."} - https://docs.github.com/rest/pulls/pulls#create-a-pull-request


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

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugSomething isn't working

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants

@max-nextcloud@marcoambrosini@juliusknorr