mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-23 01:06:35 +00:00
Align with backend statistics WS API changes (#13913)
Align with backend statists WS API changes
This commit is contained in:
parent
6d230ebd65
commit
f8a7737eb9
@ -258,8 +258,8 @@ class StatisticsChart extends LitElement {
|
|||||||
|
|
||||||
if (!this.unit) {
|
if (!this.unit) {
|
||||||
if (unit === undefined) {
|
if (unit === undefined) {
|
||||||
unit = meta?.display_unit_of_measurement;
|
unit = meta?.state_unit_of_measurement;
|
||||||
} else if (unit !== meta?.display_unit_of_measurement) {
|
} else if (unit !== meta?.state_unit_of_measurement) {
|
||||||
unit = null;
|
unit = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ export class HaStatisticPicker extends LitElement {
|
|||||||
if (includeDisplayUnitOfMeasurement) {
|
if (includeDisplayUnitOfMeasurement) {
|
||||||
const includeUnits = ensureArray(includeDisplayUnitOfMeasurement);
|
const includeUnits = ensureArray(includeDisplayUnitOfMeasurement);
|
||||||
statisticIds = statisticIds.filter((meta) =>
|
statisticIds = statisticIds.filter((meta) =>
|
||||||
includeUnits.includes(meta.display_unit_of_measurement)
|
includeUnits.includes(meta.state_unit_of_measurement)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -642,8 +642,8 @@ export const getEnergyGasUnit = (
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
|
const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
|
||||||
if (statisticIdWithMeta?.display_unit_of_measurement) {
|
if (statisticIdWithMeta?.state_unit_of_measurement) {
|
||||||
return statisticIdWithMeta.display_unit_of_measurement;
|
return statisticIdWithMeta.state_unit_of_measurement;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return undefined;
|
return undefined;
|
||||||
|
@ -20,7 +20,7 @@ export interface StatisticValue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface StatisticsMetaData {
|
export interface StatisticsMetaData {
|
||||||
display_unit_of_measurement: string;
|
state_unit_of_measurement: string;
|
||||||
statistics_unit_of_measurement: string;
|
statistics_unit_of_measurement: string;
|
||||||
statistic_id: string;
|
statistic_id: string;
|
||||||
source: string;
|
source: string;
|
||||||
@ -254,14 +254,14 @@ export const adjustStatisticsSum = (
|
|||||||
statistic_id: string,
|
statistic_id: string,
|
||||||
start_time: string,
|
start_time: string,
|
||||||
adjustment: number,
|
adjustment: number,
|
||||||
display_unit: string
|
adjustment_unit_of_measurement: string
|
||||||
): Promise<void> =>
|
): Promise<void> =>
|
||||||
hass.callWS({
|
hass.callWS({
|
||||||
type: "recorder/adjust_sum_statistics",
|
type: "recorder/adjust_sum_statistics",
|
||||||
statistic_id,
|
statistic_id,
|
||||||
start_time,
|
start_time,
|
||||||
adjustment,
|
adjustment,
|
||||||
display_unit,
|
adjustment_unit_of_measurement,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const getStatisticLabel = (
|
export const getStatisticLabel = (
|
||||||
|
@ -49,7 +49,7 @@ export class DialogEnergyGasSettings
|
|||||||
this._source = params.source
|
this._source = params.source
|
||||||
? { ...params.source }
|
? { ...params.source }
|
||||||
: emptyGasEnergyPreference();
|
: emptyGasEnergyPreference();
|
||||||
this._pickedDisplayUnit = params.metadata?.display_unit_of_measurement;
|
this._pickedDisplayUnit = params.metadata?.state_unit_of_measurement;
|
||||||
this._costs = this._source.entity_energy_price
|
this._costs = this._source.entity_energy_price
|
||||||
? "entity"
|
? "entity"
|
||||||
: this._source.number_energy_price
|
: this._source.number_energy_price
|
||||||
@ -269,7 +269,7 @@ export class DialogEnergyGasSettings
|
|||||||
} else {
|
} else {
|
||||||
this._pickedDisplayUnit = (
|
this._pickedDisplayUnit = (
|
||||||
await getStatisticMetadata(this.hass, [ev.detail.value])
|
await getStatisticMetadata(this.hass, [ev.detail.value])
|
||||||
)[0]?.display_unit_of_measurement;
|
)[0]?.state_unit_of_measurement;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this._pickedDisplayUnit = undefined;
|
this._pickedDisplayUnit = undefined;
|
||||||
|
@ -74,7 +74,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
|
|||||||
hidden: this.narrow,
|
hidden: this.narrow,
|
||||||
width: "20%",
|
width: "20%",
|
||||||
},
|
},
|
||||||
display_unit_of_measurement: {
|
state_unit_of_measurement: {
|
||||||
title: "Display unit",
|
title: "Display unit",
|
||||||
sortable: true,
|
sortable: true,
|
||||||
filterable: true,
|
filterable: true,
|
||||||
@ -220,7 +220,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
|
|||||||
this._data.push({
|
this._data.push({
|
||||||
statistic_id: statisticId,
|
statistic_id: statisticId,
|
||||||
statistics_unit_of_measurement: "",
|
statistics_unit_of_measurement: "",
|
||||||
display_unit_of_measurement: "",
|
state_unit_of_measurement: "",
|
||||||
source: "",
|
source: "",
|
||||||
state: this.hass.states[statisticId],
|
state: this.hass.states[statisticId],
|
||||||
issues: issues[statisticId],
|
issues: issues[statisticId],
|
||||||
|
@ -135,7 +135,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
|
|||||||
} else {
|
} else {
|
||||||
const data =
|
const data =
|
||||||
this._stats5min.length >= 2 ? this._stats5min : this._statsHour;
|
this._stats5min.length >= 2 ? this._stats5min : this._statsHour;
|
||||||
const unit = this._params!.statistic.display_unit_of_measurement;
|
const unit = this._params!.statistic.state_unit_of_measurement;
|
||||||
const rows: TemplateResult[] = [];
|
const rows: TemplateResult[] = [];
|
||||||
for (let i = 1; i < data.length; i++) {
|
for (let i = 1; i < data.length; i++) {
|
||||||
const stat = data[i];
|
const stat = data[i];
|
||||||
@ -221,7 +221,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
|
|||||||
label="New Value"
|
label="New Value"
|
||||||
.hass=${this.hass}
|
.hass=${this.hass}
|
||||||
.selector=${this._amountSelector(
|
.selector=${this._amountSelector(
|
||||||
this._params!.statistic.display_unit_of_measurement
|
this._params!.statistic.state_unit_of_measurement
|
||||||
)}
|
)}
|
||||||
.value=${this._amount}
|
.value=${this._amount}
|
||||||
.disabled=${this._busy}
|
.disabled=${this._busy}
|
||||||
@ -306,7 +306,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
|
|||||||
this._params!.statistic.statistic_id,
|
this._params!.statistic.statistic_id,
|
||||||
this._chosenStat!.start,
|
this._chosenStat!.start,
|
||||||
this._amount! - this._origAmount!,
|
this._amount! - this._origAmount!,
|
||||||
this._params!.statistic.display_unit_of_measurement
|
this._params!.statistic.state_unit_of_measurement
|
||||||
);
|
);
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
this._busy = false;
|
this._busy = false;
|
||||||
|
@ -205,7 +205,7 @@ export class HuiStatisticsGraphCardEditor
|
|||||||
...this._config,
|
...this._config,
|
||||||
stat_types: configured_stat_types,
|
stat_types: configured_stat_types,
|
||||||
};
|
};
|
||||||
const displayUnit = this._metaDatas?.[0]?.display_unit_of_measurement;
|
const displayUnit = this._metaDatas?.[0]?.state_unit_of_measurement;
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<ha-form
|
<ha-form
|
||||||
|
Loading…
x
Reference in New Issue
Block a user