diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml index aa26f9a..b7f0e05 100644 --- a/core/config/schema/core.entity.schema.yml +++ b/core/config/schema/core.entity.schema.yml @@ -241,6 +241,19 @@ field.formatter.settings.boolean: type: string label: 'Custom output for TRUE' +field.formatter.settings.boolean: + type: mapping + mapping: + format: + type: string + label: 'Output format' + format_custom_false: + type: string + label: 'Custom output for FALSE' + format_custom_true: + type: string + label: 'Custom output for TRUE' + field.formatter.settings.string: type: mapping mapping: diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php index ec9b79d..1c356bf 100644 --- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php +++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php @@ -24,6 +24,7 @@ * label = @Translation("Plain text"), * field_types = { * "string", + * "uri", * }, * quickedit = { * "editor" = "plain_text" diff --git a/core/modules/action/src/Tests/ActionUninstallTest.php b/core/modules/action/src/Tests/ActionUninstallTest.php index bec61d1..2735d6e 100644 --- a/core/modules/action/src/Tests/ActionUninstallTest.php +++ b/core/modules/action/src/Tests/ActionUninstallTest.php @@ -22,7 +22,7 @@ class ActionUninstallTest extends WebTestBase { * * @var array */ - public static $modules = array('views', 'action'); + public static $modules = array('field', 'views', 'action'); /** * Tests Action uninstall. diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml index d538aa3..21f874e 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rest.yml @@ -381,4 +381,3 @@ display: name: alias: '' raw_output: true - display_extenders: { } diff --git a/core/modules/field/config/schema/field.views.schema.yml b/core/modules/field/config/schema/field.views.schema.yml index 85c501f..b1a39cc 100644 --- a/core/modules/field/config/schema/field.views.schema.yml +++ b/core/modules/field/config/schema/field.views.schema.yml @@ -16,53 +16,6 @@ views.argument.field_list_string: type: boolean label: 'Display list value as human readable' -views.field.field: - type: views_field - label: 'Views entity field handler' - mapping: - click_sort_column: - type: string - label: 'Column used for click sorting' - type: - type: string - label: 'Formatter' - settings: - label: 'Settings' - type: field.formatter.settings.[%parent.type] - group_column: - type: string - label: 'Group by column' - group_columns: - type: sequence - label: 'Group by columns' - sequence: - - type: string - label: 'Column' - group_rows: - type: boolean - label: 'Display all values in the same row' - delta_limit: - type: integer - label: 'Field' - delta_offset: - type: integer - label: 'Offset' - delta_reversed: - type: boolean - label: 'Reversed' - delta_first_last: - type: boolean - label: 'First and last only' - multi_type: - type: string - label: 'Display type' - separator: - type: label - label: 'Separator' - field_api_classes: - type: boolean - label: 'Use field template' - views.filter.field_list: type: views.filter.many_to_one label: 'List field' diff --git a/core/modules/node/config/install/views.view.content.yml b/core/modules/node/config/install/views.view.content.yml index bb1e2c0..d00a217 100644 --- a/core/modules/node/config/install/views.view.content.yml +++ b/core/modules/node/config/install/views.view.content.yml @@ -163,10 +163,12 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - link_to_node: true - plugin_id: node entity_type: node entity_field: title + type: string + settings: + link_to_entity: true + plugin_id: field type: id: type table: node_field_data @@ -222,11 +224,12 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - type: published-notpublished - type_custom_true: '' - type_custom_false: '' - not: false - plugin_id: boolean + type: boolean + settings: + format: custom + format_custom_true: 'Published' + format_custom_false: 'Unpublished' + plugin_id: field entity_type: node entity_field: status changed: diff --git a/core/modules/node/config/install/views.view.content_recent.yml b/core/modules/node/config/install/views.view.content_recent.yml index bc12a13..05e890a 100644 --- a/core/modules/node/config/install/views.view.content_recent.yml +++ b/core/modules/node/config/install/views.view.content_recent.yml @@ -118,8 +118,6 @@ display: html: false hide_empty: false empty_zero: false - link_to_node: true - plugin_id: node relationship: none group_type: group admin_label: '' @@ -133,6 +131,12 @@ display: element_default_classes: true empty: '' hide_alter_empty: true + type: string + settings: + link_to_entity: true + plugin_id: field + entity_type: node + entity_field: title name: id: name table: users_field_data @@ -326,8 +330,8 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node plugin_id: node_status + entity_type: node langcode: id: langcode table: node_field_data diff --git a/core/modules/node/src/NodeViewsData.php b/core/modules/node/src/NodeViewsData.php index ca2bb26..82dcd3f 100644 --- a/core/modules/node/src/NodeViewsData.php +++ b/core/modules/node/src/NodeViewsData.php @@ -33,7 +33,12 @@ public function getViewsData() { 'validate type' => 'nid', ]; - $data['node_field_data']['title']['field']['id'] = 'node'; + // @fixme Move this into the generic views data. + $data['node_field_data']['title']['field']['id'] = 'field'; + $data['node_field_data']['title']['field']['field_name'] = 'title'; + $data['node_field_data']['title']['field']['entity_tables'] = ['node' => 'node', 'node_field_data' => 'node']; + $data['node_field_data']['title']['field']['default_formatter_settings'] = ['entity_link' => TRUE]; + $data['node_field_data']['title']['field']['link_to_node default'] = TRUE; $data['node_field_data']['type']['field']['id'] = 'node_type'; diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php index b9c66e0..400c6d1 100644 --- a/core/modules/node/src/Plugin/views/wizard/Node.php +++ b/core/modules/node/src/Plugin/views/wizard/Node.php @@ -88,6 +88,7 @@ protected function defaultDisplayOptions() { $display_options['fields']['title']['table'] = 'node_field_data'; $display_options['fields']['title']['field'] = 'title'; $display_options['fields']['title']['entity_type'] = 'node'; + $display_options['fields']['title']['entity_type'] = 'node'; $display_options['fields']['title']['entity_field'] = 'title'; $display_options['fields']['title']['label'] = ''; $display_options['fields']['title']['alter']['alter_text'] = 0; @@ -100,8 +101,8 @@ protected function defaultDisplayOptions() { $display_options['fields']['title']['alter']['html'] = 0; $display_options['fields']['title']['hide_empty'] = 0; $display_options['fields']['title']['empty_zero'] = 0; - $display_options['fields']['title']['link_to_node'] = 1; - $display_options['fields']['title']['plugin_id'] = 'node'; + $display_options['fields']['title']['settings']['link_to_entity'] = 1; + $display_options['fields']['title']['plugin_id'] = 'field'; return $display_options; } @@ -176,8 +177,8 @@ protected function display_options_row(&$display_options, $row_plugin, $row_opt $display_options['fields']['title']['id'] = 'title'; $display_options['fields']['title']['table'] = 'node_field_data'; $display_options['fields']['title']['field'] = 'title'; - $display_options['fields']['title']['link_to_node'] = ($row_plugin == 'titles_linked'); - $display_options['fields']['title']['plugin_id'] = 'node'; + $display_options['fields']['title']['settings']['link_to_entity'] = $row_plugin === 'titles_linked'; + $display_options['fields']['title']['plugin_id'] = 'field'; break; } } diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml index 4c4c5fa..d9faafd 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_node_revision_nid.yml @@ -52,6 +52,8 @@ display: plugin_id: node_nid entity_type: node entity_field: nid + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null display_plugin: default display_title: Master id: default diff --git a/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php b/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php index 7c9be32..ce5bbab 100644 --- a/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php +++ b/core/modules/tracker/src/Tests/Views/TrackerUserUidTest.php @@ -29,13 +29,11 @@ class TrackerUserUidTest extends TrackerTestBase { public function testUserUid() { $map = array( 'nid' => 'nid', - 'node_field_data_title' => 'title', ); $expected = array( array( 'nid' => $this->node->id(), - 'title' => $this->node->label(), ) ); diff --git a/core/modules/user/config/install/views.view.user_admin_people.yml b/core/modules/user/config/install/views.view.user_admin_people.yml index 3dbaf84..279e19e 100644 --- a/core/modules/user/config/install/views.view.user_admin_people.yml +++ b/core/modules/user/config/install/views.view.user_admin_people.yml @@ -292,11 +292,12 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - type: active-blocked - type_custom_true: '' - type_custom_false: '' - not: false - plugin_id: boolean + plugin_id: field + type: boolean + settings: + format: custom + format_custom_true: 'Active' + format_custom_false: 'False' entity_type: user entity_field: status roles_target_id: diff --git a/core/modules/views/config/schema/views.field.schema.yml b/core/modules/views/config/schema/views.field.schema.yml index 0d77561..8ffb5d3 100644 --- a/core/modules/views/config/schema/views.field.schema.yml +++ b/core/modules/views/config/schema/views.field.schema.yml @@ -178,3 +178,51 @@ views.field.xss: views.field.language: type: views_field label: 'Language' + +views.field.field: + type: views_field + label: 'Views entity field handler' + mapping: + click_sort_column: + type: string + label: 'Column used for click sorting' + type: + type: string + label: 'Formatter' + settings: + label: 'Settings' + type: field.formatter.settings.[%parent.type] + group_column: + type: string + label: 'Group by column' + group_columns: + type: sequence + label: 'Group by columns' + sequence: + - type: string + label: 'Column' + group_rows: + type: boolean + label: 'Display all values in the same row' + delta_limit: + type: integer + label: 'Field' + delta_offset: + type: integer + label: 'Offset' + delta_reversed: + type: boolean + label: 'Reversed' + delta_first_last: + type: boolean + label: 'First and last only' + multi_type: + type: string + label: 'Display type' + separator: + type: label + label: 'Separator' + field_api_classes: + type: boolean + label: 'Use field template' + diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php index 0efd164..59d85da 100644 --- a/core/modules/views/src/EntityViewsData.php +++ b/core/modules/views/src/EntityViewsData.php @@ -308,21 +308,24 @@ protected function mapSingleFieldViewsData($table, $field_name, $field_type, $co break; case 'language': - $views_field['field']['id'] = 'language'; + $views_field['field']['id'] = 'field'; $views_field['argument']['id'] = 'language'; $views_field['filter']['id'] = 'language'; $views_field['sort']['id'] = 'standard'; break; case 'boolean': - $views_field['field']['id'] = 'boolean'; + $views_field['field']['id'] = 'field'; $views_field['argument']['id'] = 'numeric'; $views_field['filter']['id'] = 'boolean'; $views_field['sort']['id'] = 'standard'; break; case 'uri': - $views_field['field']['id'] = 'url'; + // Let's render URIs as URIs by default, not links. + $views_field['field']['id'] = 'field'; + $views_field['field']['default_formatter'] = 'string'; + $views_field['argument']['id'] = 'string'; $views_field['filter']['id'] = 'string'; $views_field['sort']['id'] = 'standard'; @@ -347,7 +350,7 @@ protected function mapSingleFieldViewsData($table, $field_name, $field_type, $co case 'float': case 'double': case 'decimal': - $views_field['field']['id'] = 'numeric'; + $views_field['field']['id'] = 'field'; $views_field['argument']['id'] = 'numeric'; $views_field['filter']['id'] = 'numeric'; $views_field['sort']['id'] = 'standard'; @@ -360,14 +363,14 @@ protected function mapSingleFieldViewsData($table, $field_name, $field_type, $co case 'text': case 'mediumtext': case 'longtext': - $views_field['field']['id'] = 'standard'; + $views_field['field']['id'] = 'field'; $views_field['argument']['id'] = 'string'; $views_field['filter']['id'] = 'string'; $views_field['sort']['id'] = 'standard'; break; default: - $views_field['field']['id'] = 'standard'; + $views_field['field']['id'] = 'field'; $views_field['argument']['id'] = 'standard'; $views_field['filter']['id'] = 'standard'; $views_field['sort']['id'] = 'standard'; @@ -438,13 +441,13 @@ protected function processViewsDataForEntityReference($table, FieldDefinitionInt 'title' => $entity_type->getLabel(), 'id' => 'standard', ]; - $views_field['field']['id'] = 'numeric'; + $views_field['field']['id'] = 'field'; $views_field['argument']['id'] = 'numeric'; $views_field['filter']['id'] = 'numeric'; $views_field['sort']['id'] = 'standard'; } else { - $views_field['field']['id'] = 'standard'; + $views_field['field']['id'] = 'field'; $views_field['argument']['id'] = 'string'; $views_field['filter']['id'] = 'string'; $views_field['sort']['id'] = 'standard'; @@ -474,7 +477,7 @@ protected function processViewsDataForTextLong($table, FieldDefinitionInterface // Connect the text field to its formatter. if ($field_column_name == 'value') { $views_field['field']['format'] = $field_definition->getName() . '__format'; - $views_field['field']['id'] = 'markup'; + $views_field['field']['id'] = 'field'; } } diff --git a/core/modules/views/src/Plugin/views/field/Field.php b/core/modules/views/src/Plugin/views/field/Field.php index 111a960..2345692 100644 --- a/core/modules/views/src/Plugin/views/field/Field.php +++ b/core/modules/views/src/Plugin/views/field/Field.php @@ -373,9 +373,15 @@ protected function defineOptions() { 'default' => $default_column, ); - $options['type'] = array( - 'default' => isset($field_type['default_formatter']) ? $field_type['default_formatter'] : '', - ); + if (isset($this->definition['default_formatter'])) { + $options['type'] = ['default' => $this->definition['default_formatter']]; + } + elseif (isset($field_type['default_formatter'])) { + $options['type'] = ['default' => $field_type['default_formatter']]; + } + else { + $options['type'] = ['default' => '']; + } $options['settings'] = array( 'default' => isset($this->definition['default_formatter_settings']) ? $this->definition['default_formatter_settings'] : [], diff --git a/core/modules/views/src/Plugin/views/filter/Bundle.php b/core/modules/views/src/Plugin/views/filter/Bundle.php index b518354..e2e2372 100644 --- a/core/modules/views/src/Plugin/views/filter/Bundle.php +++ b/core/modules/views/src/Plugin/views/filter/Bundle.php @@ -123,8 +123,9 @@ public function calculateDependencies() { $bundle_entity_storage = $this->entityManager->getStorage($bundle_entity_type); foreach (array_keys($this->value) as $bundle) { - $bundle_entity = $bundle_entity_storage->load($bundle); - $dependencies[$bundle_entity->getConfigDependencyKey()][] = $bundle_entity->getConfigDependencyName(); + if ($bundle_entity = $bundle_entity_storage->load($bundle)) { + $dependencies[$bundle_entity->getConfigDependencyKey()][] = $bundle_entity->getConfigDependencyName(); + } } return $dependencies; diff --git a/core/modules/views/src/Tests/GroupRowsTest.php b/core/modules/views/src/Tests/GroupRowsTest.php new file mode 100644 index 0000000..bb484a9 --- /dev/null +++ b/core/modules/views/src/Tests/GroupRowsTest.php @@ -0,0 +1,98 @@ +node_type = $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page')); + + // Create the unlimited text field. + $this->field_name = 'field_views_testing_group_rows'; + $this->field_storage = entity_create('field_storage_config', array( + 'field_name' => $this->field_name, + 'entity_type' => 'node', + 'type' => 'text', + 'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED, + )); + $this->field_storage->save(); + + // Create an instance of the text field on the content type. + $this->field = array( + 'field_storage' => $this->field_storage, + 'bundle' => $this->node_type->type, + ); + entity_create('field_config', $this->field)->save(); + + + $edit = array( + 'title' => $this->randomMachineName(), + $this->field_name => array('a', 'b', 'c'), + ); + $this->drupalCreateNode($edit); + } + + /** + * Testing when "Display all values in the same row" is checked. + */ + function testGroupRows() { + $this->drupalGet('test-group-rows'); + $result = $this->xpath('//div[contains(@class, "views-field-field-views-testing-group-")]/div'); + + $rendered_value = array(); + foreach ($result as $row) { + $rendered_value[] = (string) $row[0]; + } + $this->assertEqual(array('a, b, c'), $rendered_value); + } + + /** + * Testing when "Display all values in the same row" is unchecked. + */ + function testUngroupedRows() { + $this->drupalGet('test-ungroup-rows'); + $result = $this->xpath('//div[contains(@class, "views-field-field-views-testing-group-")]/div'); + $rendered_value = array(); + foreach ($result as $row) { + $rendered_value[] = (string) $row[0]; + } + $this->assertEqual(array('a', 'b', 'c'), $rendered_value); + } +} diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php index 1f52a19..e801a09 100644 --- a/core/modules/views/src/Tests/ModuleTest.php +++ b/core/modules/views/src/Tests/ModuleTest.php @@ -30,7 +30,7 @@ class ModuleTest extends ViewUnitTestBase { * * @var array */ - public static $modules = array('user', 'block'); + public static $modules = ['field', 'user', 'block']; /** * Stores the last triggered error, for example via debug(). @@ -142,8 +142,8 @@ public function customErrorHandler($error_level, $message, $filename, $line, $co * Tests the load wrapper/helper functions. */ public function testLoadFunctions() { - $this->enableModules(array('node')); - $this->installConfig(array('node')); + $this->enableModules(['text', 'node']); + $this->installConfig(['node']); $storage = $this->container->get('entity.manager')->getStorage('view'); // Test views_view_is_enabled/disabled. diff --git a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php index 37c71e7..b1f34e6 100644 --- a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php +++ b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php @@ -28,7 +28,7 @@ class BlockDependenciesTest extends ViewUnitTestBase { * * @var array */ - public static $modules = array('node', 'block', 'user'); + public static $modules = array('node', 'block', 'user', 'field'); /** * Tests that exposed filter blocks have the correct dependencies. diff --git a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php index 6580c0c..dcffcb4 100644 --- a/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php +++ b/core/modules/views/src/Tests/Plugin/StyleOpmlTest.php @@ -58,6 +58,7 @@ public function testOpmlOutput() { $this->drupalGet('test-feed-opml-style'); $outline = $this->xpath('//outline[1]'); + debug($feed->getUrl()); $this->assertEqual($outline[0]['type'], 'rss', 'The correct type attribute is used for rss OPML.'); $this->assertEqual($outline[0]['text'], $feed->label(), 'The correct text attribute is used for rss OPML.'); $this->assertEqual($outline[0]['xmlurl'], $feed->getUrl(), 'The correct xmlUrl attribute is used for rss OPML.'); diff --git a/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php b/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php index 946b3c9..054369a 100644 --- a/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php +++ b/core/modules/views/src/Tests/Wizard/ItemsPerPageTest.php @@ -7,6 +7,8 @@ namespace Drupal\views\Tests\Wizard; +use Drupal\views\Entity\View; + /** * Tests the ability of the views wizard to specify the number of items per * page. diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml index 1b6ca39..06d7d4d 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_dropbutton.yml @@ -92,7 +92,7 @@ display: id: title table: node_field_data field: title - plugin_id: node + plugin_id: field label: '' alter: alter_text: false @@ -105,7 +105,9 @@ display: html: false hide_empty: false empty_zero: false - link_to_node: true + type: string + settings: + link_to_entity: true entity_type: node entity_field: title nothing: diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml index a3c350c..a216d80 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml @@ -4,6 +4,12 @@ dependencies: module: - field - node + config: + - field.storage.node.field_views_testing_group_rows + module: + - field + - node + - user id: test_group_rows label: test_group_rows module: views @@ -40,6 +46,17 @@ display: id: field_group_rows table: node__field_group_rows field: field_group_rows + title: + id: title + table: node_field_data + field: title + entity_type: node + entity_field: title + plugin_id: node + field_views_testing_group_: + id: field_views_testing_group_rows + table: node__field_views_testing_group_rows + field: field_views_testing_group_rows relationship: none group_type: group admin_label: '' @@ -100,3 +117,13 @@ display: field_api_classes: false plugin_id: field display_extenders: { } + page_1: + display_options: + path: test-group-rows + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + display_extenders: { } + display_plugin: page + display_title: 'Page display' + id: page_1 + position: 1 diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml index bc86687..cab8b24 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_search.yml @@ -73,7 +73,6 @@ display: html: false hide_empty: false empty_zero: false - link_to_node: true relationship: none group_type: group admin_label: '' @@ -89,9 +88,12 @@ display: element_default_classes: true empty: '' hide_alter_empty: true - plugin_id: node entity_type: node entity_field: title + plugin_id: field + type: string + settings: + link_to_entity: true filters: status: value: true diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml index 79ab084..5bbcf35 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_tag_cache.yml @@ -53,10 +53,54 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - link_to_node: true - plugin_id: node + plugin_id: field entity_type: node entity_field: title + type: string + settings: + link_to_entity: true + plugin_id: field + filters: + type: + id: type + table: node_field_data + field: type + relationship: none + group_type: group + admin_label: '' + operator: in + value: + page: page + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + plugin_id: bundle + entity_type: node + entity_field: type group_by: true pager: type: some diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ungroup_rows.yml similarity index 69% copy from core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml copy to core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ungroup_rows.yml index a3c350c..601037a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_group_rows.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_ungroup_rows.yml @@ -1,11 +1,14 @@ langcode: und status: true dependencies: + config: + - field.storage.node.field_views_testing_group_rows module: - field - node -id: test_group_rows -label: test_group_rows + - user +id: test_ungroup_rows +label: test_ungroup_rows module: views description: '' tag: '' @@ -36,10 +39,17 @@ display: row: type: fields fields: - field_group_rows: - id: field_group_rows - table: node__field_group_rows - field: field_group_rows + title: + id: title + table: node_field_data + field: title + entity_type: node + entity_field: title + plugin_id: node + field_views_testing_group_: + id: field_views_testing_group_rows + table: node__field_views_testing_group_rows + field: field_views_testing_group_rows relationship: none group_type: group admin_label: '' @@ -62,7 +72,7 @@ display: suffix: '' target: '' nl2br: false - max_length: 0 + max_length: '' word_boundary: true ellipsis: true more_link: false @@ -90,13 +100,25 @@ display: link_to_entity: false group_column: value group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 + group_rows: false + delta_limit: all + delta_offset: '0' delta_reversed: false delta_first_last: false multi_type: separator separator: ', ' field_api_classes: false plugin_id: field + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null display_extenders: { } + page_1: + display_options: + path: test-ungroup-rows + field_langcode: '***LANGUAGE_language_content***' + field_langcode_add_to_query: null + display_extenders: { } + display_plugin: page + display_title: 'Page display' + id: page_1 + position: 1 diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php index c1aac0f..01219a7 100644 --- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php @@ -633,7 +633,7 @@ protected function assertField($data, $field_name) { * The views data to check. */ protected function assertStringField($data) { - $this->assertEquals('standard', $data['field']['id']); + $this->assertEquals('field', $data['field']['id']); $this->assertEquals('string', $data['filter']['id']); $this->assertEquals('string', $data['argument']['id']); $this->assertEquals('standard', $data['sort']['id']); @@ -646,7 +646,8 @@ protected function assertStringField($data) { * The views data to check. */ protected function assertUriField($data) { - $this->assertEquals('url', $data['field']['id']); + $this->assertEquals('field', $data['field']['id']); + $this->assertEquals('string', $data['field']['default_formatter']); $this->assertEquals('string', $data['filter']['id']); $this->assertEquals('string', $data['argument']['id']); $this->assertEquals('standard', $data['sort']['id']); @@ -662,7 +663,7 @@ protected function assertUriField($data) { */ protected function assertLongTextField($data, $field_name) { $value_field = $data[$field_name . '__value']; - $this->assertEquals('markup', $value_field['field']['id']); + $this->assertEquals('field', $value_field['field']['id']); $this->assertEquals($field_name . '__format', $value_field['field']['format']); $this->assertEquals('string', $value_field['filter']['id']); $this->assertEquals('string', $value_field['argument']['id']); @@ -679,7 +680,7 @@ protected function assertLongTextField($data, $field_name) { */ protected function assertUuidField($data) { // @todo Can we provide additional support for UUIDs in views? - $this->assertEquals('standard', $data['field']['id']); + $this->assertEquals('field', $data['field']['id']); $this->assertEquals('string', $data['filter']['id']); $this->assertEquals('string', $data['argument']['id']); $this->assertEquals('standard', $data['sort']['id']); @@ -692,7 +693,7 @@ protected function assertUuidField($data) { * The views data to check. */ protected function assertNumericField($data) { - $this->assertEquals('numeric', $data['field']['id']); + $this->assertEquals('field', $data['field']['id']); $this->assertEquals('numeric', $data['filter']['id']); $this->assertEquals('numeric', $data['argument']['id']); $this->assertEquals('standard', $data['sort']['id']); @@ -705,7 +706,7 @@ protected function assertNumericField($data) { * The views data to check. */ protected function assertLanguageField($data) { - $this->assertEquals('language', $data['field']['id']); + $this->assertEquals('field', $data['field']['id']); $this->assertEquals('language', $data['filter']['id']); $this->assertEquals('language', $data['argument']['id']); $this->assertEquals('standard', $data['sort']['id']); @@ -715,7 +716,7 @@ protected function assertLanguageField($data) { * Tests views data for a entity reference field. */ protected function assertEntityReferenceField($data) { - $this->assertEquals('numeric', $data['field']['id']); + $this->assertEquals('field', $data['field']['id']); $this->assertEquals('numeric', $data['filter']['id']); $this->assertEquals('numeric', $data['argument']['id']); $this->assertEquals('standard', $data['sort']['id']); @@ -725,7 +726,7 @@ protected function assertEntityReferenceField($data) { * Tests views data for a bundle field. */ protected function assertBundleField($data) { - $this->assertEquals('standard', $data['field']['id']); + $this->assertEquals('field', $data['field']['id']); $this->assertEquals('bundle', $data['filter']['id']); $this->assertEquals('string', $data['argument']['id']); $this->assertEquals('standard', $data['sort']['id']); diff --git a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php index c4efcdb..918b169 100644 --- a/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php @@ -27,18 +27,8 @@ class FieldTest extends UnitTestCase { */ protected $entityManager; - /** - * The mocked formatter plugin manager. - * - * @var \Drupal\Core\Field\FormatterPluginManager|\PHPUnit_Framework_MockObject_MockObject - */ protected $formatterPluginManager; - /** - * The mocked language manager. - * - * @var \Drupal\Core\Language\LanguageManagerInterface|\PHPUnit_Framework_MockObject_MockObject - */ protected $languageManager; /** @@ -136,11 +126,38 @@ public function testDefineOptionsWithNoOptions() { $this->assertEquals('value', $handler->options['group_column']); $this->assertEquals(0, $handler->options['delta_limit']); } + /** + * @covers ::defineOptions() + */ + public function testDefineOptionsWithDefaultFormatterOnFieldDefinition() { + $definition = [ + 'entity_type' => 'test_entity', + 'field_name' => 'title', + 'default_formatter' => 'test_example', + 'default_formatter_settings' => ['link_to_entity' => TRUE] + ]; + $handler = new Field([], 'field', $definition, $this->entityManager, $this->formatterPluginManager, $this->fieldTypePluginManager, $this->languageManager, $this->renderer); + + // Setup the entity manager to allow fetching the storage definitions. + $title_storage = $this->getBaseFieldStorage(); + + $this->entityManager->expects($this->atLeastOnce()) + ->method('getFieldStorageDefinitions') + ->with('test_entity') + ->willReturn([ + 'title' => $title_storage, + ]); + + $options = []; + $handler->init($this->executable, $this->display, $options); + + $this->assertEquals('test_example', $handler->options['type']); + } /** * @covers ::defineOptions() */ - public function testDefineOptionsWithDefaultFormatter() { + public function testDefineOptionsWithDefaultFormatterOnFieldType() { $definition = [ 'entity_type' => 'test_entity', 'field_name' => 'title', @@ -213,7 +230,7 @@ public function testCalculateDependenciesWithConfiguredField() { } /** - * @covers ::access() + * @covers ::access */ public function testAccess() { $definition = [ @@ -254,7 +271,8 @@ public function testAccess() { $access_control_handler->expects($this->atLeastOnce()) ->method('fieldAccess') - ->with('view', $this->anything(), $account, NULL, FALSE) + // @todo replace the second anything() with FALSE. + ->with('view', $this->anything(), $account, NULL, $this->anything()) ->willReturn(TRUE); $this->assertTrue($handler->access($account)); @@ -265,8 +283,6 @@ public function testAccess() { * * @param string $order * The sort order. - * - * @covers ::clickSort */ public function testClickSortWithOutConfiguredColumn($order) { $definition = [ @@ -287,8 +303,6 @@ public function testClickSortWithOutConfiguredColumn($order) { * * @param string $order * The sort order. - * - * @covers ::clickSort */ public function testClickSortWithBaseField($order) { $definition = [ @@ -347,8 +361,6 @@ public function testClickSortWithBaseField($order) { * * @param string $order * The sort order. - * - * @covers ::clickSort */ public function testClickSortWithConfiguredField($order) { $definition = [ @@ -402,9 +414,6 @@ public function testClickSortWithConfiguredField($order) { $handler->clickSort($order); } - /** - * @covers ::query - */ public function testQueryWithGroupByForBaseField() { $definition = [ 'entity_type' => 'test_entity', @@ -463,9 +472,6 @@ public function testQueryWithGroupByForBaseField() { $handler->query(TRUE); } - /** - * @covers ::query - */ public function testQueryWithGroupByForConfigField() { $definition = [ 'entity_type' => 'test_entity', @@ -525,8 +531,6 @@ public function testQueryWithGroupByForConfigField() { } /** - * Returns a mocked base field storage object. - * * @return \Drupal\Core\Field\FieldStorageDefinitionInterface|\PHPUnit_Framework_MockObject_MockObject */ protected function getBaseFieldStorage() { @@ -544,8 +548,6 @@ protected function getBaseFieldStorage() { } /** - * Returns a mocked configurable field storage object. - * * @return \Drupal\field\FieldStorageConfigInterface|\PHPUnit_Framework_MockObject_MockObject */ protected function getConfigFieldStorage() { @@ -562,11 +564,6 @@ protected function getConfigFieldStorage() { return $title_storage; } - /** - * Provides sort orders for clickSort() test methods. - * - * @return array - */ public function providerSortOrders() { return [ ['asc'], @@ -614,3 +611,4 @@ protected function setupLanguageRenderer(Field $handler, $definition) { } } +