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

Make it include instead of exclude

Browse Source
This commit is contained in:
Bram Kragten 2022-11-02 18:42:11 +01:00
parent 3590ad0672
commit bac53bf288
No known key found for this signature in database
GPG Key ID: FBE2DFDB363EF55B
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/data/energy.ts
View File

@ -273,22 +273,22 @@ export interface EnergyData {
export const getReferencedStatisticIds = ( export const getReferencedStatisticIds = (
prefs: EnergyPreferences, prefs: EnergyPreferences,
info: EnergyInfo, info: EnergyInfo,
excludeEnergyStatTypes?: string[] includeTypes?: string[]
): string[] => { ): string[] => {
const statIDs: string[] = []; const statIDs: string[] = [];
for (const source of prefs.energy_sources) { for (const source of prefs.energy_sources) {
if (includeTypes && !includeTypes.includes(source.type)) {
continue;
}
if (source.type === "solar") { if (source.type === "solar") {
if (!excludeEnergyStatTypes?.includes(source.type)) { statIDs.push(source.stat_energy_from);
statIDs.push(source.stat_energy_from);
}
continue; continue;
} }
if (source.type === "gas" || source.type === "water") { if (source.type === "gas" || source.type === "water") {
if (!excludeEnergyStatTypes?.includes(source.type)) { statIDs.push(source.stat_energy_from);
statIDs.push(source.stat_energy_from);
}
if (source.stat_cost) { if (source.stat_cost) {
statIDs.push(source.stat_cost); statIDs.push(source.stat_cost);
@ -301,18 +301,14 @@ export const getReferencedStatisticIds = (
} }
if (source.type === "battery") { if (source.type === "battery") {
if (!excludeEnergyStatTypes?.includes(source.type)) { statIDs.push(source.stat_energy_from);
statIDs.push(source.stat_energy_from); statIDs.push(source.stat_energy_to);
statIDs.push(source.stat_energy_to);
}
continue; continue;
} }
// grid source // grid source
for (const flowFrom of source.flow_from) { for (const flowFrom of source.flow_from) {
if (!excludeEnergyStatTypes?.includes(source.type)) { statIDs.push(flowFrom.stat_energy_from);
statIDs.push(flowFrom.stat_energy_from);
}
if (flowFrom.stat_cost) { if (flowFrom.stat_cost) {
statIDs.push(flowFrom.stat_cost); statIDs.push(flowFrom.stat_cost);
} }
@ -322,9 +318,7 @@ export const getReferencedStatisticIds = (
} }
} }
for (const flowTo of source.flow_to) { for (const flowTo of source.flow_to) {
if (!excludeEnergyStatTypes?.includes(source.type)) { statIDs.push(flowTo.stat_energy_to);
statIDs.push(flowTo.stat_energy_to);
}
if (flowTo.stat_compensation) { if (flowTo.stat_compensation) {
statIDs.push(flowTo.stat_compensation); statIDs.push(flowTo.stat_compensation);
} }
@ -374,7 +368,6 @@ const getEnergyData = async (
} }
} }
const waterStatIds: string[] = [];
const consumptionStatIDs: string[] = []; const consumptionStatIDs: string[] = [];
for (const source of prefs.energy_sources) { for (const source of prefs.energy_sources) {
// grid source // grid source
@ -383,11 +376,14 @@ const getEnergyData = async (
consumptionStatIDs.push(flowFrom.stat_energy_from); consumptionStatIDs.push(flowFrom.stat_energy_from);
} }
} }
if (source.type === "water") {
waterStatIds.push(source.stat_energy_from);
}
} }
const energyStatIds = getReferencedStatisticIds(prefs, info, ["water"]); const energyStatIds = getReferencedStatisticIds(prefs, info, [
"grid",
"solar",
"battery",
"gas",
]);
const waterStatIds = getReferencedStatisticIds(prefs, info, ["water"]);
const allStatIDs = [...energyStatIds, ...waterStatIds]; const allStatIDs = [...energyStatIds, ...waterStatIds];