diff --git a/core/modules/layout_builder/layout_builder.module b/core/modules/layout_builder/layout_builder.module index 152c3afe74..5bd0ee62d1 100644 --- a/core/modules/layout_builder/layout_builder.module +++ b/core/modules/layout_builder/layout_builder.module @@ -142,9 +142,9 @@ function layout_builder_entity_view_alter(array &$build, EntityInterface $entity } } - /** @var \Drupal\layout_builder\QuickEditIntegration $quickEditIntegration */ - $quickEditIntegration = \Drupal::classResolver(QuickEditIntegration::class); - $quickEditIntegration->entityViewAlter($build, $entity, $display); + /** @var \Drupal\layout_builder\QuickEditIntegration $quick_edit_integration */ + $quick_edit_integration = \Drupal::classResolver(QuickEditIntegration::class); + $quick_edit_integration->entityViewAlter($build, $entity, $display); } /** @@ -321,7 +321,7 @@ function layout_builder_system_breadcrumb_alter(Breadcrumb &$breadcrumb, RouteMa * Implements hook_quickedit_render_field(). */ function layout_builder_quickedit_render_field(EntityInterface $entity, $field_name, $view_mode_id, $langcode) { - /** @var \Drupal\layout_builder\QuickEditIntegration $quickEditIntegration */ - $quickEditIntegration = \Drupal::classResolver(QuickEditIntegration::class); - return $quickEditIntegration->quickEditRenderField($entity, $field_name, $view_mode_id, $langcode); + /** @var \Drupal\layout_builder\QuickEditIntegration $quick_edit_integration */ + $quick_edit_integration = \Drupal::classResolver(QuickEditIntegration::class); + return $quick_edit_integration->quickEditRenderField($entity, $field_name, $view_mode_id, $langcode); } diff --git a/core/modules/layout_builder/src/QuickEditIntegration.php b/core/modules/layout_builder/src/QuickEditIntegration.php index fd59d4f700..c1be8b0209 100644 --- a/core/modules/layout_builder/src/QuickEditIntegration.php +++ b/core/modules/layout_builder/src/QuickEditIntegration.php @@ -8,7 +8,6 @@ use Drupal\Core\Entity\Entity\EntityViewDisplay; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\FieldableEntityInterface; -use Drupal\Core\Entity\RevisionableInterface; use Drupal\Core\Plugin\Context\Context; use Drupal\Core\Plugin\Context\ContextDefinition; use Drupal\Core\Plugin\Context\ContextRepositoryInterface; @@ -101,7 +100,7 @@ public function entityViewAlter(array &$build, EntityInterface $entity, EntityVi $component_uuid, $entity->id(), ]); - if ($entity instanceof RevisionableInterface) { + if ($entity->getEntityType()->isRevisionable()) { $component['content']['#view_mode'] .= ':' . $entity->getRevisionId(); } } @@ -133,14 +132,14 @@ public function quickEditRenderField(EntityInterface $entity, $field_name, $view list(, $delta, $component_uuid) = explode('-', $view_mode_id, 3); if ($entity instanceof FieldableEntityInterface) { $view_display = EntityViewDisplay::collectRenderDisplay($entity, $view_mode_id); - $cacheableMetaData = new CacheableMetadata(); + $cacheable_metadata = new CacheableMetadata(); $section_list = $this->sectionStorageManager->findByContext( [ 'display' => EntityContext::fromEntity($view_display), 'entity' => EntityContext::fromEntity($entity), 'view_mode' => new Context(new ContextDefinition('string'), $view_mode_id), ], - $cacheableMetaData + $cacheable_metadata ); $component = $section_list->getSection($delta) @@ -148,22 +147,24 @@ public function quickEditRenderField(EntityInterface $entity, $field_name, $view $contexts = $this->contextRepository->getAvailableContexts(); // @todo Change to use EntityContextDefinition in // https://www.drupal.org/project/drupal/issues/2932462. - $contexts['layout_builder.entity'] = new Context(new ContextDefinition("entity:{$entity->getEntityTypeId()}", new TranslatableMarkup('@entity being viewed', [ - '@entity' => $entity->getEntityType() - ->getLabel(), - ])), $entity); + $contexts['layout_builder.entity'] = new Context( + new ContextDefinition( + "entity:{$entity->getEntityTypeId()}", + new TranslatableMarkup('@entity being viewed', ['@entity' => $entity->getEntityType()->getLabel()])), + $entity + ); $block = $component->toRenderArray($contexts); $build = $block['content']; $build['#view_mode'] = $view_mode_id; - $cacheableMetaData->applyTo($build); + $cacheable_metadata->applyTo($build); } return $build; } /** - * Determines whether a component should have QuickEdit support. + * Determines whether a component has QuickEdit support. * - * Only field_blocks components for view configurable fields should be + * Only field_block components for view configurable fields should be * supported. * * @param array $component @@ -172,7 +173,9 @@ public function quickEditRenderField(EntityInterface $entity, $field_name, $view * The entity being displayed. * * @return bool - * Whether QuickEdit should be supported on the component. + * Whether QuickEdit is supported on the component. + * + * @see \Drupal\layout_builder\Plugin\Block\FieldBlock */ private function supportQuickEditOnComponent($component, FieldableEntityInterface $entity) { if (isset($component['content']['#field_name']) && isset($component['#base_plugin_id']) && $component['#base_plugin_id'] === 'field_block') { diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php index 0fcd821755..ceacf549fa 100644 --- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php +++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php @@ -37,6 +37,7 @@ protected function setUp() { // https://www.drupal.org/project/drupal/issues/2917777. $this->drupalPlaceBlock('local_tasks_block'); + // Save the current user to re-login after Layout Builder changes. $user = $this->loggedInUser; $this->loginLayoutAdmin(); @@ -64,7 +65,6 @@ protected function setUp() { public function testArticleNode($useOverride = FALSE) { $this->useOverride = $useOverride; parent::testArticleNode(); - // @todo Test publised, title or other field that does appear in manage dispaly. } public function provideTestArticleNode() { @@ -81,6 +81,7 @@ public function drupalCreateNode(array $settings = []) { $node = parent::drupalCreateNode($settings); $assert_session = $this->assertSession(); if ($this->useOverride) { + // Save the current user to re-login after Layout Builder changes. $user = $this->loggedInUser; $this->loginLayoutAdmin(); $this->drupalGet('node/' . $node->id() . '/layout'); @@ -122,6 +123,9 @@ protected function assertEntityInstanceFieldMarkup($entity_type_id, $entity_id, protected function replaceLayoutBuilderFieldIdKeys(array $array) { $layout_builder_expected_states = []; foreach ($array as $field_key => $value) { + // Extract from $field_key all of the information we need to call + // getQuickEditFieldId(). The fourth part of $field_key, language code, is + // not needed so it can be ignored. list($entity_type, $entity_id, $field_name, , $view_mode) = explode('/', $field_key); $layout_builder_expected_states[$this->getQuickEditFieldId($entity_type, $entity_id, $field_name, $view_mode)] = $value; } @@ -137,22 +141,28 @@ protected function replaceLayoutBuilderFieldIdKeys(array $array) { * The entity ID. * @param string $field_name * The field name. + * @param string $view_mode + * The view mode. + * * * @return string * The view mode used by layout builder. */ protected function getLayoutBuilderViewMode($entity_type, $entity_id, $field_name, $view_mode) { + // If the field is one that is not rendered by Layout Builder do not change + // $view_mode. if (in_array($field_name, ['title', 'uid', 'created'])) { return $view_mode; } + /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */ $entity = \Drupal::entityTypeManager()->getStorage($entity_type)->load($entity_id); $view_display = EntityViewDisplay::collectRenderDisplay($entity, 'default'); $sections = $view_display->getSections(); - // Find the body field component. + // Find the component with the plugin ID in the field_block format that + // matches the entity type, bundle, and field name. foreach (reset($sections)->getComponents() as $component) { if ($component->getPlugin()->getPluginId() === "field_block:$entity_type:{$entity->bundle()}:$field_name") { - // Hard code entity id and revision id. - return 'layout_builder:0:' . $component->getUuid() . ":1:1"; + return 'layout_builder:0:' . $component->getUuid() . ':' . $entity->id() . ':' . $entity->getRevisionId(); } } $this->fail("Component not found for: $entity_type, $entity_id, $field_name"); diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php index 9e617d553a..9d2fbddf7b 100644 --- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php +++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php @@ -26,12 +26,8 @@ class LayoutBuilderTest extends WebDriverTestBase { 'layout_builder', 'layout_test', 'node', - 'quickedit', - 'dblog', ]; - protected $profile = 'standard'; - /** * The node to customize with Layout Builder. * @@ -54,9 +50,28 @@ class LayoutBuilderTest extends WebDriverTestBase { protected function setUp() { parent::setUp(); - //$this->createContentType(['type' => 'bundle_with_section_field']); + $this->drupalPlaceBlock('local_tasks_block'); + + $bundle = BlockContentType::create([ + 'id' => 'basic', + 'label' => 'Basic', + ]); + $bundle->save(); + block_content_add_body_field($bundle->id()); + BlockContent::create([ + 'info' => 'My custom block', + 'type' => 'basic', + 'body' => [ + [ + 'value' => 'This is the block content', + 'format' => filter_default_format(), + ], + ], + ])->save(); + + $this->createContentType(['type' => 'bundle_with_section_field']); $this->node = $this->createNode([ - 'type' => 'article', + 'type' => 'bundle_with_section_field', 'title' => 'The node title', 'body' => [ [ @@ -69,9 +84,6 @@ protected function setUp() { 'access contextual links', 'configure any layout', 'administer node display', - 'access in-place editing', - 'edit any article content', - 'access site reports', ], 'foobar')); } @@ -245,7 +257,7 @@ public function testConfigurableLayoutSections() { ->getStorage('entity_view_display') ->create([ 'targetEntityType' => 'node', - 'bundle' => 'article', + 'bundle' => 'bundle_with_section_field', 'mode' => 'full', ]) ->enable() @@ -256,8 +268,6 @@ public function testConfigurableLayoutSections() { $assert_session = $this->assertSession(); $page = $this->getSession()->getPage(); - $this->drupalGet('node/1'); - $assert_session->waitForElementVisible('css', '.never',10000000000000); $this->drupalGet($layout_url); $this->markCurrentPage();