Fix label when there is no target (#18969)

This commit is contained in:
Bram Kragten 2023-12-08 14:38:01 +01:00 committed by GitHub
parent 8d2d45ae4e
commit 3ada2f3279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 6 deletions

View File

@ -97,6 +97,12 @@ export class HaStateControlClimateHumidity extends LitElement {
`; `;
} }
if (!this._targetHumidity) {
return html`
<p class="label">${this.hass.formatEntityState(this.stateObj)}</p>
`;
}
return html` return html`
<p class="label"> <p class="label">
${this.hass.localize("ui.card.climate.humidity_target")} ${this.hass.localize("ui.card.climate.humidity_target")}

View File

@ -164,14 +164,17 @@ export class HaStateControlClimateTemperature extends LitElement {
} }
if ( if (
!supportsFeature( (!supportsFeature(
this.stateObj, this.stateObj,
ClimateEntityFeature.TARGET_TEMPERATURE ClimateEntityFeature.TARGET_TEMPERATURE
) && ) ||
!supportsFeature( this._targetTemperature.value === null) &&
(!supportsFeature(
this.stateObj, this.stateObj,
ClimateEntityFeature.TARGET_TEMPERATURE_RANGE ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
) ) ||
this._targetTemperature.low === null ||
this._targetTemperature.high === null)
) { ) {
return html` return html`
<p class="label">${this.hass.formatEntityState(this.stateObj)}</p> <p class="label">${this.hass.formatEntityState(this.stateObj)}</p>

View File

@ -110,7 +110,9 @@ export class HaStateControlHumidifierHumidity extends LitElement {
<p class="label"> <p class="label">
${action && action !== "off" && action !== "idle" ${action && action !== "off" && action !== "idle"
? actionLabel ? actionLabel
: this.hass.localize("ui.card.humidifier.target")} : this._targetHumidity
? this.hass.localize("ui.card.humidifier.target")
: this.hass.formatEntityState(this.stateObj)}
</p> </p>
`; `;
} }

View File

@ -107,7 +107,8 @@ export class HaStateControlWaterHeaterTemperature extends LitElement {
!supportsFeature( !supportsFeature(
this.stateObj, this.stateObj,
WaterHeaterEntityFeature.TARGET_TEMPERATURE WaterHeaterEntityFeature.TARGET_TEMPERATURE
) ) ||
!this._targetTemperature
) { ) {
return html` return html`
<p class="label">${this.hass.formatEntityState(this.stateObj)}</p> <p class="label">${this.hass.formatEntityState(this.stateObj)}</p>