Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Loadpoint UI: assign to real circuits only (#30429)

Browse source
This commit is contained in:
Michael Geers 2026-06-02 13:42:01 +02:00 • committed by GitHub
parent 5bbe1bc897
commit 869ac1d6eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/js/components/Config/LoadpointModal.vue
View file

@ -758,11 +758,11 @@ export default {
return circuit && !this.circuitOptions.some((c) => c.key === circuit);
},
circuitOptions() {
const options = this.circuits.map((c) => ({
// empty option is provided by PropertyField placeholder
return this.circuits.map((c) => ({
key: c.name,
name: `${c.config?.title || ""} [${c.name}]`.trim(),
}));
return [{ key: "", name: "unassigned" }, ...options];
},
invalidVehicle() {
const { vehicle } = this.values;

10
assets/js/views/Config.vue
View file

@ -964,14 +964,8 @@ export default defineComponent({
},
async loadCircuits() {
const circuits = (await this.loadConfig("devices/circuit")) || [];
// set gridcontrol default title
circuits.forEach((c: ConfigCircuit) => {
if (c.name === GRID_CONTROL && !c.config?.title) {
c.config = c.config || {};
c.config.title = this.$t("config.hems.title");
}
});
this.circuits = circuits;
// gridcontrol is auto-created for hems and must not be user-assignable to loadpoints
this.circuits = circuits.filter((c: ConfigCircuit) => c.name !== GRID_CONTROL);
},
async loadTariffs() {
this.tariffs = (await this.loadConfig("devices/tariff")) || [];

10
tests/hems.spec.ts
View file

@ -7,6 +7,8 @@ import {
editorPaste,
enableAppContext,
expectAppEvent,
newLoadpoint,
addDemoCharger,
} from "./utils";
import { startSimulator, stopSimulator, simulatorUrl, simulatorApply } from "./simulator";
@ -188,5 +190,13 @@ limit:
"0.0 kW",
].join("")
);
// a new loadpoint can only be assigned to the dedicated circuit, not gridcontrol
await newLoadpoint(page, "Carport");
await addDemoCharger(page);
const lpModal = page.getByTestId("loadpoint-modal");
await expectModalVisible(lpModal);
const circuitOptions = lpModal.getByLabel("Circuit").getByRole("option");
await expect(circuitOptions).toHaveText(["---", "House [main]"]);
});
});