Skip to content

Commit b34e1d5

Browse files
committed
metrics view fix
1 parent 5e49716 commit b34e1d5

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

web/src/components/MetricsChart.jsx

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useMemo, useState } from "react";
1+
import React, { useMemo, useState, useEffect } from "react";
22
import {
33
LineChart,
44
Line,
@@ -34,7 +34,15 @@ export default function MetricsChart({ history = [] }) {
3434
return Array.from(s).sort((a, b) => b - a);
3535
}, [base]);
3636

37-
const [year, setYear] = useState(years.length ? years[0] : "All");
37+
const [year, setYear] = useState("All");
38+
useEffect(() => {
39+
if (!years || years.length === 0) return;
40+
const currentYear = new Date().getFullYear();
41+
setYear((prev) => {
42+
if (prev !== "All") return prev;
43+
return years.includes(currentYear) ? currentYear : years[0];
44+
});
45+
}, [years]);
3846
const dataByYear = useMemo(
3947
() =>
4048
year === "All" ? base : base.filter((d) => getYear(d.date) === year),
@@ -51,7 +59,6 @@ export default function MetricsChart({ history = [] }) {
5159
"humidity_pct",
5260
];
5361
const pointType = (row) => {
54-
console.log('row', row);
5562
if (row?.type === 0 || row?.type === 1) return row.type; // new
5663
if (row?.isForecast ?? row?.isForcast) return 1; // legacy support
5764
return 0;
@@ -245,6 +252,7 @@ export default function MetricsChart({ history = [] }) {
245252
strokeDasharray="6 4"
246253
connectNulls={false}
247254
hide
255+
legendType="none"
248256
/>
249257
</>
250258
)}
@@ -272,6 +280,7 @@ export default function MetricsChart({ history = [] }) {
272280
strokeDasharray="6 4"
273281
connectNulls={false}
274282
hide
283+
legendType="none"
275284
/>
276285
</>
277286
)}
@@ -299,6 +308,7 @@ export default function MetricsChart({ history = [] }) {
299308
strokeDasharray="6 4"
300309
connectNulls={false}
301310
hide
311+
legendType="none"
302312
/>
303313
</>
304314
)}
@@ -326,6 +336,7 @@ export default function MetricsChart({ history = [] }) {
326336
strokeDasharray="6 4"
327337
connectNulls={false}
328338
hide
339+
legendType="none"
329340
/>
330341
</>
331342
)}
@@ -353,6 +364,7 @@ export default function MetricsChart({ history = [] }) {
353364
strokeDasharray="6 4"
354365
connectNulls={false}
355366
hide
367+
legendType="none"
356368
/>
357369
</>
358370
)}

0 commit comments

Comments
 (0)