diff --git a/demo/src/ha-demo.ts b/demo/src/ha-demo.ts index 37a707952a..070fea8b44 100644 --- a/demo/src/ha-demo.ts +++ b/demo/src/ha-demo.ts @@ -71,7 +71,6 @@ class HaDemo extends HomeAssistantAppEl { entity_category: null, has_entity_name: false, unique_id: "co2_intensity", - aliases: [], }, { config_entry_id: "co2signal", @@ -87,7 +86,6 @@ class HaDemo extends HomeAssistantAppEl { entity_category: null, has_entity_name: false, unique_id: "grid_fossil_fuel_percentage", - aliases: [], }, ]); diff --git a/gallery/src/pages/misc/integration-card.ts b/gallery/src/pages/misc/integration-card.ts index 8bd6acf6c8..56de4308e8 100644 --- a/gallery/src/pages/misc/integration-card.ts +++ b/gallery/src/pages/misc/integration-card.ts @@ -197,7 +197,6 @@ const createEntityRegistryEntries = ( platform: "updater", has_entity_name: false, unique_id: "updater", - aliases: [], }, ]; diff --git a/src/components/entity/state-info.ts b/src/components/entity/state-info.ts index 7ee6c6ba39..9db1bae9f7 100644 --- a/src/components/entity/state-info.ts +++ b/src/components/entity/state-info.ts @@ -28,7 +28,7 @@ class StateInfo extends LitElement { const name = computeStateName(this.stateObj); - return html` - ${entity.interfaces - .filter((ifc) => !IGNORE_INTERFACES.includes(ifc)) - .map((ifc) => ifc.replace(/(Alexa.|Controller)/g, "")) - .join(", ")} + ${entity.entity_id in this.hass.entities + ? html`` + : ""} ${!emptyFilter ? html`${iconButton}` @@ -323,23 +329,33 @@ class CloudAlexa extends SubscribeMixin(LitElement) { if (changedProps.has("cloudStatus")) { this._entityConfigs = this.cloudStatus.prefs.alexa_entity_configs; } + if ( + changedProps.has("hass") && + changedProps.get("hass")?.entities !== this.hass.entities + ) { + const categories = {}; + + for (const entry of Object.values(this.hass.entities)) { + categories[entry.entity_id] = entry.entity_category; + } + + this._entityCategories = categories; + } } - protected override hassSubscribe(): ( - | UnsubscribeFunc - | Promise - )[] { - return [ - subscribeEntityRegistry(this.hass.connection, (entries) => { - const categories = {}; - - for (const entry of entries) { - categories[entry.entity_id] = entry.entity_category; - } - - this._entityCategories = categories; - }), - ]; + private async _openAliasesSettings(ev) { + ev.stopPropagation(); + const entityId = ev.target.entityId; + const entry = await getExtendedEntityRegistryEntry(this.hass, entityId); + if (!entry) { + return; + } + showEntityAliasesDialog(this, { + entity: entry, + updateEntry: async (updates) => { + await updateEntityRegistryEntry(this.hass, entry.entity_id, updates); + }, + }); } private async _fetchData() { diff --git a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts index 75d14227cc..92bf480175 100644 --- a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts +++ b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts @@ -9,7 +9,6 @@ import { mdiFormatListChecks, mdiSync, } from "@mdi/js"; -import type { UnsubscribeFunc } from "home-assistant-js-websocket"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; @@ -41,7 +40,8 @@ import { } from "../../../../data/cloud"; import { EntityRegistryEntry, - subscribeEntityRegistry, + getExtendedEntityRegistryEntry, + updateEntityRegistryEntry, } from "../../../../data/entity_registry"; import { fetchCloudGoogleEntities, @@ -51,15 +51,15 @@ import { showDomainTogglerDialog } from "../../../../dialogs/domain-toggler/show import { showAlertDialog } from "../../../../dialogs/generic/show-dialog-box"; import "../../../../layouts/hass-loading-screen"; import "../../../../layouts/hass-subpage"; -import { SubscribeMixin } from "../../../../mixins/subscribe-mixin"; -import { haStyle } from "../../../../resources/styles"; +import { buttonLinkStyle, haStyle } from "../../../../resources/styles"; import type { HomeAssistant } from "../../../../types"; import { showToast } from "../../../../util/toast"; +import { showEntityAliasesDialog } from "../../entities/entity-aliases/show-dialog-entity-aliases"; const DEFAULT_CONFIG_EXPOSE = true; @customElement("cloud-google-assistant") -class CloudGoogleAssistant extends SubscribeMixin(LitElement) { +class CloudGoogleAssistant extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @property() public cloudStatus!: CloudStatusLoggedIn; @@ -174,15 +174,23 @@ class CloudGoogleAssistant extends SubscribeMixin(LitElement) { secondary-line @click=${this._showMoreInfo} > - ${entity.traits - .map((trait) => trait.substr(trait.lastIndexOf(".") + 1)) - .join(", ")} + ${entity.entity_id in this.hass.entities + ? html`` + : ""} ${!emptyFilter ? html`${iconButton}` : html` ${iconButton} @@ -308,7 +316,7 @@ class CloudGoogleAssistant extends SubscribeMixin(LitElement) { ${!this.narrow ? this.hass!.localize( - "ui.panel.config.cloud.alexa.exposed", + "ui.panel.config.cloud.google.exposed", "selected", selected ) @@ -329,7 +337,7 @@ class CloudGoogleAssistant extends SubscribeMixin(LitElement) { ${!this.narrow ? this.hass!.localize( - "ui.panel.config.cloud.alexa.not_exposed", + "ui.panel.config.cloud.google.not_exposed", "selected", this._entities.length - selected ) @@ -354,23 +362,33 @@ class CloudGoogleAssistant extends SubscribeMixin(LitElement) { if (changedProps.has("cloudStatus")) { this._entityConfigs = this.cloudStatus.prefs.google_entity_configs; } + if ( + changedProps.has("hass") && + changedProps.get("hass")?.entities !== this.hass.entities + ) { + const categories = {}; + + for (const entry of Object.values(this.hass.entities)) { + categories[entry.entity_id] = entry.entity_category; + } + + this._entityCategories = categories; + } } - protected override hassSubscribe(): ( - | UnsubscribeFunc - | Promise - )[] { - return [ - subscribeEntityRegistry(this.hass.connection, (entries) => { - const categories = {}; - - for (const entry of entries) { - categories[entry.entity_id] = entry.entity_category; - } - - this._entityCategories = categories; - }), - ]; + private async _openAliasesSettings(ev) { + ev.stopPropagation(); + const entityId = ev.target.entityId; + const entry = await getExtendedEntityRegistryEntry(this.hass, entityId); + if (!entry) { + return; + } + showEntityAliasesDialog(this, { + entity: entry, + updateEntry: async (updates) => { + await updateEntityRegistryEntry(this.hass, entry.entity_id, updates); + }, + }); } private _configIsDomainExposed( @@ -583,6 +601,7 @@ class CloudGoogleAssistant extends SubscribeMixin(LitElement) { static get styles(): CSSResultGroup { return [ haStyle, + buttonLinkStyle, css` mwc-list-item > [slot="meta"] { margin-left: 4px; diff --git a/src/panels/config/entities/entity-aliases/show-dialog-entity-aliases.ts b/src/panels/config/entities/entity-aliases/show-dialog-entity-aliases.ts index d3fec599ec..0e9cbd9357 100644 --- a/src/panels/config/entities/entity-aliases/show-dialog-entity-aliases.ts +++ b/src/panels/config/entities/entity-aliases/show-dialog-entity-aliases.ts @@ -1,11 +1,11 @@ import { fireEvent } from "../../../../common/dom/fire_event"; import { - EntityRegistryEntry, EntityRegistryEntryUpdateParams, + ExtEntityRegistryEntry, } from "../../../../data/entity_registry"; export interface EntityAliasesDialogParams { - entity: EntityRegistryEntry; + entity: ExtEntityRegistryEntry; updateEntry: ( updates: Partial ) => Promise; diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index cafff74d14..5fb9d6bf9c 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -728,7 +728,6 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { selectable: false, entity_category: null, has_entity_name: false, - aliases: [], }); } if (changed) { diff --git a/src/panels/config/script/ha-script-trace.ts b/src/panels/config/script/ha-script-trace.ts index ae001665ca..a8addf7bd8 100644 --- a/src/panels/config/script/ha-script-trace.ts +++ b/src/panels/config/script/ha-script-trace.ts @@ -527,15 +527,10 @@ export class HaScriptTrace extends LitElement { :host([narrow]) .graph { max-width: 100%; } - .info { flex: 1; background-color: var(--card-background-color); } - - .linkButton { - color: var(--primary-text-color); - } .trace-link { text-decoration: none; } diff --git a/src/translations/en.json b/src/translations/en.json index f0b5e00104..91de8f9abe 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2634,7 +2634,7 @@ "enable_state_reporting": "Enable State Reporting", "info_state_reporting": "If you enable state reporting, Home Assistant will send all state changes of exposed entities to Amazon. This allows you to always see the latest states in the Alexa app and use the state changes to create routines.", "state_reporting_error": "Unable to {enable_disable} report state.", - "manage_entities": "Manage Entities", + "manage_entities": "[%key:ui::panel::config::cloud::account::google::manage_entities%]", "enable": "enable", "disable": "disable", "not_configured_title": "Alexa is not activated", @@ -2685,6 +2685,7 @@ "follow_domain": "[%key:ui::panel::config::cloud::google::follow_domain%]", "exposed": "[%key:ui::panel::config::cloud::google::exposed%]", "not_exposed": "[%key:ui::panel::config::cloud::google::not_exposed%]", + "manage_aliases": "[%key:ui::panel::config::cloud::google::manage_aliases%]", "expose": "Expose to Alexa", "sync_entities": "Synchronize entities", "sync_entities_error": "Failed to sync entities:" @@ -2710,6 +2711,7 @@ "follow_domain": "Follow domain", "exposed": "{selected} exposed", "not_exposed": "{selected} not exposed", + "manage_aliases": "Manage aliases", "sync_to_google": "Synchronizing changes to Google.", "sync_entities": "Synchronize entities", "sync_entities_error": "Failed to sync entities:",