Skip to content

Commit b1d96e2

Browse files
committed
Use a slideout for webhook details
1 parent 2120d51 commit b1d96e2

File tree

4 files changed

+39
-16
lines changed

4 files changed

+39
-16
lines changed

src/assets/activity/ActivityAsset.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ class ActivityAsset extends AssetBundle
2525
CpAsset::class,
2626
];
2727

28+
public $css = [
29+
'css/activity.css',
30+
];
31+
2832
public $js = [
2933
'js/Activity.js',
3034
];
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.webhook-activity-slideout {
2+
overflow-y: auto;
3+
}
4+
5+
.webhook-activity-slideout .meta {
6+
margin-left: -24px;
7+
margin-right: -24px;
8+
}
9+
10+
.webhook-activity-slideout .pane.code {
11+
max-height: 500px;
12+
overflow: auto;
13+
}

src/assets/activity/dist/js/Activity.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,30 @@
1717
requestId: requestId
1818
}, function(response, textStatus) {
1919
if (textStatus === 'success') {
20-
var hud = new Garnish.HUD($a, response.html);
21-
initHud(hud, requestId);
20+
const slideout = new Craft.Slideout(response.html, {
21+
containerAttributes: {
22+
class: 'webhook-activity-slideout',
23+
}
24+
});
25+
initSlideout(slideout, requestId);
2226
}
2327
})
2428
});
2529
});
2630

27-
function initHud(hud, requestId) {
28-
var $redeliverBtn = hud.$main.find('.redeliver-btn');
31+
function initSlideout(slideout, requestId) {
32+
const $redeliverBtn = slideout.$container.find('.redeliver-btn');
2933
$redeliverBtn.on('click', function() {
3034
if (!$redeliverBtn.hasClass('disabled') && confirm(Craft.t('webhooks', 'Are you sure you want to resend this request?'))) {
3135
$redeliverBtn.addClass('disabled');
32-
var $spinner = $(this).next('.spinner').removeClass('hidden');
36+
const $spinner = $(this).next('.spinner').removeClass('hidden');
3337
Craft.postActionRequest('webhooks/activity/redeliver', {
3438
requestId: requestId
3539
}, function(response, textStatus) {
3640
$spinner.addClass('hidden');
3741
if (textStatus === 'success') {
38-
hud.updateBody(response.html);
39-
initHud(hud, requestId);
42+
slideout.$container.html(response.html);
43+
initSlideout(slideout, requestId);
4044
}
4145
})
4246
}

src/templates/_activity/details.html

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@
3535
{% endif %}
3636
</div>
3737

38-
<div class="buttons">
39-
40-
</div>
41-
4238
<hr>
4339

4440
<h4>{{ 'Request'|t('webhooks') }}</h4>
@@ -49,8 +45,14 @@ <h4>{{ 'Request'|t('webhooks') }}</h4>
4945
</div>
5046

5147
<h4>{{ 'Response'|t('webhooks') }}</h4>
52-
<div class="pane code">
53-
{{ macros.headers(request.responseHeaders) }}
54-
<br>
55-
<pre>{{ request.responseBody }}</pre>
56-
</div>
48+
{% if request.responseHeaders or request.responseBody %}
49+
<div class="pane code">
50+
{{ macros.headers(request.responseHeaders) }}
51+
<br>
52+
<pre>{{ request.responseBody }}</pre>
53+
</div>
54+
{% else %}
55+
<div class="pane zilch">
56+
<p>{{ 'No response yet.'|t('webhooks') }}</p>
57+
</div>
58+
{% endif %}

0 commit comments

Comments
 (0)