diff --git a/core/config/schema/core.entity.data_types.schema.yml b/core/config/schema/core.entity.data_types.schema.yml deleted file mode 100644 index 36e59fb..0000000 --- a/core/config/schema/core.entity.data_types.schema.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Schema for entity fields, specifying generic component data type information. - -# Schema for the base of the view mode display format settings. -entity_field_view_display_base: - type: mapping - mapping: - type: - type: string - label: 'Format type machine name' - weight: - type: integer - label: 'Weight' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: entity_view_display.third_party.[%key] - label: - type: string - label: 'Label setting machine name' - settings: - type: sequence - label: 'Settings' - -# Schema for the base of the form mode display format settings. -entity_field_form_display_base: - type: mapping - mapping: - type: - type: string - label: 'Format type machine name' - weight: - type: integer - label: 'Weight' - third_party_settings: - type: sequence - label: 'Third party settings' - sequence: - - type: entity_form_display.third_party.[%key] - settings: - type: sequence - label: 'Settings' diff --git a/core/config/schema/core.entity.schema.yml b/core/config/schema/core.entity.schema.yml index 06a4215..ebf6708 100644 --- a/core/config/schema/core.entity.schema.yml +++ b/core/config/schema/core.entity.schema.yml @@ -70,7 +70,26 @@ core.entity_view_display.*.*.*: type: sequence label: 'Field display formatters' sequence: - - type: entity_view_display.field.[type] + - type: mapping + label: 'Field formatter' + mapping: + type: + type: string + label: 'Format type machine name' + weight: + type: integer + label: 'Weight' + third_party_settings: + type: sequence + label: 'Third party settings' + sequence: + - type: entity_view_display.third_party.[%key] + label: + type: string + label: 'Label setting machine name' + settings: + type: entity_view_display.field.[%parent.type] + label: 'Settings' hidden: type: sequence label: 'Field display setting' @@ -107,7 +126,23 @@ core.entity_form_display.*.*.*: type: sequence label: 'Field display formatters' sequence: - - type: entity_form_display.field.[type] + - type: mapping + label: 'Field formatter' + mapping: + type: + type: string + label: 'Format type machine name' + weight: + type: integer + label: 'Weight' + third_party_settings: + type: sequence + label: 'Third party settings' + sequence: + - type: entity_form_display.third_party.[%key] + settings: + type: entity_form_display.field.[%parent.type] + label: 'Settings' hidden: type: sequence label: 'Hidden' @@ -122,144 +157,110 @@ core.entity_form_display.*.*.*: # Default schema for entity display field with undefined type. entity_view_display.field.*: - type: entity_field_view_display_base - label: 'Entity display default' + type: mapping # Default schema for entity form display field with undefined type. entity_form_display.field.*: - type: entity_field_form_display_base - label: 'Entity form display default' + type: mapping entity_form_display.field.string_textfield: - type: entity_field_form_display_base + type: mapping label: 'Text field display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - size: - type: integer - label: 'Size of textfield' - placeholder: - type: label - label: 'Placeholder' + size: + type: integer + label: 'Size of textfield' + placeholder: + type: label + label: 'Placeholder' entity_form_display.field.string_textarea: - type: entity_field_form_display_base + type: mapping label: 'Textarea display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - rows: - type: integer - label: 'Rows' - placeholder: - type: label - label: 'Placeholder' + rows: + type: integer + label: 'Rows' + placeholder: + type: label + label: 'Placeholder' entity_form_display.field.email_default: - type: entity_field_form_display_base + type: mapping label: 'Email field display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - placeholder: - type: label - label: 'Placeholder' + placeholder: + type: label + label: 'Placeholder' entity_form_display.field.datetime_timestamp: - type: entity_field_form_display_base + type: mapping label: 'Datetime timestamp display format settings' entity_form_display.field.boolean_checkbox: - type: entity_field_form_display_base + type: mapping label: 'Boolean checkbox display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - display_label: - type: boolean - label: 'Display label' + display_label: + type: boolean + label: 'Display label' entity_form_display.field.hidden: - type: entity_field_form_display_base + type: mapping label: '- Hidden - format settings' entity_form_display.field.number: - type: entity_field_form_display_base + type: mapping label: 'Number default display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - placeholder: - type: label - label: 'Placeholder' + placeholder: + type: label + label: 'Placeholder' entity_form_display.field.checkbox: - type: entity_field_form_display_base + type: mapping label: 'Single on/off checkbox format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - display_label: - type: boolean - label: 'Use field label instead of the "On value" as label' + display_label: + type: boolean + label: 'Use field label instead of the "On value" as label' entity_view_display.field.number_decimal: - type: entity_field_view_display_base + type: mapping label: 'Number decimal display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - thousand_separator: - type: string - label: 'Thousand marker' - decimal_separator: - type: string - label: 'Decimal marker' - scale: - type: integer - label: 'Scale' - prefix_suffix: - type: boolean - label: 'Display prefix and suffix.' + thousand_separator: + type: string + label: 'Thousand marker' + decimal_separator: + type: string + label: 'Decimal marker' + scale: + type: integer + label: 'Scale' + prefix_suffix: + type: boolean + label: 'Display prefix and suffix.' entity_view_display.field.number_integer: - type: entity_field_view_display_base + type: mapping label: 'Number interger display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - thousand_separator: - type: string - label: 'Thousand marker' - prefix_suffix: - type: boolean - label: 'Display prefix and suffix.' + thousand_separator: + type: string + label: 'Thousand marker' + prefix_suffix: + type: boolean + label: 'Display prefix and suffix.' entity_view_display.field.number_unformatted: - type: entity_field_view_display_base + type: mapping label: 'Number unformatted display format settings' entity_view_display.field.uri_link: - type: entity_field_view_display_base + type: mapping label: 'URI as link display format settings' entity_view_display.field.timestamp_ago: - type: entity_field_view_display_base + type: mapping label: 'Timestamp ago display format settings' diff --git a/core/modules/comment/config/schema/comment.schema.yml b/core/modules/comment/config/schema/comment.schema.yml index 8b8c6a3..48acb67 100644 --- a/core/modules/comment/config/schema/comment.schema.yml +++ b/core/modules/comment/config/schema/comment.schema.yml @@ -1,19 +1,15 @@ # Schema for the configuration files of the Comment module. entity_view_display.field.comment_default: - type: entity_field_view_display_base + type: mapping label: 'Comment display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - pager_id: - type: integer - label: 'Pager ID' + pager_id: + type: integer + label: 'Pager ID' entity_form_display.field.comment_default: - type: entity_field_form_display_base + type: mapping label: 'Comment display format settings' action.configuration.comment_publish_action: diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml index 3086164..fd48148 100644 --- a/core/modules/datetime/config/schema/datetime.schema.yml +++ b/core/modules/datetime/config/schema/datetime.schema.yml @@ -27,39 +27,31 @@ field.datetime.value: label: 'Value' entity_view_display.field.datetime_default: - type: entity_field_view_display_base + type: mapping label: 'Datetime default display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - format_type: - type: string - label: 'Date format' + format_type: + type: string + label: 'Date format' entity_view_display.field.datetime_plain: - type: entity_field_view_display_base + type: mapping label: 'Datetime plain display format settings' entity_form_display.field.datetime_datelist: - type: entity_field_form_display_base + type: mapping label: 'Datetime select list display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - increment: - type: integer - label: 'Time increments' - date_order: - type: string - label: 'Date part order' - time_type: - type: string - label: 'Time type' + increment: + type: integer + label: 'Time increments' + date_order: + type: string + label: 'Date part order' + time_type: + type: string + label: 'Time type' entity_form_display.field.datetime_default: - type: entity_field_form_display_base + type: mapping label: 'Datetime default display format settings' 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 22561c9..5e058b4 100644 --- a/core/modules/entity_reference/config/schema/entity_reference.schema.yml +++ b/core/modules/entity_reference/config/schema/entity_reference.schema.yml @@ -38,74 +38,58 @@ entity_reference.default.handler_settings: label: 'Create referenced entities if they don''t already exist' entity_view_display.field.entity_reference_entity_view: - type: entity_field_view_display_base + type: mapping label: 'Entity reference rendered entity display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - view_mode: - type: string - label: 'View mode' - link: - type: boolean - label: 'Show links' + view_mode: + type: string + label: 'View mode' + link: + type: boolean + label: 'Show links' entity_view_display.field.entity_reference_entity_id: - type: entity_field_view_display_base + type: mapping label: 'Entity reference entity ID display format settings' entity_view_display.field.entity_reference_label: - type: entity_field_view_display_base + type: mapping label: 'Entity reference label display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - link: - type: boolean - label: 'Link label to the referenced entity' + link: + type: boolean + label: 'Link label to the referenced entity' entity_form_display.field.entity_reference_autocomplete_tags: - type: entity_field_form_display_base + type: mapping label: 'Entity reference autocomplete (Tags style) display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - match_operator: - type: string - label: 'Autocomplete matching' - size: - type: integer - label: 'Size of textfield' - autocomplete_type: - type: string - label: 'Autocomplete type' - placeholder: - type: label - label: 'Placeholder' + match_operator: + type: string + label: 'Autocomplete matching' + size: + type: integer + label: 'Size of textfield' + autocomplete_type: + type: string + label: 'Autocomplete type' + placeholder: + type: label + label: 'Placeholder' entity_form_display.field.entity_reference_autocomplete: - type: entity_field_form_display_base + type: mapping label: 'Entity reference autocomplete display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - match_operator: - type: string - label: 'Autocomplete matching' - size: - type: integer - label: 'Size of textfield' - autocomplete_type: - type: string - label: 'Autocomplete type' - placeholder: - type: label - label: 'Placeholder' + match_operator: + type: string + label: 'Autocomplete matching' + size: + type: integer + label: 'Size of textfield' + autocomplete_type: + type: string + label: 'Autocomplete type' + placeholder: + type: label + label: 'Placeholder' diff --git a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml index bc1661e..a5896b2 100644 --- a/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml +++ b/core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml @@ -1,26 +1,18 @@ entity_view_display.field.field_test_multiple: - type: entity_field_view_display_base + type: mapping label: 'field_test display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - test_formatter_setting_multiple: - type: string - label: 'Test setting' - alter: - type: boolean - label: 'Test altering' + test_formatter_setting_multiple: + type: string + label: 'Test setting' + alter: + type: boolean + label: 'Test altering' entity_form_display.field.test_field_widget_multiple: - type: entity_field_form_display_base + type: mapping label: 'field_test display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - test_widget_setting_multiple: - type: string - label: 'Test setting' + test_widget_setting_multiple: + type: string + label: 'Test setting' diff --git a/core/modules/file/config/schema/file.schema.yml b/core/modules/file/config/schema/file.schema.yml index 0babe38..f5cf194 100644 --- a/core/modules/file/config/schema/file.schema.yml +++ b/core/modules/file/config/schema/file.schema.yml @@ -68,29 +68,25 @@ field.file.field_settings: label: 'Enable Description field' entity_view_display.field.file_default: - type: entity_field_view_display_base + type: mapping label: 'Generic file format settings' entity_view_display.field.file_rss_enclosure: - type: entity_field_view_display_base + type: mapping label: 'RSS enclosure format settings' entity_view_display.field.file_table: - type: entity_field_view_display_base + type: mapping label: 'Table of files format settings' entity_view_display.field.file_url_plain: - type: entity_field_view_display_base + type: mapping label: 'URL to file format settings' entity_form_display.field.file_generic: - type: entity_field_form_display_base + type: mapping label: 'File format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - progress_indicator: - type: string - label: 'Progress indicator' + progress_indicator: + type: string + label: 'Progress indicator' diff --git a/core/modules/image/config/schema/image.schema.yml b/core/modules/image/config/schema/image.schema.yml index ef03075..5375b79 100644 --- a/core/modules/image/config/schema/image.schema.yml +++ b/core/modules/image/config/schema/image.schema.yml @@ -141,31 +141,23 @@ field.image.value: label: 'Height' entity_view_display.field.image: - type: entity_field_view_display_base + type: mapping label: 'Image field display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - image_link: - type: string - label: 'Link image to' - image_style: - type: string - label: 'Image style' + image_link: + type: string + label: 'Link image to' + image_style: + type: string + label: 'Image style' entity_form_display.field.image_image: - type: entity_field_form_display_base + type: mapping label: 'Image field display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - progress_indicator: - type: string - label: 'Progress indicator' - preview_image_style: - type: string - label: 'Preview image style' + progress_indicator: + type: string + label: 'Progress indicator' + preview_image_style: + type: string + label: 'Preview image style' diff --git a/core/modules/link/config/schema/link.schema.yml b/core/modules/link/config/schema/link.schema.yml index 9ff05fc..b81e8db 100644 --- a/core/modules/link/config/schema/link.schema.yml +++ b/core/modules/link/config/schema/link.schema.yml @@ -1,58 +1,46 @@ # Schema for the configuration files of the Link module. entity_view_display.field.link: - type: entity_field_view_display_base + type: mapping label: 'Link format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - trim_length: - type: integer - label: 'Trim link text length' - url_only: - type: boolean - label: 'URL only' - url_plain: - type: boolean - label: 'Show URL as plain text' - rel: - type: string - label: 'Add rel="nofollow" to links' - target: - type: string - label: 'Open link in new window' + trim_length: + type: integer + label: 'Trim link text length' + url_only: + type: boolean + label: 'URL only' + url_plain: + type: boolean + label: 'Show URL as plain text' + rel: + type: string + label: 'Add rel="nofollow" to links' + target: + type: string + label: 'Open link in new window' entity_view_display.field.link_separate: - type: entity_field_view_display_base + type: mapping label: 'Link format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - trim_length: - type: integer - label: 'Trim link text length' - rel: - type: string - label: 'Add rel="nofollow" to links' - target: - type: string - label: 'Open link in new window' + trim_length: + type: integer + label: 'Trim link text length' + rel: + type: string + label: 'Add rel="nofollow" to links' + target: + type: string + label: 'Open link in new window' entity_form_display.field.link_default: - type: entity_field_form_display_base + type: mapping label: 'Link format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - placeholder_url: - type: string - label: 'Placeholder for URL' - placeholder_title: - type: label - label: 'Placeholder for link text' + placeholder_url: + type: string + label: 'Placeholder for URL' + placeholder_title: + type: label + label: 'Placeholder for link text' diff --git a/core/modules/options/config/schema/options.schema.yml b/core/modules/options/config/schema/options.schema.yml index f0d444a..6f3e2ca 100644 --- a/core/modules/options/config/schema/options.schema.yml +++ b/core/modules/options/config/schema/options.schema.yml @@ -112,17 +112,17 @@ field.list_string.value: label: 'Value' entity_view_display.field.list_default: - type: entity_field_view_display_base + type: mapping label: 'Options list default display settings' entity_view_display.field.list_key: - type: entity_field_view_display_base + type: mapping label: 'Key format settings' entity_form_display.field.options_buttons: - type: entity_field_form_display_base + type: mapping label: 'Check boxes/radio buttons format settings' entity_form_display.field.options_select: - type: entity_field_form_display_base + type: mapping label: 'Select list format settings' diff --git a/core/modules/path/config/schema/path.schema.yml b/core/modules/path/config/schema/path.schema.yml index ebed69c..88b555f 100644 --- a/core/modules/path/config/schema/path.schema.yml +++ b/core/modules/path/config/schema/path.schema.yml @@ -1,5 +1,5 @@ # Schema for the configuration files of the Path module. entity_form_display.field.path: - type: entity_field_form_display_base + type: mapping label: 'Link format settings' 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 aac9add..5eb3e0d 100644 --- a/core/modules/responsive_image/config/schema/responsive_image.schema.yml +++ b/core/modules/responsive_image/config/schema/responsive_image.schema.yml @@ -43,19 +43,15 @@ responsive_image.mappings.*: label: 'Dependencies' entity_view_display.field.responsive_image: - type: entity_field_view_display_base + type: mapping label: 'Responsive image list format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - responsive_image_mapping: - type: string - label: 'Responsive image mapping' - fallback_image_style: - type: string - label: 'Fallback image style' - image_link: - type: string - label: 'Link image to' + responsive_image_mapping: + type: string + label: 'Responsive image mapping' + fallback_image_style: + type: string + label: 'Fallback image style' + image_link: + type: string + label: 'Link image to' diff --git a/core/modules/taxonomy/config/schema/taxonomy.schema.yml b/core/modules/taxonomy/config/schema/taxonomy.schema.yml index e9aed2b..69b59ba 100644 --- a/core/modules/taxonomy/config/schema/taxonomy.schema.yml +++ b/core/modules/taxonomy/config/schema/taxonomy.schema.yml @@ -80,35 +80,31 @@ field.taxonomy_term_reference.value: label: 'Term ID' entity_view_display.field.entity_reference_rss_category: - type: entity_field_view_display_base + type: mapping label: 'Taxonomy format settings' entity_view_display.field.taxonomy_term_reference_plain: - type: entity_field_view_display_base + type: mapping label: 'Taxonomy format settings' entity_view_display.field.taxonomy_term_reference_rss_category: - type: entity_field_view_display_base + type: mapping label: 'Taxonomy format settings' entity_view_display.field.taxonomy_term_reference_link: - type: entity_field_view_display_base + type: mapping label: 'Taxonomy format settings' entity_form_display.field.taxonomy_autocomplete: - type: entity_field_form_display_base + type: mapping label: 'Autocomplete term widget (tagging) format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - size: - type: integer - label: 'Size' - autocomplete_route_name: - type: string - label: 'Autocomplete route name' - placeholder: - type: label - label: 'Placeholder' + size: + type: integer + label: 'Size' + autocomplete_route_name: + type: string + label: 'Autocomplete route name' + placeholder: + type: label + label: 'Placeholder' diff --git a/core/modules/telephone/config/schema/telephone.schema.yml b/core/modules/telephone/config/schema/telephone.schema.yml index 7fcf66e..3e6510e 100644 --- a/core/modules/telephone/config/schema/telephone.schema.yml +++ b/core/modules/telephone/config/schema/telephone.schema.yml @@ -1,25 +1,17 @@ # Schema for the configuration files of the Telephone module. entity_view_display.field.telephone_link: - type: entity_field_view_display_base + type: mapping label: 'Telephone link format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - title: - type: label - label: 'Title to replace basic numeric telephone number display' + title: + type: label + label: 'Title to replace basic numeric telephone number display' entity_form_display.field.telephone_default: - type: entity_field_form_display_base + type: mapping label: 'Telephone default format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - placeholder: - type: label - label: 'Placeholder' + placeholder: + type: label + label: 'Placeholder' diff --git a/core/modules/text/config/schema/text.schema.yml b/core/modules/text/config/schema/text.schema.yml index f211cbf..b8e8783 100644 --- a/core/modules/text/config/schema/text.schema.yml +++ b/core/modules/text/config/schema/text.schema.yml @@ -91,77 +91,57 @@ field.text_with_summary.value: label: 'Text format' entity_view_display.field.text_default: - type: entity_field_view_display_base + type: mapping label: 'Formatted text default display format settings' entity_view_display.field.text_summary_or_trimmed: - type: entity_field_view_display_base + type: mapping label: 'Summary or trimmed formatted text display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - trim_length: - type: integer - label: 'Trim length' + trim_length: + type: integer + label: 'Trim length' entity_view_display.field.text_trimmed: - type: entity_field_view_display_base + type: mapping label: 'Trimmed text display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - trim_length: - type: integer - label: 'Trim length' + trim_length: + type: integer + label: 'Trim length' entity_form_display.field.text_textarea: - type: entity_field_form_display_base + type: mapping label: 'Text area (multiple rows) display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - rows: - type: integer - label: 'Rows' - placeholder: - type: label - label: 'Placeholder' + rows: + type: integer + label: 'Rows' + placeholder: + type: label + label: 'Placeholder' entity_form_display.field.text_textarea_with_summary: - type: entity_field_form_display_base + type: mapping label: 'Text area with a summary display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - rows: - type: integer - label: 'Rows' - summary_rows: - type: integer - label: 'Number of summary rows' - placeholder: - type: label - label: 'Placeholder' + rows: + type: integer + label: 'Rows' + summary_rows: + type: integer + label: 'Number of summary rows' + placeholder: + type: label + label: 'Placeholder' entity_form_display.field.text_textfield: - type: entity_field_form_display_base + type: mapping label: 'Text field display format settings' mapping: - settings: - type: mapping - label: 'Settings' - mapping: - size: - type: integer - label: 'Size of textfield' - placeholder: - type: label - label: 'Placeholder' + size: + type: integer + label: 'Size of textfield' + placeholder: + type: label + label: 'Placeholder'