From 24befcce361b10f588d1471786e90700212b658f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20=C3=85hall?= <magnus.ahall@gibon.se>
Date: Sun, 23 Aug 2026 10:20:02 +0200
Subject: [PATCH] Merged

---
 datapoint.go | 10 ++--------
 main.go      | 20 +++++++++++++++++++-
 problem.go   |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/datapoint.go b/datapoint.go
index f540db8..5c42c63 100644
--- a/datapoint.go
+++ b/datapoint.go
@@ -285,19 +285,13 @@ func DatapointRetrieve(id int, name string) (dp Datapoint, err error) { // {{{
 
 	rows, _ := db.Query(context.Background(), query, param)
 	dp, err = pgx.CollectExactlyOneRow(rows, pgx.RowToStructByNameLax[Datapoint])
-	if err != nil {
-		err = werr.Wrap(err)
-		return
-	}
-
-	if err == sql.ErrNoRows {
+	if errors.Is(err, pgx.ErrNoRows) {
 		dp = Datapoint{
 			Name: name,
 		}
 		err = nil
 		return
 	}
-
 	if err != nil {
 		err = werr.Wrap(err).WithData(name)
 		return
@@ -315,7 +309,7 @@ func DatapointRetrieve(id int, name string) (dp Datapoint, err error) { // {{{
 		dp.ID,
 	)
 	dp.LastDatapointValue, err = pgx.CollectExactlyOneRow(rows, pgx.RowToStructByNameLax[DatapointValue])
-	if err == sql.ErrNoRows {
+	if errors.Is(err, pgx.ErrNoRows) {
 		err = nil
 		return
 	}
diff --git a/main.go b/main.go
index b59f715..bb1ec5b 100644
--- a/main.go
+++ b/main.go
@@ -431,7 +431,25 @@ func pageIndex(w http.ResponseWriter, r *http.Request) { // {{{
 	page.Render(w, r)
 } // }}}
 func actionDashboardValues(w http.ResponseWriter, r *http.Request) { // {{{
-	values, err := DatapointsValue([]int{13, 15})
+	name := "start"
+
+	dashboard, err := DashboardGet(name)
+	if err != nil {
+		logger.Error("dashboard", "error", err)
+		httpError(w, err)
+		return
+	}
+
+	idMap := make(map[int]bool)
+	var ids []int
+	for _, w := range dashboard.Widgets {
+		idMap[w.DatapointID] = true
+	}
+	for id := range idMap {
+		ids = append(ids, id)
+	}
+
+	values, err := DatapointsValue(ids)
 	if err != nil {
 		logger.Error("dashboard", "error", err)
 		httpError(w, err)
diff --git a/problem.go b/problem.go
index d5513dd..9198e72 100644
--- a/problem.go
+++ b/problem.go
@@ -123,7 +123,7 @@ func ProblemStart(trigger Trigger) (problemID int, err error) { // {{{
 	)
 	var openProblems int
 	err = row.Scan(&openProblems)
-	if err != nil && err != sql.ErrNoRows {
+	if err != nil && errors.Is(err, pgx.ErrNoRows) {
 		err = werr.Wrap(err).WithData(trigger.ID)
 		return
 	}