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

Permalink malformed & z-index of composition layer #4678

Merged
merged 3 commits into from
Feb 7, 2024
Merged

Conversation

FilipLeitner
Copy link
Collaborator

@FilipLeitner FilipLeitner commented Feb 2, 2024

Description

fix issue #4650 for version 13.x

  • fix zindex assignment of composition layers -> should match the composition layer order and not be influenced by path's max zindex
  • sort layers in folder based on hsConfig.reverseLayerList

Related issues or pull requests

#4650

Pull request type

Please check the type of change your PR introduces:

  • Bugfix
  • Feature
  • Dependency updates
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Documentation content changes
  • Other (please describe)
  • I am unsure (we'll look into it together)

Do you introduce a breaking change?

  • Yes
  • No
  • I am unsure (no worries, we'll find out)

Checklist

  • I understand and agree that the changes in this PR will be licensed under the [MIT License]
  • I have followed the guidelines for contributing
  • The proposed change fits to the content of the code of conduct
  • I have added or updated tests and documentation, and the test suite passes (run npm test locally)
  • I'm lost; why do I have to check so many boxes? Please help!

@FilipLeitner FilipLeitner requested a review from jmacura as a code owner February 2, 2024 11:46
@FilipLeitner FilipLeitner changed the title Issue 4650 Permalink malformed & zindex of composition layer Feb 5, 2024
@jmacura
Copy link
Collaborator

jmacura commented Feb 5, 2024

note for hslayers-server: decoding URL in the beginning is redundant (fixed in e05185e which is rather unrelated to this PR)

@jmacura jmacura changed the title Permalink malformed & zindex of composition layer Permalink malformed & z-index of composition layer Feb 5, 2024
Copy link
Collaborator

@jmacura jmacura left a comment

Choose a reason for hiding this comment

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

Thanks 💚

@jmacura jmacura force-pushed the issue-4635/proxy-replace branch from cd398ac to 6c5d80c Compare February 5, 2024 13:44
@jmacura jmacura changed the base branch from issue-4635/proxy-replace to develop February 5, 2024 13:59
@jmacura jmacura changed the base branch from develop to release-13.x February 5, 2024 14:03
@jmacura jmacura added the Port/backport needed Stuff that needs to be re-applied in 1.x or 2.x branch respectively label Feb 5, 2024
@jmacura
Copy link
Collaborator

jmacura commented Feb 7, 2024

Commit 48651e1 cherry-picked to #4654 and is already part of develop (and this branch was rebased on top of it).

@jmacura jmacura merged commit f5ba9e5 into release-13.x Feb 7, 2024
4 checks passed
@jmacura
Copy link
Collaborator

jmacura commented Feb 7, 2024

Merged into release-13.x branch, needs a port to secondary-entry branch (future develop).

@jmacura jmacura deleted the issue-4650 branch October 21, 2024 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Port/backport needed Stuff that needs to be re-applied in 1.x or 2.x branch respectively
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants