Add "show not installable option" to update overview page #28717
+90
−34
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ import { | |
| import type { UpdateEntity } from "../../../data/update"; | ||
| import { | ||
| checkForEntityUpdates, | ||
| filterUpdateEntitiesParameterized, | ||
| } from "../../../data/update"; | ||
| import { | ||
| QuickBarMode, | ||
|
|
@@ -203,7 +203,7 @@ class HaConfigDashboard extends SubscribeMixin(LitElement) { | |
|
|
||
| protected render(): TemplateResult { | ||
| const { updates: canInstallUpdates, total: totalUpdates } = | ||
| this._filterUpdateEntitiesParameterized( | ||
| this.hass.states, | ||
| this.hass.entities | ||
| ); | ||
|
|
@@ -288,6 +288,7 @@ class HaConfigDashboard extends SubscribeMixin(LitElement) { | |
| .narrow=${this.narrow} | ||
| .total=${totalUpdates} | ||
| .updateEntities=${canInstallUpdates} | ||
| .isInstallable=${true} | ||
| ></ha-config-updates> | ||
| ${totalUpdates > canInstallUpdates.length | ||
| ? html` | ||
|
|
@@ -344,14 +345,16 @@ class HaConfigDashboard extends SubscribeMixin(LitElement) { | |
| showShortcutsDialog(this); | ||
| } | ||
|
|
||
| private _filterUpdateEntitiesParameterized = memoizeOne( | ||
| ( | ||
| entities: HomeAssistant["states"], | ||
| entityRegistry: HomeAssistant["entities"] | ||
| ): { updates: UpdateEntity[]; total: number } => { | ||
| const updates = filterUpdateEntitiesParameterized( | ||
| entities, | ||
| false, | ||
| false | ||
| ).filter((entity) => !entityRegistry[entity.entity_id]?.hidden); | ||
|
|
||
| return { | ||
| updates: updates.slice(0, updates.length === 3 ? updates.length : 2), | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,8 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) { | |
|
|
||
| @property({ type: Number }) public total?: number; | ||
|
|
||
| @property({ attribute: false }) public isInstallable = true; | ||
|
|
||
| @state() private _devices?: DeviceRegistryEntry[]; | ||
|
|
||
| @state() private _entities?: EntityRegistryEntry[]; | ||
|
|
@@ -91,6 +93,7 @@ class HaConfigUpdates extends SubscribeMixin(LitElement) { | |
| <div class="title" role="heading" aria-level="2"> | ||
| ${this.hass.localize("ui.panel.config.updates.title", { | ||
| count: this.total || this.updateEntities.length, | ||
| installable: this.isInstallable ? "true" : "false", | ||
| })} | ||
| </div> | ||
| <ha-md-list> | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2384,7 +2384,7 @@ | |
| "no_new_updates": "No new updates found", | ||
| "updates_refreshed": "State of {count} {count, plural,\n one {update}\n other {updates}\n} refreshed", | ||
| "checking_updates": "Checking for updates...", | ||
| "title": "{count} {count, plural,\n one {{installable, select, \n true {installable} \n other {not installable}\n} update}\n other {{installable, select, \n true {installable} \n other {not installable}\n} updates}\n}", | ||
|
Member
There was a problem hiding this comment. This overcomplicates it IMO. Lets just leave the existing translation as is and add a new one for "not installable" updates. |
||
| "unable_to_fetch": "Unable to load updates", | ||
| "more_updates": "Show all updates", | ||
| "show": "show", | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calling
_filterUpdateEntitiesParameterizedtwice with different args defeats the memoization as the cache only keeps the latest value.You should create a new memoized method similar to
_filterUpdateEntitiesParameterizedfor "not installable" updates instead of reusing_filterUpdateEntitiesParameterized.