[Sitemap] Add support for multiple AND conditions

[lolodomo]

Concerns labelcolor, valuecolor and visibility

Also fix wrong positions of ")" in Sitemap.xtext

Closes #3058

Signed-off-by: Laurent Garnier [email protected]

[lolodomo]

This feature is fully handled by the core framework and there is nothing to change in sitemap UIs. And the sitemap syntax remains fully backward compatible.

[kaikreuzer]

lgtm, thanks.

[lolodomo]

Thank you Kai.

[lolodomo]

@kaikreuzer @wborn : this requires a new build of core. I don't know if this requires a manual trigger or if the build will happen automatically during the night?

[wborn]

Yes it will automatically start a build at 3 AM (CEST).
Sometimes we trigger it manually when we are impatient. 🙂

[lolodomo]

Thank you for confirmation.

[mherwege]

@lolodomo Before this PR, visibility rules always required an item and comparator in the condition (unlike color rules). As you now made it the same as for color rules, this is no longer required by the grammar. Can I assume this will correctly be picked up and interpreted by the UI's as well, or is this just for simplifying the grammar? There is a check in the UI sitemap editor for the presence of item and comparator, generating a warning if not present. If this is no longer required, I can remove it.

[lolodomo]

Can I assume this will correctly be picked up and interpreted by the UI's as well, or is this just for simplifying the grammar?

No problem with UIs, this Is in fact fully handled by the core framework.

I made the change for simplification and consistency but also because the additional constraint for visibility rules (compared to color rules) seems to have no valid reason.

If this is no longer required, I can remove it.

Yes