Merged

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 {
+	if errors.Is(err, pgx.ErrNoRows) {
-		err = werr.Wrap(err)
-		return
-	}
-
-	if err == sql.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
 	}

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)

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
 	}