diff options
author | Christopher Baines <mail@cbaines.net> | 2019-10-12 21:43:34 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2019-10-12 21:43:34 +0100 |
commit | 2b9c882e5aceaf3aa6045ecbccc16b305fdcf0ae (patch) | |
tree | 08ec993a8ae9b85b46c2bf71be1ee46a27b8f72c /guix-data-service/web/view/html.scm | |
parent | af1ffc2393a640c5517db12e79035d140738a529 (diff) | |
download | data-service-2b9c882e5aceaf3aa6045ecbccc16b305fdcf0ae.tar data-service-2b9c882e5aceaf3aa6045ecbccc16b305fdcf0ae.tar.gz |
Improve error handling for comparison pages
Diffstat (limited to 'guix-data-service/web/view/html.scm')
-rw-r--r-- | guix-data-service/web/view/html.scm | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/guix-data-service/web/view/html.scm b/guix-data-service/web/view/html.scm index d915a51..b0857d1 100644 --- a/guix-data-service/web/view/html.scm +++ b/guix-data-service/web/view/html.scm @@ -51,7 +51,7 @@ compare compare/derivations compare/packages - compare-unknown-commit + compare-invalid-parameters error-page)) (define* (header) @@ -2193,28 +2193,34 @@ (style "font-size: 2em; display: block;")) "Unknown")))))))))) -(define (compare-unknown-commit base-commit target-commit - base-exists? target-exists? - base-job target-job) +(define (compare-invalid-parameters query-parameters + base-job + target-job) + (define base-commit + (assq-ref query-parameters 'base_commit)) + + (define target-commit + (peek (assq-ref query-parameters 'target_commit))) + (layout #:body `(,(header) (div (@ (class "container")) (h1 "Unknown commit") - ,(if base-exists? - '() + ,(if (invalid-query-parameter? base-commit) `(p "No known revision with commit " - (strong (samp ,base-commit)) + (strong (samp ,(invalid-query-parameter-value base-commit))) ,(if (null? base-job) " and it is not currently queued for processing" - " but it is queued for processing"))) - ,(if target-exists? - '() + " but it is queued for processing")) + '()) + ,(if (invalid-query-parameter? target-commit) `(p "No known revision with commit " - (strong (samp ,target-commit)) + (strong (samp ,(invalid-query-parameter-value target-commit))) ,(if (null? target-job) " and it is not currently queued for processing" - " but it is queued for processing"))))))) + " but it is queued for processing")) + '()))))) (define (error-page message) (layout |