Issue #2349553 by dawehner, pfrenssen, damiankloip: Store entity field...

Issue #2349553 by dawehner, pfrenssen, damiankloip: Store entity field information in the views data

core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml

@@ -79,6 +79,8 @@ display:
           empty_zero: false
           link_to_node: true
           plugin_id: node
+          entity_type: node
+          entity_field: title
         node_bulk_form:
           id: node_bulk_form
           table: node
@@ -128,6 +130,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: node_bulk_form
+          entity_type: node
       filters:
         status:
           value: true
@@ -138,6 +141,8 @@ display:
             operator: ''
           group: 1
           plugin_id: boolean
+          entity_type: node
+          entity_field: status
       sorts:
         created:
           id: created
@@ -145,6 +150,8 @@ display:
           field: created
           order: DESC
           plugin_id: date
+          entity_type: node
+          entity_field: created
       title: form
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null

core/modules/aggregator/config/install/views.view.aggregator_rss_feed.yml

@@ -126,6 +126,8 @@ display:
           format_plural_plural: '@count'
           prefix: ''
           suffix: ''
+          entity_type: aggregator_item
+          entity_field: iid
       filters: {  }
       sorts: {  }
       title: 'Aggregator RSS feed'

core/modules/aggregator/config/install/views.view.aggregator_sources.yml

@@ -131,6 +131,8 @@ display:
           format_plural_plural: '@count'
           prefix: ''
           suffix: ''
+          entity_type: aggregator_feed
+          entity_field: fid
       filters: {  }
       sorts: {  }
       title: Sources
@@ -205,6 +207,8 @@ display:
           hide_alter_empty: true
           display_as_link: false
           plugin_id: aggregator_title_link
+          entity_type: aggregator_feed
+          entity_field: title
         url:
           id: url
           table: aggregator_feed
@@ -255,6 +259,8 @@ display:
           hide_alter_empty: true
           display_as_link: false
           plugin_id: url
+          entity_type: aggregator_feed
+          entity_field: url
         description:
           id: description
           table: aggregator_feed
@@ -304,6 +310,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: xss
+          entity_type: aggregator_feed
+          entity_field: description
         link:
           id: link
           table: aggregator_feed
@@ -354,6 +362,8 @@ display:
           hide_alter_empty: true
           display_as_link: false
           plugin_id: url
+          entity_type: aggregator_feed
+          entity_field: link
       defaults:
         fields: false
         title: false

core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_items.yml

@@ -38,6 +38,8 @@ display:
           field: iid
           id: iid
           plugin_id: numeric
+          entity_type: aggregator_item
+          entity_field: iid
         title:
           table: aggregator_item
           field: title
@@ -70,11 +72,15 @@ display:
             trim: false
             preserve_tags: ''
             html: false
+          entity_type: aggregator_item
+          entity_field: title
         timestamp:
           table: aggregator_item
           field: timestamp
           id: timestamp
           plugin_id: date
+          entity_type: aggregator_item
+          entity_field: timestamp
         author:
           table: aggregator_item
           field: author
@@ -107,6 +113,8 @@ display:
             trim: false
             preserve_tags: ''
             html: false
+          entity_type: aggregator_item
+          entity_field: author
         description:
           id: description
           table: aggregator_item
@@ -156,6 +164,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: aggregator_xss
+          entity_type: aggregator_item
+          entity_field: description
       filters: {  }
       sorts: {  }
       field_langcode: '***LANGUAGE_language_content***'

core/modules/comment/config/install/views.view.comments_recent.yml

@@ -111,6 +111,8 @@ display:
           hide_alter_empty: true
           link_to_comment: true
           link_to_entity: false
+          entity_type: comment
+          entity_field: subject
         changed:
           id: changed
           table: comment_field_data
@@ -163,6 +165,8 @@ display:
           date_format: 'time ago'
           custom_date_format: ''
           timezone: ''
+          entity_type: comment
+          entity_field: changed
       filters:
         status:
           value: true
@@ -173,6 +177,8 @@ display:
           expose:
             operator: ''
           group: 1
+          entity_type: comment
+          entity_field: status
         status_node:
           value: true
           table: node_field_data
@@ -183,6 +189,8 @@ display:
           expose:
             operator: ''
           group: 1
+          entity_type: node
+          entity_field: status
       sorts:
         created:
           id: created
