branch master updated: Fix various issues linking to builds

[Christopher Baines]

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/master by this push:
     new 48cdf10  Fix various issues linking to builds
48cdf10 is described below

commit 48cdf102fe9b0b12c4e926d9c0b209d9119c5bb7
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sun Jan 3 10:54:45 2021 +0000

    Fix various issues linking to builds
---
 guix-data-service/model/package.scm       |  2 ++
 guix-data-service/web/repository/html.scm |  8 ++++----
 guix-data-service/web/revision/html.scm   | 33 +++++++++++++++----------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/guix-data-service/model/package.scm 
b/guix-data-service/model/package.scm
index 113bd72..7d58a8e 100644
--- a/guix-data-service/model/package.scm
+++ b/guix-data-service/model/package.scm
@@ -346,6 +346,7 @@ SELECT package_version,
        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',
@@ -429,6 +430,7 @@ SELECT package_version,
        JSON_AGG(
          json_build_object(
            'build_server_id', builds.build_server_id,
+           'build_server_build_id', builds.build_server_build_id,
            'derivation_file_name', builds.derivation_file_name,
            'status',  latest_build_status.status,
            'timestamp',  latest_build_status.timestamp
diff --git a/guix-data-service/web/repository/html.scm 
b/guix-data-service/web/repository/html.scm
index 581178f..314f070 100644
--- a/guix-data-service/web/repository/html.scm
+++ b/guix-data-service/web/repository/html.scm
@@ -523,9 +523,9 @@
                                                build-server-id)))
                                 (dd
                                  (a (@ (href
-                                        ,(simple-format
-                                          #f 
"/build-server/~A/build?derivation_file_name=~A"
+                                        ,(build-url
                                           build-server-id
+                                          (assoc-ref build 
"build_server_build_id")
                                           derivation-file-name)))
                                     ,(build-status-alist->build-icon 
build))))))
                           builds)))
@@ -773,9 +773,9 @@
                                                build-server-id)))
                                 (dd
                                  (a (@ (href
-                                        ,(simple-format
-                                          #f 
"/build-server/~A/build?derivation_file_name=~A"
+                                        ,(build-url
                                           build-server-id
+                                          (assoc-ref build 
"build_server_build_id")
                                           (assoc-ref build 
"derivation_file_name"))))
                                     ,(build-status-alist->build-icon 
build))))))
                           builds)))
diff --git a/guix-data-service/web/revision/html.scm 
b/guix-data-service/web/revision/html.scm
index 2a1008e..0c4aaf1 100644
--- a/guix-data-service/web/revision/html.scm
+++ b/guix-data-service/web/revision/html.scm
@@ -297,13 +297,12 @@
                     (@ (class "list-inline"))
                     ,@(map (lambda (build)
                              `(li
-                               (a (@ (href
-                                      ,(simple-format
-                                        #f 
"/build-server/~A/build?derivation_file_name=~A"
-                                        (assoc-ref build "build_server_id")
-                                        file-name)))
-                                  ,(build-status-span
-                                    (assoc-ref build "status")))))
+                               `(a (@ (href ,(build-url
+                                              build-server-id
+                                              (assoc-ref build
+                                                         
"build_server_build_id")
+                                              derivation-file-name)))
+                                   ,(build-status-alist->build-icon build))))
                            builds))))))
              derivations)))))
       (div
@@ -922,11 +921,11 @@
                          (lambda (build)
                            (let ((build-server-id
                                   (assoc-ref build "build_server_id")))
-                             `(a (@ (href
-                                     ,(simple-format
-                                       #f 
"/build-server/~A/build?derivation_file_name=~A"
-                                       build-server-id
-                                       derivation-file-name)))
+                             `(a (@ (href ,(build-url
+                                            build-server-id
+                                            (assoc-ref build
+                                                       "build_server_build_id")
+                                            derivation-file-name)))
                                  ,(build-status-alist->build-icon build))))
                          builds)))))
              system-tests)))))))))
@@ -972,11 +971,11 @@
                          (lambda (build)
                            (let ((build-server-id
                                   (assoc-ref build "build_server_id")))
-                             `(a (@ (href
-                                     ,(simple-format
-                                       #f 
"/build-server/~A/build?derivation_file_name=~A"
-                                       build-server-id
-                                       derivation-file-name)))
+                             `(a (@ (href ,(build-url
+                                            build-server-id
+                                            (assoc-ref build
+                                                       "build_server_build_id")
+                                            derivation-file-name)))
                                  ,(build-status-alist->build-icon build))))
                          builds)))))
              channel-instances)))))))))