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.

Sign up for GitHub

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

Jump to bottom

Click to go back button to show MacroGroup list from Group page within ChangeMapMenu.vue #579

Merged
merged 25 commits into from
Feb 26, 2024
Merged

Click to go back button to show MacroGroup list from Group page within ChangeMapMenu.vue #579

merged 25 commits into from
Feb 26, 2024

Conversation

volterra79
Copy link
Member

@volterra79 volterra79 commented Feb 19, 2024 •
edited by Raruto
Loading

Depends on: g3w-suite/g3w-admin#761

Changes: "click to go back behavior"

Screenshot from 2024-02-19 15-17-35

Before: "goes straight back to the root"

Screenshot from 2024-02-19 15-20-23

After: "show macro group content" and then "go back to root""

Screenshot from 2024-02-19 15-17-51

Screenshot from 2024-02-19 15-20-23

@volterra79 volterra79 added bug Something isn't working backport to v3.9.x labels Feb 19, 2024
@volterra79 volterra79 added this to the v3.10 milestone Feb 19, 2024
@volterra79 volterra79 self-assigned this Feb 19, 2024
volterra79 added a commit to g3w-suite/g3w-admin that referenced this pull request Feb 19, 2024
@volterra79
🐛 Client
3b12f2a 
  g3w-suite/g3w-client#579
@volterra79 volterra79 marked this pull request as ready for review February 19, 2024 14:34
@Raruto Raruto added ux Changes to a current behavior to improve user experience and removed bug Something isn't working labels Feb 20, 2024
@Raruto Raruto changed the title Show macrogroup content if current project belong to a Group inside a macro group Click to go back button to show MacroGroup list from Group page within ChangeMapMenu.vue Feb 20, 2024
@volterra79 volterra79 marked this pull request as draft February 20, 2024 08:43
@volterra79 volterra79 marked this pull request as ready for review February 23, 2024 08:38
volterra79 added a commit to g3w-suite/g3w-admin that referenced this pull request Feb 23, 2024
@volterra79
✨ Client
5661a8f 
  g3w-suite/g3w-client#579
@Raruto
Copy link
Collaborator

Raruto commented Feb 23, 2024

@volterra79 It doesn't seem right:

1. Open change map menu

image

2. After click on "Back arrow"

image

@Raruto
Copy link
Collaborator

Raruto commented Feb 26, 2024

@wlorenzetti should we backport this up to [email protected]?

