Merge branch 'patterns-layout-include-defaults' into 8.x-1.x

.travis.yml

@@ -32,7 +32,9 @@ before_script:
   - mysql -e 'create database drupal'
   # Install Drupal 8 target site.
   - drush --root=$PWD/build si standard -y --db-url=mysql://travis:@127.0.0.1/drupal
-  - drush --root=$PWD/build en ui_patterns_test -y
+  # Force exit status to true so expected patterns validation error will not stop Travis build.
+  - drush --root=$PWD/build en ui_patterns_test -y || true
+  - drush --root=$PWD/build cr
   # Run Drush web server.
   - drush --root=$PWD/build --debug runserver :8888 > ~/debug.txt 2>&1 &
   - sleep 4s

composer.json

@@ -29,7 +29,7 @@
     "drupal/token": "~1",
     "drupal/bootstrap": "3.1",
     "phpunit/phpunit": "5.5.*",
-    "nuvoleweb/drupal-behat": "1.0.2",
+    "nuvoleweb/drupal-behat": "~1.1.0",
     "mikey179/vfsStream": "*",
     "bex/behat-screenshot": "^1.2",
     "bex/behat-screenshot-image-driver-img42": "^1.0",

modules/ui_patterns_layouts/src/Plugin/Layout/PatternLayout.php

@@ -8,6 +8,7 @@ use Drupal\Core\Layout\LayoutDefinition;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\ui_patterns\UiPatternsManager;
+use Drupal\Core\Render\ElementInfoManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -24,6 +25,13 @@ class PatternLayout extends LayoutDefault implements PluginFormInterface, Contai
    */
   protected $patternManager = NULL;
 
+  /**
+   * The element info.
+   *
+   * @var \Drupal\Core\Render\ElementInfoManagerInterface
+   */
+  protected $elementInfo;
+
   /**
    * Constructs a LocalActionDefault object.
    *
@@ -36,8 +44,9 @@ class PatternLayout extends LayoutDefault implements PluginFormInterface, Contai
    * @param \Drupal\ui_patterns\UiPatternsManager $pattern_manager
    *    Pattern manager service.
    */
-  public function __construct(array $configuration, $plugin_id, LayoutDefinition $plugin_definition, UiPatternsManager $pattern_manager) {
+  public function __construct(array $configuration, $plugin_id, LayoutDefinition $plugin_definition, ElementInfoManagerInterface $element_info, UiPatternsManager $pattern_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->elementInfo = $element_info;
     $this->patternManager = $pattern_manager;
   }
 
@@ -49,6 +58,7 @@ class PatternLayout extends LayoutDefault implements PluginFormInterface, Contai
       $configuration,
       $plugin_id,
       $plugin_definition,
+      $container->get('plugin.manager.element_info'),
       $container->get('plugin.manager.ui_patterns')
     );
   }
@@ -74,7 +84,7 @@ class PatternLayout extends LayoutDefault implements PluginFormInterface, Contai
       '#type' => 'pattern',
       '#id' => $this->getPluginDefinition()->get('additional')['pattern'],
       '#fields' => $fields,
-    ];
+    ] + $this->elementInfo->getInfo('pattern');
   }
 
   /**

modules/ui_patterns_test/config/install/page_manager.page.panels_test_page.yml

+langcode: en
+status: true
+dependencies: {  }
+id: panels_test_page
+label: 'Panels Test Page'
+description: ''
+use_admin_theme: false
+path: /panels-test-page
+access_logic: and
+access_conditions: {  }
+parameters: {  }

modules/ui_patterns_test/config/install/page_manager.page_variant.panels_test_page-panels_variant-0.yml

+langcode: en
+status: true
+dependencies:
+  config:
+    - page_manager.page.panels_test_page
+  module:
+    - panels
+id: panels_test_page-panels_variant-0
+label: Panels
+variant: panels_variant
+variant_settings:
+  blocks:
+    4fe295c8-8fd2-44fd-a8c0-65d71579f4de:
+      id: page_title_block
+      label: 'Page title'
+      provider: core
+      label_display: '0'
+      region: subtitle
+      weight: 0
+      uuid: 4fe295c8-8fd2-44fd-a8c0-65d71579f4de
+      context_mapping: {  }
+  id: panels_variant
+  uuid: dba05a1b-0070-4e7d-8720-305b76b61827
+  label: null
+  weight: 0
+  layout: pattern_jumbotron
+  layout_settings: {  }
+  page_title: 'Here is your jumbotron title'
+  storage_type: page_manager
+  storage_id: panels_test_page-panels_variant-0
+  builder: standard
+page: panels_test_page
+weight: 0
+selection_criteria: {  }
+selection_logic: and
+static_context: {  }

modules/ui_patterns_test/ui_patterns_test.info.yml

@@ -17,6 +17,7 @@ dependencies:
   - image
   - link
   - node
+  - page_manager
   - page_manager_ui
   - panels
   - paragraphs

modules/ui_patterns_test/ui_patterns_test.ui_patterns.yml

@@ -42,5 +42,30 @@ blockquote:
     - ui_patterns_test/library1
     - ui_patterns_test/library2
 
+jumbotron:
+  label: Jumbotron
+  description: A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site.
+  fields:
+    title:
+      type: text
+      label: Title
+      description: Jumbotron title.
+      preview: Hello, world!
+    subtitle:
+      type: text
+      label: Description
+      description: Jumbotron description.
+      preview: This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.
+    link_label:
+      type: text
+      label: Link label
+      description: Jumbotron link label.
+      preview: Learn more
+    link_url:
+      type: text
+      label: URL
+      description: Jumbotron link URL.
+      preview: http://example.com
+
 bad_pattern:
   description: This pattern is for test purposes only, it will print an error message on /patterns page.

modules/ui_patterns_test/ui_patterns_test_theme/ui_patterns_test_theme.ui_patterns.yml

@@ -21,31 +21,6 @@ carousel:
           subtitle: Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae.
           image: http://lorempixel.com/900/500/sports/6
 
-jumbotron:
-  label: Jumbotron
-  description: A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site.
-  fields:
-    title:
-      type: text
-      label: Title
-      description: Jumbotron title.
-      preview: Hello, world!
-    subtitle:
-      type: text
-      label: Description
-      description: Jumbotron description.
-      preview: This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.
-    link_label:
-      type: text
-      label: Link label
-      description: Jumbotron link label.
-      preview: Learn more
-    link_url:
-      type: text
-      label: URL
-      description: Jumbotron link URL.
-      preview: http://example.com
-
 modal:
   label: Modal
   description: Modals are streamlined, but flexible, dialog prompts with the minimum required functionality and smart defaults.

tests/features/content.feature

@@ -82,3 +82,7 @@ Feature: Content
     And I should see the button "Save changes" in the "modal"
     And I should see the link "Link title"
 
+  Scenario: Patterns render as Panels layouts.
+    Given I am on "/panels-test-page"
+    Then I should see "Here is your jumbotron title" in the "jumbotron"
+