From 5d1536030a16d1c0cd80cac3b8e18c38169488c9 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Thu, 25 Aug 2022 14:53:16 +0200 Subject: [PATCH] Refactor getStatisticLabel (#13486) --- src/components/chart/statistics-chart.ts | 6 +----- src/data/history.ts | 5 ++--- .../energy/components/ha-energy-battery-settings.ts | 4 ++-- .../energy/components/ha-energy-device-settings.ts | 2 +- .../energy/components/ha-energy-gas-settings.ts | 2 +- .../energy/components/ha-energy-grid-settings.ts | 4 ++-- .../energy/components/ha-energy-solar-settings.ts | 2 +- .../cards/energy/hui-energy-devices-graph-card.ts | 4 ++-- .../cards/energy/hui-energy-gas-graph-card.ts | 2 +- .../cards/energy/hui-energy-solar-graph-card.ts | 4 ++-- .../cards/energy/hui-energy-sources-table-card.ts | 12 ++++++------ .../cards/energy/hui-energy-usage-graph-card.ts | 6 +++++- 12 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/components/chart/statistics-chart.ts b/src/components/chart/statistics-chart.ts index 7107c2f2c3..da1dac1c1d 100644 --- a/src/components/chart/statistics-chart.ts +++ b/src/components/chart/statistics-chart.ts @@ -238,11 +238,7 @@ class StatisticsChart extends LitElement { ); let name = names[firstStat.statistic_id]; if (!name) { - const tmp: Record = {}; - if (meta) { - tmp[firstStat.statistic_id] = meta; - } - name = getStatisticLabel(this.hass, firstStat.statistic_id, tmp); + name = getStatisticLabel(this.hass, firstStat.statistic_id, meta); } if (!this.unit) { diff --git a/src/data/history.ts b/src/data/history.ts index 813b7e6cc9..de7f7ccbcd 100644 --- a/src/data/history.ts +++ b/src/data/history.ts @@ -569,12 +569,11 @@ export const adjustStatisticsSum = ( export const getStatisticLabel = ( hass: HomeAssistant, statisticsId: string, - statisticsMetaData: Record | undefined + statisticsMetaData: StatisticsMetaData | undefined ): string => { const entity = hass.states[statisticsId]; if (entity) { return computeStateName(entity); } - const statisticMetaData = statisticsMetaData?.[statisticsId]; - return statisticMetaData?.name || statisticsId; + return statisticsMetaData?.name || statisticsId; }; diff --git a/src/panels/config/energy/components/ha-energy-battery-settings.ts b/src/panels/config/energy/components/ha-energy-battery-settings.ts index e674658b43..376ace7323 100644 --- a/src/panels/config/energy/components/ha-energy-battery-settings.ts +++ b/src/panels/config/energy/components/ha-energy-battery-settings.ts @@ -104,14 +104,14 @@ export class EnergyBatterySettings extends LitElement { >${getStatisticLabel( this.hass, source.stat_energy_from, - this.statsMetadata + this.statsMetadata[source.stat_energy_from] )} ${getStatisticLabel( this.hass, source.stat_energy_to, - this.statsMetadata + this.statsMetadata[source.stat_energy_to] )} diff --git a/src/panels/config/energy/components/ha-energy-device-settings.ts b/src/panels/config/energy/components/ha-energy-device-settings.ts index 71600031e8..bac990fbc8 100644 --- a/src/panels/config/energy/components/ha-energy-device-settings.ts +++ b/src/panels/config/energy/components/ha-energy-device-settings.ts @@ -90,7 +90,7 @@ export class EnergyDeviceSettings extends LitElement { >${getStatisticLabel( this.hass, device.stat_consumption, - this.statsMetadata + this.statsMetadata[device.stat_consumption] )} ${getStatisticLabel( this.hass, source.stat_energy_from, - this.statsMetadata + this.statsMetadata[source.stat_energy_from] )} ${getStatisticLabel( this.hass, flow.stat_energy_from, - this.statsMetadata + this.statsMetadata[flow.stat_energy_from] )} ${getStatisticLabel( this.hass, flow.stat_energy_to, - this.statsMetadata + this.statsMetadata[flow.stat_energy_to] )} ${getStatisticLabel( this.hass, source.stat_energy_from, - this.statsMetadata + this.statsMetadata[source.stat_energy_from] )} ${this.info diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts index 8fad8ee7f5..a1419466c5 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts @@ -116,7 +116,7 @@ export class HuiEnergyDevicesGraphCard return getStatisticLabel( this.hass, statisticId as any, - this._data?.statsMetadata + this._data?.statsMetadata[statisticId] ); }, }, @@ -138,7 +138,7 @@ export class HuiEnergyDevicesGraphCard return getStatisticLabel( this.hass, statisticId, - this._data?.statsMetadata + this._data?.statsMetadata[statisticId] ); }, label: (context) => diff --git a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts index 1d4b87943e..3803a69a23 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts @@ -382,7 +382,7 @@ export class HuiEnergyGasGraphCard label: getStatisticLabel( this.hass, source.stat_energy_from, - statisticsMetaData + statisticsMetaData[source.stat_energy_from] ), borderColor: compare ? borderColor + "7F" : borderColor, backgroundColor: compare ? borderColor + "32" : borderColor + "7F", diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts index e184dbce06..5b29e94c53 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts @@ -405,7 +405,7 @@ export class HuiEnergySolarGraphCard name: getStatisticLabel( this.hass, source.stat_energy_from, - statisticsMetaData + statisticsMetaData[source.stat_energy_from] ), } ), @@ -483,7 +483,7 @@ export class HuiEnergySolarGraphCard name: getStatisticLabel( this.hass, source.stat_energy_from, - statisticsMetaData + statisticsMetaData[source.stat_energy_from] ), } ), diff --git a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts index a30e7ae5aa..6116c25e4c 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts @@ -239,7 +239,7 @@ export class HuiEnergySourcesTableCard ${getStatisticLabel( this.hass, source.stat_energy_from, - this._data?.statsMetadata + this._data?.statsMetadata[source.stat_energy_from] )} ${compare @@ -347,7 +347,7 @@ export class HuiEnergySourcesTableCard ${getStatisticLabel( this.hass, source.stat_energy_from, - this._data?.statsMetadata + this._data?.statsMetadata[source.stat_energy_from] )} ${compare @@ -384,7 +384,7 @@ export class HuiEnergySourcesTableCard ${getStatisticLabel( this.hass, source.stat_energy_to, - this._data?.statsMetadata + this._data?.statsMetadata[source.stat_energy_to] )} ${compare @@ -505,7 +505,7 @@ export class HuiEnergySourcesTableCard ${getStatisticLabel( this.hass, flow.stat_energy_from, - this._data?.statsMetadata + this._data?.statsMetadata[flow.stat_energy_from] )} ${compare @@ -610,7 +610,7 @@ export class HuiEnergySourcesTableCard ${getStatisticLabel( this.hass, flow.stat_energy_to, - this._data?.statsMetadata + this._data?.statsMetadata[flow.stat_energy_to] )} ${compare @@ -763,7 +763,7 @@ export class HuiEnergySourcesTableCard ${getStatisticLabel( this.hass, source.stat_energy_from, - this._data?.statsMetadata + this._data?.statsMetadata[source.stat_energy_from] )} ${compare diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts index f761ed0a88..1e315bcc37 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts @@ -620,7 +620,11 @@ export class HuiEnergyUsageGraphCard label: type in labels ? labels[type] - : getStatisticLabel(this.hass, statId, statisticsMetaData), + : getStatisticLabel( + this.hass, + statId, + statisticsMetaData[statId] + ), order: type === "used_solar" ? 1