@@ -196,6 +204,8 @@ display:
           expose:
             label: ''
           plugin_id: date
+          entity_type: comment
+          entity_field: created
         cid:
           id: cid
           table: comment
@@ -208,6 +218,8 @@ display:
           expose:
             label: ''
           plugin_id: standard
+          entity_type: comment
+          entity_field: cid
       title: 'Recent comments'
       empty:
         area_text_custom:

core/modules/comment/src/Plugin/views/wizard/Comment.php

@@ -39,6 +39,8 @@ class Comment extends WizardPluginBase {
       'table' => 'comment_field_data',
       'field' => 'status',
       'plugin_id' => 'boolean',
+      'entity_type' => 'comment',
+      'entity_field' => 'status',
     ),
     'status_node' => array(
       'value' => TRUE,
@@ -46,6 +48,8 @@ class Comment extends WizardPluginBase {
       'field' => 'status',
       'plugin_id' => 'boolean',
       'relationship' => 'node',
+      'entity_type' => 'node',
+      'entity_field' => 'status',
     ),
   );
 
@@ -72,6 +76,7 @@ protected function defaultDisplayOptions() {
     $display_options['relationships']['node']['id'] = 'node';
     $display_options['relationships']['node']['table'] = 'comment_field_data';
     $display_options['relationships']['node']['field'] = 'node';
+    $display_options['relationships']['node']['entity_type'] = 'comment_field_data';
     $display_options['relationships']['node']['required'] = 1;
     $display_options['relationships']['node']['plugin_id'] = 'standard';
 
@@ -82,6 +87,8 @@ protected function defaultDisplayOptions() {
     $display_options['fields']['subject']['id'] = 'subject';
     $display_options['fields']['subject']['table'] = 'comment_field_data';
     $display_options['fields']['subject']['field'] = 'subject';
+    $display_options['fields']['subject']['entity_type'] = 'comment';
+    $display_options['fields']['subject']['entity_field'] = 'subject';
     $display_options['fields']['subject']['label'] = '';
     $display_options['fields']['subject']['alter']['alter_text'] = 0;
     $display_options['fields']['subject']['alter']['make_link'] = 0;

core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_row.yml

@@ -115,6 +115,8 @@ display:
           hide_alter_empty: true
           link_to_entity: false
           plugin_id: comment
+          entity_type: comment
+          entity_field: subject
       filters:
         status:
           value: true
@@ -125,6 +127,8 @@ display:
             operator: ''
           group: 1
           plugin_id: boolean
+          entity_type: comment
+          entity_field: status
         status_node:
           value: true
           table: node_field_data
@@ -135,6 +139,8 @@ display:
             operator: ''
           group: 1
           plugin_id: boolean
+          entity_type: node
+          entity_field: status
       sorts: {  }
       title: test_comment_row
       header: {  }

core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_rss.yml

@@ -59,6 +59,8 @@ display:
           hide_empty: false
           empty_zero: false
           link_to_comment: true
+          entity_type: comment
+          entity_field: subject
       filters: {  }
       sorts: {  }
       field_langcode: '***LANGUAGE_language_content***'

core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_comment_user_uid.yml

@@ -32,6 +32,7 @@ display:
             items_per_page: 25
           table: node_field_data
           plugin_id: argument_comment_user_uid
+          entity_type: node
       cache:
         type: none
       exposed_form:
@@ -42,6 +43,8 @@ display:
           id: nid
           table: node
           plugin_id: node
+          entity_type: node
+          entity_field: nid
       pager:
         type: full
       query:

core/modules/comment/tests/modules/comment_test_views/test_views/views.view.test_field_filters.yml

@@ -101,6 +101,8 @@ display:
           hide_alter_empty: true
           link_to_entity: false
           plugin_id: comment
+          entity_type: comment
+          entity_field: subject
       filters:
         subject:
           id: subject
@@ -138,6 +140,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+          entity_type: comment
+          entity_field: subject
       sorts: {  }
       title: 'Title filter page'
       header: {  }
@@ -193,6 +197,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+          entity_type: comment
+          entity_field: comment_body
       defaults:
         filters: false
         filter_groups: false
@@ -249,6 +255,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+          entity_type: comment
+          entity_field: comment_body
       defaults:
         filters: false
         filter_groups: false
@@ -315,6 +323,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+          entity_type: comment
+          entity_field: subject
       defaults:
         filters: false
         filter_groups: false

core/modules/contact/tests/modules/contact_test_views/test_views/views.view.test_contact_link.yml

@@ -102,12 +102,15 @@ display:
           anonymous_text: ''
           format_username: true
           plugin_id: user_name
+          entity_type: user
+          entity_field: name
         contact:
           id: contact
           table: users
           field: contact
           plugin_id: contact_link
           exclude: false
+          entity_type: user
       filters:
         status:
           value: true
@@ -118,6 +121,8 @@ display:
             operator: '0'
           group: 1
           plugin_id: boolean
+          entity_type: user
+          entity_field: status
       sorts: {  }
       title: test_contact_link
       header: {  }

core/modules/content_translation/tests/modules/content_translation_test_views/test_views/views.view.test_entity_translations_link.yml

@@ -53,6 +53,8 @@ display:
           link_to_user: true
           format_username: true
           plugin_id: user_name
+          entity_type: user
+          entity_field: name
         translation_link:
           id: translation_link
           table: users
@@ -69,6 +71,7 @@ display:
           hide_alter_empty: true
           text: Translate
           plugin_id: content_translation_link
+          entity_type: user
       filters:
         uid_raw:
           id: uid_raw
@@ -80,6 +83,7 @@ display:
           group: 1
           exposed: false
           plugin_id: numeric
+          entity_type: user
       sorts:
         created:
           id: created
@@ -87,6 +91,8 @@ display:
           field: created
           order: DESC
           plugin_id: date
+          entity_type: user
+          entity_field: created
       title: People
       empty:
         area:

core/modules/entity_reference/tests/modules/entity_reference_test/config/install/views.view.test_entity_reference.yml

@@ -86,6 +86,8 @@ display:
           hide_alter_empty: true
           link_to_node: true
           plugin_id: node
+          entity_type: node
+          entity_field: title
       filters:
         status:
           value: true
@@ -96,6 +98,8 @@ display:
             operator: ''
           group: 1
           plugin_id: boolean
+          entity_type: node
+          entity_field: status
       sorts:
         created:
           id: created
@@ -103,6 +107,8 @@ display:
           field: created
           order: DESC
           plugin_id: date
+          entity_type: node
+          entity_field: created
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
   entity_reference_1:

core/modules/entity_reference/tests/modules/entity_reference_test_views/test_views/views.view.test_entity_reference_view.yml

@@ -24,12 +24,16 @@ display:
           relationship: none
           table: entity_test
           plugin_id: numeric
+          entity_type: entity_test
+          entity_field: id
         id_1:
           field: id
           id: id_1
           relationship: test_relationship
           table: entity_test
           plugin_id: numeric
+          entity_type: entity_test
+          entity_field: id
       pager:
         options:
           offset: 0
@@ -42,6 +46,8 @@ display:
           relationship: none
           table: entity_test
           plugin_id: standard
+          entity_type: entity_test
+          entity_field: id
       relationships:
         test_relationship:
           id: field_test

core/modules/field/tests/modules/field_test_views/test_views/views.view.test_view_fieldapi.yml

@@ -23,21 +23,29 @@ display:
           id: nid
           table: node
           plugin_id: node
+          entity_type: node
+          entity_field: nid
         field_name_0:
           id: field_name_0
           table: node__field_name_0
           field: field_name_0
           plugin_id: field
+          entity_type: node
+          entity_field: field_name_0
         field_name_5:
           id: field_name_5
           table: node__field_name_5
           field: field_name_5
           plugin_id: field
+          entity_type: node
+          entity_field: field_name_5
         field_no_view_access:
           id: field_no_view_access
           table: node__field_no_view_access
           field: field_no_view_access
           plugin_id: field
+          entity_type: node
+          entity_field: field_no_view_access
       cache:
         type: none
       exposed_form:

core/modules/file/config/install/views.view.files.yml

@@ -176,6 +176,8 @@ display:
           empty: ''
           hide_alter_empty: true
           plugin_id: file
+          entity_type: file
+          entity_field: fid
         filename:
           id: filename
           table: file_managed
@@ -208,6 +210,8 @@ display:
           empty: ''
           hide_alter_empty: true
           plugin_id: file
+          entity_type: file
+          entity_field: filename
         filemime:
           id: filemime
           table: file_managed
@@ -259,6 +263,8 @@ display:
           link_to_file: false
           filemime_image: false
           plugin_id: file_filemime
+          entity_type: file
+          entity_field: filemime
         filesize:
           id: filesize
           table: file_managed
@@ -309,6 +315,8 @@ display:
           hide_alter_empty: true
           file_size_display: formatted
           plugin_id: file_size
+          entity_type: file
+          entity_field: filesize
         status:
           id: status
           table: file_managed
@@ -358,6 +366,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: file_status
+          entity_type: file
+          entity_field: status
         created:
           id: created
           table: file_managed
@@ -410,6 +420,8 @@ display:
           custom_date_format: ''
           timezone: ''
           plugin_id: date
+          entity_type: file
+          entity_field: created
         changed:
           id: changed
           table: file_managed
@@ -462,6 +474,8 @@ display:
           custom_date_format: ''
           timezone: ''
           plugin_id: date
+          entity_type: file
+          entity_field: changed
         count:
           id: count
           table: file_usage
@@ -559,6 +573,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+          entity_type: file
+          entity_field: filename
         filemime:
           id: filemime
           table: file_managed
@@ -597,6 +613,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+          entity_type: file
+          entity_field: filemime
         status:
           id: status
           table: file_managed
@@ -636,6 +654,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: file_status
+          entity_type: file
+          entity_field: status
       sorts: {  }
       title: Files
       header: {  }
@@ -979,6 +999,8 @@ display:
           break_phrase: false
           not: false
           plugin_id: file_fid
+          entity_type: file
+          entity_field: fid
       style:
         type: table
         options:

core/modules/file/src/Plugin/views/wizard/File.php

@@ -41,6 +41,8 @@ protected function defaultDisplayOptions() {
     $display_options['fields']['filename']['id'] = 'filename';
     $display_options['fields']['filename']['table'] = 'file_managed';
     $display_options['fields']['filename']['field'] = 'filename';
+    $display_options['fields']['filename']['entity_type'] = 'file';
+    $display_options['fields']['filename']['entity_field'] = 'filename';
     $display_options['fields']['filename']['label'] = '';
     $display_options['fields']['filename']['alter']['alter_text'] = 0;
     $display_options['fields']['filename']['alter']['make_link'] = 0;

core/modules/node/config/install/views.view.archive.yml

@@ -75,6 +75,8 @@ display:
           expose:
             label: ''
           granularity: second
+          entity_type: node
+          entity_field: created
       arguments:
         created_year_month:
           id: created_year_month
@@ -94,6 +96,7 @@ display:
             items_per_page: 30
           specify_validation: true
           plugin_id: date_year_month
+          entity_type: node
       filters:
         status:
           id: status
@@ -104,6 +107,8 @@ display:
           expose:
             operator: '0'
           plugin_id: boolean
+          entity_type: node
+          entity_field: status
         langcode:
           id: langcode
           table: node_field_data
@@ -142,6 +147,8 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: language
+          entity_type: node
+          entity_field: langcode
       style:
         type: default
         options:
@@ -188,6 +195,7 @@ display:
             items_per_page: 30
           specify_validation: true
           plugin_id: date_year_month
+          entity_type: node
       field_langcode: '***LANGUAGE_language_content***'
       field_langcode_add_to_query: null
   page_1:

core/modules/node/config/install/views.view.content.yml

@@ -148,6 +148,7 @@ display:
           empty_zero: false
           hide_alter_empty: true
           plugin_id: node_bulk_form
+          entity_type: node
         title:
           id: title
           table: node_field_data
@@ -164,6 +165,8 @@ display:
           hide_alter_empty: true
           link_to_node: true
           plugin_id: node
+          entity_type: node
+          entity_field: title
         type:
           id: type
           table: node_field_data
@@ -181,6 +184,8 @@ display:
           link_to_node: false
           machine_name: ''
           plugin_id: node_type
+          entity_type: node
+          entity_field: type
         name:
           id: name
           table: users_field_data
@@ -201,6 +206,8 @@ display:
           anonymous_text: ''
           format_username: true
           plugin_id: user_name
+          entity_type: user
+          entity_field: name
         status:
           id: status
           table: node_field_data
@@ -220,6 +227,8 @@ display:
           type_custom_false: ''
           not: ''