"Send now" button

Reolves #35

Author: brandonkelly

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Added
 - Added new “Element is being saved for the first time” and “Element is a provisional draft” webhook filters.
 - Some webhook filters now disable other mutually-exclusive filters when active and enabled.
+- Pending webhook requests now have a “Send now” button, for manually triggering a webhook if the queue job was lost or failed. ([#35](https://github.com/craftcms/webhooks/issues/35))
 - Added the “Initial Delay” setting. ([#53](https://github.com/craftcms/webhooks/discussions/53))
 - Added `craft\webhooks\filters\ExclusiveFilterInterface`.
 

src/assets/activity/ActivityAsset.php

@@ -9,7 +9,6 @@
 
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
-use craft\web\View;
 
 /**
  * Webhooks index asset bundle
@@ -32,18 +31,4 @@ class ActivityAsset extends AssetBundle
     public $js = [
         'js/Activity.js',
     ];
-
-    /**
-     * @inheritdoc
-     */
-    public function registerAssetFiles($view)
-    {
-        parent::registerAssetFiles($view);
-
-        if ($view instanceof View) {
-            $view->registerTranslations('webhooks', [
-                'Are you sure you want to resend this request?',
-            ]);
-        }
-    }
 }

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

@@ -29,10 +29,10 @@
     });
 
     function initSlideout(slideout, requestId) {
-        const $redeliverBtn = slideout.$container.find('.redeliver-btn');
-        $redeliverBtn.on('click', function() {
-            if (!$redeliverBtn.hasClass('disabled') && confirm(Craft.t('webhooks', 'Are you sure you want to resend this request?'))) {
-                $redeliverBtn.addClass('disabled');
+        const $sendBtn = slideout.$container.find('.send-btn');
+        $sendBtn.on('click', function() {
+            if (!$sendBtn.hasClass('disabled')) {
+                $sendBtn.addClass('disabled');
                 const $spinner = $(this).next('.spinner').removeClass('hidden');
                 Craft.postActionRequest('webhooks/activity/redeliver', {
                     requestId: requestId

src/templates/_activity/details.html

@@ -13,7 +13,14 @@
   {% endif %}
   <div class="data">
     <div class="heading">{{ 'Status'|t('webhooks') }}</div>
-    <div class="value">{{ macros.status(request) }}</div>
+    <div class="value">
+      {{ macros.status(request) }}
+      {% if request.status == 'pending' %}
+        &nbsp;&nbsp;
+        <div class="btn small send-btn">{{ 'Send now'|t('webhooks') }}</div>
+        <div class="spinner hidden"></div>
+      {% endif %}
+    </div>
   </div>
   {% if request.status == 'done' %}
     <div class="data">
@@ -27,7 +34,7 @@
       <div class="value">
         <div class="flex">
           <div>{{ request.attempts }}&nbsp;&nbsp;</div>
-          <div class="btn small redeliver-btn">{{ 'Redeliver'|t('webhooks') }}</div>
+          <div class="btn small send-btn">{{ 'Redeliver'|t('webhooks') }}</div>
           <div class="spinner hidden"></div>
         </div>
       </div>