@volterra79 volterra79 merged commit ebb57cd into dev Feb 26, 2024
@volterra79 volterra79 deleted the g3w-admin/pr/761 branch February 26, 2024 14:51
github-actions bot pushed a commit that referenced this pull request Feb 26, 2024
@volterra79 @github-actions
Click to go back button to show MacroGroup list from Group page withi…
5b6c62f 
…n `ChangeMapMenu.vue` (#579)

* add cache

* Temp dev

* Check if current project (initiial) belong to a macrogroup/s checking initCongif.group.macrogroup_id attribute

* avoid nested conditions

* replace `this._cache` with internal functions `get_macro(id)` + `get_group(id)`

* missing `cb`

* Show macrogroups list if a project initial group belong to more than one macro groups

* Show macrogroups list if a project initial group belong to more than one macro groups: Improving

* Show macrogroups if init project belong to a group inside more than one macrogroups

* remove padding

* Revert "remove padding"

This reverts commit 540c938.

* code clean up

* Fix case of group.id == macrogroup.id

* remove `setFallBackImage` and `macrogroupsandgroups `

* remove `isChildNode` and `_onChangeRoot`

* jsdoc

* Fix .on register event. Need to be a function

---------

Co-authored-by: Raruto <[email protected]>
(cherry picked from commit ebb57cd)
@github-actions github-actions bot mentioned this pull request Feb 26, 2024
Merged
@github-actions GitHub Actions
Copy link

The backport to v3.8.x failed:

The process '/usr/bin/git' failed with exit code 1

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-v3.8.x v3.8.x
# Navigate to the new working tree
cd .worktrees/backport-v3.8.x
# Create a new branch
git switch --create backport-579-to-v3.8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ebb57cdffbf6f92b6c6acb75be269919383d7d57
# Push it to GitHub
git push --set-upstream origin backport-579-to-v3.8.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.8.x

Then, create a pull request where the base branch is v3.8.x and the compare/head branch is backport-579-to-v3.8.x.

volterra79 added a commit that referenced this pull request Feb 26, 2024
@github-actions @volterra79
Click to go back button to show MacroGroup list from Group page withi…
51f0a87 
…n `ChangeMapMenu.vue` (#579) (#585)

* add cache

* Temp dev

* Check if current project (initiial) belong to a macrogroup/s checking initCongif.group.macrogroup_id attribute

* avoid nested conditions

* replace `this._cache` with internal functions `get_macro(id)` + `get_group(id)`

* missing `cb`

* Show macrogroups list if a project initial group belong to more than one macro groups

* Show macrogroups list if a project initial group belong to more than one macro groups: Improving

* Show macrogroups if init project belong to a group inside more than one macrogroups

* remove padding

* Revert "remove padding"

This reverts commit 540c938.

* code clean up

* Fix case of group.id == macrogroup.id

* remove `setFallBackImage` and `macrogroupsandgroups `

* remove `isChildNode` and `_onChangeRoot`

* jsdoc

* Fix .on register event. Need to be a function

---------

Co-authored-by: Raruto <[email protected]>
(cherry picked from commit ebb57cd)

Co-authored-by: Francesco Boccacci <[email protected]>
@volterra79 volterra79 mentioned this pull request Mar 1, 2024
Merged
volterra79 added a commit that referenced this pull request Mar 1, 2024
@volterra79
🔙 from #579 - Click to go back button to show MacroGroup list from Gr…
80f3973 
…oup page within ChangeMapMenu.vue
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
@wlorenzetti @volterra79 @Raruto
Add macrogroup_id to group serializer. (#761)
ee5486e 
* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <[email protected]>
Co-authored-by: volterra79 <[email protected]>
Co-authored-by: Raruto <[email protected]>
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
@wlorenzetti
Add macrogroup_id to group serializer. (#761)
9775773 
* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <[email protected]>
Co-authored-by: volterra79 <[email protected]>
Co-authored-by: Raruto <[email protected]>
(cherry picked from commit ee5486e)
@wlorenzetti wlorenzetti mentioned this pull request Mar 4, 2024
Merged
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
@wlorenzetti
Add macrogroup_id to group serializer. (#761)
a242a72 
* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <[email protected]>
Co-authored-by: volterra79 <[email protected]>
Co-authored-by: Raruto <[email protected]>
(cherry picked from commit ee5486e)
@wlorenzetti wlorenzetti mentioned this pull request Mar 4, 2024
Merged
volterra79 added a commit that referenced this pull request Mar 4, 2024
@volterra79
🔙 from #579 - #590 (#591)
2931ddf 
* 🔙 from #579 - Click to go back button to show MacroGroup list from Group page within ChangeMapMenu.vue

* 🔙 from #590 - In case of just one project inside a group, show "No more project for this group"
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
@wlorenzetti @volterra79
Add macrogroup_id to group serializer. (#761) (#772)
963e730 
* Add `macrogroup_id` to group serializer. (#761)

* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <[email protected]>
Co-authored-by: volterra79 <[email protected]>
Co-authored-by: Raruto <[email protected]>
(cherry picked from commit ee5486e)

* ⬆️ Client
  ⬆️ Bump g3w-client v3.9.4 and g3w-client-plugin-qplotly v3.7.1
  - https://github.com/g3w-suite/g3w-client/releases/tag/v3.9.4
  - https://github.com/g3w-suite/g3w-client-plugin-qplotly/releases/tag/v3.7.1

* Fix for QGIS server >= 3.28

---------

Co-authored-by: volterra79 <[email protected]>
Co-authored-by: wlorenzetti <[email protected]>
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
@wlorenzetti @volterra79
Add macrogroup_id to group serializer. (#761) (#773)
d71c5d5 
* Add `macrogroup_id` to group serializer. (#761)

* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <[email protected]>
Co-authored-by: volterra79 <[email protected]>
Co-authored-by: Raruto <[email protected]>
(cherry picked from commit ee5486e)

* For QGIS server version >= 3.28

* Fix merge.

* ⬆️ Client
  ⬆️ Bump g3w-client v3.8.17 https://github.com/g3w-suite/g3w-client/releases/tag/v3.8.17

---------

Co-authored-by: wlorenzetti <[email protected]>
Co-authored-by: volterra79 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Raruto Raruto Raruto approved these changes

@wlorenzetti wlorenzetti Awaiting requested review from wlorenzetti

Assignees

@volterra79 volterra79

Labels
backport to v3.8.x backport to v3.9.x ux Changes to a current behavior to improve user experience
Projects
None yet
Milestone
v3.10
Development

Successfully merging this pull request may close these issues.
2 participants
@volterra79 @Raruto