Merge remote-tracking branch 'origin/craft-5-develop' into craft-5

Author: andrewmenich

src/services/BlockUsageService.php

@@ -156,28 +156,41 @@ public function getBlockEntries(int $fieldId, int $blockId)
         return $ret;
     }
 
-    public function getEntryTypeEntries(int $entryTypeId)
+    public function getEntryTypeEntries(int $fieldId, int $entryTypeId)
     {
-        $entryType = Craft::$app->getEntries()->getEntryTypeById($entryTypeId);
+        $entryType = Craft::$app->getEntries()->getEntryTypeById($entryTypeId) ?? Craft::$app->getEntries()->getEntryTypeById($fieldId);
 
-        $entries = Entry::find()->typeId($entryTypeId)->status(null)->collect();
+        if(!$entryType) {
+            return [
+                'block' => [
+                    'name' => '',
+                ],
+                'entries' => []
+            ];
+        }
 
-        $topLevelEntries = $entries->map(function($entry){
-            try {
-                $owner = $entry->getOwner();
+        $entries = Entry::find()->typeId($entryType->id)->status(null)->collect();
 
-                if($owner) {
-                    while($owner->getOwner()) {
-                        $owner = $owner->getOwner();
+        $topLevelEntries = $entries
+            ->filter(function($entry) use ($fieldId){
+                return $entry->fieldId === $fieldId;
+            })
+            ->map(function($entry){
+                try {
+                    $owner = $entry->getOwner();
+                    if($owner) {
+                        while($owner->getOwner()) {
+                            $owner = $owner->getOwner();
+                        }
                     }
-                }
 
 
-                return $owner ?? $entry;
-            } catch(Exception $e) {
-                return $entry;
-            }
-        })->unique();
+                    return $owner ?? $entry;
+                } catch(Exception $e) {
+                    return $entry;
+                }
+            })
+            ->unique();
 
         $labelHtml = $this->_getEntryTypeLabel($entryType);
         return [

src/variables/BlockUsageVariable.php

@@ -32,9 +32,9 @@ public function getBlockEntries($fieldId, $blockId): array
         return BlockUsage::getInstance()->blockUsageService->getBlockEntries($fieldId, $blockId);
     }
 
-    public function getEntryTypeEntries($entryId): array
+    public function getEntryTypeEntries($entryId, $blockId): array
     {
-        return BlockUsage::getInstance()->blockUsageService->getEntryTypeEntries($entryId);
+        return BlockUsage::getInstance()->blockUsageService->getEntryTypeEntries($entryId, $blockId);
     }
 
     public function getEntryTypes($fieldId): array