Use DefineElementEditorHtmlEvent event instead

putyourlightson · Aug 1, 2024 · 1c01786 · 1c01786
1 parent 97fefc1
commit 1c01786
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/src/helpers/ElementSidebarHelper.php b/src/helpers/ElementSidebarHelper.php
@@ -8,7 +8,7 @@
 use Craft;
 use craft\base\Element;
 use craft\base\Event;
-use craft\events\DefineHtmlEvent;
+use craft\events\DefineElementEditorHtmlEvent;
 use craft\helpers\Db;
 use craft\helpers\Html;
 use craft\helpers\UrlHelper;
@@ -38,26 +38,26 @@ public static function getSidebarHtml(Element $element): string
             return '';
         }
 
-        $siteUri = new SiteUriModel([
-            'siteId' => $element->siteId,
-            'uri' => $element->uri,
-        ]);
-
         $html = Html::beginTag('fieldset', ['class' => 'blitz-element-sidebar']) .
             Html::tag('legend', 'Blitz', ['class' => 'h6']) .
-            Html::tag('div', self::metaFieldsHtml($siteUri), ['class' => 'meta']) .
+            Html::tag('div', self::metaFieldsHtml($element), ['class' => 'meta']) .
             Html::endTag('fieldset');
 
-        $event = new DefineHtmlEvent([
+        $event = new DefineElementEditorHtmlEvent([
+            'element' => $element,
             'html' => $html,
         ]);
         Event::trigger(self::class, self::EVENT_DEFINE_SIDEBAR_HTML, $event);
 
         return $event->html;
     }
 
-    private static function metaFieldsHtml(SiteUriModel $siteUri): string
+    private static function metaFieldsHtml(Element $element): string
     {
+        $siteUri = new SiteUriModel([
+            'siteId' => $element->siteId,
+            'uri' => $element->uri,
+        ]);
         $cachedValue = Blitz::$plugin->cacheStorage->get($siteUri);
 
         /** @var CacheRecord|null $cacheRecord */
@@ -70,14 +70,11 @@ private static function metaFieldsHtml(SiteUriModel $siteUri): string
             'expired' => $cacheRecord && $cacheRecord->expiryDate && $cacheRecord->expiryDate <= Db::prepareDateForDb('now'),
             'dateCached' => $cacheRecord->dateCached ?? null,
             'expiryDate' => $cacheRecord->expiryDate ?? null,
-            'refreshActionUrl' => UrlHelper::actionUrl('blitz/cache/refresh-page', [
-                'siteId' => $siteUri->siteId,
-                'uri' => $siteUri->uri,
-                'sidebarPanel' => 1,
-            ]),
+            'refreshActionUrl' => UrlHelper::actionUrl('blitz/cache/refresh-page', $siteUri->toArray()),
         ]);
 
-        $event = new DefineHtmlEvent([
+        $event = new DefineElementEditorHtmlEvent([
+            'element' => $element,
             'html' => $html,
         ]);
         Event::trigger(self::class, self::EVENT_DEFINE_META_FIELDS_HTML, $event);

diff --git a/src/templates/_element-sidebar.twig b/src/templates/_element-sidebar.twig
@@ -23,7 +23,7 @@
 </div>
 {% if cached %}
     {% if dateCached %}
-        <div class="data date">
+        <div class="data live">
             <div class="heading">
                 {{ 'Cached at'|t('blitz') }}
             </div>
@@ -33,7 +33,7 @@
         </div>
     {% endif %}
     {% if expiryDate %}
-        <div class="data date">
+        <div class="data live">
             <div class="heading">
                 {{ expired ? 'Expired at'|t('blitz') : 'Expires at'|t('blitz') }}
             </div>
@@ -70,7 +70,7 @@
         .then((response) => {
             Craft.cp.displaySuccess(response.data.message);
             $('.blitz-element-sidebar .cacheStatus').html(Craft.t('blitz', 'Refreshed'));
-            $('.blitz-element-sidebar .date').remove();
+            $('.blitz-element-sidebar .live').remove();
         })
         .catch(({response}) => {
             if (response.data.message) {