From 8c69c772d1d6589e4ee85ac3d58bd1477aac78d7 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Thu, 8 Dec 2022 13:20:01 +0100 Subject: [PATCH] Fix statistics graph card (#14631) --- src/components/chart/statistics-chart.ts | 14 +++++++++++++- .../lovelace/cards/hui-statistics-graph-card.ts | 2 +- .../hui-statistics-graph-card-editor.ts | 6 +++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/chart/statistics-chart.ts b/src/components/chart/statistics-chart.ts index a82ed0d7c7..90d3ead65a 100644 --- a/src/components/chart/statistics-chart.ts +++ b/src/components/chart/statistics-chart.ts @@ -34,7 +34,10 @@ import "./ha-chart-base"; export type ExtendedStatisticType = StatisticType | "change"; -export const statTypeMap: Record = { +export const supportedStatTypeMap: Record< + ExtendedStatisticType, + StatisticType +> = { mean: "mean", min: "min", max: "max", @@ -43,6 +46,15 @@ export const statTypeMap: Record = { change: "sum", }; +export const statTypeMap: Record = { + mean: "mean", + min: "min", + max: "max", + sum: "sum", + state: "state", + change: "sum", +}; + @customElement("statistics-chart") class StatisticsChart extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; diff --git a/src/panels/lovelace/cards/hui-statistics-graph-card.ts b/src/panels/lovelace/cards/hui-statistics-graph-card.ts index 94caa11c5d..94550d6921 100644 --- a/src/panels/lovelace/cards/hui-statistics-graph-card.ts +++ b/src/panels/lovelace/cards/hui-statistics-graph-card.ts @@ -154,7 +154,7 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard { if ( changedProps.has("_config") && - (oldConfig?.entities !== this._config.entities || + (oldConfig?.stat_types !== this._config.stat_types || oldConfig?.days_to_show !== this._config.days_to_show || oldConfig?.period !== this._config.period || oldConfig?.unit !== this._config.unit) diff --git a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts index a491318179..6b0c025ea9 100644 --- a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts @@ -26,6 +26,7 @@ import { deepEqual } from "../../../../common/util/deep-equal"; import { ExtendedStatisticType, statTypeMap, + supportedStatTypeMap, } from "../../../../components/chart/statistics-chart"; import "../../../../components/entity/ha-statistics-picker"; import "../../../../components/ha-form/ha-form"; @@ -185,7 +186,10 @@ export class HuiStatisticsGraphCardEditor disabled: !metaDatas || !metaDatas.every((metaData) => - statisticsMetaHasType(metaData, statTypeMap[stat_type]) + statisticsMetaHasType( + metaData, + supportedStatTypeMap[stat_type] + ) ), })), },