diff --git a/hassio/src/addon-view/config/hassio-addon-audio.ts b/hassio/src/addon-view/config/hassio-addon-audio.ts index 0851a1269b..c167dc0e84 100644 --- a/hassio/src/addon-view/config/hassio-addon-audio.ts +++ b/hassio/src/addon-view/config/hassio-addon-audio.ts @@ -55,7 +55,9 @@ class HassioAddonAudio extends LitElement { >
${this._error - ? html`${this._error}` + ? html`${this._error}` : ""} `} ${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""} ${!this._yamlMode || (this._canShowSchema && this.addon.schema) || this._valid ? "" : html` - + ${this.supervisor.localize( "addon.configuration.options.invalid_yaml" )} diff --git a/hassio/src/addon-view/config/hassio-addon-network.ts b/hassio/src/addon-view/config/hassio-addon-network.ts index ae3deed1db..ab6ce3e860 100644 --- a/hassio/src/addon-view/config/hassio-addon-network.ts +++ b/hassio/src/addon-view/config/hassio-addon-network.ts @@ -64,7 +64,9 @@ class HassioAddonNetwork extends LitElement { >
${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""} diff --git a/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts b/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts index 411027275a..e248f37288 100644 --- a/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts +++ b/hassio/src/addon-view/documentation/hassio-addon-documentation-tab.ts @@ -40,7 +40,9 @@ class HassioAddonDocumentationDashboard extends LitElement {
${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""}
${this._content diff --git a/hassio/src/addon-view/info/hassio-addon-info.ts b/hassio/src/addon-view/info/hassio-addon-info.ts index d1f6da3d08..2ca1016876 100644 --- a/hassio/src/addon-view/info/hassio-addon-info.ts +++ b/hassio/src/addon-view/info/hassio-addon-info.ts @@ -144,14 +144,14 @@ class HassioAddonInfo extends LitElement { this.addon.arch ) ? html` - + ${this.supervisor.localize( "addon.dashboard.not_available_arch" )} ` : html` - + ${this.supervisor.localize( "addon.dashboard.not_available_arch", "core_version_installed", @@ -572,7 +572,9 @@ class HassioAddonInfo extends LitElement {
${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""} ${!this.addon.version && addonStoreInfo && !this.addon.available ? !addonArchIsSupported( @@ -580,14 +582,14 @@ class HassioAddonInfo extends LitElement { this.addon.arch ) ? html` - + ${this.supervisor.localize( "addon.dashboard.not_available_arch" )} ` : html` - + ${this.supervisor.localize( "addon.dashboard.not_available_version", "core_version_installed", diff --git a/hassio/src/addon-view/log/hassio-addon-logs.ts b/hassio/src/addon-view/log/hassio-addon-logs.ts index 133e888bb9..49b4388e97 100644 --- a/hassio/src/addon-view/log/hassio-addon-logs.ts +++ b/hassio/src/addon-view/log/hassio-addon-logs.ts @@ -36,7 +36,9 @@ class HassioAddonLogs extends LitElement {

${this.addon.name}

${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""}
${this._content diff --git a/hassio/src/dialogs/backup/dialog-hassio-backup.ts b/hassio/src/dialogs/backup/dialog-hassio-backup.ts index 0287c8fa01..097acd7505 100644 --- a/hassio/src/dialogs/backup/dialog-hassio-backup.ts +++ b/hassio/src/dialogs/backup/dialog-hassio-backup.ts @@ -92,7 +92,9 @@ class HassioBackupDialog > `} ${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""} `} ${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""} ${this._dialogParams.supervisor.localize("common.close")} diff --git a/hassio/src/dialogs/network/dialog-hassio-network.ts b/hassio/src/dialogs/network/dialog-hassio-network.ts index d765060baa..a247fc7f37 100644 --- a/hassio/src/dialogs/network/dialog-hassio-network.ts +++ b/hassio/src/dialogs/network/dialog-hassio-network.ts @@ -252,7 +252,7 @@ export class DialogHassioNetwork ` : ""} ${this._dirty - ? html` + ? html` ${this.supervisor.localize("dialog.network.warning")} ` : ""} diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts index 64eb324a20..647ef85227 100644 --- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts +++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts @@ -78,7 +78,9 @@ class HassioRepositoriesDialog extends LitElement { )} > ${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""}
${repositories.length diff --git a/hassio/src/dialogs/update/dialog-supervisor-update.ts b/hassio/src/dialogs/update/dialog-supervisor-update.ts index ca832ff776..23f2d65946 100644 --- a/hassio/src/dialogs/update/dialog-supervisor-update.ts +++ b/hassio/src/dialogs/update/dialog-supervisor-update.ts @@ -130,7 +130,9 @@ class DialogSupervisorUpdate extends LitElement { )}

`} ${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""} `; diff --git a/hassio/src/system/hassio-supervisor-info.ts b/hassio/src/system/hassio-supervisor-info.ts index 7282cced77..5804cf4c2e 100644 --- a/hassio/src/system/hassio-supervisor-info.ts +++ b/hassio/src/system/hassio-supervisor-info.ts @@ -174,6 +174,7 @@ class HassioSupervisorInfo extends LitElement { ` : "" : html``} ${!this.supervisor.supervisor.healthy ? html` ${this._error - ? html`${this._error}` + ? html` + ${this._error} + ` : ""} ${this.hass.userData?.showAdvanced ? html` diff --git a/src/components/ha-alert.ts b/src/components/ha-alert.ts index ddd3c641e7..c27f9b825e 100644 --- a/src/components/ha-alert.ts +++ b/src/components/ha-alert.ts @@ -11,6 +11,8 @@ import { css, html, LitElement } from "lit"; import { customElement, property } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; import { fireEvent } from "../common/dom/fire_event"; +import { computeRTL } from "../common/util/compute_rtl"; +import { HomeAssistant } from "../types"; import "./ha-svg-icon"; const ALERT_ICONS = { @@ -29,6 +31,8 @@ declare global { @customElement("ha-alert") class HaAlert extends LitElement { + @property({ type: Object }) public hass?: HomeAssistant; + @property() public title = ""; @property({ attribute: "alert-type" }) public alertType: @@ -37,7 +41,7 @@ class HaAlert extends LitElement { | "error" | "success" = "info"; - @property({ attribute: "action-text" }) public actionText = ""; + @property({ attribute: "action-text" }) public actionText?: string; @property({ type: Boolean }) public dismissable = false; @@ -47,7 +51,7 @@ class HaAlert extends LitElement { return html`
diff --git a/src/panels/config/cloud/account/cloud-google-pref.ts b/src/panels/config/cloud/account/cloud-google-pref.ts index 5f9c343ba0..841e703411 100644 --- a/src/panels/config/cloud/account/cloud-google-pref.ts +++ b/src/panels/config/cloud/account/cloud-google-pref.ts @@ -46,6 +46,7 @@ export class CloudGooglePref extends LitElement { ${google_enabled && !this.cloudStatus.google_registered ? html` html` - + After setting up a new device, it can take up to 2 hours for new data to arrive in your energy dashboard. diff --git a/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts b/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts index 99cf52fb36..cb89179d5e 100644 --- a/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts +++ b/src/panels/config/integrations/integration-panels/zwave/zwave-migration.ts @@ -159,7 +159,10 @@ export class ZwaveMigration extends LitElement { ) .map( (entityState) => - html` + html` Device ${computeStateName(entityState)} (${entityState.entity_id}) is not ready yet! For the best result, wake the device up if it is @@ -252,7 +255,10 @@ export class ZwaveMigration extends LitElement {

${this._waitingOnDevices?.map( (device) => - html` + html` Device ${computeDeviceName(device, this.hass)} is not ready yet! For the best result, wake the device up if it is battery powered and wait for this device @@ -265,6 +271,7 @@ export class ZwaveMigration extends LitElement { ${this._migratedZwaveEntities!.length !== this._migrationData.zwave_entity_ids.length ? html` diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts index 088ebf5f86..aa65d24136 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts @@ -166,7 +166,7 @@ class DialogZWaveJSAddNode extends LitElement {

${ this._error - ? html`${this._error}` : "" @@ -192,7 +192,9 @@ class DialogZWaveJSAddNode extends LitElement { ? html`

The device has requested the following security classes:

${this._error - ? html`${this._error}` + ? html`${this._error}` : ""}
${this._requestedGrant?.securityClasses @@ -356,6 +358,7 @@ class DialogZWaveJSAddNode extends LitElement {

${this._lowSecurity ? html` diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts index b5941c91ab..d990afcb29 100644 --- a/src/panels/lovelace/cards/hui-error-card.ts +++ b/src/panels/lovelace/cards/hui-error-card.ts @@ -35,7 +35,11 @@ export class HuiErrorCard extends LitElement implements LovelaceCard { } } - return html` + return html` ${dumped ? html`
${dumped}
` : ""}
`; } diff --git a/src/panels/lovelace/components/hui-warning.ts b/src/panels/lovelace/components/hui-warning.ts index 20f59819c2..974f015f2c 100644 --- a/src/panels/lovelace/components/hui-warning.ts +++ b/src/panels/lovelace/components/hui-warning.ts @@ -19,7 +19,9 @@ export const createEntityNotFoundWarning = ( @customElement("hui-warning") export class HuiWarning extends LitElement { protected render(): TemplateResult { - return html` `; + return html` + + `; } } diff --git a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts index 9f76adeadc..99f2b6ee26 100644 --- a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts +++ b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts @@ -124,7 +124,7 @@ export class HuiDialogEditView extends LitElement { ? html` ${VIEWS_NO_BADGE_SUPPORT.includes(this._type) ? html` - + ${this.hass!.localize( "ui.panel.lovelace.editor.edit_badges.view_no_badges" )}