Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20231208.2 #18971

Merged
merged 5 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "home-assistant-frontend"
version = "20231208.1"
version = "20231208.2"
license = {text = "Apache-2.0"}
description = "The Home Assistant frontend"
readme = "README.md"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { mdiThermostat } from "@mdi/js";
import { HassEntity } from "home-assistant-js-websocket";
import { css, html, LitElement, PropertyValues, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
import { customElement, property, query, state } from "lit/decorators";
import { styleMap } from "lit/directives/style-map";
import { stopPropagation } from "../../../common/dom/stop_propagation";
import { computeDomain } from "../../../common/entity/compute_domain";
import { stateColorCss } from "../../../common/entity/state_color";
import "../../../components/ha-control-select";
import "../../../components/ha-control-select-menu";
import type { ControlSelectOption } from "../../../components/ha-control-select";
import type { HaControlSelectMenu } from "../../../components/ha-control-select-menu";
import {
ClimateEntity,
compareClimateHvacModes,
Expand Down Expand Up @@ -35,6 +39,9 @@ class HuiClimateHvacModesCardFeature

@state() _currentHvacMode?: HvacMode;

@query("ha-control-select-menu", true)
private _haSelect?: HaControlSelectMenu;

static getStubConfig(
_,
stateObj?: HassEntity
Expand Down Expand Up @@ -66,8 +73,23 @@ class HuiClimateHvacModesCardFeature
}
}

protected updated(changedProps: PropertyValues) {
super.updated(changedProps);
if (this._haSelect && changedProps.has("hass")) {
const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
if (
this.hass &&
this.hass.formatEntityAttributeValue !==
oldHass?.formatEntityAttributeValue
) {
this._haSelect.layoutOptions();
}
}
}

private async _valueChanged(ev: CustomEvent) {
const mode = (ev.detail as any).value as HvacMode;
const mode =
(ev.detail as any).value ?? ((ev.target as any).value as HvacMode);

if (mode === this.stateObj!.state) return;

Expand Down Expand Up @@ -111,6 +133,37 @@ class HuiClimateHvacModesCardFeature
path: computeHvacModeIcon(mode),
}));

if (this._config.style === "dropdown") {
return html`
<div class="container">
<ha-control-select-menu
show-arrow
hide-label
.label=${this.hass.localize("ui.card.climate.mode")}
.value=${this._currentHvacMode}
.disabled=${this.stateObj.state === UNAVAILABLE}
fixedMenuPosition
naturalMenuWidth
@selected=${this._valueChanged}
@closed=${stopPropagation}
>
<ha-svg-icon slot="icon" .path=${mdiThermostat}></ha-svg-icon>
${options.map(
(option) => html`
<ha-list-item .value=${option.value} graphic="icon">
<ha-svg-icon
slot="graphic"
.path=${option.path}
></ha-svg-icon>
${option.label}
</ha-list-item>
`
)}
</ha-control-select-menu>
</div>
`;
}

return html`
<div class="container">
<ha-control-select
Expand All @@ -131,6 +184,14 @@ class HuiClimateHvacModesCardFeature

static get styles() {
return css`
ha-control-select-menu {
box-sizing: border-box;
--control-select-menu-height: 40px;
--control-select-menu-border-radius: 10px;
line-height: 1.2;
display: block;
width: 100%;
}
ha-control-select {
--control-select-padding: 0;
--control-select-thickness: 40px;
Expand Down
1 change: 1 addition & 0 deletions src/panels/lovelace/card-features/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export interface AlarmModesCardFeatureConfig {

export interface ClimateHvacModesCardFeatureConfig {
type: "climate-hvac-modes";
style?: "dropdown" | "icons";
hvac_modes?: HvacMode[];
}

Expand Down
15 changes: 9 additions & 6 deletions src/panels/lovelace/common/generate-lovelace-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,15 @@ export const computeCards = (
const cardConfig: ThermostatCardConfig = {
type: "thermostat",
entity: entityId,
features: [
{
type: "climate-hvac-modes",
hvac_modes: states[entityId]?.attributes?.hvac_modes,
},
],
features:
(states[entityId]?.attributes?.hvac_modes?.length ?? 0) > 1
? [
{
type: "climate-hvac-modes",
hvac_modes: states[entityId]?.attributes?.hvac_modes,
},
]
: undefined,
};
cards.push(cardConfig);
} else if (domain === "humidifier") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { customElement, property, state } from "lit/decorators";
import memoizeOne from "memoize-one";
import { fireEvent } from "../../../../common/dom/fire_event";
import type { FormatEntityStateFunc } from "../../../../common/translations/entity-state";
import type { LocalizeFunc } from "../../../../common/translations/localize";
import "../../../../components/ha-form/ha-form";
import type { SchemaUnion } from "../../../../components/ha-form/types";
import { HVAC_MODES } from "../../../../data/climate";
Expand All @@ -30,8 +31,27 @@ export class HuiClimateHvacModesCardFeatureEditor
}

private _schema = memoizeOne(
(formatEntityState: FormatEntityStateFunc, stateObj?: HassEntity) =>
(
localize: LocalizeFunc,
formatEntityState: FormatEntityStateFunc,
stateObj?: HassEntity
) =>
[
{
name: "style",
selector: {
select: {
multiple: false,
mode: "list",
options: ["dropdown", "icons"].map((mode) => ({
value: mode,
label: localize(
`ui.panel.lovelace.editor.features.types.climate-preset-modes.style_list.${mode}`
),
})),
},
},
},
{
name: "hvac_modes",
selector: {
Expand Down Expand Up @@ -59,12 +79,22 @@ export class HuiClimateHvacModesCardFeatureEditor
? this.hass.states[this.context?.entity_id]
: undefined;

const schema = this._schema(this.hass.formatEntityState, stateObj);
const data: ClimateHvacModesCardFeatureConfig = {
style: "icons",
hvac_modes: [],
...this._config,
};

const schema = this._schema(
this.hass.localize,
this.hass.formatEntityState,
stateObj
);

return html`
<ha-form
.hass=${this.hass}
.data=${this._config}
.data=${data}
.schema=${schema}
.computeLabel=${this._computeLabelCallback}
@value-changed=${this._valueChanged}
Expand All @@ -81,13 +111,12 @@ export class HuiClimateHvacModesCardFeatureEditor
) => {
switch (schema.name) {
case "hvac_modes":
case "style":
return this.hass!.localize(
`ui.panel.lovelace.editor.features.types.climate-hvac-modes.${schema.name}`
);
default:
return this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
);
return "";
}
};
}
Expand Down
26 changes: 16 additions & 10 deletions src/panels/todo/ha-panel-todo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ import { HuiErrorCard } from "../lovelace/cards/hui-error-card";
import { createCardElement } from "../lovelace/create-element/create-card-element";
import { LovelaceCard } from "../lovelace/types";
import { navigate } from "../../common/navigate";
import { createSearchParam } from "../../common/url/search-params";
import {
createSearchParam,
extractSearchParam,
} from "../../common/url/search-params";
import { constructUrlCurrentPath } from "../../common/url/construct-url";

@customElement("ha-panel-todo")
Expand Down Expand Up @@ -105,18 +108,21 @@ class PanelTodo extends LitElement {

if (!this.hasUpdated) {
this.hass.loadFragmentTranslation("lovelace");
}

if (!this.hasUpdated && !this._entityId) {
this._entityId = getTodoLists(this.hass)[0]?.entity_id;
} else if (!this.hasUpdated) {
this._setupTodoElement();
const urlEntityId = extractSearchParam("entity_id");
if (urlEntityId) {
this._entityId = urlEntityId;
} else {
if (this._entityId && !(this._entityId in this.hass.states)) {
this._entityId = undefined;
}
if (!this._entityId) {
this._entityId = getTodoLists(this.hass)[0]?.entity_id;
}
}
}
}

protected updated(changedProperties: PropertyValues): void {
super.updated(changedProperties);
if (changedProperties.has("_entityId")) {
if (changedProperties.has("_entityId") || !this.hasUpdated) {
this._setupTodoElement();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
<p class="label">
${this.hass.localize("ui.card.climate.humidity_target")}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,17 @@ export class HaStateControlClimateTemperature extends LitElement {
}

if (
!supportsFeature(
(!supportsFeature(
this.stateObj,
ClimateEntityFeature.TARGET_TEMPERATURE
) &&
!supportsFeature(
) ||
this._targetTemperature.value === null) &&
(!supportsFeature(
this.stateObj,
ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
)
) ||
this._targetTemperature.low === null ||
this._targetTemperature.high === null)
) {
return html`
<p class="label">${this.hass.formatEntityState(this.stateObj)}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ export class HaStateControlHumidifierHumidity extends LitElement {
<p class="label">
${action && action !== "off" && action !== "idle"
? actionLabel
: this.hass.localize("ui.card.humidifier.target")}
: this._targetHumidity
? this.hass.localize("ui.card.humidifier.target")
: this.hass.formatEntityState(this.stateObj)}
</p>
`;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ export class HaStateControlWaterHeaterTemperature extends LitElement {
!supportsFeature(
this.stateObj,
WaterHeaterEntityFeature.TARGET_TEMPERATURE
)
) ||
!this._targetTemperature
) {
return html`
<p class="label">${this.hass.formatEntityState(this.stateObj)}</p>
Expand Down
7 changes: 6 additions & 1 deletion src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -5280,7 +5280,12 @@
},
"climate-hvac-modes": {
"label": "Climate HVAC modes",
"hvac_modes": "HVAC modes"
"hvac_modes": "HVAC modes",
"style": "[%key:ui::panel::lovelace::editor::features::types::climate-preset-modes::style%]",
"style_list": {
"dropdown": "[%key:ui::panel::lovelace::editor::features::types::climate-preset-modes::style_list::dropdown%]",
"icons": "[%key:ui::panel::lovelace::editor::features::types::climate-preset-modes::style_list::icons%]"
}
},
"climate-preset-modes": {
"label": "Climate preset modes",
Expand Down
Loading