Start support for relation queries in Craft 5.3.0

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Fixed
 
-- Fixed the nested element type view in the Blitz Diagnostics utility.
+- Fixed the nested element type count displayed in the Blitz Diagnostics utility.
 
 ## 5.6.2 - 2024-08-05
 

src/helpers/ElementQueryHelper.php

@@ -273,6 +273,18 @@ public static function getNormalizedElementQueryIdParam(mixed $value): mixed
         return $value;
     }
 
+    /**
+     * Returns whether the element query has numeric IDs that may be related element IDs.
+     */
+    public static function hasRelatedElementIds(ElementQuery $elementQuery): bool
+    {
+        if (!is_array($elementQuery->id)) {
+            return false;
+        }
+
+        return ArrayHelper::isNumeric($elementQuery->id);
+    }
+
     /**
      * Returns whether the element query has fixed IDs.
      */

src/services/GenerateCacheService.php

@@ -254,6 +254,14 @@ public function addElementQuery(ElementQuery $elementQuery): void
             return;
         }
 
+        // Don’t proceed if the query has related element IDs, but add them in case this is a relation field query so that disabled elements will trigger a refresh whenever enabled. Required as of Craft 5.3.0.
+        // https://github.com/putyourlightson/craft-blitz/issues/555
+        if (ElementQueryHelper::hasRelatedElementIds($elementQuery)) {
+            $this->generateData->addElementIds($elementQuery->id);
+
+            return;
+        }
+
         // Don’t proceed if the query has fixed IDs or slugs
         if (ElementQueryHelper::hasFixedIdsOrSlugs($elementQuery)) {
             return;
@@ -289,7 +297,7 @@ public function addElementQuery(ElementQuery $elementQuery): void
             return;
         }
 
-        // Don’t proceed if this is a relation field query
+        // Don’t proceed if this is a relation field query. Required to support relations saved prior to Craft 5.3.0.
         if (ElementQueryHelper::isRelationFieldQuery($elementQuery)) {
             $this->addRelatedElementIds($elementQuery);
 

src/services/HintsService.php

@@ -58,6 +58,14 @@ public function checkElementQuery(ElementQuery $elementQuery): void
             return;
         }
 
+        // TODO: Figure out how to add field hints for related element IDs.
+        // Required as of Craft 5.3.0.
+        if (ElementQueryHelper::hasRelatedElementIds($elementQuery)) {
+            //$this->addFieldHint($field->id);
+            return;
+        }
+
+        // Required to support relations saved prior to Craft 5.3.0.
         if (!ElementQueryHelper::isRelationFieldQuery($elementQuery)) {
             return;
         }