03/03: Improve build links on the package derivations page

[Christopher Baines]

cbaines pushed a commit to branch master
in repository data-service.

commit 74980bce707c687730ed78b0798419f61bfa7727
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Dec 9 19:08:19 2020 +0000

    Improve build links on the package derivations page
---
 guix-data-service/model/derivation.scm  |  2 ++
 guix-data-service/web/revision/html.scm | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/guix-data-service/model/derivation.scm 
b/guix-data-service/model/derivation.scm
index bb3a877..470cca1 100644
--- a/guix-data-service/model/derivation.scm
+++ b/guix-data-service/model/derivation.scm
@@ -311,6 +311,7 @@ SELECT derivations.file_name,
          SELECT JSON_AGG(
                   json_build_object(
                     'build_server_id', builds.build_server_id,
+                    'build_server_build_id', builds.build_server_build_id,
                     'status',  latest_build_status.status,
                     'timestamp',  latest_build_status.timestamp,
                     'build_for_equivalent_derivation',
@@ -498,6 +499,7 @@ SELECT derivations.file_name,
          SELECT JSON_AGG(
                   json_build_object(
                     'build_server_id', builds.build_server_id,
+                    'build_server_build_id', builds.build_server_build_id,
                     'status',  latest_build_status.status,
                     'timestamp',  latest_build_status.timestamp,
                     'build_for_equivalent_derivation',
diff --git a/guix-data-service/web/revision/html.scm 
b/guix-data-service/web/revision/html.scm
index 58f1bb1..8ed7eee 100644
--- a/guix-data-service/web/revision/html.scm
+++ b/guix-data-service/web/revision/html.scm
@@ -1663,11 +1663,11 @@ figure {
                                  ,(assq-ref build-server-urls
                                             build-server-id)))
                              (dd
-                              (a (@ (href
-                                     ,(simple-format
-                                       #f 
"/build-server/~A/build?derivation_file_name=~A"
-                                       build-server-id
-                                       file-name)))
+                              (a (@ (href ,(build-url
+                                            build-server-id
+                                            (assoc-ref build
+                                                       "build_server_build_id")
+                                            file-name)))
                                  ,(build-status-alist->build-icon build))))))
                        (vector->list builds)))))))
              derivations)))