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

Fixing bug about the print overlay stacking #5069

Merged
merged 3 commits into from
Dec 3, 2024

Conversation

neo-garaix
Copy link
Contributor

Ticket : fix #5068

Add :

  • End2end test for the overlay

Update :

  • lizMap events about docks
Capture.video.du.2024-12-03.11-52-50.webm

Funded by 3liz

@github-actions github-actions bot added this to the 3.10.0 milestone Dec 3, 2024
Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

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

Thanks for fixing the issue ;-)

tests/end2end/playwright/print.spec.js Outdated Show resolved Hide resolved
Copy link
Member

@Gustry Gustry left a comment

Choose a reason for hiding this comment

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

Thanks for removing the screenshot

@rldhont rldhont merged commit b0056cd into 3liz:master Dec 3, 2024
13 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Dec 3, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 98550c95d... FIX: Remove print overlay when change minidock
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging assets/src/components/Print.js
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5069-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 98550c95d82cf5ed8851d010fce3d5105dfbdfc1,2659c199b0eb737f52fb924da0cf177a99340075,338c98183c720aec14c7288c60186c775cafde71
# Push it to GitHub
git push --set-upstream origin backport-5069-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

Then, create a pull request where the base branch is release_3_7 and the compare/head branch is backport-5069-to-release_3_7.

@3liz-bot
Copy link
Contributor

3liz-bot commented Dec 3, 2024

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 98550c95d... FIX: Remove print overlay when change minidock
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging assets/src/components/Print.js
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_8 release_3_8
# Navigate to the new working tree
cd .worktrees/backport-release_3_8
# Create a new branch
git switch --create backport-5069-to-release_3_8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 98550c95d82cf5ed8851d010fce3d5105dfbdfc1,2659c199b0eb737f52fb924da0cf177a99340075,338c98183c720aec14c7288c60186c775cafde71
# Push it to GitHub
git push --set-upstream origin backport-5069-to-release_3_8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_8

Then, create a pull request where the base branch is release_3_8 and the compare/head branch is backport-5069-to-release_3_8.

@3liz-bot
Copy link
Contributor

3liz-bot commented Dec 3, 2024

The backport to release_3_9 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 98550c95d... FIX: Remove print overlay when change minidock
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging assets/src/components/Print.js
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_9 release_3_9
# Navigate to the new working tree
cd .worktrees/backport-release_3_9
# Create a new branch
git switch --create backport-5069-to-release_3_9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 98550c95d82cf5ed8851d010fce3d5105dfbdfc1,2659c199b0eb737f52fb924da0cf177a99340075,338c98183c720aec14c7288c60186c775cafde71
# Push it to GitHub
git push --set-upstream origin backport-5069-to-release_3_9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_9

Then, create a pull request where the base branch is release_3_9 and the compare/head branch is backport-5069-to-release_3_9.

rldhont pushed a commit to rldhont/lizmap-web-client that referenced this pull request Dec 3, 2024
* FIX: Remove print overlay when change minidock

fix 3liz#5068
3liz-bot pushed a commit that referenced this pull request Dec 3, 2024
* FIX: Remove print overlay when change minidock

fix #5068
3liz-bot pushed a commit that referenced this pull request Dec 3, 2024
* FIX: Remove print overlay when change minidock

fix #5068
@neo-garaix neo-garaix deleted the fix-print-overlay-when-change branch December 4, 2024 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Print overlay stacking when we switch between minidocks
5 participants