fix(sitemap): clear iconcolor/labelcolor/valuecolor when an SSE event omits them - #1345
Merged
Merged
Conversation
… omits them OpenHABWidget.apply(event:) merged colors with `if let`, so it could only set a color, never clear one. When a widget's color condition (e.g. iconcolor=[==ON="orange"]) stopped matching, the server's SSE event for that widget simply omits the color field instead of sending an empty string — so the stale color stuck around until a full sitemap reload rebuilt the widget from scratch. Regressed in #1168 (3.4.6 -> 3.4.7), which moved sitemap updates from long-polling (always a full widget snapshot) to incremental SSE events. Colors are now recomputed as a group whenever an event carries a state change (event.state or event.enrichedItem present) — an omitted color defaults to "" instead of being left untouched. Non-state events (icon reload, visibility-only) still leave colors alone, since the server never touches them there. Signed-off-by: Tim Mueller-Seydlitz <timbms@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
OpenHABWidget.apply(event:)merged SSE color updates withif let, so it could only set a color, never clear one. When a widget's color condition (e.g.iconcolor=[==ON="orange"]) stopped matching, the server's SSE event for that widget simply omits the color field instead of sending an empty string — so the stale color stuck around forever, until a full sitemap reload rebuilt the widget from scratch.iconcolor/labelcolor/valuecolorturned orange correctly on ON, but never reverted on OFF without a manual reload.event.stateorevent.enrichedItempresent) — an omitted color defaults to""instead of being left untouched. Non-state events (icon reload, visibility-only) still leave colors alone, since the server never touches them there.Test plan
xcodebuild -workspace openHAB.xcworkspace -scheme openHAB buildsucceedscolorClearsOnStateChangeAwayFromMatchingConditionandnonStateEventLeavesColorsUntouchedtoOpenHABWidgetEventApplicationTests, both passOpenHABCoreTestssuite passes (-testPlan openHABTests -only-testing:OpenHABCoreTests)🤖 Generated with Claude Code