diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml index 08f0162..f5124e3 100644 --- a/core/config/schema/core.data_types.schema.yml +++ b/core/config/schema/core.data_types.schema.yml @@ -380,7 +380,7 @@ field_config_base: type: string label: 'Default value callback' settings: - type: field.[%parent.field_type].field_settings + type: field.field_settings.[%parent.field_type] third_party_settings: type: sequence label: 'Third party settings' @@ -420,6 +420,10 @@ field.storage_settings.*: type: sequence label: 'Settings' +field.field_settings.*: + type: sequence + label: 'Settings' + # Schema for the configuration of the String field type. field.storage_settings.string: @@ -430,7 +434,7 @@ field.storage_settings.string: type: integer label: 'Maximum length' -field.string.field_settings: +field.field_settings.string: type: sequence label: 'String settings' @@ -451,7 +455,7 @@ field.storage_settings.string_long: type: field.storage_settings.string label: 'String (long) settings' -field.string_long.field_settings: +field.field_settings.string_long: type: field.string.field_settings label: 'String (long) settings' @@ -476,7 +480,7 @@ field.storage_settings.uri: type: integer label: 'Maximum length' -field.uri.field_settings: +field.field_settings.uri: type: sequence label: 'URI settings' @@ -497,7 +501,7 @@ field.storage_settings.created: type: sequence label: 'Created timestamp settings' -field.created.field_settings: +field.field_settings.created: type: sequence label: 'Created timestamp settings' @@ -518,7 +522,7 @@ field.storage_settings.changed: type: sequence label: 'Changed timestamp settings' -field.changed.field_settings: +field.field_settings.changed: type: sequence label: 'Changed timestamp settings' @@ -543,7 +547,7 @@ field.storage_settings.entity_reference: type: string label: 'Type of item to reference' -field.entity_reference.field_settings: +field.field_settings.entity_reference: type: mapping label: 'Entity reference settings' mapping: @@ -578,7 +582,7 @@ field.storage_settings.boolean: type: string label: 'Off label' -field.boolean.field_settings: +field.field_settings.boolean: label: 'Boolean settings' type: sequence @@ -601,7 +605,7 @@ field.storage_settings.email: sequence: - type: string -field.email.field_settings: +field.field_settings.email: type: sequence label: 'Email settings' sequence: @@ -628,9 +632,9 @@ field.storage_settings.integer: - type: string label: 'setting' -field.integer.field_settings: +field.field_settings.integer: type: mapping - label: 'Integer' + label: 'Integer settings' mapping: min: type: integer @@ -672,9 +676,9 @@ field.storage_settings.decimal: type: integer label: 'Scale' -field.decimal.field_settings: +field.field_settings.decimal: type: mapping - label: 'Decimal' + label: 'Decimal settings' mapping: min: type: float @@ -709,9 +713,9 @@ field.storage_settings.float: - type: string label: 'setting' -field.float.field_settings: +field.field_settings.float: type: mapping - label: 'Float' + label: 'Float settings ' mapping: min: type: float diff --git a/core/modules/comment/config/schema/comment.schema.yml b/core/modules/comment/config/schema/comment.schema.yml index 9ffe3de..0851a31 100644 --- a/core/modules/comment/config/schema/comment.schema.yml +++ b/core/modules/comment/config/schema/comment.schema.yml @@ -93,7 +93,7 @@ field.comment.value: type: integer label: 'Count' -field.comment.field_settings: +field.field_settings.comment: type: mapping label: 'Comment settings' mapping: diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml index 68acbda..95a6204 100644 --- a/core/modules/datetime/config/schema/datetime.schema.yml +++ b/core/modules/datetime/config/schema/datetime.schema.yml @@ -8,11 +8,9 @@ field.storage_settings.datetime: type: string label: 'Date type' -field.datetime.field_settings: +field.field_settings.datetime: type: sequence - label: 'Settings' - sequence: - - type: string + label: 'Datetime settings' field.datetime.value: type: sequence diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml index 4f8644a..5200145 100644 --- a/core/modules/file/config/schema/file.schema.yml +++ b/core/modules/file/config/schema/file.schema.yml @@ -59,7 +59,7 @@ base_file_field_field_settings: type: string label: 'Maximum upload size' -field.file.field_settings: +field.field_settings.file: type: base_file_field_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 b3cae62..e9e4862 100644 --- a/core/modules/image/config/schema/image.schema.yml +++ b/core/modules/image/config/schema/image.schema.yml @@ -85,7 +85,7 @@ field.storage_settings.image: type: field_default_image label: 'Default value' -field.image.field_settings: +field.field_settings.image: type: base_file_field_field_settings label: 'Image settings' mapping: diff --git a/core/modules/options/config/schema/options.schema.yml b/core/modules/options/config/schema/options.schema.yml index 7dd5f6d..04475f1 100644 --- a/core/modules/options/config/schema/options.schema.yml +++ b/core/modules/options/config/schema/options.schema.yml @@ -21,8 +21,8 @@ field.storage_settings.list_integer: type: string label: 'Allowed values function' -field.list_integer.field_settings: - label: 'List (integer)' +field.field_settings.list_integer: + label: 'List (integer) settings' type: sequence field.list_integer.value: @@ -57,8 +57,8 @@ field.storage_settings.list_float: type: string label: 'Allowed values function' -field.list_float.field_settings: - label: 'List (float)' +field.field_settings.list_float: + label: 'List (float) settings' type: sequence field.list_float.value: @@ -93,8 +93,8 @@ field.storage_settings.list_string: type: string label: 'Allowed values function' -field.list_string.field_settings: - label: 'List (float)' +field.field_settings.list_string: + label: 'List (text) settings' type: sequence field.list_string.value: diff --git a/core/modules/taxonomy/config/schema/taxonomy.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.schema.yml index dc6c8e6..bd36c68 100644 --- a/core/modules/taxonomy/config/schema/taxonomy.schema.yml +++ b/core/modules/taxonomy/config/schema/taxonomy.schema.yml @@ -60,7 +60,7 @@ field.storage_settings.taxonomy_term_reference: type: integer value: 'Parent' -field.taxonomy_term_reference.field_settings: +field.field_settings.taxonomy_term_reference: type: mapping 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 36fe3cd..60911c3 100644 --- a/core/modules/text/config/schema/text.schema.yml +++ b/core/modules/text/config/schema/text.schema.yml @@ -16,8 +16,8 @@ field.storage_settings.text: type: integer label: 'Maximum length' -field.text.field_settings: - type: mapping +field.field_settings.text: + type: sequence label: 'Text (formatted) settings' field.text.value: @@ -38,7 +38,7 @@ field.storage_settings.text_long: label: 'Text (formatted, long) settings' type: sequence -field.text_long.field_settings: +field.field_settings.text_long: label: 'Text (formatted, long) settings' type: sequence @@ -60,7 +60,7 @@ field.storage_settings.text_with_summary: label: 'Text (formatted, long, with summary) settings' type: sequence -field.text_with_summary.field_settings: +field.field_settings.text_with_summary: type: mapping label: 'Text (formatted, long, with summary) settings' mapping: