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

Simplify energy settings (#13846)

Browse Source
This commit is contained in:
Erik Montnemery 2022-09-23 09:03:17 +02:00 committed by GitHub
parent 5422fda990
commit 6252955bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demo/src/stubs/energy.ts
View File

@ -11,14 +11,12 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
{ {
stat_energy_from: "sensor.energy_consumption_tarif_1", stat_energy_from: "sensor.energy_consumption_tarif_1",
stat_cost: "sensor.energy_consumption_tarif_1_cost", stat_cost: "sensor.energy_consumption_tarif_1_cost",
entity_energy_from: "sensor.energy_consumption_tarif_1",
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}, },
{ {
stat_energy_from: "sensor.energy_consumption_tarif_2", stat_energy_from: "sensor.energy_consumption_tarif_2",
stat_cost: "sensor.energy_consumption_tarif_2_cost", stat_cost: "sensor.energy_consumption_tarif_2_cost",
entity_energy_from: "sensor.energy_consumption_tarif_2",
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}, },
@ -27,14 +25,12 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
{ {
stat_energy_to: "sensor.energy_production_tarif_1", stat_energy_to: "sensor.energy_production_tarif_1",
stat_compensation: "sensor.energy_production_tarif_1_compensation", stat_compensation: "sensor.energy_production_tarif_1_compensation",
entity_energy_to: "sensor.energy_production_tarif_1",
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}, },
{ {
stat_energy_to: "sensor.energy_production_tarif_2", stat_energy_to: "sensor.energy_production_tarif_2",
stat_compensation: "sensor.energy_production_tarif_2_compensation", stat_compensation: "sensor.energy_production_tarif_2_compensation",
entity_energy_to: "sensor.energy_production_tarif_2",
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}, },
@ -55,7 +51,6 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
type: "gas", type: "gas",
stat_energy_from: "sensor.energy_gas", stat_energy_from: "sensor.energy_gas",
stat_cost: "sensor.energy_gas_cost", stat_cost: "sensor.energy_gas_cost",
entity_energy_from: "sensor.energy_gas",
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}, },

8
src/data/energy.ts
View File

@ -29,7 +29,6 @@ export const emptyFlowFromGridSourceEnergyPreference =
(): FlowFromGridSourceEnergyPreference => ({ (): FlowFromGridSourceEnergyPreference => ({
stat_energy_from: "", stat_energy_from: "",
stat_cost: null, stat_cost: null,
entity_energy_from: null,
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}); });
@ -38,7 +37,6 @@ export const emptyFlowToGridSourceEnergyPreference =
(): FlowToGridSourceEnergyPreference => ({ (): FlowToGridSourceEnergyPreference => ({
stat_energy_to: "", stat_energy_to: "",
stat_compensation: null, stat_compensation: null,
entity_energy_to: null,
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}); });
@ -68,7 +66,6 @@ export const emptyGasEnergyPreference = (): GasSourceTypeEnergyPreference => ({
type: "gas", type: "gas",
stat_energy_from: "", stat_energy_from: "",
stat_cost: null, stat_cost: null,
entity_energy_from: null,
entity_energy_price: null, entity_energy_price: null,
number_energy_price: null, number_energy_price: null,
}); });
@ -93,7 +90,6 @@ export interface FlowFromGridSourceEnergyPreference {
stat_cost: string | null; stat_cost: string | null;
// Can be used to generate costs if stat_cost omitted // Can be used to generate costs if stat_cost omitted
entity_energy_from: string | null;
entity_energy_price: string | null; entity_energy_price: string | null;
number_energy_price: number | null; number_energy_price: number | null;
} }
@ -105,8 +101,7 @@ export interface FlowToGridSourceEnergyPreference {
// $ meter // $ meter
stat_compensation: string | null; stat_compensation: string | null;
// Can be used to generate costs if stat_cost omitted // Can be used to generate costs if stat_compensation omitted
entity_energy_to: string | null;
entity_energy_price: string | null; entity_energy_price: string | null;
number_energy_price: number | null; number_energy_price: number | null;
} }
@ -142,7 +137,6 @@ export interface GasSourceTypeEnergyPreference {
stat_cost: string | null; stat_cost: string | null;
// Can be used to generate costs if stat_cost omitted // Can be used to generate costs if stat_cost omitted
entity_energy_from: string | null;
entity_energy_price: string | null; entity_energy_price: string | null;
number_energy_price: number | null; number_energy_price: number | null;
unit_of_measurement?: string | null; unit_of_measurement?: string | null;

1
src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
View File

@ -280,7 +280,6 @@ export class DialogEnergyGasSettings
this._source = { this._source = {
...this._source!, ...this._source!,
stat_energy_from: ev.detail.value, stat_energy_from: ev.detail.value,
entity_energy_from: ev.detail.value,
}; };
} }

3
src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts
View File

@ -269,9 +269,6 @@ export class DialogEnergyGridFlowSettings
[this._params!.direction === "from" [this._params!.direction === "from"
? "stat_energy_from" ? "stat_energy_from"
: "stat_energy_to"]: ev.detail.value, : "stat_energy_to"]: ev.detail.value,
[this._params!.direction === "from"
? "entity_energy_from"
: "entity_energy_to"]: ev.detail.value,
}; };
} }