jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-24 09:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

20221002.0 (#13953)

Browse Source
This commit is contained in:
Bram Kragten 2022-10-02 20:43:53 +02:00 committed by GitHub
commit e84b9b7c6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 666 additions and 439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gallery/src/pages/automation/describe-condition.ts
View File

@ -36,6 +36,7 @@ const conditions = [
{ condition: "sun", after: "sunset" },
{ condition: "sun", after: "sunrise", offset: "-01:00" },
{ condition: "zone", entity_id: "device_tracker.person", zone: "zone.home" },
{ condition: "trigger", id: "motion" },
{ condition: "time" },
{ condition: "template" },
];

2
pyproject.toml
View File

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "home-assistant-frontend"
version = "20220929.0"
version = "20221002.0"
license = {text = "Apache-2.0"}
description = "The Home Assistant frontend"
readme = "README.md"

8
src/components/chart/statistics-chart.ts
View File

@ -21,6 +21,7 @@ import {
numberFormatToLocale,
} from "../../common/number/format_number";
import {
getDisplayUnit,
getStatisticLabel,
getStatisticMetadata,
Statistics,
@ -258,8 +259,11 @@ class StatisticsChart extends LitElement {
if (!this.unit) {
if (unit === undefined) {
unit = meta?.display_unit_of_measurement;
} else if (unit !== meta?.display_unit_of_measurement) {
unit = getDisplayUnit(this.hass, firstStat.statistic_id, meta);
} else if (
unit !== getDisplayUnit(this.hass, firstStat.statistic_id, meta)
) {
// Clear unit if not all statistics have same unit
unit = null;
}
}

61
src/components/entity/ha-statistic-picker.ts
View File

@ -5,9 +5,12 @@ import { customElement, property, query, state } from "lit/decorators";
import memoizeOne from "memoize-one";
import { ensureArray } from "../../common/ensure-array";
import { fireEvent } from "../../common/dom/fire_event";
import { computeStateName } from "../../common/entity/compute_state_name";
import { stringCompare } from "../../common/string/compare";
import { getStatisticIds, StatisticsMetaData } from "../../data/recorder";
import {
getStatisticIds,
getStatisticLabel,
StatisticsMetaData,
} from "../../data/recorder";
import { PolymerChangedEvent } from "../../polymer-types";
import { HomeAssistant } from "../../types";
import { documentationUrl } from "../../util/documentation-url";
@ -43,18 +46,11 @@ export class HaStatisticPicker extends LitElement {
public includeStatisticsUnitOfMeasurement?: string | string[];
/**
* Show only statistics displayed with these units of measurements.
* @attr include-display-unit-of-measurement
* Show only statistics with these unit classes.
* @attr include-unit-class
*/
@property({ attribute: "include-display-unit-of-measurement" })
public includeDisplayUnitOfMeasurement?: string | string[];
/**
* Show only statistics with these device classes.
* @attr include-device-classes
*/
@property({ attribute: "include-device-classes" })
public includeDeviceClasses?: string[];
@property({ attribute: "include-unit-class" })
public includeUnitClass?: string | string[];
/**
* Show only statistics on entities.
@ -97,8 +93,7 @@ export class HaStatisticPicker extends LitElement {
(
statisticIds: StatisticsMetaData[],
includeStatisticsUnitOfMeasurement?: string | string[],
includeDisplayUnitOfMeasurement?: string | string[],
includeDeviceClasses?: string[],
includeUnitClass?: string | string[],
entitiesOnly?: boolean
): Array<{ id: string; name: string; state?: HassEntity }> => {
if (!statisticIds.length) {
@ -113,15 +108,18 @@ export class HaStatisticPicker extends LitElement {
}
if (includeStatisticsUnitOfMeasurement) {
const includeUnits = ensureArray(includeStatisticsUnitOfMeasurement);
const includeUnits: (string | null)[] = ensureArray(
includeStatisticsUnitOfMeasurement
);
statisticIds = statisticIds.filter((meta) =>
includeUnits.includes(meta.statistics_unit_of_measurement)
);
}
if (includeDisplayUnitOfMeasurement) {
const includeUnits = ensureArray(includeDisplayUnitOfMeasurement);
if (includeUnitClass) {
const includeUnitClasses: (string | null)[] =
ensureArray(includeUnitClass);
statisticIds = statisticIds.filter((meta) =>
includeUnits.includes(meta.display_unit_of_measurement)
includeUnitClasses.includes(meta.unit_class)
);
}
@ -136,23 +134,16 @@ export class HaStatisticPicker extends LitElement {
if (!entitiesOnly) {
output.push({
id: meta.statistic_id,
name: meta.name || meta.statistic_id,
name: getStatisticLabel(this.hass, meta.statistic_id, meta),
});
}
return;
}
if (
!includeDeviceClasses ||
includeDeviceClasses.includes(
entityState!.attributes.device_class || ""
)
) {
output.push({
id: meta.statistic_id,
name: computeStateName(entityState),
state: entityState,
});
}
output.push({
id: meta.statistic_id,
name: getStatisticLabel(this.hass, meta.statistic_id, meta),
state: entityState,
});
});
if (!output.length) {
@ -203,8 +194,7 @@ export class HaStatisticPicker extends LitElement {
(this.comboBox as any).items = this._getStatistics(
this.statisticIds!,
this.includeStatisticsUnitOfMeasurement,
this.includeDisplayUnitOfMeasurement,
this.includeDeviceClasses,
this.includeUnitClass,
this.entitiesOnly
);
} else {
@ -212,8 +202,7 @@ export class HaStatisticPicker extends LitElement {
(this.comboBox as any).items = this._getStatistics(
this.statisticIds!,
this.includeStatisticsUnitOfMeasurement,
this.includeDisplayUnitOfMeasurement,
this.includeDeviceClasses,
this.includeUnitClass,
this.entitiesOnly
);
});

19
src/components/entity/ha-statistics-picker.ts
View File

@ -32,11 +32,11 @@ class HaStatisticsPicker extends LitElement {
public includeStatisticsUnitOfMeasurement?: string[] | string;
/**
* Show only statistics displayed with these units of measurements.
* @attr include-display-unit-of-measurement
* Show only statistics with these unit classes.
* @attr include-unit-class
*/
@property({ attribute: "include-display-unit-of-measurement" })
public includeDisplayUnitOfMeasurement?: string[] | string;
@property({ attribute: "include-unit-class" })
public includeUnitClass?: string | string[];
/**
* Ignore filtering of statistics type and units when only a single statistic is selected.
@ -58,12 +58,12 @@ class HaStatisticsPicker extends LitElement {
this.ignoreRestrictionsOnFirstStatistic &&
this._currentStatistics.length <= 1;
const includeDisplayUnitCurrent = ignoreRestriction
? undefined
: this.includeDisplayUnitOfMeasurement;
const includeStatisticsUnitCurrent = ignoreRestriction
? undefined
: this.includeStatisticsUnitOfMeasurement;
const includeUnitClassCurrent = ignoreRestriction
? undefined
: this.includeUnitClass;
const includeStatisticTypesCurrent = ignoreRestriction
? undefined
: this.statisticTypes;
@ -75,8 +75,8 @@ class HaStatisticsPicker extends LitElement {
<ha-statistic-picker
.curValue=${statisticId}
.hass=${this.hass}
.includeDisplayUnitOfMeasurement=${includeDisplayUnitCurrent}
.includeStatisticsUnitOfMeasurement=${includeStatisticsUnitCurrent}
.includeUnitClass=${includeUnitClassCurrent}
.value=${statisticId}
.statisticTypes=${includeStatisticTypesCurrent}
.statisticIds=${this.statisticIds}
@ -89,10 +89,9 @@ class HaStatisticsPicker extends LitElement {
<div>
<ha-statistic-picker
.hass=${this.hass}
.includeDisplayUnitOfMeasurement=${this
.includeDisplayUnitOfMeasurement}
.includeStatisticsUnitOfMeasurement=${this
.includeStatisticsUnitOfMeasurement}
.includeUnitClass=${this.includeUnitClass}
.statisticTypes=${this.statisticTypes}
.statisticIds=${this.statisticIds}
.label=${this.pickStatisticLabel}

31
src/components/ha-combo-box.ts
View File

@ -8,7 +8,14 @@ import type {
ComboBoxLightValueChangedEvent,
} from "@vaadin/combo-box/vaadin-combo-box-light";
import { registerStyles } from "@vaadin/vaadin-themable-mixin/register-styles";
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import {
css,
CSSResultGroup,
html,
LitElement,
PropertyValues,
TemplateResult,
} from "lit";
import { ComboBoxLitRenderer, comboBoxRenderer } from "@vaadin/combo-box/lit";
import { customElement, property, query } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined";
@ -225,11 +232,13 @@ export class HaComboBox extends LitElement {
// @ts-ignore
fireEvent(this, ev.type, ev.detail);
if (
opened &&
"MutationObserver" in window &&
!this._overlayMutationObserver
) {
if (opened) {
this.removeInertOnOverlay();
}
}
private removeInertOnOverlay() {
if ("MutationObserver" in window && !this._overlayMutationObserver) {
const overlay = document.querySelector<HTMLElement>(
"vaadin-combo-box-overlay"
);
@ -268,6 +277,16 @@ export class HaComboBox extends LitElement {
}
}
updated(changedProps: PropertyValues) {
super.updated(changedProps);
if (
changedProps.has("filteredItems") ||
(changedProps.has("items") && this.opened)
) {
this.removeInertOnOverlay();
}
}
private _filterChanged(ev: ComboBoxLightFilterChangedEvent) {
// @ts-ignore
fireEvent(this, ev.type, ev.detail, { composed: false });

2
src/components/ha-icon-picker.ts
View File

@ -13,7 +13,7 @@ type IconItem = {
icon: string;
keywords: string[];
};
let iconItems: IconItem[] = [{ icon: "", keywords: [] }];
let iconItems: IconItem[] = [];
let iconLoaded = false;
// eslint-disable-next-line lit/prefer-static-styles

2
src/components/ha-navigation-picker.ts
View File

@ -20,7 +20,7 @@ type NavigationItem = {
title: string;
};
const DEFAULT_ITEMS: NavigationItem[] = [{ path: "", icon: "", title: "" }];
const DEFAULT_ITEMS: NavigationItem[] = [];
// eslint-disable-next-line lit/prefer-static-styles
const rowRenderer: ComboBoxLitRenderer<NavigationItem> = (item) => html`

13
src/data/automation_i18n.ts
View File

@ -189,7 +189,11 @@ export const describeTrigger = (
// Time Trigger
if (trigger.platform === "time" && trigger.at) {
const at = trigger.at.includes(".")
? `entity ${computeStateName(hass.states[trigger.at]) || trigger.at}`
? `entity ${
hass.states[trigger.at]
? computeStateName(hass.states[trigger.at])
: trigger.at
}`
: trigger.at;
return `When the time is equal to ${at}`;
@ -568,6 +572,13 @@ export const describeCondition = (
}`;
}
if (condition.condition === "trigger") {
if (!condition.id) {
return "Trigger condition";
}
return `When triggered by ${condition.id}`;
}
return `${
condition.condition ? condition.condition.replace(/_/g, " ") : "Unknown"
} condition`;

42
src/data/energy.ts
View File

@ -600,20 +600,14 @@ export const getEnergySolarForecasts = (hass: HomeAssistant) =>
type: "energy/solar_forecast",
});
export const ENERGY_GAS_VOLUME_UNITS = ["m³"];
export const ENERGY_GAS_ENERGY_UNITS = ["kWh"];
export const ENERGY_GAS_UNITS = [
...ENERGY_GAS_VOLUME_UNITS,
...ENERGY_GAS_ENERGY_UNITS,
];
const energyGasUnitClass = ["volume", "energy"] as const;
export type EnergyGasUnitClass = typeof energyGasUnitClass[number];
export type EnergyGasUnit = "volume" | "energy";
export const getEnergyGasUnitCategory = (
export const getEnergyGasUnitClass = (
prefs: EnergyPreferences,
statisticsMetaData: Record<string, StatisticsMetaData> = {},
excludeSource?: string
): EnergyGasUnit | undefined => {
): EnergyGasUnitClass | undefined => {
for (const source of prefs.energy_sources) {
if (source.type !== "gas") {
continue;
@ -622,29 +616,29 @@ export const getEnergyGasUnitCategory = (
continue;
}
const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
if (statisticIdWithMeta) {
return ENERGY_GAS_VOLUME_UNITS.includes(
statisticIdWithMeta.statistics_unit_of_measurement
if (
energyGasUnitClass.includes(
statisticIdWithMeta.unit_class as EnergyGasUnitClass
)
? "volume"
: "energy";
) {
return statisticIdWithMeta.unit_class as EnergyGasUnitClass;
}
}
return undefined;
};
export const getEnergyGasUnit = (
hass: HomeAssistant,
prefs: EnergyPreferences,
statisticsMetaData: Record<string, StatisticsMetaData> = {}
): string | undefined => {
for (const source of prefs.energy_sources) {
if (source.type !== "gas") {
continue;
}
const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
if (statisticIdWithMeta?.display_unit_of_measurement) {
return statisticIdWithMeta.display_unit_of_measurement;
}
const unitClass = getEnergyGasUnitClass(prefs, statisticsMetaData);
if (unitClass === undefined) {
return undefined;
}
return undefined;
return unitClass === "energy"
? "kWh"
: hass.config.unit_system.length === "km"
? "m³"
: "ft³";
};

22
src/data/recorder.ts
View File

@ -20,13 +20,13 @@ export interface StatisticValue {
}
export interface StatisticsMetaData {
display_unit_of_measurement: string;
statistics_unit_of_measurement: string;
statistics_unit_of_measurement: string | null;
statistic_id: string;
source: string;
name?: string | null;
has_sum: boolean;
has_mean: boolean;
unit_class: string | null;
}
export type StatisticsValidationResult =
@ -254,14 +254,14 @@ export const adjustStatisticsSum = (
statistic_id: string,
start_time: string,
adjustment: number,
display_unit: string
adjustment_unit_of_measurement: string | null
): Promise<void> =>
hass.callWS({
type: "recorder/adjust_sum_statistics",
statistic_id,
start_time,
adjustment,
display_unit,
adjustment_unit_of_measurement,
});
export const getStatisticLabel = (
@ -275,3 +275,17 @@ export const getStatisticLabel = (
}
return statisticsMetaData?.name || statisticsId;
};
export const getDisplayUnit = (
hass: HomeAssistant,
statisticsId: string | undefined,
statisticsMetaData: StatisticsMetaData | undefined
): string | null | undefined => {
let unit: string | undefined;
if (statisticsId) {
unit = hass.states[statisticsId]?.attributes.unit_of_measurement;
}
return unit === undefined
? statisticsMetaData?.statistics_unit_of_measurement
: unit;
};

19
src/dialogs/config-flow/step-flow-abort.ts
View File

@ -14,8 +14,6 @@ import { showAddApplicationCredentialDialog } from "../../panels/config/applicat
import { configFlowContentStyles } from "./styles";
import { DataEntryFlowDialogParams } from "./show-dialog-data-entry-flow";
import { showConfigFlowDialog } from "./show-dialog-config-flow";
import { domainToName } from "../../data/integration";
import { showConfirmationDialog } from "../generic/show-dialog-box";
@customElement("step-flow-abort")
class StepFlowAbort extends LitElement {
@ -54,26 +52,11 @@ class StepFlowAbort extends LitElement {
}
private async _handleMissingCreds() {
const confirm = await showConfirmationDialog(this, {
title: this.hass.localize(
"ui.panel.config.integrations.config_flow.missing_credentials_title"
),
text: this.hass.localize(
"ui.panel.config.integrations.config_flow.missing_credentials",
{
integration: domainToName(this.hass.localize, this.domain),
}
),
confirmText: this.hass.localize("ui.common.yes"),
dismissText: this.hass.localize("ui.common.no"),
});
this._flowDone();
if (!confirm) {
return;
}
// Prompt to enter credentials and restart integration setup
showAddApplicationCredentialDialog(this.params.dialogParentElement!, {
selectedDomain: this.domain,
manifest: this.params.manifest,
applicationCredentialAddedCallback: () => {
showConfigFlowDialog(this.params.dialogParentElement!, {
dialogClosedCallback: this.params.dialogClosedCallback,

129
src/panels/config/application_credentials/dialog-add-application-credential.ts
View File

@ -5,6 +5,7 @@ import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
import { fireEvent } from "../../../common/dom/fire_event";
import "../../../components/ha-alert";
import "../../../components/ha-circular-progress";
import "../../../components/ha-combo-box";
import { createCloseHeading } from "../../../components/ha-dialog";
@ -16,7 +17,7 @@ import {
createApplicationCredential,
fetchApplicationCredentialsConfig,
} from "../../../data/application_credential";
import { domainToName } from "../../../data/integration";
import { domainToName, IntegrationManifest } from "../../../data/integration";
import { haStyleDialog } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
import { documentationUrl } from "../../../util/documentation-url";
@ -44,6 +45,8 @@ export class DialogAddApplicationCredential extends LitElement {
@state() private _domain?: string;
@state() private _manifest?: IntegrationManifest | null;
@state() private _name?: string;
@state() private _description?: string;
@ -58,8 +61,8 @@ export class DialogAddApplicationCredential extends LitElement {
public showDialog(params: AddApplicationCredentialDialogParams) {
this._params = params;
this._domain =
params.selectedDomain !== undefined ? params.selectedDomain : "";
this._domain = params.selectedDomain;
this._manifest = params.manifest;
this._name = "";
this._description = "";
this._clientId = "";
@ -76,7 +79,7 @@ export class DialogAddApplicationCredential extends LitElement {
name: domainToName(this.hass.localize, domain),
}));
await this.hass.loadBackendTranslation("application_credentials");
if (this._domain !== "") {
if (this._domain) {
this._updateDescription();
}
}
@ -85,6 +88,9 @@ export class DialogAddApplicationCredential extends LitElement {
if (!this._params || !this._domains) {
return html``;
}
const selectedDomainName = this._params.selectedDomain
? domainToName(this.hass.localize, this._domain!)
: "";
return html`
<ha-dialog
open
@ -99,42 +105,76 @@ export class DialogAddApplicationCredential extends LitElement {
)}
>
<div>
${this._error ? html` <div class="error">${this._error}</div> ` : ""}
<p>
${this.hass.localize(
"ui.panel.config.application_credentials.editor.description"
)}
<br />
<a
href=${documentationUrl(
this.hass!,
"/integrations/application_credentials"
)}
target="_blank"
rel="noreferrer"
>
${this.hass!.localize(
"ui.panel.config.application_credentials.editor.view_documentation"
)}
<ha-svg-icon .path=${mdiOpenInNew}></ha-svg-icon>
</a>
</p>
<ha-combo-box
name="domain"
.hass=${this.hass}
.disabled=${!!this._params.selectedDomain}
.label=${this.hass.localize(
"ui.panel.config.application_credentials.editor.domain"
)}
.value=${this._domain}
.renderer=${rowRenderer}
.items=${this._domains}
item-id-path="id"
item-value-path="id"
item-label-path="name"
required
@value-changed=${this._handleDomainPicked}
></ha-combo-box>
${this._error
? html`<ha-alert alert-type="error">${this._error}</ha-alert> `
: ""}
${this._params.selectedDomain && !this._description
? html`<p>
${this.hass.localize(
"ui.panel.config.application_credentials.editor.missing_credentials",
{
integration: selectedDomainName,
}
)}
${this._manifest?.is_built_in || this._manifest?.documentation
? html`<a
href=${this._manifest.is_built_in
? documentationUrl(
this.hass,
`/integrations/${this._domain}`
)
: this._manifest.documentation}
target="_blank"
rel="noreferrer"
>
${this.hass.localize(
"ui.panel.config.application_credentials.editor.missing_credentials_domain_link",
{
integration: selectedDomainName,
}
)}
<ha-svg-icon .path=${mdiOpenInNew}></ha-svg-icon>
</a>`
: ""}
</p>`
: ""}
${!this._params.selectedDomain || !this._description
? html`<p>
${this.hass.localize(
"ui.panel.config.application_credentials.editor.description"
)}
<a
href=${documentationUrl(
this.hass!,
"/integrations/application_credentials"
)}
target="_blank"
rel="noreferrer"
>
${this.hass!.localize(
"ui.panel.config.application_credentials.editor.view_documentation"
)}
<ha-svg-icon .path=${mdiOpenInNew}></ha-svg-icon>
</a>
</p>`
: ""}
${this._params.selectedDomain
? ""
: html`<ha-combo-box
name="domain"
.hass=${this.hass}
.label=${this.hass.localize(
"ui.panel.config.application_credentials.editor.domain"
)}
.value=${this._domain}
.renderer=${rowRenderer}
.items=${this._domains}
item-id-path="id"
item-value-path="id"
item-label-path="name"
required
@value-changed=${this._handleDomainPicked}
></ha-combo-box>`}
${this._description
? html`<ha-markdown
breaks
@ -223,7 +263,11 @@ export class DialogAddApplicationCredential extends LitElement {
this._updateDescription();
}
private _updateDescription() {
private async _updateDescription() {
await this.hass.loadBackendTranslation(
"application_credentials",
this._domain
);
const info = this._config!.integrations[this._domain!];
this._description = this.hass.localize(
`component.${this._domain}.application_credentials.description`,
@ -298,6 +342,9 @@ export class DialogAddApplicationCredential extends LitElement {
a ha-svg-icon {
--mdc-icon-size: 16px;
}
ha-markdown {
margin-bottom: 16px;
}
`,
];
}

2
src/panels/config/application_credentials/show-dialog-add-application-credential.ts
View File

@ -1,5 +1,6 @@
import { fireEvent } from "../../../common/dom/fire_event";
import { ApplicationCredential } from "../../../data/application_credential";
import { IntegrationManifest } from "../../../data/integration";
export interface AddApplicationCredentialDialogParams {
applicationCredentialAddedCallback: (
@ -7,6 +8,7 @@ export interface AddApplicationCredentialDialogParams {
) => void;
dialogAbortedCallback?: () => void;
selectedDomain?: string;
manifest?: IntegrationManifest | null;
}
export const loadAddApplicationCredentialDialog = () =>

6
src/panels/config/automation/action/types/ha-automation-action-choose.ts
View File

@ -55,7 +55,7 @@ export class HaChooseAction extends LitElement implements ActionElement {
)}:
</h3>
<ha-automation-condition
.conditions=${option.conditions}
.conditions=${ensureArray<string | Condition>(option.conditions)}
.reOrderMode=${this.reOrderMode}
.disabled=${this.disabled}
.hass=${this.hass}
@ -68,7 +68,7 @@ export class HaChooseAction extends LitElement implements ActionElement {
)}:
</h3>
<ha-automation-action
.actions=${option.sequence || []}
.actions=${ensureArray(option.sequence) || []}
.reOrderMode=${this.reOrderMode}
.disabled=${this.disabled}
.hass=${this.hass}
@ -96,7 +96,7 @@ export class HaChooseAction extends LitElement implements ActionElement {
)}:
</h2>
<ha-automation-action
.actions=${action.default || []}
.actions=${ensureArray(action.default) || []}
.reOrderMode=${this.reOrderMode}
.disabled=${this.disabled}
@value-changed=${this._defaultChanged}

25
src/panels/config/automation/ha-automation-editor.ts
View File

@ -444,7 +444,7 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
if (changedProps.has("entityId") && this.entityId) {
getAutomationStateConfig(this.hass, this.entityId).then((c) => {
this._config = c.config;
this._config = this._normalizeConfig(c.config);
});
this._entityId = this.entityId;
this._dirty = false;
@ -473,24 +473,27 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) {
this._entityId = automation?.entity_id;
}
private _normalizeConfig(config: AutomationConfig): AutomationConfig {
// Normalize data: ensure trigger, action and condition are lists
// Happens when people copy paste their automations into the config
for (const key of ["trigger", "condition", "action"]) {
const value = config[key];
if (value && !Array.isArray(value)) {
config[key] = [value];
}
}
return config;
}
private async _loadConfig() {
try {
const config = await fetchAutomationFileConfig(
this.hass,
this.automationId as string
);
// Normalize data: ensure trigger, action and condition are lists
// Happens when people copy paste their automations into the config
for (const key of ["trigger", "condition", "action"]) {
const value = config[key];
if (value && !Array.isArray(value)) {
config[key] = [value];
}
}
this._dirty = false;
this._readOnly = false;
this._config = config;
this._config = this._normalizeConfig(config);
} catch (err: any) {
const entity = Object.values(this.hass.entities).find(
(ent) =>

33
src/panels/config/automation/ha-automation-picker.ts
View File

@ -35,6 +35,8 @@ import {
deleteAutomation,
duplicateAutomation,
fetchAutomationFileConfig,
getAutomationStateConfig,
showAutomationEditor,
triggerAutomationActions,
} from "../../../data/automation";
import {
@ -329,6 +331,14 @@ class HaAutomationPicker extends LitElement {
}
private _showTrace(automation: any) {
if (!automation.attributes.id) {
showAlertDialog(this, {
text: this.hass.localize(
"ui.panel.config.automation.picker.traces_not_available"
),
});
return;
}
navigate(`/config/automation/trace/${automation.attributes.id}`);
}
@ -382,17 +392,20 @@ class HaAutomationPicker extends LitElement {
);
duplicateAutomation(config);
} catch (err: any) {
if (err.status_code === 404) {
const response = await getAutomationStateConfig(
this.hass,
automation.entity_id
);
showAutomationEditor({ ...response.config, id: undefined });
return;
}
await showAlertDialog(this, {
text:
err.status_code === 404
? this.hass.localize(
"ui.panel.config.automation.editor.load_error_not_duplicable"
)
: this.hass.localize(
"ui.panel.config.automation.editor.load_error_unknown",
"err_no",
err.status_code
),
text: this.hass.localize(
"ui.panel.config.automation.editor.load_error_unknown",
"err_no",
err.status_code
),
});
}
}

71
src/panels/config/devices/ha-config-devices-dashboard.ts
View File

@ -38,6 +38,7 @@ import { HomeAssistant, Route } from "../../../types";
import { configSections } from "../ha-panel-config";
import "../integrations/ha-integration-overflow-menu";
import { showZWaveJSAddNodeDialog } from "../integrations/integration-panels/zwave_js/show-dialog-zwave_js-add-node";
import { showAddIntegrationDialog } from "../integrations/show-add-integration-dialog";
interface DeviceRowData extends DeviceRegistryEntry {
device?: DeviceRowData;
@ -363,16 +364,15 @@ export class HaConfigDeviceDashboard extends LitElement {
}
protected render(): TemplateResult {
const { devicesOutput, filteredConfigEntry } =
this._devicesAndFilterDomains(
this.devices,
this.entries,
this.entities,
this.areas,
this._searchParms,
this._showDisabled,
this.hass.localize
);
const { devicesOutput } = this._devicesAndFilterDomains(
this.devices,
this.entries,
this.entities,
this.areas,
this._searchParms,
this._showDisabled,
this.hass.localize
);
const activeFilters = this._activeFilters(
this.entries,
this._searchParms,
@ -405,39 +405,21 @@ export class HaConfigDeviceDashboard extends LitElement {
@search-changed=${this._handleSearchChange}
@row-click=${this._handleRowClicked}
clickable
.hasFab=${filteredConfigEntry &&
(filteredConfigEntry.domain === "zha" ||
filteredConfigEntry.domain === "zwave_js")}
hasFab
>
<ha-integration-overflow-menu
.hass=${this.hass}
slot="toolbar-icon"
></ha-integration-overflow-menu>
${!filteredConfigEntry
? ""
: filteredConfigEntry.domain === "zwave_js"
? html`
<ha-fab
slot="fab"
.label=${this.hass.localize("ui.panel.config.zha.add_device")}
extended
?rtl=${computeRTL(this.hass)}
@click=${this._showZJSAddDeviceDialog}
>
<ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
</ha-fab>
`
: filteredConfigEntry.domain === "zha"
? html`<a href="/config/zha/add" slot="fab">
<ha-fab
.label=${this.hass.localize("ui.panel.config.zha.add_device")}
extended
?rtl=${computeRTL(this.hass)}
>
<ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
</ha-fab>
</a>`
: html``}
<ha-fab
slot="fab"
.label=${this.hass.localize("ui.panel.config.devices.add_device")}
extended
@click=${this._addDevice}
?rtl=${computeRTL(this.hass)}
>
<ha-svg-icon slot="icon" .path=${mdiPlus}></ha-svg-icon>
</ha-fab>
<ha-button-menu slot="filter-menu" corner="BOTTOM_START" multi>
<ha-icon-button
slot="trigger"
@ -516,7 +498,7 @@ export class HaConfigDeviceDashboard extends LitElement {
this._showDisabled = true;
}
private _showZJSAddDeviceDialog() {
private _addDevice() {
const { filteredConfigEntry } = this._devicesAndFilterDomains(
this.devices,
this.entries,
@ -526,7 +508,18 @@ export class HaConfigDeviceDashboard extends LitElement {
this._showDisabled,
this.hass.localize
);
if (filteredConfigEntry?.domain === "zha") {
navigate(`/config/zha/add`);
return;
}
if (filteredConfigEntry?.domain === "zwave_js") {
this._showZJSAddDeviceDialog(filteredConfigEntry);
return;
}
showAddIntegrationDialog(this);
}
private _showZJSAddDeviceDialog(filteredConfigEntry: ConfigEntry) {
showZWaveJSAddNodeDialog(this, {
entry_id: filteredConfigEntry!.entry_id,
});

6
src/panels/config/energy/components/ha-energy-gas-settings.ts
View File

@ -10,7 +10,7 @@ import {
EnergyPreferencesValidation,
EnergyValidationIssue,
GasSourceTypeEnergyPreference,
getEnergyGasUnitCategory,
getEnergyGasUnitClass,
saveEnergyPreferences,
} from "../../../../data/energy";
import {
@ -133,7 +133,7 @@ export class EnergyGasSettings extends LitElement {
private _addSource() {
showEnergySettingsGasDialog(this, {
allowedGasUnitCategory: getEnergyGasUnitCategory(
allowedGasUnitClass: getEnergyGasUnitClass(
this.preferences,
this.statsMetadata
),
@ -152,7 +152,7 @@ export class EnergyGasSettings extends LitElement {
ev.currentTarget.closest(".row").source;
showEnergySettingsGasDialog(this, {
source: { ...origSource },
allowedGasUnitCategory: getEnergyGasUnitCategory(
allowedGasUnitClass: getEnergyGasUnitClass(
this.preferences,
this.statsMetadata,
origSource.stat_energy_from

9
src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts
View File

@ -14,8 +14,7 @@ import { EnergySettingsBatteryDialogParams } from "./show-dialogs-energy";
import "@material/mwc-button/mwc-button";
import "../../../../components/entity/ha-statistic-picker";
const energyUnits = ["kWh"];
const energyDeviceClasses = ["energy"];
const energyUnitClasses = ["energy"];
@customElement("dialog-energy-battery-settings")
export class DialogEnergyBatterySettings
@ -67,8 +66,7 @@ export class DialogEnergyBatterySettings
<ha-statistic-picker
.hass=${this.hass}
.includeStatisticsUnitOfMeasurement=${energyUnits}
.includeDeviceClasses=${energyDeviceClasses}
.includeUnitClass=${energyUnitClasses}
.value=${this._source.stat_energy_to}
.label=${this.hass.localize(
"ui.panel.config.energy.battery.dialog.energy_into_battery"
@ -79,8 +77,7 @@ export class DialogEnergyBatterySettings
<ha-statistic-picker
.hass=${this.hass}
.includeStatisticsUnitOfMeasurement=${energyUnits}
.includeDeviceClasses=${energyDeviceClasses}
.includeUnitClass=${energyUnitClasses}
.value=${this._source.stat_energy_from}
.label=${this.hass.localize(
"ui.panel.config.energy.battery.dialog.energy_out_of_battery"

6
src/panels/config/energy/dialogs/dialog-energy-device-settings.ts
View File

@ -14,8 +14,7 @@ import "../../../../components/ha-radio";
import "../../../../components/ha-formfield";
import "../../../../components/entity/ha-entity-picker";
const energyUnits = ["kWh"];
const energyDeviceClasses = ["energy"];
const energyUnitClasses = ["energy"];
@customElement("dialog-energy-device-settings")
export class DialogEnergyDeviceSettings
@ -69,8 +68,7 @@ export class DialogEnergyDeviceSettings
<ha-statistic-picker
.hass=${this.hass}
.includeStatisticsUnitOfMeasurement=${energyUnits}
.includeDeviceClasses=${energyDeviceClasses}
.includeUnitClass=${energyUnitClasses}
.label=${this.hass.localize(
"ui.panel.config.energy.device_consumption.dialog.device_consumption_energy"
)}

43
src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
View File

@ -5,9 +5,6 @@ import { fireEvent } from "../../../../common/dom/fire_event";
import "../../../../components/ha-dialog";
import {
emptyGasEnergyPreference,
ENERGY_GAS_ENERGY_UNITS,
ENERGY_GAS_UNITS,
ENERGY_GAS_VOLUME_UNITS,
GasSourceTypeEnergyPreference,
} from "../../../../data/energy";
import { HassDialog } from "../../../../dialogs/make-dialog-manager";
@ -21,7 +18,10 @@ import "../../../../components/ha-radio";
import "../../../../components/ha-formfield";
import "../../../../components/ha-textfield";
import type { HaRadio } from "../../../../components/ha-radio";
import { getStatisticMetadata } from "../../../../data/recorder";
import {
getStatisticMetadata,
getDisplayUnit,
} from "../../../../data/recorder";
@customElement("dialog-energy-gas-settings")
export class DialogEnergyGasSettings
@ -38,7 +38,7 @@ export class DialogEnergyGasSettings
@state() private _pickableUnit?: string;
@state() private _pickedDisplayUnit?: string;
@state() private _pickedDisplayUnit?: string | null;
@state() private _error?: string;
@ -49,7 +49,11 @@ export class DialogEnergyGasSettings
this._source = params.source
? { ...params.source }
: emptyGasEnergyPreference();
this._pickedDisplayUnit = params.metadata?.display_unit_of_measurement;
this._pickedDisplayUnit = getDisplayUnit(
this.hass,
params.source?.stat_energy_from,
params.metadata
);
this._costs = this._source.entity_energy_price
? "entity"
: this._source.number_energy_price
@ -75,9 +79,9 @@ export class DialogEnergyGasSettings
const pickableUnit =
this._pickableUnit ||
(this._params.allowedGasUnitCategory === undefined
(this._params.allowedGasUnitClass === undefined
? "ft³, m³, Wh, kWh or MWh"
: this._params.allowedGasUnitCategory === "energy"
: this._params.allowedGasUnitClass === "energy"
? "Wh, kWh or MWh"
: "ft³ or m³");
@ -98,17 +102,12 @@ export class DialogEnergyGasSettings
<ha-statistic-picker
.hass=${this.hass}
.includeStatisticsUnitOfMeasurement=${this._params
.allowedGasUnitCategory === undefined
? ENERGY_GAS_UNITS
: this._params.allowedGasUnitCategory === "energy"
? ENERGY_GAS_ENERGY_UNITS
: ENERGY_GAS_VOLUME_UNITS}
.includeUnitClass=${this._params.allowedGasUnitClass}
.value=${this._source.stat_energy_from}
.label=${`${this.hass.localize(
"ui.panel.config.energy.gas.dialog.gas_usage"
)} (${
this._params.allowedGasUnitCategory === undefined
this._params.allowedGasUnitClass === undefined
? this.hass.localize(
"ui.panel.config.energy.gas.dialog.m3_or_kWh"
)
@ -263,14 +262,12 @@ export class DialogEnergyGasSettings
private async _statisticChanged(ev: CustomEvent<{ value: string }>) {
if (ev.detail.value) {
const entity = this.hass.states[ev.detail.value];
if (entity?.attributes.unit_of_measurement) {
this._pickedDisplayUnit = entity.attributes.unit_of_measurement;
} else {
this._pickedDisplayUnit = (
await getStatisticMetadata(this.hass, [ev.detail.value])
)[0]?.display_unit_of_measurement;
}
const metadata = await getStatisticMetadata(this.hass, [ev.detail.value]);
this._pickedDisplayUnit = getDisplayUnit(
this.hass,
ev.detail.value,
metadata[0]
);
} else {
this._pickedDisplayUnit = undefined;
}

6
src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts
View File

@ -20,8 +20,7 @@ import "../../../../components/ha-formfield";
import type { HaRadio } from "../../../../components/ha-radio";
import "../../../../components/entity/ha-entity-picker";
const energyUnits = ["kWh"];
const energyDeviceClasses = ["energy"];
const energyUnitClasses = ["energy"];
@customElement("dialog-energy-grid-flow-settings")
export class DialogEnergyGridFlowSettings
@ -93,8 +92,7 @@ export class DialogEnergyGridFlowSettings
<ha-statistic-picker
.hass=${this.hass}
.includeStatisticsUnitOfMeasurement=${energyUnits}
.includeDeviceClasses=${energyDeviceClasses}
.includeUnitClass=${energyUnitClasses}
.value=${this._source[
this._params.direction === "from"
? "stat_energy_from"

6
src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts
View File

@ -22,8 +22,7 @@ import { showConfigFlowDialog } from "../../../../dialogs/config-flow/show-dialo
import { ConfigEntry, getConfigEntries } from "../../../../data/config_entries";
import { brandsUrl } from "../../../../util/brands-url";
const energyUnits = ["kWh"];
const energyDeviceClasses = ["energy"];
const energyUnitClasses = ["energy"];
@customElement("dialog-energy-solar-settings")
export class DialogEnergySolarSettings
@ -79,8 +78,7 @@ export class DialogEnergySolarSettings
<ha-statistic-picker
.hass=${this.hass}
.includeStatisticsUnitOfMeasurement=${energyUnits}
.includeDeviceClasses=${energyDeviceClasses}
.includeUnitClass=${energyUnitClasses}
.value=${this._source.stat_energy_from}
.label=${this.hass.localize(
"ui.panel.config.energy.solar.dialog.solar_production_energy"

4
src/panels/config/energy/dialogs/show-dialogs-energy.ts
View File

@ -2,7 +2,7 @@ import { fireEvent } from "../../../../common/dom/fire_event";
import {
BatterySourceTypeEnergyPreference,
DeviceConsumptionEnergyPreference,
EnergyGasUnit,
EnergyGasUnitClass,
EnergyInfo,
FlowFromGridSourceEnergyPreference,
FlowToGridSourceEnergyPreference,
@ -46,7 +46,7 @@ export interface EnergySettingsBatteryDialogParams {
export interface EnergySettingsGasDialogParams {
source?: GasSourceTypeEnergyPreference;
allowedGasUnitCategory?: EnergyGasUnit;
allowedGasUnitClass?: EnergyGasUnitClass;
metadata?: StatisticsMetaData;
saveCallback: (source: GasSourceTypeEnergyPreference) => Promise<void>;
}

15
src/panels/config/helpers/forms/ha-schedule-form.ts
View File

@ -219,19 +219,18 @@ class HaScheduleForm extends LitElement {
const start = new Date();
start.setDate(start.getDate() + distance);
const start_tokens = item.from.split(":");
start.setHours(
parseInt(item.from.slice(0, 2)),
parseInt(item.from.slice(-2))
parseInt(start_tokens[0]),
parseInt(start_tokens[1]),
0,
0
);
const end = new Date();
end.setDate(end.getDate() + distance);
end.setHours(
parseInt(item.to.slice(0, 2)),
parseInt(item.to.slice(-2)),
0,
0
);
const end_tokens = item.to.split(":");
end.setHours(parseInt(end_tokens[0]), parseInt(end_tokens[1]), 0, 0);
events.push({
id: `${day}-${index}`,

54
src/panels/config/integrations/dialog-add-integration.ts
View File

@ -80,10 +80,10 @@ class AddIntegrationDialog extends LitElement {
private _height?: number;
public showDialog(params: AddIntegrationDialogParams): void {
public showDialog(params?: AddIntegrationDialogParams): void {
this._open = true;
this._pickedBrand = params.brand;
this._initialFilter = params.initialFilter;
this._pickedBrand = params?.brand;
this._initialFilter = params?.initialFilter;
this._narrow = matchMedia(
"all and (max-width: 450px), all and (max-height: 500px)"
).matches;
@ -296,14 +296,13 @@ class AddIntegrationDialog extends LitElement {
scrimClickAction
escapeKeyAction
hideActions
.heading=${this._pickedBrand
? true
: createCloseHeading(
this.hass,
this.hass.localize("ui.panel.config.integrations.new")
)}
.heading=${createCloseHeading(
this.hass,
this.hass.localize("ui.panel.config.integrations.new")
)}
>
${this._pickedBrand
${this._pickedBrand &&
(!this._integrations || this._pickedBrand in this._integrations)
? html`<div slot="heading">
<ha-icon-button-prev
@click=${this._prevClicked}
@ -385,7 +384,11 @@ class AddIntegrationDialog extends LitElement {
return html``;
}
return html`
<ha-integration-list-item .hass=${this.hass} .integration=${integration}>
<ha-integration-list-item
brand
.hass=${this.hass}
.integration=${integration}
>
</ha-integration-list-item>
`;
};
@ -506,7 +509,16 @@ class AddIntegrationDialog extends LitElement {
if (integration.integrations) {
const integrations =
this._integrations![integration.domain].integrations!;
this._fetchFlowsInProgress(Object.keys(integrations));
let domains = Object.keys(integrations);
if (integration.iot_standards?.includes("homekit")) {
// if homekit is supported, also fetch the discovered homekit devices
domains.push("homekit_controller");
}
if (integration.domain === "apple") {
// we show discoverd homekit devices in their own brand section, dont show them at apple
domains = domains.filter((domain) => domain !== "homekit_controller");
}
this._fetchFlowsInProgress(domains);
this._pickedBrand = integration.domain;
return;
}
@ -529,6 +541,15 @@ class AddIntegrationDialog extends LitElement {
return;
}
if (
["cloud", "google_assistant", "alexa"].includes(integration.domain) &&
isComponentLoaded(this.hass, "cloud")
) {
this.closeDialog();
navigate("/config/cloud");
return;
}
const manifest = await fetchIntegrationManifest(
this.hass,
integration.domain
@ -591,7 +612,14 @@ class AddIntegrationDialog extends LitElement {
private async _fetchFlowsInProgress(domains: string[]) {
const flowsInProgress = (
await fetchConfigFlowInProgress(this.hass.connection)
).filter((flow) => domains.includes(flow.handler));
).filter(
(flow) =>
// filter config flows that are not for the integration we are looking for
domains.includes(flow.handler) ||
// filter config flows of other domains (like homekit) that are for the domains we are looking for
("alternative_domain" in flow.context &&
domains.includes(flow.context.alternative_domain))
);
if (flowsInProgress.length) {
this._flowsInProgress = flowsInProgress;

21
src/panels/config/integrations/ha-domain-integrations.ts
View File

@ -1,7 +1,9 @@
import { css, html, LitElement } from "lit";
import { customElement, property } from "lit/decorators";
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
import { fireEvent } from "../../../common/dom/fire_event";
import { protocolIntegrationPicked } from "../../../common/integrations/protocolIntegrationPicked";
import { navigate } from "../../../common/navigate";
import { caseInsensitiveStringCompare } from "../../../common/string/compare";
import { localizeConfigFlowTitle } from "../../../data/config_flow";
import { DataEntryFlowProgress } from "../../../data/data_entry_flow";
@ -26,7 +28,7 @@ class HaDomainIntegrations extends LitElement {
@property() public domain!: string;
@property({ attribute: false }) public integration!: Integration;
@property({ attribute: false }) public integration?: Integration;
@property({ attribute: false })
public flowsInProgress?: DataEntryFlowProgress[];
@ -179,9 +181,22 @@ class HaDomainIntegrations extends LitElement {
private async _integrationPicked(ev) {
const domain = ev.currentTarget.domain;
if (
(domain === this.domain && !this.integration.config_flow) ||
!this.integration.integrations?.[domain]?.config_flow
["cloud", "google_assistant", "alexa"].includes(domain) &&
isComponentLoaded(this.hass, "cloud")
) {
fireEvent(this, "close-dialog");
navigate("/config/cloud");
return;
}
if (
(domain === this.domain &&
!this.integration!.config_flow &&
(!this.integration!.integrations?.[domain] ||
!this.integration!.integrations[domain].config_flow)) ||
!this.integration!.integrations?.[domain]?.config_flow
) {
const manifest = await fetchIntegrationManifest(this.hass, domain);
showAlertDialog(this, {

3
src/panels/config/integrations/ha-integration-list-item.ts
View File

@ -22,6 +22,8 @@ export class HaIntegrationListItem extends ListItemBase {
@property({ type: Boolean }) hasMeta = true;
@property({ type: Boolean }) brand = false;
renderSingleLine() {
if (!this.integration) {
return html``;
@ -51,6 +53,7 @@ export class HaIntegrationListItem extends ListItemBase {
type: "icon",
useFallback: true,
darkOptimized: this.hass.themes?.darkMode,
brand: this.brand,
})}
referrerpolicy="no-referrer"
/>

20
src/panels/config/script/ha-script-editor.ts
View File

@ -469,15 +469,9 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
) {
fetchScriptFileConfig(this.hass, this.scriptId).then(
(config) => {
// Normalize data: ensure sequence is a list
// Happens when people copy paste their scripts into the config
const value = config.sequence;
if (value && !Array.isArray(value)) {
config.sequence = [value];
}
this._dirty = false;
this._readOnly = false;
this._config = config;
this._config = this._normalizeConfig(config);
},
(resp) => {
const entity = Object.values(this.hass.entities).find(
@ -524,7 +518,7 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
if (changedProps.has("entityId") && this.entityId) {
getScriptStateConfig(this.hass, this.entityId).then((c) => {
this._config = c.config;
this._config = this._normalizeConfig(c.config);
});
const regEntry = this.hass.entities[this.entityId];
if (regEntry?.unique_id) {
@ -536,6 +530,16 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) {
}
}
private _normalizeConfig(config: ScriptConfig): ScriptConfig {
// Normalize data: ensure sequence is a list
// Happens when people copy paste their scripts into the config
const value = config.sequence;
if (value && !Array.isArray(value)) {
config.sequence = [value];
}
return config;
}
private _computeLabelCallback = (
schema: SchemaUnion<ReturnType<typeof this._schema>>,
data: HaFormDataContainer

24
src/panels/config/script/ha-script-picker.ts
View File

@ -28,6 +28,7 @@ import "../../../components/ha-svg-icon";
import {
deleteScript,
fetchScriptFileConfig,
getScriptStateConfig,
showScriptEditor,
triggerScript,
} from "../../../data/script";
@ -311,17 +312,20 @@ class HaScriptPicker extends LitElement {
)})`,
});
} catch (err: any) {
if (err.status_code === 404) {
const response = await getScriptStateConfig(
this.hass,
script.entity_id
);
showScriptEditor(response.config);
return;
}
await showAlertDialog(this, {
text:
err.status_code === 404
? this.hass.localize(
"ui.panel.config.script.editor.load_error_not_duplicable"
)
: this.hass.localize(
"ui.panel.config.script.editor.load_error_unknown",
"err_no",
err.status_code
),
text: this.hass.localize(
"ui.panel.config.script.editor.load_error_unknown",
"err_no",
err.status_code
),
});
}
}

4
src/panels/config/storage/dialog-move-datadisk.ts
View File

@ -138,10 +138,6 @@ class MoveDatadiskDialog extends LitElement {
${device}
</mwc-list-item>`
)}
<mwc-list-item>Test</mwc-list-item>
<mwc-list-item>Test</mwc-list-item>
<mwc-list-item>Test</mwc-list-item>
<mwc-list-item>Test</mwc-list-item>
</ha-select>
<mwc-button

8
src/panels/developer-tools/statistics/developer-tools-statistics.ts
View File

@ -74,12 +74,6 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
hidden: this.narrow,
width: "20%",
},
display_unit_of_measurement: {
title: "Display unit",
sortable: true,
filterable: true,
width: "10%",
},
statistics_unit_of_measurement: {
title: "Statistics unit",
sortable: true,
@ -220,12 +214,12 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
this._data.push({
statistic_id: statisticId,
statistics_unit_of_measurement: "",
display_unit_of_measurement: "",
source: "",
state: this.hass.states[statisticId],
issues: issues[statisticId],
has_mean: false,
has_sum: false,
unit_class: null,
});
}
});

25
src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts
View File

@ -23,6 +23,7 @@ import "../../../components/ha-svg-icon";
import {
adjustStatisticsSum,
fetchStatistics,
getDisplayUnit,
StatisticValue,
} from "../../../data/recorder";
import type { DateTimeSelector, NumberSelector } from "../../../data/selector";
@ -59,7 +60,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
};
private _amountSelector = memoizeOne(
(unit_of_measurement: string): NumberSelector => ({
(unit_of_measurement: string | undefined): NumberSelector => ({
number: {
step: 0.01,
unit_of_measurement,
@ -135,7 +136,11 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
} else {
const data =
this._stats5min.length >= 2 ? this._stats5min : this._statsHour;
const unit = this._params!.statistic.display_unit_of_measurement;
const unit = getDisplayUnit(
this.hass,
this._params!.statistic.statistic_id,
this._params!.statistic
);
const rows: TemplateResult[] = [];
for (let i = 1; i < data.length; i++) {
const stat = data[i];
@ -192,6 +197,11 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
}
private _renderAdjustStat() {
const unit = getDisplayUnit(
this.hass,
this._params!.statistic.statistic_id,
this._params!.statistic
);
return html`
<div class="text-content">
<b>Statistic:</b> ${this._params!.statistic.statistic_id}
@ -220,9 +230,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
<ha-selector-number
label="New Value"
.hass=${this.hass}
.selector=${this._amountSelector(
this._params!.statistic.display_unit_of_measurement
)}
.selector=${this._amountSelector(unit || undefined)}
.value=${this._amount}
.disabled=${this._busy}
@value-changed=${(ev) => {
@ -299,6 +307,11 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
}
private async _fixIssue(): Promise<void> {
const unit = getDisplayUnit(
this.hass,
this._params!.statistic.statistic_id,
this._params!.statistic
);
this._busy = true;
try {
await adjustStatisticsSum(
@ -306,7 +319,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
this._params!.statistic.statistic_id,
this._chosenStat!.start,
this._amount! - this._origAmount!,
this._params!.statistic.display_unit_of_measurement
unit || null
);
} catch (err: any) {
this._busy = false;

7
src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
View File

@ -315,8 +315,11 @@ class HuiEnergyDistrubutionCard
${formatNumber(gasUsage || 0, this.hass.locale, {
maximumFractionDigits: 1,
})}
${getEnergyGasUnit(prefs, this._data.statsMetadata) ||
"m³"}
${getEnergyGasUnit(
this.hass,
prefs,
this._data.statsMetadata
) || "m³"}
</div>
<svg width="80" height="30">
<path d="M40 0 v30" id="gas" />

3
src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
View File

@ -274,7 +274,8 @@ export class HuiEnergyGasGraphCard
) as GasSourceTypeEnergyPreference[];
this._unit =
getEnergyGasUnit(energyData.prefs, energyData.statsMetadata) || "m³";
getEnergyGasUnit(this.hass, energyData.prefs, energyData.statsMetadata) ||
"m³";
const datasets: ChartDataset<"bar", ScatterDataPoint[]>[] = [];

3
src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
View File

@ -130,7 +130,8 @@ export class HuiEnergySourcesTableCard
);
const gasUnit =
getEnergyGasUnit(this._data.prefs, this._data.statsMetadata) || "";
getEnergyGasUnit(this.hass, this._data.prefs, this._data.statsMetadata) ||
"";
const compare = this._data.statsCompare !== undefined;

4
src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts
View File

@ -205,7 +205,7 @@ export class HuiStatisticsGraphCardEditor
...this._config,
stat_types: configured_stat_types,
};
const displayUnit = this._metaDatas?.[0]?.display_unit_of_measurement;
const unitClass = this._metaDatas?.[0]?.unit_class;
return html`
<ha-form
@ -223,7 +223,7 @@ export class HuiStatisticsGraphCardEditor
.pickedStatisticLabel=${this.hass!.localize(
"ui.panel.lovelace.editor.card.statistics-graph.picked_statistic"
)}
.includeDisplayUnitOfMeasurement=${displayUnit}
.includeUnitClass=${unitClass}
.ignoreRestrictionsOnFirstStatistic=${true}
.value=${this._configEntities}
.configValue=${"entities"}

296
src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts
View File

@ -1,13 +1,26 @@
import "@material/mwc-button";
import { ActionDetail } from "@material/mwc-list";
import { mdiCheck, mdiDotsVertical } from "@mdi/js";
import "@polymer/paper-tabs/paper-tab";
import "@polymer/paper-tabs/paper-tabs";
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
import {
css,
CSSResultGroup,
html,
LitElement,
PropertyValues,
TemplateResult,
} from "lit";
import { customElement, property, query, state } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
import { fireEvent, HASSDomEvent } from "../../../../common/dom/fire_event";
import { stopPropagation } from "../../../../common/dom/stop_propagation";
import { navigate } from "../../../../common/navigate";
import { deepEqual } from "../../../../common/util/deep-equal";
import "../../../../components/ha-alert";
import "../../../../components/ha-circular-progress";
import "../../../../components/ha-dialog";
import "../../../../components/ha-alert";
import { HaYamlEditor } from "../../../../components/ha-yaml-editor";
import type {
LovelaceBadgeConfig,
LovelaceCardConfig,
@ -20,6 +33,11 @@ import {
import { haStyleDialog } from "../../../../resources/styles";
import type { HomeAssistant } from "../../../../types";
import "../../components/hui-entity-editor";
import {
DEFAULT_VIEW_LAYOUT,
PANEL_VIEW_LAYOUT,
VIEWS_NO_BADGE_SUPPORT,
} from "../../views/const";
import { addView, deleteView, replaceView } from "../config-util";
import "../hui-badge-preview";
import { processEditorEntities } from "../process-editor-entities";
@ -31,12 +49,6 @@ import {
import "./hui-view-editor";
import "./hui-view-visibility-editor";
import { EditViewDialogParams } from "./show-edit-view-dialog";
import {
DEFAULT_VIEW_LAYOUT,
PANEL_VIEW_LAYOUT,
VIEWS_NO_BADGE_SUPPORT,
} from "../../views/const";
import { deepEqual } from "../../../../common/util/deep-equal";
@customElement("hui-dialog-edit-view")
export class HuiDialogEditView extends LitElement {
@ -56,6 +68,10 @@ export class HuiDialogEditView extends LitElement {
@state() private _dirty = false;
@state() private _yamlMode = false;
@query("ha-yaml-editor") private _editor?: HaYamlEditor;
private _curTabIndex = 0;
get _type(): string {
@ -67,6 +83,16 @@ export class HuiDialogEditView extends LitElement {
: this._config.type || DEFAULT_VIEW_LAYOUT;
}
protected updated(changedProperties: PropertyValues) {
if (this._yamlMode && changedProperties.has("_yamlMode")) {
const viewConfig = {
...this._config,
badges: this._badges,
};
this._editor?.setValue(viewConfig);
}
}
public showDialog(params: EditViewDialogParams): void {
this._params = params;
@ -89,6 +115,7 @@ export class HuiDialogEditView extends LitElement {
this._params = undefined;
this._config = {};
this._badges = [];
this._yamlMode = false;
this._dirty = false;
fireEvent(this, "dialog-closed", { dialog: this.localName });
}
@ -111,62 +138,74 @@ export class HuiDialogEditView extends LitElement {
}
let content;
switch (this._curTab) {
case "tab-settings":
content = html`
<hui-view-editor
.isNew=${this._params.viewIndex === undefined}
.hass=${this.hass}
.config=${this._config}
@view-config-changed=${this._viewConfigChanged}
></hui-view-editor>
`;
break;
case "tab-badges":
content = html`
${this._badges?.length
? html`
${VIEWS_NO_BADGE_SUPPORT.includes(this._type)
? html`
<ha-alert alert-type="warning">
${this.hass!.localize(
"ui.panel.lovelace.editor.edit_badges.view_no_badges"
)}
</ha-alert>
`
: ""}
<div class="preview-badges">
${this._badges.map(
(badgeConfig) => html`
<hui-badge-preview
.hass=${this.hass}
.config=${badgeConfig}
></hui-badge-preview>
`
)}
</div>
`
: ""}
<hui-entity-editor
.hass=${this.hass}
.entities=${this._badges}
@entities-changed=${this._badgesChanged}
></hui-entity-editor>
`;
break;
case "tab-visibility":
content = html`
<hui-view-visibility-editor
.hass=${this.hass}
.config=${this._config}
@view-visibility-changed=${this._viewVisibilityChanged}
></hui-view-visibility-editor>
`;
break;
case "tab-cards":
content = html` Cards `;
break;
if (this._yamlMode) {
content = html`
<ha-yaml-editor
.hass=${this.hass}
dialogInitialFocus
@value-changed=${this._viewYamlChanged}
></ha-yaml-editor>
`;
} else {
switch (this._curTab) {
case "tab-settings":
content = html`
<hui-view-editor
.isNew=${this._params.viewIndex === undefined}
.hass=${this.hass}
.config=${this._config}
@view-config-changed=${this._viewConfigChanged}
></hui-view-editor>
`;
break;
case "tab-badges":
content = html`
${this._badges?.length
? html`
${VIEWS_NO_BADGE_SUPPORT.includes(this._type)
? html`
<ha-alert alert-type="warning">
${this.hass!.localize(
"ui.panel.lovelace.editor.edit_badges.view_no_badges"
)}
</ha-alert>
`
: ""}
<div class="preview-badges">
${this._badges.map(
(badgeConfig) => html`
<hui-badge-preview
.hass=${this.hass}
.config=${badgeConfig}
></hui-badge-preview>
`
)}
</div>
`
: ""}
<hui-entity-editor
.hass=${this.hass}
.entities=${this._badges}
@entities-changed=${this._badgesChanged}
></hui-entity-editor>
`;
break;
case "tab-visibility":
content = html`
<hui-view-visibility-editor
.hass=${this.hass}
.config=${this._config}
@view-visibility-changed=${this._viewVisibilityChanged}
></hui-view-visibility-editor>
`;
break;
case "tab-cards":
content = html` Cards `;
break;
}
}
return html`
<ha-dialog
open
@ -174,31 +213,75 @@ export class HuiDialogEditView extends LitElement {
escapeKeyAction
@closed=${this.closeDialog}
.heading=${this._viewConfigTitle}
class=${classMap({
"yaml-mode": this._yamlMode,
})}
>
<div slot="heading">
<h2>${this._viewConfigTitle}</h2>
<paper-tabs
scrollable
hide-scroll-buttons
.selected=${this._curTabIndex}
@selected-item-changed=${this._handleTabSelected}
<ha-button-menu
slot="icons"
fixed
corner="BOTTOM_END"
menuCorner="END"
@action=${this._handleAction}
@closed=${stopPropagation}
>
<paper-tab id="tab-settings" dialogInitialFocus
>${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.tab_settings"
)}</paper-tab
>
<paper-tab id="tab-badges"
>${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.tab_badges"
)}</paper-tab
>
<paper-tab id="tab-visibility"
>${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.tab_visibility"
)}</paper-tab
>
</paper-tabs>
<ha-icon-button
slot="trigger"
.label=${this.hass!.localize("ui.common.menu")}
.path=${mdiDotsVertical}
></ha-icon-button>
<mwc-list-item graphic="icon">
${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.edit_ui"
)}
${!this._yamlMode
? html`<ha-svg-icon
class="selected_menu_item"
slot="graphic"
.path=${mdiCheck}
></ha-svg-icon>`
: ``}
</mwc-list-item>
<mwc-list-item graphic="icon">
${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.edit_yaml"
)}
${this._yamlMode
? html`<ha-svg-icon
class="selected_menu_item"
slot="graphic"
.path=${mdiCheck}
></ha-svg-icon>`
: ``}
</mwc-list-item>
</ha-button-menu>
${!this._yamlMode
? html`<paper-tabs
scrollable
hide-scroll-buttons
.selected=${this._curTabIndex}
@selected-item-changed=${this._handleTabSelected}
>
<paper-tab id="tab-settings" dialogInitialFocus
>${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.tab_settings"
)}</paper-tab
>
<paper-tab id="tab-badges"
>${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.tab_badges"
)}</paper-tab
>
<paper-tab id="tab-visibility"
>${this.hass!.localize(
"ui.panel.lovelace.editor.edit_view.tab_visibility"
)}</paper-tab
>
</paper-tabs>`
: ""}
</div>
${content}
${this._params.viewIndex !== undefined
@ -235,6 +318,19 @@ export class HuiDialogEditView extends LitElement {
`;
}
private async _handleAction(ev: CustomEvent<ActionDetail>) {
ev.stopPropagation();
ev.preventDefault();
switch (ev.detail.index) {
case 0:
this._yamlMode = false;
break;
case 1:
this._yamlMode = true;
break;
}
}
private async _delete(): Promise<void> {
if (!this._params) {
return;
@ -348,6 +444,17 @@ export class HuiDialogEditView extends LitElement {
this._dirty = true;
}
private _viewYamlChanged(ev: CustomEvent) {
ev.stopPropagation();
if (!ev.detail.isValid) {
return;
}
const { badges = [], ...config } = ev.detail.value;
this._config = config;
this._badges = badges;
this._dirty = true;
}
private _isConfigChanged(): boolean {
return (
this._creatingView ||
@ -366,6 +473,9 @@ export class HuiDialogEditView extends LitElement {
return [
haStyleDialog,
css`
ha-dialog.yaml-mode {
--dialog-content-padding: 0;
}
h2 {
display: block;
color: var(--primary-text-color);
@ -421,6 +531,22 @@ export class HuiDialogEditView extends LitElement {
ha-circular-progress[active] {
display: block;
}
ha-button-menu {
color: var(--secondary-text-color);
position: absolute;
right: 16px;
top: 14px;
inset-inline-end: 16px;
inset-inline-start: initial;
direction: var(--direction);
}
ha-button-menu,
ha-icon-button {
--mdc-theme-text-primary-on-background: var(--primary-text-color);
}
.selected_menu_item {
color: var(--primary-color);
}
.hidden {
display: none;
}

27
src/panels/lovelace/editor/view-editor/hui-view-editor.ts
View File

@ -33,7 +33,7 @@ export class HuiViewEditor extends LitElement {
private _suggestedPath = false;
private _schema = memoizeOne(
(localize: LocalizeFunc, subview: boolean, showAdvanced: boolean) =>
(localize: LocalizeFunc) =>
[
{ name: "title", selector: { text: {} } },
{
@ -69,14 +69,6 @@ export class HuiViewEditor extends LitElement {
boolean: {},
},
},
...(subview && showAdvanced
? [
{
name: "back_path",
selector: { navigation: {} },
},
]
: []),
] as const
);
@ -98,11 +90,7 @@ export class HuiViewEditor extends LitElement {
return html``;
}
const schema = this._schema(
this.hass.localize,
this._config.subview ?? false,
this.hass.userData?.showAdvanced ?? false
);
const schema = this._schema(this.hass.localize);
const data = {
theme: "Backend-selected",
@ -128,9 +116,6 @@ export class HuiViewEditor extends LitElement {
if (config.type === "masonry") {
delete config.type;
}
if (!config.subview) {
delete config.back_path;
}
if (
this.isNew &&
@ -155,10 +140,6 @@ export class HuiViewEditor extends LitElement {
return this.hass.localize("ui.panel.lovelace.editor.edit_view.type");
case "subview":
return this.hass.localize("ui.panel.lovelace.editor.edit_view.subview");
case "back_path":
return this.hass.localize(
"ui.panel.lovelace.editor.edit_view.back_path"
);
default:
return this.hass!.localize(
`ui.panel.lovelace.editor.card.generic.${schema.name}`
@ -174,10 +155,6 @@ export class HuiViewEditor extends LitElement {
return this.hass.localize(
"ui.panel.lovelace.editor.edit_view.subview_helper"
);
case "back_path":
return this.hass.localize(
"ui.panel.lovelace.editor.edit_view.back_path_helper"
);
default:
return undefined;
}

14
src/translations/en.json
View File

@ -1855,8 +1855,8 @@
"show_info": "Information",
"default_name": "New Automation",
"missing_name": "Cannot save automation without a name",
"traces_not_available": "Automations need an ID for history to be tracked. Add an ID to your automation to make it available in traces.",
"load_error_not_editable": "Only automations in automations.yaml are editable.",
"load_error_not_duplicable": "Only automations in automations.yaml can be duplicated.",
"load_error_not_deletable": "Only automations in automations.yaml can be deleted.",
"load_error_unknown": "Error loading automation ({err_no}).",
"save": "Save",
@ -2341,7 +2341,6 @@
"parallel": "Max number of parallel runs"
},
"load_error_not_editable": "Only scripts inside scripts.yaml are editable.",
"load_error_not_duplicable": "Only scripts in scripts.yaml can be duplicated.",
"load_error_not_deletable": "Only scripts in scripts.yaml can be deleted.",
"load_error_unknown": "Error loading script ({err_no}).",
"delete_confirm_title": "Delete script?",
@ -2610,6 +2609,7 @@
},
"devices": {
"add_prompt": "No {name} have been added using this {type} yet. You can add one by clicking the + button above.",
"add_device": "Add Device",
"caption": "Devices",
"description": "Manage configured devices",
"device_info": "{type} info",
@ -2985,8 +2985,6 @@
"error": "Error",
"could_not_load": "Config flow could not be loaded",
"not_loaded": "The integration could not be loaded, try to restart Home Assistant.",
"missing_credentials_title": "Add application credentials?",
"missing_credentials": "Setting up {integration} requires configuring application credentials. Do you want to do that now?",
"supported_brand_flow": "Support for {supported_brand} devices is provided by {flow_domain_name}. Do you want to continue?",
"missing_zwave_zigbee": "To add a {integration} device, you first need {supported_hardware_link} and the {integration} integration set up. If you already have the hardware then you can proceed with the setup of {integration}.",
"supported_hardware": "supported hardware",
@ -3059,7 +3057,9 @@
"editor": {
"caption": "Add Credential",
"description": "OAuth is used to grant Home Assistant access to information on other websites without giving a passwords. This mechanism is used by companies such as Spotify, Google, Withings, Microsoft, and Twitter.",
"view_documentation": "View documentation",
"missing_credentials": "Setting up {integration} requires configuring application credentials.",
"missing_credentials_domain_link": "View {integration} documentation",
"view_documentation": "View application credentials documentation",
"add": "Add",
"domain": "Integration",
"name": "Name",
@ -3804,8 +3804,8 @@
},
"subview": "Subview",
"subview_helper": "Subviews don't appear in tabs and have a back button.",
"back_path": "Back path (optional)",
"back_path_helper": "Only for subviews. If empty, clicking on back button will go to the previous page."
"edit_ui": "Edit in visual editor",
"edit_yaml": "Edit in YAML"
},
"edit_badges": {
"view_no_badges": "Badges are not be supported by the current view type."

9
src/util/brands-url.ts
View File

@ -3,6 +3,7 @@ export interface BrandsOptions {
type: "icon" | "logo" | "icon@2x" | "logo@2x";
useFallback?: boolean;
darkOptimized?: boolean;
brand?: boolean;
}
export interface HardwareBrandsOptions {
@ -13,9 +14,11 @@ export interface HardwareBrandsOptions {
}
export const brandsUrl = (options: BrandsOptions): string =>
`https://brands.home-assistant.io/${options.useFallback ? "_/" : ""}${
options.domain
}/${options.darkOptimized ? "dark_" : ""}${options.type}.png`;
`https://brands.home-assistant.io/${options.brand ? "brands/" : ""}${
options.useFallback ? "_/" : ""
}${options.domain}/${options.darkOptimized ? "dark_" : ""}${
options.type
}.png`;
export const hardwareBrandsUrl = (options: HardwareBrandsOptions): string =>
`https://brands.home-assistant.io/hardware/${options.category}/${