From c8fc3d5cec27e88b60ddbdce1ca1ef7bc4b26cd8 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Fri, 7 Jul 2023 15:01:16 +0300 Subject: [PATCH 1/7] EWPP-3455: Update dependencies in composer.json file. --- composer.json | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index eed3d86..1d97e58 100644 --- a/composer.json +++ b/composer.json @@ -4,16 +4,16 @@ "type": "library", "license": "EUPL-1.2", "require": { - "php": ">=7.1", - "drupal/core": "^8.6 || ^9", - "drupal/drupal-extension": "~4.0" + "php": ">=8.0", + "drupal/core": "^9.4 || ^10", + "drupal/drupal-extension": "~5.0" }, "require-dev": { "composer/installers": "~1.2", - "drush/drush": "~10.3", - "drupal/core-dev": "^8.9 || ^9", - "drupal/core-composer-scaffold": "^8.9 || ^9", - "guzzlehttp/guzzle": "~6.3", + "drush/drush": "~12.1", + "drupal/core-dev": "^9.4 || ^10", + "drupal/core-composer-scaffold": "^9.4 || ^10", + "guzzlehttp/guzzle": "~7.0", "instaclick/php-webdriver": "^1.4.5", "nikic/php-parser": "~3.0|~4.0", "openeuropa/code-review": "^1.6|^2.0", @@ -51,7 +51,10 @@ "allow-plugins": { "composer/installers": true, "dealerdirect/phpcodesniffer-composer-installer": true, - "drupal/core-composer-scaffold": true + "drupal/core-composer-scaffold": true, + "cweagans/composer-patches": true, + "phpro/grumphp": true, + "phpstan/extension-installer": true }, "discard-changes": true }, From 0eacf977feb08688fa564258fbf6c251f2a65999 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Fri, 7 Jul 2023 15:03:00 +0300 Subject: [PATCH 2/7] EWPP-3455: Update used php to 8.1 in docker-compose.yml. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4bf5af9..102ae2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: web: - image: fpfis/httpd-php-dev:8.0 + image: fpfis/httpd-php-dev:8.1 working_dir: /var/www/html ports: - 8080:8080 From 9a5e85f9ed064432019d1cd3e2f786cb1414d77a Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Fri, 7 Jul 2023 15:03:45 +0300 Subject: [PATCH 3/7] EWPP-3455: Update README.md file. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 94f8a75..df538a7 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ definitions to demonstrate how to use the traits. This depends on the following software: -* [PHP 7.1](http://php.net/) -* [Drupal 8.6](https://www.drupal.org/) +* [PHP 8.0](http://php.net/) +* [Drupal 9.4](https://www.drupal.org/) * [Behat Drupal Extension](https://github.com/jhedstrom/drupalextension) ## Installation From bf8ad3187fa2e40d192cdb45cb4bec57b5ba87b2 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Fri, 7 Jul 2023 15:04:38 +0300 Subject: [PATCH 4/7] EWPP-3455: Update configs for import. --- tests/config/sync/block.block.stark_admin.yml | 2 +- .../sync/block.block.stark_branding.yml | 2 +- .../sync/block.block.stark_local_actions.yml | 2 +- .../sync/block.block.stark_local_tasks.yml | 2 +- tests/config/sync/block.block.stark_login.yml | 2 +- .../sync/block.block.stark_messages.yml | 2 +- .../sync/block.block.stark_page_title.yml | 2 +- tests/config/sync/block.block.stark_tools.yml | 2 +- .../sync/block.block.useraccountmenu.yml | 6 +- ...ty_form_display.node.blog_post.default.yml | 24 +- ....entity_form_display.node.news.default.yml | 24 +- ...ty_view_display.node.blog_post.default.yml | 10 +- ...ity_view_display.node.blog_post.teaser.yml | 6 +- ....entity_view_display.node.news.default.yml | 10 +- ...e.entity_view_display.node.news.teaser.yml | 6 +- tests/config/sync/core.extension.yml | 6 +- .../core.menu.static_menu_link_overrides.yml | 2 +- tests/config/sync/dblog.settings.yml | 2 +- .../sync/field.field.node.blog_post.body.yml | 1 + .../sync/field.field.node.news.body.yml | 1 + tests/config/sync/field.settings.yml | 2 +- tests/config/sync/filter.settings.yml | 4 +- tests/config/sync/node.settings.yml | 2 +- tests/config/sync/system.cron.yml | 4 +- tests/config/sync/system.date.yml | 8 +- tests/config/sync/system.diff.yml | 4 +- tests/config/sync/system.file.yml | 4 +- tests/config/sync/system.image.gd.yml | 2 +- tests/config/sync/system.image.yml | 2 +- tests/config/sync/system.logging.yml | 2 +- tests/config/sync/system.mail.yml | 4 +- tests/config/sync/system.maintenance.yml | 4 +- tests/config/sync/system.performance.yml | 4 +- tests/config/sync/system.rss.yml | 12 +- tests/config/sync/system.site.yml | 8 +- tests/config/sync/system.theme.global.yml | 4 +- tests/config/sync/system.theme.yml | 4 +- tests/config/sync/text.settings.yml | 2 +- tests/config/sync/update.settings.yml | 4 +- tests/config/sync/user.flood.yml | 4 +- tests/config/sync/user.mail.yml | 110 +++- tests/config/sync/user.settings.yml | 6 +- tests/config/sync/views.view.archive.yml | 128 ++--- tests/config/sync/views.view.content.yml | 393 ++++++------- .../config/sync/views.view.content_recent.yml | 194 +++---- tests/config/sync/views.view.files.yml | 518 +++++++++--------- tests/config/sync/views.view.frontpage.yml | 300 +++++----- tests/config/sync/views.view.glossary.yml | 315 +++++------ .../config/sync/views.view.taxonomy_term.yml | 134 ++--- .../sync/views.view.user_admin_people.yml | 424 +++++++------- tests/config/sync/views.view.watchdog.yml | 350 ++++++------ tests/config/sync/views.view.who_s_new.yml | 166 +++--- tests/config/sync/views.view.who_s_online.yml | 202 +++---- 53 files changed, 1782 insertions(+), 1656 deletions(-) diff --git a/tests/config/sync/block.block.stark_admin.yml b/tests/config/sync/block.block.stark_admin.yml index aca7ec6..a59c549 100644 --- a/tests/config/sync/block.block.stark_admin.yml +++ b/tests/config/sync/block.block.stark_admin.yml @@ -19,8 +19,8 @@ plugin: 'system_menu_block:admin' settings: id: 'system_menu_block:admin' label: Administration - provider: system label_display: visible + provider: system level: 1 depth: 0 expand_all_items: false diff --git a/tests/config/sync/block.block.stark_branding.yml b/tests/config/sync/block.block.stark_branding.yml index d062810..9241afb 100644 --- a/tests/config/sync/block.block.stark_branding.yml +++ b/tests/config/sync/block.block.stark_branding.yml @@ -17,8 +17,8 @@ plugin: system_branding_block settings: id: system_branding_block label: 'Site branding' - provider: system label_display: '0' + provider: system use_site_logo: true use_site_name: true use_site_slogan: true diff --git a/tests/config/sync/block.block.stark_local_actions.yml b/tests/config/sync/block.block.stark_local_actions.yml index 1b1573d..bffd5be 100644 --- a/tests/config/sync/block.block.stark_local_actions.yml +++ b/tests/config/sync/block.block.stark_local_actions.yml @@ -15,6 +15,6 @@ plugin: local_actions_block settings: id: local_actions_block label: 'Primary admin actions' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/tests/config/sync/block.block.stark_local_tasks.yml b/tests/config/sync/block.block.stark_local_tasks.yml index d61f607..222ee93 100644 --- a/tests/config/sync/block.block.stark_local_tasks.yml +++ b/tests/config/sync/block.block.stark_local_tasks.yml @@ -15,8 +15,8 @@ plugin: local_tasks_block settings: id: local_tasks_block label: Tabs - provider: core label_display: '0' + provider: core primary: true secondary: true visibility: { } diff --git a/tests/config/sync/block.block.stark_login.yml b/tests/config/sync/block.block.stark_login.yml index 350563a..7c924ba 100644 --- a/tests/config/sync/block.block.stark_login.yml +++ b/tests/config/sync/block.block.stark_login.yml @@ -17,6 +17,6 @@ plugin: user_login_block settings: id: user_login_block label: 'User login' - provider: user label_display: visible + provider: user visibility: { } diff --git a/tests/config/sync/block.block.stark_messages.yml b/tests/config/sync/block.block.stark_messages.yml index ffc9e06..178117d 100644 --- a/tests/config/sync/block.block.stark_messages.yml +++ b/tests/config/sync/block.block.stark_messages.yml @@ -17,6 +17,6 @@ plugin: system_messages_block settings: id: system_messages_block label: 'Status messages' - provider: system label_display: '0' + provider: system visibility: { } diff --git a/tests/config/sync/block.block.stark_page_title.yml b/tests/config/sync/block.block.stark_page_title.yml index 564a8bb..4c74757 100644 --- a/tests/config/sync/block.block.stark_page_title.yml +++ b/tests/config/sync/block.block.stark_page_title.yml @@ -15,6 +15,6 @@ plugin: page_title_block settings: id: page_title_block label: 'Page title' - provider: core label_display: '0' + provider: core visibility: { } diff --git a/tests/config/sync/block.block.stark_tools.yml b/tests/config/sync/block.block.stark_tools.yml index 771afdb..6574775 100644 --- a/tests/config/sync/block.block.stark_tools.yml +++ b/tests/config/sync/block.block.stark_tools.yml @@ -19,8 +19,8 @@ plugin: 'system_menu_block:tools' settings: id: 'system_menu_block:tools' label: Tools - provider: system label_display: visible + provider: system level: 1 depth: 0 expand_all_items: false diff --git a/tests/config/sync/block.block.useraccountmenu.yml b/tests/config/sync/block.block.useraccountmenu.yml index 398d427..cfbb8e4 100644 --- a/tests/config/sync/block.block.useraccountmenu.yml +++ b/tests/config/sync/block.block.useraccountmenu.yml @@ -18,16 +18,16 @@ plugin: 'system_menu_block:account' settings: id: 'system_menu_block:account' label: 'User account menu' - provider: system label_display: visible + provider: system level: 1 depth: 0 expand_all_items: false visibility: user_role: id: user_role - roles: - authenticated: authenticated negate: false context_mapping: user: '@user.current_user_context:current_user' + roles: + authenticated: authenticated diff --git a/tests/config/sync/core.entity_form_display.node.blog_post.default.yml b/tests/config/sync/core.entity_form_display.node.blog_post.default.yml index 45e371e..98318f5 100644 --- a/tests/config/sync/core.entity_form_display.node.blog_post.default.yml +++ b/tests/config/sync/core.entity_form_display.node.blog_post.default.yml @@ -16,12 +16,12 @@ content: body: type: text_textarea_with_summary weight: 121 + region: content settings: rows: 9 summary_rows: 3 placeholder: '' third_party_settings: { } - region: content created: type: datetime_timestamp weight: 10 @@ -29,35 +29,35 @@ content: settings: { } third_party_settings: { } field_tags: + type: entity_reference_autocomplete weight: 122 + region: content settings: match_operator: CONTAINS + match_limit: 10 size: 60 placeholder: '' - match_limit: 10 third_party_settings: { } - type: entity_reference_autocomplete - region: content promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield @@ -70,11 +70,11 @@ content: uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS + match_limit: 10 size: 60 placeholder: '' - match_limit: 10 - region: content third_party_settings: { } hidden: { } diff --git a/tests/config/sync/core.entity_form_display.node.news.default.yml b/tests/config/sync/core.entity_form_display.node.news.default.yml index cd6a5a6..f5d9b98 100644 --- a/tests/config/sync/core.entity_form_display.node.news.default.yml +++ b/tests/config/sync/core.entity_form_display.node.news.default.yml @@ -16,12 +16,12 @@ content: body: type: text_textarea_with_summary weight: 121 + region: content settings: rows: 9 summary_rows: 3 placeholder: '' third_party_settings: { } - region: content created: type: datetime_timestamp weight: 10 @@ -29,35 +29,35 @@ content: settings: { } third_party_settings: { } field_tags: + type: entity_reference_autocomplete weight: 122 + region: content settings: match_operator: CONTAINS + match_limit: 10 size: 60 placeholder: '' - match_limit: 10 third_party_settings: { } - type: entity_reference_autocomplete - region: content promote: type: boolean_checkbox - settings: - display_label: true weight: 15 region: content + settings: + display_label: true third_party_settings: { } status: type: boolean_checkbox - settings: - display_label: true weight: 120 region: content + settings: + display_label: true third_party_settings: { } sticky: type: boolean_checkbox - settings: - display_label: true weight: 16 region: content + settings: + display_label: true third_party_settings: { } title: type: string_textfield @@ -70,11 +70,11 @@ content: uid: type: entity_reference_autocomplete weight: 5 + region: content settings: match_operator: CONTAINS + match_limit: 10 size: 60 placeholder: '' - match_limit: 10 - region: content third_party_settings: { } hidden: { } diff --git a/tests/config/sync/core.entity_view_display.node.blog_post.default.yml b/tests/config/sync/core.entity_view_display.node.blog_post.default.yml index 1a06679..246cd14 100644 --- a/tests/config/sync/core.entity_view_display.node.blog_post.default.yml +++ b/tests/config/sync/core.entity_view_display.node.blog_post.default.yml @@ -15,23 +15,23 @@ bundle: blog_post mode: default content: body: - label: hidden type: text_default - weight: 101 + label: hidden settings: { } third_party_settings: { } + weight: 101 region: content field_tags: - weight: 102 + type: entity_reference_label label: above settings: link: true third_party_settings: { } - type: entity_reference_label + weight: 102 region: content links: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: { } diff --git a/tests/config/sync/core.entity_view_display.node.blog_post.teaser.yml b/tests/config/sync/core.entity_view_display.node.blog_post.teaser.yml index e445034..7524e0c 100644 --- a/tests/config/sync/core.entity_view_display.node.blog_post.teaser.yml +++ b/tests/config/sync/core.entity_view_display.node.blog_post.teaser.yml @@ -15,17 +15,17 @@ bundle: blog_post mode: teaser content: body: - label: hidden type: text_summary_or_trimmed - weight: 101 + label: hidden settings: trim_length: 600 third_party_settings: { } + weight: 101 region: content links: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: field_tags: true diff --git a/tests/config/sync/core.entity_view_display.node.news.default.yml b/tests/config/sync/core.entity_view_display.node.news.default.yml index b25682f..30453f1 100644 --- a/tests/config/sync/core.entity_view_display.node.news.default.yml +++ b/tests/config/sync/core.entity_view_display.node.news.default.yml @@ -15,23 +15,23 @@ bundle: news mode: default content: body: - label: hidden type: text_default - weight: 101 + label: hidden settings: { } third_party_settings: { } + weight: 101 region: content field_tags: - weight: 102 + type: entity_reference_label label: above settings: link: true third_party_settings: { } - type: entity_reference_label + weight: 102 region: content links: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: { } diff --git a/tests/config/sync/core.entity_view_display.node.news.teaser.yml b/tests/config/sync/core.entity_view_display.node.news.teaser.yml index 1f8005c..bdefcaf 100644 --- a/tests/config/sync/core.entity_view_display.node.news.teaser.yml +++ b/tests/config/sync/core.entity_view_display.node.news.teaser.yml @@ -15,17 +15,17 @@ bundle: news mode: teaser content: body: - label: hidden type: text_summary_or_trimmed - weight: 101 + label: hidden settings: trim_length: 600 third_party_settings: { } + weight: 101 region: content links: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: field_tags: true diff --git a/tests/config/sync/core.extension.yml b/tests/config/sync/core.extension.yml index 871db1f..003f7f5 100644 --- a/tests/config/sync/core.extension.yml +++ b/tests/config/sync/core.extension.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc module: block: 0 dblog: 0 @@ -6,8 +8,10 @@ module: field_ui: 0 file: 0 filter: 0 + mysql: 0 node: 0 page_cache: 0 + path_alias: 0 system: 0 taxonomy: 0 text: 0 @@ -19,5 +23,3 @@ module: theme: stark: 0 profile: minimal -_core: - default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc diff --git a/tests/config/sync/core.menu.static_menu_link_overrides.yml b/tests/config/sync/core.menu.static_menu_link_overrides.yml index df14c46..2261a22 100644 --- a/tests/config/sync/core.menu.static_menu_link_overrides.yml +++ b/tests/config/sync/core.menu.static_menu_link_overrides.yml @@ -1,3 +1,3 @@ -definitions: { } _core: default_config_hash: jdY7AU0tU-QsjmiOw3W8vwpYMb-By--_MSFgbqKUTYM +definitions: { } diff --git a/tests/config/sync/dblog.settings.yml b/tests/config/sync/dblog.settings.yml index cf06e3f..fbd17ea 100644 --- a/tests/config/sync/dblog.settings.yml +++ b/tests/config/sync/dblog.settings.yml @@ -1,3 +1,3 @@ -row_limit: 1000 _core: default_config_hash: e883aGsrt1wFrsydlYU584PZONCSfRy0DtkZ9KzHb58 +row_limit: 1000 diff --git a/tests/config/sync/field.field.node.blog_post.body.yml b/tests/config/sync/field.field.node.blog_post.body.yml index e090849..496c765 100644 --- a/tests/config/sync/field.field.node.blog_post.body.yml +++ b/tests/config/sync/field.field.node.blog_post.body.yml @@ -20,4 +20,5 @@ default_value_callback: '' settings: display_summary: true required_summary: false + allowed_formats: { } field_type: text_with_summary diff --git a/tests/config/sync/field.field.node.news.body.yml b/tests/config/sync/field.field.node.news.body.yml index 46e5b85..749f443 100644 --- a/tests/config/sync/field.field.node.news.body.yml +++ b/tests/config/sync/field.field.node.news.body.yml @@ -20,4 +20,5 @@ default_value_callback: '' settings: display_summary: true required_summary: false + allowed_formats: { } field_type: text_with_summary diff --git a/tests/config/sync/field.settings.yml b/tests/config/sync/field.settings.yml index 95c042d..2225b8f 100644 --- a/tests/config/sync/field.settings.yml +++ b/tests/config/sync/field.settings.yml @@ -1,3 +1,3 @@ -purge_batch_size: 50 _core: default_config_hash: nJk0TAQBzlNo52ehiHI7bIEPLGi0BYqZvPdEn7Chfu0 +purge_batch_size: 50 diff --git a/tests/config/sync/filter.settings.yml b/tests/config/sync/filter.settings.yml index dfcfed3..9ce2939 100644 --- a/tests/config/sync/filter.settings.yml +++ b/tests/config/sync/filter.settings.yml @@ -1,4 +1,4 @@ -fallback_format: plain_text -always_show_fallback_choice: false _core: default_config_hash: FiPjM3WdB__ruFA7B6TLwni_UcZbmek5G4b2dxQItxA +fallback_format: plain_text +always_show_fallback_choice: false diff --git a/tests/config/sync/node.settings.yml b/tests/config/sync/node.settings.yml index b65cead..3a9d97e 100644 --- a/tests/config/sync/node.settings.yml +++ b/tests/config/sync/node.settings.yml @@ -1,3 +1,3 @@ -use_admin_theme: false _core: default_config_hash: 2OMXCScXUOLSYID9-phjO4q36nnnaMWNUlDxEqZzG1U +use_admin_theme: false diff --git a/tests/config/sync/system.cron.yml b/tests/config/sync/system.cron.yml index 6801fb5..49e58a0 100644 --- a/tests/config/sync/system.cron.yml +++ b/tests/config/sync/system.cron.yml @@ -1,6 +1,6 @@ +_core: + default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y threshold: requirements_warning: 172800 requirements_error: 1209600 logging: 1 -_core: - default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y diff --git a/tests/config/sync/system.date.yml b/tests/config/sync/system.date.yml index e075cb4..38ad03d 100644 --- a/tests/config/sync/system.date.yml +++ b/tests/config/sync/system.date.yml @@ -1,11 +1,11 @@ +_core: + default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo +first_day: 0 country: default: '' -first_day: 0 timezone: default: Europe/Sofia user: configurable: true - warn: false default: 0 -_core: - default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo + warn: false diff --git a/tests/config/sync/system.diff.yml b/tests/config/sync/system.diff.yml index c43dd91..f2fff7b 100644 --- a/tests/config/sync/system.diff.yml +++ b/tests/config/sync/system.diff.yml @@ -1,5 +1,5 @@ +_core: + default_config_hash: 1WanmaEhxW_vM8_5Ktsdntj8MaO9UBHXg0lN603PsWM context: lines_leading: 2 lines_trailing: 2 -_core: - default_config_hash: 1WanmaEhxW_vM8_5Ktsdntj8MaO9UBHXg0lN603PsWM diff --git a/tests/config/sync/system.file.yml b/tests/config/sync/system.file.yml index 39ee4cb..2cf27f7 100644 --- a/tests/config/sync/system.file.yml +++ b/tests/config/sync/system.file.yml @@ -1,7 +1,7 @@ +_core: + default_config_hash: t48gCU9DzYfjb3bAOIqHLzhL0ChBlXh6_5B5Pyo9t8g allow_insecure_uploads: false default_scheme: public path: temporary: /tmp temporary_maximum_age: 21600 -_core: - default_config_hash: t48gCU9DzYfjb3bAOIqHLzhL0ChBlXh6_5B5Pyo9t8g diff --git a/tests/config/sync/system.image.gd.yml b/tests/config/sync/system.image.gd.yml index b676907..2d81266 100644 --- a/tests/config/sync/system.image.gd.yml +++ b/tests/config/sync/system.image.gd.yml @@ -1,3 +1,3 @@ -jpeg_quality: 75 _core: default_config_hash: eNXaHfkJJUThHeF0nvkoXyPLRrKYGxgHRjORvT4F5rQ +jpeg_quality: 75 diff --git a/tests/config/sync/system.image.yml b/tests/config/sync/system.image.yml index 990d3dc..2e18f7f 100644 --- a/tests/config/sync/system.image.yml +++ b/tests/config/sync/system.image.yml @@ -1,3 +1,3 @@ -toolkit: gd _core: default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24 +toolkit: gd diff --git a/tests/config/sync/system.logging.yml b/tests/config/sync/system.logging.yml index e95b28a..d6164de 100644 --- a/tests/config/sync/system.logging.yml +++ b/tests/config/sync/system.logging.yml @@ -1,3 +1,3 @@ -error_level: hide _core: default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA +error_level: hide diff --git a/tests/config/sync/system.mail.yml b/tests/config/sync/system.mail.yml index 60ed34d..419e77e 100644 --- a/tests/config/sync/system.mail.yml +++ b/tests/config/sync/system.mail.yml @@ -1,4 +1,4 @@ -interface: - default: php_mail _core: default_config_hash: rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE +interface: + default: php_mail diff --git a/tests/config/sync/system.maintenance.yml b/tests/config/sync/system.maintenance.yml index 79501fb..7bc5b98 100644 --- a/tests/config/sync/system.maintenance.yml +++ b/tests/config/sync/system.maintenance.yml @@ -1,4 +1,4 @@ -message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.' -langcode: en _core: default_config_hash: Z5MXifrF77GEAgx0GQ6iWT8wStjFuY8BD9OruofWTJ8 +langcode: en +message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.' diff --git a/tests/config/sync/system.performance.yml b/tests/config/sync/system.performance.yml index d4f85d5..cd81c18 100644 --- a/tests/config/sync/system.performance.yml +++ b/tests/config/sync/system.performance.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ cache: page: max_age: 0 @@ -13,5 +15,3 @@ js: preprocess: true gzip: true stale_file_threshold: 2592000 -_core: - default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ diff --git a/tests/config/sync/system.rss.yml b/tests/config/sync/system.rss.yml index 858f127..18b255d 100644 --- a/tests/config/sync/system.rss.yml +++ b/tests/config/sync/system.rss.yml @@ -1,8 +1,8 @@ -channel: - description: '' -items: - limit: 10 - view_mode: rss -langcode: en _core: default_config_hash: TlH7NNk46phfxu1mSUfwg1C0YqaGsUCeD4l9JQnQlDU +langcode: en +items: + view_mode: rss + limit: 10 +channel: + description: '' diff --git a/tests/config/sync/system.site.yml b/tests/config/sync/system.site.yml index 846b442..32ef1dc 100644 --- a/tests/config/sync/system.site.yml +++ b/tests/config/sync/system.site.yml @@ -1,4 +1,7 @@ -uuid: 6bb3f272-5795-4a0f-8330-913d9c9aff13 +_core: + default_config_hash: yXadRE77Va-G6dxhd2kPYapAvbnSvTF6hO4oXiOEynI +langcode: en +uuid: ab8ad9b6-a010-4789-b6c7-f865f1829d10 name: 'Site name' mail: info@example.org slogan: '' @@ -8,7 +11,4 @@ page: front: /user/login admin_compact_mode: false weight_select_max: 100 -langcode: en default_langcode: en -_core: - default_config_hash: yXadRE77Va-G6dxhd2kPYapAvbnSvTF6hO4oXiOEynI diff --git a/tests/config/sync/system.theme.global.yml b/tests/config/sync/system.theme.global.yml index 0450b3a..46e6002 100644 --- a/tests/config/sync/system.theme.global.yml +++ b/tests/config/sync/system.theme.global.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: KHk8rzK2GMRtdfoAeocFrll8Q7gGtiocl2GF5jnX9cY favicon: mimetype: image/vnd.microsoft.icon path: '' @@ -12,5 +14,3 @@ logo: path: '' url: '' use_default: true -_core: - default_config_hash: KHk8rzK2GMRtdfoAeocFrll8Q7gGtiocl2GF5jnX9cY diff --git a/tests/config/sync/system.theme.yml b/tests/config/sync/system.theme.yml index e9d51dd..ffebf8c 100644 --- a/tests/config/sync/system.theme.yml +++ b/tests/config/sync/system.theme.yml @@ -1,4 +1,4 @@ -admin: '' -default: stark _core: default_config_hash: 6lQ55NXM9ysybMQ6NzJj4dtiQ1dAkOYxdDompa-r_kk +admin: '' +default: stark diff --git a/tests/config/sync/text.settings.yml b/tests/config/sync/text.settings.yml index ef751a5..a295c7e 100644 --- a/tests/config/sync/text.settings.yml +++ b/tests/config/sync/text.settings.yml @@ -1,3 +1,3 @@ -default_summary_length: 600 _core: default_config_hash: Bkewb77RBOK3_aXMPsp8p87gbc03NvmC5gBLzPl7hVA +default_summary_length: 600 diff --git a/tests/config/sync/update.settings.yml b/tests/config/sync/update.settings.yml index 55b4646..a801697 100644 --- a/tests/config/sync/update.settings.yml +++ b/tests/config/sync/update.settings.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw check: disabled_extensions: false interval_days: 1 @@ -9,5 +11,3 @@ notification: emails: - admin@example.org threshold: all -_core: - default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw diff --git a/tests/config/sync/user.flood.yml b/tests/config/sync/user.flood.yml index f165c95..4eb3644 100644 --- a/tests/config/sync/user.flood.yml +++ b/tests/config/sync/user.flood.yml @@ -1,7 +1,7 @@ +_core: + default_config_hash: UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs uid_only: false ip_limit: 50 ip_window: 3600 user_limit: 5 user_window: 21600 -_core: - default_config_hash: UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs diff --git a/tests/config/sync/user.mail.yml b/tests/config/sync/user.mail.yml index 25e2429..645f713 100644 --- a/tests/config/sync/user.mail.yml +++ b/tests/config/sync/user.mail.yml @@ -1,30 +1,116 @@ +_core: + default_config_hash: IWzNdUVX2YSiflxrGSTLIiqTrhgIzbV2C-hRL5DniJM +langcode: en cancel_confirm: - body: "[user:display-name],\n\nA request to cancel your account has been made at [site:name].\n\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\n\n[user:cancel-url]\n\nNOTE: The cancellation of your account is not reversible.\n\nThis link expires in one day and nothing will happen if it is not used.\n\n-- [site:name] team" subject: 'Account cancellation request for [user:display-name] at [site:name]' + body: |- + [user:display-name], + + A request to cancel your account has been made at [site:name]. + + You may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser: + + [user:cancel-url] + + NOTE: The cancellation of your account is not reversible. + + This link expires in one day and nothing will happen if it is not used. + + -- [site:name] team password_reset: - body: "[user:display-name],\n\nA request to reset the password for your account has been made at [site:name].\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\n\n-- [site:name] team" subject: 'Replacement login information for [user:display-name] at [site:name]' + body: |- + [user:display-name], + + A request to reset the password for your account has been made at [site:name]. + + You may now log in by clicking this link or copying and pasting it into your browser: + + [user:one-time-login-url] + + This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used. + + -- [site:name] team register_admin_created: - body: "[user:display-name],\n\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team" subject: 'An administrator created an account for you at [site:name]' + body: |- + [user:display-name], + + A site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser: + + [user:one-time-login-url] + + This link can only be used once to log in and will lead you to a page where you can set your password. + + After setting your password, you will be able to log in at [site:login-url] in the future using: + + username: [user:name] + password: Your password + + -- [site:name] team register_no_approval_required: - body: "[user:display-name],\n\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:name]\npassword: Your password\n\n-- [site:name] team" subject: 'Account details for [user:display-name] at [site:name]' + body: |- + [user:display-name], + + Thank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser: + + [user:one-time-login-url] + + This link can only be used once to log in and will lead you to a page where you can set your password. + + After setting your password, you will be able to log in at [site:login-url] in the future using: + + username: [user:name] + password: Your password + + -- [site:name] team register_pending_approval: - body: "[user:display-name],\n\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\n\n-- [site:name] team" subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' + body: |- + [user:display-name], + + Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details. + + -- [site:name] team register_pending_approval_admin: - body: "[user:display-name] has applied for an account.\n\n[user:edit-url]" subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' + body: |- + [user:display-name] has applied for an account. + + [user:edit-url] status_activated: - body: "[user:display-name],\n\nYour account at [site:name] has been activated.\n\nYou may now log in by clicking this link or copying and pasting it into your browser:\n\n[user:one-time-login-url]\n\nThis link can only be used once to log in and will lead you to a page where you can set your password.\n\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\n\nusername: [user:account-name]\npassword: Your password\n\n-- [site:name] team" subject: 'Account details for [user:display-name] at [site:name] (approved)' + body: |- + [user:display-name], + + Your account at [site:name] has been activated. + + You may now log in by clicking this link or copying and pasting it into your browser: + + [user:one-time-login-url] + + This link can only be used once to log in and will lead you to a page where you can set your password. + + After setting your password, you will be able to log in at [site:login-url] in the future using: + + username: [user:account-name] + password: Your password + + -- [site:name] team status_blocked: - body: "[user:display-name],\n\nYour account on [site:name] has been blocked.\n\n-- [site:name] team" subject: 'Account details for [user:display-name] at [site:name] (blocked)' + body: |- + [user:display-name], + + Your account on [site:name] has been blocked. + + -- [site:name] team status_canceled: - body: "[user:display-name],\n\nYour account on [site:name] has been canceled.\n\n-- [site:name] team" subject: 'Account details for [user:display-name] at [site:name] (canceled)' -langcode: en -_core: - default_config_hash: IWzNdUVX2YSiflxrGSTLIiqTrhgIzbV2C-hRL5DniJM + body: |- + [user:display-name], + + Your account on [site:name] has been canceled. + + -- [site:name] team \ No newline at end of file diff --git a/tests/config/sync/user.settings.yml b/tests/config/sync/user.settings.yml index 1bad2ef..2275a73 100644 --- a/tests/config/sync/user.settings.yml +++ b/tests/config/sync/user.settings.yml @@ -1,3 +1,6 @@ +_core: + default_config_hash: w314Zp7B4NbrlV4KeeZLNSmTTpdJiv-KwZO2E1fSSK0 +langcode: en anonymous: Anonymous verify_mail: true notify: @@ -13,6 +16,3 @@ register: visitors_admin_approval cancel_method: user_cancel_block password_reset_timeout: 86400 password_strength: true -langcode: en -_core: - default_config_hash: w314Zp7B4NbrlV4KeeZLNSmTTpdJiv-KwZO2E1fSSK0 diff --git a/tests/config/sync/views.view.archive.yml b/tests/config/sync/views.view.archive.yml index be5e119..820c12b 100644 --- a/tests/config/sync/views.view.archive.yml +++ b/tests/config/sync/views.view.archive.yml @@ -23,39 +23,18 @@ display: display_plugin: default position: 0 display_options: - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } title: 'Monthly archive' - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - 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 + fields: { } pager: type: mini options: - items_per_page: 10 offset: 0 - id: 0 + items_per_page: 10 total_pages: 0 + id: 0 + tags: + next: ›› + previous: ‹‹ expose: items_per_page: false items_per_page_label: 'Items per page' @@ -64,59 +43,74 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - tags: - previous: ‹‹ - next: ›› + 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 + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: created: id: created table: node_field_data field: created - order: DESC - plugin_id: date relationship: none group_type: group admin_label: '' - exposed: false + entity_type: node + entity_field: created + plugin_id: date + order: DESC expose: label: '' + exposed: false granularity: second - entity_type: node - entity_field: created arguments: created_year_month: id: created_year_month table: node_field_data field: created_year_month + entity_type: node + plugin_id: date_year_month default_action: summary exception: title_enable: true title_enable: true title: '{{ arguments.created_year_month }}' default_argument_type: fixed - summary: - sort_order: desc - format: default_summary summary_options: override: true items_per_page: 30 + summary: + sort_order: desc + format: default_summary specify_validation: true - plugin_id: date_year_month - entity_type: node filters: status: id: status table: node_field_data field: status + entity_type: node + entity_field: status + plugin_id: boolean value: '1' group: 0 expose: operator: '0' operator_limit_selection: false operator_list: { } - plugin_id: boolean - entity_type: node - entity_field: status langcode: id: langcode table: node_field_data @@ -124,6 +118,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -135,6 +132,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -142,8 +141,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -156,9 +153,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode style: type: default options: @@ -170,20 +164,26 @@ display: type: 'entity:node' options: view_mode: teaser + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - fields: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } block_1: id: block_1 @@ -191,38 +191,38 @@ display: display_plugin: block position: 1 display_options: - query: - type: views_query - options: { } - defaults: - arguments: false arguments: created_year_month: id: created_year_month table: node_field_data field: created_year_month + entity_type: node + plugin_id: date_year_month default_action: summary exception: title_enable: true title_enable: true title: '{{ arguments.created_year_month }}' default_argument_type: fixed - summary: - format: default_summary summary_options: items_per_page: 30 + summary: + format: default_summary specify_validation: true - plugin_id: date_year_month - entity_type: node + query: + type: views_query + options: { } + defaults: + arguments: false display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: id: page_1 @@ -233,14 +233,14 @@ display: query: type: views_query options: { } - path: archive display_extenders: { } + path: archive cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/tests/config/sync/views.view.content.yml b/tests/config/sync/views.view.content.yml index 131f4f0..88b0a30 100644 --- a/tests/config/sync/views.view.content.yml +++ b/tests/config/sync/views.view.content.yml @@ -16,134 +16,19 @@ base_table: node_field_data base_field: nid display: default: + id: default + display_title: Master + display_plugin: default + position: 0 display_options: - access: - type: perm - options: - perm: 'access content overview' - cache: - type: tag - query: - type: views_query - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: true - caption: '' - summary: '' - description: '' - columns: - node_bulk_form: node_bulk_form - title: title - type: type - name: name - status: status - changed: changed - edit_node: edit_node - delete_node: delete_node - dropbutton: dropbutton - timestamp: title - info: - node_bulk_form: - align: '' - separator: '' - empty_column: false - responsive: '' - title: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - type: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - status: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - edit_node: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - delete_node: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - dropbutton: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - timestamp: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: changed - empty_table: true - row: - type: fields + title: Content fields: node_bulk_form: id: node_bulk_form table: node field: node_bulk_form + entity_type: node + plugin_id: node_bulk_form label: '' exclude: false alter: @@ -154,12 +39,13 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: node_bulk_form - entity_type: node title: id: title table: node_field_data field: title + entity_type: node + entity_field: title + plugin_id: field label: Title exclude: false alter: @@ -170,12 +56,9 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: node - entity_field: title type: string settings: link_to_entity: true - plugin_id: field type: id: type table: node_field_data @@ -183,6 +66,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: field label: 'Content type' exclude: false alter: @@ -238,14 +124,14 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node - entity_field: type - plugin_id: field name: id: name table: users_field_data field: name relationship: uid + entity_type: user + entity_field: name + plugin_id: field label: Author exclude: false alter: @@ -256,14 +142,14 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field type: user_name - entity_type: user - entity_field: name status: id: status table: node_field_data field: status + entity_type: node + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -277,15 +163,15 @@ display: type: boolean settings: format: custom - format_custom_true: Published format_custom_false: Unpublished - plugin_id: field - entity_type: node - entity_field: status + format_custom_true: Published changed: id: changed table: node_field_data field: changed + entity_type: node + entity_field: changed + plugin_id: field label: Updated exclude: false alter: @@ -301,9 +187,15 @@ display: date_format: short custom_date_format: '' timezone: '' - plugin_id: field - entity_type: node - entity_field: changed + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 operations: id: operations table: node @@ -311,6 +203,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: entity_operations label: Operations exclude: false alter: @@ -353,7 +246,41 @@ display: empty_zero: false hide_alter_empty: true destination: true - plugin_id: entity_operations + pager: + type: full + options: + items_per_page: 50 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access content overview' + cache: + type: tag + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + plugin_id: text_custom + empty: true + content: 'No content available.' + sorts: { } + arguments: { } filters: title: id: title @@ -362,6 +289,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: string operator: contains value: '' group: 1 @@ -372,6 +302,8 @@ display: description: '' use_operator: false operator: title_op + operator_limit_selection: false + operator_list: { } identifier: title required: false remember: false @@ -380,8 +312,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -394,9 +324,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: string - entity_type: node - entity_field: title type: id: type table: node_field_data @@ -404,6 +331,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle operator: in value: { } group: 1 @@ -414,6 +344,8 @@ display: description: '' use_operator: false operator: type_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -423,8 +355,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -437,9 +367,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: bundle - entity_type: node - entity_field: type status: id: status table: node_field_data @@ -447,6 +374,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -457,14 +387,14 @@ display: description: '' use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: true group_info: label: 'Published status' @@ -485,9 +415,6 @@ display: title: Unpublished operator: '=' value: '0' - plugin_id: boolean - entity_type: node - entity_field: status langcode: id: langcode table: node_field_data @@ -495,6 +422,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: { } group: 1 @@ -505,6 +435,8 @@ display: description: '' use_operator: false operator: langcode_op + operator_limit_selection: false + operator_list: { } identifier: langcode required: false remember: false @@ -514,8 +446,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -528,51 +458,131 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode status_extra: id: status_extra table: node_field_data field: status_extra + entity_type: node + plugin_id: node_status operator: '=' value: false - plugin_id: node_status group: 1 - entity_type: node expose: operator_limit_selection: false operator_list: { } - sorts: { } - title: Content - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - empty: true - content: 'No content available.' - plugin_id: text_custom - arguments: { } + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + node_bulk_form: node_bulk_form + title: title + type: type + name: name + status: status + changed: changed + edit_node: edit_node + delete_node: delete_node + dropbutton: dropbutton + timestamp: title + default: changed + info: + node_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' + title: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + edit_node: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + delete_node: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + dropbutton: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + timestamp: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: true + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query relationships: uid: id: uid table: node_field_data field: uid admin_label: author - required: true plugin_id: standard + required: true show_admin_links: false - filter_groups: - operator: AND - groups: - 1: AND display_extenders: { } - display_plugin: default - display_title: Master - id: default - position: 0 cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -581,30 +591,30 @@ display: - user - 'user.node_grants:view' - user.permissions - max-age: 0 tags: { } page_1: + id: page_1 + display_title: Page + display_plugin: page + position: 1 display_options: + display_extenders: { } path: admin/content/node menu: type: 'default tab' title: Content description: '' - menu_name: admin weight: -10 + menu_name: admin context: '' tab_options: type: normal title: Content description: 'Find and manage content' - menu_name: admin weight: -10 - display_extenders: { } - display_plugin: page - display_title: Page - id: page_1 - position: 1 + menu_name: admin cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -613,5 +623,4 @@ display: - user - 'user.node_grants:view' - user.permissions - max-age: 0 tags: { } diff --git a/tests/config/sync/views.view.content_recent.yml b/tests/config/sync/views.view.content_recent.yml index 88138fe..2e26d8e 100644 --- a/tests/config/sync/views.view.content_recent.yml +++ b/tests/config/sync/views.view.content_recent.yml @@ -16,75 +16,34 @@ base_table: node_field_data base_field: nid display: default: - display_plugin: default id: default display_title: Master + display_plugin: default 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: 10 - offset: 0 - style: - type: html_list - options: - grouping: { } - row_class: '' - default_row_class: true - type: ul - wrapper_class: item-list - class: '' - row: - type: fields + title: 'Recent content' fields: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: title + plugin_id: field label: '' exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' element_type: '' element_class: '' element_label_type: '' @@ -94,11 +53,12 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true type: string settings: link_to_entity: true - plugin_id: field changed: id: changed table: node_field_data @@ -106,6 +66,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field label: '' exclude: false alter: @@ -160,9 +123,57 @@ display: multi_type: separator separator: ', ' field_api_classes: false + pager: + type: some + options: + offset: 0 + items_per_page: 10 + 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 + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No content available.' + tokenize: false + sorts: + changed: + id: changed + table: node_field_data + field: changed + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: changed - plugin_id: field + plugin_id: date + order: DESC + expose: + label: '' + exposed: false + granularity: second + arguments: { } filters: status_extra: id: status_extra @@ -171,6 +182,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + plugin_id: node_status operator: '=' value: false group: 1 @@ -181,14 +194,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -201,8 +214,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - plugin_id: node_status langcode: id: langcode table: node_field_data @@ -210,6 +221,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -221,6 +235,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -228,8 +244,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -242,40 +256,25 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: node - entity_field: langcode - plugin_id: language - sorts: - changed: - id: changed - table: node_field_data - field: changed - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - granularity: second - entity_type: node - entity_field: changed - plugin_id: date - title: 'Recent content' - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No content available.' - plugin_id: text_custom + style: + type: html_list + options: + grouping: { } + row_class: '' + default_row_class: true + type: ul + wrapper_class: item-list + class: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: uid: id: uid @@ -284,39 +283,40 @@ display: relationship: none group_type: group admin_label: author - required: true entity_type: node entity_field: uid plugin_id: standard - arguments: { } - display_extenders: { } + required: true use_more: false use_more_always: false use_more_text: More - link_url: '' link_display: '0' + link_url: '' + header: { } + footer: { } + display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } block_1: - display_plugin: block id: block_1 display_title: Block + display_plugin: block position: 1 display_options: display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/tests/config/sync/views.view.files.yml b/tests/config/sync/views.view.files.yml index dfd272b..9f5f773 100644 --- a/tests/config/sync/views.view.files.yml +++ b/tests/config/sync/views.view.files.yml @@ -16,156 +16,34 @@ base_table: file_managed base_field: fid display: default: - display_plugin: default id: default display_title: Master + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access files overview' - 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: Filter - 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: mini - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: 0 - tags: - previous: '‹ Previous' - next: 'Next ›' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - fid: fid - filename: filename - filemime: filemime - filesize: filesize - status: status - created: created - changed: changed - count: count - info: - fid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - filename: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - filemime: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - filesize: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - status: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - created: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: '' - changed: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: '' - count: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - default: changed - empty_table: true - row: - type: fields + title: Files fields: fid: id: fid table: file_managed field: fid + relationship: none + group_type: group + admin_label: '' + entity_type: file + entity_field: fid + plugin_id: field + label: Fid + exclude: true alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' - label: Fid - exclude: true element_type: '' element_class: '' element_label_type: '' @@ -175,10 +53,9 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true - plugin_id: field - entity_type: file - entity_field: fid filename: id: filename table: file_managed @@ -186,6 +63,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filename + plugin_id: field label: Name exclude: false alter: @@ -239,9 +119,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field - entity_type: file - entity_field: filename filemime: id: filemime table: file_managed @@ -249,6 +126,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filemime + plugin_id: field label: 'MIME type' exclude: false alter: @@ -291,9 +171,6 @@ display: empty_zero: false hide_alter_empty: true type: file_filemime - plugin_id: field - entity_type: file - entity_field: filemime filesize: id: filesize table: file_managed @@ -301,6 +178,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filesize + plugin_id: field label: Size exclude: false alter: @@ -343,9 +223,6 @@ display: empty_zero: false hide_alter_empty: true type: file_size - plugin_id: field - entity_type: file - entity_field: filesize status: id: status table: file_managed @@ -353,6 +230,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -399,9 +279,6 @@ display: format: custom format_custom_false: Temporary format_custom_true: Permanent - plugin_id: field - entity_type: file - entity_field: status created: id: created table: file_managed @@ -409,6 +286,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: created + plugin_id: field label: 'Upload date' exclude: false alter: @@ -455,9 +335,15 @@ display: date_format: medium custom_date_format: '' timezone: '' - plugin_id: field - entity_type: file - entity_field: created + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 changed: id: changed table: file_managed @@ -465,6 +351,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: changed + plugin_id: field label: 'Changed date' exclude: false alter: @@ -511,9 +400,15 @@ display: date_format: medium custom_date_format: '' timezone: '' - plugin_id: field - entity_type: file - entity_field: changed + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 count: id: count table: file_usage @@ -521,6 +416,7 @@ display: relationship: fid group_type: sum admin_label: '' + plugin_id: numeric label: 'Used in' exclude: false alter: @@ -570,7 +466,51 @@ display: format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz prefix: '' suffix: '' - plugin_id: numeric + pager: + type: mini + options: + offset: 0 + items_per_page: 50 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access files overview' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + plugin_id: text_custom + empty: true + content: 'No files available.' + sorts: { } + arguments: { } filters: filename: id: filename @@ -579,6 +519,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filename + plugin_id: string operator: word value: '' group: 1 @@ -589,6 +532,8 @@ display: description: '' use_operator: false operator: filename_op + operator_limit_selection: false + operator_list: { } identifier: filename required: false remember: false @@ -597,8 +542,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -611,9 +554,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: string - entity_type: file - entity_field: filename filemime: id: filemime table: file_managed @@ -621,6 +561,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: filemime + plugin_id: string operator: word value: '' group: 1 @@ -631,6 +574,8 @@ display: description: '' use_operator: false operator: filemime_op + operator_limit_selection: false + operator_list: { } identifier: filemime required: false remember: false @@ -639,8 +584,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -653,9 +596,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: string - entity_type: file - entity_field: filemime status: id: status table: file_managed @@ -663,6 +603,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: status + plugin_id: file_status operator: in value: { } group: 1 @@ -673,6 +616,8 @@ display: description: '' use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: false remember: false @@ -682,8 +627,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -696,21 +639,95 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: file_status - entity_type: file - entity_field: status - sorts: { } - title: Files - header: { } - footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - empty: true - content: 'No files available.' - plugin_id: text_custom + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + fid: fid + filename: filename + filemime: filemime + filesize: filesize + status: status + created: created + changed: changed + count: count + default: changed + info: + fid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + filename: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + filemime: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + filesize: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + status: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + created: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + changed: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + count: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + override: true + sticky: false + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: fid: id: fid @@ -720,34 +737,26 @@ display: group_type: group admin_label: 'File usage' required: true - arguments: { } group_by: true show_admin_links: true + header: { } + footer: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } page_1: - display_plugin: page id: page_1 display_title: 'Files overview' + display_plugin: page position: 1 display_options: - path: admin/content/files - menu: - type: tab - title: Files - description: '' - menu_name: admin - weight: 0 - context: '' - display_description: '' defaults: pager: true relationships: false @@ -760,59 +769,32 @@ display: group_type: group admin_label: 'File usage' required: false + display_description: '' display_extenders: { } + path: admin/content/files + menu: + type: tab + title: Files + description: '' + weight: 0 + menu_name: admin + context: '' cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } page_2: - display_plugin: page id: page_2 display_title: 'File usage' + display_plugin: page position: 2 display_options: - display_description: '' - path: admin/content/files/usage/% - empty: { } - defaults: - empty: false - pager: false - filters: false - filter_groups: false - fields: false - group_by: false - title: false - arguments: false - style: false - row: false - relationships: false - pager: - type: mini - options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: 0 - tags: - previous: '‹ Previous' - next: 'Next ›' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - filters: { } - filter_groups: - operator: AND - groups: { } + title: 'File usage' fields: entity_label: id: entity_label @@ -821,6 +803,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: entity_label label: Entity exclude: false alter: @@ -863,7 +846,6 @@ display: empty_zero: false hide_alter_empty: true link_to_entity: true - plugin_id: entity_label type: id: type table: file_usage @@ -871,6 +853,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: 'Entity type' exclude: false alter: @@ -912,7 +895,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard module: id: module table: file_usage @@ -920,6 +902,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: 'Registering module' exclude: false alter: @@ -961,7 +944,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard count: id: count table: file_usage @@ -969,6 +951,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: numeric label: 'Use count' exclude: false alter: @@ -1018,9 +1001,25 @@ display: format_plural_string: !!binary MQNAY291bnQ= prefix: '' suffix: '' - plugin_id: numeric - group_by: false - title: 'File usage' + pager: + type: mini + options: + offset: 0 + items_per_page: 10 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + empty: { } arguments: fid: id: fid @@ -1029,6 +1028,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: file + entity_field: fid + plugin_id: file_fid default_action: 'not found' exception: value: all @@ -1043,8 +1045,8 @@ display: summary_options: base_path: '' count: true - items_per_page: 25 override: false + items_per_page: 25 summary: sort_order: asc number_of_records: 0 @@ -1056,25 +1058,22 @@ display: validate_options: { } break_phrase: false not: false - plugin_id: file_fid - entity_type: file - entity_field: fid + filters: { } + filter_groups: + operator: AND + groups: { } style: type: table options: grouping: { } row_class: '' default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' columns: entity_label: entity_label type: type module: module count: count + default: entity_label info: entity_label: sortable: true @@ -1104,11 +1103,27 @@ display: separator: '' empty_column: false responsive: '' - default: entity_label + override: true + sticky: false + summary: '' empty_table: true + caption: '' + description: '' row: type: fields options: { } + defaults: + empty: false + title: false + pager: false + group_by: false + style: false + row: false + relationships: false + fields: false + arguments: false + filters: false + filter_groups: false relationships: fid: id: fid @@ -1118,12 +1133,15 @@ display: group_type: group admin_label: 'File usage' required: true + group_by: false + display_description: '' display_extenders: { } + path: admin/content/files/usage/% cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: -1 tags: { } diff --git a/tests/config/sync/views.view.frontpage.yml b/tests/config/sync/views.view.frontpage.yml index ab10c80..f5ed954 100644 --- a/tests/config/sync/views.view.frontpage.yml +++ b/tests/config/sync/views.view.frontpage.yml @@ -19,7 +19,44 @@ base_table: node_field_data base_field: nid display: default: + id: default + display_title: Master + display_plugin: default + position: 0 display_options: + title: '' + fields: { } + pager: + type: full + options: + offset: 0 + items_per_page: 10 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + 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 access: type: perm options: @@ -29,28 +66,28 @@ display: options: { } empty: area_text_custom: - admin_label: '' - content: 'No front page content has been created yet.
Follow the User Guide to start building your site.' - empty: true + id: area_text_custom + table: views field: area_text_custom + relationship: none group_type: group - id: area_text_custom + admin_label: '' + plugin_id: text_custom label: '' - relationship: none - table: views + empty: true + content: 'No front page content has been created yet.
Follow the User Guide to start building your site.' tokenize: false - plugin_id: text_custom node_listing_empty: - admin_label: '' - empty: true - field: node_listing_empty - group_type: group id: node_listing_empty - label: '' - relationship: none table: node - plugin_id: node_listing_empty + field: node_listing_empty + relationship: none + group_type: group + admin_label: '' entity_type: node + plugin_id: node_listing_empty + label: '' + empty: true title: id: title table: views @@ -58,74 +95,95 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: title label: '' empty: true title: 'Welcome to [site:name]' - plugin_id: title - 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 + sorts: + sticky: + id: sticky + table: node_field_data + field: sticky + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: sticky + plugin_id: boolean + order: DESC + expose: + label: '' + exposed: false + created: + id: created + table: node_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + exposed: false + granularity: second + arguments: { } filters: promote: + id: promote + table: node_field_data + field: promote + relationship: none + group_type: group admin_label: '' + entity_type: node + entity_field: promote + plugin_id: boolean + operator: '=' + value: '1' + group: 1 + exposed: false expose: - description: '' - identifier: '' + operator_id: '' label: '' - multiple: false + description: '' + use_operator: false operator: '' - operator_id: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false remember: false + multiple: false remember_roles: authenticated: authenticated - required: false - use_operator: false - operator_limit_selection: false - operator_list: { } - exposed: false - field: promote - group: 1 + is_grouped: false group_info: - default_group: All - default_group_multiple: { } + label: '' description: '' - group_items: { } identifier: '' - label: '' - multiple: false optional: true - remember: false widget: select - group_type: group - id: promote - is_grouped: false - operator: '=' - relationship: none + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + status: + id: status table: node_field_data - value: '1' - plugin_id: boolean + field: status entity_type: node - entity_field: promote - status: + entity_field: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '' operator_limit_selection: false operator_list: { } - field: status - group: 1 - id: status - table: node_field_data - value: '1' - plugin_id: boolean - entity_type: node - entity_field: status langcode: id: langcode table: node_field_data @@ -133,6 +191,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -144,6 +205,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -151,8 +214,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -165,146 +226,85 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode - pager: - type: full + style: + type: default options: - items_per_page: 10 - offset: 0 - id: 0 - total_pages: 0 - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - quantity: 9 + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + row: + type: 'entity:node' + options: + view_mode: teaser query: type: views_query options: + query_comment: '' disable_sql_rewrite: false distinct: false replica: false - query_comment: '' query_tags: { } - row: - type: 'entity:node' - options: - view_mode: teaser - sorts: - sticky: - admin_label: '' - expose: - label: '' - exposed: false - field: sticky - group_type: group - id: sticky - order: DESC - relationship: none - table: node_field_data - plugin_id: boolean - entity_type: node - entity_field: sticky - created: - field: created - id: created - order: DESC - table: node_field_data - plugin_id: date - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - granularity: second - entity_type: node - entity_field: created - style: - type: default - options: - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - title: '' + relationships: { } header: { } footer: { } - relationships: { } - fields: { } - arguments: { } display_extenders: { } - display_plugin: default - display_title: Master - id: default - position: 0 cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } feed_1: - display_plugin: feed id: feed_1 display_title: Feed + display_plugin: feed position: 2 display_options: - sitename_title: true - path: rss.xml - displays: - page_1: page_1 - default: '' pager: type: some options: - items_per_page: 10 offset: 0 + items_per_page: 10 style: type: rss options: - description: '' grouping: { } uses_fields: false + description: '' row: type: node_rss options: relationship: none view_mode: rss display_extenders: { } + path: rss.xml + sitename_title: true + displays: + page_1: page_1 + default: '' cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: - display_options: - path: node - display_extenders: { } - display_plugin: page - display_title: Page id: page_1 + display_title: Page + display_plugin: page position: 1 + display_options: + display_extenders: { } + path: node cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/tests/config/sync/views.view.glossary.yml b/tests/config/sync/views.view.glossary.yml index 0f8659f..8a636a9 100644 --- a/tests/config/sync/views.view.glossary.yml +++ b/tests/config/sync/views.view.glossary.yml @@ -23,59 +23,17 @@ display: display_plugin: default position: 0 display_options: - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - use_ajax: true - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - 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: mini - options: - items_per_page: 36 - offset: 0 - id: 0 - total_pages: 0 - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› fields: title: id: title table: node_field_data field: title - plugin_id: field relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: title + plugin_id: field label: Title exclude: false alter: @@ -117,18 +75,17 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: node - entity_field: title name: id: name table: users_field_data field: name - label: Author relationship: uid - plugin_id: field - type: user_name group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field + label: Author exclude: false alter: alter_text: false @@ -169,22 +126,18 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: user - entity_field: name + type: user_name changed: id: changed table: node_field_data field: changed - label: 'Last update' - type: timestamp - settings: - date_format: long - custom_date_format: '' - timezone: '' - plugin_id: field relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: changed + plugin_id: field + label: 'Last update' exclude: false alter: alter_text: false @@ -225,90 +178,91 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - entity_type: node - entity_field: changed + type: timestamp + settings: + date_format: long + custom_date_format: '' + timezone: '' + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + pager: + type: mini + options: + offset: 0 + items_per_page: 36 + total_pages: 0 + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + 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 + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: { } arguments: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: string default_action: default exception: title_enable: true + title_enable: false + title: '' default_argument_type: fixed default_argument_options: argument: a + default_argument_skip_url: false + summary_options: { } summary: format: default_summary specify_validation: true + validate: + type: none + fail: 'not found' + validate_options: { } glossary: true limit: 1 case: upper path_case: lower transform_dash: false - plugin_id: string - relationship: none - group_type: group - admin_label: '' - title_enable: false - title: '' - default_argument_skip_url: false - summary_options: { } - validate: - type: none - fail: 'not found' - validate_options: { } break_phrase: false - entity_type: node - entity_field: title - relationships: - uid: - id: uid - table: node_field_data - field: uid - plugin_id: standard - relationship: none - group_type: group - admin_label: author - required: false - style: - type: table - options: - columns: - title: title - name: name - changed: changed - default: title - info: - title: - sortable: true - separator: '' - name: - sortable: true - separator: '' - changed: - sortable: true - separator: '' - override: true - sticky: false - grouping: { } - row_class: '' - default_row_class: true - uses_fields: false - order: asc - summary: '' - empty_table: false - row: - type: fields - options: - inline: { } - separator: '' - hide_empty: false - default_field_elements: true - header: { } - footer: { } - empty: { } - sorts: { } filters: langcode: id: langcode @@ -317,6 +271,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -328,6 +285,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -335,8 +294,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -349,11 +306,64 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + uses_fields: false + columns: + title: title + name: name + changed: changed + default: title + info: + title: + sortable: true + separator: '' + name: + sortable: true + separator: '' + changed: + sortable: true + separator: '' + override: true + sticky: false + summary: '' + order: asc + empty_table: false + row: + type: fields + options: + default_field_elements: true + inline: { } + separator: '' + hide_empty: false + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: + uid: + id: uid + table: node_field_data + field: uid + relationship: none + group_type: group + admin_label: author + plugin_id: standard + required: false + use_ajax: true + header: { } + footer: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -361,7 +371,6 @@ display: - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } attachment_1: id: attachment_1 @@ -369,59 +378,60 @@ display: display_plugin: attachment position: 2 display_options: - query: - type: views_query - options: { } pager: type: none options: offset: 0 items_per_page: 0 - defaults: - arguments: false arguments: title: id: title table: node_field_data field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: string default_action: summary exception: title_enable: true + title_enable: false + title: '' default_argument_type: fixed default_argument_options: argument: a - summary: - format: unformatted_summary + default_argument_skip_url: false summary_options: items_per_page: 25 inline: true separator: ' | ' + summary: + format: unformatted_summary specify_validation: true + validate: + type: none + fail: 'not found' + validate_options: { } glossary: true limit: 1 case: upper path_case: lower transform_dash: false - plugin_id: string - relationship: none - group_type: group - admin_label: '' - title_enable: false - title: '' - default_argument_skip_url: false - validate: - type: none - fail: 'not found' - validate_options: { } break_phrase: false - entity_type: node - entity_field: title + query: + type: views_query + options: { } + defaults: + arguments: false + display_extenders: { } displays: default: default page_1: page_1 inherit_arguments: false - display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -429,7 +439,6 @@ display: - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: id: page_1 @@ -440,6 +449,7 @@ display: query: type: views_query options: { } + display_extenders: { } path: glossary menu: type: normal @@ -447,8 +457,8 @@ display: weight: 0 menu_name: main parent: '' - display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' @@ -456,5 +466,4 @@ display: - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/tests/config/sync/views.view.taxonomy_term.yml b/tests/config/sync/views.view.taxonomy_term.yml index e3fa3f6..77c2308 100644 --- a/tests/config/sync/views.view.taxonomy_term.yml +++ b/tests/config/sync/views.view.taxonomy_term.yml @@ -24,38 +24,17 @@ display: display_plugin: default position: 0 display_options: - query: - type: views_query - options: - query_comment: '' - disable_sql_rewrite: false - distinct: false - replica: false - query_tags: { } - access: - type: perm - options: - perm: 'access content' - cache: - type: tag - options: { } - 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 + fields: { } pager: type: mini options: - items_per_page: 10 offset: 0 - id: 0 + items_per_page: 10 total_pages: 0 + id: 0 + tags: + next: ›› + previous: ‹‹ expose: items_per_page: false items_per_page_label: 'Items per page' @@ -64,34 +43,49 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - tags: - previous: ‹‹ - next: ›› + 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 + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } sorts: sticky: id: sticky table: taxonomy_index field: sticky - order: DESC - plugin_id: standard relationship: none group_type: group admin_label: '' - exposed: false + plugin_id: standard + order: DESC expose: label: '' + exposed: false created: id: created table: taxonomy_index field: created - order: DESC - plugin_id: date relationship: none group_type: group admin_label: '' - exposed: false + plugin_id: date + order: DESC expose: label: '' + exposed: false granularity: second arguments: tid: @@ -101,6 +95,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: taxonomy_index_tid default_action: 'not found' exception: value: '' @@ -115,8 +110,8 @@ display: summary_options: base_path: '' count: true - items_per_page: 25 override: false + items_per_page: 25 summary: sort_order: asc number_of_records: 0 @@ -126,15 +121,14 @@ display: type: 'entity:taxonomy_term' fail: 'not found' validate_options: + bundles: { } access: true operation: view multiple: 0 - bundles: { } break_phrase: false add_table: false require_value: false reduce_duplicates: false - plugin_id: taxonomy_index_tid filters: langcode: id: langcode @@ -143,6 +137,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language operator: in value: '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' @@ -154,6 +151,8 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false @@ -161,8 +160,6 @@ display: remember_roles: authenticated: authenticated reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -175,9 +172,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: language - entity_type: node - entity_field: langcode status: id: status table: taxonomy_index @@ -185,6 +179,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -195,14 +190,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -215,7 +210,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: boolean style: type: default options: @@ -227,6 +221,17 @@ display: type: 'entity:node' options: view_mode: teaser + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } + link_display: page_1 + link_url: '' header: entity_taxonomy_term: id: entity_taxonomy_term @@ -235,27 +240,22 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: entity empty: true - tokenize: true target: '{{ raw_arguments.tid }}' view_mode: full + tokenize: true bypass_access: false - plugin_id: entity footer: { } - empty: { } - relationships: { } - fields: { } display_extenders: { } - link_url: '' - link_display: page_1 cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } feed_1: id: feed_1 @@ -263,37 +263,37 @@ display: display_plugin: feed position: 2 display_options: - query: - type: views_query - options: { } pager: type: some options: - items_per_page: 10 offset: 0 - path: taxonomy/term/%/feed - displays: - page_1: page_1 - default: '0' + items_per_page: 10 style: type: rss options: - description: '' grouping: { } uses_fields: false + description: '' row: type: node_rss options: relationship: none view_mode: default + query: + type: views_query + options: { } display_extenders: { } + path: taxonomy/term/%/feed + displays: + page_1: page_1 + default: '0' cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } page_1: id: page_1 @@ -304,14 +304,14 @@ display: query: type: views_query options: { } - path: taxonomy/term/% display_extenders: { } + path: taxonomy/term/% cache_metadata: + max-age: -1 contexts: - 'languages:language_interface' - url - url.query_args - 'user.node_grants:view' - user.permissions - max-age: -1 tags: { } diff --git a/tests/config/sync/views.view.user_admin_people.yml b/tests/config/sync/views.view.user_admin_people.yml index 52f3cc8..b4c93ba 100644 --- a/tests/config/sync/views.view.user_admin_people.yml +++ b/tests/config/sync/views.view.user_admin_people.yml @@ -15,131 +15,12 @@ base_table: users_field_data base_field: uid display: default: - display_plugin: default id: default display_title: Master + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'administer users' - cache: - type: tag - query: - type: views_query - options: - disable_sql_rewrite: false - distinct: false - replica: false - query_comment: '' - query_tags: { } - exposed_form: - type: basic - options: - submit_button: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: true - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: full - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: 0 - tags: - previous: '‹ Previous' - next: 'Next ›' - first: '« First' - last: 'Last »' - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - quantity: 9 - style: - type: table - options: - grouping: { } - row_class: '' - default_row_class: true - override: true - sticky: false - summary: '' - columns: - user_bulk_form: user_bulk_form - name: name - status: status - rid: rid - created: created - access: access - edit_node: edit_node - dropbutton: dropbutton - info: - user_bulk_form: - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - status: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - rid: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - created: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - access: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - edit_node: - align: '' - separator: '' - empty_column: false - responsive: priority-low - dropbutton: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - default: created - empty_table: true - row: - type: fields + title: People fields: user_bulk_form: id: user_bulk_form @@ -148,6 +29,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + plugin_id: user_bulk_form label: 'Bulk update' exclude: false alter: @@ -189,8 +72,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: user_bulk_form - entity_type: user name: id: name table: users_field_data @@ -198,6 +79,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: Username exclude: false alter: @@ -239,10 +123,7 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field type: user_name - entity_type: user - entity_field: name status: id: status table: users_field_data @@ -250,6 +131,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: status + plugin_id: field label: Status exclude: false alter: @@ -291,14 +175,11 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: field type: boolean settings: format: custom - format_custom_true: Active format_custom_false: Blocked - entity_type: user - entity_field: status + format_custom_true: Active roles_target_id: id: roles_target_id table: user__roles @@ -306,6 +187,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: user_roles label: Roles exclude: false alter: @@ -349,7 +231,6 @@ display: hide_alter_empty: true type: ul separator: ', ' - plugin_id: user_roles created: id: created table: users_field_data @@ -357,6 +238,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: created + plugin_id: field label: 'Member for' exclude: false alter: @@ -403,9 +287,6 @@ display: future_format: '@interval' past_format: '@interval' granularity: 2 - plugin_id: field - entity_type: user - entity_field: created access: id: access table: users_field_data @@ -413,6 +294,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: access + plugin_id: field label: 'Last access' exclude: false alter: @@ -459,9 +343,6 @@ display: future_format: '@interval hence' past_format: '@interval ago' granularity: 2 - plugin_id: field - entity_type: user - entity_field: access operations: id: operations table: users @@ -469,6 +350,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + plugin_id: entity_operations label: Operations exclude: false alter: @@ -511,8 +394,6 @@ display: empty_zero: false hide_alter_empty: true destination: true - entity_type: user - plugin_id: entity_operations mail: id: mail table: users_field_data @@ -520,6 +401,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: mail + plugin_id: field label: '' exclude: true alter: @@ -574,9 +458,71 @@ display: multi_type: separator separator: ', ' field_api_classes: false - plugin_id: field + pager: + type: full + options: + offset: 0 + items_per_page: 50 + total_pages: 0 + id: 0 + tags: + next: 'Next ›' + previous: '‹ Previous' + first: '« First' + last: 'Last »' + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + quantity: 9 + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'administer users' + cache: + type: tag + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No people available.' + tokenize: false + sorts: + created: + id: created + table: users_field_data + field: created + relationship: none + group_type: group + admin_label: '' entity_type: user - entity_field: mail + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + exposed: false + granularity: second filters: combine: id: combine @@ -585,6 +531,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: combine operator: contains value: '' group: 1 @@ -595,6 +542,8 @@ display: description: '' use_operator: false operator: combine_op + operator_limit_selection: false + operator_list: { } identifier: user required: false remember: false @@ -603,8 +552,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -620,7 +567,6 @@ display: fields: name: name mail: mail - plugin_id: combine status: id: status table: users_field_data @@ -628,6 +574,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: status + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -638,6 +587,8 @@ display: description: '' use_operator: false operator: status_op + operator_limit_selection: false + operator_list: { } identifier: status required: false remember: false @@ -646,8 +597,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: true group_info: label: Status @@ -668,9 +617,6 @@ display: title: Blocked operator: '=' value: '0' - plugin_id: boolean - entity_type: user - entity_field: status roles_target_id: id: roles_target_id table: user__roles @@ -678,6 +624,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: user_roles operator: or value: { } group: 1 @@ -688,6 +635,8 @@ display: description: '' use_operator: false operator: roles_target_id_op + operator_limit_selection: false + operator_list: { } identifier: role required: false remember: false @@ -697,8 +646,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -712,7 +659,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: user_roles permission: id: permission table: user__roles @@ -720,6 +666,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: user_permissions operator: or value: { } group: 1 @@ -730,6 +677,8 @@ display: description: '' use_operator: false operator: permission_op + operator_limit_selection: false + operator_list: { } identifier: permission required: false remember: false @@ -739,8 +688,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -754,7 +701,6 @@ display: default_group_multiple: { } group_items: { } reduce_duplicates: false - plugin_id: user_permissions default_langcode: id: default_langcode table: users_field_data @@ -762,6 +708,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: default_langcode + plugin_id: boolean operator: '=' value: '1' group: 1 @@ -772,14 +721,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -792,9 +741,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - entity_type: user - entity_field: default_langcode - plugin_id: boolean uid_raw: id: uid_raw table: users_field_data @@ -802,6 +748,8 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + plugin_id: numeric operator: '!=' value: min: '' @@ -815,14 +763,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -835,92 +783,144 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: numeric - entity_type: user - sorts: - created: - id: created - table: users_field_data - field: created - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - granularity: second - plugin_id: date - entity_type: user - entity_field: created - title: People - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'No people available.' - plugin_id: text_custom + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + user_bulk_form: user_bulk_form + name: name + status: status + rid: rid + created: created + access: access + edit_node: edit_node + dropbutton: dropbutton + default: created + info: + user_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + rid: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + created: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + access: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + edit_node: + align: '' + separator: '' + empty_column: false + responsive: priority-low + dropbutton: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: false + summary: '' + empty_table: true + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + css_class: '' + use_ajax: false + group_by: false + show_admin_links: true use_more: false use_more_always: false use_more_text: more + link_display: page_1 + link_url: '' display_comment: '' - use_ajax: false hide_attachment_summary: false - show_admin_links: true - group_by: false - link_url: '' - link_display: page_1 - css_class: '' - filter_groups: - operator: AND - groups: - 1: AND display_extenders: { } cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: 0 tags: { } page_1: - display_plugin: page id: page_1 display_title: Page + display_plugin: page position: 1 display_options: - path: admin/people/list + defaults: + show_admin_links: false show_admin_links: false + display_extenders: { } + path: admin/people/list menu: type: 'default tab' title: List description: 'Find and manage people interacting with your site.' - menu_name: admin weight: -10 + menu_name: admin context: '' tab_options: type: normal title: People description: 'Manage user accounts, roles, and permissions.' - menu_name: admin weight: 0 - defaults: - show_admin_links: false - display_extenders: { } + menu_name: admin cache_metadata: + max-age: 0 contexts: - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - user.permissions - max-age: 0 tags: { } diff --git a/tests/config/sync/views.view.watchdog.yml b/tests/config/sync/views.view.watchdog.yml index 2fcd595..8648102 100644 --- a/tests/config/sync/views.view.watchdog.yml +++ b/tests/config/sync/views.view.watchdog.yml @@ -16,133 +16,12 @@ base_table: watchdog base_field: wid display: default: - display_plugin: default id: default display_title: Master + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access site reports' - cache: - type: none - 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: Filter - reset_button: true - reset_button_label: Reset - exposed_sorts_label: 'Sort by' - expose_sort_order: false - sort_asc_label: Asc - sort_desc_label: Desc - pager: - type: mini - options: - items_per_page: 50 - offset: 0 - id: 0 - total_pages: null - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - tags: - previous: ‹‹ - next: ›› - style: - type: table - options: - grouping: { } - row_class: '{{ type }} {{ severity }}' - default_row_class: true - override: true - sticky: false - caption: '' - summary: '' - description: '' - columns: - nothing: nothing - wid: wid - severity: severity - type: type - timestamp: timestamp - message: message - name: name - link: link - info: - nothing: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - wid: - sortable: false - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - severity: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-low - type: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - timestamp: - sortable: true - default_sort_order: desc - align: '' - separator: '' - empty_column: false - responsive: priority-low - message: - sortable: false - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: '' - name: - sortable: true - default_sort_order: asc - align: '' - separator: '' - empty_column: false - responsive: priority-medium - link: - align: '' - separator: '' - empty_column: false - responsive: priority-low - default: wid - empty_table: false - row: - type: fields + title: 'Recent log messages' fields: nothing: id: nothing @@ -151,6 +30,7 @@ display: relationship: none group_type: group admin_label: Icon + plugin_id: custom label: '' exclude: false alter: @@ -192,7 +72,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: false - plugin_id: custom wid: id: wid table: watchdog @@ -200,6 +79,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: WID exclude: true alter: @@ -241,7 +121,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard severity: id: severity table: watchdog @@ -249,6 +128,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: machine_name label: Severity exclude: true alter: @@ -291,7 +171,6 @@ display: empty_zero: false hide_alter_empty: true machine_name: false - plugin_id: machine_name type: id: type table: watchdog @@ -299,6 +178,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: standard label: Type exclude: false alter: @@ -340,7 +220,6 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: standard timestamp: id: timestamp table: watchdog @@ -348,6 +227,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: date label: Date exclude: false alter: @@ -392,7 +272,6 @@ display: date_format: short custom_date_format: '' timezone: '' - plugin_id: date message: id: message table: watchdog @@ -400,6 +279,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: dblog_message label: Message exclude: false alter: @@ -442,7 +322,6 @@ display: empty_zero: false hide_alter_empty: true replace_variables: true - plugin_id: dblog_message name: id: name table: users_field_data @@ -450,6 +329,9 @@ display: relationship: uid group_type: group admin_label: '' + entity_type: user + entity_field: name + plugin_id: field label: User exclude: false alter: @@ -505,9 +387,6 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: user - entity_field: name - plugin_id: field link: id: link table: watchdog @@ -515,6 +394,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: dblog_operations label: Operations exclude: false alter: @@ -556,7 +436,67 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - plugin_id: dblog_operations + pager: + type: mini + options: + offset: 0 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: ›› + previous: ‹‹ + expose: + items_per_page: false + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: false + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: false + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: perm + options: + perm: 'access site reports' + cache: + type: none + options: { } + empty: + area: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: 'No log messages available.' + plugin_id: text_custom + empty: true + content: 'No log messages available.' + tokenize: false + sorts: + wid: + id: wid + table: watchdog + field: wid + relationship: none + group_type: group + admin_label: '' + plugin_id: standard + order: DESC + expose: + label: '' + exposed: false + arguments: { } filters: type: id: type @@ -565,6 +505,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: dblog_types operator: in value: { } group: 1 @@ -575,6 +516,8 @@ display: description: '' use_operator: false operator: type_op + operator_limit_selection: false + operator_list: { } identifier: type required: false remember: false @@ -584,8 +527,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -598,7 +539,6 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: dblog_types severity: id: severity table: watchdog @@ -606,6 +546,7 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: in_operator operator: in value: { } group: 1 @@ -616,6 +557,8 @@ display: description: '' use_operator: false operator: severity_op + operator_limit_selection: false + operator_list: { } identifier: severity required: false remember: false @@ -625,8 +568,6 @@ display: anonymous: '0' administrator: '0' reduce: false - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -639,35 +580,97 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: in_operator - sorts: - wid: - id: wid - table: watchdog - field: wid - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - plugin_id: standard - title: 'Recent log messages' - header: { } - footer: { } - empty: - area: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: 'No log messages available.' - empty: true - tokenize: false - content: 'No log messages available.' - plugin_id: text_custom + filter_groups: + operator: AND + groups: + 1: AND + style: + type: table + options: + grouping: { } + row_class: '{{ type }} {{ severity }}' + default_row_class: true + columns: + nothing: nothing + wid: wid + severity: severity + type: type + timestamp: timestamp + message: message + name: name + link: link + default: wid + info: + nothing: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + wid: + sortable: false + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + severity: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-low + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + timestamp: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: priority-low + message: + sortable: false + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: priority-medium + link: + align: '' + separator: '' + empty_column: false + responsive: priority-low + override: true + sticky: false + summary: '' + empty_table: false + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } relationships: uid: id: uid @@ -676,15 +679,12 @@ display: relationship: none group_type: group admin_label: User - required: false plugin_id: standard - arguments: { } - display_extenders: { } - filter_groups: - operator: AND - groups: - 1: AND + required: false css_class: admin-dblog + header: { } + footer: { } + display_extenders: { } cache_metadata: max-age: -1 contexts: @@ -695,9 +695,9 @@ display: - user.permissions tags: { } page: - display_plugin: page id: page display_title: Page + display_plugin: page position: 1 display_options: display_extenders: { } diff --git a/tests/config/sync/views.view.who_s_new.yml b/tests/config/sync/views.view.who_s_new.yml index 6e4df74..a049aae 100644 --- a/tests/config/sync/views.view.who_s_new.yml +++ b/tests/config/sync/views.view.who_s_new.yml @@ -7,7 +7,7 @@ dependencies: _core: default_config_hash: o_8fSWHZOVIbydZACGsSX09DtuJhqkRmNOzcVj-4bQI id: who_s_new -label: 'Who''s new' +label: "Who's new" module: user description: 'Shows a list of the newest user accounts on the site.' tag: default @@ -15,68 +15,34 @@ base_table: users_field_data base_field: uid display: default: - display_plugin: default id: default display_title: Master + display_plugin: default 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: html_list - row: - type: fields + title: "Who's new" fields: name: id: name table: users_field_data field: name - label: '' + relationship: none + group_type: group + admin_label: '' + entity_type: user + entity_field: name plugin_id: field - type: user_name + label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -86,23 +52,64 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true + type: user_name + pager: + type: some + options: + offset: 0 + items_per_page: 5 + 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 + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + empty: { } + sorts: + created: + id: created + table: users_field_data + field: created + relationship: none + group_type: group + admin_label: '' entity_type: user - entity_field: name + entity_field: created + plugin_id: date + order: DESC + expose: + label: '' + exposed: false + granularity: second + arguments: { } filters: status: - value: '1' + id: status table: users_field_data field: status - id: status + entity_type: user + entity_field: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '0' operator_limit_selection: false operator_list: { } - group: 1 - plugin_id: boolean - entity_type: user - entity_field: status access: id: access table: users_field_data @@ -110,6 +117,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: access + plugin_id: date operator: '>' value: min: '' @@ -124,14 +134,14 @@ display: description: '' use_operator: false operator: '' + operator_limit_selection: false + operator_list: { } identifier: '' required: false remember: false multiple: false remember_roles: authenticated: authenticated - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -144,53 +154,43 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: date - entity_type: user - entity_field: access - sorts: - created: - id: created - table: users_field_data - field: created - relationship: none - group_type: group - admin_label: '' - order: DESC - exposed: false - expose: - label: '' - granularity: second - plugin_id: date - entity_type: user - entity_field: created - title: 'Who''s new' + style: + type: html_list + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: { } footer: { } - empty: { } - relationships: { } - arguments: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } block_1: - display_plugin: block id: block_1 - display_title: 'Who''s new' + display_title: "Who's new" + display_plugin: block position: 1 display_options: display_description: 'A list of new users' - block_description: 'Who''s new' - block_category: User display_extenders: { } + block_description: "Who's new" + block_category: User cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } diff --git a/tests/config/sync/views.view.who_s_online.yml b/tests/config/sync/views.view.who_s_online.yml index 8e20090..3daa5fc 100644 --- a/tests/config/sync/views.view.who_s_online.yml +++ b/tests/config/sync/views.view.who_s_online.yml @@ -7,7 +7,7 @@ dependencies: _core: default_config_hash: m0vmYmhrzMR6S_IC0UlK0Cl-q5lEvL8-EbxbbcDtk34 id: who_s_online -label: 'Who''s online block' +label: "Who's online block" module: user description: 'Shows the user names of the most recently active users, and the total number of active users.' tag: default @@ -15,75 +15,34 @@ base_table: users_field_data base_field: uid display: default: - display_plugin: default id: default display_title: Master + display_plugin: default position: 0 display_options: - access: - type: perm - options: - perm: 'access user profiles' - 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: 10 - offset: 0 - style: - type: html_list - options: - grouping: { } - row_class: '' - default_row_class: true - type: ul - wrapper_class: item-list - class: '' - row: - type: fields + title: "Who's online" fields: name: id: name table: users_field_data field: name - label: '' + relationship: none + group_type: group + admin_label: '' + entity_type: user + entity_field: name plugin_id: field - type: user_name + label: '' + exclude: false alter: alter_text: false make_link: false absolute: false - trim: false word_boundary: false ellipsis: false strip_tags: false + trim: false html: false - hide_empty: false - empty_zero: false - relationship: none - group_type: group - admin_label: '' - exclude: false element_type: '' element_class: '' element_label_type: '' @@ -93,23 +52,75 @@ display: element_wrapper_class: '' element_default_classes: true empty: '' + hide_empty: false + empty_zero: false hide_alter_empty: true + type: user_name + pager: + type: some + options: + offset: 0 + items_per_page: 10 + 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 + access: + type: perm + options: + perm: 'access user profiles' + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'There are currently 0 users online.' + tokenize: false + sorts: + access: + id: access + table: users_field_data + field: access + relationship: none + group_type: group + admin_label: '' entity_type: user - entity_field: name + entity_field: access + plugin_id: date + order: DESC + expose: + label: '' + exposed: false + granularity: second + arguments: { } filters: status: - value: '1' + id: status table: users_field_data field: status - id: status + entity_type: user + entity_field: status + plugin_id: boolean + value: '1' + group: 1 expose: operator: '0' operator_limit_selection: false operator_list: { } - group: 1 - plugin_id: boolean - entity_type: user - entity_field: status access: id: access table: users_field_data @@ -117,6 +128,9 @@ display: relationship: none group_type: group admin_label: '' + entity_type: user + entity_field: access + plugin_id: date operator: '>=' value: min: '' @@ -131,6 +145,8 @@ display: description: 'A user is considered online for this long after they have last viewed a page.' use_operator: false operator: access_op + operator_limit_selection: false + operator_list: { } identifier: access required: false remember: false @@ -139,8 +155,6 @@ display: authenticated: authenticated anonymous: '0' administrator: '0' - operator_limit_selection: false - operator_list: { } is_grouped: false group_info: label: '' @@ -153,26 +167,26 @@ display: default_group: All default_group_multiple: { } group_items: { } - plugin_id: date - entity_type: user - entity_field: access - sorts: - access: - id: access - table: users_field_data - field: access - order: DESC - relationship: none - group_type: group - admin_label: '' - exposed: false - expose: - label: '' - granularity: second - plugin_id: date - entity_type: user - entity_field: access - title: 'Who''s online' + style: + type: html_list + options: + grouping: { } + row_class: '' + default_row_class: true + type: ul + wrapper_class: item-list + class: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: { } header: result: id: result @@ -181,45 +195,31 @@ display: relationship: none group_type: group admin_label: '' + plugin_id: result empty: false content: 'There are currently @total users online.' - plugin_id: result footer: { } - empty: - area_text_custom: - id: area_text_custom - table: views - field: area_text_custom - relationship: none - group_type: group - admin_label: '' - empty: true - tokenize: false - content: 'There are currently 0 users online.' - plugin_id: text_custom - relationships: { } - arguments: { } display_extenders: { } cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } who_s_online_block: - display_plugin: block id: who_s_online_block - display_title: 'Who''s online' + display_title: "Who's online" + display_plugin: block position: 1 display_options: - block_description: 'Who''s online' display_description: 'A list of users that are currently logged in.' display_extenders: { } + block_description: "Who's online" cache_metadata: + max-age: -1 contexts: - 'languages:language_content' - 'languages:language_interface' - user.permissions - max-age: -1 tags: { } From 360bf2f1724dc053f6f764159270add02bcb406e Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Fri, 7 Jul 2023 15:05:16 +0300 Subject: [PATCH 5/7] EWPP-3455: Update travis.yml file for testing 8.0/8.1 version. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3299317..66258ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ sudo: required language: php php: - - 7.1 - - 7.4 - 8.0 + - 8.1 services: - docker From 8a47476065a4765e0ca02f75edb293686142d5b7 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Fri, 7 Jul 2023 15:46:48 +0300 Subject: [PATCH 6/7] EWPP-3455: Fix behat configuration according to updated dependencies. --- behat.yml.dist | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/behat.yml.dist b/behat.yml.dist index 1e84880..f404875 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -11,13 +11,16 @@ default: - Drupal\DrupalExtension\Context\DrupalContext extensions: Behat\MinkExtension: + browserkit_http: ~ base_url: "${drupal.base_url}" javascript_session: 'selenium2' browser_name: 'chrome' - goutte: ~ selenium2: wd_host: '${selenium.host}:${selenium.port}/wd/hub' - capabilities: { "browser": "chrome", "version": "*" } + capabilities: + nativeEvents: true + marionette: true + browserName: chrome Drupal\DrupalExtension: api_driver: "drupal" drupal: From e64687be19fadbbe782575ad1ec9670a503e4a54 Mon Sep 17 00:00:00 2001 From: Sergii Pavlenko Date: Fri, 7 Jul 2023 15:48:25 +0300 Subject: [PATCH 7/7] EWPP-3455: Fix missed usage of accessCheck() method for entity queries. --- src/Traits/EntityTrait.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Traits/EntityTrait.php b/src/Traits/EntityTrait.php index 05d293e..d9eb05e 100644 --- a/src/Traits/EntityTrait.php +++ b/src/Traits/EntityTrait.php @@ -54,6 +54,7 @@ protected static function getEntityByLabel(string $entity_type_id, string $label $query = $storage->getQuery() ->condition($entity_definition->getKey('label'), $label) + ->accessCheck(FALSE) ->range(0, 1); // Optionally filter by bundle.