Issue #2378055 by Gábor Hojtsy: Reorganise config schema for entity_form_display / entity_view_display

core/config/schema/core.entity.data_types.schema.yml

@@ -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'

core/config/schema/core.entity.schema.yml

@@ -68,9 +68,28 @@ core.entity_view_display.*.*.*:
       label: 'View or form mode machine name'
     content:
       type: sequence
-      label: 'Field display formatters'
+      label: 'Field 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: field.formatter.settings.[%parent.type]
+              label: 'Settings'
     hidden:
       type: sequence
       label: 'Field display setting'
@@ -105,9 +124,25 @@ core.entity_form_display.*.*.*:
       label: 'Enabled'
     content:
       type: sequence
-      label: 'Field display formatters'
+      label: 'Field widgets'
       sequence:
-        - type: entity_form_display.field.[type]
+        - type: mapping
+          label: 'Field widget'
+          mapping:
+            type:
+              type: string
+              label: 'Widget 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: field.widget.settings.[%parent.type]
+              label: 'Settings'
     hidden:
       type: sequence
       label: 'Hidden'
@@ -121,22 +156,16 @@ core.entity_form_display.*.*.*:
         - type: entity_form_display.third_party.[%key]
 
 # Default schema for entity display field with undefined type.
-entity_view_display.field.*:
-  type: entity_field_view_display_base
-  label: 'Entity display default'
+field.formatter.settings.*:
+  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'
-
-entity_form_display.field.string_textfield:
-  type: entity_field_form_display_base
-  label: 'Text field display format settings'
-  mapping:
-    settings:
+field.widget.settings.*:
   type: mapping
-      label: 'Settings'
+
+field.widget.settings.string_textfield:
+  type: mapping
+  label: 'Text field display format settings'
   mapping:
     size:
       type: integer
@@ -145,13 +174,9 @@ entity_form_display.field.string_textfield:
       type: label
       label: 'Placeholder'
 
-entity_form_display.field.string_textarea:
-  type: entity_field_form_display_base
-  label: 'Textarea display format settings'
-  mapping:
-    settings:
+field.widget.settings.string_textarea:
   type: mapping
-      label: 'Settings'
+  label: 'Textarea display format settings'
   mapping:
     rows:
       type: integer
@@ -160,69 +185,49 @@ entity_form_display.field.string_textarea:
       type: label
       label: 'Placeholder'
 
-entity_form_display.field.email_default:
-  type: entity_field_form_display_base
-  label: 'Email field display format settings'
-  mapping:
-    settings:
+field.widget.settings.email_default:
   type: mapping
-      label: 'Settings'
+  label: 'Email field display format settings'
   mapping:
     placeholder:
       type: label
       label: 'Placeholder'
 
-entity_form_display.field.datetime_timestamp:
-  type: entity_field_form_display_base
+field.widget.settings.datetime_timestamp:
+  type: mapping
   label: 'Datetime timestamp display format settings'
 
-entity_form_display.field.boolean_checkbox:
-  type: entity_field_form_display_base
-  label: 'Boolean checkbox display format settings'
-  mapping:
-    settings:
+field.widget.settings.boolean_checkbox:
   type: mapping
-      label: 'Settings'
+  label: 'Boolean checkbox display format settings'
   mapping:
     display_label:
       type: boolean
       label: 'Display label'
 
-entity_form_display.field.hidden:
-  type: entity_field_form_display_base
+field.widget.settings.hidden:
+  type: mapping
   label: '- Hidden - format settings'
 
-entity_form_display.field.number:
-  type: entity_field_form_display_base
-  label: 'Number default display format settings'
-  mapping:
-    settings:
+field.widget.settings.number:
   type: mapping
-      label: 'Settings'
+  label: 'Number default display format settings'
   mapping:
     placeholder:
       type: label
       label: 'Placeholder'
 
-entity_form_display.field.checkbox:
-  type: entity_field_form_display_base
-  label: 'Single on/off checkbox format settings'
-  mapping:
-    settings:
+field.widget.settings.checkbox:
   type: mapping
