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

Align with backend statistics WS API changes (#13913)

Browse Source 
Align with backend statists WS API changes
This commit is contained in:
Erik Montnemery 2022-09-30 08:38:56 +02:00 committed by GitHub
parent 6d230ebd65
commit f8a7737eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,8 +258,8 @@ 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 = meta?.state_unit_of_measurement;
} else if (unit !== meta?.state_unit_of_measurement) {
unit = null;
}
}

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

@ -121,7 +121,7 @@ export class HaStatisticPicker extends LitElement {
if (includeDisplayUnitOfMeasurement) {
const includeUnits = ensureArray(includeDisplayUnitOfMeasurement);
statisticIds = statisticIds.filter((meta) =>
includeUnits.includes(meta.display_unit_of_measurement)
includeUnits.includes(meta.state_unit_of_measurement)
);
}

4
src/data/energy.ts
View File

@ -642,8 +642,8 @@ export const getEnergyGasUnit = (
continue;
}
const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
if (statisticIdWithMeta?.display_unit_of_measurement) {
return statisticIdWithMeta.display_unit_of_measurement;
if (statisticIdWithMeta?.state_unit_of_measurement) {
return statisticIdWithMeta.state_unit_of_measurement;
}
}
return undefined;

6
src/data/recorder.ts
View File

@ -20,7 +20,7 @@ export interface StatisticValue {
}
export interface StatisticsMetaData {
display_unit_of_measurement: string;
state_unit_of_measurement: string;
statistics_unit_of_measurement: string;
statistic_id: string;
source: string;
@ -254,14 +254,14 @@ export const adjustStatisticsSum = (
statistic_id: string,
start_time: string,
adjustment: number,
display_unit: string
adjustment_unit_of_measurement: string
): Promise<void> =>
hass.callWS({
type: "recorder/adjust_sum_statistics",
statistic_id,
start_time,
adjustment,
display_unit,
adjustment_unit_of_measurement,
});
export const getStatisticLabel = (

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

@ -49,7 +49,7 @@ export class DialogEnergyGasSettings
this._source = params.source
? { ...params.source }
: emptyGasEnergyPreference();
this._pickedDisplayUnit = params.metadata?.display_unit_of_measurement;
this._pickedDisplayUnit = params.metadata?.state_unit_of_measurement;
this._costs = this._source.entity_energy_price
? "entity"
: this._source.number_energy_price
@ -269,7 +269,7 @@ export class DialogEnergyGasSettings
} else {
this._pickedDisplayUnit = (
await getStatisticMetadata(this.hass, [ev.detail.value])
)[0]?.display_unit_of_measurement;
)[0]?.state_unit_of_measurement;
}
} else {
this._pickedDisplayUnit = undefined;

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

@ -74,7 +74,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
hidden: this.narrow,
width: "20%",
},
display_unit_of_measurement: {
state_unit_of_measurement: {
title: "Display unit",
sortable: true,
filterable: true,
@ -220,7 +220,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
this._data.push({
statistic_id: statisticId,
statistics_unit_of_measurement: "",
display_unit_of_measurement: "",
state_unit_of_measurement: "",
source: "",
state: this.hass.states[statisticId],
issues: issues[statisticId],

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

@ -135,7 +135,7 @@ 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 = this._params!.statistic.state_unit_of_measurement;
const rows: TemplateResult[] = [];
for (let i = 1; i < data.length; i++) {
const stat = data[i];
@ -221,7 +221,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
label="New Value"
.hass=${this.hass}
.selector=${this._amountSelector(
this._params!.statistic.display_unit_of_measurement
this._params!.statistic.state_unit_of_measurement
)}
.value=${this._amount}
.disabled=${this._busy}
@ -306,7 +306,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
this._params!.statistic.state_unit_of_measurement
);
} catch (err: any) {
this._busy = false;

2
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 displayUnit = this._metaDatas?.[0]?.state_unit_of_measurement;
return html`
<ha-form