diff --git a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml index 3d0bec3..1ce66e1 100644 --- a/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml @@ -100,6 +100,7 @@ display: empty: '' hide_alter_empty: true link_to_entity: false + plugin_id: comment filters: subject: id: subject diff --git a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml index 213689a..409f16f 100644 --- a/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml +++ b/core/modules/node/tests/modules/node_test_views/test_views/views.view.test_field_filters.yml @@ -73,7 +73,7 @@ display: html: false hide_empty: false empty_zero: false - link_to_node: 1 + link_to_node: true relationship: none group_type: group admin_label: '' @@ -88,6 +88,7 @@ display: element_default_classes: true empty: '' hide_alter_empty: true + plugin_id: node filters: status: value: true @@ -97,6 +98,7 @@ display: expose: operator: '' group: 1 + plugin_id: boolean title: id: title table: node_field_data @@ -179,6 +181,7 @@ display: expose: operator: '' group: 1 + plugin_id: boolean body_value: id: body_value table: node__body @@ -243,6 +246,7 @@ display: expose: operator: '' group: 1 + plugin_id: boolean body_value: id: body_value table: node__body @@ -307,6 +311,7 @@ display: expose: operator: '' group: 1 + plugin_id: boolean title: id: title table: node_field_data diff --git a/core/modules/views/config/schema/views.access.schema.yml b/core/modules/views/config/schema/views.access.schema.yml index c09edef..dac0100 100644 --- a/core/modules/views/config/schema/views.access.schema.yml +++ b/core/modules/views/config/schema/views.access.schema.yml @@ -1,7 +1,5 @@ # Schema for the views access plugins. views.access.none: - type: sequence + type: mapping label: 'None' - sequence: - - type: string diff --git a/core/modules/views/config/schema/views.schema.yml b/core/modules/views/config/schema/views.schema.yml index 61a6ea5..9c1f23c 100644 --- a/core/modules/views/config/schema/views.schema.yml +++ b/core/modules/views/config/schema/views.schema.yml @@ -112,10 +112,13 @@ views.view.*: position: type: integer label: 'Position' + deleted: + type: boolean + label: 'Deleted' display_options: type: views.display.[%parent.display_plugin] -block.settings.views_block:*: +views_block: type: block_settings label: 'View block' mapping: @@ -125,3 +128,9 @@ block.settings.views_block:*: items_per_page: type: string label: 'Items per block' + +block.settings.views_block:*: + type: views_block + +block.settings.views_exposed_filter_block:*: + type: views_block diff --git a/core/modules/views/src/Tests/Handler/AreaTest.php b/core/modules/views/src/Tests/Handler/AreaTest.php index 0df2ce0..cece05c 100644 --- a/core/modules/views/src/Tests/Handler/AreaTest.php +++ b/core/modules/views/src/Tests/Handler/AreaTest.php @@ -166,6 +166,7 @@ public function testTitleArea() { 'admin_label' => '', 'empty' => '0', 'title' => 'Overridden title', + 'plugin_id' => 'title', ), )); diff --git a/core/modules/views/src/Tests/Plugin/DisplayTest.php b/core/modules/views/src/Tests/Plugin/DisplayTest.php index 3c52272..7ffb84d 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayTest.php @@ -84,7 +84,9 @@ public function testDisplayPlugin() { // Move the second display before the first one in order to test custom // sorting. $displays['display_test_1']['position'] = 2; + $displays['display_test_1']['display_plugin'] = 'page'; $displays['display_test_2']['position'] = 1; + $displays['display_test_2']['display_plugin'] = 'page'; $view->storage->set('display', $displays); $view->save(); diff --git a/core/modules/views/src/Tests/ViewElementTest.php b/core/modules/views/src/Tests/ViewElementTest.php index c0b7829..ec85538 100644 --- a/core/modules/views/src/Tests/ViewElementTest.php +++ b/core/modules/views/src/Tests/ViewElementTest.php @@ -89,11 +89,12 @@ public function testViewElement() { 'type' => 'none', 'fail' => 'not found', ), - 'break_phrase' => 0, - 'not' => 0, + 'break_phrase' => FALSE, + 'not' => FALSE, 'id' => 'age', 'table' => 'views_test_data', 'field' => 'age', + 'plugin_id' => 'numeric', ) )); $view->save(); diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml index 73463bf..af8b888 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_defaults.yml @@ -48,5 +48,6 @@ display: table: views_test_data field: created order: DESC + plugin_id: date field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml index 30b059b..f2d15cf 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_views_groupby_save.yml @@ -29,7 +29,7 @@ display: field: id table: views_test_data id: id - plugin_id: id + plugin_id: numeric field_langcode: '***LANGUAGE_language_content***' field_langcode_add_to_query: null display_plugin: default diff --git a/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml b/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml index 4b51a2b..590559f 100644 --- a/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml +++ b/core/modules/views/tests/modules/views_test_data/config/schema/views_test_data.views.schema.yml @@ -26,3 +26,58 @@ views.style.mapping_test: toggle_title_field: type: boolean label: 'Toggle title field' + +views_test_data.tests: + type: mapping + label: 'Views test data tests' + mapping: + handler_access_callback: + type: boolean + label: 'Access callback handler toggle' + handler_access_callback_argument: + type: boolean + label: 'Access callback argument handler toggle' + +views.access.test_static: + type: mapping + label: 'Static test' + mapping: + access: + type: boolean + label: 'Allow access' + +views.display.display_test: + type: views_display + label: 'Test display options' + mapping: + test_option: + label: 'Test option' + type: string + +views.display.display_no_area_test: + type: views.display.display_test + label: 'Test display options without areas' + +views.query.query_test: + type: views_query + label: 'Views query test options' + mapping: + test_setting: + type: string + label: 'Test setting' + +views.row.test_row: + type: views_entity_row + label: 'Row test options' + mapping: + test_option: + type: string + label: 'Test option' + +views.style.test_style: + type: views_style + label: 'Test style options' + mapping: + test_option: + type: string + label: 'Test option' diff --git a/core/modules/views_ui/src/Tests/CustomBooleanTest.php b/core/modules/views_ui/src/Tests/CustomBooleanTest.php index ebf989b..555f81e 100644 --- a/core/modules/views_ui/src/Tests/CustomBooleanTest.php +++ b/core/modules/views_ui/src/Tests/CustomBooleanTest.php @@ -30,6 +30,7 @@ class CustomBooleanTest extends UITestBase { public function viewsData() { $data = parent::viewsData(); $data['views_test_data']['age']['field']['id'] = 'boolean'; + $data['views_test_data']['age']['field']['plugin_id'] = 'boolean'; return $data; }