Remove hiddenBy and disabledBy from HAAppEntity and DB #4265
Conversation
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
Eliminates the hiddenBy and disabledBy properties from HAAppEntity, related database tables, and query logic. Entity hidden/disabled state is now determined dynamically from AppEntityRegistry, simplifying entity state management and reducing data duplication.
Contributor
There was a problem hiding this comment.
Pull request overview
Removes the hiddenBy and disabledBy fields from HAAppEntity and its backing database table, and shifts hidden/disabled resolution to AppEntityRegistry to avoid duplicated state.
Changes:
- Deleted
hiddenBy/disabledByfromHAAppEntityand removed the corresponding DB columns and enum cases. - Updated hidden/disabled evaluation to be derived from
AppEntityRegistryand adjustedHAAppEntity.config(include:)filtering accordingly. - Removed the now-unneeded entity DB synchronization logic in
AreasServiceand updated home entity observation to no longer filter on removed columns.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| Sources/Shared/HAAppEntity.swift | Removes persisted hidden/disabled fields; derives hidden/disabled dynamically and updates config filtering logic. |
| Sources/Shared/Database/Tables/HAppEntityTable.swift | Drops hiddenBy/disabledBy columns from the HAAppEntity table schema. |
| Sources/Shared/Database/DatabaseTables.swift | Removes hiddenBy/disabledBy enum cases for the AppEntity table. |
| Sources/Shared/AreasService.swift | Removes logic that previously synced hidden/disabled state into HAAppEntity rows. |
| Sources/App/WebView/ExperimentalSpace/Home/HomeViewModel.swift | Removes DB filters on removed columns when observing app entities. |
Contributor
## Summary Addresses performance feedback on #4265. The `config(include:)` method was using `first(where:)` to search the entire registry array for each entity, resulting in O(n²) complexity. Replaced with dictionary-based lookups for O(1) access. **Changes:** - Build registry dictionary keyed by `(serverId, entityId)` tuples - Replace `first(where:)` array search with direct dictionary access - Use `uniquingKeysWith` to handle potential duplicate keys gracefully **Before:** ```swift guard let registry = appEntityRegistry .first(where: { $0.entityId == entity.entityId && $0.serverId == entity.serverId }) else { return true } ``` **After:** ```swift let registryDict = Dictionary( appEntityRegistry.compactMap { registry -> ((String, String), AppEntityRegistry)? in guard let entityId = registry.entityId else { return nil } return ((registry.serverId, entityId), registry) }, uniquingKeysWith: { first, _ in first } ) guard let registry = registryDict[(entity.serverId, entity.entityId)] else { return true } ``` ## Screenshots N/A - Backend performance optimization ## Link to pull request in Documentation repository Documentation: home-assistant/companion.home-assistant# ## Any other notes This is a stacked PR merging into #4265. <!-- START COPILOT CODING AGENT TIPS --> --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: bgoncal <5808343+bgoncal@users.noreply.github.com>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4265 +/- ##
=======================================
Coverage ? 43.08%
=======================================
Files ? 261
Lines ? 15106
Branches ? 0
=======================================
Hits ? 6508
Misses ? 8598
Partials ? 0 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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.
Eliminates the hiddenBy and disabledBy properties from HAAppEntity, related database tables, and query logic. Entity hidden/disabled state is now determined dynamically from AppEntityRegistry, simplifying entity state management and reducing data duplication.
Summary
Screenshots
Link to pull request in Documentation repository
Documentation: home-assistant/companion.home-assistant#
Any other notes