jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-25 18:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent voice settings to override entity registry settings dialog (#17485)

Browse Source
This commit is contained in:
Bram Kragten 2023-08-04 15:09:20 +02:00 committed by GitHub
parent 7b6d9106d4
commit 0d630aa5f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/dialogs/more-info/ha-more-info-dialog.ts
View File

@ -411,54 +411,54 @@ export class MoreInfoDialog extends LitElement {
@entity-entry-updated=${this._entryUpdated} @entity-entry-updated=${this._entryUpdated}
@toggle-edit-mode=${this._handleToggleInfoEditModeEvent} @toggle-edit-mode=${this._handleToggleInfoEditModeEvent}
> >
${this._childView ${cache(
? html` this._childView
<div class="child-view"> ? html`
${dynamicElement(this._childView.viewTag, { <div class="child-view">
hass: this.hass, ${dynamicElement(this._childView.viewTag, {
entry: this._entry, hass: this.hass,
params: this._childView.viewParams, entry: this._entry,
})} params: this._childView.viewParams,
</div> })}
` </div>
: cache( `
this._currView === "info" : this._currView === "info"
? html` ? html`
<ha-more-info-info <ha-more-info-info
dialogInitialFocus dialogInitialFocus
.hass=${this.hass} .hass=${this.hass}
.entityId=${this._entityId} .entityId=${this._entityId}
.entry=${this._entry} .entry=${this._entry}
.editMode=${this._infoEditMode} .editMode=${this._infoEditMode}
></ha-more-info-info> ></ha-more-info-info>
` `
: this._currView === "history" : this._currView === "history"
? html` ? html`
<ha-more-info-history-and-logbook <ha-more-info-history-and-logbook
.hass=${this.hass} .hass=${this.hass}
.entityId=${this._entityId} .entityId=${this._entityId}
></ha-more-info-history-and-logbook> ></ha-more-info-history-and-logbook>
` `
: this._currView === "settings" : this._currView === "settings"
? html` ? html`
<ha-more-info-settings <ha-more-info-settings
.hass=${this.hass} .hass=${this.hass}
.entityId=${this._entityId} .entityId=${this._entityId}
.entry=${this._entry} .entry=${this._entry}
></ha-more-info-settings> ></ha-more-info-settings>
` `
: this._currView === "related" : this._currView === "related"
? html` ? html`
<ha-related-items <ha-related-items
.hass=${this.hass} .hass=${this.hass}
.itemId=${entityId} .itemId=${entityId}
.itemType=${SearchableDomains.has(domain) .itemType=${SearchableDomains.has(domain)
? domain ? domain
: "entity"} : "entity"}
></ha-related-items> ></ha-related-items>
` `
: nothing : nothing
)} )}
</div> </div>
</ha-dialog> </ha-dialog>
`; `;

5
src/panels/config/entities/entity-registry-settings-editor.ts
View File

@ -186,7 +186,10 @@ export class EntityRegistrySettingsEditor extends LitElement {
protected willUpdate(changedProperties: PropertyValues) { protected willUpdate(changedProperties: PropertyValues) {
super.willUpdate(changedProperties); super.willUpdate(changedProperties);
if (!changedProperties.has("entry")) { if (
!changedProperties.has("entry") ||
changedProperties.get("entry")?.id === this.entry.id
) {
return; return;
} }