diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php
index 4d47afa..9a9edcc 100644
--- a/core/lib/Drupal/Core/Block/BlockBase.php
+++ b/core/lib/Drupal/Core/Block/BlockBase.php
@@ -85,8 +85,8 @@ protected function baseConfigurationDefaults() {
return array(
'id' => $this->getPluginId(),
'label' => '',
- 'provider' => $this->pluginDefinition['provider'],
'label_display' => static::BLOCK_LABEL_VISIBLE,
+ 'provider' => $this->pluginDefinition['provider'],
);
}
diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 0128c66..79db0c2 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -208,9 +208,7 @@ public function save($has_trusted_data = FALSE) {
if ($this->typedConfigManager->hasConfigSchema($this->name)) {
// Ensure that the schema wrapper has the latest data.
$this->schemaWrapper = NULL;
- foreach ($this->data as $key => $value) {
- $this->data[$key] = $this->castValue($key, $value);
- }
+ $this->data = $this->castValue(NULL, $this->data);
}
else {
foreach ($this->data as $key => $value) {
diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index 7b938fa..8107291 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -294,13 +294,17 @@ protected function createConfiguration($collection, array $config_to_create) {
$new_config = new Config($name, $this->getActiveStorages($collection), $this->eventDispatcher, $this->typedConfig);
}
if ($config_to_create[$name] !== FALSE) {
- $new_config->setData($config_to_create[$name]);
// Add a hash to configuration created through the installer so it is
// possible to know if the configuration was created by installing an
// extension and to track which version of the default config was used.
if (!$this->isSyncing() && $collection == StorageInterface::DEFAULT_COLLECTION) {
- $new_config->set('_core.default_config_hash', Crypt::hashBase64(serialize($config_to_create[$name])));
+ $config_to_create[$name] = [
+ '_core' => [
+ 'default_config_hash' => Crypt::hashBase64(serialize($config_to_create[$name])),
+ ]
+ ] + $config_to_create[$name];
}
+ $new_config->setData($config_to_create[$name]);
}
if ($collection == StorageInterface::DEFAULT_COLLECTION && $entity_type = $this->configManager->getEntityTypeIdByName($name)) {
// If we are syncing do not create configuration entities. Pluggable
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 08e7e19..da924f0 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -344,6 +344,21 @@ public function preSave(EntityStorageInterface $storage) {
// being written during a configuration synchronization then there is no
// need to recalculate the dependencies.
$this->calculateDependencies();
+ // If the data is trusted we need to ensure that the dependencies are
+ // sorted as per their schema. If the save is not trusted then the
+ // configuration will be sorted by StorableConfigBase.
+ if ($this->trustedData) {
+ $mapping = ['config' => 0, 'content' => 1, 'module' => 2, 'theme' => 3, 'enforced' => 4];
+ $dependency_sort = function ($dependencies) use ($mapping) {
+ // Only sort the keys that exist.
+ $mapping_to_replace = array_intersect_key($mapping, $dependencies);
+ return array_replace($mapping_to_replace, $dependencies);
+ };
+ $this->dependencies = $dependency_sort($this->dependencies);
+ if (isset($this->dependencies['enforced'])) {
+ $this->dependencies['enforced'] = $dependency_sort($this->dependencies['enforced']);
+ }
+ }
}
}
diff --git a/core/lib/Drupal/Core/Config/StorableConfigBase.php b/core/lib/Drupal/Core/Config/StorableConfigBase.php
index 40a25ef..a32087a 100644
--- a/core/lib/Drupal/Core/Config/StorableConfigBase.php
+++ b/core/lib/Drupal/Core/Config/StorableConfigBase.php
@@ -3,6 +3,7 @@
namespace Drupal\Core\Config;
use Drupal\Core\Config\Schema\Ignore;
+use Drupal\Core\Config\Schema\Mapping;
use Drupal\Core\TypedData\PrimitiveInterface;
use Drupal\Core\TypedData\Type\FloatInterface;
use Drupal\Core\TypedData\Type\IntegerInterface;
@@ -164,8 +165,9 @@ protected function validateValue($key, $value) {
/**
* Casts the value to correct data type using the configuration schema.
*
- * @param string $key
- * A string that maps to a key within the configuration data.
+ * @param string|null $key
+ * A string that maps to a key within the configuration data. If NULL the
+ * top level mapping will be processed.
* @param string $value
* Value to associate with the key.
*
@@ -176,7 +178,11 @@ protected function validateValue($key, $value) {
* If the value is unsupported in configuration.
*/
protected function castValue($key, $value) {
- $element = $this->getSchemaWrapper()->get($key);
+ $element = $this->getSchemaWrapper();
+ if ($key !== NULL) {
+ $element = $element->get($key);
+ }
+
// Do not cast value if it is unknown or defined to be ignored.
if ($element && ($element instanceof Undefined || $element instanceof Ignore)) {
// Do validate the value (may throw UnsupportedDataTypeConfigException)
@@ -208,7 +214,17 @@ protected function castValue($key, $value) {
}
// Recurse into any nested keys.
foreach ($value as $nested_value_key => $nested_value) {
- $value[$nested_value_key] = $this->castValue($key . '.' . $nested_value_key, $nested_value);
+ $lookup_key = $key ? $key . '.' . $nested_value_key : $nested_value_key;
+ $value[$nested_value_key] = $this->castValue($lookup_key, $nested_value);
+ }
+
+ // Only sort maps when we have more than 1 element to sort.
+ if ($element instanceof Mapping && count($value) > 1) {
+ $mapping = $element->getDataDefinition()['mapping'];
+ // Only sort the keys in $value.
+ $mapping = array_intersect_key($mapping, $value);
+ // Sort the array in $value using the mapping definition.
+ $value = array_replace($mapping, $value);
}
}
return $value;
diff --git a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
index e0232cf..702390e 100644
--- a/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
+++ b/core/modules/aggregator/config/install/core.entity_view_display.aggregator_feed.aggregator_feed.default.yml
@@ -12,9 +12,9 @@ content:
type: timestamp_ago
weight: 1
region: content
+ label: inline
settings: { }
third_party_settings: { }
- label: inline
description:
weight: 3
region: content
@@ -31,8 +31,8 @@ content:
type: uri_link
weight: 4
region: content
+ label: inline
settings: { }
third_party_settings: { }
- label: inline
hidden:
more_link: true
diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml
index 1a16549..79dfe02 100644
--- a/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml
+++ b/core/modules/aggregator/config/optional/views.view.aggregator_rss_feed.yml
@@ -3,6 +3,7 @@ status: true
dependencies:
module:
- aggregator
+ - user
id: aggregator_rss_feed
label: 'Aggregator RSS feed'
module: aggregator
@@ -13,72 +14,25 @@ base_field: iid
core: 8.x
display:
default:
- display_plugin: default
id: default
display_title: Master
+ display_plugin: default
position: 0
display_options:
- access:
- type: perm
- options:
- perm: 'access news feeds'
- 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: full
- 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
- style:
- type: default
- row:
- type: 'entity:aggregator_item'
+ title: 'Aggregator RSS feed'
fields:
iid:
+ id: iid
table: aggregator_item
field: iid
- id: iid
relationship: none
group_type: group
admin_label: ''
+ entity_type: aggregator_item
+ entity_field: iid
+ plugin_id: field
label: 'Item ID'
exclude: false
- plugin_id: field
alter:
alter_text: false
text: ''
@@ -119,38 +73,89 @@ display:
empty_zero: false
hide_alter_empty: true
type: number_integer
- entity_type: aggregator_item
- entity_field: iid
- filters: { }
+ 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:
+ perm: 'access news feeds'
+ cache:
+ type: tag
+ options: { }
+ empty: { }
sorts: { }
- title: 'Aggregator RSS feed'
+ arguments: { }
+ filters: { }
+ style:
+ type: default
+ row:
+ type: 'entity:aggregator_item'
+ 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'
- url.query_args
- user.permissions
+ tags: { }
cacheable: false
feed_items:
- display_plugin: feed
id: feed_items
display_title: Feed
+ display_plugin: feed
position: 1
display_options:
- path: aggregator/rss
- display_description: ''
defaults:
arguments: true
+ display_description: ''
display_extenders: { }
+ path: aggregator/rss
cache_metadata:
+ max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- user.permissions
+ tags: { }
cacheable: false
diff --git a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml
index 7ddea89..330abcc 100644
--- a/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml
+++ b/core/modules/aggregator/config/optional/views.view.aggregator_sources.yml
@@ -17,74 +17,23 @@ base_field: fid
core: 8.x
display:
default:
- display_plugin: default
id: default
display_title: Master
+ display_plugin: default
position: 0
display_options:
- access:
- type: perm
- options:
- perm: 'access news feeds'
- 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: full
- options:
- items_per_page: 10
- 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: '‹ Previous'
- next: 'Next ›'
- first: '« First'
- last: 'Last »'
- quantity: 9
- style:
- type: default
- row:
- type: 'entity:aggregator_feed'
- options:
- relationship: none
- view_mode: summary
+ title: Sources
fields:
fid:
+ id: fid
table: aggregator_feed
field: fid
- id: fid
- plugin_id: field
- type: number_integer
relationship: none
group_type: group
admin_label: ''
+ entity_type: aggregator_feed
+ entity_field: fid
+ plugin_id: field
label: ''
exclude: false
alter:
@@ -126,35 +75,83 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- entity_type: aggregator_feed
- entity_field: fid
- filters: { }
+ type: number_integer
+ pager:
+ type: full
+ options:
+ offset: 0
+ items_per_page: 10
+ total_pages: null
+ 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:
+ perm: 'access news feeds'
+ cache:
+ type: tag
+ options: { }
+ empty: { }
sorts: { }
- title: Sources
+ arguments: { }
+ filters: { }
+ style:
+ type: default
+ row:
+ type: 'entity:aggregator_feed'
+ options:
+ relationship: none
+ view_mode: summary
+ 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'
- url.query_args
- user.permissions
- max-age: 0
+ tags: { }
feed_1:
- display_plugin: feed
id: feed_1
display_title: Feed
+ display_plugin: feed
position: 2
display_options:
- style:
- type: opml
- options:
- grouping: { }
- path: aggregator/opml
+ title: 'OPML feed'
fields:
title:
id: title
@@ -163,6 +160,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: aggregator_feed
+ entity_field: title
+ plugin_id: field
label: ''
exclude: false
alter:
@@ -218,9 +218,6 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
- plugin_id: field
- entity_type: aggregator_feed
- entity_field: title
url:
id: url
table: aggregator_feed
@@ -228,6 +225,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: aggregator_feed
+ entity_field: url
+ plugin_id: url
label: ''
exclude: false
alter:
@@ -270,9 +270,6 @@ display:
empty_zero: false
hide_alter_empty: true
display_as_link: false
- plugin_id: url
- entity_type: aggregator_feed
- entity_field: url
description:
id: description
table: aggregator_feed
@@ -280,6 +277,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: aggregator_feed
+ entity_field: description
+ plugin_id: xss
label: ''
exclude: false
alter:
@@ -321,9 +321,6 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- plugin_id: xss
- entity_type: aggregator_feed
- entity_field: description
link:
id: link
table: aggregator_feed
@@ -331,6 +328,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: aggregator_feed
+ entity_field: link
+ plugin_id: url
label: ''
exclude: false
alter:
@@ -373,12 +373,10 @@ display:
empty_zero: false
hide_alter_empty: true
display_as_link: false
- plugin_id: url
- entity_type: aggregator_feed
- entity_field: link
- defaults:
- fields: false
- title: false
+ style:
+ type: opml
+ options:
+ grouping: { }
row:
type: opml_fields
options:
@@ -390,37 +388,42 @@ display:
language_field: ''
xml_url_field: url
url_field: ''
+ defaults:
+ title: false
+ fields: false
+ display_extenders: { }
+ path: aggregator/opml
+ sitename_title: true
displays:
page_1: page_1
default: '0'
- title: 'OPML feed'
- sitename_title: true
- display_extenders: { }
cache_metadata:
+ max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- user.permissions
- max-age: 0
+ tags: { }
page_1:
- display_plugin: page
id: page_1
display_title: Page
+ display_plugin: page
position: 1
display_options:
+ display_extenders: { }
path: aggregator/sources
menu:
type: normal
title: Sources
description: ''
weight: 0
- context: '0'
menu_name: tools
- display_extenders: { }
+ context: '0'
cache_metadata:
+ max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- url.query_args
- user.permissions
- max-age: 0
+ tags: { }
diff --git a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
index d31c92c..20c56b9 100644
--- a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
+++ b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
@@ -94,8 +94,8 @@ protected function createTests() {
'settings' => array(
'id' => 'test_html',
'label' => '',
- 'provider' => 'block_test',
'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE,
+ 'provider' => 'block_test',
),
'visibility' => array(),
);
diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index c5dfba2..de11b7c 100644
--- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -105,21 +105,21 @@ public function testBlockMigration() {
$this->assertEntity('user_1', $visibility, 'sidebar_first', 'bartik', 0, '', '0');
$visibility['user_role']['id'] = 'user_role';
- $roles['authenticated'] = 'authenticated';
- $visibility['user_role']['roles'] = $roles;
+ $visibility['user_role']['negate'] = FALSE;
$context_mapping['user'] = '@user.current_user_context:current_user';
$visibility['user_role']['context_mapping'] = $context_mapping;
- $visibility['user_role']['negate'] = FALSE;
+ $roles['authenticated'] = 'authenticated';
+ $visibility['user_role']['roles'] = $roles;
$this->assertEntity('user_2', $visibility, 'sidebar_second', 'bartik', -9, '', '0');
$visibility = [];
$visibility['user_role']['id'] = 'user_role';
+ $visibility['user_role']['negate'] = FALSE;
+ $context_mapping['user'] = '@user.current_user_context:current_user';
+ $visibility['user_role']['context_mapping'] = $context_mapping;
$visibility['user_role']['roles'] = [
'migrate_test_role_1' => 'migrate_test_role_1'
];
- $context_mapping['user'] = '@user.current_user_context:current_user';
- $visibility['user_role']['context_mapping'] = $context_mapping;
- $visibility['user_role']['negate'] = FALSE;
$this->assertEntity('user_3', $visibility, 'sidebar_second', 'bartik', -6, '', '0');
// Check system block
diff --git a/core/modules/block_content/config/optional/views.view.block_content.yml b/core/modules/block_content/config/optional/views.view.block_content.yml
index 20fe0bf..c38aeed 100644
--- a/core/modules/block_content/config/optional/views.view.block_content.yml
+++ b/core/modules/block_content/config/optional/views.view.block_content.yml
@@ -14,103 +14,12 @@ base_field: id
core: 8.x
display:
default:
- display_plugin: default
id: default
display_title: Master
+ display_plugin: default
position: 0
display_options:
- access:
- type: perm
- options:
- perm: 'administer blocks'
- 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: mini
- options:
- items_per_page: 50
- offset: 0
- id: 0
- total_pages: null
- 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:
- info: info
- type: type
- changed: changed
- operations: operations
- info:
- info:
- 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: ''
- changed:
- sortable: true
- default_sort_order: desc
- align: ''
- separator: ''
- empty_column: false
- responsive: ''
- operations:
- sortable: false
- default_sort_order: asc
- align: ''
- separator: ''
- empty_column: false
- responsive: ''
- default: changed
- empty_table: true
- row:
- type: fields
+ title: 'Custom block library'
fields:
info:
id: info
@@ -119,6 +28,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: null
+ entity_field: info
+ plugin_id: field
label: 'Block description'
exclude: false
alter:
@@ -174,9 +86,6 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
- entity_type: null
- entity_field: info
- plugin_id: field
type:
id: type
table: block_content_field_data
@@ -184,6 +93,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: block_content
+ entity_field: type
+ plugin_id: field
label: 'Block type'
exclude: false
alter:
@@ -239,9 +151,6 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
- entity_type: block_content
- entity_field: type
- plugin_id: field
changed:
id: changed
table: block_content_field_data
@@ -249,6 +158,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: block_content
+ entity_field: changed
+ plugin_id: field
label: Updated
exclude: false
alter:
@@ -290,14 +202,11 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- entity_type: block_content
- entity_field: changed
type: timestamp
settings:
date_format: short
custom_date_format: ''
timezone: ''
- plugin_id: field
operations:
id: operations
table: block_content
@@ -305,6 +214,8 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: block_content
+ plugin_id: entity_operations
label: Operations
exclude: false
alter:
@@ -347,8 +258,66 @@ display:
empty_zero: false
hide_alter_empty: true
destination: true
+ pager:
+ type: mini
+ options:
+ offset: 0
+ items_per_page: 50
+ total_pages: null
+ 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: 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: 'administer blocks'
+ 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 no custom blocks available. '
+ tokenize: false
+ block_content_listing_empty:
+ id: block_content_listing_empty
+ table: block_content
+ field: block_content_listing_empty
+ relationship: none
+ group_type: group
+ admin_label: ''
entity_type: block_content
- plugin_id: entity_operations
+ plugin_id: block_content_listing_empty
+ label: ''
+ empty: true
+ sorts: { }
+ arguments: { }
filters:
info:
id: info
@@ -357,6 +326,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: block_content
+ entity_field: info
+ plugin_id: string
operator: contains
value: ''
group: 1
@@ -387,9 +359,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
- entity_type: block_content
- entity_field: info
- plugin_id: string
type:
id: type
table: block_content_field_data
@@ -397,6 +366,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: block_content
+ entity_field: type
+ plugin_id: bundle
operator: in
value: { }
group: 1
@@ -428,52 +400,80 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
- entity_type: block_content
- entity_field: type
- plugin_id: bundle
- sorts: { }
- title: 'Custom block library'
+ style:
+ type: table
+ options:
+ grouping: { }
+ row_class: ''
+ default_row_class: true
+ columns:
+ info: info
+ type: type
+ changed: changed
+ operations: operations
+ default: changed
+ info:
+ info:
+ 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: ''
+ changed:
+ sortable: true
+ default_sort_order: desc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ operations:
+ sortable: false
+ default_sort_order: asc
+ align: ''
+ separator: ''
+ empty_column: false
+ responsive: ''
+ 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: { }
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: 'There are no custom blocks available. '
- plugin_id: text_custom
- block_content_listing_empty:
- admin_label: ''
- empty: true
- field: block_content_listing_empty
- group_type: group
- id: block_content_listing_empty
- label: ''
- relationship: none
- table: block_content
- plugin_id: block_content_listing_empty
- entity_type: block_content
- relationships: { }
- arguments: { }
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:
display_extenders: { }
@@ -482,16 +482,16 @@ display:
type: tab
title: 'Custom block library'
description: ''
- parent: block.admin_display
weight: 0
- context: '0'
menu_name: admin
+ parent: block.admin_display
+ context: '0'
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/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml b/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml
index 58aba45..b90eb49 100644
--- a/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml
+++ b/core/modules/book/config/optional/core.entity_form_display.node.book.default.yml
@@ -28,17 +28,17 @@ content:
third_party_settings: { }
promote:
type: boolean_checkbox
- settings:
- display_label: true
weight: 15
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
diff --git a/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml b/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml
index d6ef64d..f39e28a 100644
--- a/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml
+++ b/core/modules/book/config/optional/core.entity_view_display.node.book.default.yml
@@ -13,10 +13,10 @@ bundle: book
mode: default
content:
body:
- label: hidden
type: text_default
weight: 100
region: content
+ label: hidden
settings: { }
third_party_settings: { }
links:
diff --git a/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml b/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml
index 77a62c3..619ca71 100644
--- a/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml
+++ b/core/modules/book/config/optional/core.entity_view_display.node.book.teaser.yml
@@ -14,10 +14,10 @@ bundle: book
mode: teaser
content:
body:
- label: hidden
type: text_summary_or_trimmed
weight: 100
region: content
+ label: hidden
settings:
trim_length: 600
third_party_settings: { }
diff --git a/core/modules/book/config/optional/core.entity_view_mode.node.print.yml b/core/modules/book/config/optional/core.entity_view_mode.node.print.yml
index d615b03..d695ac5 100644
--- a/core/modules/book/config/optional/core.entity_view_mode.node.print.yml
+++ b/core/modules/book/config/optional/core.entity_view_mode.node.print.yml
@@ -1,11 +1,11 @@
langcode: en
status: false
dependencies:
+ module:
+ - node
enforced:
module:
- book
- module:
- - node
id: node.print
label: Print
targetEntityType: node
diff --git a/core/modules/comment/config/optional/views.view.comments_recent.yml b/core/modules/comment/config/optional/views.view.comments_recent.yml
index 28613e6..ce7b448 100644
--- a/core/modules/comment/config/optional/views.view.comments_recent.yml
+++ b/core/modules/comment/config/optional/views.view.comments_recent.yml
@@ -15,59 +15,23 @@ base_field: cid
core: 8.x
display:
default:
- display_plugin: default
id: default
display_title: Master
+ display_plugin: default
position: 0
display_options:
- access:
- type: perm
- options:
- perm: 'access comments'
- cache:
- type: tag
- query:
- type: views_query
- exposed_form:
- type: basic
- 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
- options:
- default_field_elements: true
- hide_empty: false
- relationships:
- node:
- field: node
- id: node
- table: comment_field_data
- required: true
- plugin_id: standard
+ title: 'Recent comments'
fields:
subject:
id: subject
table: comment_field_data
field: subject
relationship: none
- type: string
- settings:
- link_to_entity: true
- plugin_id: field
group_type: group
admin_label: ''
+ entity_type: comment
+ entity_field: subject
+ plugin_id: field
label: ''
exclude: false
alter:
@@ -109,16 +73,19 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- entity_type: comment
- entity_field: subject
+ type: string
+ settings:
+ link_to_entity: true
changed:
id: changed
table: comment_field_data
field: changed
relationship: none
- plugin_id: field
group_type: group
admin_label: ''
+ entity_type: comment
+ entity_field: changed
+ plugin_id: field
label: ''
exclude: false
alter:
@@ -165,32 +132,32 @@ display:
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 2
- entity_type: comment
- entity_field: changed
- filters:
- status:
- value: '1'
- table: comment_field_data
- field: status
- id: status
- plugin_id: boolean
- expose:
- operator: ''
- group: 1
- entity_type: comment
- entity_field: status
- status_node:
- value: '1'
- table: node_field_data
- field: status
- relationship: node
- id: status_node
- plugin_id: boolean
- expose:
- operator: ''
- group: 1
- entity_type: node
- entity_field: status
+ pager:
+ type: some
+ options:
+ offset: 0
+ items_per_page: 10
+ exposed_form:
+ type: basic
+ access:
+ type: perm
+ options:
+ perm: 'access comments'
+ 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
+ label: ''
+ empty: true
+ content: 'No comments available.'
+ tokenize: false
sorts:
created:
id: created
@@ -199,13 +166,13 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: comment
+ entity_field: created
+ plugin_id: date
order: DESC
- exposed: false
expose:
label: ''
- plugin_id: date
- entity_type: comment
- entity_field: created
+ exposed: false
cid:
id: cid
table: comment_field_data
@@ -213,48 +180,81 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: comment
+ entity_field: cid
+ plugin_id: field
order: DESC
exposed: false
- plugin_id: field
+ filters:
+ status:
+ id: status
+ table: comment_field_data
+ field: status
entity_type: comment
- entity_field: cid
- title: 'Recent comments'
- empty:
- area_text_custom:
- id: area_text_custom
- table: views
- field: area_text_custom
- relationship: none
- group_type: group
- admin_label: ''
- label: ''
- empty: true
- content: 'No comments available.'
- tokenize: false
- plugin_id: text_custom
+ entity_field: status
+ plugin_id: boolean
+ value: '1'
+ group: 1
+ expose:
+ operator: ''
+ status_node:
+ id: status_node
+ table: node_field_data
+ field: status
+ relationship: node
+ entity_type: node
+ entity_field: status
+ plugin_id: boolean
+ value: '1'
+ group: 1
+ expose:
+ operator: ''
+ style:
+ type: html_list
+ options:
+ grouping: { }
+ row_class: ''
+ default_row_class: true
+ type: ul
+ wrapper_class: item-list
+ class: ''
+ row:
+ type: fields
+ options:
+ default_field_elements: true
+ hide_empty: false
+ query:
+ type: views_query
+ relationships:
+ node:
+ id: node
+ table: comment_field_data
+ field: node
+ plugin_id: standard
+ required: true
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: Block
+ display_plugin: block
position: 1
display_options:
+ display_extenders: { }
block_description: 'Recent comments'
block_category: 'Lists (Views)'
allow:
items_per_page: true
- display_extenders: { }
cache_metadata:
+ max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- user.permissions
- max-age: -1
tags: { }
diff --git a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
index c10e268..e192a30 100644
--- a/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
+++ b/core/modules/config/tests/config_schema_test/config/schema/config_schema_test.schema.yml
@@ -297,3 +297,18 @@ test.double_brackets.breed:
mapping:
breed:
type: string
+
+config_schema_test.schema_mapping_sort:
+ type: config_object
+ mapping:
+ bar:
+ type: string
+ foo:
+ type: string
+ map:
+ type: mapping
+ mapping:
+ sub_foo:
+ type: string
+ sub_bar:
+ type: string
diff --git a/core/modules/config/tests/config_test/config/install/config_test.types.yml b/core/modules/config/tests/config_test/config/install/config_test.types.yml
index 6c27522..c65d562 100644
--- a/core/modules/config/tests/config_test/config/install/config_test.types.yml
+++ b/core/modules/config/tests/config_test/config/install/config_test.types.yml
@@ -1,8 +1,8 @@
array: []
boolean: true
-exp: 1.2e+34
float: 3.14159
float_as_integer: !!float 1
+exp: 1.2e+34
hex: 0xC
int: 99
octal: 0775
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
index 2ee3c77..171d709 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldFormatterSettingsTest.php
@@ -27,12 +27,12 @@ public function testEntityDisplaySettings() {
// Run tests.
$field_name = "field_test";
$expected = array(
- 'label' => 'above',
- 'weight' => 1,
'type' => 'text_trimmed',
+ 'weight' => 1,
+ 'region' => 'content',
+ 'label' => 'above',
'settings' => array('trim_length' => 600),
'third_party_settings' => array(),
- 'region' => 'content',
);
// Can we load any entity display.
@@ -75,10 +75,10 @@ public function testEntityDisplaySettings() {
$expected['weight'] = 2;
$expected['type'] = 'number_decimal';
$expected['settings'] = array(
- 'scale' => 2,
- 'decimal_separator' => '.',
- 'thousand_separator' => ',',
- 'prefix_suffix' => TRUE,
+ 'thousand_separator' => ',',
+ 'decimal_separator' => '.',
+ 'scale' => 2,
+ 'prefix_suffix' => TRUE,
);
$component = $display->getComponent('field_test_three');
$this->assertIdentical($expected, $component);
@@ -122,7 +122,7 @@ public function testEntityDisplaySettings() {
// Test the image field formatter settings.
$expected['weight'] = 9;
$expected['type'] = 'image';
- $expected['settings'] = array('image_style' => '', 'image_link' => '');
+ $expected['settings'] = array('image_link' => '', 'image_style' => '');
$component = $display->getComponent('field_test_imagefield');
$this->assertIdentical($expected, $component);
$display = EntityViewDisplay::load('node.story.teaser');
@@ -138,10 +138,9 @@ public function testEntityDisplaySettings() {
$this->assertIdentical($expected, $component);
// Test date field.
- $defaults = array('format_type' => 'fallback', 'timezone_override' => '',);
$expected['weight'] = 10;
$expected['type'] = 'datetime_default';
- $expected['settings'] = array('format_type' => 'fallback') + $defaults;
+ $expected['settings'] = array('timezone_override' => '', 'format_type' => 'fallback');
$component = $display->getComponent('field_test_date');
$this->assertIdentical($expected, $component);
$display = EntityViewDisplay::load('node.story.default');
@@ -155,13 +154,13 @@ public function testEntityDisplaySettings() {
$component = $display->getComponent('field_test_datestamp');
$this->assertIdentical($expected, $component);
$display = EntityViewDisplay::load('node.story.teaser');
- $expected['settings'] = array('format_type' => 'medium') + $defaults;
+ $expected['settings'] = array('timezone_override' => '', 'format_type' => 'medium');
$component = $display->getComponent('field_test_datestamp');
$this->assertIdentical($expected, $component);
// Test datetime field.
$expected['weight'] = 12;
- $expected['settings'] = array('format_type' => 'short') + $defaults;
+ $expected['settings'] = array('timezone_override' => '', 'format_type' => 'short');
$component = $display->getComponent('field_test_datetime');
$this->assertIdentical($expected, $component);
$display = EntityViewDisplay::load('node.story.default');
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index e7bb636..2d30d91 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -30,10 +30,16 @@ public function testWidgetSettings() {
// Text field.
$component = $form_display->getComponent('field_test');
- $expected = array('weight' => 1, 'type' => 'text_textfield');
- $expected['settings'] = array('size' => 60, 'placeholder' => '');
- $expected['third_party_settings'] = array();
- $expected['region'] = 'content';
+ $expected = array(
+ 'type' => 'text_textfield',
+ 'weight' => 1,
+ 'region' => 'content',
+ 'settings' => array(
+ 'size' => 60,
+ 'placeholder' => '',
+ ),
+ 'third_party_settings' => array(),
+ );
$this->assertIdentical($expected, $component, 'Text field settings are correct.');
// Integer field.
diff --git a/core/modules/file/config/optional/views.view.files.yml b/core/modules/file/config/optional/views.view.files.yml
index e5edee2..b02e8d8 100644
--- a/core/modules/file/config/optional/views.view.files.yml
+++ b/core/modules/file/config/optional/views.view.files.yml
@@ -14,156 +14,34 @@ base_field: fid
core: 8.x
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: ''
@@ -173,10 +51,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
@@ -184,6 +61,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: filename
+ plugin_id: field
label: Name
exclude: false
alter:
@@ -237,9 +117,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
@@ -247,6 +124,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: filemime
+ plugin_id: field
label: 'MIME type'
exclude: false
alter:
@@ -289,9 +169,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
@@ -299,6 +176,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: filesize
+ plugin_id: field
label: Size
exclude: false
alter:
@@ -341,9 +221,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
@@ -351,6 +228,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: status
+ plugin_id: field
label: Status
exclude: false
alter:
@@ -397,9 +277,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
@@ -407,6 +284,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: created
+ plugin_id: field
label: 'Upload date'
exclude: false
alter:
@@ -453,9 +333,6 @@ display:
date_format: medium
custom_date_format: ''
timezone: ''
- plugin_id: field
- entity_type: file
- entity_field: created
changed:
id: changed
table: file_managed
@@ -463,6 +340,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: changed
+ plugin_id: field
label: 'Changed date'
exclude: false
alter:
@@ -509,9 +389,6 @@ display:
date_format: medium
custom_date_format: ''
timezone: ''
- plugin_id: field
- entity_type: file
- entity_field: changed
count:
id: count
table: file_usage
@@ -519,6 +396,7 @@ display:
relationship: fid
group_type: sum
admin_label: ''
+ plugin_id: numeric
label: 'Used in'
exclude: false
alter:
@@ -568,7 +446,51 @@ display:
format_plural_string: "1 place\x03@count places"
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
@@ -577,6 +499,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: filename
+ plugin_id: string
operator: word
value: ''
group: 1
@@ -607,9 +532,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
@@ -617,6 +539,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: filemime
+ plugin_id: string
operator: word
value: ''
group: 1
@@ -647,9 +572,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
@@ -657,6 +579,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: file
+ entity_field: status
+ plugin_id: file_status
operator: in
value: { }
group: 1
@@ -688,21 +613,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
@@ -712,34 +711,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: 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: '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
@@ -752,59 +743,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: 0
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- url
- url.query_args
- user.permissions
- max-age: 0
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
@@ -813,6 +777,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: entity_label
label: Entity
exclude: false
alter:
@@ -855,7 +820,6 @@ display:
empty_zero: false
hide_alter_empty: true
link_to_entity: true
- plugin_id: entity_label
type:
id: type
table: file_usage
@@ -863,6 +827,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: standard
label: 'Entity type'
exclude: false
alter:
@@ -904,7 +869,6 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- plugin_id: standard
module:
id: module
table: file_usage
@@ -912,6 +876,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: standard
label: 'Registering module'
exclude: false
alter:
@@ -953,7 +918,6 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
- plugin_id: standard
count:
id: count
table: file_usage
@@ -961,6 +925,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: numeric
label: 'Use count'
exclude: false
alter:
@@ -1010,9 +975,25 @@ display:
format_plural_string: "1\x03@count"
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
@@ -1021,6 +1002,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
@@ -1035,8 +1019,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
@@ -1048,25 +1032,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
@@ -1096,11 +1077,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
@@ -1110,12 +1107,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: 0
contexts:
- 'languages:language_interface'
- url
- url.query_args
- user.permissions
- max-age: 0
tags: { }
diff --git a/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml b/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml
index 6773d32..8751d50 100644
--- a/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml
+++ b/core/modules/forum/config/optional/core.entity_form_display.node.forum.default.yml
@@ -37,17 +37,17 @@ content:
third_party_settings: { }
promote:
type: boolean_checkbox
- settings:
- display_label: true
weight: 15
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: { }
taxonomy_forums:
type: options_select
diff --git a/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml b/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml
index befeba8..72ef82b 100644
--- a/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml
+++ b/core/modules/forum/config/optional/core.entity_view_display.comment.comment_forum.default.yml
@@ -12,10 +12,10 @@ bundle: comment_forum
mode: default
content:
comment_body:
- label: hidden
type: text_default
weight: 0
region: content
+ label: hidden
settings: { }
third_party_settings: { }
links:
diff --git a/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml b/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml
index f3e8c5c..2570925 100644
--- a/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml
+++ b/core/modules/forum/config/optional/core.entity_view_display.node.forum.default.yml
@@ -17,17 +17,17 @@ bundle: forum
mode: default
content:
body:
- label: hidden
type: text_default
weight: 0
region: content
+ label: hidden
settings: { }
third_party_settings: { }
comment_forum:
- label: hidden
type: comment_default
weight: 20
region: content
+ label: hidden
settings:
view_mode: default
pager_id: 0
diff --git a/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml b/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml
index 7b174f4..eb1c3d3 100644
--- a/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml
+++ b/core/modules/forum/config/optional/core.entity_view_display.node.forum.teaser.yml
@@ -16,10 +16,10 @@ bundle: forum
mode: teaser
content:
body:
- label: hidden
type: text_summary_or_trimmed
weight: 100
region: content
+ label: hidden
settings:
trim_length: 600
third_party_settings: { }
diff --git a/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml b/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml
index b326039..aecec5b 100644
--- a/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml
+++ b/core/modules/forum/config/optional/core.entity_view_display.taxonomy_term.forums.default.yml
@@ -15,8 +15,8 @@ content:
type: text_default
weight: 0
region: content
+ label: above
settings: { }
third_party_settings: { }
- label: above
hidden:
forum_container: true
diff --git a/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml b/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml
index 8812273..e5edd7e 100644
--- a/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml
+++ b/core/modules/forum/config/optional/field.field.node.forum.comment_forum.yml
@@ -18,15 +18,15 @@ default_value:
-
status: 2
cid: 0
- last_comment_name: null
last_comment_timestamp: 0
+ last_comment_name: null
last_comment_uid: 0
comment_count: 0
default_value_callback: ''
settings:
default_mode: 0
per_page: 50
- form_location: true
anonymous: 0
+ form_location: true
preview: 1
field_type: comment
diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml
index 0006ad7..4276644 100644
--- a/core/modules/image/config/schema/image.schema.yml
+++ b/core/modules/image/config/schema/image.schema.yml
@@ -14,14 +14,14 @@ image.style.*:
sequence:
type: mapping
mapping:
+ uuid:
+ type: string
id:
type: string
- data:
- type: image.effect.[%parent.id]
weight:
type: integer
- uuid:
- type: string
+ data:
+ type: image.effect.[%parent.id]
image.effect.*:
type: mapping
diff --git a/core/modules/language/config/optional/tour.tour.language-add.yml b/core/modules/language/config/optional/tour.tour.language-add.yml
index 9f428b4..e9ce9a1 100644
--- a/core/modules/language/config/optional/tour.tour.language-add.yml
+++ b/core/modules/language/config/optional/tour.tour.language-add.yml
@@ -11,19 +11,19 @@ tips:
id: language-add-overview
plugin: text
label: 'Adding languages'
- body: 'This page provides the ability to add common languages to your site.
If the desired language is not available, you can add a custom language.
'
weight: 1
+ body: 'This page provides the ability to add common languages to your site.
If the desired language is not available, you can add a custom language.
'
language-add-choose:
id: language-add-choose
plugin: text
label: 'Select language'
- body: 'Choose a language from the list, or choose "Custom language..." at the end of the list.
Click the "Add language" button when you are done choosing your language.
When adding a custom language, you will get an additional form where you can provide the name, code, and direction of the language.
'
weight: 2
attributes:
data-id: edit-predefined-langcode
+ body: 'Choose a language from the list, or choose "Custom language..." at the end of the list.
Click the "Add language" button when you are done choosing your language.
When adding a custom language, you will get an additional form where you can provide the name, code, and direction of the language.
'
language-add-continue:
id: language-add-continue
plugin: text
label: 'Continuing on'
- body: 'Now that you have an overview of the "Add languages" feature, you can continue by:
'
weight: 3
+ body: 'Now that you have an overview of the "Add languages" feature, you can continue by:
'
diff --git a/core/modules/language/config/optional/tour.tour.language-edit.yml b/core/modules/language/config/optional/tour.tour.language-edit.yml
index 454fef1..ae88f6c 100644
--- a/core/modules/language/config/optional/tour.tour.language-edit.yml
+++ b/core/modules/language/config/optional/tour.tour.language-edit.yml
@@ -11,35 +11,35 @@ tips:
id: language-edit-overview
plugin: text
label: 'Editing languages'
- body: 'This page provides the ability to edit a language on your site, including custom languages.
'
weight: 1
+ body: 'This page provides the ability to edit a language on your site, including custom languages.
'
language-edit-langcode:
id: language-edit-langcode
plugin: text
label: 'Language code'
- body: 'You cannot change the code of a language on the site, since it is used by the system to keep track of the language.
'
weight: 2
attributes:
data-id: edit-langcode-view
+ body: 'You cannot change the code of a language on the site, since it is used by the system to keep track of the language.
'
language-edit-label:
id: language-edit-label
plugin: text
label: 'Language name'
- body: 'The language name is used throughout the site for all users and is written in English. Names of built-in languages can be translated using the Interface Translation module, and names of both built-in and custom languages can be translated using the Configuration Translation module.
'
weight: 3
attributes:
data-id: edit-label
+ body: 'The language name is used throughout the site for all users and is written in English. Names of built-in languages can be translated using the Interface Translation module, and names of both built-in and custom languages can be translated using the Configuration Translation module.
'
language-edit-direction:
id: language-edit-direction
plugin: text
label: 'Language direction'
- body: 'Choose if the language is a "Left to right" or "Right to left" language.
Note that not all themes support "Right to left" layouts, so test your theme if you are using "Right to left".
'
weight: 4
attributes:
data-id: edit-direction--wrapper--description
+ body: 'Choose if the language is a "Left to right" or "Right to left" language.
Note that not all themes support "Right to left" layouts, so test your theme if you are using "Right to left".
'
language-edit-continue:
id: language-edit-continue
plugin: text
label: 'Continuing on'
- body: 'Now that you have an overview of the "Edit language" feature, you can continue by:
'
weight: 5
+ body: 'Now that you have an overview of the "Edit language" feature, you can continue by:
'
diff --git a/core/modules/language/config/optional/tour.tour.language.yml b/core/modules/language/config/optional/tour.tour.language.yml
index 7ab79d3..e4103e8 100644
--- a/core/modules/language/config/optional/tour.tour.language.yml
+++ b/core/modules/language/config/optional/tour.tour.language.yml
@@ -11,43 +11,43 @@ tips:
id: language-overview
plugin: text
label: Languages
- body: 'The "Languages" page allows you to add, edit, delete, and reorder languages for the site.
'
weight: 1
+ body: 'The "Languages" page allows you to add, edit, delete, and reorder languages for the site.
'
language-add:
id: language-add
plugin: text
label: 'Adding languages'
- body: 'To add more languages to your site, click the "Add language" button.
Added languages will be displayed in the language list and can then be edited or deleted.
'
weight: 2
attributes:
data-class: button-action
+ body: 'To add more languages to your site, click the "Add language" button.
Added languages will be displayed in the language list and can then be edited or deleted.
'
language-reorder:
id: language-reorder
plugin: text
label: 'Reordering languages'
- body: 'To reorder the languages on your site, use the drag icons next to each language.
The order shown here is the display order for language lists on the site such as in the language switcher blocks provided by the Interface Translation and Content Translation modules.
When you are done with reordering the languages, click the "Save configuration" button for the changes to take effect.
'
weight: 3
attributes:
data-class: draggable
+ body: 'To reorder the languages on your site, use the drag icons next to each language.
The order shown here is the display order for language lists on the site such as in the language switcher blocks provided by the Interface Translation and Content Translation modules.
When you are done with reordering the languages, click the "Save configuration" button for the changes to take effect.
'
language-default:
id: language-default
plugin: text
label: 'Set a language as default'
- body: 'You can change the default language of the site by choosing one of your configured languages as default. The site will use the default language in situations where no choice is made but a language should be set, for example as the language of the displayed interface.
'
weight: 4
attributes:
data-class: js-form-item-site-default-language
+ body: 'You can change the default language of the site by choosing one of your configured languages as default. The site will use the default language in situations where no choice is made but a language should be set, for example as the language of the displayed interface.
'
language-operations:
id: language-operations
plugin: text
label: 'Modifying languages'
- body: 'Operations are provided for editing and deleting your languages.
You can edit the name and the direction of the language.
Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.
'
weight: 5
attributes:
data-class: dropbutton-wrapper
+ body: 'Operations are provided for editing and deleting your languages.
You can edit the name and the direction of the language.
Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.
'
language-continue:
id: language-continue
plugin: text
label: 'Continuing on'
- body: 'Now that you have an overview of the "Languages" page, you can continue by:
'
weight: 6
+ body: 'Now that you have an overview of the "Languages" page, you can continue by:
'
diff --git a/core/modules/locale/config/optional/tour.tour.locale.yml b/core/modules/locale/config/optional/tour.tour.locale.yml
index b6b376c..f93b4d2 100644
--- a/core/modules/locale/config/optional/tour.tour.locale.yml
+++ b/core/modules/locale/config/optional/tour.tour.locale.yml
@@ -13,59 +13,59 @@ tips:
id: locale-overview
plugin: text
label: 'User interface translation'
- body: 'This page allows you to translate the user interface or modify existing translations. If you have installed your site initially in English, you must first add another language on the Languages page, in order to use this page.'
weight: 1
+ body: 'This page allows you to translate the user interface or modify existing translations. If you have installed your site initially in English, you must first add another language on the Languages page, in order to use this page.'
locale-language:
id: locale-language
plugin: text
label: 'Translation language'
- body: 'Choose the language you want to translate.'
weight: 2
attributes:
data-id: edit-langcode
+ body: 'Choose the language you want to translate.'
locale-search:
id: locale-search
plugin: text
label: Search
- body: 'Enter the specific word or sentence you want to translate, you can also write just a part of a word.'
weight: 3
attributes:
data-id: edit-string
+ body: 'Enter the specific word or sentence you want to translate, you can also write just a part of a word.'
locale-filter:
id: locale-filter
plugin: text
label: 'Filter the search'
- body: 'You can search for untranslated strings if you want to translate something that isn''t translated yet. If you want to modify an existing translation, you might want to search only for translated strings.'
weight: 4
attributes:
data-id: edit-translation
+ body: 'You can search for untranslated strings if you want to translate something that isn''t translated yet. If you want to modify an existing translation, you might want to search only for translated strings.'
locale-submit:
id: locale-submit
plugin: text
label: 'Apply your search criteria'
- body: 'To apply your search criteria, click on the Filter button.'
weight: 5
attributes:
data-id: edit-submit
+ body: 'To apply your search criteria, click on the Filter button.'
locale-translate:
id: locale-translate
plugin: text
label: Translate
- body: 'You can write your own translation in the text fields of the right column. Try to figure out in which context the text will be used in order to translate it in the appropriate way.'
weight: 6
attributes:
data-class: js-form-type-textarea
+ body: 'You can write your own translation in the text fields of the right column. Try to figure out in which context the text will be used in order to translate it in the appropriate way.'
locale-validate:
id: locale-validate
plugin: text
label: 'Validate the translation'
- body: 'When you have finished your translations, click on the Save translations button. You must save your translations, each time before changing the page or making a new search.'
weight: 7
attributes:
data-id: edit-submit--2
+ body: 'When you have finished your translations, click on the Save translations button. You must save your translations, each time before changing the page or making a new search.'
locale-continue:
id: locale-continue
plugin: text
label: 'Continuing on'
- body: 'The translations you have made here will be used on your site''s user interface. If you want to use them on another site or modify them on an external translation editor, you can export them to a .po file and import them later.'
weight: 8
+ body: 'The translations you have made here will be used on your site''s user interface. If you want to use them on another site or modify them on an external translation editor, you can export them to a .po file and import them later.'
diff --git a/core/modules/node/config/optional/views.view.archive.yml b/core/modules/node/config/optional/views.view.archive.yml
index 73e0477..319a871 100644
--- a/core/modules/node/config/optional/views.view.archive.yml
+++ b/core/modules/node/config/optional/views.view.archive.yml
@@ -21,39 +21,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'
@@ -62,57 +41,72 @@ 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'
- plugin_id: boolean
- entity_type: node
- entity_field: status
langcode:
id: langcode
table: node_field_data
@@ -120,6 +114,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***'
@@ -150,9 +147,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
- plugin_id: language
- entity_type: node
- entity_field: langcode
style:
type: default
options:
@@ -164,20 +158,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
@@ -185,38 +185,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
@@ -227,14 +227,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/core/modules/node/config/optional/views.view.content.yml b/core/modules/node/config/optional/views.view.content.yml
index cef43c7..8179163 100644
--- a/core/modules/node/config/optional/views.view.content.yml
+++ b/core/modules/node/config/optional/views.view.content.yml
@@ -14,134 +14,19 @@ base_field: nid
core: 8.x
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:
@@ -152,12 +37,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:
@@ -168,12 +54,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
@@ -181,6 +64,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: node
+ entity_field: type
+ plugin_id: field
label: 'Content type'
exclude: false
alter:
@@ -236,14 +122,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:
@@ -254,14 +140,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:
@@ -275,15 +161,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:
@@ -299,9 +185,6 @@ display:
date_format: short
custom_date_format: ''
timezone: ''
- plugin_id: field
- entity_type: node
- entity_field: changed
operations:
id: operations
table: node
@@ -309,6 +192,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: entity_operations
label: Operations
exclude: false
alter:
@@ -351,7 +235,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
@@ -360,6 +278,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: node
+ entity_field: title
+ plugin_id: string
operator: contains
value: ''
group: 1
@@ -390,9 +311,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
@@ -400,6 +318,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: node
+ entity_field: type
+ plugin_id: bundle
operator: in
value: { }
group: 1
@@ -431,9 +352,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
@@ -441,6 +359,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: node
+ entity_field: status
+ plugin_id: boolean
operator: '='
value: '1'
group: 1
@@ -477,9 +398,6 @@ display:
title: Unpublished
operator: '='
value: '0'
- plugin_id: boolean
- entity_type: node
- entity_field: status
langcode:
id: langcode
table: node_field_data
@@ -487,6 +405,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: node
+ entity_field: langcode
+ plugin_id: language
operator: in
value: { }
group: 1
@@ -518,48 +439,128 @@ 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
- 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'
@@ -568,30 +569,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'
@@ -600,5 +601,4 @@ display:
- user
- 'user.node_grants:view'
- user.permissions
- max-age: 0
tags: { }
diff --git a/core/modules/node/config/optional/views.view.content_recent.yml b/core/modules/node/config/optional/views.view.content_recent.yml
index 39f4ecb..d33a3f4 100644
--- a/core/modules/node/config/optional/views.view.content_recent.yml
+++ b/core/modules/node/config/optional/views.view.content_recent.yml
@@ -14,75 +14,34 @@ base_field: nid
core: 8.x
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: ''
@@ -92,11 +51,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
@@ -104,6 +64,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: node
+ entity_field: changed
+ plugin_id: field
label: ''
exclude: false
alter:
@@ -158,9 +121,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
@@ -169,6 +180,8 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: node
+ plugin_id: node_status
operator: '='
value: false
group: 1
@@ -197,8 +210,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
- entity_type: node
- plugin_id: node_status
langcode:
id: langcode
table: node_field_data
@@ -206,6 +217,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***'
@@ -236,40 +250,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
@@ -278,39 +277,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: 0
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: 0
tags: { }
diff --git a/core/modules/node/config/optional/views.view.frontpage.yml b/core/modules/node/config/optional/views.view.frontpage.yml
index d05e291..761986f 100644
--- a/core/modules/node/config/optional/views.view.frontpage.yml
+++ b/core/modules/node/config/optional/views.view.frontpage.yml
@@ -17,7 +17,44 @@ base_field: nid
core: 8.x
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:
@@ -27,28 +64,28 @@ display:
options: { }
empty:
area_text_custom:
- admin_label: ''
- content: 'No front page content has been created yet.'
- 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.'
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
@@ -56,70 +93,91 @@ 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: ''
+ identifier: ''
+ required: false
remember: false
+ multiple: false
remember_roles:
authenticated: authenticated
- required: false
- use_operator: false
- 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
- table: node_field_data
- value: '1'
- plugin_id: boolean
- entity_type: node
- entity_field: promote
+ multiple: false
+ remember: false
+ default_group: All
+ default_group_multiple: { }
+ group_items: { }
status:
- expose:
- operator: ''
- field: status
- group: 1
id: status
table: node_field_data
- value: '1'
- plugin_id: boolean
+ field: status
entity_type: node
entity_field: status
+ plugin_id: boolean
+ value: '1'
+ group: 1
+ expose:
+ operator: ''
langcode:
id: langcode
table: node_field_data
@@ -127,6 +185,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***'
@@ -157,146 +218,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/core/modules/node/config/optional/views.view.glossary.yml b/core/modules/node/config/optional/views.view.glossary.yml
index 2b4e330..8a4a1c8 100644
--- a/core/modules/node/config/optional/views.view.glossary.yml
+++ b/core/modules/node/config/optional/views.view.glossary.yml
@@ -1,6 +1,8 @@
langcode: en
status: false
dependencies:
+ config:
+ - system.menu.main
module:
- node
- user
@@ -19,59 +21,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:
@@ -113,18 +73,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
@@ -165,22 +124,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
@@ -221,90 +176,82 @@ 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: ''
+ 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
@@ -313,6 +260,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***'
@@ -343,11 +293,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: 0
contexts:
- 'languages:language_content'
- 'languages:language_interface'
@@ -355,7 +358,6 @@ display:
- url.query_args
- 'user.node_grants:view'
- user.permissions
- max-age: 0
tags: { }
attachment_1:
id: attachment_1
@@ -363,59 +365,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: 0
contexts:
- 'languages:language_content'
- 'languages:language_interface'
@@ -423,7 +426,6 @@ display:
- url.query_args
- 'user.node_grants:view'
- user.permissions
- max-age: 0
tags: { }
page_1:
id: page_1
@@ -434,6 +436,7 @@ display:
query:
type: views_query
options: { }
+ display_extenders: { }
path: glossary
menu:
type: normal
@@ -441,8 +444,8 @@ display:
weight: 0
menu_name: main
parent: ''
- display_extenders: { }
cache_metadata:
+ max-age: 0
contexts:
- 'languages:language_content'
- 'languages:language_interface'
@@ -450,5 +453,4 @@ display:
- url.query_args
- 'user.node_grants:view'
- user.permissions
- max-age: 0
tags: { }
diff --git a/core/modules/responsive_image/config/schema/responsive_image.schema.yml b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
index f05a8e2..3d66404 100644
--- a/core/modules/responsive_image/config/schema/responsive_image.schema.yml
+++ b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
@@ -17,6 +17,12 @@ responsive_image.styles.*:
type: mapping
label: 'Image style mapping'
mapping:
+ breakpoint_id:
+ type: string
+ label: 'Breakpoint ID'
+ multiplier:
+ type: string
+ label: 'Multiplier'
# Image mapping type. Either 'sizes' (using the 'sizes' attribute)
# or 'image_style' (using a single image style to map to this
# breakpoint).
@@ -25,12 +31,6 @@ responsive_image.styles.*:
label: 'Responsive image mapping type'
image_mapping:
type: responsive_image.image_mapping_type.[%parent.image_mapping_type]
- breakpoint_id:
- type: string
- label: 'Breakpoint ID'
- multiplier:
- type: string
- label: 'Multiplier'
breakpoint_group:
type: string
label: 'Breakpoint group'
diff --git a/core/modules/simpletest/config/install/simpletest.settings.yml b/core/modules/simpletest/config/install/simpletest.settings.yml
index a2254cc..7420cd5 100644
--- a/core/modules/simpletest/config/install/simpletest.settings.yml
+++ b/core/modules/simpletest/config/install/simpletest.settings.yml
@@ -1,6 +1,6 @@
clear_results: true
+verbose: true
httpauth:
method: 1
- password: ''
username: ''
-verbose: true
+ password: ''
diff --git a/core/modules/system/config/install/system.date.yml b/core/modules/system/config/install/system.date.yml
index 6470af2..410acaf 100644
--- a/core/modules/system/config/install/system.date.yml
+++ b/core/modules/system/config/install/system.date.yml
@@ -1,9 +1,9 @@
+first_day: 0
country:
default: ''
-first_day: 0
timezone:
default: ''
user:
configurable: true
- warn: false
default: 0
+ warn: false
diff --git a/core/modules/system/config/install/system.maintenance.yml b/core/modules/system/config/install/system.maintenance.yml
index 40cfeb2..2c1a44b 100644
--- a/core/modules/system/config/install/system.maintenance.yml
+++ b/core/modules/system/config/install/system.maintenance.yml
@@ -1,2 +1,2 @@
-message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.'
langcode: en
+message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.'
diff --git a/core/modules/system/config/install/system.rss.yml b/core/modules/system/config/install/system.rss.yml
index 994f55c..fc7a76b 100644
--- a/core/modules/system/config/install/system.rss.yml
+++ b/core/modules/system/config/install/system.rss.yml
@@ -1,6 +1,6 @@
+langcode: en
channel:
description: ''
items:
limit: 10
view_mode: rss
-langcode: en
diff --git a/core/modules/system/config/install/system.site.yml b/core/modules/system/config/install/system.site.yml
index b5a932b..daf0090 100644
--- a/core/modules/system/config/install/system.site.yml
+++ b/core/modules/system/config/install/system.site.yml
@@ -1,3 +1,4 @@
+langcode: en
uuid: ''
name: 'Drupal'
mail: ''
@@ -8,5 +9,4 @@ page:
front: /user/login
admin_compact_mode: false
weight_select_max: 100
-langcode: en
default_langcode: en
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php
index c8e800b..41b1d52 100644
--- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php
@@ -26,20 +26,20 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase {
'logging' => 1,
],
'system.date' => [
+ 'first_day' => 4,
// country is not handled by the migration.
'country' => [
'default' => '',
],
- 'first_day' => 4,
// timezone is not handled by the migration.
'timezone' => [
'default' => 'Europe/Paris',
'user' => [
'configurable' => FALSE,
- // warn is not handled by the migration.
- 'warn' => FALSE,
// default is not handled by the migration.
'default' => 0,
+ // warn is not handled by the migration.
+ 'warn' => FALSE,
],
],
],
@@ -63,9 +63,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase {
'error_level' => 'some',
],
'system.maintenance' => [
- 'message' => 'Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.',
// langcode is not handled by the migration.
'langcode' => 'en',
+ 'message' => 'Drupal is currently under maintenance. We should be back shortly. Thank you for your patience.',
],
'system.performance' => [
'cache' => [
@@ -90,13 +90,15 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase {
// gzip is not handled by the migration.
'gzip' => TRUE,
],
- // stale_file_threshold is not handled by the migration.
- 'stale_file_threshold' => 2592000,
'response' => [
'gzip' => TRUE,
],
+ // stale_file_threshold is not handled by the migration.
+ 'stale_file_threshold' => 2592000,
],
'system.rss' => [
+ // langcode is not handled by the migration.
+ 'langcode' => 'en',
// channel is not handled by the migration.
'channel' => [
'description' => '',
@@ -105,10 +107,10 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase {
'limit' => 10,
'view_mode' => 'title',
],
- // langcode is not handled by the migration.
- 'langcode' => 'en',
],
'system.site' => [
+ // langcode and default_langcode are not handled by the migration.
+ 'langcode' => 'en',
// uuid is not handled by the migration.
'uuid' => '',
'name' => 'site_name',
@@ -121,8 +123,6 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase {
],
'admin_compact_mode' => FALSE,
'weight_select_max' => 100,
- // langcode and default_langcode are not handled by the migration.
- 'langcode' => 'en',
'default_langcode' => 'en',
],
];
diff --git a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
index 22e9ba7..9da5ea1 100644
--- a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php
@@ -27,17 +27,17 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
'logging' => 1,
],
'system.date' => [
+ 'first_day' => 1,
'country' => [
'default' => 'US',
],
- 'first_day' => 1,
'timezone' => [
'default' => 'America/Chicago',
'user' => [
'configurable' => TRUE,
- 'warn' => TRUE,
// DRUPAL_USER_TIMEZONE_SELECT (D7 API)
'default' => 2,
+ 'warn' => TRUE,
],
],
],
@@ -66,9 +66,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
],
],
'system.maintenance' => [
- 'message' => 'This is a custom maintenance mode message.',
// langcode is not handled by the migration.
'langcode' => 'en',
+ 'message' => 'This is a custom maintenance mode message.',
],
'system.performance' => [
'cache' => [
@@ -93,13 +93,14 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
// gzip is not handled by the migration.
'gzip' => TRUE,
],
- // stale_file_threshold is not handled by the migration.
- 'stale_file_threshold' => 2592000,
'response' => [
'gzip' => TRUE,
],
+ // stale_file_threshold is not handled by the migration.
+ 'stale_file_threshold' => 2592000,
],
'system.rss' => [
+ 'langcode' => 'en',
'channel' => [
'description' => '',
],
@@ -107,9 +108,10 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
'limit' => 27,
'view_mode' => 'fulltext',
],
- 'langcode' => 'en',
],
'system.site' => [
+ // langcode and default_langcode are not handled by the migration.
+ 'langcode' => 'en',
// uuid is not handled by the migration.
'uuid' => '',
'name' => 'The Site Name',
@@ -122,8 +124,6 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase {
],
'admin_compact_mode' => TRUE,
'weight_select_max' => 40,
- // langcode and default_langcode are not handled by the migration.
- 'langcode' => 'en',
'default_langcode' => 'en',
],
];
diff --git a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml
index 95b54a8..0027d86 100644
--- a/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml
+++ b/core/modules/taxonomy/config/optional/views.view.taxonomy_term.yml
@@ -22,38 +22,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'
@@ -62,34 +41,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:
@@ -99,6 +93,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: taxonomy_index_tid
default_action: 'not found'
exception:
value: ''
@@ -113,8 +108,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
@@ -124,15 +119,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
@@ -141,6 +135,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***'
@@ -171,9 +168,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
@@ -181,6 +175,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: boolean
operator: '='
value: '1'
group: 1
@@ -209,7 +204,6 @@ display:
default_group: All
default_group_multiple: { }
group_items: { }
- plugin_id: boolean
style:
type: default
options:
@@ -221,6 +215,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
@@ -229,27 +234,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
@@ -257,37 +257,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
@@ -298,14 +298,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/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml
index 9734cde..d216882 100644
--- a/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml
+++ b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test-2.yml
@@ -9,7 +9,7 @@ tips:
id: tour-test-2
plugin: text
label: 'The quick brown fox'
- body: 'Per lo più in pianura.'
weight: 2
+ body: 'Per lo più in pianura.'
attributes:
data-id: tour-test-2
diff --git a/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml
index 4236f72..be454f2 100644
--- a/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml
+++ b/core/modules/tour/tests/tour_test/config/install/tour.tour.tour-test.yml
@@ -12,29 +12,29 @@ tips:
id: tour-test-1
plugin: text
label: 'The first tip'
- body: 'Is [site:name] always the best dressed?'
weight: 1
+ body: 'Is [site:name] always the best dressed?'
attributes:
data-id: tour-test-1
tour-test-action:
id: tour-test-3
plugin: text
label: 'The action'
- body: 'The action button of awesome'
weight: 2
+ body: 'The action button of awesome'
attributes:
data-class: button-action
tour-test-3:
id: tour-test-3
plugin: image
label: 'The awesome image'
- url: 'http://local/image.png'
weight: 1
+ url: 'http://local/image.png'
tour-test-6:
id: tour-test-6
plugin: text
label: 'Im a list'
- body: 'Im all these things:
'
weight: 6
+ body: 'Im all these things:
'
attributes:
data-id: tour-test-3
diff --git a/core/modules/user/config/install/user.mail.yml b/core/modules/user/config/install/user.mail.yml
index 9f2ad67..176e017 100644
--- a/core/modules/user/config/install/user.mail.yml
+++ b/core/modules/user/config/install/user.mail.yml
@@ -1,28 +1,28 @@
+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],\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"
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],\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"
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],\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"
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],\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"
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\n-- [site:name] team"
subject: 'Account details for [user:display-name] at [site:name] (pending admin 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\n-- [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.\n\n[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],\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"
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],\n\nYour account on [site:name] has been blocked.\n\n-- [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
+ body: "[user:display-name],\n\nYour account on [site:name] has been canceled.\n\n-- [site:name] team"
diff --git a/core/modules/user/config/install/user.settings.yml b/core/modules/user/config/install/user.settings.yml
index 8372ccd..3232949 100644
--- a/core/modules/user/config/install/user.settings.yml
+++ b/core/modules/user/config/install/user.settings.yml
@@ -1,3 +1,4 @@
+langcode: en
anonymous: Anonymous
verify_mail: true
notify:
@@ -13,4 +14,3 @@ register: visitors
cancel_method: user_cancel_block
password_reset_timeout: 86400
password_strength: true
-langcode: en
diff --git a/core/modules/user/config/optional/views.view.user_admin_people.yml b/core/modules/user/config/optional/views.view.user_admin_people.yml
index e829a20..9312d62 100644
--- a/core/modules/user/config/optional/views.view.user_admin_people.yml
+++ b/core/modules/user/config/optional/views.view.user_admin_people.yml
@@ -13,131 +13,12 @@ base_field: uid
core: 8.x
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
@@ -146,6 +27,8 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ plugin_id: user_bulk_form
label: 'Bulk update'
exclude: false
alter:
@@ -187,8 +70,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
@@ -196,6 +77,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: name
+ plugin_id: field
label: Username
exclude: false
alter:
@@ -237,10 +121,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
@@ -248,6 +129,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: status
+ plugin_id: field
label: Status
exclude: false
alter:
@@ -289,14 +173,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
@@ -304,6 +185,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: user_roles
label: Roles
exclude: false
alter:
@@ -347,7 +229,6 @@ display:
hide_alter_empty: true
type: ul
separator: ', '
- plugin_id: user_roles
created:
id: created
table: users_field_data
@@ -355,6 +236,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: created
+ plugin_id: field
label: 'Member for'
exclude: false
alter:
@@ -401,9 +285,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
@@ -411,6 +292,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: access
+ plugin_id: field
label: 'Last access'
exclude: false
alter:
@@ -457,9 +341,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
@@ -467,6 +348,8 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ plugin_id: entity_operations
label: Operations
exclude: false
alter:
@@ -509,8 +392,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
@@ -518,6 +399,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: mail
+ plugin_id: field
label: ''
exclude: true
alter:
@@ -572,9 +456,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
@@ -583,6 +529,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: combine
operator: contains
value: ''
group: 1
@@ -616,7 +563,6 @@ display:
fields:
name: name
mail: mail
- plugin_id: combine
status:
id: status
table: users_field_data
@@ -624,6 +570,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: status
+ plugin_id: boolean
operator: '='
value: '1'
group: 1
@@ -662,9 +611,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
@@ -672,6 +618,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: user_roles
operator: or
value: { }
group: 1
@@ -704,7 +651,6 @@ display:
default_group_multiple: { }
group_items: { }
reduce_duplicates: false
- plugin_id: user_roles
permission:
id: permission
table: user__roles
@@ -712,6 +658,7 @@ display:
relationship: none
group_type: group
admin_label: ''
+ plugin_id: user_permissions
operator: or
value: { }
group: 1
@@ -744,7 +691,6 @@ display:
default_group_multiple: { }
group_items: { }
reduce_duplicates: false
- plugin_id: user_permissions
default_langcode:
id: default_langcode
table: users_field_data
@@ -752,6 +698,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: default_langcode
+ plugin_id: boolean
operator: '='
value: '1'
group: 1
@@ -780,9 +729,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
@@ -790,6 +736,8 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ plugin_id: numeric
operator: '!='
value:
min: ''
@@ -821,92 +769,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/core/modules/user/config/optional/views.view.who_s_new.yml b/core/modules/user/config/optional/views.view.who_s_new.yml
index 7d4ed34..8430955 100644
--- a/core/modules/user/config/optional/views.view.who_s_new.yml
+++ b/core/modules/user/config/optional/views.view.who_s_new.yml
@@ -13,68 +13,34 @@ base_field: uid
core: 8.x
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: ''
@@ -84,21 +50,62 @@ 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
- expose:
- operator: '0'
- group: 1
- plugin_id: boolean
entity_type: user
entity_field: status
+ plugin_id: boolean
+ value: '1'
+ group: 1
+ expose:
+ operator: '0'
access:
id: access
table: users_field_data
@@ -106,6 +113,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: access
+ plugin_id: date
operator: '>'
value:
min: ''
@@ -138,53 +148,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_plugin: block
position: 1
display_options:
display_description: 'A list of new users'
+ display_extenders: { }
block_description: 'Who''s new'
block_category: User
- display_extenders: { }
cache_metadata:
+ max-age: -1
contexts:
- 'languages:language_content'
- 'languages:language_interface'
- user.permissions
- max-age: -1
tags: { }
diff --git a/core/modules/user/config/optional/views.view.who_s_online.yml b/core/modules/user/config/optional/views.view.who_s_online.yml
index 3116036..117286b 100644
--- a/core/modules/user/config/optional/views.view.who_s_online.yml
+++ b/core/modules/user/config/optional/views.view.who_s_online.yml
@@ -13,75 +13,34 @@ base_field: uid
core: 8.x
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: ''
@@ -91,21 +50,73 @@ 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
- expose:
- operator: '0'
- group: 1
- plugin_id: boolean
entity_type: user
entity_field: status
+ plugin_id: boolean
+ value: '1'
+ group: 1
+ expose:
+ operator: '0'
access:
id: access
table: users_field_data
@@ -113,6 +124,9 @@ display:
relationship: none
group_type: group
admin_label: ''
+ entity_type: user
+ entity_field: access
+ plugin_id: date
operator: '>='
value:
min: ''
@@ -147,26 +161,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
@@ -175,45 +189,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_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: { }
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
index af2eec9..1508adc 100644
--- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserFloodTest.php
@@ -25,14 +25,14 @@ protected function setUp() {
*/
public function testMigration() {
$expected = [
+ '_core' => [
+ 'default_config_hash' => 'UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs',
+ ],
'uid_only' => TRUE,
'ip_limit' => 30,
'ip_window' => 7200,
'user_limit' => 22,
'user_window' => 86400,
- '_core' => [
- 'default_config_hash' => 'UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs',
- ],
];
$this->assertIdentical($expected, $this->config('user.flood')->get());
}
diff --git a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
index 42193dd..5e3f2e6 100644
--- a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
+++ b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
@@ -16,79 +16,79 @@ tips:
id: views-main
plugin: text
label: 'Manage view settings'
- body: 'View or edit the configuration.'
weight: 1
+ body: 'View or edit the configuration.'
views-ui-displays:
id: views-ui-displays
plugin: text
label: 'Displays in this view'
- body: 'A display is a way of outputting the results, e.g., as a page or a block. A view can contain multiple displays, which are listed here. The active display is highlighted.'
weight: 2
attributes:
data-id: views-display-top
+ body: 'A display is a way of outputting the results, e.g., as a page or a block. A view can contain multiple displays, which are listed here. The active display is highlighted.'
views-ui-view-admin:
id: views-ui-view-admin
plugin: text
label: 'View administration'
- body: 'Perform administrative tasks, including adding a description and creating a clone. Click the drop-down button to view the available options.'
weight: 3
location: left
attributes:
data-id: views-display-extra-actions
+ body: 'Perform administrative tasks, including adding a description and creating a clone. Click the drop-down button to view the available options.'
views-ui-format:
id: views-ui-format
plugin: text
label: 'Output format'
- body: 'Choose how to output results. E.g., choose Content to output each item completely, using your configured display settings. Or choose Fields, which allows you to output only specific fields for each result. Additional formats can be added by installing modules to extend Drupal''s base functionality.'
weight: 4
attributes:
data-class: views-ui-display-tab-bucket.format
+ body: 'Choose how to output results. E.g., choose Content to output each item completely, using your configured display settings. Or choose Fields, which allows you to output only specific fields for each result. Additional formats can be added by installing modules to extend Drupal''s base functionality.'
views-ui-fields:
id: views-ui-fields
plugin: text
label: Fields
- body: 'If this view uses fields, they are listed here. You can click on a field to configure it.'
weight: 5
attributes:
data-class: views-ui-display-tab-bucket.field
+ body: 'If this view uses fields, they are listed here. You can click on a field to configure it.'
views-ui-filter:
id: views-ui-filter
plugin: text
label: 'Filter your view'
- body: 'Add filters to limit the results in the output. E.g., to only show content that is published, you would add a filter for Published and select Yes.'
weight: 6
attributes:
data-class: views-ui-display-tab-bucket.filter
+ body: 'Add filters to limit the results in the output. E.g., to only show content that is published, you would add a filter for Published and select Yes.'
views-ui-filter-operations:
id: views-ui-filter-operations
plugin: text
label: 'Filter actions'
- body: 'Add, rearrange or remove filters.'
weight: 7
attributes:
data-class: 'views-ui-display-tab-bucket.filter .dropbutton-widget'
+ body: 'Add, rearrange or remove filters.'
views-ui-sorts:
id: views-ui-sorts
plugin: text
label: 'Sort Criteria'
- body: 'Control the order in which the results are output. Click on an active sort rule to configure it.'
weight: 8
attributes:
data-class: views-ui-display-tab-bucket.sort
+ body: 'Control the order in which the results are output. Click on an active sort rule to configure it.'
views-ui-sorts-operations:
id: views-ui-sorts-operations
plugin: text
label: 'Sort actions'
- body: 'Add, rearrange or remove sorting rules.'
weight: 9
attributes:
data-class: 'views-ui-display-tab-bucket.sort .dropbutton-widget'
+ body: 'Add, rearrange or remove sorting rules.'
views-ui-preview:
id: views-ui-preview
plugin: text
label: Preview
- body: 'Show a preview of the view output.'
weight: 10
location: left
attributes:
data-id: preview-submit
+ body: 'Show a preview of the view output.'
diff --git a/core/modules/workflows/config/schema/workflows.schema.yml b/core/modules/workflows/config/schema/workflows.schema.yml
index e19eb6b..5bf1f05 100644
--- a/core/modules/workflows/config/schema/workflows.schema.yml
+++ b/core/modules/workflows/config/schema/workflows.schema.yml
@@ -8,12 +8,6 @@ workflows.workflow.*:
label:
type: label
label: 'Label'
- type:
- type: string
- label: 'Workflow type'
- type_settings:
- type: workflow.type_settings.[%parent.type]
- label: 'Custom settings for workflow type'
states:
type: sequence
label: 'States'
@@ -49,3 +43,9 @@ workflows.workflow.*:
weight:
type: integer
label: 'Weight'
+ type:
+ type: string
+ label: 'Workflow type'
+ type_settings:
+ type: workflow.type_settings.[%parent.type]
+ label: 'Custom settings for workflow type'
diff --git a/core/profiles/minimal/config/install/block.block.stark_admin.yml b/core/profiles/minimal/config/install/block.block.stark_admin.yml
index d4deb18..5e114e9 100644
--- a/core/profiles/minimal/config/install/block.block.stark_admin.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_admin.yml
@@ -16,8 +16,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
visibility: { }
diff --git a/core/profiles/minimal/config/install/block.block.stark_branding.yml b/core/profiles/minimal/config/install/block.block.stark_branding.yml
index f340745..2a7faac 100644
--- a/core/profiles/minimal/config/install/block.block.stark_branding.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_branding.yml
@@ -14,8 +14,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/core/profiles/minimal/config/install/block.block.stark_local_actions.yml b/core/profiles/minimal/config/install/block.block.stark_local_actions.yml
index 66b19e6..7915dd7 100644
--- a/core/profiles/minimal/config/install/block.block.stark_local_actions.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_local_actions.yml
@@ -12,6 +12,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/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml b/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml
index df13219..b14bf21 100644
--- a/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_local_tasks.yml
@@ -12,8 +12,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/core/profiles/minimal/config/install/block.block.stark_login.yml b/core/profiles/minimal/config/install/block.block.stark_login.yml
index 2e4178c..080fc2f 100644
--- a/core/profiles/minimal/config/install/block.block.stark_login.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_login.yml
@@ -14,6 +14,6 @@ plugin: user_login_block
settings:
id: user_login_block
label: 'User login'
- provider: user
label_display: visible
+ provider: user
visibility: { }
diff --git a/core/profiles/minimal/config/install/block.block.stark_messages.yml b/core/profiles/minimal/config/install/block.block.stark_messages.yml
index 085f7ee..9f7b8c4 100644
--- a/core/profiles/minimal/config/install/block.block.stark_messages.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_messages.yml
@@ -14,6 +14,6 @@ plugin: system_messages_block
settings:
id: system_messages_block
label: 'Status messages'
- provider: system
label_display: '0'
+ provider: system
visibility: { }
diff --git a/core/profiles/minimal/config/install/block.block.stark_page_title.yml b/core/profiles/minimal/config/install/block.block.stark_page_title.yml
index d5fe87c..7b7f098 100644
--- a/core/profiles/minimal/config/install/block.block.stark_page_title.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_page_title.yml
@@ -12,6 +12,6 @@ plugin: page_title_block
settings:
id: page_title_block
label: 'Page title'
- provider: core
label_display: '0'
+ provider: core
visibility: { }
diff --git a/core/profiles/minimal/config/install/block.block.stark_tools.yml b/core/profiles/minimal/config/install/block.block.stark_tools.yml
index 2b6d1d5..97f09f2 100644
--- a/core/profiles/minimal/config/install/block.block.stark_tools.yml
+++ b/core/profiles/minimal/config/install/block.block.stark_tools.yml
@@ -16,8 +16,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
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
index 93cadc8..d660b36 100644
--- a/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_account_menu.yml
@@ -16,8 +16,8 @@ plugin: 'system_menu_block:account'
settings:
id: 'system_menu_block:account'
label: 'User account menu'
- provider: system
label_display: '0'
+ provider: system
level: 1
depth: 1
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_branding.yml b/core/profiles/standard/config/install/block.block.bartik_branding.yml
index 6cf70a7..2846213 100644
--- a/core/profiles/standard/config/install/block.block.bartik_branding.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_branding.yml
@@ -14,8 +14,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/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml
index bce3d01..5d036c5 100644
--- a/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_breadcrumbs.yml
@@ -14,6 +14,6 @@ plugin: system_breadcrumb_block
settings:
id: system_breadcrumb_block
label: Breadcrumbs
- provider: system
label_display: '0'
+ provider: system
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_content.yml b/core/profiles/standard/config/install/block.block.bartik_content.yml
index b1e0c80..007a65b 100644
--- a/core/profiles/standard/config/install/block.block.bartik_content.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_content.yml
@@ -14,6 +14,6 @@ plugin: system_main_block
settings:
id: system_main_block
label: 'Main page content'
- provider: system
label_display: '0'
+ provider: system
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_footer.yml b/core/profiles/standard/config/install/block.block.bartik_footer.yml
index a8623d1..49cb4ad 100644
--- a/core/profiles/standard/config/install/block.block.bartik_footer.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_footer.yml
@@ -16,8 +16,8 @@ plugin: 'system_menu_block:footer'
settings:
id: 'system_menu_block:footer'
label: 'Footer menu'
- provider: system
label_display: '0'
+ provider: system
level: 1
depth: 0
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_help.yml b/core/profiles/standard/config/install/block.block.bartik_help.yml
index cf344d3..9d52ab4 100644
--- a/core/profiles/standard/config/install/block.block.bartik_help.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_help.yml
@@ -14,6 +14,6 @@ plugin: help_block
settings:
id: help_block
label: Help
- provider: help
label_display: '0'
+ provider: help
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml b/core/profiles/standard/config/install/block.block.bartik_local_actions.yml
index a58496d..cd2e4e2 100644
--- a/core/profiles/standard/config/install/block.block.bartik_local_actions.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_local_actions.yml
@@ -12,6 +12,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/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml b/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml
index 6b7c5d3..11d5665 100644
--- a/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_local_tasks.yml
@@ -12,8 +12,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/core/profiles/standard/config/install/block.block.bartik_main_menu.yml b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
index dc7ebec..19129d7 100644
--- a/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_main_menu.yml
@@ -16,8 +16,8 @@ plugin: 'system_menu_block:main'
settings:
id: 'system_menu_block:main'
label: 'Main navigation'
- provider: system
label_display: '0'
+ provider: system
level: 1
depth: 1
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_messages.yml b/core/profiles/standard/config/install/block.block.bartik_messages.yml
index e6bb7d7..f5d3cc2 100644
--- a/core/profiles/standard/config/install/block.block.bartik_messages.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_messages.yml
@@ -14,6 +14,6 @@ plugin: system_messages_block
settings:
id: system_messages_block
label: 'Status messages'
- provider: system
label_display: '0'
+ provider: system
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_page_title.yml b/core/profiles/standard/config/install/block.block.bartik_page_title.yml
index 21cfb2f..26eadb6 100644
--- a/core/profiles/standard/config/install/block.block.bartik_page_title.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_page_title.yml
@@ -12,6 +12,6 @@ plugin: page_title_block
settings:
id: page_title_block
label: 'Page title'
- provider: core
label_display: '0'
+ provider: core
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_powered.yml b/core/profiles/standard/config/install/block.block.bartik_powered.yml
index bb74cc8..447b926 100644
--- a/core/profiles/standard/config/install/block.block.bartik_powered.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_powered.yml
@@ -14,6 +14,6 @@ plugin: system_powered_by_block
settings:
id: system_powered_by_block
label: 'Powered by Drupal'
- provider: system
label_display: '0'
+ provider: system
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_search.yml b/core/profiles/standard/config/install/block.block.bartik_search.yml
index 90b81cb..ba96189 100644
--- a/core/profiles/standard/config/install/block.block.bartik_search.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_search.yml
@@ -14,6 +14,6 @@ plugin: search_form_block
settings:
id: search_form_block
label: Search
- provider: search
label_display: visible
+ provider: search
visibility: { }
diff --git a/core/profiles/standard/config/install/block.block.bartik_tools.yml b/core/profiles/standard/config/install/block.block.bartik_tools.yml
index 5a2aae5..710a568 100644
--- a/core/profiles/standard/config/install/block.block.bartik_tools.yml
+++ b/core/profiles/standard/config/install/block.block.bartik_tools.yml
@@ -16,8 +16,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
visibility: { }
diff --git a/core/profiles/standard/config/install/field.field.node.article.comment.yml b/core/profiles/standard/config/install/field.field.node.article.comment.yml
index 59218f0..7d37219 100644
--- a/core/profiles/standard/config/install/field.field.node.article.comment.yml
+++ b/core/profiles/standard/config/install/field.field.node.article.comment.yml
@@ -18,15 +18,15 @@ default_value:
-
status: 2
cid: 0
- last_comment_name: null
last_comment_timestamp: 0
+ last_comment_name: null
last_comment_uid: 0
comment_count: 0
default_value_callback: ''
settings:
default_mode: 1
per_page: 50
- form_location: true
anonymous: 0
+ form_location: true
preview: 1
field_type: comment
diff --git a/core/profiles/standard/config/install/field.field.node.article.field_image.yml b/core/profiles/standard/config/install/field.field.node.article.field_image.yml
index b4b1c14..ab7b994 100644
--- a/core/profiles/standard/config/install/field.field.node.article.field_image.yml
+++ b/core/profiles/standard/config/install/field.field.node.article.field_image.yml
@@ -17,14 +17,16 @@ translatable: true
default_value: { }
default_value_callback: ''
settings:
+ handler: 'default:file'
+ handler_settings: { }
file_directory: '[date:custom:Y]-[date:custom:m]'
file_extensions: 'png gif jpg jpeg'
max_filesize: ''
max_resolution: ''
min_resolution: ''
alt_field: true
- title_field: false
alt_field_required: true
+ title_field: false
title_field_required: false
default_image:
uuid: null
@@ -32,6 +34,4 @@ settings:
title: ''
width: null
height: null
- handler: 'default:file'
- handler_settings: { }
field_type: image
diff --git a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
index b2e61f6..4fc1e66 100644
--- a/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
+++ b/core/profiles/standard/config/install/field.field.user.user.user_picture.yml
@@ -17,21 +17,21 @@ translatable: true
default_value: { }
default_value_callback: ''
settings:
- file_extensions: 'png gif jpg jpeg'
+ handler: 'default:file'
+ handler_settings: { }
file_directory: 'pictures/[date:custom:Y]-[date:custom:m]'
+ file_extensions: 'png gif jpg jpeg'
max_filesize: '30 KB'
- alt_field: false
- title_field: false
max_resolution: 85x85
min_resolution: ''
+ alt_field: false
+ alt_field_required: false
+ title_field: false
+ title_field_required: false
default_image:
uuid: null
alt: ''
title: ''
width: null
height: null
- alt_field_required: false
- title_field_required: false
- handler: 'default:file'
- handler_settings: { }
field_type: image
diff --git a/core/profiles/standard/config/install/field.storage.node.field_image.yml b/core/profiles/standard/config/install/field.storage.node.field_image.yml
index e4da708..a6964d3 100644
--- a/core/profiles/standard/config/install/field.storage.node.field_image.yml
+++ b/core/profiles/standard/config/install/field.storage.node.field_image.yml
@@ -10,6 +10,9 @@ field_name: field_image
entity_type: node
type: image
settings:
+ target_type: file
+ display_field: false
+ display_default: false
uri_scheme: public
default_image:
uuid: null
@@ -17,9 +20,6 @@ settings:
title: ''
width: null
height: null
- target_type: file
- display_field: false
- display_default: false
module: image
locked: false
cardinality: 1
diff --git a/core/profiles/standard/config/install/field.storage.user.user_picture.yml b/core/profiles/standard/config/install/field.storage.user.user_picture.yml
index 8253628..6d0476d 100644
--- a/core/profiles/standard/config/install/field.storage.user.user_picture.yml
+++ b/core/profiles/standard/config/install/field.storage.user.user_picture.yml
@@ -10,6 +10,9 @@ field_name: user_picture
entity_type: user
type: image
settings:
+ target_type: file
+ display_field: false
+ display_default: false
uri_scheme: public
default_image:
uuid: null
@@ -17,9 +20,6 @@ settings:
title: ''
width: null
height: null
- target_type: file
- display_field: false
- display_default: false
module: image
locked: false
cardinality: 1
diff --git a/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml b/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml
index 6f90240..62f839b 100644
--- a/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml
+++ b/core/profiles/testing_config_overrides/config/install/tour.tour.language.yml
@@ -9,5 +9,5 @@ tips:
id: language-overview
plugin: text
label: Languages
- body: 'The "Languages" page allows you to add, edit, delete, and reorder languages for the site.
'
weight: 1
+ body: 'The "Languages" page allows you to add, edit, delete, and reorder languages for the site.
'
diff --git a/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml b/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml
index f0ef399..125266a 100644
--- a/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml
+++ b/core/profiles/testing_config_overrides/config/optional/tour.tour.testing_config_overrides.yml
@@ -9,5 +9,5 @@ tips:
id: language-overview
plugin: text
label: Languages
- body: 'The "Languages" page allows you to add, edit, delete, and reorder languages for the site.
'
weight: 1
+ body: 'The "Languages" page allows you to add, edit, delete, and reorder languages for the site.
'
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
index 2af8b74..cbc20cc 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
@@ -250,16 +250,16 @@ public function testDataTypes() {
$data = array(
'array' => array(),
'boolean' => TRUE,
- 'exp' => 1.2e+34,
'float' => 3.14159,
'float_as_integer' => (float) 1,
+ 'exp' => 1.2e+34,
'hex' => 0xC,
'int' => 99,
'octal' => 0775,
'string' => 'string',
'string_int' => '1',
);
- $data['_core']['default_config_hash'] = Crypt::hashBase64(serialize($data));
+ $data = ['_core' => ['default_config_hash' => Crypt::hashBase64(serialize($data))]] + $data;
$this->assertIdentical($config->get(), $data);
// Re-set each key using Config::set().
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
index 8a39d64..2ea8e4f 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php
@@ -353,23 +353,23 @@ public function testConfigSaveWithSchema() {
$untyped_to_typed = $untyped_values;
$typed_values = array(
- 'string' => '1',
- 'empty_string' => '',
- 'null_string' => NULL,
+ 'config_schema_test_integer' => 1,
+ 'config_schema_test_integer_empty_string' => NULL,
'integer' => 100,
'null_integer' => NULL,
+ 'float' => 3.14,
+ 'null_float' => NULL,
+ 'string' => '1',
+ 'null_string' => NULL,
+ 'empty_string' => '',
'boolean' => TRUE,
'no_type' => 1,
'mapping' => array(
'string' => '1'
),
- 'float' => 3.14,
- 'null_float' => NULL,
'sequence' => array (TRUE, FALSE, TRUE),
'sequence_bc' => array(TRUE, FALSE, TRUE),
'not_present_in_schema' => TRUE,
- 'config_schema_test_integer' => 1,
- 'config_schema_test_integer_empty_string' => NULL,
);
// Save config which has a schema that enforces types.
@@ -396,6 +396,24 @@ public function testConfigSaveWithSchema() {
}
/**
+ * Test configuration value data type enforcement using schemas.
+ */
+ public function testConfigSaveMappingSort() {
+ // Top level map sorting.
+ $data = [
+ 'foo' => '1',
+ 'bar' => '2',
+ ];
+ // Save config which has a schema that enforces types.
+ $this->config('config_schema_test.schema_mapping_sort')
+ ->setData($data)
+ ->save();
+ $this->assertSame(['bar' => '2', 'foo' => '1'], $this->config('config_schema_test.schema_mapping_sort')->get());
+ $this->config('config_schema_test.schema_mapping_sort')->set('map', ['sub_bar' => '2', 'sub_foo' => '1'])->save();
+ $this->assertSame(['sub_foo' => '1', 'sub_bar' => '2'], $this->config('config_schema_test.schema_mapping_sort')->get('map'));
+ }
+
+ /**
* Tests fallback to a greedy wildcard.
*/
function testSchemaFallback() {
@@ -522,9 +540,9 @@ public function testConfigSaveWithWrappingSchema() {
$typed_values = [
'tests' => [
[
- 'wrapper_value' => 'foo',
'plugin_id' => 'wrapper:foo',
'internal_value' => '100',
+ 'wrapper_value' => 'foo',
],
],
];
@@ -557,10 +575,10 @@ public function testConfigSaveWithWrappingSchemaDoubleBrackets() {
$typed_values = [
'tests' => [
[
- 'wrapper_value' => 'foo',
+ 'another_key' => 100,
'foo' => 'turtle',
'bar' => 'horse',
- 'another_key' => 100,
+ 'wrapper_value' => 'foo',
],
],
];
@@ -591,10 +609,10 @@ public function testConfigSaveWithWrappingSchemaDoubleBrackets() {
$typed_values = [
'tests' => [
[
- 'wrapper_value' => 'foo',
+ 'another_key' => '100',
'foo' => 'cat',
'bar' => 'dog',
- 'another_key' => '100',
+ 'wrapper_value' => 'foo',
],
],
];