Issue #2902187 by amateescu, timmillwood, Sam152, webchick, Manuel Garcia,...

Issue #2902187 by amateescu, timmillwood, Sam152, webchick, Manuel Garcia, xjm, plach, DuneBL, larowlan, Bojhan, jibran, Berdir, jojototh: Provide a way for users to moderate content

core/modules/content_moderation/content_moderation.links.task.yml

 content_moderation.workflows:
   deriver: 'Drupal\content_moderation\Plugin\Derivative\DynamicLocalTasks'
   weight: 100
+
+content_moderation.content:
+  title: 'Overview'
+  route_name: system.admin_content
+  parent_id: system.admin_content
+
+content_moderation.moderated_content:
+  title: 'Moderated content'
+  route_name: content_moderation.admin_moderated_content
+  parent_id: system.admin_content
+  weight: 1

core/modules/content_moderation/content_moderation.routing.yml

+content_moderation.admin_moderated_content:
+  path: '/admin/content/moderated'
+  defaults:
+    _controller: '\Drupal\content_moderation\Controller\ModeratedContentController::nodeListing'
+    _title: 'Moderated content'
+  requirements:
+    _permission: 'view any unpublished content'
+
 content_moderation.workflow_type_edit_form:
   path: '/admin/config/workflow/workflows/manage/{workflow}/type/{entity_type_id}'
   defaults:

core/modules/content_moderation/src/Controller/ModeratedContentController.php

+<?php
+
+namespace Drupal\content_moderation\Controller;
+
+use Drupal\content_moderation\ModeratedNodeListBuilder;
+use Drupal\Core\Controller\ControllerBase;
+
+/**
+ * Defines a controller to list moderated nodes.
+ */
+class ModeratedContentController extends ControllerBase {
+
+  /**
+   * Provides the listing page for moderated nodes.
+   *
+   * @return array
+   *   A render array as expected by drupal_render().
+   */
+  public function nodeListing() {
+    $entity_type = $this->entityTypeManager()->getDefinition('node');
+
+    return $this->entityTypeManager()->createHandlerInstance(ModeratedNodeListBuilder::class, $entity_type)->render();
+  }
+
+}

core/modules/content_moderation/src/ModeratedNodeListBuilder.php