-      label: 'Settings'
+  label: 'Single on/off checkbox format settings'
   mapping:
     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
-  label: 'Number decimal display format settings'
-  mapping:
-    settings:
+field.formatter.settings.number_decimal:
   type: mapping
-      label: 'Settings'
+  label: 'Number decimal display format settings'
   mapping:
     thousand_separator:
       type: string
@@ -237,13 +242,9 @@ entity_view_display.field.number_decimal:
       type: boolean
       label: 'Display prefix and suffix.'
 
-entity_view_display.field.number_integer:
-  type: entity_field_view_display_base
-  label: 'Number interger display format settings'
-  mapping:
-    settings:
+field.formatter.settings.number_integer:
   type: mapping
-      label: 'Settings'
+  label: 'Number interger display format settings'
   mapping:
     thousand_separator:
       type: string
@@ -252,14 +253,14 @@ entity_view_display.field.number_integer:
       type: boolean
       label: 'Display prefix and suffix.'
 
-entity_view_display.field.number_unformatted:
-  type: entity_field_view_display_base
+field.formatter.settings.number_unformatted:
+  type: mapping
   label: 'Number unformatted display format settings'
 
-entity_view_display.field.uri_link:
-  type: entity_field_view_display_base
+field.formatter.settings.uri_link:
+  type: mapping
   label: 'URI as link display format settings'
 
-entity_view_display.field.timestamp_ago:
-  type: entity_field_view_display_base
+field.formatter.settings.timestamp_ago:
+  type: mapping
   label: 'Timestamp ago display format settings'

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
-  label: 'Comment display format settings'
-  mapping:
-    settings:
+field.formatter.settings.comment_default:
   type: mapping
-      label: 'Settings'
+  label: 'Comment display format settings'
   mapping:
     pager_id:
       type: integer
       label: 'Pager ID'
 
-entity_form_display.field.comment_default:
-  type: entity_field_form_display_base
+field.widget.settings.comment_default:
+  type: mapping
   label: 'Comment display format settings'
 
 action.configuration.comment_publish_action:

core/modules/datetime/config/schema/datetime.schema.yml

@@ -26,29 +26,21 @@ field.datetime.value:
         - type: string
           label: 'Value'
 
-entity_view_display.field.datetime_default:
-  type: entity_field_view_display_base
-  label: 'Datetime default display format settings'
-  mapping:
-    settings:
+field.formatter.settings.datetime_default:
   type: mapping
-      label: 'Settings'
+  label: 'Datetime default display format settings'
   mapping:
     format_type:
       type: string
       label: 'Date format'
 
-entity_view_display.field.datetime_plain:
-  type: entity_field_view_display_base
+field.formatter.settings.datetime_plain:
+  type: mapping
   label: 'Datetime plain display format settings'
 
-entity_form_display.field.datetime_datelist:
-  type: entity_field_form_display_base
-  label: 'Datetime select list display format settings'
-  mapping:
-    settings:
+field.widget.settings.datetime_datelist:
   type: mapping
-      label: 'Settings'
+  label: 'Datetime select list display format settings'
   mapping:
     increment:
       type: integer
@@ -60,6 +52,6 @@ entity_form_display.field.datetime_datelist:
       type: string
       label: 'Time type'
 
-entity_form_display.field.datetime_default:
-  type: entity_field_form_display_base
+field.widget.settings.datetime_default:
+  type: mapping
   label: 'Datetime default display format settings'

core/modules/entity_reference/config/schema/entity_reference.schema.yml

@@ -37,13 +37,9 @@ entity_reference.default.handler_settings:
       type: boolean
       label: 'Create referenced entities if they don''t already exist'
 
-entity_view_display.field.entity_reference_entity_view:
-  type: entity_field_view_display_base
-  label: 'Entity reference rendered entity display format settings'
-  mapping:
-    settings:
+field.formatter.settings.entity_reference_entity_view:
   type: mapping
-      label: 'Settings'
+  label: 'Entity reference rendered entity display format settings'
   mapping:
     view_mode:
       type: string
@@ -52,29 +48,21 @@ entity_view_display.field.entity_reference_entity_view:
       type: boolean
       label: 'Show links'
 
