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

Bring back energy usage graph order (#24156)

Browse Source
This commit is contained in:
Petar Petrov 2025-02-10 16:53:36 +02:00 committed by GitHub
parent a26bf80b13
commit 3d5c65d652
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
View File

@ -300,6 +300,8 @@ export class HuiEnergyUsageGraphCard
type: "bar",
stack: "usage",
data: [],
// @ts-expect-error
order: 0,
});
}
@ -315,6 +317,8 @@ export class HuiEnergyUsageGraphCard
)
);
// @ts-expect-error
datasets.sort((a, b) => a.order - b.order);
fillDataGapsAndRoundCaps(datasets);
this._chartData = datasets;
}
@ -482,7 +486,7 @@ export class HuiEnergyUsageGraphCard
this._compareStart!
);
Object.entries(combinedData).forEach(([type, sources]) => {
Object.entries(combinedData).forEach(([type, sources], idx) => {
Object.entries(sources).forEach(([statId, source]) => {
const points: BarSeriesOption["data"] = [];
// Process chart data.
@ -513,6 +517,13 @@ export class HuiEnergyUsageGraphCard
statId,
statisticsMetaData[statId]
),
// @ts-expect-error
order:
type === "used_solar"
? 1
: type === "to_battery"
? Object.keys(combinedData).length
: idx + 2,
barMaxWidth: 50,
itemStyle: {
borderColor: getEnergyColor(