Issue #3190542 by godotislate, clayfreeman, tim.plunkett, neclimdul,... (038e6515) · Commits · project / drupal

core/modules/layout_builder/src/Plugin/SectionStorage/OverridesSectionStorage.php

+6 −4

Original line number	Diff line number	Diff line
		@@ -188,7 +188,9 @@ public function deriveContextsFromRoute($value, $definition, $name, array $defau
		* The route defaults array.
		*
		* @return \Drupal\Core\Entity\EntityInterface\|null
		* The entity for the route, or NULL if none exist.
		* The entity for the route, or NULL if none exist. The entity is not
		* guaranteed to be fieldable, or contain the necessary field for this
		* section storage plugin.
		*
		* @see \Drupal\layout_builder\SectionStorageInterface::deriveContextsFromRoute()
		* @see \Drupal\Core\ParamConverter\ParamConverterInterface::convert()
		@@ -206,9 +208,7 @@ private function extractEntityFromRoute($value, array $defaults) {
		}

		$entity = $this->entityRepository->getActive($entity_type_id, $entity_id);
		if ($entity instanceof FieldableEntityInterface && $entity->hasField(static::FIELD_NAME)) {
		return $entity;
		}
		return ($entity instanceof FieldableEntityInterface) ? $entity : NULL;
		}

		/**
		@@ -359,6 +359,8 @@ public function access($operation, AccountInterface $account = NULL, $return_as_

		// Access also depends on the default being enabled.
		$result = $result->andIf($this->getDefaultSectionStorage()->access($operation, $account, TRUE));
		// Access also depends on the default layout being overridable.
		$result = $result->andIf(AccessResult::allowedIf($this->getDefaultSectionStorage()->isOverridable())->addCacheableDependency($this->getDefaultSectionStorage()));
		$result = $this->handleTranslationAccess($result, $operation, $account);
		return $return_as_object ? $result : $result->isAllowed();
		}

core/modules/layout_builder/tests/src/Functional/LayoutBuilderLocalTaskTest.php

0 → 100644

+111 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Tests\layout_builder\Functional;

		use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
		use Drupal\Tests\BrowserTestBase;

		/**
		* Tests Layout Builder local tasks.
		*
		* @group layout_builder
		*/
		class LayoutBuilderLocalTaskTest extends BrowserTestBase {

		/**
		* {@inheritdoc}
		*/
		protected static $modules = [
		'layout_builder',
		'block',
		'node',
		];

		/**
		* {@inheritdoc}
		*/
		protected $defaultTheme = 'stark';

		/**
		* {@inheritdoc}
		*/
		protected function setUp(): void {
		parent::setUp();

		$this->drupalPlaceBlock('local_tasks_block');
		}

		/**
		* Tests the cacheability of local tasks with Layout Builder module installed.
		*/
		public function testLocalTaskLayoutBuilderInstalledCacheability() {
		// Create only one bundle and do not enable layout builder on its display.
		$this->drupalCreateContentType([
		'type' => 'bundle_no_lb_display',
		]);

		LayoutBuilderEntityViewDisplay::load('node.bundle_no_lb_display.default')
		->disableLayoutBuilder()
		->save();

		$node = $this->drupalCreateNode([
		'type' => 'bundle_no_lb_display',
		]);

		$assert_session = $this->assertSession();

		$this->drupalLogin($this->drupalCreateUser([
		'configure any layout',
		]));

		$this->drupalGet('node/' . $node->id());
		$assert_session->responseHeaderEquals('X-Drupal-Cache-Max-Age', '-1 (Permanent)');
		$assert_session->statusCodeEquals(200);
		}

		/**
		* Tests the cacheability of local tasks with multiple content types.
		*/
		public function testLocalTaskMultipleContentTypesCacheability() {
		// Test when there are two content types, one with a display having Layout
		// Builder enabled with overrides, and another with display not having
		// Layout Builder enabled.
		$this->drupalCreateContentType([
		'type' => 'bundle_no_lb_display',
		]);
		LayoutBuilderEntityViewDisplay::load('node.bundle_no_lb_display.default')
		->disableLayoutBuilder()
		->save();

		$node_without_lb = $this->drupalCreateNode([
		'type' => 'bundle_no_lb_display',
		]);

		$this->drupalCreateContentType([
		'type' => 'bundle_with_overrides',
		]);
		LayoutBuilderEntityViewDisplay::load('node.bundle_with_overrides.default')
		->enableLayoutBuilder()
		->setOverridable()
		->save();

		$node_with_overrides = $this->drupalCreateNode([
		'type' => 'bundle_with_overrides',
		]);

		$assert_session = $this->assertSession();

		$this->drupalLogin($this->drupalCreateUser([
		'configure any layout',
		]));

		$this->drupalGet('node/' . $node_without_lb->id());
		$assert_session->responseHeaderEquals('X-Drupal-Cache-Max-Age', '-1 (Permanent)');
		$assert_session->statusCodeEquals(200);

		$this->drupalGet('node/' . $node_with_overrides->id());
		$assert_session->responseHeaderEquals('X-Drupal-Cache-Max-Age', '-1 (Permanent)');
		$assert_session->statusCodeEquals(200);
		}

		}

core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -236,7 +236,7 @@ public function testLayoutUrlNoSectionField() {
		$node->save();

		$this->drupalGet($node->toUrl('canonical')->toString() . '/layout');
		$this->assertSession()->statusCodeEquals(404);
		$this->assertSession()->statusCodeEquals(403);
		}

		/**

core/modules/layout_builder/tests/src/Unit/OverridesSectionStorageTest.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ public function providerTestExtractEntityFromRoute() {
		[],
		];
		$data['with value, without layout'] = [
		FALSE,
		TRUE,
		'my_entity_type',
		'my_entity_type.entity_without_layout',
		[],