-entity_view_display.field.entity_reference_entity_id:
-  type: entity_field_view_display_base
+field.formatter.settings.entity_reference_entity_id:
+  type: mapping
   label: 'Entity reference entity ID display format settings'
 
-entity_view_display.field.entity_reference_label:
-  type: entity_field_view_display_base
-  label: 'Entity reference label display format settings'
-  mapping:
-    settings:
+field.formatter.settings.entity_reference_label:
   type: mapping
-      label: 'Settings'
+  label: 'Entity reference label display format settings'
   mapping:
     link:
       type: boolean
       label: 'Link label to the referenced entity'
 
-entity_form_display.field.entity_reference_autocomplete_tags:
-  type: entity_field_form_display_base
-  label: 'Entity reference autocomplete (Tags style) display format settings'
-  mapping:
-    settings:
+field.widget.settings.entity_reference_autocomplete_tags:
   type: mapping
-      label: 'Settings'
+  label: 'Entity reference autocomplete (Tags style) display format settings'
   mapping:
     match_operator:
       type: string
@@ -89,13 +77,9 @@ entity_form_display.field.entity_reference_autocomplete_tags:
       type: label
       label: 'Placeholder'
 
-entity_form_display.field.entity_reference_autocomplete:
-  type: entity_field_form_display_base
-  label: 'Entity reference autocomplete display format settings'
-  mapping:
-    settings:
+field.widget.settings.entity_reference_autocomplete:
   type: mapping
-      label: 'Settings'
+  label: 'Entity reference autocomplete display format settings'
   mapping:
     match_operator:
       type: string

core/modules/field/tests/modules/field_test/config/schema/field_test.schema.yml

@@ -1,10 +1,6 @@
-entity_view_display.field.field_test_multiple:
-  type: entity_field_view_display_base
-  label: 'field_test display format settings'
-  mapping:
-    settings:
+field.formatter.settings.field_test_multiple:
   type: mapping
-      label: 'Settings'
+  label: 'field_test display format settings'
   mapping:
     test_formatter_setting_multiple:
       type: string
@@ -13,13 +9,9 @@ entity_view_display.field.field_test_multiple:
       type: boolean
       label: 'Test altering'
 
-entity_form_display.field.test_field_widget_multiple:
-  type: entity_field_form_display_base
-  label: 'field_test display format settings'
-  mapping:
-    settings:
+field.widget.settings.test_field_widget_multiple:
   type: mapping
-      label: 'Settings'
+  label: 'field_test display format settings'
   mapping:
     test_widget_setting_multiple:
       type: string

core/modules/file/config/schema/file.schema.yml

@@ -67,29 +67,25 @@ field.file.field_settings:
       type: boolean
       label: 'Enable Description field'
 
-entity_view_display.field.file_default:
-  type: entity_field_view_display_base
+field.formatter.settings.file_default:
+  type: mapping
   label: 'Generic file format settings'
 
-entity_view_display.field.file_rss_enclosure:
-  type: entity_field_view_display_base
+field.formatter.settings.file_rss_enclosure:
+  type: mapping
   label: 'RSS enclosure format settings'
 
-entity_view_display.field.file_table:
-  type: entity_field_view_display_base
+field.formatter.settings.file_table:
+  type: mapping
   label: 'Table of files format settings'
 
-entity_view_display.field.file_url_plain:
-  type: entity_field_view_display_base
+field.formatter.settings.file_url_plain:
+  type: mapping
   label: 'URL to file format settings'
 
-entity_form_display.field.file_generic:
-  type: entity_field_form_display_base
-  label: 'File format settings'
-  mapping:
-    settings:
+field.widget.settings.file_generic:
   type: mapping
-      label: 'Settings'
+  label: 'File format settings'
   mapping:
     progress_indicator:
       type: string

core/modules/image/config/schema/image.schema.yml

@@ -140,13 +140,9 @@ field.image.value:
           type: integer
           label: 'Height'
 
