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

Add locale values in the JSON response for the lint warnings page

Browse source 
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Danjela Lura 2020-06-24 14:15:16 +02:00 • committed by Christopher Baines
parent 89aaf984ec
commit d442d408ee
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
guix-data-service/model/lint-warning.scm
View file

@ -63,15 +63,16 @@
(string-append " (string-append "
SELECT DISTINCT ON (lint_warnings.id) lint_warnings.id, SELECT DISTINCT ON (lint_warnings.id) lint_warnings.id,
lint_checkers.name, translated_lint_checker_descriptions.description, lint_checkers.name, translated_lint_checker_descriptions.description,
lint_checkers.network_dependent, packages.name, packages.version, translated_lint_checker_descriptions.locale, lint_checkers.network_dependent,
packages.name, packages.version,
locations.file, locations.line, locations.column_number, locations.file, locations.line, locations.column_number,
lint_warning_messages.message lint_warning_messages.message, lint_warning_messages.locale
FROM lint_warnings FROM lint_warnings
INNER JOIN lint_checkers INNER JOIN lint_checkers
ON lint_warnings.lint_checker_id = lint_checkers.id ON lint_warnings.lint_checker_id = lint_checkers.id
INNER JOIN ( INNER JOIN (
SELECT DISTINCT ON (lint_checkers.id) lint_checkers.id AS lint_checker_id, SELECT DISTINCT ON (lint_checkers.id) lint_checkers.id AS lint_checker_id,
lint_checker_descriptions.description lint_checker_descriptions.description, lint_checker_descriptions.locale
FROM guix_revision_lint_checkers FROM guix_revision_lint_checkers
INNER JOIN guix_revisions INNER JOIN guix_revisions
ON guix_revision_lint_checkers.guix_revision_id = guix_revisions.id ON guix_revision_lint_checkers.guix_revision_id = guix_revisions.id

10
guix-data-service/web/revision/controller.scm
View file

@ -1083,14 +1083,20 @@
. ,(list->vector . ,(list->vector
(map (match-lambda (map (match-lambda
((id lint-checker-name lint-checker-description ((id lint-checker-name lint-checker-description
lint-checker-description-locale
lint-checker-network-dependent lint-checker-network-dependent
package-name package-version package-name package-version
file line-number column-number file line-number column-number
message) message message-locale)
`((package . ((name . ,package-name) `((package . ((name . ,package-name)
(version . ,package-version))) (version . ,package-version)))
,@(if (member "message" fields) ,@(if (member "message" fields)
`((message . ,message)) `((message . ,message)
(message-locale . ,message-locale))
'())
,@(if (member "linter" fields)
`((lint-checker-description . ,lint-checker-description)
(lint-checker-description-locale . ,lint-checker-description-locale))
'()) '())
,@(if (member "location" fields) ,@(if (member "location" fields)
`((location . ((file . ,file) `((location . ((file . ,file)

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

@ -1945,10 +1945,10 @@ figure {
,@(let ((fields (assq-ref query-parameters 'field))) ,@(let ((fields (assq-ref query-parameters 'field)))
(map (map
(match-lambda (match-lambda
((id lint-checker-name lint-checker-description ((id lint-checker-name lint-checker-description lint-checker-description-locale
lint-checker-network-dependent lint-checker-network-dependent
package-name package-version file line-number column-number package-name package-version file line-number column-number
message) message message-locale)
`(tr `(tr
(td (a (@ (href ,(string-append (td (a (@ (href ,(string-append
(string-join (string-join