diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml index 4283543..08f0162 100644 --- a/core/config/schema/core.data_types.schema.yml +++ b/core/config/schema/core.data_types.schema.yml @@ -414,9 +414,15 @@ core.date_format.*: type: string label: 'Default language' +# Generic field settings schemas. + +field.storage_settings.*: + type: sequence + label: 'Settings' + # Schema for the configuration of the String field type. -field.string.storage_settings: +field.storage_settings.string: type: mapping label: 'String settings' mapping: @@ -441,8 +447,8 @@ field.string.value: # Schema for the configuration of the String (long) field type. -field.string_long.storage_settings: - type: field.string.storage_settings +field.storage_settings.string_long: + type: field.storage_settings.string label: 'String (long) settings' field.string_long.field_settings: @@ -462,7 +468,7 @@ field.string_long.value: # Schema for the configuration of the URI field type. -field.uri.storage_settings: +field.storage_settings.uri: type: mapping label: 'URI settings' mapping: @@ -487,7 +493,7 @@ field.uri.value: # Schema for the configuration of the Created field type. -field.created.storage_settings: +field.storage_settings.created: type: sequence label: 'Created timestamp settings' @@ -508,7 +514,7 @@ field.created.value: # Schema for the configuration of the Changed field type. -field.changed.storage_settings: +field.storage_settings.changed: type: sequence label: 'Changed timestamp settings' @@ -529,7 +535,7 @@ field.changed.value: # Schema for the configuration of the Entity reference field type. -field.entity_reference.storage_settings: +field.storage_settings.entity_reference: type: mapping label: 'Entity reference settings' mapping: @@ -561,7 +567,7 @@ field.entity_reference.value: # Schema for the configuration of the Boolean field type. -field.boolean.storage_settings: +field.storage_settings.boolean: type: mapping label: 'Boolean settings' mapping: @@ -589,7 +595,7 @@ field.boolean.value: # Schema for the configuration of the Email field type. -field.email.storage_settings: +field.storage_settings.email: type: sequence label: 'Email settings' sequence: @@ -615,7 +621,7 @@ field.email.value: # Schema for the configuration of the Integer field type. -field.integer.storage_settings: +field.storage_settings.integer: type: sequence label: 'Integer settings' sequence: @@ -655,7 +661,7 @@ field.integer.value: # Schema for the configuration of the Decimal field type. -field.decimal.storage_settings: +field.storage_settings.decimal: type: mapping label: 'Decimal settings' mapping: @@ -696,7 +702,7 @@ field.decimal.value: # Schema for the configuration of the Float field type. -field.float.storage_settings: +field.storage_settings.float: type: sequence label: 'Float settings' sequence: diff --git a/core/modules/comment/config/schema/comment.schema.yml b/core/modules/comment/config/schema/comment.schema.yml index b5bcd86..9ffe3de 100644 --- a/core/modules/comment/config/schema/comment.schema.yml +++ b/core/modules/comment/config/schema/comment.schema.yml @@ -60,7 +60,7 @@ comment.type.*: type: text label: 'Description' -field.comment.storage_settings: +field.storage_settings.comment: type: sequence label: 'Settings' sequence: diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml index 58e4cc6..02eaf19 100644 --- a/core/modules/datetime/config/schema/datetime.schema.yml +++ b/core/modules/datetime/config/schema/datetime.schema.yml @@ -1,6 +1,6 @@ # Schema for the configuration files of the Datetime module. -field.datetime.storage_settings: +field.storage_settings.datetim: type: mapping label: 'Datetime settings' mapping: diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml index 862f40a..b47cf07 100644 --- a/core/modules/field/config/schema/field.schema.yml +++ b/core/modules/field/config/schema/field.schema.yml @@ -25,7 +25,7 @@ field.storage.*.*: type: string label: 'Type' settings: - type: field.[%parent.type].storage_settings + type: field.storage_settings.[%parent.type] module: type: string label: 'Module' diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml index cd21f38..4f8644a 100644 --- a/core/modules/file/config/schema/file.schema.yml +++ b/core/modules/file/config/schema/file.schema.yml @@ -22,7 +22,7 @@ file.settings: type: path label: 'Directory' -field.file.storage_settings: +field.storage_settings.file: type: base_entity_reference_field_settings label: 'File settings' mapping: diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml index f0db0d5..b3cae62 100644 --- a/core/modules/image/config/schema/image.schema.yml +++ b/core/modules/image/config/schema/image.schema.yml @@ -77,8 +77,8 @@ image.settings: type: boolean label: 'Suppress the itok query string for image derivatives' -field.image.storage_settings: - type: field.file.storage_settings +field.storage_settings.image: + type: field.storage_settings.file label: 'Image settings' mapping: default_image: diff --git a/core/modules/options/config/schema/options.schema.yml b/core/modules/options/config/schema/options.schema.yml index 03cb81f..7dd5f6d 100644 --- a/core/modules/options/config/schema/options.schema.yml +++ b/core/modules/options/config/schema/options.schema.yml @@ -1,6 +1,6 @@ # Schema for the configuration files of the Options module. -field.list_integer.storage_settings: +field.storage_settings.list_integer: type: mapping label: 'List (integer) settings' mapping: @@ -23,8 +23,7 @@ field.list_integer.storage_settings: field.list_integer.field_settings: label: 'List (integer)' - type: mapping - mapping: { } + type: sequence field.list_integer.value: type: sequence @@ -37,7 +36,7 @@ field.list_integer.value: type: integer label: 'Value' -field.list_float.storage_settings: +field.storage_settings.list_float: type: mapping label: 'List (float) settings' mapping: @@ -60,8 +59,7 @@ field.list_float.storage_settings: field.list_float.field_settings: label: 'List (float)' - type: mapping - mapping: { } + type: sequence field.list_float.value: type: sequence @@ -74,7 +72,7 @@ field.list_float.value: type: string label: 'Value' -field.list_string.storage_settings: +field.storage_settings.list_string: type: mapping label: 'List (text) settings' mapping: @@ -97,8 +95,7 @@ field.list_string.storage_settings: field.list_string.field_settings: label: 'List (float)' - type: mapping - mapping: { } + type: sequence field.list_string.value: type: sequence diff --git a/core/modules/taxonomy/config/schema/taxonomy.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.schema.yml index 579f673..dc6c8e6 100644 --- a/core/modules/taxonomy/config/schema/taxonomy.schema.yml +++ b/core/modules/taxonomy/config/schema/taxonomy.schema.yml @@ -39,7 +39,7 @@ taxonomy.vocabulary.*: sequence: - type: taxonomy.vocabulary.third_party.[%key] -field.taxonomy_term_reference.storage_settings: +field.storage_settings.taxonomy_term_reference: type: base_entity_reference_field_settings label: 'Taxonomy term reference settings' mapping: diff --git a/core/modules/text/config/schema/text.schema.yml b/core/modules/text/config/schema/text.schema.yml index f472aec..36fe3cd 100644 --- a/core/modules/text/config/schema/text.schema.yml +++ b/core/modules/text/config/schema/text.schema.yml @@ -8,7 +8,7 @@ text.settings: type: integer label: 'Default summary length' -field.text.storage_settings: +field.storage_settings.text: type: mapping label: 'Text (formatted) settings' mapping: @@ -19,8 +19,6 @@ field.text.storage_settings: field.text.field_settings: type: mapping label: 'Text (formatted) settings' - sequence: - - type: string field.text.value: type: sequence @@ -36,15 +34,13 @@ field.text.value: type: string label: 'Text format' -field.text_long.storage_settings: +field.storage_settings.text_long: label: 'Text (formatted, long) settings' - type: mapping - mapping: { } + type: sequence field.text_long.field_settings: label: 'Text (formatted, long) settings' - type: mapping - mapping: { } + type: sequence field.text_long.value: type: sequence @@ -60,10 +56,9 @@ field.text_long.value: type: string label: 'Text format' -field.text_with_summary.storage_settings: +field.storage_settings.text_with_summary: label: 'Text (formatted, long, with summary) settings' - type: mapping - mapping: { } + type: sequence field.text_with_summary.field_settings: type: mapping