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

Fix wrong loadpoint title in error messages after UI reorder (#25800)

Browse source 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: andig <184815+andig@users.noreply.github.com>
Co-authored-by: naltatis <152287+naltatis@users.noreply.github.com>
This commit is contained in:
Copilot 2025-12-04 20:18:05 +01:00 • committed by GitHub
parent a5c73442ee
commit f2647cdb48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
assets/js/components/Site/Site.vue
View file

@ -13,7 +13,7 @@
<div class="d-flex">
<Notifications
:notifications="notifications"
:loadpointTitles="loadpointTitles"
:loadpoints="loadpoints"
class="me-2"
/>
<TopNavigation v-bind="topNavigation" />
@ -194,9 +194,6 @@ export default defineComponent({
energyflow() {
return this.collectProps(Energyflow);
},
loadpointTitles() {
return this.orderedVisibleLoadpoints.map((lp) => lp.displayTitle);
},
vehicleList() {
const vehicles = this.vehicles || {};
return Object.entries(vehicles).map(([name, vehicle]) => ({ name, ...vehicle }));

10
assets/js/components/Top/Notifications.vue
View file

@ -90,14 +90,14 @@
import "@h2d2/shopicons/es/regular/exclamationtriangle";
import formatter from "@/mixins/formatter";
import { defineComponent, type PropType } from "vue";
import type { Notification, Timeout } from "@/types/evcc";
import type { Notification, Timeout, UiLoadpoint } from "@/types/evcc";
export default defineComponent({
name: "Notifications",
mixins: [formatter],
props: {
notifications: { type: Array as PropType<Notification[]>, default: () => [] },
loadpointTitles: { type: Array as PropType<string[]>, default: () => [] },
loadpoints: { type: Array as PropType<UiLoadpoint[]>, default: () => [] },
},
data() {
return {
@ -128,8 +128,10 @@ export default defineComponent({
message({ message, lp }: { message: string | string[]; lp?: number }) {
const lines = Array.isArray(message) ? message : [message];
if (lp) {
// add loadpoint title to first line
lines[0] = `${this.loadpointTitles[lp - 1] || lp}: ${lines[0]}`;
// Find loadpoint by id (which is the original 1-based index)
const loadpoint = this.loadpoints.find((l) => l.id === String(lp));
const title = loadpoint?.displayTitle || lp;
lines[0] = `${title}: ${lines[0]}`;
}
return lines;
},