Fix Craft element route matching & autoload entry & category

Author: chasegiunta

src/Plugin.php

@@ -8,6 +8,8 @@
 use craft\base\Element;
 use craft\base\Model;
 use craft\base\Plugin as BasePlugin;
+use craft\elements\Entry;
+use craft\elements\Category;
 use craft\events\RegisterTemplateRootsEvent;
 use craft\events\RegisterUrlRulesEvent;
 use craft\events\SetElementRouteEvent;
@@ -203,6 +205,12 @@ function (RegisterTemplateRootsEvent $event) {
             Element::class,
             Element::EVENT_SET_ROUTE,
             function (SetElementRouteEvent $event) {
+                $element = $event->sender;
+                if (!$element) return;
+                
+                $isCraftElement = $element instanceof Entry || $element instanceof Category;
+                if (!$isCraftElement) return;
+
                 $event->route = 'inertia/base/index';
 
                 // Explicitly tell the element that a route has been set,

src/controllers/BaseController.php

@@ -5,6 +5,8 @@
 use Craft;
 use craft\web\UrlManager;
 use Illuminate\Support\Arr;
+use craft\elements\Entry;
+use craft\elements\Category;
 use craft\services\Elements;
 
 use yii\web\NotFoundHttpException;
@@ -51,7 +53,11 @@ public function actionIndex(): array|string
                 // We're probably validating an element in a form
                 // And need to give to give it the user to get validation errors
                 $element = Craft::$container->get('currentElement');
-                $templateVariables['element'] = $element;
+                if ($element instanceof Entry) {
+                    $templateVariables['entry'] = $element;
+                } else if ($element instanceof Category) {
+                    $templateVariables['category'] = $element;
+                }
             }
 
             try {
@@ -294,30 +300,35 @@ private function extractUriParameters($uri, $uriFormat)
 
     private function handleElementRequest($element, $uri)
     {
-        $section = $element->getSection();
+        $sectionOrGroup = $element instanceof Entry ? $element->getSection() : $element->getGroup();
 
         $site = Craft::$app->getSites()->getCurrentSite();
         $siteID = $site->id;
 
-        /** @var array $sectionSiteSettings */
-        $sectionSiteSettings = $section->getSiteSettings();
-        $sectionSiteSetting = null;
-        foreach ($sectionSiteSettings as $setting) {
+        /** @var array $siteSettings */
+        $siteSettings = $sectionOrGroup->getSiteSettings();
+        $siteSetting = null;
+        foreach ($siteSettings as $setting) {
             if ($setting->siteId === $siteID) {
-                $sectionSiteSetting = $setting;
+                $siteSetting = $setting;
                 break;
             }
         }
 
-        if ($sectionSiteSetting === null) {
+        if ($siteSetting === null) {
             throw new \Exception('No section site setting found for the current site.');
         }
 
-        $uriFormat = $sectionSiteSetting->uriFormat;
+        $uriFormat = $siteSetting->uriFormat;
 
-        $specifiedTemplate = $sectionSiteSetting->template;
+        $specifiedTemplate = $siteSetting->template;
         $templateVariables = $this->extractUriParameters($uri, $uriFormat);
-        $templateVariables['element'] = $element;
+
+        if  ($element instanceof Entry) {
+            $templateVariables['entry'] = $element;
+        } elseif ($element instanceof Category) {
+            $templateVariables['category'] = $element;
+        }
 
         $matchesTwigTemplate = Craft::$app->getView()->doesTemplateExist($specifiedTemplate);
         return [$matchesTwigTemplate, $specifiedTemplate, $templateVariables];