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

Use name from metadata in statistics card (#13451)

Browse Source 
* Use name from metadata in statistics card

* Refactor to use getStatisticLabel
This commit is contained in:
Erik Montnemery 2022-08-25 13:47:16 +02:00 committed by GitHub
parent 80e7993923
commit d64c81a123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,13 +15,13 @@ import {
import { customElement, property, state } from "lit/decorators"; import { customElement, property, state } from "lit/decorators";
import { getGraphColorByIndex } from "../../common/color/colors"; import { getGraphColorByIndex } from "../../common/color/colors";
import { isComponentLoaded } from "../../common/config/is_component_loaded"; import { isComponentLoaded } from "../../common/config/is_component_loaded";
import { computeStateName } from "../../common/entity/compute_state_name";
import { import {
formatNumber, formatNumber,
numberFormatToLocale, numberFormatToLocale,
} from "../../common/number/format_number"; } from "../../common/number/format_number";
import { import {
getStatisticIds, getStatisticIds,
getStatisticLabel,
Statistics, Statistics,
statisticsHaveType, statisticsHaveType,
StatisticsMetaData, StatisticsMetaData,
@ -233,19 +233,17 @@ class StatisticsChart extends LitElement {
const names = this.names || {}; const names = this.names || {};
statisticsData.forEach((stats) => { statisticsData.forEach((stats) => {
const firstStat = stats[0]; const firstStat = stats[0];
let name = names[firstStat.statistic_id];
if (!name) {
const entityState = this.hass.states[firstStat.statistic_id];
if (entityState) {
name = computeStateName(entityState);
} else {
name = firstStat.statistic_id;
}
}
const meta = this.statisticIds!.find( const meta = this.statisticIds!.find(
(stat) => stat.statistic_id === firstStat.statistic_id (stat) => stat.statistic_id === firstStat.statistic_id
); );
let name = names[firstStat.statistic_id];
if (!name) {
const tmp: Record<string, StatisticsMetaData> = {};
if (meta) {
tmp[firstStat.statistic_id] = meta;
}
name = getStatisticLabel(this.hass, firstStat.statistic_id, tmp);
}
if (!this.unit) { if (!this.unit) {
if (unit === undefined) { if (unit === undefined) {