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

Add more links to store items

Browse source 
On the formatted derivation and derivation comparison pages.
This commit is contained in:
Christopher Baines 2019-11-14 21:20:17 +00:00
parent 81eb5f88d1
commit 5d7dadc9fe
2 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -411,10 +411,10 @@
(th "Arguments")) (th "Arguments"))
(tbody (tbody
(tr (tr
(td ,common-builder) (td ,(display-possible-store-item common-builder))
(td (ol (td (ol
,@(map (lambda (arg) ,@(map (lambda (arg)
`(li ,arg)) `(li ,(display-possible-store-item arg)))
common-args)))))) common-args))))))
`(table `(table
(@ (class "table")) (@ (class "table"))
@ -430,20 +430,22 @@
(target-args (assq-ref arguments 'target))) (target-args (assq-ref arguments 'target)))
`((tr `((tr
(td ,base) (td ,base)
(td ,(or base-builder (td ,(display-possible-store-item
common-builder)) (or base-builder
common-builder)))
(td (ol (td (ol
,@(map (lambda (arg) ,@(map (lambda (arg)
`(li ,arg)) `(li ,(display-possible-store-item arg)))
(or common-args (or common-args
base-args))))) base-args)))))
(tr (tr
(td ,target) (td ,target)
(td ,(or target-builder (td ,(display-possible-store-item
common-builder)) (or target-builder
common-builder)))
(td (ol (td (ol
,@(map (lambda (arg) ,@(map (lambda (arg)
`(li ,arg)) `(li ,(display-possible-store-item arg)))
(or common-args (or common-args
target-args)))))))))))) target-args))))))))))))
(h2 "Environment variables") (h2 "Environment variables")
@ -460,21 +462,27 @@
(if common-value (if common-value
`((tr `((tr
(td ,name) (td ,name)
(td ,common-value))) (td ,(display-possible-store-item common-value))))
(let ((base-value (assq-ref values 'base)) (let ((base-value (assq-ref values 'base))
(target-value (assq-ref values 'target))) (target-value (assq-ref values 'target)))
(if (and base-value target-value) (if (and base-value target-value)
`((tr `((tr
(td (@ (rowspan 2)) (td (@ (rowspan 2))
,name) ,name)
(td ,base ,base-value)) (td ,base ,(display-possible-store-item
base-value)))
(tr (tr
(td ,target ,target-value))) (td ,target ,(display-possible-store-item
target-value))))
`((tr `((tr
(td ,name) (td ,name)
(td ,@(if base-value (td ,@(if base-value
(list base base-value) (list base
(list target target-value))))))))))) (display-possible-store-item
base-value))
(list target
(display-possible-store-item
target-value))))))))))))
environment-variables)))))))))) environment-variables))))))))))
(define (compare/derivations query-parameters (define (compare/derivations query-parameters

6
guix-data-service/web/view/html.scm
View file

@ -787,7 +787,7 @@
(@ (style "margin-left: 3em;")) (@ (style "margin-left: 3em;"))
,@(map (lambda (arg count-down) ,@(map (lambda (arg count-down)
`(div "\"" `(div "\""
,arg ,(display-possible-store-item arg)
"\"" "\""
,@(if (eq? count-down 0) ,@(if (eq? count-down 0)
'() '()
@ -814,7 +814,9 @@
"(" "("
"\"" ,(assq-ref env-var 'key) "\"" "\"" ,(assq-ref env-var 'key) "\""
"," ","
"\"" ,(assq-ref env-var 'value) "\"" "\"" ,(display-possible-store-item
(assq-ref env-var 'value))
"\""
")")) ")"))
env-vars env-vars
(reverse (iota (length env-vars)))) (reverse (iota (length env-vars))))