taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some fixes on webhooks interface

stable
Jesús Espino 2015-01-26 17:46:10 +01:00 committed by David Barragán Merino
parent 379b21b407
commit be8476584e
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/coffee/modules/admin/third-parties.coffee
View File

@ -86,13 +86,11 @@ WebhookDirective = ($rs, $repo, $confirm, $loading) ->
updateLogs = () -> updateLogs = () ->
$rs.webhooklogs.list(webhook.id).then (webhooklogs) => $rs.webhooklogs.list(webhook.id).then (webhooklogs) =>
webhooklogs = webhooklogs.reverse()
for log in webhooklogs for log in webhooklogs
statusText = String(log.status) log.validStatus = 200 <= log.status < 300
log.validStatus = statusText.length==3 and statusText[0]="2" log.prettySentHeaders = _.map(_.pairs(log.request_headers), ([header, value]) -> "#{header}: #{value}").join("\n")
log.prettySentData = JSON.stringify(log.request_data.data, undefined, 2) log.prettySentData = JSON.stringify(log.request_data.data, undefined, 2)
log.prettySentHeaders = JSON.stringify(log.request_headers, undefined, 2) log.prettyDate = moment(log.created).format("DD MMM YYYY [at] hh:mm:ss") # TODO: i18n
log.prettyDate = moment(log.created).format("DD MMM YYYY [at] hh:mm:ss")
webhook.logs_counter = webhooklogs.length webhook.logs_counter = webhooklogs.length
webhook.logs = webhooklogs webhook.logs = webhooklogs
@ -102,9 +100,9 @@ WebhookDirective = ($rs, $repo, $confirm, $loading) ->
textElement = $el.find(".toggle-history") textElement = $el.find(".toggle-history")
historyElement = textElement.parents(".single-webhook-wrapper").find(".webhooks-history") historyElement = textElement.parents(".single-webhook-wrapper").find(".webhooks-history")
if historyElement.hasClass("open") if historyElement.hasClass("open")
textElement.text("(Hide history)") textElement.text("(Hide history)") # TODO: i18n
else else
textElement.text("(Show history)") textElement.text("(Show history)") # TODO: i18n
showVisualizationMode = () -> showVisualizationMode = () ->
$el.find(".edition-mode").addClass("hidden") $el.find(".edition-mode").addClass("hidden")
@ -160,8 +158,8 @@ WebhookDirective = ($rs, $repo, $confirm, $loading) ->
cancel(target) cancel(target)
$el.on "click", ".delete-webhook", () -> $el.on "click", ".delete-webhook", () ->
title = "Delete webhook" #TODO: i18in title = "Delete webhook" #TODO: i18n
message = "Webhook '#{webhook.name}'" #TODO: i18in message = "Webhook '#{webhook.name}'" #TODO: i18n
$confirm.askOnDelete(title, message).then (finish) => $confirm.askOnDelete(title, message).then (finish) =>
onSucces = -> onSucces = ->

2
app/partials/admin/admin-third-parties-webhooks.jade
View File

@ -56,7 +56,7 @@ block content
div.history-single-wrapper(ng-repeat="log in webhook.logs") div.history-single-wrapper(ng-repeat="log in webhook.logs")
div.history-single div.history-single
div div
span.history-response-icon(ng-class="validStatus ? 'history-success' : 'history-error'") span.history-response-icon(ng-class="log.validStatus ? 'history-success' : 'history-error'", title="{{log.status}}")
span.history-date(ng-bind="log.prettyDate") span.history-date(ng-bind="log.prettyDate")
span.toggle-log.icon.icon-arrow-bottom span.toggle-log.icon.icon-arrow-bottom

5
app/styles/modules/admin/admin-third-parties-webhooks.scss
View File

@ -135,15 +135,12 @@
} }
.history-single-response { .history-single-response {
@include slide(1000px, hidden, $min: 0); @include slide(1000px, hidden, $min: 0);
&.open {
margin-top: 1rem;
}
} }
.history-single-request-header, .history-single-request-header,
.history-single-response-header { .history-single-response-header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: .5rem 0; padding: 1.5rem 0 .5rem 0;
span:first-child { span:first-child {
@extend %bold; @extend %bold;
color: $gray-light; color: $gray-light;