Views integration incorrectly joins content_moderation_state entities with matching IDs, but different entity types.

In #2787881: Moderating a non-translatable entity type throws exception we are just editing the EntityTestWithBundle entity type to make it revisionable, which saves having to create a new entity type (and bundle).

I'm super confused that https://www.drupal.org/files/issues/2819477-views-integration--passing-t... fixes the problem, given that it doens't really contain a fix?

1. +++ b/core/modules/content_moderation/config/schema/content_moderation.schema.yml
   @@ -38,7 +38,7 @@ content_moderation.state_transition.*:
   -node.type.*.third_party.content_moderation:
   +content_moderation_third_party_settings:
   

   Nice!

2. +++ b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
   @@ -41,6 +45,18 @@ protected function setUp($import_test_views = TRUE) {
   +//    $test_entity = EntityTestRevWithBundle::create([
   +//      'type' => 'test_bundle',
   +//    ]);
   +//    $test_entity->moderation_state->target_id = 'draft';
   +//    $test_entity->save();
   

   Is this leftover code we can remove?

+++ b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
@@ -41,6 +57,19 @@ protected function setUp($import_test_views = TRUE) {
+//    $test_entity->save();

I guess this shouldn't be commented out.

+++ b/core/modules/content_moderation/src/ViewsData.php
@@ -193,15 +193,11 @@ public function getViewsData() {
             ],
-            [
-              'field' => 'content_entity_revision_id',
-              'left_field' => $entity_type->getKey('revision'),
-            ],

Ah that makes sense, thank you for the explanation.

#2845151: ContentModerationStateFormatter pretends it's for the moderated entity, but it is for the content moderation state entity is also working to resolve Views issues.

Looks good to me.

So like. The view will show totally wrong data? That's a neat "feature". ;) Sounds major to me.

+++ b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
@@ -44,7 +48,13 @@ protected function setUp($import_test_views = TRUE) {
+    // Create a totally unrelated entity to ensure the extra join information
+    // joins by the correct entity type.
+    $entity = EntityTestMulRevPub::create([]);
+    $entity->save();

I don't know that this is actually enough to ensure that the node and the test entity have the same serial ID. Sometimes serial IDs in tests are different from what one expects. At the least, I think we should add an assertion that the two entities' IDs are the same, but there might be some other trick in some test somewhere for ensuring they have the serial IDs we expect. (Yes that's very helpful and specific, I know.)

Technically this fix could disrupt a site relying on the "feature" that the view shows them additional rows, but since Content Moderation is also alpha, I think this can go into any patch release or the beta.

I don't know that this is actually enough to ensure that the node and the test entity have the same serial ID. Sometimes serial IDs in tests are different from what one expects. At the least, I think we should add an assertion that the two entities' IDs are the same, but there might be some other trick in some test somewhere for ensuring they have the serial IDs we expect

Great! idea @xjm. result rows will have all the entities so we can add asserts on that.
I found another point.

+++ b/core/modules/content_moderation/src/ViewsData.php
@@ -193,15 +193,11 @@ public function getViewsData() {
-          'join_extra' => [
+          'extra' => [

@@ -216,7 +212,7 @@ public function getViewsData() {
-          'join_extra' => [
+          'extra' => [

This is a views data change so we at least need an update hook to clear the cache. A post-update hook will do ;-)

Would be good to have this in.

Committed and pushed d66623e to 8.4.x and c109192 to 8.3.x. Thanks!

diff --git a/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
index 8703d1f..d4c4aa3 100644
--- a/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
+++ b/core/modules/content_moderation/tests/src/Kernel/ViewsDataIntegrationTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\content_moderation\Kernel;
 
-use Drupal\entity_test\Entity\EntityTestMul;
 use Drupal\entity_test\Entity\EntityTestMulRevPub;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;

unused use fix on commit.