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

[Bugfix] JS config themes #4514

Merged
merged 6 commits into from
Jul 3, 2024
Merged

[Bugfix] JS config themes #4514

merged 6 commits into from
Jul 3, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Jun 12, 2024

Fixing JS classes around map themes

Funded by Karum

@rldhont rldhont added javascript Pull requests that update Javascript code backport release_3_7 backport release_3_8 labels Jun 12, 2024
@rldhont rldhont requested review from nboisteault and mdouchin June 12, 2024 06:27
@github-actions github-actions bot added this to the 3.9.0 milestone Jun 12, 2024
@Gustry Gustry added the sponsored development This development has been funded label Jun 12, 2024
@josemvm
Copy link
Collaborator

josemvm commented Jun 23, 2024

hi @rldhont i get this error An error occurred while loading this map. Some necessary resources may temporarily be unavailable. Please try again later. [Go back to the home page.](https://xxx.xxx.xxx/) when i activate de first map theme on qgis server 3.34, lwc 3.7.9-pre but not on qgis server 3.28

maybe related to this PR (?)

@rldhont
Copy link
Collaborator Author

rldhont commented Jun 24, 2024

hi @rldhont i get this error An error occurred while loading this map. Some necessary resources may temporarily be unavailable. Please try again later. [Go back to the home page.](https://xxx.xxx.xxx/) when i activate de first map theme on qgis server 3.34, lwc 3.7.9-pre but not on qgis server 3.28

maybe related to this PR (?)

When you've got this message, it means that one of the GetCapabilities requests (WMS, WFS, WMTS) or all has failed.

@Gustry
Copy link
Member

Gustry commented Jun 27, 2024

@josemvm

i get this error

Please check your Javascript console, you will have some tips about what was wrong, in the "Console" and/or in the "Network" tab by checking which requests as failed.

@josemvm
Copy link
Collaborator

josemvm commented Jun 27, 2024

@rldhont

When you've got this message, it means that one of the GetCapabilities requests (WMS, WFS, WMTS) or all has failed.

in this case when i deactivate de first map theme the map loads with all layers and without problems

@Gustry this is what i can get in my javascript console:

imagem

@josemvm
Copy link
Collaborator

josemvm commented Jun 27, 2024

in the network tab everything looks good to me but i can provide an url if you want to investigate

thanks

@rldhont rldhont added the run end2end If the PR must run end2end tests or not label Jun 29, 2024
@rldhont rldhont marked this pull request as ready for review June 29, 2024 15:01
@rldhont
Copy link
Collaborator Author

rldhont commented Jul 2, 2024

@Gustry I have apply #4565

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.

I'm not able to review too much this PR, but given the fact it fixes tests on QGIS 3.34, LGTM.

You will have some conflicts while backporting, at least on 3.7 I think.

I think it's a blocker for releasing 3.7 and 3.8 this PR.

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

3liz-bot commented Jul 3, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 269a2dcd5... [Bugfix] JS: activateFirstMapTheme options config
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/legacy/switcher-layers-actions.js
Auto-merging assets/src/modules/config/Options.js
CONFLICT (content): Merge conflict in assets/src/modules/config/Options.js
Auto-merging tests/js-units/node/config/options.test.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-4514-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 269a2dcd572458bfcc9b7f2e825254f325c265f2,f9833ae079d7fd8d4a8f44815ac2f3141d2aa476,f345e3a8d26f87da80bdcbd73fa97cc58569c503,03f35fd8422f36f98342766b9e06dce4419d39ae,97cdaa30ded7a67b265f28e6b44e902ed919d586,ff9dfd1c6401d3977ef9a1ce1b96387987611d79
# Push it to GitHub
git push --set-upstream origin backport-4514-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-4514-to-release_3_7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 backport release_3_8 failed backport javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not sponsored development This development has been funded
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants