diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml new file mode 100644 index 0000000..5eaf8c3 --- /dev/null +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block_with_context.yml @@ -0,0 +1,218 @@ +langcode: en +status: true +dependencies: + module: + - node + - user +id: test_view_block_with_context +label: test_view_block_with_context +module: views +description: '' +tag: '' +base_table: node_field_data +base_field: nid +core: 8.x +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: '' + query_tags: { } + exposed_form: + type: basic + options: + submit_button: Apply + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + pager: + type: some + options: + items_per_page: 5 + offset: 0 + style: + type: default + row: + type: fields + fields: + title: + id: title + table: node_field_data + field: title + settings: + link_to_entity: true + plugin_id: field + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + filters: + status: + value: true + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + group: 1 + sorts: + created: + id: created + table: node_field_data + field: created + order: DESC + entity_type: node + entity_field: created + plugin_id: date + relationship: none + group_type: group + admin_label: '' + exposed: false + expose: + label: '' + granularity: second + title: test_view_block_with_context + header: { } + footer: { } + empty: { } + relationships: { } + arguments: + nid: + id: nid + table: node + field: nid + relationship: none + group_type: group + admin_label: '' + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: fixed + default_argument_options: + argument: '' + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + items_per_page: 25 + override: false + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: true + validate: + type: 'entity:node' + fail: 'not found' + validate_options: + operation: view + multiple: 0 + bundles: { } + access: false + break_phrase: false + not: false + entity_type: node + entity_field: nid + plugin_id: numeric + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - 'user.node_grants:view' + - user.permissions + cacheable: false + block_1: + display_plugin: block + id: block_1 + display_title: Block + position: 1 + display_options: + display_extenders: { } + cache_metadata: + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - 'user.node_grants:view' + - user.permissions + cacheable: false diff --git a/core/modules/views/src/Plugin/Block/ViewsBlock.php b/core/modules/views/src/Plugin/Block/ViewsBlock.php index 43ff658..e03db23 100644 --- a/core/modules/views/src/Plugin/Block/ViewsBlock.php +++ b/core/modules/views/src/Plugin/Block/ViewsBlock.php @@ -5,6 +5,7 @@ use Drupal\Component\Utility\Xss; use Drupal\Core\Form\FormStateInterface; use Drupal\views\Element\View; +use Drupal\Core\Entity\EntityInterface; /** * Provides a generic Views block. @@ -23,10 +24,24 @@ class ViewsBlock extends ViewsBlockBase { public function build() { $this->view->display_handler->preBlockBuild($this); + $args = []; + foreach ($this->getContexts() as $context_name => $context) { + /** @var \Drupal\views\Plugin\views\argument\ArgumentPluginBase $argument */ + if (($argument = $this->view->display_handler->getHandler('argument', $context_name)) && ($value = $context->getContextValue())) { + if ($value instanceof EntityInterface) { + $value = $value->id(); + } + $args[] = $value; + } + elseif ($argument->options['default_action'] == 'ignore') { + $args[] = $argument->options['exception']['value']; + } + } + // We ask ViewExecutable::buildRenderable() to avoid creating a render cache // entry for the view output by passing FALSE, because we're going to cache // the whole block instead. - if ($output = $this->view->buildRenderable($this->displayID, [], FALSE)) { + if ($output = $this->view->buildRenderable($this->displayID, $args, FALSE)) { // Override the label to the dynamic title configured in the view. if (empty($this->configuration['views_label']) && $this->view->getTitle()) { $output['#title'] = ['#markup' => $this->view->getTitle(), '#allowed_tags' => Xss::getHtmlTagList()]; diff --git a/core/modules/views/src/Plugin/Block/ViewsBlock.php b/core/modules/views/src/Plugin/Block/ViewsBlock.php.orig similarity index 100% copy from core/modules/views/src/Plugin/Block/ViewsBlock.php copy to core/modules/views/src/Plugin/Block/ViewsBlock.php.orig diff --git a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php index 37e0dc8..f08f1e2 100644 --- a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php +++ b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php @@ -3,8 +3,10 @@ namespace Drupal\views\Plugin\Derivative; use Drupal\Core\Entity\EntityStorageInterface; +use Drupal\Core\Plugin\Context\ContextDefinition; use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; +use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -82,6 +84,7 @@ public function getDerivativeDefinitions($base_plugin_definition) { $executable = $view->getExecutable(); $executable->initDisplay(); foreach ($executable->displayHandlers as $display) { + /** @var \Drupal\views\Plugin\views\display\DisplayPluginInterface $display */ // Add a block plugin definition for each block display. if (isset($display) && !empty($display->definition['uses_hook_block'])) { $delta = $view->id() . '-' . $display->display['id']; @@ -106,9 +109,31 @@ public function getDerivativeDefinitions($base_plugin_definition) { 'config_dependencies' => array( 'config' => array( $view->getConfigDependencyName(), - ) - ) + ), + ), ); + + // Look for arguments and expose them as context. + foreach ($display->getHandlers('argument') as $argument_name => $argument) { + /** @var \Drupal\views\Plugin\views\argument\ArgumentPluginBase $argument */ + if ($validator = $argument->getPlugin('argument_validator')) { + /** @var \Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase $validator */ + if (strpos($validator->getPluginId(), 'entity:') !== FALSE) { + $this->derivatives[$delta]['context'][$argument_name] = new ContextDefinition($argument->getPlugin('argument_validator')->getPluginId(), $argument->adminLabel(), FALSE); + } + elseif ($validator->getPluginId() == 'numeric') { + $this->derivatives[$delta]['context'][$argument_name] = new ContextDefinition('integer', $argument->adminLabel(), FALSE); + } + } + else { + switch ($argument->getPluginId()) { + case 'numeric': + $this->derivatives[$delta]['context'][$argument_name] = new ContextDefinition('integer', $argument->adminLabel(), FALSE); + } + } + } + + $this->derivatives[$delta] += $base_plugin_definition; } } diff --git a/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/core/modules/views/src/Plugin/Derivative/ViewsBlock.php.orig similarity index 100% copy from core/modules/views/src/Plugin/Derivative/ViewsBlock.php copy to core/modules/views/src/Plugin/Derivative/ViewsBlock.php.orig diff --git a/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php b/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php new file mode 100644 index 0000000..4e106c0 --- /dev/null +++ b/core/modules/views/src/Tests/Plugin/ContextualFiltersBlockContextTest.php @@ -0,0 +1,56 @@ +enableViewsTestModule(); + } + + /** + * Tests exposed context. + */ + public function testBlockContext() { + $this->drupalLogin($this->drupalCreateUser(['administer views', 'administer blocks'])); + $this->drupalGet('admin/structure/block'); + $this->clickLinkPartialName('Place block'); + $this->drupalPlaceBlock('views_block:test_view_block_with_context-block_1', ['label' => 'test_view_block_with_context-block_1:1']); + + $definition = \Drupal::service('plugin.manager.block')->getDefinition('views_block:test_view_block_with_context-block_1'); + + $this->assertTrue($definition['context']['nid']); + } + +}