Compare commits

...

5 commits

Author SHA1 Message Date
andig
07f3982d1e
chore: pin devEngines package manager (#32386)
Some checks failed
Validate Schema / build (push) Has been cancelled
Release / call-build-workflow (push) Has been cancelled
Release / Publish Docker :release (push) Has been cancelled
Release / Github & APT (push) Has been cancelled
Release / Demo (push) Has been cancelled
Release / Hassio Addon (push) Has been cancelled
2026-08-01 13:16:56 +02:00
andig
e4ca549ea6
0.313 backport: chore: pin clock in device colors test (#32325) (#32387) 2026-08-01 13:16:37 +02:00
Michael Geers
0990bd9784
0.313 backport: Sessions UI: fix grouped chart layout and legend styling (#32383) 2026-08-01 13:00:13 +02:00
Michael Geers
fff6479115
0.313 backport: chore: fix request cache warning (#32382) 2026-08-01 12:56:12 +02:00
Michael Geers
58c4b446d6
Cardata: delete obsolete streaming containers (#32376) 2026-08-01 12:44:11 +02:00
16 changed files with 61 additions and 38 deletions

View file

@ -27,6 +27,7 @@ const colors: {
temperature: string | null;
export: string | null;
background: string | null;
box: string | null;
light: string | null;
selfPalette: string[];
palette: string[];
@ -44,6 +45,7 @@ const colors: {
temperature: null,
export: null,
background: null,
box: null,
light: null,
selfPalette: ["#0FDE41", "#FFBD2F", "#FD6158", "#03C1EF", "#0F662D", "#FF922E"],
palette: [
@ -152,6 +154,7 @@ export function updateCssColors() {
colors.temperature = style.getPropertyValue("--evcc-temperature");
colors.export = style.getPropertyValue("--evcc-export-contrast");
colors.background = style.getPropertyValue("--evcc-background");
colors.box = style.getPropertyValue("--evcc-box");
colors.pricePerKWh = style.getPropertyValue("--bs-gray-medium");
colors.co2PerKWh = style.getPropertyValue("--bs-gray-medium");
colors.light = style.getPropertyValue("--bs-gray-light");

View file

@ -1,9 +1,9 @@
<template>
<div v-if="chartData.labels.length > 1" class="row">
<div class="col-12 col-md-6 mb-3">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 mb-3">
<PolarArea :data="chartData" :options="options" />
</div>
<div class="col-12 col-md-6 d-flex align-items-center py-0 py-md-3">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 d-flex align-items-center">
<LegendList :legends="legends" :device-colors="deviceColors" grid />
</div>
</div>
@ -130,7 +130,7 @@ export default defineComponent({
beginAtZero: false,
ticks: {
color: colors.muted || "",
backdropColor: colors.background || "",
backdropColor: colors.box || "",
font: { size: 10 },
callback: this.formatValue,
maxTicksLimit: 6,

View file

@ -1,9 +1,9 @@
<template>
<div v-if="chartData.labels.length > 1" class="row">
<div class="col-12 col-md-6 mb-3">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 mb-3">
<Doughnut :data="chartData" :options="options" />
</div>
<div class="col-12 col-md-6 d-flex align-items-center">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 d-flex align-items-center">
<LegendList :legends="legends" :device-colors="deviceColors" grid />
</div>
</div>
@ -94,7 +94,7 @@ export default defineComponent({
borderRadius: 10,
color: colors.text || "",
borderWidth: 3,
borderColor: colors.background || "",
borderColor: colors.box || "",
cutout: "70%",
radius: "95%",
animation: { duration: 250 },

View file

@ -1,9 +1,9 @@
<template>
<div v-if="chartData.labels.length > 1" class="row">
<div class="col-12 col-md-6 mb-3">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 mb-3">
<Doughnut :data="chartData" :options="options" />
</div>
<div class="col-12 col-md-6 d-flex align-items-center">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 d-flex align-items-center">
<LegendList :legends="legends" :device-colors="deviceColors" grid />
</div>
</div>
@ -107,7 +107,7 @@ export default defineComponent({
borderRadius: 10,
color: colors.text,
borderWidth: 3,
borderColor: colors.background,
borderColor: colors.box,
cutout: "70%",
radius: "95%",
animation: { duration: 250 },

View file

@ -1,6 +1,6 @@
<template>
<ul
class="root p-0 d-flex flex-wrap column-gap-4 row-gap-2"
class="root p-0 m-0 d-flex flex-wrap column-gap-4 row-gap-2"
:class="{
'root--small-equal-widths': smallEqualWidths,
'root--grid': grid,
@ -50,7 +50,7 @@
<div
v-for="value in valueList(legend.value)"
:key="value"
class="text-muted text-nowrap legend-value text-end"
class="text-muted text-nowrap legend-value text-end tabular"
>
{{ value }}
</div>

View file

@ -174,7 +174,7 @@ const COLUMNS_PER_BREAKPOINT = {
sm: 3,
md: 4,
lg: 7,
xl: 8,
xl: 7,
xxl: 9,
};

View file

@ -1,9 +1,9 @@
<template>
<div v-if="chartData.labels.length > 1" class="row">
<div class="col-12 col-md-6 mb-3">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 mb-3">
<PolarArea :data="chartData" :options="options" />
</div>
<div class="col-12 col-md-6 d-flex align-items-center py-0 py-md-3">
<div class="col-12 col-md-6 col-lg-12 col-xxl-6 d-flex align-items-center">
<LegendList :legends="legends" :device-colors="deviceColors" grid />
</div>
</div>
@ -123,7 +123,7 @@ export default defineComponent({
ticks: {
stepSize: 25,
color: colors.muted,
backdropColor: colors.background,
backdropColor: colors.box,
},
grid: { color: colors.border },
},

View file

@ -180,7 +180,7 @@ export default defineComponent({
ticks: {
stepSize: 20,
color: colors.muted,
backdropColor: colors.background,
backdropColor: colors.box,
font: { size: 10 },
callback: (value: number) => this.fmtPercentage(value, 0),
},

View file

@ -86,9 +86,9 @@
/>
</Card>
<div v-if="showExtraCharts">
<div class="row align-items-start">
<div class="row">
<div class="col-12 col-lg-6 mb-4">
<Card :title="firstExtraTitle" edge-to-edge>
<Card :title="firstExtraTitle" edge-to-edge class="h-100">
<div v-if="activeType === types.SOLAR">
<SolarYearChart
v-if="showSolarYearChart"
@ -116,7 +116,7 @@
</Card>
</div>
<div class="col-12 col-lg-6 mb-4">
<Card :title="secondExtraTitle" edge-to-edge>
<Card :title="secondExtraTitle" edge-to-edge class="h-100">
<EnergyGroupedChart
v-if="activeType === types.SOLAR"
:sessions="currentSessions"

View file

@ -51,6 +51,12 @@
"npm": ">=10.0.0",
"node": ">=26.0.0"
},
"devEngines": {
"packageManager": {
"name": "npm",
"version": ">=10.0.0"
}
},
"license": "MIT",
"repository": "github:evcc-io/evcc",
"devDependencies": {

View file

@ -229,8 +229,8 @@ func (p *HTTP) request(url string, body string) ([]byte, error) {
// warn on uncached GET polling: a repeated roundtrip means neither a configured
// cache nor the device's own response headers spared it. cache hits are exempt.
if p.method == http.MethodGet && p.mu == nil && resp.Header.Get(httpcache.XFromCache) == "" {
if key := stripQuery(url); repeatedGet(key, time.Now()) {
p.log.WARN.Printf("uncached request repeated within 1s, please report at https://github.com/evcc-io/evcc/issues: %s", key)
if repeatedGet(url, time.Now()) {
p.log.WARN.Printf("uncached request repeated within 1s, please report at https://github.com/evcc-io/evcc/issues: %s", url)
}
}
@ -254,15 +254,6 @@ var (
httpSeen = make(map[string]httpAccess)
)
// stripQuery drops the query and fragment so cache-busting params do not make
// each poll look like a distinct url.
func stripQuery(url string) string {
if i := strings.IndexAny(url, "?#"); i >= 0 {
return url[:i]
}
return url
}
// repeatedGet reports the first time url is fetched again within a second, a sign
// the response should be cached. It fires once per url to avoid log spam.
func repeatedGet(url string, now time.Time) bool {

View file

@ -176,8 +176,7 @@ func TestRepeatedGet(t *testing.T) {
require.False(t, repeatedGet(spaced, t0))
require.False(t, repeatedGet(spaced, t0.Add(2*time.Second))) // >1s apart: no warn
// query params are stripped before keying, so cache-busting still counts as a repeat
require.Equal(t, "http://q.test/path", stripQuery("http://q.test/path?ts=1&x=2#frag"))
require.False(t, repeatedGet(stripQuery("http://q.test/path?ts=1"), t0))
require.True(t, repeatedGet(stripQuery("http://q.test/path?ts=2"), t0.Add(300*time.Millisecond)))
// query params are part of the key, so cache-busting urls are distinct requests
require.False(t, repeatedGet("http://q.test/path?ts=1", t0))
require.False(t, repeatedGet("http://q.test/path?ts=2", t0.Add(300*time.Millisecond)))
}

View file

@ -33,6 +33,10 @@ function chartSection(page: Page, heading: string): Locator {
}
test("device colors: autoassign, override, persistence", async ({ page }) => {
// fixture sessions are dated 2026-05. Sessions.vue ranks loadpoints by energy
// over the last three months relative to now, so pin the clock to keep them in range
await page.clock.setFixedTime(new Date("2026-05-15T12:00:00Z"));
// ---------- Step 1 — Sessions, by-vehicle view ----------
await page.goto("/#/sessions?year=2026&month=5");
await expect(page.getByRole("heading", { name: "Charging Sessions" })).toBeVisible();

View file

@ -33,7 +33,10 @@ var requiredKeys = []string{
"vehicle.vehicle.travelledDistance",
}
const requiredVersion = "v6"
const (
containerName = "evcc.io"
requiredVersion = "v6"
)
type API struct {
*request.Helper

View file

@ -205,7 +205,7 @@ func (v *MqttConnector) handler(_ mqtt.Client, m mqtt.Message) {
return
}
v.log.TRACE.Println("recv: " + string(m.Payload()))
v.log.TRACE.Printf("recv %s: %s", m.Topic(), string(m.Payload()))
v.mu.RLock()
defer v.mu.RUnlock()

View file

@ -71,14 +71,17 @@ func (v *Provider) findOrCreateContainer() (string, error) {
return "", err
}
// obsolete containers keep streaming, resulting in duplicate messages
defer v.deleteObsoleteContainers(containers)
if i := slices.IndexFunc(containers, func(c Container) bool {
return c.Name == "evcc.io" && c.Purpose == requiredVersion
return c.Name == containerName && c.Purpose == requiredVersion
}); i >= 0 {
return containers[i].ContainerId, nil
}
res, err := v.api.CreateContainer(CreateContainer{
Name: "evcc.io",
Name: containerName,
Purpose: requiredVersion,
TechnicalDescriptors: requiredKeys,
})
@ -86,6 +89,20 @@ func (v *Provider) findOrCreateContainer() (string, error) {
return res.ContainerId, err
}
func (v *Provider) deleteObsoleteContainers(containers []Container) {
for _, c := range containers {
if c.Name != containerName || c.Purpose == requiredVersion {
continue
}
v.log.DEBUG.Printf("deleting obsolete container %s (%s)", c.ContainerId, c.Purpose)
if err := v.api.DeleteContainer(c.ContainerId); err != nil {
v.log.WARN.Printf("delete container %s: %v", c.ContainerId, err)
}
}
}
func (v *Provider) setupContainer() error {
container, err := v.findOrCreateContainer()
if err != nil {