+<?php
+
+namespace Drupal\content_moderation;
+
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Routing\RedirectDestinationInterface;
+use Drupal\node\NodeListBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Defines a class to build a listing of moderated node entities.
+ */
+class ModeratedNodeListBuilder extends NodeListBuilder {
+
+  /**
+   * The entity storage class.
+   *
+   * @var \Drupal\Core\Entity\RevisionableStorageInterface
+   */
+  protected $storage;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs a new ModeratedNodeListBuilder object.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type definition.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The entity storage class.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   * @param \Drupal\Core\Routing\RedirectDestinationInterface $redirect_destination
+   *   The redirect destination service.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, DateFormatterInterface $date_formatter, RedirectDestinationInterface $redirect_destination, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($entity_type, $storage, $date_formatter, $redirect_destination);
+
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
+    return new static(
+      $entity_type,
+      $container->get('entity.manager')->getStorage($entity_type->id()),
+      $container->get('date.formatter'),
+      $container->get('redirect.destination'),
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function load() {
+    $revision_ids = $this->getEntityRevisionIds();
+    return $this->storage->loadMultipleRevisions($revision_ids);
+  }
+
+  /**
+   * Loads entity revision IDs using a pager sorted by the entity revision ID.
+   *
+   * @return array
+   *   An array of entity revision IDs.
+   */
+  protected function getEntityRevisionIds() {
+    $query = $this->entityTypeManager->getStorage('content_moderation_state')->getAggregateQuery()
+      ->aggregate('content_entity_id', 'MAX')
+      ->groupBy('content_entity_revision_id')
+      ->condition('content_entity_type_id', $this->entityTypeId)
+      ->condition('moderation_state', 'published', '<>')
+      ->sort('content_entity_revision_id', 'DESC');
+
+    // Only add the pager if a limit is specified.
+    if ($this->limit) {
+      $query->pager($this->limit);
+    }
+
+    $result = $query->execute();
+
+    return $result ? array_column($result, 'content_entity_revision_id') : [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header = parent::buildHeader();
+    $header['status'] = $this->t('Moderation state');
+
+    return $header;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    $row = parent::buildRow($entity);
+    $row['status'] = $entity->moderation_state->value;
+
+    return $row;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function render() {
+    $build = parent::render();
+    $build['table']['#empty'] = $this->t('There is no moderated @label yet. Only pending versions of @label, such as drafts, are listed here.', ['@label' => $this->entityType->getLabel()]);
+
+    return $build;
+  }
+
+}

core/modules/content_moderation/tests/src/Functional/ModeratedContentViewTest.php

+<?php
+
+namespace Drupal\Tests\content_moderation\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+use Drupal\workflows\Entity\Workflow;
+
+/**
+ * Tests moderated content administration page functionality.
+ *
+ * @group content_moderation
+ */
+class ModeratedContentViewTest extends BrowserTestBase {
+
+  /**
+   * A user with permission to bypass access content.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $adminUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['content_moderation', 'node', 'views'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setUp() {
+    parent::setUp();
+
+    $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page'])->save();
+    $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article'])->save();
+    $this->drupalCreateContentType(['type' => 'unmoderated_type', 'name' => 'Unmoderated type'])->save();
+
+    $workflow = Workflow::load('editorial');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'page');
+    $workflow->getTypePlugin()->addEntityTypeAndBundle('node', 'article');
+    $workflow->save();
+
+    $this->adminUser = $this->drupalCreateUser(['access administration pages', 'view any unpublished content', 'administer nodes', 'bypass node access']);
+  }
+
+  /**
+   * Tests the moderated content page.
+   */
+  public function testModeratedContentPage() {
+    $assert_sesison = $this->assertSession();
+    $this->drupalLogin($this->adminUser);
+
+    // Use an explicit changed time to ensure the expected order in the content
+    // admin listing. We want these to appear in the table in the same order as
+    // they appear in the following code, and the 'moderated_content' view has a
+    // table style configuration with a default sort on the 'changed' field
+    // descending.
+    $time = \Drupal::time()->getRequestTime();
+    $excluded_nodes['published_page'] = $this->drupalCreateNode(['type' => 'page', 'changed' => $time--, 'moderation_state' => 'published']);
+    $excluded_nodes['published_article'] = $this->drupalCreateNode(['type' => 'article', 'changed' => $time--, 'moderation_state' => 'published']);
+
+    $excluded_nodes['unmoderated_type'] = $this->drupalCreateNode(['type' => 'unmoderated_type', 'changed' => $time--]);
+    $excluded_nodes['unmoderated_type']->setNewRevision(TRUE);
+    $excluded_nodes['unmoderated_type']->isDefaultRevision(FALSE);
+    $excluded_nodes['unmoderated_type']->changed->value = $time--;
+    $excluded_nodes['unmoderated_type']->save();
+
+    $nodes['published_then_draft_article'] = $this->drupalCreateNode(['type' => 'article', 'changed' => $time--, 'moderation_state' => 'published', 'title' => 'first article - published']);
+    $nodes['published_then_draft_article']->setNewRevision(TRUE);
+    $nodes['published_then_draft_article']->setTitle('first article - draft');
+    $nodes['published_then_draft_article']->moderation_state->value = 'draft';
+    $nodes['published_then_draft_article']->changed->value = $time--;
+    $nodes['published_then_draft_article']->save();
+
+    $nodes['published_then_archived_article'] = $this->drupalCreateNode(['type' => 'article', 'changed' => $time--, 'moderation_state' => 'published']);
+    $nodes['published_then_archived_article']->setNewRevision(TRUE);
+    $nodes['published_then_archived_article']->moderation_state->value = 'archived';
+    $nodes['published_then_archived_article']->changed->value = $time--;
+    $nodes['published_then_archived_article']->save();
+
+    $nodes['draft_article'] = $this->drupalCreateNode(['type' => 'article', 'changed' => $time--, 'moderation_state' => 'draft']);
+    $nodes['draft_page_1'] = $this->drupalCreateNode(['type' => 'page', 'changed' => $time--, 'moderation_state' => 'draft']);
+    $nodes['draft_page_2'] = $this->drupalCreateNode(['type' => 'page', 'changed' => $time, 'moderation_state' => 'draft']);
+
+    // Verify view, edit, and delete links for any content.
+    $this->drupalGet('admin/content/moderated');
+    $assert_sesison->statusCodeEquals(200);
+
+    // Check that nodes with pending revisions appear in the view.
+    $node_type_labels = $this->xpath('//td[contains(@class, "views-field-type")]');
+    $delta = 0;
+    foreach ($nodes as $node) {
+      $assert_sesison->linkByHrefExists('node/' . $node->id());
+      $assert_sesison->linkByHrefExists('node/' . $node->id() . '/edit');
+      $assert_sesison->linkByHrefExists('node/' . $node->id() . '/delete');
+      // Verify that we can see the content type label.
+      $this->assertEquals($node->type->entity->label(), trim($node_type_labels[$delta]->getText()));
+      $delta++;
+    }
+
+    // Check that nodes that are not moderated or do not have a pending revision
+    // do not appear in the view.
+    foreach ($excluded_nodes as $node) {
+      $assert_sesison->linkByHrefNotExists('node/' . $node->id());
+    }
+
+    // Check that the latest revision is displayed.
+    $assert_sesison->pageTextContains('first article - draft');
+    $assert_sesison->pageTextNotContains('first article - published');
+
+    // Verify filtering by moderation state.
+    $this->drupalGet('admin/content/moderated', ['query' => ['moderation_state' => 'editorial-draft']]);
+
+    $assert_sesison->linkByHrefExists('node/' . $nodes['published_then_draft_article']->id() . '/edit');
+    $assert_sesison->linkByHrefExists('node/' . $nodes['draft_article']->id() . '/edit');
+    $assert_sesison->linkByHrefExists('node/' . $nodes['draft_page_1']->id() . '/edit');
+    $assert_sesison->linkByHrefExists('node/' . $nodes['draft_page_1']->id() . '/edit');
+    $assert_sesison->linkByHrefNotExists('node/' . $nodes['published_then_archived_article']->id() . '/edit');
+
+    // Verify filtering by moderation state and content type.
+    $this->drupalGet('admin/content/moderated', ['query' => ['moderation_state' => 'editorial-draft', 'type' => 'page']]);
+
+    $assert_sesison->linkByHrefExists('node/' . $nodes['draft_page_1']->id() . '/edit');
+    $assert_sesison->linkByHrefExists('node/' . $nodes['draft_page_2']->id() . '/edit');
+    $assert_sesison->linkByHrefNotExists('node/' . $nodes['published_then_draft_article']->id() . '/edit');
+    $assert_sesison->linkByHrefNotExists('node/' . $nodes['published_then_archived_article']->id() . '/edit');
+    $assert_sesison->linkByHrefNotExists('node/' . $nodes['draft_article']->id() . '/edit');
+  }
+
+}

core/modules/views/src/EntityViewsData.php

@@ -183,6 +183,13 @@ public function getViewsData() {
           'id' => 'entity_operations',
         ],
       ];
+      $data[$revision_table]['operations'] = [
+        'field' => [
+          'title' => $this->t('Operations links'),
+          'help' => $this->t('Provides links to perform entity operations.'),
+          'id' => 'entity_operations',
+        ],
+      ];
     }
 
     if ($this->entityType->hasViewBuilderClass()) {