diff --git a/core/modules/block/config/schema/block.views.schema.yml b/core/modules/block/config/schema/block.views.schema.yml deleted file mode 100644 index 53affeb6a23..00000000000 --- a/core/modules/block/config/schema/block.views.schema.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Schema for the views plugins of the Block module. - - -views.display.block: - type: views_display - label: 'Block display options' - mapping: - block_description: - type: label - label: 'Block name' - block_category: - type: text - label: 'Block category' - block_hide_empty: - type: boolean - label: 'Hide block if no result/empty text' - allow: - type: mapping - label: 'Allow' - mapping: - items_per_page: - type: boolean - label: 'Items per page' diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml index e16db6bcf8e..8ecb8a1a477 100644 --- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block.yml @@ -38,7 +38,7 @@ display: id: block_1 display_title: Block position: null - provider: block + provider: views display_options: field: title: @@ -47,6 +47,3 @@ label: test_view_block module: views id: test_view_block tag: '' -dependencies: - module: - - block diff --git a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml index 45750f45a53..c9920840de9 100644 --- a/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml +++ b/core/modules/block/tests/modules/block_test_views/test_views/views.view.test_view_block2.yml @@ -34,7 +34,7 @@ display: provider: views_test_data title: test_view_block2 block_1: - provider: block + provider: views display_plugin: block id: block_1 display_title: Block @@ -44,7 +44,7 @@ display: title: link_to_node: true block_2: - provider: block + provider: views display_plugin: block id: block_2 display_title: Block @@ -54,7 +54,7 @@ display: title: link_to_node: true block_3: - provider: block + provider: views display_plugin: block id: block_3 display_title: Block @@ -68,6 +68,3 @@ label: test_view_block2 module: views id: test_view_block2 tag: '' -dependencies: - module: - - block diff --git a/core/modules/comment/config/install/views.view.comments_recent.yml b/core/modules/comment/config/install/views.view.comments_recent.yml index 674c8a8a32c..9023ae7e34a 100644 --- a/core/modules/comment/config/install/views.view.comments_recent.yml +++ b/core/modules/comment/config/install/views.view.comments_recent.yml @@ -3,7 +3,6 @@ status: true dependencies: module: - comment - - block id: comments_recent label: 'Recent comments' module: views @@ -232,7 +231,7 @@ display: field_langcode: '***CURRENT_LANGUAGE***' field_langcode_add_to_query: null block_1: - provider: block + provider: views display_plugin: block id: block_1 display_title: Block diff --git a/core/modules/node/config/install/views.view.archive.yml b/core/modules/node/config/install/views.view.archive.yml index 58be6c3b79f..f8dd979929f 100644 --- a/core/modules/node/config/install/views.view.archive.yml +++ b/core/modules/node/config/install/views.view.archive.yml @@ -140,7 +140,7 @@ display: display_title: Block display_plugin: block position: 1 - provider: block + provider: views display_options: query: type: views_query @@ -174,5 +174,4 @@ langcode: en dependencies: module: - node - - block 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 f7fa546a0df..643ac97201c 100644 --- a/core/modules/node/config/install/views.view.content_recent.yml +++ b/core/modules/node/config/install/views.view.content_recent.yml @@ -460,7 +460,7 @@ display: display_options: link_url: admin/content block_category: 'Lists (Views)' - provider: block + provider: views label: 'Recent content' module: node id: content_recent @@ -470,5 +470,4 @@ dependencies: module: - node - user - - block diff --git a/core/modules/user/config/install/views.view.who_s_new.yml b/core/modules/user/config/install/views.view.who_s_new.yml index f04489fa322..694827addb7 100644 --- a/core/modules/user/config/install/views.view.who_s_new.yml +++ b/core/modules/user/config/install/views.view.who_s_new.yml @@ -162,7 +162,7 @@ display: id: block_1 display_title: 'Who''s new' position: 1 - provider: block + provider: views display_options: display_description: 'A list of new users' block_description: 'Who''s new' @@ -175,4 +175,3 @@ langcode: en dependencies: module: - user - - block diff --git a/core/modules/user/config/install/views.view.who_s_online.yml b/core/modules/user/config/install/views.view.who_s_online.yml index 748538f8dd7..5b2208224fb 100644 --- a/core/modules/user/config/install/views.view.who_s_online.yml +++ b/core/modules/user/config/install/views.view.who_s_online.yml @@ -193,7 +193,7 @@ display: id: who_s_online_block display_title: 'Who''s online' position: 1 - provider: block + provider: views display_options: block_description: 'Who''s online' display_description: 'A list of users that are currently logged in.' @@ -205,4 +205,3 @@ langcode: en dependencies: module: - user - - block diff --git a/core/modules/views/config/schema/views.display.schema.yml b/core/modules/views/config/schema/views.display.schema.yml index 626588b3b00..212941bb750 100644 --- a/core/modules/views/config/schema/views.display.schema.yml +++ b/core/modules/views/config/schema/views.display.schema.yml @@ -60,6 +60,27 @@ views.display.page: type: string label: 'Menu name' +views.display.block: + type: views_display + label: 'Block display options' + mapping: + block_description: + type: label + label: 'Block name' + block_category: + type: text + label: 'Block category' + block_hide_empty: + type: boolean + label: 'Hide block if no result/empty text' + allow: + type: mapping + label: 'Allow' + mapping: + items_per_page: + type: boolean + label: 'Items per page' + views.display.feed: type: views_display_path label: 'Feed display options' diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml index 840d8741726..8f40aa374c5 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display.yml @@ -32,7 +32,7 @@ display: display_title: Block id: block_1 position: 2 - provider: block + provider: views default: display_options: access: @@ -92,6 +92,3 @@ display: label: '' id: test_display tag: '' -dependencies: - module: - - block diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml index 638c3f58a1a..b74f3c07d4a 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_invalid.yml @@ -30,10 +30,7 @@ display: id: block_1 display_title: Block position: 1 - provider: block + provider: views label: '' id: test_display_invalid tag: '' -dependencies: - module: - - block