diff --git a/src/panels/config/scene/ha-config-scene.ts b/src/panels/config/scene/ha-config-scene.ts index 47e888e0f3..faef74442b 100644 --- a/src/panels/config/scene/ha-config-scene.ts +++ b/src/panels/config/scene/ha-config-scene.ts @@ -26,8 +26,6 @@ class HaConfigScene extends HassRouterPage { @property({ attribute: "is-wide", type: Boolean }) public isWide = false; - @property({ attribute: false }) public showAdvanced = false; - @property({ attribute: false }) public scenes: SceneEntity[] = []; protected routerOptions: RouterOptions = { @@ -62,7 +60,6 @@ class HaConfigScene extends HassRouterPage { pageEl.narrow = this.narrow; pageEl.isWide = this.isWide; pageEl.route = this.routeTail; - pageEl.showAdvanced = this.showAdvanced; if (this.hass) { if (!pageEl.scenes || !changedProps) { diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index 0d9c3d7f2c..e0c8e319d2 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -98,8 +98,6 @@ export class HaSceneEditor extends PreventUnsavedMixin( @property({ attribute: false }) public scenes!: SceneEntity[]; - @property({ attribute: false }) public showAdvanced = false; - @state() private _dirty = false; @state() private _errors?: string; @@ -486,88 +484,86 @@ export class HaSceneEditor extends PreventUnsavedMixin( : nothing} - ${this.showAdvanced - ? html` -
+ +
+ ${this.hass.localize( + "ui.panel.config.scene.editor.entities.header" + )} +
+ ${this._mode === "live" || entities.length === 0 + ? html`
${this.hass.localize( - "ui.panel.config.scene.editor.entities.header" + `ui.panel.config.scene.editor.entities.introduction${this._mode === "review" ? "_review" : ""}` )} -
- ${this._mode === "live" || entities.length === 0 - ? html`
- ${this.hass.localize( - `ui.panel.config.scene.editor.entities.introduction${this._mode === "review" ? "_review" : ""}` - )} -
` - : nothing} - ${entities.length - ? html` - - - ${entities.map((entityId) => { - const entityStateObj = this.hass.states[entityId]; - if (!entityStateObj) { - return nothing; - } - return html` - ` + : nothing} + ${entities.length + ? html` + + + ${entities.map((entityId) => { + const entityStateObj = this.hass.states[entityId]; + if (!entityStateObj) { + return nothing; + } + return html` + + ${this._mode === "live" + ? html` ` + : nothing} + ${computeStateName(entityStateObj)} +
+ - ${this._mode === "live" - ? html` ` - : nothing} - ${computeStateName(entityStateObj)} -
- -
- - `; - })} - - - ` - : ""} - ${this._mode === "live" - ? html`
+
+
+ `; + })} +
+
+ ` + : ""} + ${this._mode === "live" + ? html` +
+ -
- -
- ` - : nothing} - ` - : nothing} + >
+
+
` + : nothing} +
` : nothing}
`;