rerolled https://www.drupal.org/files/issues/2018-09-26/2977587-30.patch no tests

tedbow · tedbow · commit 86d8b9ad0598 · 2018-09-27T12:34:49.000-04:00
diff --git a/core/modules/layout_builder/src/Controller/ChooseBlockController.php b/core/modules/layout_builder/src/Controller/ChooseBlockController.php
@@ -11,6 +11,7 @@
 use Drupal\layout_builder\Context\LayoutBuilderContextTrait;
 use Drupal\layout_builder\SectionStorageInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Entity\EntityTypeRepositoryInterface;
 
 /**
  * Defines a controller to choose a new block.
@@ -37,17 +38,27 @@ class ChooseBlockController implements ContainerInjectionInterface {
    */
   protected $entityTypeManager;
 
+  /**
+   * The entity type repository.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeRepositoryInterface
+   */
+  protected $entityTypeRepository;
+
   /**
    * ChooseBlockController constructor.
    *
    * @param \Drupal\Core\Block\BlockManagerInterface $block_manager
    *   The block manager.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager.
+   * @param \Drupal\Core\Entity\EntityTypeRepositoryInterface $entity_type_repository
+   *   The entity type repository.
    */
-  public function __construct(BlockManagerInterface $block_manager, EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(BlockManagerInterface $block_manager, EntityTypeManagerInterface $entity_type_manager, EntityTypeRepositoryInterface $entity_type_repository) {
     $this->blockManager = $block_manager;
     $this->entityTypeManager = $entity_type_manager;
+    $this->entityTypeRepository = $entity_type_repository;
   }
 
   /**
@@ -56,7 +67,8 @@ public function __construct(BlockManagerInterface $block_manager, EntityTypeMana
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('plugin.manager.block'),
-      $container->get('entity_type.manager')
+      $container->get('entity_type.manager'),
+      $container->get('entity_type.repository')
     );
   }
 
@@ -74,6 +86,7 @@ public static function create(ContainerInterface $container) {
    *   A render array.
    */
   public function build(SectionStorageInterface $section_storage, $delta, $region) {
+    $entity_type_label = $this->getEntityFieldCategoryLabels();
     if ($this->entityTypeManager->hasDefinition('block_content_type') && $types = $this->entityTypeManager->getStorage('block_content_type')->loadMultiple()) {
       if (count($types) === 1) {
         $type = reset($types);
@@ -132,13 +145,16 @@ public function build(SectionStorageInterface $section_storage, $delta, $region)
       'delta' => $delta,
       'region' => $region,
     ]);
+    $field_block_category_weight = -200;
+    $non_view_configurable_field_links = [];
+    $links = [];
     $grouped_definitions = $this->blockManager->getGroupedDefinitions($definitions);
     foreach ($grouped_definitions as $category => $blocks) {
       $block_categories[$category]['#type'] = 'details';
       $block_categories[$category]['#attributes']['class'][] = 'js-layout-builder-category';
-      $block_categories[$category]['#open'] = TRUE;
+      $block_categories[$category]['#open'] = FALSE;
       $block_categories[$category]['#title'] = $category;
-      $block_categories[$category]['links'] = $this->getBlockLinks($section_storage, $delta, $region, $blocks);
+      $this->addBlockLinks($block_categories[$category], $section_storage, $delta, $region, $blocks);
     }
     $build['block_categories'] = $block_categories;
     return $build;
@@ -166,7 +182,7 @@ public function inlineBlockList(SectionStorageInterface $section_storage, $delta
     $blocks = $this->blockManager->getGroupedDefinitions($definitions);
     $build = [];
     if (isset($blocks['Inline blocks'])) {
-      $build['links'] = $this->getBlockLinks($section_storage, $delta, $region, $blocks['Inline blocks']);
+      $this->addBlockLinks($build, $section_storage, $delta, $region, $blocks['Inline blocks']);
       $build['links']['#attributes']['class'][] = 'inline-block-list';
       $build['back_button'] = [
         '#type' => 'link',
@@ -186,8 +202,10 @@ public function inlineBlockList(SectionStorageInterface $section_storage, $delta
   }
 
   /**
-   * Gets a render array of block links.
+   * Adds a render array of block links.
    *
+   * @param array $render_array
+   *   Render array to add links to.
    * @param \Drupal\layout_builder\SectionStorageInterface $section_storage
    *   The section storage.
    * @param int $delta
@@ -200,9 +218,14 @@ public function inlineBlockList(SectionStorageInterface $section_storage, $delta
    * @return array
    *   The block links render array.
    */
-  protected function getBlockLinks(SectionStorageInterface $section_storage, $delta, $region, array $blocks) {
+  protected function addBlockLinks(&$render_array, SectionStorageInterface $section_storage, $delta, $region, array $blocks) {
+    static $field_block_category_weight = -200;
     $links = [];
+    $category = NULL;
     foreach ($blocks as $block_id => $block) {
+      if (!$category) {
+        $category = $block['category'];
+      }
       $attributes = $this->getAjaxAttributes();
       $attributes['class'][] = 'js-layout-builder-block-link';
       $link = [
@@ -218,10 +241,40 @@ protected function getBlockLinks(SectionStorageInterface $section_storage, $delt
         ),
         'attributes' => $attributes,
       ];
-
-      $links[] = $link;
+      if ($block['id'] === 'field_block' && empty($block['_is_view_configurable'])) {
+        $non_view_configurable_field_links[] = $link;
+      }
+      else {
+        $links[] = $link;
+      }
+    }
+    if ($non_view_configurable_field_links) {
+      if (empty($links)) {
+        // If no other links exist add these links as top level links for the
+        // category.
+        $links = $non_view_configurable_field_links;
+      }
+      else {
+        $render_array['more_fields'] = [
+          '#type' => 'details',
+          '#title' => $this->t('More+'),
+          '#open' => FALSE,
+          'links' => [
+            '#theme' => 'links',
+            '#links' => $non_view_configurable_field_links,
+          ],
+          '#weight' => 100,
+        ];
+      }
+    }
+    // If this a entity category and there are links besides non 'view'
+    // configurable field blocks move the category to the top and open it.
+    if (in_array($category, $this->getEntityFieldCategoryLabels()) && $links) {
+      $render_array['#open'] = TRUE;
+      $render_array['#weight'] = $field_block_category_weight;
+      $field_block_category_weight += 10;
     }
-    return [
+    $render_array['links'] = [
       '#theme' => 'links',
       '#links' => $links,
     ];
@@ -244,4 +297,19 @@ protected function getAjaxAttributes() {
     return [];
   }
 
+  /**
+   * Gets the category labels used for entity fields.
+   *
+   * @return string[]
+   *   The category labels.
+   */
+  protected function getEntityFieldCategoryLabels() {
+    $entity_type_labels = $this->entityTypeRepository->getEntityTypeLabels();
+    foreach ($entity_type_labels as &$entity_type_label) {
+      $entity_type_label = $this->t('@entity fields', ['@entity' => $entity_type_label])
+        ->render();
+    }
+    return $entity_type_labels;
+  }
+
 }
diff --git a/core/modules/layout_builder/src/Plugin/Derivative/FieldBlockDeriver.php b/core/modules/layout_builder/src/Plugin/Derivative/FieldBlockDeriver.php
@@ -118,6 +118,11 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           // unavailable to place in the block UI.
           $derivative['_block_ui_hidden'] = !$field_definition->isDisplayConfigurable('view');
 
+          // Mark as view configurable or not to enable highlighting of view
+          // configurable fields in the 'Add Block' listing of the layout
+          // builder.
+          $derivative['_is_view_configurable'] = $field_definition->isDisplayConfigurable('view');
+
           $context_definition = EntityContextDefinition::fromEntityTypeId($entity_type_id)->setLabel($entity_type_labels[$entity_type_id]);
           $context_definition->addConstraint('Bundle', [$bundle]);
           $derivative['context'] = [
diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php
@@ -2,14 +2,12 @@
 
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
-use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
-
 /**
  * Ajax blocks tests.
  *
  * @group layout_builder
  */
-class AjaxBlockTest extends WebDriverTestBase {
+class AjaxBlockTest extends LayoutBuilderTestBase {
 
   /**
    * {@inheritdoc}
@@ -71,7 +69,8 @@ public function testAddAjaxBlock() {
     $assert_session->linkExists('Add Block');
     $this->clickLink('Add Block');
     $assert_session->assertWaitOnAjaxRequest();
-    $assert_session->linkExists('TestAjax');
+    $this->clickBlockCategory('Test');
+    $this->assertBlockLinkVisible('TestAjax');
     $this->clickLink('TestAjax');
     $assert_session->assertWaitOnAjaxRequest();
     // Find the radio buttons.
diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTestBase.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTestBase.php
@@ -3,13 +3,12 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\block_content\Entity\BlockContentType;
-use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait;
 
 /**
  * Base class for testing inline blocks.
  */
-abstract class InlineBlockTestBase extends WebDriverTestBase {
+abstract class InlineBlockTestBase extends LayoutBuilderTestBase {
 
   use ContextualLinkClickTrait;
 
