diff --git a/core/modules/entity_reference/config/schema/entity_reference.schema.yml b/core/modules/entity_reference/config/schema/entity_reference.schema.yml index 423dbc3..4357074 100644 --- a/core/modules/entity_reference/config/schema/entity_reference.schema.yml +++ b/core/modules/entity_reference/config/schema/entity_reference.schema.yml @@ -2,11 +2,14 @@ field.entity_reference.settings: type: mapping - label: 'Settings' + label: 'Entity reference settings' mapping: target_type: type: string label: 'Type of item to reference' + target_bundle: + type: string + label: 'Budle of item to reference' field.entity_reference.instance_settings: type: mapping diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml index 0fb20de..66c1cd5 100644 --- a/core/modules/file/config/schema/file.schema.yml +++ b/core/modules/file/config/schema/file.schema.yml @@ -23,7 +23,7 @@ file.settings: label: 'Directory' field.file.settings: - type: mapping + type: field.entity_reference.settings label: 'File settings' mapping: display_field: @@ -43,10 +43,12 @@ field.file.value: - type: string label: 'Value' -field.file.instance_settings: +base_file_field_instance_settings: type: mapping - label: 'File settings' mapping: + handler: + type: string + label: 'Reference method' file_directory: type: string label: 'File directory' @@ -56,6 +58,11 @@ field.file.instance_settings: max_filesize: type: string label: 'Maximum upload size' + +field.file.instance_settings: + type: base_file_field_instance_settings + label: 'File settings' + mapping: description_field: type: boolean label: 'Enable Description field' diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml index 2d139a3..4f1fc79 100644 --- a/core/modules/image/config/schema/image.schema.yml +++ b/core/modules/image/config/schema/image.schema.yml @@ -73,41 +73,17 @@ image.settings: label: 'Suppress the itok query string for image derivatives' field.image.settings: - type: mapping + type: field.file.settings label: 'Image settings' mapping: - uri_scheme: - type: string - label: 'Upload destination' default_image: type: field_default_image label: 'Default value' - target_type: - type: string - label: 'Target type' - display_field: - type: boolean - label: 'Display field' - display_default: - type: boolean - label: 'Displayed by default' - target_bundle: - type: string - label: 'Target bundle' field.image.instance_settings: - type: mapping + type: base_file_field_instance_settings label: 'Image settings' mapping: - file_directory: - type: string - label: 'Upload destination' - file_extensions: - type: string - label: 'Allowed file extensions' - max_filesize: - type: string - label: 'Maximum upload size' max_resolution: type: string label: 'Maximum image resolution' @@ -129,9 +105,6 @@ field.image.instance_settings: default_image: type: field_default_image label: 'Default value' - handler: - type: string - label: 'Handler' field.image.value: type: sequence diff --git a/core/modules/taxonomy/config/schema/taxonomy.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.schema.yml index 9ca7666..5e4a22e 100644 --- a/core/modules/taxonomy/config/schema/taxonomy.schema.yml +++ b/core/modules/taxonomy/config/schema/taxonomy.schema.yml @@ -35,7 +35,7 @@ taxonomy.vocabulary.*: label: 'Weight' field.taxonomy_term_reference.settings: - type: mapping + type: field.entity_reference.settings label: 'Taxonomy term reference settings' mapping: options_list_callback: @@ -54,19 +54,14 @@ field.taxonomy_term_reference.settings: parent: type: integer value: 'Parent' - target_type: - type: string - label: 'Target type' - target_bundle: - type: string - label: 'Target bundle' field.taxonomy_term_reference.instance_settings: - type: sequence + type: mapping label: 'Taxonomy term reference settings' - sequence: - - type: string - label: 'Setting' + mapping: + handler: + type: string + label: 'Reference method' field.taxonomy_term_reference.value: type: sequence