-entity_view_display.field.image:
-  type: entity_field_view_display_base
-  label: 'Image field display format settings'
-  mapping:
-    settings:
+field.formatter.settings.image:
   type: mapping
-      label: 'Settings'
+  label: 'Image field display format settings'
   mapping:
     image_link:
       type: string
@@ -155,13 +151,9 @@ entity_view_display.field.image:
       type: string
       label: 'Image style'
 
-entity_form_display.field.image_image:
-  type: entity_field_form_display_base
-  label: 'Image field display format settings'
-  mapping:
-    settings:
+field.widget.settings.image_image:
   type: mapping
-      label: 'Settings'
+  label: 'Image field display format settings'
   mapping:
     progress_indicator:
       type: string

core/modules/link/config/schema/link.schema.yml

@@ -1,12 +1,8 @@
 # Schema for the configuration files of the Link module.
 
-entity_view_display.field.link:
-  type: entity_field_view_display_base
-  label: 'Link format settings'
-  mapping:
-    settings:
+field.formatter.settings.link:
   type: mapping
-      label: 'Settings'
+  label: 'Link format settings'
   mapping:
     trim_length:
       type: integer
@@ -24,13 +20,9 @@ entity_view_display.field.link:
       type: string
       label: 'Open link in new window'
 
-entity_view_display.field.link_separate:
-  type: entity_field_view_display_base
-  label: 'Link format settings'
-  mapping:
-    settings:
+field.formatter.settings.link_separate:
   type: mapping
-      label: 'Settings'
+  label: 'Link format settings'
   mapping:
     trim_length:
       type: integer
@@ -42,13 +34,9 @@ entity_view_display.field.link_separate:
       type: string
       label: 'Open link in new window'
 
-entity_form_display.field.link_default:
-  type: entity_field_form_display_base
-  label: 'Link format settings'
-  mapping:
-    settings:
+field.widget.settings.link_default:
   type: mapping
-      label: 'Settings'
+  label: 'Link format settings'
   mapping:
     placeholder_url:
       type: string

core/modules/options/config/schema/options.schema.yml

@@ -111,18 +111,18 @@ field.list_string.value:
           type: string
           label: 'Value'
 
-entity_view_display.field.list_default:
-  type: entity_field_view_display_base
+field.formatter.settings.list_default:
+  type: mapping
   label: 'Options list default display settings'
 
-entity_view_display.field.list_key:
-  type: entity_field_view_display_base
+field.formatter.settings.list_key:
+  type: mapping
   label: 'Key format settings'
 
-entity_form_display.field.options_buttons:
-  type: entity_field_form_display_base
+field.widget.settings.options_buttons:
+  type: mapping
   label: 'Check boxes/radio buttons format settings'
 
-entity_form_display.field.options_select:
-  type: entity_field_form_display_base
+field.widget.settings.options_select:
+  type: mapping
   label: 'Select list format settings'

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
+field.widget.settings.path:
+  type: mapping
   label: 'Link format settings'

core/modules/responsive_image/config/schema/responsive_image.schema.yml

@@ -42,13 +42,9 @@ responsive_image.mappings.*:
       type: config_dependencies
       label: 'Dependencies'
 
-entity_view_display.field.responsive_image:
-  type: entity_field_view_display_base
-  label: 'Responsive image list format settings'
-  mapping:
-    settings:
+field.formatter.settings.responsive_image:
   type: mapping
-      label: 'Settings'
+  label: 'Responsive image list format settings'
   mapping:
     responsive_image_mapping:
       type: string

core/modules/taxonomy/config/schema/taxonomy.schema.yml

@@ -79,29 +79,25 @@ field.taxonomy_term_reference.value:
           type: integer
           label: 'Term ID'
 
-entity_view_display.field.entity_reference_rss_category:
-  type: entity_field_view_display_base
-  label: 'Taxonomy format settings'
-
-entity_view_display.field.taxonomy_term_reference_plain:
-  type: entity_field_view_display_base
-  label: 'Taxonomy format settings'
-
-entity_view_display.field.taxonomy_term_reference_rss_category:
-  type: entity_field_view_display_base
-  label: 'Taxonomy format settings'
-
-entity_view_display.field.taxonomy_term_reference_link:
-  type: entity_field_view_display_base
-  label: 'Taxonomy format settings'
-
-entity_form_display.field.taxonomy_autocomplete:
-  type: entity_field_form_display_base
-  label: 'Autocomplete term widget (tagging) format settings'
-  mapping:
-    settings:
+field.formatter.settings.entity_reference_rss_category:
   type: mapping
-      label: 'Settings'
+  label: 'Taxonomy format settings'
+
+field.formatter.settings.taxonomy_term_reference_plain:
+  type: mapping
+  label: 'Taxonomy format settings'
+
+field.formatter.settings.taxonomy_term_reference_rss_category:
+  type: mapping
+  label: 'Taxonomy format settings'
+
+field.formatter.settings.taxonomy_term_reference_link:
+  type: mapping
+  label: 'Taxonomy format settings'
+
+field.widget.settings.taxonomy_autocomplete:
+  type: mapping
+  label: 'Autocomplete term widget (tagging) format settings'
   mapping:
     size:
       type: integer

core/modules/telephone/config/schema/telephone.schema.yml

@@ -1,24 +1,16 @@
 # Schema for the configuration files of the Telephone module.
 
-entity_view_display.field.telephone_link:
-  type: entity_field_view_display_base
-  label: 'Telephone link format settings'
-  mapping:
-    settings:
+field.formatter.settings.telephone_link:
   type: mapping
-      label: 'Settings'
+  label: 'Telephone link format settings'
   mapping:
     title:
       type: label
       label: 'Title to replace basic numeric telephone number display'
 
-entity_form_display.field.telephone_default:
-  type: entity_field_form_display_base
-  label: 'Telephone default format settings'
-  mapping:
-    settings:
+field.widget.settings.telephone_default:
   type: mapping
-      label: 'Settings'
+  label: 'Telephone default format settings'
   mapping:
     placeholder:
       type: label

core/modules/text/config/schema/text.schema.yml

@@ -90,41 +90,29 @@ field.text_with_summary.value:
           type: string
           label: 'Text format'
 
-entity_view_display.field.text_default:
-  type: entity_field_view_display_base
+field.formatter.settings.text_default:
+  type: mapping
   label: 'Formatted text default display format settings'
 
-entity_view_display.field.text_summary_or_trimmed:
-  type: entity_field_view_display_base
+field.formatter.settings.text_summary_or_trimmed:
+  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'
 
-entity_view_display.field.text_trimmed:
-  type: entity_field_view_display_base
+field.formatter.settings.text_trimmed:
+  type: mapping
   label: 'Trimmed text display format settings'
-  mapping:
-    settings:
-      type: mapping
-      label: 'Settings'
   mapping:
     trim_length:
       type: integer
       label: 'Trim length'
 
-entity_form_display.field.text_textarea:
-  type: entity_field_form_display_base
-  label: 'Text area (multiple rows) display format settings'
-  mapping:
-    settings:
+field.widget.settings.text_textarea:
   type: mapping
-      label: 'Settings'
+  label: 'Text area (multiple rows) display format settings'
   mapping:
     rows:
       type: integer
@@ -133,13 +121,9 @@ entity_form_display.field.text_textarea:
       type: label
       label: 'Placeholder'
 
-entity_form_display.field.text_textarea_with_summary:
-  type: entity_field_form_display_base
-  label: 'Text area with a summary display format settings'
-  mapping:
-    settings:
+field.widget.settings.text_textarea_with_summary:
   type: mapping
-      label: 'Settings'
+  label: 'Text area with a summary display format settings'
   mapping:
     rows:
       type: integer
@@ -151,13 +135,9 @@ entity_form_display.field.text_textarea_with_summary:
       type: label
       label: 'Placeholder'
 
-entity_form_display.field.text_textfield:
-  type: entity_field_form_display_base
-  label: 'Text field display format settings'
-  mapping:
-    settings:
+field.widget.settings.text_textfield:
   type: mapping
-      label: 'Settings'
+  label: 'Text field display format settings'
   mapping:
     size:
       type: integer