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

New option to disable the automatic permalink #4586

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Jul 5, 2024

In the main section of the JSON, add a new option to enable the automatic permalink : automatic_permalink.

It will be enabled by default.

Linked to 3liz/lizmap-plugin#590

@rldhont rldhont added user interface tests unit tests and docker configuration for tests javascript Pull requests that update Javascript code run end2end If the PR must run end2end tests or not backport release_3_7 backport release_3_8 labels Jul 5, 2024
@rldhont rldhont requested review from Gustry and nboisteault July 5, 2024 16:39
@github-actions github-actions bot added this to the 3.9.0 milestone Jul 5, 2024
In the main section of the JSON, add a new option to enable the automatic permalink : automatic_permalink.

It will be enabled by default.

Linked to 3liz/lizmap-plugin#590
@rldhont rldhont force-pushed the disable-automatic-permalink branch from e04a34f to ba73e8c Compare July 8, 2024 06:51
@Gustry
Copy link
Member

Gustry commented Jul 8, 2024

It will be enabled by default.

You mean "automatic permalink" will be enabled by default ? So it will be the reverse compared to the plugin ?

@rldhont
Copy link
Collaborator Author

rldhont commented Jul 8, 2024

It will be enabled by default.

You mean "automatic permalink" will be enabled by default ? So it will be the reverse compared to the plugin ?

I keep the LWC 3.7 fonctionnality

@nboisteault
Copy link
Member

It will be enabled by default.

You mean "automatic permalink" will be enabled by default ? So it will be the reverse compared to the plugin ?

I keep the LWC 3.7 fonctionnality

It could be disabled by default in LWC 3.8.

@rldhont
Copy link
Collaborator Author

rldhont commented Jul 8, 2024

It will be enabled by default.

You mean "automatic permalink" will be enabled by default ? So it will be the reverse compared to the plugin ?

I keep the LWC 3.7 fonctionnality

It could be disabled by default in LWC 3.8.

I will do an other PR in this case after validation and backport.

@Gustry
Copy link
Member

Gustry commented Jul 8, 2024

I keep the LWC 3.7 fonctionnality

We need to be consistent with the plugin so :) Which is not the case, or to define what happen if the key is not found.
So you consider if the key is not found or True, then the automatic permalink is done, right ?

It could be disabled by default in LWC 3.8.

Well, if we want to change the default behavior, I think it's better to do it ASAP.

People are creating new projects. The more we wait, the more they will have to manually update their CFG file.

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

3liz-bot commented Jul 8, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ba73e8cf1... New option to disable the automatic permalink
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/modules/Permalink.js
Auto-merging assets/src/modules/config/Options.js
CONFLICT (content): Merge conflict in assets/src/modules/config/Options.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-4586-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ba73e8cf18ac06999b20c275904553ec48e694f6
# Push it to GitHub
git push --set-upstream origin backport-4586-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-4586-to-release_3_7.

rldhont added a commit to rldhont/lizmap-web-client that referenced this pull request Jul 9, 2024
After 3liz#4586 that added `automatic_permalink` option
the default value will be false.
3liz-bot pushed a commit that referenced this pull request Jul 9, 2024
After #4586 that added `automatic_permalink` option
the default value will be false.
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 tests unit tests and docker configuration for tests user interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants