From 522f66423bdcab7482cd46b7fda85028383ec879 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jul 2024 15:26:19 +0200 Subject: [PATCH 01/18] Fix demo map panel (#21265) --- demo/src/stubs/entities.ts | 50 ++++++++++++++++++++++++++++++++++++ demo/src/stubs/lovelace.ts | 17 +++++++++--- src/fake_data/demo_panels.ts | 4 +-- 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/demo/src/stubs/entities.ts b/demo/src/stubs/entities.ts index 132515a014ad..8c863f9a3bb6 100644 --- a/demo/src/stubs/entities.ts +++ b/demo/src/stubs/entities.ts @@ -1,5 +1,55 @@ import { convertEntities } from "../../../src/fake_data/entity"; +export const mapEntities = () => + convertEntities({ + "zone.home": { + entity_id: "zone.home", + state: "zoning", + attributes: { + hidden: true, + latitude: 52.3631339, + longitude: 4.8903147, + radius: 200, + friendly_name: "Home", + icon: "hademo:home", + }, + }, + "zone.uva": { + entity_id: "zone.buckhead", + state: "zoning", + attributes: { + hidden: true, + radius: 400, + friendly_name: "UvA", + icon: "hademo:school", + latitude: 52.3558182, + longitude: 4.9535376, + }, + }, + "person.arsaboo": { + entity_id: "person.arsaboo", + state: "not_home", + attributes: { + radius: 50, + friendly_name: "Arsaboo", + latitude: 52.3579946, + longitude: 4.8664597, + entity_picture: "/assets/arsaboo/images/arsaboo.jpg", + }, + }, + "person.melody": { + entity_id: "person.melody", + state: "not_home", + attributes: { + radius: 50, + friendly_name: "Melody", + latitude: 52.3408927, + longitude: 4.8711073, + entity_picture: "/assets/arsaboo/images/melody.jpg", + }, + }, + }); + export const energyEntities = () => convertEntities({ "sensor.grid_fossil_fuel_percentage": { diff --git a/demo/src/stubs/lovelace.ts b/demo/src/stubs/lovelace.ts index 6896de37ef09..8712f51a66a2 100644 --- a/demo/src/stubs/lovelace.ts +++ b/demo/src/stubs/lovelace.ts @@ -7,16 +7,25 @@ import { } from "../configs/demo-configs"; import "../custom-cards/cast-demo-row"; import "../custom-cards/ha-demo-card"; +import { mapEntities } from "./entities"; export const mockLovelace = ( hass: MockHomeAssistant, localizePromise: Promise ) => { - hass.mockWS("lovelace/config", () => - Promise.all([selectedDemoConfig, localizePromise]).then( + hass.mockWS("lovelace/config", ({ url_path }) => { + if (url_path === "map") { + hass.addEntities(mapEntities()); + return { + strategy: { + type: "map", + }, + }; + } + return Promise.all([selectedDemoConfig, localizePromise]).then( ([config, localize]) => config.lovelace(localize) - ) - ); + ); + }); hass.mockWS("lovelace/config/save", () => Promise.resolve()); hass.mockWS("lovelace/resources", () => Promise.resolve([])); diff --git a/src/fake_data/demo_panels.ts b/src/fake_data/demo_panels.ts index 319aa4997827..dbf70b4b1df8 100644 --- a/src/fake_data/demo_panels.ts +++ b/src/fake_data/demo_panels.ts @@ -66,10 +66,10 @@ export const demoPanels: Panels = { // url_path: "history", // }, map: { - component_name: "map", + component_name: "lovelace", icon: "hass:tooltip-account", title: "map", - config: null, + config: { mode: "storage" }, url_path: "map", }, energy: { From 97c4cf9391955fc1a066546575aeb3f6b082e9b0 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 3 Jul 2024 15:33:00 +0200 Subject: [PATCH 02/18] Hide some things in demo (#21268) --- .../more-info/controls/more-info-media_player.ts | 3 ++- src/dialogs/more-info/ha-more-info-dialog.ts | 2 +- src/dialogs/more-info/ha-more-info-history.ts | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/dialogs/more-info/controls/more-info-media_player.ts b/src/dialogs/more-info/controls/more-info-media_player.ts index 1cd8c228120d..34971e593ba0 100644 --- a/src/dialogs/more-info/controls/more-info-media_player.ts +++ b/src/dialogs/more-info/controls/more-info-media_player.ts @@ -63,7 +63,8 @@ class MoreInfoMediaPlayer extends LitElement { ` )} - ${!isUnavailableState(stateObj.state) && + ${!__DEMO__ && + !isUnavailableState(stateObj.state) && supportsFeature(stateObj, MediaPlayerEntityFeature.BROWSE_MEDIA) ? html` ` : nothing} - ${isAdmin + ${!__DEMO__ && isAdmin ? html` ${this.hass.localize("ui.dialogs.more_info_control.history")} - ${this.hass.localize( - "ui.dialogs.more_info_control.show_more" - )} + ${__DEMO__ + ? nothing + : html`${this.hass.localize( + "ui.dialogs.more_info_control.show_more" + )}`} ${this._error ? html`
${this._error}
` From e332364ec0f445ade3b73f4de3388460a69093cb Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 3 Jul 2024 08:56:44 -0700 Subject: [PATCH 03/18] Fix automation picker overflow menu for keyboard (#21048) * Fix automation picker overflow menu for keyboard * some updates from review * typing * no removeEventListener * updates from review --- src/components/ha-menu-item.ts | 4 +- src/components/ha-menu.ts | 25 +++++++ .../config/automation/ha-automation-picker.ts | 73 +++++++++++-------- 3 files changed, 69 insertions(+), 33 deletions(-) diff --git a/src/components/ha-menu-item.ts b/src/components/ha-menu-item.ts index b6b133c68115..2f2914859640 100644 --- a/src/components/ha-menu-item.ts +++ b/src/components/ha-menu-item.ts @@ -1,9 +1,11 @@ import { MdMenuItem } from "@material/web/menu/menu-item"; import { css } from "lit"; -import { customElement } from "lit/decorators"; +import { customElement, property } from "lit/decorators"; @customElement("ha-menu-item") export class HaMenuItem extends MdMenuItem { + @property({ attribute: false }) clickAction?: (item?: HTMLElement) => void; + static override styles = [ ...super.styles, css` diff --git a/src/components/ha-menu.ts b/src/components/ha-menu.ts index 06c2d5f91def..06e1de186329 100644 --- a/src/components/ha-menu.ts +++ b/src/components/ha-menu.ts @@ -1,9 +1,30 @@ import { MdMenu } from "@material/web/menu/menu"; +import type { CloseMenuEvent } from "@material/web/menu/menu"; +import { + CloseReason, + KeydownCloseKey, +} from "@material/web/menu/internal/controllers/shared"; import { css } from "lit"; import { customElement } from "lit/decorators"; +import type { HaMenuItem } from "./ha-menu-item"; @customElement("ha-menu") export class HaMenu extends MdMenu { + connectedCallback(): void { + super.connectedCallback(); + this.addEventListener("close-menu", this._handleCloseMenu); + } + + private _handleCloseMenu(ev: CloseMenuEvent) { + if ( + ev.detail.reason.kind === CloseReason.KEYDOWN && + ev.detail.reason.key === KeydownCloseKey.ESCAPE + ) { + return; + } + (ev.detail.initiator as HaMenuItem).clickAction?.(ev.detail.initiator); + } + static override styles = [ ...super.styles, css` @@ -18,4 +39,8 @@ declare global { interface HTMLElementTagNameMap { "ha-menu": HaMenu; } + + interface HTMLElementEventMap { + "close-menu": CloseMenuEvent; + } } diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 3c0f0d10df8c..7bef54309e4b 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -68,6 +68,7 @@ import "../../../components/ha-icon-overflow-menu"; import "../../../components/ha-menu"; import type { HaMenu } from "../../../components/ha-menu"; import "../../../components/ha-menu-item"; +import type { HaMenuItem } from "../../../components/ha-menu-item"; import "../../../components/ha-sub-menu"; import "../../../components/ha-svg-icon"; import { createAreaRegistryEntry } from "../../../data/area_registry"; @@ -826,7 +827,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { - + - +
${this.hass.localize( @@ -844,7 +845,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { )}
- +
${this.hass.localize( @@ -852,13 +853,13 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { )}
- +
${this.hass.localize("ui.panel.config.automation.editor.run")}
- +
${this.hass.localize( @@ -867,13 +868,13 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
- +
${this.hass.localize("ui.panel.config.automation.picker.duplicate")}
- + - +
${this.hass.localize("ui.panel.config.automation.picker.delete")} @@ -1055,28 +1056,32 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { this._applyFilters(); } - private _showInfo(ev) { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _showInfo = (item: HaMenuItem) => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; fireEvent(this, "hass-more-info", { entityId: automation.entity_id }); - } + }; - private _showSettings(ev) { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _showSettings = (item: HaMenuItem) => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; fireEvent(this, "hass-more-info", { entityId: automation.entity_id, view: "settings", }); - } + }; - private _runActions(ev) { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _runActions = (item: HaMenuItem) => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; triggerAutomationActions(this.hass, automation.entity_id); - } + }; - private _editCategory(ev) { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _editCategory = (item: HaMenuItem) => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; const entityReg = this._entityReg.find( (reg) => reg.entity_id === automation.entity_id @@ -1096,10 +1101,11 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { scope: "automation", entityReg, }); - } + }; - private _showTrace(ev) { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _showTrace = (item: HaMenuItem) => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; if (!automation.attributes.id) { showAlertDialog(this, { @@ -1112,19 +1118,21 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { navigate( `/config/automation/trace/${encodeURIComponent(automation.attributes.id)}` ); - } + }; - private async _toggle(ev): Promise { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _toggle = async (item: HaMenuItem): Promise => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; const service = automation.state === "off" ? "turn_on" : "turn_off"; await this.hass.callService("automation", service, { entity_id: automation.entity_id, }); - } + }; - private async _deleteConfirm(ev) { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _deleteConfirm = async (item: HaMenuItem) => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; showConfirmationDialog(this, { title: this.hass.localize( @@ -1139,7 +1147,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { confirm: () => this._delete(automation), destructive: true, }); - } + }; private async _delete(automation) { try { @@ -1159,8 +1167,9 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { } } - private async _duplicate(ev) { - const automation = ev.currentTarget.parentElement.anchorElement.automation; + private _duplicate = async (item: HaMenuItem) => { + const automation = ((item.parentElement as HaMenu)!.anchorElement as any)! + .automation; try { const config = await fetchAutomationFileConfig( @@ -1184,7 +1193,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { ), }); } - } + }; private _showHelp() { showAlertDialog(this, { From 1ceef7c3d33547ef4805f7f40d3e324d37c17192 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 3 Jul 2024 22:32:56 +0200 Subject: [PATCH 04/18] Set min column size to 1 for vertical tile card (#21275) --- src/panels/lovelace/cards/hui-tile-card.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-tile-card.ts b/src/panels/lovelace/cards/hui-tile-card.ts index 19a05e3bb4ab..ae8c8a99c0b8 100644 --- a/src/panels/lovelace/cards/hui-tile-card.ts +++ b/src/panels/lovelace/cards/hui-tile-card.ts @@ -123,19 +123,21 @@ export class HuiTileCard extends LitElement implements LovelaceCard { public getLayoutOptions(): LovelaceLayoutOptions { const grid_columns = 2; + let grid_min_columns = 2; let grid_rows = 1; if (this._config?.features?.length) { const featureHeight = Math.ceil((this._config.features.length * 2) / 3); grid_rows += featureHeight; } if (this._config?.vertical) { - grid_rows!++; + grid_rows++; + grid_min_columns = 1; } return { grid_columns, grid_rows, grid_min_rows: grid_rows, - grid_min_columns: grid_columns, + grid_min_columns, }; } From c07e1122e156ee72a5bf2ed0267feb7863058f60 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jul 2024 08:11:39 +0200 Subject: [PATCH 05/18] Tweak demo, add some translations, tweak media players (#21271) Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../images/media_player_family_room.jpg | Bin 0 -> 30519 bytes demo/src/configs/sections/entities.ts | 74 ++++++++++++++++-- demo/src/configs/sections/lovelace.ts | 21 +++-- .../controls/more-info-media_player.ts | 3 +- src/translations/en.json | 19 ++++- 5 files changed, 94 insertions(+), 23 deletions(-) create mode 100644 demo/public/assets/sections/images/media_player_family_room.jpg diff --git a/demo/public/assets/sections/images/media_player_family_room.jpg b/demo/public/assets/sections/images/media_player_family_room.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e73833aa305179403ee04bfd0c4762195740ae80 GIT binary patch literal 30519 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 literal 0 HcmV?d00001 diff --git a/demo/src/configs/sections/entities.ts b/demo/src/configs/sections/entities.ts index 1900624b8304..1bdb06f8a9ad 100644 --- a/demo/src/configs/sections/entities.ts +++ b/demo/src/configs/sections/entities.ts @@ -1,7 +1,7 @@ import { convertEntities } from "../../../../src/fake_data/entity"; import { DemoConfig } from "../types"; -export const demoEntitiesSections: DemoConfig["entities"] = () => +export const demoEntitiesSections: DemoConfig["entities"] = (localize) => convertEntities({ "cover.living_room_garden_shutter": { entity_id: "cover.living_room_garden_shutter", @@ -113,11 +113,30 @@ export const demoEntitiesSections: DemoConfig["entities"] = () => }, "media_player.living_room_nest_mini": { entity_id: "media_player.living_room_nest_mini", - state: "off", + state: "on", attributes: { device_class: "speaker", - friendly_name: "Living room Nest Mini", - supported_features: 152461, + volume_level: 0.18, + is_volume_muted: false, + media_content_type: "music", + media_duration: 300, + media_position: 0, + media_position_updated_at: new Date( + // 23 seconds in + new Date().getTime() - 23000 + ).toISOString(), + media_title: "I Wasn't Born To Follow", + media_artist: "The Byrds", + media_album_name: "The Notorious Byrd Brothers", + source_list: ["It's A Party", "Radio HSL", "Retro 70s and 80s"], + shuffle: false, + night_sound: false, + speech_enhance: false, + friendly_name: localize( + "ui.panel.page-demo.config.sections.entities.media_player.living_room_nest_mini" + ), + entity_picture: "/assets/sections/images/media_player_family_room.jpg", + supported_features: 64063, }, }, "cover.kitchen_shutter": { @@ -168,8 +187,27 @@ export const demoEntitiesSections: DemoConfig["entities"] = () => state: "on", attributes: { device_class: "speaker", - friendly_name: "Kitchen Nest Audio", - supported_features: 152461, + volume_level: 0.18, + is_volume_muted: false, + media_content_type: "music", + media_duration: 300, + media_position: 0, + media_position_updated_at: new Date( + // 23 seconds in + new Date().getTime() - 23000 + ).toISOString(), + media_title: "I Wasn't Born To Follow", + media_artist: "The Byrds", + media_album_name: "The Notorious Byrd Brothers", + source_list: ["It's A Party", "Radio HSL", "Retro 70s and 80s"], + shuffle: false, + night_sound: false, + speech_enhance: false, + friendly_name: localize( + "ui.panel.page-demo.config.sections.entities.media_player.kitchen_nest_audio" + ), + entity_picture: "/assets/sections/images/media_player_family_room.jpg", + supported_features: 64063, }, }, "binary_sensor.tesla_wall_connector_vehicle_connected": { @@ -333,8 +371,28 @@ export const demoEntitiesSections: DemoConfig["entities"] = () => entity_id: "media_player.study_nest_hub", state: "off", attributes: { - friendly_name: "Study Nest Hub", - supported_features: 152461, + device_class: "speaker", + volume_level: 0.18, + is_volume_muted: false, + media_content_type: "music", + media_duration: 300, + media_position: 0, + media_position_updated_at: new Date( + // 23 seconds in + new Date().getTime() - 23000 + ).toISOString(), + media_title: "I Wasn't Born To Follow", + media_artist: "The Byrds", + media_album_name: "The Notorious Byrd Brothers", + source_list: ["It's A Party", "Radio HSL", "Retro 70s and 80s"], + shuffle: false, + night_sound: false, + speech_enhance: false, + friendly_name: localize( + "ui.panel.page-demo.config.sections.entities.media_player.study_nest_hub" + ), + entity_picture: "/assets/sections/images/media_player_family_room.jpg", + supported_features: 64063, }, }, "sensor.standing_desk_height": { diff --git a/demo/src/configs/sections/lovelace.ts b/demo/src/configs/sections/lovelace.ts index 36b4abb2fe9c..f09c0595c6da 100644 --- a/demo/src/configs/sections/lovelace.ts +++ b/demo/src/configs/sections/lovelace.ts @@ -1,7 +1,7 @@ import { isFrontpageEmbed } from "../../util/is_frontpage"; import { DemoConfig } from "../types"; -export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ +export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({ title: "Home Assistant Demo", views: [ { @@ -14,7 +14,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ ? [] : [ { - title: "Welcome 👋", + title: `${localize("ui.panel.page-demo.config.sections.titles.welcome")} 👋`, cards: [{ type: "custom:ha-demo-card" }], }, ]), @@ -53,10 +53,9 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ { type: "tile", entity: "media_player.living_room_nest_mini", - name: "Nest Mini", }, ], - title: "🛋️ Living room ", + title: `🛋️ ${localize("ui.panel.page-demo.config.sections.titles.living_room")} `, }, { type: "grid", @@ -89,10 +88,9 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ { type: "tile", entity: "media_player.kitchen_nest_audio", - name: "Nest Audio", }, ], - title: "👩‍🍳 Kitchen", + title: `👩‍🍳 ${localize("ui.panel.page-demo.config.sections.titles.kitchen")}`, }, { type: "grid", @@ -134,7 +132,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ color: "dark-grey", }, ], - title: "⚡️ Energy", + title: `⚡️ ${localize("ui.panel.page-demo.config.sections.titles.energy")}`, }, { type: "grid", @@ -171,7 +169,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ state_content: ["preset_mode", "current_temperature"], }, ], - title: "🌤️ Climate", + title: `🌤️ ${localize("ui.panel.page-demo.config.sections.titles.climate")}`, }, { type: "grid", @@ -189,7 +187,6 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ { type: "tile", entity: "media_player.study_nest_hub", - name: "Nest Hub", }, { type: "tile", @@ -199,7 +196,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ icon: "mdi:desk", }, ], - title: "🧑‍💻 Study", + title: `🧑‍💻 ${localize("ui.panel.page-demo.config.sections.titles.study")}`, }, { type: "grid", @@ -233,7 +230,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ name: "Illuminance", }, ], - title: "🌳 Outdoor", + title: `🌳 ${localize("ui.panel.page-demo.config.sections.titles.outdoor")}`, }, { type: "grid", @@ -263,7 +260,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({ icon: "mdi:home-assistant", }, ], - title: "🎉 Updates", + title: `🎉 ${localize("ui.panel.page-demo.config.sections.titles.updates")}`, }, ], }, diff --git a/src/dialogs/more-info/controls/more-info-media_player.ts b/src/dialogs/more-info/controls/more-info-media_player.ts index 34971e593ba0..1cd8c228120d 100644 --- a/src/dialogs/more-info/controls/more-info-media_player.ts +++ b/src/dialogs/more-info/controls/more-info-media_player.ts @@ -63,8 +63,7 @@ class MoreInfoMediaPlayer extends LitElement { ` )}
- ${!__DEMO__ && - !isUnavailableState(stateObj.state) && + ${!isUnavailableState(stateObj.state) && supportsFeature(stateObj, MediaPlayerEntityFeature.BROWSE_MEDIA) ? html` Date: Thu, 4 Jul 2024 04:01:01 -0400 Subject: [PATCH 06/18] Clean up imports and unopened tag on device config page (#21274) --- .../config/devices/ha-config-device-page.ts | 462 ++++++++---------- 1 file changed, 212 insertions(+), 250 deletions(-) diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts index 7b3849ec665a..1a9809b9b68a 100644 --- a/src/panels/config/devices/ha-config-device-page.ts +++ b/src/panels/config/devices/ha-config-device-page.ts @@ -1,6 +1,5 @@ import { consume } from "@lit-labs/context"; import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; -import "@material/mwc-list/mwc-list-item"; import { mdiCog, mdiDelete, @@ -10,8 +9,6 @@ import { mdiPencil, mdiPlusCircle, } from "@mdi/js"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; import { CSSResultGroup, LitElement, @@ -24,7 +21,7 @@ import { customElement, property, state } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import memoizeOne from "memoize-one"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; -import { SENSOR_ENTITIES, ASSIST_ENTITIES } from "../../../common/const"; +import { ASSIST_ENTITIES, SENSOR_ENTITIES } from "../../../common/const"; import { computeDomain } from "../../../common/entity/compute_domain"; import { computeStateDomain } from "../../../common/entity/compute_state_domain"; import { computeStateName } from "../../../common/entity/compute_state_name"; @@ -77,7 +74,6 @@ import type { HomeAssistant } from "../../../types"; import { brandsUrl } from "../../../util/brands-url"; import { fileDownload } from "../../../util/file_download"; import "../../logbook/ha-logbook"; -import "../ha-config-section"; import "./device-detail/ha-device-entities-card"; import "./device-detail/ha-device-info-card"; import "./device-detail/ha-device-via-devices-card"; @@ -665,269 +661,235 @@ export class HaConfigDevicePage extends LitElement { ` : ""; - return html` - - - + +
+
+ ${area + ? html`
+ ${this.hass.localize( + "ui.panel.config.integrations.config_entry.area", + { area: area.name || "Unnamed Area" } + )} +
` + : ""} +
+ ${battery && + (batteryDomain === "binary_sensor" || !isNaN(battery.state as any)) + ? html` +
+ ${batteryDomain === "sensor" + ? this.hass.formatEntityState(battery) + : nothing} + +
+ ` + : ""} + ${integrations.length + ? html` + ${domainToName( + ` + : ""} +
+
+
+ ${this._deviceAlerts?.length + ? html` +
+ ${this._deviceAlerts.map( + (alert) => html` + + ${alert.text} + + ` )} - > -
-
- ${ - area - ? html`
- ${this.hass.localize( - "ui.panel.config.integrations.config_entry.area", - { area: area.name || "Unnamed Area" } - )} -
` - : "" - } -
- ${ - battery && - (batteryDomain === "binary_sensor" || - !isNaN(battery.state as any)) - ? html` -
- ${batteryDomain === "sensor" - ? this.hass.formatEntityState(battery) - : nothing} - -
- ` - : "" - } - ${ - integrations.length - ? html` - ${domainToName( - ` - : "" - } -
-
-
- ${ - this._deviceAlerts?.length - ? html` -
- ${this._deviceAlerts.map( - (alert) => html` - - ${alert.text} - - ` + ` + : ""} + + ${deviceInfo} + ${firstDeviceAction || actions.length + ? html` +
+
+ - ` - : "" - } - - ${deviceInfo} - ${ - firstDeviceAction || actions.length - ? html` -
- + + ${actions.length + ? html` + + + ${actions.map((deviceAction) => { + const listItem = html` - ${firstDeviceAction!.label} - ${firstDeviceAction!.icon + ${deviceAction.label} + ${deviceAction.icon ? html` ` : ""} - ${firstDeviceAction!.trailingIcon + ${deviceAction.trailingIcon ? html` ` : ""} - - -
- - ${actions.length - ? html` - - `; + return deviceAction.href + ? html` - ${actions.map((deviceAction) => { - const listItem = html` - ${deviceAction.label} - ${deviceAction.icon - ? html` - - ` - : ""} - ${deviceAction.trailingIcon - ? html` - - ` - : ""} - `; - return deviceAction.href - ? html`${listItem} - ` - : listItem; - })} - - ` - : ""} -
- ` - : "" - } - - ${!this.narrow ? [automationCard, sceneCard, scriptCard] : ""} -
-
- ${( - [ - "control", - "sensor", - "notify", - "event", - "assist", - "config", - "diagnostic", - ] as const - ).map((category) => - // Make sure we render controls if no other cards will be rendered - entitiesByCategory[category].length > 0 || - (entities.length === 0 && category === "control") - ? html` - - - ` - : "" - )} - -
-
- ${this.narrow ? [automationCard, sceneCard, scriptCard] : ""} - ${ - isComponentLoaded(this.hass, "logbook") - ? html` - -

- ${this.hass.localize("panel.logbook")} -

- - - ` - : "" - } -
-
- - `; + >${listItem} + ` + : listItem; + })} + + ` + : ""} +
+ ` + : ""} + + ${!this.narrow ? [automationCard, sceneCard, scriptCard] : ""} +
+
+ ${( + [ + "control", + "sensor", + "notify", + "event", + "assist", + "config", + "diagnostic", + ] as const + ).map((category) => + // Make sure we render controls if no other cards will be rendered + entitiesByCategory[category].length > 0 || + (entities.length === 0 && category === "control") + ? html` + + + ` + : "" + )} + +
+
+ ${this.narrow ? [automationCard, sceneCard, scriptCard] : ""} + ${isComponentLoaded(this.hass, "logbook") + ? html` + +

+ ${this.hass.localize("panel.logbook")} +

+ + + ` + : ""} +
+
+ `; } private async _getDiagnosticButtons(requestId: number): Promise { From df7b5b08cf25f86beb013661a3ebd1648358a830 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 4 Jul 2024 11:46:10 +0200 Subject: [PATCH 07/18] Allow custom localize function for datatable (#21270) --- src/components/data-table/ha-data-table.ts | 11 +++++++++-- src/layouts/hass-tabs-subpage-data-table.ts | 8 ++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index bd1507e2eee0..1819256bab0c 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -34,6 +34,7 @@ import type { HaCheckbox } from "../ha-checkbox"; import "../ha-svg-icon"; import "../search-input"; import { filterData, sortData } from "./sort-filter"; +import { LocalizeFunc } from "../../common/translations/localize"; export interface RowClickedEvent { id: string; @@ -110,6 +111,8 @@ const UNDEFINED_GROUP_KEY = "zzzzz_undefined"; export class HaDataTable extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; + @property({ attribute: false }) public localizeFunc?: LocalizeFunc; + @property({ type: Boolean }) public narrow = false; @property({ type: Object }) public columns: DataTableColumnContainer = {}; @@ -317,6 +320,8 @@ export class HaDataTable extends LitElement { ); protected render() { + const localize = this.localizeFunc || this.hass.localize; + const columns = this._sortedColumns(this.columns, this.columnOrder); const renderRow = (row: DataTableRowData, index: number) => @@ -436,7 +441,7 @@ export class HaDataTable extends LitElement {
${this.noDataText || - this.hass.localize("ui.components.data-table.no-data")} + localize("ui.components.data-table.no-data")}
@@ -619,6 +624,8 @@ export class HaDataTable extends LitElement { return; } + const localize = this.localizeFunc || this.hass.localize; + if (this.appendRow || this.hasFab || this.groupColumn) { let items = [...data]; @@ -672,7 +679,7 @@ export class HaDataTable extends LitElement { > ${groupName === UNDEFINED_GROUP_KEY - ? this.hass.localize("ui.components.data-table.ungrouped") + ? localize("ui.components.data-table.ungrouped") : groupName || ""}
`, }); diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 4f062182a2dc..615fb2d5d056 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -430,6 +430,7 @@ export class HaTabsSubpageDataTable extends LitElement { : ""}
- ${this.hass.localize( - "ui.components.subpage-data-table.show_results", - { number: this.data.length } - )} + ${localize("ui.components.subpage-data-table.show_results", { + number: this.data.length, + })}
` From 15589927c8b93e640b74dacda4e9c6d1c88567ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:46:55 +0200 Subject: [PATCH 08/18] Update dependency @codemirror/view to v6.28.3 (#21277) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 292983f4ad45..24d847dcce6a 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@codemirror/legacy-modes": "6.4.0", "@codemirror/search": "6.5.6", "@codemirror/state": "6.4.1", - "@codemirror/view": "6.28.2", + "@codemirror/view": "6.28.3", "@egjs/hammerjs": "2.0.17", "@formatjs/intl-datetimeformat": "6.12.5", "@formatjs/intl-displaynames": "6.6.8", diff --git a/yarn.lock b/yarn.lock index 255077cb166b..16d13741a67e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1539,14 +1539,14 @@ __metadata: languageName: node linkType: hard -"@codemirror/view@npm:6.28.2, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0, @codemirror/view@npm:^6.27.0": - version: 6.28.2 - resolution: "@codemirror/view@npm:6.28.2" +"@codemirror/view@npm:6.28.3, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0, @codemirror/view@npm:^6.27.0": + version: 6.28.3 + resolution: "@codemirror/view@npm:6.28.3" dependencies: "@codemirror/state": "npm:^6.4.0" style-mod: "npm:^4.1.0" w3c-keyname: "npm:^2.2.4" - checksum: 10/c4221d6e47112ec3ec20c954deecab4565a8023dfeefabff8ba1801fb67d2965d49c27853310618fd723077ca86564b4bbefa36f0839d9430518f7d0a1cc3e84 + checksum: 10/4732786b1afa3730a2c08b3711b335b8da2cb76318c9c4b2aeafd868bb36bfaeec826a18669b3d2d0f408e8012734689085633e4b6c3609cd2385838d79e5bc6 languageName: node linkType: hard @@ -8902,7 +8902,7 @@ __metadata: "@codemirror/legacy-modes": "npm:6.4.0" "@codemirror/search": "npm:6.5.6" "@codemirror/state": "npm:6.4.1" - "@codemirror/view": "npm:6.28.2" + "@codemirror/view": "npm:6.28.3" "@egjs/hammerjs": "npm:2.0.17" "@formatjs/intl-datetimeformat": "npm:6.12.5" "@formatjs/intl-displaynames": "npm:6.6.8" From 202bd148efa0141eb65fd1347f16b145e2b54e2a Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 4 Jul 2024 12:29:17 +0200 Subject: [PATCH 09/18] Fix iframe card overflow in vertical stack (#21282) --- src/panels/lovelace/cards/hui-iframe-card.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts index 36cdea605ec3..48113e02d6d8 100644 --- a/src/panels/lovelace/cards/hui-iframe-card.ts +++ b/src/panels/lovelace/cards/hui-iframe-card.ts @@ -129,6 +129,8 @@ export class HuiIframeCard extends LitElement implements LovelaceCard { overflow: hidden; width: 100%; height: 100%; + display: flex; + flex-direction: column; } #root { From b411ae028689f695be4735ed070d20f35368f896 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 19:18:37 +0200 Subject: [PATCH 10/18] Update dependency @lokalise/node-api to v12.6.0 (#21291) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 24d847dcce6a..b5cba2ab3737 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "@babel/preset-typescript": "7.24.7", "@bundle-stats/plugin-webpack-filter": "4.13.3", "@koa/cors": "5.0.0", - "@lokalise/node-api": "12.5.0", + "@lokalise/node-api": "12.6.0", "@octokit/auth-oauth-device": "7.1.1", "@octokit/plugin-retry": "7.1.1", "@octokit/rest": "21.0.0", diff --git a/yarn.lock b/yarn.lock index 16d13741a67e..16ff05d601e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2221,10 +2221,10 @@ __metadata: languageName: node linkType: hard -"@lokalise/node-api@npm:12.5.0": - version: 12.5.0 - resolution: "@lokalise/node-api@npm:12.5.0" - checksum: 10/f070847c5dcf450e060c5cc8a92e1b731c9509c85492ac8864a7e49c16e6532d6aaae76cb3f374c356dbf84d72d548a61d40f89afd6d8090cc16a700b069299a +"@lokalise/node-api@npm:12.6.0": + version: 12.6.0 + resolution: "@lokalise/node-api@npm:12.6.0" + checksum: 10/966f4d014c12ef91745925cd6e21698ca35db6483ee50b938e1029509d7c37d0a881bdc673f18debd2fedcafade8c2ce22aa39bea53e0861ba5243a2c646921b languageName: node linkType: hard @@ -8924,7 +8924,7 @@ __metadata: "@lit-labs/motion": "npm:1.0.7" "@lit-labs/observers": "npm:2.0.2" "@lit-labs/virtualizer": "npm:2.0.13" - "@lokalise/node-api": "npm:12.5.0" + "@lokalise/node-api": "npm:12.6.0" "@lrnwebcomponents/simple-tooltip": "npm:8.0.2" "@material/chips": "npm:=14.0.0-canary.53b3cad2f.0" "@material/data-table": "npm:=14.0.0-canary.53b3cad2f.0" From 1abebdae21b9011af9f19442ee148b6c7310b74f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 20:07:42 +0200 Subject: [PATCH 11/18] Update typescript-eslint monorepo to v7.15.0 (#21296) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index b5cba2ab3737..aac30ded713c 100644 --- a/package.json +++ b/package.json @@ -185,8 +185,8 @@ "@types/tar": "6.1.13", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "7.14.1", - "@typescript-eslint/parser": "7.14.1", + "@typescript-eslint/eslint-plugin": "7.15.0", + "@typescript-eslint/parser": "7.15.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index 16ff05d601e9..02e62368d9c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4584,15 +4584,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/eslint-plugin@npm:7.14.1" +"@typescript-eslint/eslint-plugin@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.15.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:7.14.1" - "@typescript-eslint/type-utils": "npm:7.14.1" - "@typescript-eslint/utils": "npm:7.14.1" - "@typescript-eslint/visitor-keys": "npm:7.14.1" + "@typescript-eslint/scope-manager": "npm:7.15.0" + "@typescript-eslint/type-utils": "npm:7.15.0" + "@typescript-eslint/utils": "npm:7.15.0" + "@typescript-eslint/visitor-keys": "npm:7.15.0" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" @@ -4603,44 +4603,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/48c815dbb92399965483c93b27816fad576c3b3227b59eebfe5525e24d07b39ec8b0c7459de83865c8d61c818696519f50b229714dd3ed705d5b35973bfcc781 + checksum: 10/e6b21687ab9e9dc38eb1b1d90a3ac483f3f5e5e9c49aa8a434a24de016822d65c82b926cda2ae79bac2225bd9495fb04f7aa6afcaad2b09f6129fd8014fbcedd languageName: node linkType: hard -"@typescript-eslint/parser@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/parser@npm:7.14.1" +"@typescript-eslint/parser@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/parser@npm:7.15.0" dependencies: - "@typescript-eslint/scope-manager": "npm:7.14.1" - "@typescript-eslint/types": "npm:7.14.1" - "@typescript-eslint/typescript-estree": "npm:7.14.1" - "@typescript-eslint/visitor-keys": "npm:7.14.1" + "@typescript-eslint/scope-manager": "npm:7.15.0" + "@typescript-eslint/types": "npm:7.15.0" + "@typescript-eslint/typescript-estree": "npm:7.15.0" + "@typescript-eslint/visitor-keys": "npm:7.15.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/f521462a7005cab5e4923937dcf36713d9438ded175b53332ae469d91cc9eb18cb3a23768b3c52063464280baae83f6b66db28cebb2e262d6d869d1a898b23f3 + checksum: 10/0b5e7a14fa5d0680efb17e750a095729a7fb7c785d7a0fea2f9e6cbfef9e65caab2b751654b348b9ab813d222c1c3f8189ebf48561b81224d1821cee5c99d658 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/scope-manager@npm:7.14.1" +"@typescript-eslint/scope-manager@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/scope-manager@npm:7.15.0" dependencies: - "@typescript-eslint/types": "npm:7.14.1" - "@typescript-eslint/visitor-keys": "npm:7.14.1" - checksum: 10/600a7beb96f5b96f675125285137339c2438b5b26db203a66eef52dd409e8c0db0dafb22c94547dfb963f8efdf63b0fb59e05655e2dcf84d54624863365a59e7 + "@typescript-eslint/types": "npm:7.15.0" + "@typescript-eslint/visitor-keys": "npm:7.15.0" + checksum: 10/45bfdbae2d080691a34f5b37679b4a4067981baa3b82922268abdd21f6917a8dd1c4ccb12133f6c9cce81cfd640040913b223e8125235b92f42fdb57db358a3e languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/type-utils@npm:7.14.1" +"@typescript-eslint/type-utils@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/type-utils@npm:7.15.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:7.14.1" - "@typescript-eslint/utils": "npm:7.14.1" + "@typescript-eslint/typescript-estree": "npm:7.15.0" + "@typescript-eslint/utils": "npm:7.15.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.3.0" peerDependencies: @@ -4648,23 +4648,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/75c279948a7e7e546d692e85a0b48fc3b648ffee1773feb7ff199aba1b0847a9a16c432b133aa72d26e645627403852b7dd24829f9b3badd6d4711c4cc38e9e4 + checksum: 10/64fa589b413567df3689a19ef88f3dbaed66d965e39cc548a58626eb5bd8fc4e2338496eb632f3472de9ae9800cb14d0e48ef3508efe80bdb91af8f3f1e56ad7 languageName: node linkType: hard -"@typescript-eslint/types@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/types@npm:7.14.1" - checksum: 10/608057582bb195bd746a7bfb7c04dac4be1d4602b8fa681b2d1d50b564362b681dc2ca293b13cc4c7acc454f3a09f1ea2580415347efb7853e5df8ba34b7acdb +"@typescript-eslint/types@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/types@npm:7.15.0" + checksum: 10/b36c98344469f4bc54a5199733ea4f6d4d0f2da1070605e60d4031e2da2946b84b91a90108516c8e6e83a21030ba4e935053a0906041c920156de40683297d0b languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/typescript-estree@npm:7.14.1" +"@typescript-eslint/typescript-estree@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.15.0" dependencies: - "@typescript-eslint/types": "npm:7.14.1" - "@typescript-eslint/visitor-keys": "npm:7.14.1" + "@typescript-eslint/types": "npm:7.15.0" + "@typescript-eslint/visitor-keys": "npm:7.15.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -4674,31 +4674,31 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/f75b956f7981712d3f85498f9d9fcc2243d79d6fe71b24bc688a7c43d2a4248f73ecfb78f9d58501fde87fc44b02e26c46f9ea2ae51eb8450db79ca169f91ef9 + checksum: 10/c5fb15108fbbc1bc976e827218ff7bfbc78930c5906292325ee42ba03514623e7b861497b3e3087f71ede9a757b16441286b4d234450450b0dd70ff753782736 languageName: node linkType: hard -"@typescript-eslint/utils@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/utils@npm:7.14.1" +"@typescript-eslint/utils@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/utils@npm:7.15.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:7.14.1" - "@typescript-eslint/types": "npm:7.14.1" - "@typescript-eslint/typescript-estree": "npm:7.14.1" + "@typescript-eslint/scope-manager": "npm:7.15.0" + "@typescript-eslint/types": "npm:7.15.0" + "@typescript-eslint/typescript-estree": "npm:7.15.0" peerDependencies: eslint: ^8.56.0 - checksum: 10/1ef74214ca84e32f151364512a51e82b7da5590dee03d0de0e1abcf18009e569f9a0638506cf03bd4a844af634b4935458e334b7b2459e9a50a67aba7d6228c7 + checksum: 10/f6de1849dee610a8110638be98ab2ec09e7cdf2f756b538b0544df2dfad86a8e66d5326a765302fe31553e8d9d3170938c0d5d38bd9c7d36e3ee0beb1bdc8172 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:7.14.1": - version: 7.14.1 - resolution: "@typescript-eslint/visitor-keys@npm:7.14.1" +"@typescript-eslint/visitor-keys@npm:7.15.0": + version: 7.15.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.15.0" dependencies: - "@typescript-eslint/types": "npm:7.14.1" + "@typescript-eslint/types": "npm:7.15.0" eslint-visitor-keys: "npm:^3.4.3" - checksum: 10/42246f33cb3f9185c0b467c9a534e34a674e4fc08ba982a03aaa77dc1e569e916f1fca9ce9cd14c4df91f416e6e917bff51f98b8d8ca26ec5f67c253e8646bde + checksum: 10/0e17d7f5de767da7f98170c2efc905cdb0ceeaf04a667e12ca1a92eae64479a07f4f8e2a9b5023b055b01250916c3bcac86908cd06552610baff734fafae4464 languageName: node linkType: hard @@ -8986,8 +8986,8 @@ __metadata: "@types/tar": "npm:6.1.13" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:7.14.1" - "@typescript-eslint/parser": "npm:7.14.1" + "@typescript-eslint/eslint-plugin": "npm:7.15.0" + "@typescript-eslint/parser": "npm:7.15.0" "@vaadin/combo-box": "npm:24.4.0" "@vaadin/vaadin-themable-mixin": "npm:24.4.0" "@vibrant/color": "npm:3.2.1-alpha.1" From 050bef056431b98f1d398c87740070250f66e421 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 4 Jul 2024 21:09:10 +0200 Subject: [PATCH 12/18] Better handle auto height in card resize editor (#21260) * Add auto-height option to resize editor * Use min instead of max * Remove auto height --- src/components/ha-grid-size-picker.ts | 33 +++++++++++-------- .../card-editor/ha-grid-layout-slider.ts | 3 ++ .../card-editor/hui-card-layout-editor.ts | 8 +++-- .../lovelace/sections/hui-grid-section.ts | 4 +-- src/panels/lovelace/types.ts | 2 +- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/components/ha-grid-size-picker.ts b/src/components/ha-grid-size-picker.ts index 453a24cb8d30..6ae6b7b37d75 100644 --- a/src/components/ha-grid-size-picker.ts +++ b/src/components/ha-grid-size-picker.ts @@ -10,7 +10,7 @@ import { HomeAssistant } from "../types"; import { conditionalClamp } from "../common/number/clamp"; type GridSizeValue = { - rows?: number; + rows?: number | "auto"; columns?: number; }; @@ -47,6 +47,16 @@ export class HaGridSizeEditor extends LitElement { this.columnMin !== undefined && this.columnMin === this.columnMax; const disabledRows = this.rowMin !== undefined && this.rowMin === this.rowMax; + + const autoHeight = this._localValue?.rows === "auto"; + + const rowMin = this.rowMin ?? 1; + const rowMax = this.rowMax ?? this.rows; + const columnMin = this.columnMin ?? 1; + const columnMax = this.columnMax ?? this.columns; + const rowValue = autoHeight ? rowMin : this._localValue?.rows; + const columnValue = this._localValue?.columns; + return html`
+
@@ -215,10 +226,6 @@ export class HaGridSizeEditor extends LitElement { opacity: 0.2; cursor: pointer; } - .preview .cell[disabled] { - opacity: 0.05; - cursor: initial; - } .selected { pointer-events: none; } diff --git a/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts b/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts index ab1bebf00fcc..cfbbd31c3aec 100644 --- a/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts +++ b/src/panels/lovelace/editor/card-editor/ha-grid-layout-slider.ts @@ -378,6 +378,9 @@ export class HaGridLayoutSlider extends LitElement { :host(:disabled) .handle:after { background: var(--disabled-color); } + :host(:disabled) .active { + background: var(--disabled-color); + } .pressed .handle { transition: none; } diff --git a/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts b/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts index 5a5690727ce6..ac32343f75e9 100644 --- a/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts +++ b/src/panels/lovelace/editor/card-editor/hui-card-layout-editor.ts @@ -11,8 +11,10 @@ import "../../../../components/ha-button-menu"; import "../../../../components/ha-grid-size-picker"; import "../../../../components/ha-icon-button"; import "../../../../components/ha-list-item"; +import "../../../../components/ha-settings-row"; import "../../../../components/ha-slider"; import "../../../../components/ha-svg-icon"; +import "../../../../components/ha-switch"; import "../../../../components/ha-yaml-editor"; import type { HaYamlEditor } from "../../../../components/ha-yaml-editor"; import { LovelaceCardConfig } from "../../../../data/lovelace/config/card"; @@ -61,11 +63,13 @@ export class HuiCardLayoutEditor extends LitElement { this._defaultLayoutOptions ); + const sizeValue = this._gridSizeValue(options); + return html`

${this.hass.localize( - `ui.panel.lovelace.editor.edit_card.layout.explanation` + "ui.panel.lovelace.editor.edit_card.layout.explanation" )}

Date: Thu, 4 Jul 2024 21:09:34 +0200 Subject: [PATCH 13/18] Change delete/remove wording in tag area to be consistent (#21299) delete tags --- src/panels/config/tags/ha-config-tags.ts | 7 ++++--- src/translations/en.json | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/panels/config/tags/ha-config-tags.ts b/src/panels/config/tags/ha-config-tags.ts index 98ae4252f802..933490adfe3c 100644 --- a/src/panels/config/tags/ha-config-tags.ts +++ b/src/panels/config/tags/ha-config-tags.ts @@ -301,12 +301,13 @@ export class HaConfigTags extends SubscribeMixin(LitElement) { private async _removeTag(selectedTag: Tag) { if ( !(await showConfirmationDialog(this, { - title: this.hass!.localize("ui.panel.config.tag.confirm_remove_title"), - text: this.hass.localize("ui.panel.config.tag.confirm_remove", { + title: this.hass!.localize("ui.panel.config.tag.confirm_delete_title"), + text: this.hass.localize("ui.panel.config.tag.confirm_delete", { tag: selectedTag.name || selectedTag.id, }), dismissText: this.hass!.localize("ui.common.cancel"), - confirmText: this.hass!.localize("ui.common.remove"), + confirmText: this.hass!.localize("ui.common.delete"), + destructive: true, })) ) { return false; diff --git a/src/translations/en.json b/src/translations/en.json index 541d0fcc92c4..f73378c16bf4 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2107,8 +2107,8 @@ "edit": "Edit", "never_scanned": "Never scanned", "create_automation": "Create automation with tag", - "confirm_remove_title": "Remove tag?", - "confirm_remove": "Are you sure you want to remove tag {tag}?", + "confirm_delete_title": "Delete tag?", + "confirm_delete": "Are you sure you want to delete tag {tag}?", "automation_title": "Tag {name} is scanned", "qr_code_image": "QR code for tag {name}", "headers": { From dc93a0ce54b6001a13c90832960eac30944877bf Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 4 Jul 2024 21:18:50 +0200 Subject: [PATCH 14/18] Fix energy selection date card in grid layout (#21293) Fix energy selection card in grid layout --- .../energy/hui-energy-date-selection-card.ts | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts b/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts index d6ab8eb4929a..0b2ff5fa817b 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-date-selection-card.ts @@ -1,17 +1,17 @@ import { - html, - LitElement, - nothing, - css, CSSResultGroup, + LitElement, PropertyValues, + css, + html, + nothing, } from "lit"; import { customElement, property, state } from "lit/decorators"; import { HomeAssistant } from "../../../../types"; +import { hasConfigChanged } from "../../common/has-changed"; import "../../components/hui-energy-period-selector"; -import { LovelaceCard } from "../../types"; +import { LovelaceCard, LovelaceLayoutOptions } from "../../types"; import { EnergyCardBaseConfig } from "../types"; -import { hasConfigChanged } from "../../common/has-changed"; @customElement("hui-energy-date-selection-card") export class HuiEnergyDateSelectionCard @@ -26,6 +26,13 @@ export class HuiEnergyDateSelectionCard return 1; } + public getLayoutOptions(): LovelaceLayoutOptions { + return { + grid_rows: 1, + grid_columns: 4, + }; + } + public setConfig(config: EnergyCardBaseConfig): void { this._config = config; } @@ -57,6 +64,13 @@ export class HuiEnergyDateSelectionCard static get styles(): CSSResultGroup { return css` + :host { + ha-card { + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + } .padded { padding-left: 16px !important; padding-inline-start: 16px !important; From 7f50504908d414308df04f276ec8933e9892f52d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 19:21:19 +0000 Subject: [PATCH 15/18] Update dependency typescript to v5.5.3 (#21300) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index aac30ded713c..baf9e0afd94f 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "terser-webpack-plugin": "5.3.10", "transform-async-modules-webpack-plugin": "1.1.1", "ts-lit-plugin": "2.0.2", - "typescript": "5.5.2", + "typescript": "5.5.3", "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", diff --git a/yarn.lock b/yarn.lock index 02e62368d9c3..e43e25715610 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9083,7 +9083,7 @@ __metadata: ts-lit-plugin: "npm:2.0.2" tsparticles-engine: "npm:2.12.0" tsparticles-preset-links: "npm:2.12.0" - typescript: "npm:5.5.2" + typescript: "npm:5.5.3" ua-parser-js: "npm:1.0.38" unfetch: "npm:5.0.0" vis-data: "npm:7.1.9" @@ -14209,13 +14209,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.5.2": - version: 5.5.2 - resolution: "typescript@npm:5.5.2" +"typescript@npm:5.5.3": + version: 5.5.3 + resolution: "typescript@npm:5.5.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/9118b20f248e76b0dbff8737fef65dfa89d02668d4e633d2c5ceac99033a0ca5e8a1c1a53bc94da68e8f67677a88f318663dde859c9e9a09c1e116415daec2ba + checksum: 10/11a867312419ed497929aafd2f1d28b2cd41810a5eb6c6e9e169559112e9ea073d681c121a29102e67cd4478d0a4ae37a306a5800f3717f59c4337e6a9bd5e8d languageName: node linkType: hard @@ -14229,13 +14229,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.5.2#optional!builtin": - version: 5.5.2 - resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin::version=5.5.2&hash=379a07" +"typescript@patch:typescript@npm%3A5.5.3#optional!builtin": + version: 5.5.3 + resolution: "typescript@patch:typescript@npm%3A5.5.3#optional!builtin::version=5.5.3&hash=379a07" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/ac3145f65cf9e72ab29f2196e05d5816b355dc1a9195b9f010d285182a12457cfacd068be2dd22c877f88ebc966ac6e0e83f51c8586412b16499a27e3670ff4b + checksum: 10/7cf7acb78a80f749b82842f2ffe01e90e7b3e709a6f4268588e0b7599c41dca1059be217f47778fe1a380bfaf60933021ef20d002c426d4d7745e1b36c11467b languageName: node linkType: hard From f995f19f061be75279551eead79732758a3f3064 Mon Sep 17 00:00:00 2001 From: Matthias de Baat Date: Fri, 5 Jul 2024 09:00:19 +0200 Subject: [PATCH 16/18] Clarify remove vs. delete (#21297) Co-authored-by: Simon Lamon <32477463+silamon@users.noreply.github.com> Co-authored-by: Franck Nijhof --- .../src/pages/Text/remove-delete-add-create.markdown | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gallery/src/pages/Text/remove-delete-add-create.markdown b/gallery/src/pages/Text/remove-delete-add-create.markdown index 89c61db6383a..3b0bb85c3676 100644 --- a/gallery/src/pages/Text/remove-delete-add-create.markdown +++ b/gallery/src/pages/Text/remove-delete-add-create.markdown @@ -3,13 +3,16 @@ title: When to use remove, delete, add and create subtitle: The difference between remove/delete and add/create. --- -# Remove vs Delete +# Removing or deleting content -Remove and Delete are quite similar, but can be frustrating if used inconsistently. +_Remove_ and _Delete_ are quite similar, but can be frustrating if used inconsistently. + +- Remove refers to an action that can be restored or reapplied. +- Delete refers to a permanent, non-recoverable action. ## Remove -Take away and set aside, but kept in existence. +The term _Remove_ should always be used when an item/setting or content is to be removed or disassociated, but the action can be reversed or reapplied. For example: @@ -22,7 +25,7 @@ For example: ## Delete -Erase, rendered nonexistent or nonrecoverable. +The term _Delete_ should always be used to refer to any action that will cause the permanent deletion of an item/setting or content. For example: From f7072c247e8ea13ff9b894871e6f27341389b3f2 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Fri, 5 Jul 2024 12:17:31 +0200 Subject: [PATCH 17/18] Improve sensor card graph inside section grid (#21289) --- src/panels/lovelace/cards/hui-entity-card.ts | 24 ++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/panels/lovelace/cards/hui-entity-card.ts b/src/panels/lovelace/cards/hui-entity-card.ts index 42861e70fe4e..3e06cf7bf197 100644 --- a/src/panels/lovelace/cards/hui-entity-card.ts +++ b/src/panels/lovelace/cards/hui-entity-card.ts @@ -8,6 +8,7 @@ import { PropertyValues, } from "lit"; import { customElement, property, state } from "lit/decorators"; +import { classMap } from "lit/directives/class-map"; import { ifDefined } from "lit/directives/if-defined"; import { styleMap } from "lit/directives/style-map"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; @@ -73,6 +74,8 @@ export class HuiEntityCard extends LitElement implements LovelaceCard { @property({ attribute: false }) public hass?: HomeAssistant; + @property() public layout?: string; + @state() private _config?: EntityCardConfig; private _footerElement?: HuiErrorCard | LovelaceHeaderFooter; @@ -132,8 +135,15 @@ export class HuiEntityCard extends LitElement implements LovelaceCard { const colored = stateObj && this.getStateColor(stateObj, this._config); + const fixedFooter = + this.layout === "grid" || this._footerElement !== undefined; + return html` - +
${name}
@@ -188,7 +198,7 @@ export class HuiEntityCard extends LitElement implements LovelaceCard { ` : ""}
- ${this._footerElement} +
${this._footerElement}
`; } @@ -309,6 +319,16 @@ export class HuiEntityCard extends LitElement implements LovelaceCard { font-size: 18px; color: var(--secondary-text-color); } + + .with-fixed-footer { + justify-content: flex-start; + } + .with-fixed-footer .footer { + position: absolute; + right: 0; + left: 0; + bottom: 0; + } `, ]; } From 42b5fbec9bd0c4dd7a871d80b9b3082da1dade2f Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 5 Jul 2024 13:22:23 +0200 Subject: [PATCH 18/18] Bumped version to 20240705.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6aa93e24f7a8..402d7c3b98b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240703.0" +version = "20240705.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md"