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

Sitemap editor: Support AND conditions and icon rules #2145

Merged
merged 4 commits into from
Oct 27, 2023
Merged

Sitemap editor: Support AND conditions and icon rules #2145

merged 4 commits into from
Oct 27, 2023

Conversation

mherwege
Copy link
Contributor

@mherwege mherwege commented Oct 20, 2023 •
edited by florian-h05
Loading

Fixes #2149.

Sitemaps now support icon rules and AND conditions in icon, color and visibility rules.
Mappings now also support an icon.

This PR introduces support to configure this in the sitemap editor.
It also contains a fix for staticIcon support.

Depends on openhab/openhab-core#3850

@mherwege
fix staticIcon parameter
9e6f88d 
Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
@mherwege
allow and conditions
8605ad0 
Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
@mherwege mherwege requested a review from a team as a code owner October 20, 2023 15:35
@mherwege mherwege mentioned this pull request Oct 20, 2023
Closed
@relativeci
Copy link

relativeci bot commented Oct 20, 2023 •
edited
Loading

Job #1222: Bundle Size — 15.8MiB (+0.22%).

323990c(current) vs b7270d2 main#1158(baseline)

Warning

Bundle contains 16 duplicate packages – View duplicate packages

Warning

Bundle introduced 13 new packages: @jsep-plugin/regex, @jsep-plugin/arrow, @jsep-plugin/object and 10 more – View changed packages

Bundle metrics  Change 10 changes Regression 5 regressions Improvement 1 improvement
                 Current
Job #1222		      Baseline
Job #1158
Regression  Initial JS 1.85MiB(+10.95%) 1.67MiB
Regression  Initial CSS 608.95KiB(+0.01%) 608.89KiB
Change  Cache Invalidation 93.81% 93.95%
Change  Chunks 217(-0.91%) 219
Change  Assets 683(-0.87%) 689
Change  Modules 2987(+75.71%) 1700
Regression  Duplicate Modules 173(+92.22%) 90
Improvement  Duplicate Code 1.61%(-17.44%) 1.95%
Regression  Packages 152(+10.14%) 138
Regression  Duplicate Packages 16(+6.67%) 15
Bundle size by type  Change 3 changes Regression 3 regressions
                 Current
Job #1222		      Baseline
Job #1158
Regression  JS 9.28MiB (+0.25%) 9.25MiB
Regression  Other 4.74MiB (+0.21%) 4.73MiB
Regression  CSS 860.19KiB (+0.08%) 859.49KiB
Not changed  Fonts 526.1KiB 526.1KiB
Not changed  Media 295.6KiB 295.6KiB
Not changed  IMG 140.74KiB 140.74KiB
Not changed  HTML 1.23KiB 1.23KiB

View job #1222 report View mherwege:conditions_and branch activity

@mherwege
support icon in mappings
9286571 
Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
@mherwege mherwege mentioned this pull request Oct 20, 2023
Closed
@florian-h05 florian-h05 added enhancement New feature or request main ui Main UI awaiting other PR Depends on another PR labels Oct 22, 2023
@florian-h05 florian-h05 changed the title Sitemap editor: support AND conditions and icon rules Sitemap editor: Support AND conditions and icon rules Oct 22, 2023
florian-h05
florian-h05 approved these changes Oct 22, 2023
View reviewed changes
Copy link
Contributor

@florian-h05 florian-h05 left a comment

Choose a reason for hiding this comment

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

LGTM thanks.

Please ping me once the core PR is merged.

@mherwege
leading non-whitespace in mapping or condition
323990c 
Signed-off-by: Mark Herwege <mark.herwege@telenet.be>
@mherwege mherwege mentioned this pull request Oct 24, 2023
Closed
@mherwege
Copy link
Contributor Author

@florian-h05 The core PR has now been merged.
Note I added a small commit solving #2149 after your review.

@florian-h05 florian-h05 removed the awaiting other PR Depends on another PR label Oct 27, 2023
@florian-h05 florian-h05 added this to the 4.1 milestone Oct 27, 2023
@florian-h05 florian-h05 merged commit 922c4f3 into openhab:main Oct 27, 2023
6 checks passed
@mherwege mherwege deleted the conditions_and branch October 27, 2023 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@florian-h05 florian-h05 florian-h05 approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request main ui Main UI
Projects
None yet
Milestone
4.1
Development

Successfully merging this pull request may close these issues.

Syntax validation errors when command mappings contain special characters like [ and ]
2 participants
@mherwege @florian-h05