github
/
ha-frontend
mirror of https://github.com/home-assistant/frontend
1
Fork 0
Code Releases Activity

Combine energy and water api calls to reduce overhead

This commit is contained in:
J. Nick Koston 2023-02-11 18:19:58 -06:00
parent a325d32d09
commit 9df1acb7d0
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/data/energy.ts
View File

@ -405,30 +405,18 @@ const getEnergyData = async (
volume: lengthUnit === "km" ? "L" : "gal",
};
const stats = {
...(energyStatIds.length
const stats =
energyStatIds.length || waterStatIds.length
? await fetchStatistics(
hass!,
startMinHour,
end,
energyStatIds,
[...energyStatIds, ...waterStatIds],
period,
energyUnits,
{ ...energyUnits, ...waterUnits },
["sum"]
)
: {}),
...(waterStatIds.length
? await fetchStatistics(
hass!,
startMinHour,
end,
waterStatIds,
period,
waterUnits,
["sum"]
)
: {}),
};
: {};
let statsCompare;
let startCompare;
@ -444,32 +432,19 @@ const getEnergyData = async (
const compareStartMinHour = addHours(startCompare, -1);
endCompare = addMilliseconds(start, -1);
statsCompare = {
...(energyStatIds.length
statsCompare =
energyStatIds.length || waterStatIds.length
? await fetchStatistics(
hass!,
compareStartMinHour,
endCompare,
energyStatIds,
[...energyStatIds, ...waterStatIds],
period,
energyUnits,
{ ...energyUnits, ...waterUnits },
["sum"]
)
: {}),
...(waterStatIds.length
? await fetchStatistics(
hass!,
compareStartMinHour,
endCompare,
waterStatIds,
period,
waterUnits,
["sum"]
)
: {}),
};
: {};
}
let fossilEnergyConsumption: FossilEnergyConsumption | undefined;
let fossilEnergyConsumptionCompare: FossilEnergyConsumption | undefined;