cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve select-job-for-commit

Browse source 
It now returns #f or a list, rather than the empty list or a nested list.
This commit is contained in:
Christopher Baines 2020-10-09 19:31:51 +01:00
parent 51204aefca
commit 6023aa8caf
4 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

20
guix-data-service/web/compare/html.scm
View file

@ -1034,26 +1034,26 @@
(div (@ (class "container"))
(h1 "Unknown commit")
,(if (invalid-query-parameter? base-commit)
(if (null? base-job)
`(p "No known revision with commit "
(strong (samp ,(invalid-query-parameter-value base-commit)))
".")
(if base-job
`(p "Revision "
(a (@ (href
,(string-append "/revision/"
(invalid-query-parameter-value base-commit))))
(strong (samp ,(invalid-query-parameter-value base-commit))))
" is queued for processing."))
" is queued for processing.")
`(p "No known revision with commit "
(strong (samp ,(invalid-query-parameter-value base-commit)))
"."))
'())
,(if (invalid-query-parameter? target-commit)
(if (null? target-job)
`(p "No known revision with commit "
(strong (samp ,(invalid-query-parameter-value target-commit)))
".")
(if target-job
`(p "Revision "
(a (@ (href
,(string-append "/revision/"
(invalid-query-parameter-value target-commit))))
(strong (samp ,(invalid-query-parameter-value target-commit))))
" is queued for processing."))
" is queued for processing.")
`(p "No known revision with commit "
(strong (samp ,(invalid-query-parameter-value target-commit)))
"."))
'())))))

61
guix-data-service/web/revision/html.scm
View file

@ -2147,36 +2147,35 @@ figure {
`(,(header)
(div
(@ (class "container"))
,@(match job
(()
`((h1 "Unknown revision")
(p "No known revision with commit "
(strong (samp ,commit-hash)))))
((jobs ...)
`((div
(@ (class "row"))
,@(if job
`((div
(@ (class "row"))
(div
(@ (class "col-md-12"))
(h1 (@ (style "white-space: nowrap;"))
"Revision " (samp ,commit-hash))))
(div
(@ (class "col-md-12"))
(h1 (@ (style "white-space: nowrap;"))
"Revision " (samp ,commit-hash))))
(div
(@ (class "row"))
(div
(@ (class "col-md-6"))
(h2 "Packages")
(strong (@ (class "text-center")
(style "font-size: 2em; display: block;"))
"Unknown")
(@ (class "row"))
(div
(@ (class "col-md-6"))
(h2 "Packages")
(strong (@ (class "text-center")
(style "font-size: 2em; display: block;"))
"Unknown")
,@(if (null? git-repositories-and-branches)
'()
(view-revision/git-repositories
git-repositories-and-branches
commit-hash))
,@(view-revision/jobs-and-events jobs-and-events))
(div
(@ (class "col-md-6"))
(h3 "Derivations")
(strong (@ (class "text-center")
(style "font-size: 2em; display: block;"))
"Unknown"))))
`((h1 "Unknown revision")
(p "No known revision with commit "
(strong (samp ,commit-hash)))))))))
,@(if (null? git-repositories-and-branches)
'()
(view-revision/git-repositories
git-repositories-and-branches
commit-hash))
,@(view-revision/jobs-and-events jobs-and-events))
(div
(@ (class "col-md-6"))
(h3 "Derivations")
(strong (@ (class "text-center")
(style "font-size: 2em; display: block;"))
"Unknown"))))))))))