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

[Fix] Add Popup dock server side #4398

Merged
merged 1 commit into from
May 7, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented May 1, 2024

The popup dock is build client side by the JS and depends on lizDict. Since #4329 the popup dock could be created before the lizDict is available.

@rldhont rldhont added user interface javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not php Pull requests that update Php code labels May 1, 2024
@rldhont rldhont requested review from nboisteault and mdouchin May 1, 2024 08:03
@github-actions github-actions bot added this to the 3.8.0 milestone May 1, 2024
@rldhont rldhont force-pushed the fix-dock-popup-lizdict branch from fc5f2f5 to 0d7e2b5 Compare May 1, 2024 14:24
@Gustry
Copy link
Member

Gustry commented May 2, 2024

I have this error on master :

ReferenceError: lizUrls is not defined
<script id="lizmap-vars" type="application/json">{"lizUrls":{"params":{"repository":"testsrepository","project":"attribute_table"},"config":"\/index.php\/lizmap\/service\/getProjectConfig","remoteStorageConfig":"\/index.php\/lizmap\/service\/getRemoteStorageConfig","keyValueConfig":"\/index.php\/lizmap\/service\/getKeyValueConfig","wms":"\/index.php\/lizmap\/service","media":"\/index.php\/view\/media\/getMedia","nominatim":"\/index.php\/lizmap\/osm\/nominatim","ign":"\/index.php\/lizmap\/ign\/address","edition":"\/index.php\/lizmap\/edition\/getFeature","permalink":"http:\/\/localhost:8130\/index.php\/view\/map","dataTableLanguage":"\/assets\/js\/dataTables\/fr_FR.json","basepath":"\/","geobookmark":"\/index.php\/lizmap\/geobookmark","service":"\/index.php\/lizmap\/service?repository=testsrepository&project=attribute_table","resourceUrlReplacement":{"webdav":"dav\/"},"webDavUrl":"http:\/\/webdav\/"},"lizProj4":{"EPSG:2154":"+proj=lcc +lat_0=46.5 +lon_0=3 +lat_1=49 +lat_2=44 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs","EPSG:4326":"+proj=longlat +datum=WGS84 +no_defs","":""},"filterConfigData":{"url":"\/index.php\/filter\/service?repository=testsrepository&project=attribute_table"},"filterConfig":{}}</script>

The popup dock is build client side by the JS and depends on `lizDict`.
Since 3liz#4329 the popup dock could be created before the `lizDict` is available.
@rldhont rldhont force-pushed the fix-dock-popup-lizdict branch from 0d7e2b5 to 327ae66 Compare May 3, 2024 07:42
@Gustry
Copy link
Member

Gustry commented May 3, 2024

It seems ok this morning restarting my docker stack...

I had to sudo chown etienne:etienne -R ../assets/node_modules/ to be sure, but I though it was fixed a few commits ago 3123d8c

@rldhont
Copy link
Collaborator Author

rldhont commented May 7, 2024

@mdouchin @nboisteault ready for review. backport or not ?

@mdouchin
Copy link
Collaborator

mdouchin commented May 7, 2024

backport to 3.7 would be great

@rldhont rldhont merged commit 0a19884 into 3liz:master May 7, 2024
13 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented May 7, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 327ae66d0... [Fix] Add Popup dock server side
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".

stdout
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js
Auto-merging lizmap/modules/lizmap/lib/Project/Project.php
Auto-merging lizmap/modules/view/controllers/lizMap.classic.php

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-4398-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 327ae66d0219ad799dd17e9f2553db55e874f7ec
# Push it to GitHub
git push --set-upstream origin backport-4398-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-4398-to-release_3_7.

@rldhont rldhont deleted the fix-dock-popup-lizdict branch May 22, 2024 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_7 failed backport javascript Pull requests that update Javascript code php Pull requests that update Php code run end2end If the PR must run end2end tests or not user interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants