Issue #2927349 by tim.plunkett: Decouple the Layout Builder UI from entities

core/modules/layout_builder/layout_builder.routing.yml

 layout_builder.choose_section:
-  path: '/layout_builder/choose/section/{entity_type_id}/{entity}/{delta}'
+  path: '/layout_builder/choose/section/{section_storage_type}/{section_storage}/{delta}'
   defaults:
    _controller: '\Drupal\layout_builder\Controller\ChooseSectionController::build'
   requirements:
@@ -7,12 +7,11 @@ layout_builder.choose_section:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.add_section:
-  path: '/layout_builder/add/section/{entity_type_id}/{entity}/{delta}/{plugin_id}'
+  path: '/layout_builder/add/section/{section_storage_type}/{section_storage}/{delta}/{plugin_id}'
   defaults:
     _controller: '\Drupal\layout_builder\Controller\AddSectionController::build'
   requirements:
@@ -20,12 +19,11 @@ layout_builder.add_section:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.configure_section:
-  path: '/layout_builder/configure/section/{entity_type_id}/{entity}/{delta}/{plugin_id}'
+  path: '/layout_builder/configure/section/{section_storage_type}/{section_storage}/{delta}/{plugin_id}'
   defaults:
     _title: 'Configure section'
     _form: '\Drupal\layout_builder\Form\ConfigureSectionForm'
@@ -37,12 +35,11 @@ layout_builder.configure_section:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.remove_section:
-  path: '/layout_builder/remove/section/{entity_type_id}/{entity}/{delta}'
+  path: '/layout_builder/remove/section/{section_storage_type}/{section_storage}/{delta}'
   defaults:
     _form: '\Drupal\layout_builder\Form\RemoveSectionForm'
   requirements:
@@ -50,12 +47,11 @@ layout_builder.remove_section:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.choose_block:
-  path: '/layout_builder/choose/block/{entity_type_id}/{entity}/{delta}/{region}'
+  path: '/layout_builder/choose/block/{section_storage_type}/{section_storage}/{delta}/{region}'
   defaults:
     _controller: '\Drupal\layout_builder\Controller\ChooseBlockController::build'
   requirements:
@@ -63,12 +59,11 @@ layout_builder.choose_block:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.add_block:
-  path: '/layout_builder/add/block/{entity_type_id}/{entity}/{delta}/{region}/{plugin_id}'
+  path: '/layout_builder/add/block/{section_storage_type}/{section_storage}/{delta}/{region}/{plugin_id}'
   defaults:
     _form: '\Drupal\layout_builder\Form\AddBlockForm'
   requirements:
@@ -76,12 +71,11 @@ layout_builder.add_block:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.update_block:
-  path: '/layout_builder/update/block/{entity_type_id}/{entity}/{delta}/{region}/{uuid}'
+  path: '/layout_builder/update/block/{section_storage_type}/{section_storage}/{delta}/{region}/{uuid}'
   defaults:
     _form: '\Drupal\layout_builder\Form\UpdateBlockForm'
   requirements:
@@ -89,12 +83,11 @@ layout_builder.update_block:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.remove_block:
-  path: '/layout_builder/remove/block/{entity_type_id}/{entity}/{delta}/{region}/{uuid}'
+  path: '/layout_builder/remove/block/{section_storage_type}/{section_storage}/{delta}/{region}/{uuid}'
   defaults:
     _form: '\Drupal\layout_builder\Form\RemoveBlockForm'
   requirements:
@@ -102,12 +95,11 @@ layout_builder.remove_block:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 layout_builder.move_block:
-  path: '/layout_builder/move/block/{entity_type_id}/{entity}/{delta_from}/{delta_to}/{region_from}/{region_to}/{block_uuid}/{preceding_block_uuid}'
+  path: '/layout_builder/move/block/{section_storage_type}/{section_storage}/{delta_from}/{delta_to}/{region_from}/{region_to}/{block_uuid}/{preceding_block_uuid}'
   defaults:
     _controller: '\Drupal\layout_builder\Controller\MoveBlockController::build'
     delta_from: null
@@ -121,8 +113,7 @@ layout_builder.move_block:
   options:
     _admin_route: TRUE
     parameters:
-      entity:
-        type: entity:{entity_type_id}
+      section_storage:
         layout_builder_tempstore: TRUE
 
 route_callbacks:

core/modules/layout_builder/layout_builder.services.yml

 services:
   layout_builder.tempstore_repository:
     class: Drupal\layout_builder\LayoutTempstoreRepository
-    arguments: ['@user.shared_tempstore', '@entity_type.manager']
+    arguments: ['@user.shared_tempstore']
   access_check.entity.layout:
     class: Drupal\layout_builder\Access\LayoutSectionAccessCheck
     tags:
@@ -15,9 +15,12 @@ services:
       - { name: route_enhancer }
   layout_builder.param_converter:
     class: Drupal\layout_builder\Routing\LayoutTempstoreParamConverter
-    arguments: ['@entity.manager', '@layout_builder.tempstore_repository']
+    arguments: ['@layout_builder.tempstore_repository', '@class_resolver']
     tags:
       - { name: paramconverter, priority: 10 }
+  layout_builder.section_storage_param_converter.overrides:
+    class: Drupal\layout_builder\Routing\SectionStorageOverridesParamConverter
+    arguments: ['@entity.manager']
   cache_context.layout_builder_is_active:
     class: Drupal\layout_builder\Cache\LayoutBuilderIsActiveCacheContext
     arguments: ['@current_route_match']

core/modules/layout_builder/src/Access/LayoutSectionAccessCheck.php

@@ -3,10 +3,10 @@
 namespace Drupal\layout_builder\Access;
 
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\layout_builder\SectionStorageInterface;
 
 /**
  * Provides an access check for the Layout Builder UI.
@@ -16,7 +16,7 @@
 class LayoutSectionAccessCheck implements AccessInterface {
 
   /**
-   * Checks routing access to layout for the entity.
+   * Checks routing access to the layout.
    *
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The current route match.
@@ -27,24 +27,20 @@ class LayoutSectionAccessCheck implements AccessInterface {
    *   The access result.
    */
   public function access(RouteMatchInterface $route_match, AccountInterface $account) {
-    // Attempt to retrieve the generic 'entity' parameter, otherwise look up the
-    // specific entity via the entity type ID.
-    $entity = $route_match->getParameter('entity') ?: $route_match->getParameter($route_match->getParameter('entity_type_id'));
+    $section_storage = $route_match->getParameter('section_storage');
 
-    // If we don't have an entity, forbid access.
-    if (empty($entity)) {
+    if (empty($section_storage)) {
       return AccessResult::forbidden()->addCacheContexts(['route']);
     }
 
-    // If the entity isn't fieldable, forbid access.
-    if (!$entity instanceof FieldableEntityInterface || !$entity->hasField('layout_builder__layout')) {
+    if (!$section_storage instanceof SectionStorageInterface) {
       $access = AccessResult::forbidden();
     }
     else {
       $access = AccessResult::allowedIfHasPermission($account, 'configure any layout');
     }
 
-    return $access->addCacheableDependency($entity);
+    return $access->addCacheableDependency($section_storage);
   }
 
 }

core/modules/layout_builder/src/Controller/AddSectionController.php

@@ -4,9 +4,9 @@
 
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
 use Drupal\layout_builder\Section;
+use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
@@ -51,10 +51,10 @@ public static function create(ContainerInterface $container) {
   }
 
   /**
-   * Add the layout to the entity field in a tempstore.
+   * Adds the new section.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
+   * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
+   *   The section storage.
    * @param int $delta
    *   The delta of the section to splice.
    * @param string $plugin_id
@@ -63,18 +63,16 @@ public static function create(ContainerInterface $container) {
    * @return \Symfony\Component\HttpFoundation\Response
    *   The controller response.
    */
-  public function build(EntityInterface $entity, $delta, $plugin_id) {
-    /** @var \Drupal\layout_builder\SectionStorageInterface $field_list */
-    $field_list = $entity->layout_builder__layout;
-    $field_list->insertSection($delta, new Section($plugin_id));
+  public function build(SectionStorageInterface $section_storage, $delta, $plugin_id) {
+    $section_storage->insertSection($delta, new Section($plugin_id));
 
-    $this->layoutTempstoreRepository->set($entity);
+    $this->layoutTempstoreRepository->set($section_storage);
 
     if ($this->isAjax()) {
-      return $this->rebuildAndClose($entity);
+      return $this->rebuildAndClose($section_storage);
     }
     else {
-      $url = $entity->toUrl('layout-builder');
+      $url = $section_storage->getLayoutBuilderUrl();
       return new RedirectResponse($url->setAbsolute()->toString());
     }
   }

core/modules/layout_builder/src/Controller/ChooseBlockController.php

@@ -4,8 +4,8 @@
 
 use Drupal\Core\Block\BlockManagerInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Url;
+use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -46,8 +46,8 @@ public static function create(ContainerInterface $container) {
   /**
    * Provides the UI for choosing a new block.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
+   * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
+   *   The section storage.
    * @param int $delta
    *   The delta of the section to splice.
    * @param string $region
@@ -56,7 +56,7 @@ public static function create(ContainerInterface $container) {
    * @return array
    *   A render array.
    */
-  public function build(EntityInterface $entity, $delta, $region) {
+  public function build(SectionStorageInterface $section_storage, $delta, $region) {
     $build['#type'] = 'container';
     $build['#attributes']['class'][] = 'block-categories';
 
@@ -72,8 +72,8 @@ public function build(EntityInterface $entity, $delta, $region) {
           'title' => $block['admin_label'],
           'url' => Url::fromRoute('layout_builder.add_block',
             [
-              'entity_type_id' => $entity->getEntityTypeId(),
-              'entity' => $entity->id(),
+              'section_storage_type' => $section_storage->getStorageType(),
+              'section_storage' => $section_storage->getStorageId(),
               'delta' => $delta,
               'region' => $region,
               'plugin_id' => $block_id,

core/modules/layout_builder/src/Controller/ChooseSectionController.php

@@ -3,11 +3,11 @@
 namespace Drupal\layout_builder\Controller;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Layout\LayoutPluginManagerInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
+use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -49,15 +49,15 @@ public static function create(ContainerInterface $container) {
   /**
    * Choose a layout plugin to add as a section.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
+   * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
+   *   The section storage.
    * @param int $delta
    *   The delta of the section to splice.
    *
    * @return array
    *   The render array.
    */
-  public function build(EntityInterface $entity, $delta) {
+  public function build(SectionStorageInterface $section_storage, $delta) {
     $output['#title'] = $this->t('Choose a layout');
 
     $items = [];
@@ -75,8 +75,8 @@ public function build(EntityInterface $entity, $delta) {
         '#url' => Url::fromRoute(
           $layout instanceof PluginFormInterface ? 'layout_builder.configure_section' : 'layout_builder.add_section',
           [
-            'entity_type_id' => $entity->getEntityTypeId(),
-            'entity' => $entity->id(),
+            'section_storage_type' => $section_storage->getStorageType(),
+            'section_storage' => $section_storage->getStorageId(),
             'delta' => $delta,
             'plugin_id' => $plugin_id,
           ]

core/modules/layout_builder/src/Controller/LayoutRebuildTrait.php

@@ -5,7 +5,7 @@
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\CloseDialogCommand;
 use Drupal\Core\Ajax\ReplaceCommand;
-use Drupal\Core\Entity\EntityInterface;
+use Drupal\layout_builder\SectionStorageInterface;
 
 /**
  * Provides AJAX responses to rebuild the Layout Builder.
@@ -24,15 +24,15 @@
   /**
    * Rebuilds the layout.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
+   * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
+   *   The section storage.
    *
    * @return \Drupal\Core\Ajax\AjaxResponse
    *   An AJAX response to either rebuild the layout and close the dialog, or
    *   reload the page.
    */
-  protected function rebuildAndClose(EntityInterface $entity) {
-    $response = $this->rebuildLayout($entity);
+  protected function rebuildAndClose(SectionStorageInterface $section_storage) {
+    $response = $this->rebuildLayout($section_storage);
     $response->addCommand(new CloseDialogCommand('#drupal-off-canvas'));
     return $response;
   }
@@ -40,17 +40,17 @@ protected function rebuildAndClose(EntityInterface $entity) {
   /**
    * Rebuilds the layout.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
+   * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
+   *   The section storage.
    *
    * @return \Drupal\Core\Ajax\AjaxResponse
    *   An AJAX response to either rebuild the layout and close the dialog, or
    *   reload the page.
    */
-  protected function rebuildLayout(EntityInterface $entity) {
+  protected function rebuildLayout(SectionStorageInterface $section_storage) {
     $response = new AjaxResponse();
     $layout_controller = $this->classResolver->getInstanceFromDefinition(LayoutBuilderController::class);
-    $layout = $layout_controller->layout($entity, TRUE);
+    $layout = $layout_controller->layout($section_storage, TRUE);
     $response->addCommand(new ReplaceCommand('#layout-builder', $layout));
     return $response;
   }

core/modules/layout_builder/src/Controller/MoveBlockController.php

@@ -4,8 +4,8 @@
 
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
+use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -50,8 +50,8 @@ public static function create(ContainerInterface $container) {
   /**
    * Moves a block to another region.
    *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
+   * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
+   *   The section storage.
    * @param int $delta_from
    *   The delta of the original section.
    * @param int $delta_to
@@ -68,10 +68,8 @@ public static function create(ContainerInterface $container) {
    * @return \Drupal\Core\Ajax\AjaxResponse
    *   An AJAX response.
    */
-  public function build(EntityInterface $entity, $delta_from, $delta_to, $region_from, $region_to, $block_uuid, $preceding_block_uuid = NULL) {
-    /** @var \Drupal\layout_builder\SectionStorageInterface $field_list */
-    $field_list = $entity->layout_builder__layout;
-    $section = $field_list->getSection($delta_from);
+  public function build(SectionStorageInterface $section_storage, $delta_from, $delta_to, $region_from, $region_to, $block_uuid, $preceding_block_uuid = NULL) {
+    $section = $section_storage->getSection($delta_from);
 
     $component = $section->getComponent($block_uuid);
     $section->removeComponent($block_uuid);
@@ -79,7 +77,7 @@ public function build(EntityInterface $entity, $delta_from, $delta_to, $region_f
     // If the block is moving from one section to another, update the original
     // section and load the new one.
     if ($delta_from !== $delta_to) {
-      $section = $field_list->getSection($delta_to);
+      $section = $section_storage->getSection($delta_to);
     }
 
     // If a preceding block was specified, insert after that. Otherwise add the
@@ -92,8 +90,8 @@ public function build(EntityInterface $entity, $delta_from, $delta_to, $region_f
       $section->appendComponent($component);
     }
 
-    $this->layoutTempstoreRepository->set($entity);
-    return $this->rebuildLayout($entity);
+    $this->layoutTempstoreRepository->set($section_storage);
+    return $this->rebuildLayout($section_storage);
   }
 
 }

core/modules/layout_builder/src/Field/LayoutSectionItemList.php

@@ -74,4 +74,55 @@ public function removeSection($delta) {
     return $this;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getStorageType() {
+    return 'overrides';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getStorageId() {
+    $entity = $this->getEntity();
+    return $entity->getEntityTypeId() . ':' . $entity->id();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function label() {
+    return $this->getEntity()->label();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save() {
+    return $this->getEntity()->save();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCanonicalUrl() {
+    return $this->getEntity()->toUrl('canonical');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getLayoutBuilderUrl() {
+    return $this->getEntity()->toUrl('layout-builder');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __wakeup() {
+    // Ensure the entity is updated with the latest value.
+    $this->getEntity()->set($this->getName(), $this->getValue());
+  }
+
 }

core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php

@@ -6,7 +6,6 @@
 use Drupal\Core\Block\BlockManagerInterface;
 use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Form\SubformState;
@@ -18,6 +17,7 @@
 use Drupal\layout_builder\Controller\LayoutRebuildTrait;
 use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
 use Drupal\layout_builder\Section;
+use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -88,11 +88,11 @@
   protected $region;
 
   /**
-   * The entity.
+   * The section storage.
    *
-   * @var \Drupal\Core\Entity\EntityInterface
+   * @var \Drupal\layout_builder\SectionStorageInterface
    */
-  protected $entity;
+  protected $sectionStorage;
 
   /**
    * Constructs a new block form.
@@ -159,8 +159,8 @@ protected function prepareBlock($block_id, array $configuration) {
    *   An associative array containing the structure of the form.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity being configured.
+   * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
+   *   The section storage being configured.
    * @param int $delta
    *   The delta of the section.
    * @param string $region
@@ -173,8 +173,8 @@ protected function prepareBlock($block_id, array $configuration) {
    * @return array
    *   The form array.
    */
-  public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity = NULL, $delta = NULL, $region = NULL, $plugin_id = NULL, array $configuration = []) {
-    $this->entity = $entity;
+  public function buildForm(array $form, FormStateInterface $form_state, SectionStorageInterface $section_storage = NULL, $delta = NULL, $region = NULL, $plugin_id = NULL, array $configuration = []) {
+    $this->sectionStorage = $section_storage;
     $this->delta = $delta;
     $this->region = $region;
     $this->block = $this->prepareBlock($plugin_id, $configuration);
@@ -246,20 +246,18 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
 
     $configuration = $this->block->getConfiguration();
 
-    /** @var \Drupal\layout_builder\SectionStorageInterface $field_list */
-    $field_list = $this->entity->layout_builder__layout;
-    $section = $field_list->getSection($this->delta);
+    $section = $this->sectionStorage->getSection($this->delta);
     $this->submitBlock($section, $this->region, $configuration['uuid'], $configuration);
 
-    $this->layoutTempstoreRepository->set($this->entity);
-    $form_state->setRedirectUrl($this->entity->toUrl('layout-builder'));
+    $this->layoutTempstoreRepository->set($this->sectionStorage);
+    $form_state->setRedirectUrl($this->sectionStorage->getLayoutBuilderUrl());
   }
 
   /**
    * {@inheritdoc}
    */
   protected function successfulAjaxSubmit(array $form, FormStateInterface $form_state) {
-    return $this->rebuildAndClose($this->entity);
+    return $this->rebuildAndClose($this->sectionStorage);
   }
 
   /**

core/modules/layout_builder/src/Form/ConfigureSectionForm.php

@@ -3,7 +3,6 @@
 namespace Drupal\layout_builder\Form;
 
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Form\SubformState;
@@ -14,6 +13,7 @@
 use Drupal\layout_builder\Controller\LayoutRebuildTrait;
 use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
 use Drupal\layout_builder\Section;
+use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -48,11 +48,11 @@ class ConfigureSectionForm extends FormBase {
   protected $pluginFormFactory;
 
   /**
-   * The entity.
+   * The section storage.
    *
-   * @var \Drupal\Core\Entity\EntityInterface
+   * @var \Drupal\layout_builder\SectionStorageInterface
    */
-  protected $entity;
+  protected $sectionStorage;
 
   /**
    * The field delta.
@@ -105,15 +105,13 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity = NULL, $delta = NULL, $plugin_id = NULL) {
-    $this->entity = $entity;
+  public function buildForm(array $form, FormStateInterface $form_state, SectionStorageInterface $section_storage = NULL, $delta = NULL, $plugin_id = NULL) {
+    $this->sectionStorage = $section_storage;
     $this->delta = $delta;
     $this->isUpdate = is_null($plugin_id);
 
     if ($this->isUpdate) {
-      /** @var \Drupal\layout_builder\SectionStorageInterface $field_list */
-      $field_list = $this->entity->layout_builder__layout;
-      $section = $field_list->getSection($this->delta);
+      $section = $this->sectionStorage->getSection($this->delta);
     }
     else {
       $section = new Section($plugin_id);
@@ -156,24 +154,22 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $plugin_id = $this->layout->getPluginId();
     $configuration = $this->layout->getConfiguration();
 
-    /** @var \Drupal\layout_builder\SectionStorageInterface $field_list */
-    $field_list = $this->entity->layout_builder__layout;
     if ($this->isUpdate) {
-      $field_list->getSection($this->delta)->setLayoutSettings($configuration);
+      $this->sectionStorage->getSection($this->delta)->setLayoutSettings($configuration);
     }
     else {
-      $field_list->insertSection($this->delta, new Section($plugin_id, $configuration));
+      $this->sectionStorage->insertSection($this->delta, new Section($plugin_id, $configuration));
     }
 
-    $this->layoutTempstoreRepository->set($this->entity);
-    $form_state->setRedirectUrl($this->entity->toUrl('layout-builder'));
+    $this->layoutTempstoreRepository->set($this->sectionStorage);
+    $form_state->setRedirectUrl($this->sectionStorage->getLayoutBuilderUrl());
   }
 
   /**
    * {@inheritdoc}
    */
   protected function successfulAjaxSubmit(array $form, FormStateInterface $form_state) {
-    return $this->rebuildAndClose($this->entity);
+    return $this->rebuildAndClose($this->sectionStorage);
   }
 
   /**

core/modules/layout_builder/src/Form/LayoutRebuildConfirmFormBase.php

@@ -3,11 +3,11 @@
 namespace Drupal\layout_builder\Form;
 
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\layout_builder\Controller\LayoutRebuildTrait;
 use Drupal\layout_builder\LayoutTempstoreRepositoryInterface;
+use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -28,11 +28,11 @@
   protected $layoutTempstoreRepository;
 
   /**
-   * The entity.
+   * The section storage.
    *
-   * @var \Drupal\Core\Entity\EntityInterface
+   * @var \Drupal\layout_builder\SectionStorageInterface
    */
-  protected $entity;
+  protected $sectionStorage;
 
   /**
    * The field delta.
@@ -68,14 +68,14 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return $this->entity->toUrl('layout-builder', ['query' => ['layout_is_rebuilding' => TRUE]]);
+    return $this->sectionStorage->getLayoutBuilderUrl()->setOption('query', ['layout_is_rebuilding' => TRUE]);
   }
 
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity = NULL, $delta = NULL) {
-    $this->entity = $entity;
+  public function buildForm(array $form, FormStateInterface $form_state, SectionStorageInterface $section_storage = NULL, $delta = NULL) {
+    $this->sectionStorage = $section_storage;
     $this->delta = $delta;
 
     $form = parent::buildForm($form, $form_state);
@@ -92,9 +92,9 @@ public function buildForm(array $form, FormStateInterface $form_state, EntityInt
    * {@inheritdoc}
    */