From 76a9cf047bb2521d8f8958d89c522ae78b4d289c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20Sch=C3=BCring?=
 <46997-sunlix@users.noreply.drupalcode.org>
Date: Thu, 30 Mar 2023 06:14:17 +0000
Subject: [PATCH] Issue #3349660 by sunlix: Missing MediaEntityHierarchyHandler

---
 src/Handler/EntityHierarchyHandler.php                 | 2 +-
 tests/src/Functional/ReorderChildrenFunctionalTest.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Handler/EntityHierarchyHandler.php b/src/Handler/EntityHierarchyHandler.php
index 50f2980..3ab447e 100644
--- a/src/Handler/EntityHierarchyHandler.php
+++ b/src/Handler/EntityHierarchyHandler.php
@@ -17,7 +17,7 @@ class EntityHierarchyHandler implements EntityHierarchyHandlerInterface {
   public function getAddChildUrl(EntityTypeInterface $entityType, ContentEntityInterface $parent, $bundle, $fieldName) {
     $routeName = "entity.{$entityType->id()}.add_form";
     return Url::fromRoute($routeName, [
-      $entityType->getKey('bundle') => $bundle,
+      ($entityType->getBundleEntityType() ?? $entityType->getKey('bundle')) => $bundle,
     ], [
       'query' => [
         $fieldName => $parent->id(),
diff --git a/tests/src/Functional/ReorderChildrenFunctionalTest.php b/tests/src/Functional/ReorderChildrenFunctionalTest.php
index b8f6b63..16bc6bc 100644
--- a/tests/src/Functional/ReorderChildrenFunctionalTest.php
+++ b/tests/src/Functional/ReorderChildrenFunctionalTest.php
@@ -128,7 +128,7 @@ class ReorderChildrenFunctionalTest extends BrowserTestBase {
     $assert->linkExists('Children');
     $different_test_entity = EntityTestRev::create([
       'type' => 'entity_test_rev',
-      'label' => 'No children here',
+      'name' => 'No children here',
     ]);
     $different_test_entity->save();
     $this->drupalGet($different_test_entity->toUrl());
@@ -140,7 +140,7 @@ class ReorderChildrenFunctionalTest extends BrowserTestBase {
     entity_test_create_bundle('someotherbundle');
     $another_different_test_entity = EntityTest::create([
       'type' => 'someotherbundle',
-      'label' => 'No children here either',
+      'name' => 'No children here either',
     ]);
     $another_different_test_entity->save();
     $this->drupalGet($another_different_test_entity->toUrl());
@@ -156,7 +156,7 @@ class ReorderChildrenFunctionalTest extends BrowserTestBase {
     $field->save();
     $another_different_test_entity = EntityTest::create([
       'type' => 'someotherbundle',
-      'label' => 'No children here either',
+      'name' => 'No children here either',
     ]);
     $another_different_test_entity->save();
     $this->drupalGet($another_different_test_entity->toUrl());
-- 
GitLab