diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index e7fb7c2..ab6b944 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -307,6 +307,11 @@ block_settings:
provider:
type: string
label: 'Provider'
+ context_mapping:
+ type: sequence
+ label: 'Context assignments'
+ sequence:
+ type: string
condition.plugin:
type: mapping
diff --git a/core/lib/Drupal/Core/Annotation/ContextDefinition.php b/core/lib/Drupal/Core/Annotation/ContextDefinition.php
index 0b26860..38767c5 100644
--- a/core/lib/Drupal/Core/Annotation/ContextDefinition.php
+++ b/core/lib/Drupal/Core/Annotation/ContextDefinition.php
@@ -113,7 +113,7 @@ public function __construct(array $values) {
// used in the classes they pass to.
foreach (['label', 'description'] as $key) {
// @todo Remove this workaround in https://www.drupal.org/node/2362727.
- if (isset($values[$key]) && $values[$key] instanceof TranslatableString) {
+ if (isset($values[$key]) && $values[$key] instanceof Translation && $values[$key]->get() instanceof TranslatableString) {
$values[$key] = (string) $values[$key]->get();
}
else {
diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php
index 2544254..5684e3d 100644
--- a/core/lib/Drupal/Core/Block/BlockBase.php
+++ b/core/lib/Drupal/Core/Block/BlockBase.php
@@ -10,6 +10,7 @@
use Drupal\block\BlockInterface;
use Drupal\Core\Access\AccessResult;
use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Plugin\ContextAwarePluginAssignmentTrait;
use Drupal\Core\Plugin\ContextAwarePluginBase;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\NestedArray;
@@ -28,6 +29,8 @@
*/
abstract class BlockBase extends ContextAwarePluginBase implements BlockPluginInterface {
+ use ContextAwarePluginAssignmentTrait;
+
/**
* The transliteration service.
*
@@ -175,6 +178,9 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
'#return_value' => BlockInterface::BLOCK_LABEL_VISIBLE,
);
+ // Add context mapping UI form elements.
+ $contexts = $form_state->getTemporaryValue('gathered_contexts') ?: [];
+ $form['context_mapping'] = $this->addContextAssignmentElement($this, $contexts);
// Add plugin-specific settings for this block type.
$form += $this->blockForm($form, $form_state);
return $form;
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
index 19d756c..c2d2dd8 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginAssignmentTrait.php
@@ -51,16 +51,26 @@ protected function addContextAssignmentElement(ContextAwarePluginInterface $plug
'#type' => 'value',
'#value' => $context_id,
];
+ $element['context_slot_title'] = [
+ '#type' => 'item',
+ '#title' => $definition->getLabel() ?: $context_slot,
+ '#markup' => $options[$context_id],
+ ];
}
if (count($options) > 1) {
+ // The context display element is only useful when a single context is
+ // available, we have multiple and require user interaction.
+ unset($element['context_slot_title']);
+
$assignments = $plugin->getContextMapping();
$element[$context_slot] = [
- '#title' => $this->t('Select a @context value:', ['@context' => $context_slot]),
+ '#title' => $definition->getLabel() ?: $this->t('Select a @context value:', ['@context' => $context_slot]),
'#type' => 'select',
'#options' => $options,
'#required' => $definition->isRequired(),
'#default_value' => !empty($assignments[$context_slot]) ? $assignments[$context_slot] : '',
+ '#description' => $definition->getDescription(),
];
}
}
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index 51a39d7..a5154d5 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -64,6 +64,10 @@ public function getContextMapping() {
* {@inheritdoc}
*/
public function setContextMapping(array $context_mapping) {
+ // The ContextAwarePluginAssignmentTrait adds a visual element to the
+ // context mapping when only one context is available. We should unset this
+ // before saving the context mapping.
+ unset($context_mapping['context_slot_title']);
if ($this instanceof ConfigurablePluginInterface) {
$configuration = $this->getConfiguration();
$configuration['context_mapping'] = $context_mapping;
diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index 8c13bbb..915d16b 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -335,6 +335,12 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
// Call the plugin submit handler.
$entity->getPlugin()->submitConfigurationForm($form, $settings);
+ $block = $entity->getPlugin();
+ // If this block is context-aware, set the context mapping.
+ if ($block instanceof ContextAwarePluginInterface && $block->getContextDefinitions()) {
+ $context_mapping = $settings->getValue('context_mapping', []);
+ $block->setContextMapping($context_mapping);
+ }
// Update the original form values.
$form_state->setValue('settings', $settings->getValues());
@@ -345,8 +351,8 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
$condition_values = (new FormState())
->setValues($values);
$condition->submitConfigurationForm($form, $condition_values);
- if ($condition instanceof ContextAwarePluginInterface) {
- $context_mapping = isset($values['context_mapping']) ? $values['context_mapping'] : [];
+ if ($condition instanceof ContextAwarePluginInterface && $condition->getContextDefinitions()) {
+ $context_mapping = $condition_values->getValue('context_mapping', []);
$condition->setContextMapping($context_mapping);
}
// Update the original form values.
diff --git a/core/modules/block/src/BlockViewBuilder.php b/core/modules/block/src/BlockViewBuilder.php
index 9a582352..7972bbc 100644
--- a/core/modules/block/src/BlockViewBuilder.php
+++ b/core/modules/block/src/BlockViewBuilder.php
@@ -16,6 +16,7 @@
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Plugin\ContextAwarePluginInterface;
use Drupal\Core\Render\Element;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -139,6 +140,12 @@ protected static function buildPreRenderableBlock($entity, ModuleHandlerInterfac
$derivative_id = $plugin->getDerivativeId();
$configuration = $plugin->getConfiguration();
+ // Inject runtime contexts.
+ if ($plugin instanceof ContextAwarePluginInterface) {
+ $contexts = \Drupal::service('context.repository')->getRuntimeContexts($plugin->getContextMapping());
+ \Drupal::service('context.handler')->applyContextMapping($plugin, $contexts);
+ }
+
// Create the render array for the block as a whole.
// @see template_preprocess_block().
$build = [
diff --git a/core/modules/block/src/Controller/BlockLibraryController.php b/core/modules/block/src/Controller/BlockLibraryController.php
index 1dcd15d..0f6c965 100644
--- a/core/modules/block/src/Controller/BlockLibraryController.php
+++ b/core/modules/block/src/Controller/BlockLibraryController.php
@@ -12,6 +12,7 @@
use Drupal\Core\Controller\ControllerBase;
use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
use Drupal\Core\Menu\LocalActionManagerInterface;
+use Drupal\Core\Plugin\Context\LazyContextRepository;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Url;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -30,6 +31,13 @@ class BlockLibraryController extends ControllerBase {
protected $blockManager;
/**
+ * The context repository.
+ *
+ * @var \Drupal\Core\Plugin\Context\LazyContextRepository
+ */
+ protected $contextRepository;
+
+ /**
* The route match.
*
* @var \Drupal\Core\Routing\RouteMatchInterface
@@ -48,15 +56,18 @@ class BlockLibraryController extends ControllerBase {
*
* @param \Drupal\Core\Block\BlockManagerInterface $block_manager
* The block manager.
+ * @param \Drupal\Core\Plugin\Context\LazyContextRepository $context_repository
+ * The context repository.
* @param \Drupal\Core\Routing\RouteMatchInterface $route_match
* The current route match.
* @param \Drupal\Core\Menu\LocalActionManagerInterface $local_action_manager
* The local action manager.
*/
- public function __construct(BlockManagerInterface $block_manager, RouteMatchInterface $route_match, LocalActionManagerInterface $local_action_manager) {
+ public function __construct(BlockManagerInterface $block_manager, LazyContextRepository $context_repository, RouteMatchInterface $route_match, LocalActionManagerInterface $local_action_manager) {
$this->blockManager = $block_manager;
$this->routeMatch = $route_match;
$this->localActionManager = $local_action_manager;
+ $this->contextRepository = $context_repository;
}
/**
@@ -65,6 +76,7 @@ public function __construct(BlockManagerInterface $block_manager, RouteMatchInte
public static function create(ContainerInterface $container) {
return new static(
$container->get('plugin.manager.block'),
+ $container->get('context.repository'),
$container->get('current_route_match'),
$container->get('plugin.manager.menu.local_action')
);
@@ -95,7 +107,7 @@ public function listBlocks(Request $request, $theme) {
];
// Only add blocks which work without any available context.
- $definitions = $this->blockManager->getDefinitionsForContexts();
+ $definitions = $this->blockManager->getDefinitionsForContexts($this->contextRepository->getAvailableContexts());
// Order by category, and then by admin label.
$definitions = $this->blockManager->getSortedDefinitions($definitions);
diff --git a/core/modules/block/src/Tests/BlockInterfaceTest.php b/core/modules/block/src/Tests/BlockInterfaceTest.php
index 28208ac..5af8ec0 100644
--- a/core/modules/block/src/Tests/BlockInterfaceTest.php
+++ b/core/modules/block/src/Tests/BlockInterfaceTest.php
@@ -79,6 +79,7 @@ public function testBlockInterface() {
'#default_value' => TRUE,
'#return_value' => 'visible',
),
+ 'context_mapping' => array(),
'display_message' => array(
'#type' => 'textfield',
'#title' => t('Display message'),
diff --git a/core/modules/block/src/Tests/BlockUiTest.php b/core/modules/block/src/Tests/BlockUiTest.php
index 721a7e2..d3bb947 100644
--- a/core/modules/block/src/Tests/BlockUiTest.php
+++ b/core/modules/block/src/Tests/BlockUiTest.php
@@ -169,18 +169,54 @@ public function testCandidateBlockList() {
* Tests the behavior of context-aware blocks.
*/
public function testContextAwareBlocks() {
+ $expected_text = '' . \Drupal::currentUser()->getUsername() . '
';
+ $this->drupalGet('');
+ $this->assertNoText('Test context-aware block');
+ $this->assertNoRaw($expected_text);
+
+ $block_url = 'admin/structure/block/add/test_context_aware/classy';
$arguments = array(
- ':ul_class' => 'block-list',
- ':li_class' => 'test-context-aware',
- ':href' => 'admin/structure/block/add/test_context_aware/classy',
- ':text' => 'Test context-aware block',
+ ':title' => 'Test context-aware block',
+ ':category' => 'Block test',
+ ':href' => $block_url,
);
+ $pattern = '//tr[.//td/div[text()=:title] and .//td[text()=:category] and .//td//a[contains(@href, :href)]]';
$this->drupalGet('admin/structure/block');
- $elements = $this->xpath('//details[@id="edit-category-block-test"]//ul[contains(@class, :ul_class)]/li[contains(@class, :li_class)]/a[contains(@href, :href) and text()=:text]', $arguments);
- $this->assertTrue(empty($elements), 'The context-aware test block does not appear.');
+ $this->clickLinkPartialName('Place block');
+ $elements = $this->xpath($pattern, $arguments);
+ $this->assertTrue(!empty($elements), 'The context-aware test block appears.');
$definition = \Drupal::service('plugin.manager.block')->getDefinition('test_context_aware');
$this->assertTrue(!empty($definition), 'The context-aware test block exists.');
+
+ $edit = [
+ 'region' => 'content',
+ 'settings[context_mapping][user]' => '@block_test.multiple_static_context:user2',
+ ];
+ $this->drupalPostForm($block_url, $edit, 'Save block');
+
+ $this->drupalGet('');
+ $this->assertText('Test context-aware block');
+ $this->assertRaw($expected_text);
+ }
+
+ /**
+ * Tests the behavior of unsatisfied context-aware blocks.
+ */
+ public function testContextAwareUnsatisfiedBlocks() {
+ $arguments = [
+ ':title' => 'Test context-aware block',
+ ':category' => 'Block test',
+ ':href' => 'admin/structure/block/add/test_context_aware_unsatisfied/classy',
+ ];
+ $pattern = '//tr[.//td/div[text()=:title] and .//td[text()=:category] and .//td//a[contains(@href, :href)]]';
+
+ $this->drupalGet('admin/structure/block');
+ $this->clickLinkPartialName('Place block');
+ $elements = $this->xpath($pattern, $arguments);
+ $this->assertTrue(empty($elements), 'The context-aware test block does not appear.');
+ $definition = \Drupal::service('plugin.manager.block')->getDefinition('test_context_aware_unsatisfied');
+ $this->assertTrue(!empty($definition), 'The context-aware test block exists.');
}
/**
diff --git a/core/modules/block/tests/modules/block_test/block_test.services.yml b/core/modules/block/tests/modules/block_test/block_test.services.yml
new file mode 100644
index 0000000..f165a02
--- /dev/null
+++ b/core/modules/block/tests/modules/block_test/block_test.services.yml
@@ -0,0 +1,6 @@
+services:
+ block_test.multiple_static_context:
+ class: Drupal\block_test\ContextProvider\MultipleStaticContext
+ arguments: ['@current_user', '@entity.manager']
+ tags:
+ - { name: 'context_provider' }
diff --git a/core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php b/core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php
new file mode 100644
index 0000000..e316e8b
--- /dev/null
+++ b/core/modules/block/tests/modules/block_test/src/ContextProvider/MultipleStaticContext.php
@@ -0,0 +1,80 @@
+account = $account;
+ $this->userStorage = $entity_manager->getStorage('user');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getRuntimeContexts(array $unqualified_context_ids) {
+ $current_user = $this->userStorage->load($this->account->id());
+
+ $context1 = new Context(new ContextDefinition('entity:user', 'User 1'));
+ $context1->setContextValue($current_user);
+
+ $context2 = new Context(new ContextDefinition('entity:user', 'User 2'));
+ $context2->setContextValue($current_user);
+
+ $cacheability = new CacheableMetadata();
+ $cacheability->setCacheContexts(['user']);
+
+ $context1->addCacheableDependency($cacheability);
+ $context2->addCacheableDependency($cacheability);
+
+ return [
+ 'user1' => $context1,
+ 'user2' => $context2,
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAvailableContexts() {
+ return $this->getRuntimeContexts([]);
+ }
+
+}
diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php
index 56b127b..c4223d0 100644
--- a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php
+++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareBlock.php
@@ -29,6 +29,8 @@ public function build() {
/** @var $user \Drupal\user\UserInterface */
$user = $this->getContextValue('user');
return array(
+ '#prefix' => '',
+ '#suffix' => '
',
'#markup' => $user->getUsername(),
);
}
diff --git a/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php
new file mode 100644
index 0000000..7232e74
--- /dev/null
+++ b/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestContextAwareUnsatisfiedBlock.php
@@ -0,0 +1,34 @@
+ 'test',
+ ];
+ }
+
+}
diff --git a/core/modules/node/src/ContextProvider/NodeRouteContext.php b/core/modules/node/src/ContextProvider/NodeRouteContext.php
index e6f5781..6f55b08 100644
--- a/core/modules/node/src/ContextProvider/NodeRouteContext.php
+++ b/core/modules/node/src/ContextProvider/NodeRouteContext.php
@@ -13,12 +13,15 @@
use Drupal\Core\Plugin\Context\ContextProviderInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\node\Entity\Node;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
/**
* Sets the current node as a context on node routes.
*/
class NodeRouteContext implements ContextProviderInterface {
+ use StringTranslationTrait;
+
/**
* The route match object.
*
@@ -63,7 +66,7 @@ public function getRuntimeContexts(array $unqualified_context_ids) {
* {@inheritdoc}
*/
public function getAvailableContexts() {
- $context = new Context(new ContextDefinition('entity:node'));
+ $context = new Context(new ContextDefinition('entity:node', $this->t('Node from URL')));
return ['node' => $context];
}
diff --git a/core/tests/Drupal/Tests/Core/Annotation/ContextDefinitionTest.php b/core/tests/Drupal/Tests/Core/Annotation/ContextDefinitionTest.php
new file mode 100644
index 0000000..ff313f2
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Annotation/ContextDefinitionTest.php
@@ -0,0 +1,69 @@
+translationManager = $this->getStringTranslationStub();
+ }
+
+ /**
+ * Test the ContextDefinition Annotation.
+ */
+ public function testContextDefinitionAnnotation() {
+ $container = new ContainerBuilder();
+ $container->set('string_translation', $this->translationManager);
+ \Drupal::setContainer($container);
+
+ $values = [
+ 'value' => 'entity:node',
+ 'label' => 'test',
+ 'description' => 'test',
+ ];
+ $context_definition = new ContextDefinition($values);
+ $definition = $context_definition->get();
+ //throw new \Exception(print_r(, TRUE));
+ // If the label or description are not a Translation annotation instance,
+ // it should be replaced by NULL.
+ $this->assertNull($definition->getLabel());
+ $this->assertNull($definition->getDescription());
+
+ $values = [
+ 'value' => 'entity:node',
+ 'label' => new Translation(['value' => 'test']),
+ 'description' => new Translation(['value' => 'test']),
+ ];
+ $context_definition = new ContextDefinition($values);
+ $definition = $context_definition->get();
+ //throw new \Exception(print_r(, TRUE));
+ // If the label or description are a Translation annotation instance, the
+ // translated string should be returned.
+ $this->assertEquals('test', $definition->getLabel());
+ $this->assertEquals('test', $definition->getDescription());
+ }
+
+}